feat: Handle file upload from Flagship #2969

acezard · 2023-08-23T14:41:20Z

Upload one file
Upload multiple files
Handle upload progression without leaving the app with one file
Handle upload progression without leaving the app with multiple files
Handle upload progression after leaving and opening the app again with one file
Handle upload progression after leaving and opening the app again with multiple files

Crash-- · 2023-09-12T10:18:59Z

src/drive/web/modules/views/Upload/UploaderComponent.tsx

+            title={t('ImportToDrive.title', { smart_count: items.length })}
+            subTitle={t('ImportToDrive.to')}
+          />
+          <Query


Query component is deprecated. You should have refactor to useQuery(). I still thin that this kind of refactor to be up to date with the cozy latest standard should be done BEFORE converting to TS...

Crash-- · 2023-09-12T10:20:19Z

I have to delete the cache on travis to be able to build this branch. And locally I have to rm -rf node_modules/ ....

bundlemon · 2023-09-12T10:24:54Z

BundleMon

Files updated (6)

Status	Path	Size	Limits
✅	drive/manifest.webapp	1.88KB (+114B +6.28%)	2KB
✅	drive/services/qualificationMigration/drive.j s	250.63KB (-680B -0.26%)	500KB
✅	drive/services/dacc/drive.js	255.46KB (-1.08KB -0.42%)	500KB
✅	drive/intents/drive.(hash).js	156.65KB (-7.59KB -4.62%)	171KB
✅	drive/public/drive.(hash).js	1.52MB (-18.91KB -1.2%)	1.65MB
✅	drive/app/drive.(hash).js	247.84KB (-23.46KB -8.65%)	280KB

Unchanged files (13)

Status	Path	Size	Limits
✅	drive/vendors/drive.(hash).js	1.3MB	1.6MB
✅	drive/public/pdf.worker.entry.(hash).worker.j s	343.37KB	345KB
✅	drive/public/cozy-client-js.js	158.97KB	160KB
✅	drive/public/drive.(hash).min.css	92.6KB	100KB
✅	drive/app-drive.(hash).min.css	55.72KB	56KB
✅	drive/intents-drive.(hash).min.css	37.06KB	40KB
✅	drive/onlyOffice/slide.pptx	24.82KB	25KB
✅	drive/onlyOffice/text.docx	5.84KB	6KB
✅	drive/onlyOffice/spreadsheet.xlsx	5.01KB	6KB
✅	drive/index.html	532B	1KB
✅	drive/intents/index.html	516B	1KB
✅	drive/img/app-icon.(hash).svg	419B	1KB
✅	drive/manifest.json	184B	1KB

Total files change -51.6KB -1.13%

Groups updated (4)

Status	Path	Size	Limits
✅	drive/services/**	506.08KB (-1.75KB -0.34%)	+1%
✅	drive/intents/**	157.15KB (-7.59KB -4.61%)	+6%
✅	drive/public/**	2.11MB (-18.91KB -0.87%)	+7%
✅	drive/app/**	247.84KB (-23.46KB -8.65%)	+10%

Unchanged groups (4)

Status	Path	Size	Limits
✅	drive/screenshots/**	2.13MB	+0.4%
✅	drive/vendors/**	1.3MB	+6%
✅	drive/onlyOffice/**	35.68KB	+0.4%
✅	drive/img/**	419B	+0.4%

Final result: ✅

View report in BundleMon website ➡️

Current branch size history | Target branch size history

src/drive/targets/manifest.webapp

package.json

src/components/App/App.jsx

src/drive/web/modules/views/Upload/UploaderComponent.spec.tsx

src/drive/web/modules/views/Upload/UploaderComponent.tsx

Crash-- · 2023-09-12T10:44:13Z

src/drive/web/modules/views/Upload/UploaderComponent.tsx

+  }, [dispatch, removeFileToUploadQueue, t])
+
+  const onClose = useCallback(async () => {
+    await webviewIntent?.call('resetFilesToHandle').then(() => {


I still really don't like this way of writing code... Can we do it differently to be the same as other place?

src/drive/web/modules/views/Upload/UploaderComponent.tsx

src/drive/targets/manifest.webapp

src/drive/web/modules/upload/index.js

- Also add placeholder route that will handle mobile uploads later

It is believed this will help integrating with the existing store logic. No runtime changes are intended, only typings so everything is as clear as possible when reusing the already existing mobile upload flow

has to be put at a better location

Go back to drive root as a fallback. Some app states can go back to drive upload page that was in cache, while cozy-flagship doesn't have files to upload anymore

this commit: - removes modification in upload module - removes logic in uploaderView - regroup logic and state management in the custom hook of the feature - removes deprecated Query component - enhances UI loading state - accept 10 files maximum

src/drive/targets/manifest.webapp

src/drive/web/modules/views/Upload/UploadUtils.ts

src/drive/web/modules/views/Upload/UploaderComponent.spec.tsx

Also remove old import from a test file. The test file itself seems a bit outdated, it would be good to review it at some point

Ldoppea · 2023-10-19T17:13:52Z

src/drive/web/modules/views/Upload/UploadUtils.ts

+
+    logger('info', 'uploadFilesFromFlagship called')
+
+    await webviewIntent?.call('uploadFiles', JSON.stringify({ fileOptions }))


I just noticed that we pass only one file at a time to uploadFiles. Didn't we want to pass an array here?

If yes we should modify the interface.

If no we should rename this as uploadFile.

Yes it's one by one, it was made like that to mimick the old upload to mobile feature. In this case renaming seems the best approach

done on react-native side too cozy/cozy-flagship-app@5278d76

src/drive/web/modules/views/Upload/UploadUtils.ts

Instead of removing all files to upload, we go back to the selection screen

Files are sent one by one

acezard force-pushed the refactor--updated-upload-component-to-typescript branch 4 times, most recently from 569db51 to 5a3eb17 Compare August 24, 2023 09:40

acezard changed the title ~~refactor: updated upload component to typescript~~ feat: Handle file upload from Flagship Aug 30, 2023

acezard force-pushed the refactor--updated-upload-component-to-typescript branch from 7bd34e8 to ec80628 Compare September 3, 2023 16:30

acezard changed the base branch from feat--Update-manifest-to-add-acceptFromFlagship to master September 4, 2023 07:01

acezard marked this pull request as ready for review September 4, 2023 07:01

acezard requested review from zatteo and cballevre as code owners September 4, 2023 07:01

acezard mentioned this pull request Sep 4, 2023

feat: Update manifest to add acceptFromFlagship #2967

Closed

acezard force-pushed the refactor--updated-upload-component-to-typescript branch from 7ce7c11 to 880b97e Compare September 4, 2023 07:08