Merge main into next #1528
Merged
Merge main into next #1528
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Make all DAM license fields optional if `LicenseType` is `ROYALTY_FREE` even if `requireLicense` is true in `DamConfig`. Closes COM-250
github-actions
bot
changed the title
github-actions
bot
force-pushed
the
merge-main-into-next
branch
from
1ece08b to
d297766
Compare
github-actions
bot
force-pushed
the
merge-main-into-next
branch
from
d297766 to
1be8200
Compare
## Problem: Our fixtures are currently broken. You always get this error when executing them: <img width="573" alt="Bildschirmfoto 2023-12-14 um 17 02 52" src="https://github.com/vivid-planet/comet/assets/13380047/ce7eed3c-5834-4618-8ced-ec93875c71ca"> The problem is that a required `userGroup` field is added to `PageTreeNode` in Demo: https://github.com/vivid-planet/comet/blob/99e0c57cc8ef542befd74d5b8ad9cf71058570e1/demo/api/src/page-tree/entities/page-tree-node.entity.ts#L26-L28 https://github.com/vivid-planet/comet/blob/1c098e4d0f23946c0fd543856c8f0aa897b83b82/demo/api/src/page-tree/dto/page-tree-node.input.ts#L7-L12 We don't provide a userGroup in the fixtures and it didn't strike because the typing of `PageTreeService.createNode()` is wrong. The input is typed with `PageTreeNodeBaseCreateInput` https://github.com/vivid-planet/comet/blob/b73eb4c34c70c694fc8b267ce330af5959c50e7b/packages/api/cms-api/src/page-tree/page-tree.service.ts#L33 but the actual input type can be defined in the application and is passed to the resolver via a factory: https://github.com/vivid-planet/comet/blob/46bced34cbb9ec02de6dd462bd9111a6be7898b7/packages/api/cms-api/src/page-tree/createPageTreeResolver.ts#L35 ### -> So actually the typing in the `PageTreeService` is wrong and we need to fix that I now circumvented this by using ts-ignore. But I think we need a solution to get the typing right. I'm however not sure what the best way to do this is.
github-actions
bot
force-pushed
the
merge-main-into-next
branch
from
1be8200 to
0880ca9
Compare
thomasdax98
requested review from
thomasdax98
and removed request for
johnnyomair
thomasdax98
approved these changes
Dec 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automated pull request to merge changes from
mainintonext. It has merge conflicts. To resolve conflicts, check out the branchmerge-main-into-nextlocally, make any necessary changes to conflicting files, and commit and publish your changes.