feat(api-headless-cms): add crud operation to restore entry from trash bin #4064
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
… leo/feat/hcms-restore-item
# Conflicts: # packages/api-headless-cms/src/types/types.ts
adrians5j
requested changes
Apr 10, 2024
packages/api-headless-cms/src/graphql/schema/resolvers/manage/resolveRestore.ts
Outdated
Show resolved
Hide resolved
| [PROJECT_PACKAGE_FEATURE_NAME.APW]: { | ||
| enabled: false | ||
| }, | ||
| [PROJECT_PACKAGE_FEATURE_NAME.AUDIT_LOGS]: { |
There was a problem hiding this comment.
Can you just add RECORD_LOCKING here too?
https://github.com/webiny/webiny-js/pull/4073/files#diff-28a27b0014482b8d1670cb2977ad2020082b4c703210cfce6bcd27c6adcd3635R35-R37
This was merged into next like yday, so it's new. But note that only after merging next you should be able to add it.
There was a problem hiding this comment.
It should be there already; I merged next into this branch...can you have a look to see if everything is ok?
packages/api-headless-cms/__tests__/contentAPI/contentEntry.restore.test.ts
Outdated
Show resolved
Hide resolved
adrians5j
requested changes
Apr 11, 2024
packages/api-headless-cms-aco/src/hooks/entry/onEntryBeforeRestoreFromBin.hook.ts
Show resolved
Hide resolved
...api-headless-cms/src/crud/contentEntry/useCases/RestoreEntryFromBin/TransformEntryRestore.ts
Outdated
Show resolved
Hide resolved
adrians5j
approved these changes
Apr 12, 2024
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.
Changes
With this PR, developers can restore an entry previously moved to the trash bin.
When an entry has been restored, we add the following fields:
deleted: changed fromtruetofalse(boolean)restoredOn: the datetime when the entry has been restored (string)restoredBy: the user that restored the entry (identity object)Similar types have been added for the
revisionRestoredOnandrevisionRestoredByfields.Folder verification while restoring an entry
In the restoration process, we verify if the folder referenced by the
folderIdinsidewby_locationstill exists. If not, we relocate the entry to theROOT_FOLDER.This aspect of the business logic is handled by subscribing to
restoreEntryevent topics and managed in a separate package calledapi-headless-cms-aco.Related PR
webiny/webiny-upgrades#29
How Has This Been Tested?
Manually + Jest