[VO-740] feat(nextcloud): Show trash #3187

cballevre · 2024-07-15T16:00:17Z

### ✨ Features

*  Show trash inside nextcloud

Related PRs :

bundlemon · 2024-07-15T16:06:01Z

BundleMon

Files updated (3)

Status	Path	Size	Limits
✅	app/drive.(hash).js	178.77KB (+1.5KB +0.85%)	300KB
✅	public/drive.(hash).js	1.56MB (-31B 0%)	1.7MB
✅	intents/drive.(hash).js	105.11KB (-1.23KB -1.16%)	190KB

Unchanged files (15)

Status	Path	Size	Limits
✅	vendors/drive.(hash).js	1.78MB	2MB
✅	public/pdf.worker.entry.(hash).worker.js	345.35KB	350KB
✅	services/qualificationMigration/drive.js	280.06KB	500KB
✅	services/dacc/drive.js	261.09KB	500KB
✅	public/cozy-client-js.js	159.28KB	160KB
✅	public/drive.(hash).min.css	69.71KB	100KB
✅	app-drive.(hash).min.css	37.84KB	56KB
✅	intents-drive.(hash).min.css	33.01KB	40KB
✅	onlyOffice/slide.pptx	24.83KB	25KB
✅	onlyOffice/text.docx	5.85KB	6KB
✅	onlyOffice/spreadsheet.xlsx	5.02KB	6KB
✅	manifest.webapp	1.87KB	2KB
✅	index.html	598B	1KB
✅	intents/index.html	508B	1KB
✅	manifest.json	185B	1KB

Total files change +249B 0%

Groups updated (3)

