✨ List and restore deleted docs #1450
Merged
Conversation
This file contains hidden or 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
| Size Change: +2.26 kB (+0.06%) Total Size: 3.66 MB
|
AntoLC force-pushed the feature/bin-in-docs branch 3 times, most recently from 6155329 to 9bb3f51 Compare AntoLC force-pushed the feature/bin-in-docs branch from 7616ea8 to a9be1c2 Compare AntoLC force-pushed the feature/bin-in-docs branch from 304c07c to 3ec8300 Compare AntoLC force-pushed the feature/bin-in-docs branch 3 times, most recently from 3256335 to 21e1bf6 Compare 
Collaborator Author
| You can test this feature now from https://1450-docs.ppr-docs.beta.numerique.gouv.fr/ ! |
AntoLC force-pushed the feature/bin-in-docs branch 2 times, most recently from 6d6ef73 to 33928f0 Compare 
Collaborator
| hey @AntoLC This is pretty good I like it ! juste One thing : tabfocu.mp4 |
Ovgodd requested changes Oct 9, 2025
Collaborator
Ovgodd left a comment
Ovgodd left a comment There was a problem hiding this comment.
Nice ! I suggested some little things !
| const parentDoc = parentNode?.data.value as Doc; | ||
| if (!parentDoc) { | ||
| return currentDoc.abilities.move && isDesktop; | ||
| <Overlayer isOverlay={currentDoc.deleted_at != null}> |
Collaborator
There was a problem hiding this comment.
I think we can do this, avoiding the unwanted tabfocus into the greyed subitem,
But react thinks Inert is not valid html ,
So maybe we can add this too :
// global.d.ts declare module 'react' { interface HTMLAttributes<T> { inert?: '' | undefined; } }
Suggested change
| <Overlayer isOverlay={currentDoc.deleted_at != null}> | |
| <section | |
| aria-disabled={!!doc.deleted_at} | |
| {...(doc.deleted_at | |
| ? ({ inert: '' } satisfies React.HTMLAttributes<HTMLElement>) | |
| : {})} | |
| <Overlayer isOverlay={currentDoc.deleted_at != null}> |
WDYT ? it is a proposition but I am not sure of it
Or I can look at the a11y of it after merging the main feature !
Collaborator Author
There was a problem hiding this comment.
Comment on lines +212 to +221
| let dateToDisplay = relativeDate(doc.updated_at); | ||
| | ||
| if (isInTrashbin && config?.TRASHBIN_CUTOFF_DAYS && doc.deleted_at) { | ||
| const daysLeft = calculateDaysLeft( | ||
| doc.deleted_at, | ||
| config.TRASHBIN_CUTOFF_DAYS, | ||
| ); | ||
| | ||
| dateToDisplay = `${daysLeft} ${t('days', { count: daysLeft })}`; | ||
| } |
Collaborator
There was a problem hiding this comment.
little suggestion, something like that for better readability ?
Suggested change
| let dateToDisplay = relativeDate(doc.updated_at); | |
| if (isInTrashbin && config?.TRASHBIN_CUTOFF_DAYS && doc.deleted_at) { | |
| const daysLeft = calculateDaysLeft( | |
| doc.deleted_at, | |
| config.TRASHBIN_CUTOFF_DAYS, | |
| ); | |
| dateToDisplay = `${daysLeft} ${t('days', { count: daysLeft })}`; | |
| } | |
| const shouldShowDaysLeft = isInTrashbin && config?.TRASHBIN_CUTOFF_DAYS && doc.deleted_at | |
| const daysLeft = | |
| shouldShowDaysLeft | |
| ? calculateDaysLeft(doc.deleted_at, config.TRASHBIN_CUTOFF_DAYS) | |
| : null; | |
| const dateToDisplay = | |
| daysLeft !== null | |
| ? `${daysLeft} ${t('days', { count: daysLeft })}` | |
| : relativeDate(doc.updated_at); |
Collaborator Author
There was a problem hiding this comment.
By doing shouldShowDaysLeft we get linter warning, the clear "if" condition helps the linter to know that doc.deleted_at is not undefined. I think it's ok, multiple ternaires do not improve a lot the readability.
4 tasks
AntoLC force-pushed the feature/bin-in-docs branch 3 times, most recently from 5af1da5 to f80eb27 Compare 
To know when a document in the trashbin will be permanently deleted.
The front needs to know when a document has been deleted. We expose the deleted_at property on a document object,
The abilities for a deleted document were too open. We want to restrict them. Only the restore, retrieve and tree is allowed. The tree method will need some modifications to get the right informations.
The tree endpoint will now return a result only for owners. For other users the endpoint still returns a 403. Also, the endpoint does look for ancestors anymore, it only stay on the current document.
AntoLC force-pushed the feature/bin-in-docs branch from f80eb27 to 11d8000 Compare Collaborator Author
| The changes from the design reviews has been made as well. |
AntoLC force-pushed the feature/bin-in-docs branch from b10420f to 0f826ed Compare AntoLC force-pushed the feature/bin-in-docs branch 2 times, most recently from 5c146af to bd78617 Compare The design uses Material Symbols for icons. This commit adds the font to the project and updates the Icon component to be able to use it.
List the docs deleted in the trashbin list, it is displayed in the docs grid.
We can now restore a doc from the trashbin list actions.
Whe the doc is deleted, the doc page is a bit different, we have to adapt the doc header to add some information and actions that are relevant for a deleted doc.
We want to improve the accessibility of our BoxButton component by adding a theme focus visible style. This will help users who navigate using the keyboard to easily identify which button is currently focused. To do so we have to move some theme styles to the Box component to be able to use them in BoxButton.
A circular dependency was introduced in the previous commit. This commit resolves the circular dependency by refactoring the code to remove the circular reference.
AntoLC force-pushed the feature/bin-in-docs branch from bd78617 to 127c90c Compare Merged
Closed
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.
Purpose
We want to be able to see the deleted documents, and to restore them if needed.
Proposal
Demo
🚨 Take care
After
TRASHBIN_CUTOFF_DAYSdays, the doc will be definitively deleted, 30 by default.docs/src/backend/impress/settings.py
Lines 430 to 432 in 9bb3f51