Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nested global blocks #7423

Merged

Conversation

wachterjohannes
Copy link
Member

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Fixed tickets fixes #7414 , fixes #7409
Related issues/PRs #7229
License MIT
Documentation PR none

What's in this PR?

This PR fixed following issues:

Why?

This issues where introduced by #7229

@mamazu
Copy link
Contributor

mamazu commented May 14, 2024

Now when I expand a global block type the list of properties is empty.

@wachterjohannes
Copy link
Member Author

@mamazu seems to work for me pretty well:

image

Have you rebuild the admin dist files?

@wachterjohannes
Copy link
Member Author

wachterjohannes commented May 14, 2024

@mamazu see comment in the issue #7409 (comment)

@mamazu
Copy link
Contributor

mamazu commented May 14, 2024

Yes. Oddly there are also no console errors this time when I expand a block which is empty. So no clue what's happening.

@wachterjohannes
Copy link
Member Author

@mamazu does it work now?

@spackmat
Copy link
Contributor

@wachterjohannes I also get no console errors now, bus still does not work.

@wachterjohannes
Copy link
Member Author

@spackmat only to be clear - after updating the vendor to my branch - you have to remove the node_modules folder and run npm install && npm run build to be sure that my new files are used

@mamazu
Copy link
Contributor

mamazu commented May 14, 2024

@wachterjohannes Still no change. Even ran the Sulu admin build update command.

@ghost
Copy link

ghost commented May 14, 2024

Works for me, but there is an error with local and global blocks combined:
#7414 (comment)

@spackmat
Copy link
Contributor

spackmat commented May 14, 2024

@wachterjohannes did it all again for you, still the same: When the blocks are within a section, there are no fields displayed. Outside of a section it works well for normal blocks, nested blocks do not work at all, showing the wrong name.

Looks like this (opened), when within a section:
image

And should look like this (when outside of a section:
image

And looks like this (without section) for nested blocks:
image
(outside of the nested block, the block is correctly named "Studienverlaufsplan", when not nested)

@wachterjohannes
Copy link
Member Author

@spackmat me and @mamazu found the issue and pushed it to the branch - can you recheck?

@spackmat
Copy link
Contributor

spackmat commented May 14, 2024

@wachterjohannes @mamazu Hey, the non nested blocks within sections do work now 👏

The nested blocks still fail the same way as before.

@spackmat
Copy link
Contributor

@wachterjohannes with your last commit, the nested blocks also work. Nice! 😎

@wachterjohannes wachterjohannes force-pushed the fix-global-blocks-edge-cases branch 2 times, most recently from 8245859 to 63c4c76 Compare May 15, 2024 08:06
@wachterjohannes
Copy link
Member Author

@spackmat thanks for the testing :)

@mamazu will you give it a try again?

@FlorianKoerner
Copy link
Contributor

@wachterjohannes Looks good - even with nested blocks. Thank you! :)

@mamazu
Copy link
Contributor

mamazu commented May 15, 2024

Works for me.

@wachterjohannes wachterjohannes force-pushed the fix-global-blocks-edge-cases branch 3 times, most recently from 056ac38 to 93255ef Compare May 15, 2024 12:25
@alexander-schranz alexander-schranz merged commit 7cadd18 into sulu:2.6 May 15, 2024
7 of 8 checks passed
@wachterjohannes wachterjohannes deleted the fix-global-blocks-edge-cases branch May 15, 2024 14:16
@alexander-schranz
Copy link
Member

Thank you all for testing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Error or unexpected behavior of already existing functionality
Projects
None yet
5 participants