Status	Path	Size	Limits
✅	app/**	178.77KB (+1.5KB +0.85%)	-
✅	public/**	2.13MB (-31B 0%)	-
✅	intents/**	105.6KB (-1.23KB -1.15%)	-

Unchanged groups (4)

Status	Path	Size	Limits
✅	vendors/**	1.78MB	-
✅	services/**	541.15KB	-
✅	onlyOffice/**	35.7KB	-
✅	img/**	5.85KB	-

Final result: ✅

View report in BundleMon website ➡️

Current branch size history | Target branch size history

This is preparatory work to share code between IOCozyFile routes and the Nextcloud routes. This also makes it easier to go backwards on Android.

acezard · 2024-07-22T08:40:10Z

src/modules/trash/components/DestroyConfirm.tsx

+    try {
+      setBusy(true)
+      await onConfirm()
+    } finally {


we don't handle the error scenario with some UI feedback here?

Good point, I've added alerts in case of success or error

acezard · 2024-07-22T08:41:06Z

src/modules/views/Trash/TrashDestroyView.tsx

+  const handleConfirm = async (): Promise<void> => {
+    if (!fileResult.data) return
+    for (const file of fileResult.data) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call


I've seen multiple of these maybe it's easier to type cozy-client in d.ts for this method

I don't really want to modify CozyClient typing directly in Drive. We'd have to see how we could integrate this directly into the package, but we'd probably have to consider typing cozy-stack-client at the same time as .collection is direct access to their classes.

acezard · 2024-07-22T08:41:56Z

src/modules/filelist/File.jsx

@@ -118,7 +117,7 @@ const File = ({
  // because they are magic folder created by the stack
  const canInteractWithFile =
    attributes._id !== 'io.cozy.files.shared-drives-dir' &&
-    attributes._id !== TRASH_DIR_ID
+    !attributes._id.endsWith('.trash-dir')


why use a literal string instead of a constant here?

This allows me to manage all the trash from both doctype io.cozy.files and io.cozy.remote.nextcloud.files in one line. You would have prefer something like that :

const canInteractWithFile = attributes._id !== SHARED_DRIVES_DIR_ID && attributes._id !== TRASH_DIR_ID && attributes._id !== NEXTCLOUD_TRASH_DIR_ID

Maybe this constant should be provided by cozy-client or cozy-stack-client as they are already set as type here.

Note: I tend to put the doctype directly because I find them quicker to search globally in a project.

acezard · 2024-07-22T08:46:20Z

src/modules/nextcloud/components/NextcloudTrashFolderBody.tsx

@@ -32,12 +36,21 @@ const NextcloudTrashFolderBody: FC<NextcloudTrashFolderBodyProps> = ({
    window.open(file.links.self, '_blank')
  }

-  const fileActions = makeActions([], {
+  const handleRefresh = async (files: NextcloudFile[]): Promise<void> => {


what is supposed to happen in case of throw during this refresh?

I move this part inside the action directly so its handle by try/catch for the restore. I took advantage of this to limit the number of query resets by duplicating the parents' paths.

However, your comment made me realise that the resetQuery function returns an error when the query didn't exist. I'm in the process of correcting it in cozy-client but I don't think it will be a problem for this PR.

acezard · 2024-07-22T08:47:25Z

src/modules/views/Nextcloud/NextcloudDestroyView.tsx

+      state.fileIds?.includes(_id)
+    )
+
+    const handleConfirm = async (): Promise<void> => {


same here, what happens in case we can't handleConfirm? on ui side particularly (maybe it's irrelevant, not sure)

The UI side is handle inside the DestroyConfirm because the message are the same between io.cozy.files and io.cozy.remote.nextcloud.files

This is preparatory work to share code between IOCozyFile routes and the Nextcloud routes. This also makes it easier to go backwards on Android.

cballevre force-pushed the feat/show-trash-inside-nextcloud branch 2 times, most recently from 866c43d to 0b45b89 Compare July 18, 2024 15:27

cballevre marked this pull request as ready for review July 18, 2024 15:29

cballevre requested a review from acezard as a code owner July 18, 2024 15:29

cballevre force-pushed the feat/show-trash-inside-nextcloud branch from 0b45b89 to e0abef6 Compare July 19, 2024 06:43

cballevre added 3 commits July 22, 2024 09:50

refactor(MoreMenu): Convert into typescript

a43af46

refactor(selectable): Convert into typescript

150d0e8

refactor(trash): Use route for empty trash confirmation modal

1e4cba7

This is preparatory work to share code between IOCozyFile routes and the Nextcloud routes. This also makes it easier to go backwards on Android.

cballevre force-pushed the feat/show-trash-inside-nextcloud branch from e0abef6 to 824b070 Compare July 22, 2024 07:51

cballevre requested a review from Ldoppea July 22, 2024 07:52

acezard reviewed Jul 22, 2024

View reviewed changes

cballevre added 6 commits July 22, 2024 11:12

refactor(trash): Use a route for destroy confirmation modal

2a4dd8c

This is preparatory work to share code between IOCozyFile routes and the Nextcloud routes. This also makes it easier to go backwards on Android.

feat(nextcloud): Show trash

7cbbdc6

feat(nextcloud): Add restore action onto trashed files

42aa968

feat(nextcloud): Add permantly delete action onto trashed files

32b2701

feat(nextcloud): Update trash query after moving a file to trash

112f840

feat: Update cozy-client from 48.9.0 to 48.11.0

10f846a

cballevre force-pushed the feat/show-trash-inside-nextcloud branch from 824b070 to 10f846a Compare July 22, 2024 12:43

cballevre requested a review from acezard July 22, 2024 12:50

acezard approved these changes Jul 22, 2024

View reviewed changes

cballevre merged commit 9e6c800 into master Jul 22, 2024
3 checks passed

cballevre deleted the feat/show-trash-inside-nextcloud branch July 22, 2024 12:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[VO-740] feat(nextcloud): Show trash #3187

[VO-740] feat(nextcloud): Show trash #3187

cballevre commented Jul 15, 2024 •

edited

Loading

bundlemon bot commented Jul 15, 2024 •

edited

Loading

acezard Jul 22, 2024

cballevre Jul 22, 2024

acezard Jul 22, 2024

cballevre Jul 22, 2024

acezard Jul 22, 2024

cballevre Jul 22, 2024

acezard Jul 22, 2024

cballevre Jul 22, 2024

acezard Jul 22, 2024

cballevre Jul 22, 2024

[VO-740] feat(nextcloud): Show trash #3187

[VO-740] feat(nextcloud): Show trash #3187

Conversation

cballevre commented Jul 15, 2024 • edited Loading

bundlemon bot commented Jul 15, 2024 • edited Loading

BundleMon

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cballevre commented Jul 15, 2024 •

edited

Loading

bundlemon bot commented Jul 15, 2024 •

edited

Loading