[full-ci] Remove the upload progress bar and its related states (#6825)

Remove the upload progress bar and its related states Co-authored-by: Saw-jan <[email protected]>
owncloud · May 4, 2022 · 4e9aa0b · 4e9aa0b
1 parent 95edac2
commit 4e9aa0b
Show file tree

Hide file tree

Showing 27 changed files with 17 additions and 594 deletions.
diff --git a/changelog/unreleased/enhancement-remove-upload-progress-component b/changelog/unreleased/enhancement-remove-upload-progress-component
@@ -0,0 +1,6 @@
+Enhancement: Remove the upload progress component
+
+We've removed the upload progress component because the implementation of Uppy made it obsolete.
+
+https://github.com/owncloud/web/pull/6825
+https://github.com/owncloud/web/issues/6819
diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
@@ -104,8 +104,4 @@ main {
   grid-area: main;
   z-index: 0;
 }
-
-#files-upload-progress {
-  grid-area: upload;
-}
 </style>
diff --git a/packages/web-app-files/src/components/Upload/DetailsWidget.vue b/packages/web-app-files/src/components/Upload/DetailsWidget.vue
diff --git a/packages/web-app-files/src/components/Upload/ProgressBar.vue b/packages/web-app-files/src/components/Upload/ProgressBar.vue
diff --git a/packages/web-app-files/src/composables/fileListHeaderPosition/useFileListHeaderPosition.ts b/packages/web-app-files/src/composables/fileListHeaderPosition/useFileListHeaderPosition.ts
@@ -1,8 +1,6 @@
-import { ref, nextTick, onMounted, Ref, watch } from '@vue/composition-api'
-import { useStore } from 'web-pkg/src/composables/store'
+import { ref, nextTick, onMounted, Ref } from '@vue/composition-api'
 
 export const useFileListHeaderPosition = (): { y: Ref; refresh: () => void } => {
-  const store = useStore()
   const y = ref(0)
   const refresh = async (): Promise<void> => {
     await nextTick()
@@ -18,7 +16,6 @@ export const useFileListHeaderPosition = (): { y: Ref; refresh: () => void } =>
 
   window.onresize = refresh
   onMounted(refresh)
-  watch(() => store.getters['Files/inProgress'].length > 0, refresh)
 
   return { y, refresh }
 }
diff --git a/packages/web-app-files/src/store/getters.js b/packages/web-app-files/src/store/getters.js
@@ -1,9 +1,6 @@
 import { ShareTypes } from '../helpers/share'
 
 export default {
-  inProgress: (state) => {
-    return state.inProgress
-  },
   selectedFiles: (state, getters) => {
     return getters.filesAll.filter((f) => state.selectedIds.includes(f.id))
   },

diff --git a/packages/web-app-files/src/store/state.js b/packages/web-app-files/src/store/state.js
@@ -3,8 +3,6 @@ export default {
   files: [],
   filesSearched: null,
   selectedIds: [],
-  inProgress: [],
-  shareOpen: null,
   versions: [],
   spaces: [],
 

diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue
@@ -11,7 +11,6 @@
     </app-bar>
     <app-loading-spinner v-if="loadResourcesTask.isRunning" />
     <template v-else>
-      <progress-bar v-show="$_uploadProgressVisible" id="files-upload-progress" class="oc-p-s" />
       <not-found-message v-if="folderNotFound" class="files-not-found oc-height-1-1" />
       <no-content-message
         v-else-if="isEmpty"
@@ -88,7 +87,6 @@ import { bus } from 'web-pkg/src/instance'
 import { breadcrumbsFromPath, concatBreadcrumbs } from '../helpers/breadcrumbs'
 
 import AppBar from '../components/AppBar/AppBar.vue'
-import ProgressBar from '../components/Upload/ProgressBar.vue'
 import CreateAndUpload from '../components/AppBar/CreateAndUpload.vue'
 import ResourceTable from '../components/FilesList/ResourceTable.vue'
 import QuickActions from '../components/FilesList/QuickActions.vue'
@@ -112,7 +110,6 @@ const visibilityObserver = new VisibilityObserver()
 export default defineComponent({
   components: {
     AppBar,
-    ProgressBar,
     CreateAndUpload,
     ResourceTable,
     QuickActions,
@@ -146,15 +143,11 @@ export default defineComponent({
     ...mapGetters('Files', [
       'highlightedFile',
       'currentFolder',
-      'inProgress',
       'totalFilesCount',
       'totalFilesSize'
     ]),
     ...mapGetters(['user', 'homeFolder', 'configuration']),
 
-    $_uploadProgressVisible() {
-      return this.inProgress.length > 0
-    },
     isEmpty() {
       return this.paginatedResources.length < 1
     },

diff --git a/packages/web-app-files/src/views/PublicFiles.vue b/packages/web-app-files/src/views/PublicFiles.vue
@@ -11,7 +11,6 @@
     </app-bar>
     <app-loading-spinner v-if="loadResourcesTask.isRunning" />
     <template v-else>
-      <progress-bar v-show="$_uploadProgressVisible" id="files-upload-progress" class="oc-p-s" />
       <not-found-message v-if="folderNotFound" class="files-not-found oc-height-1-1" />
       <no-content-message
         v-else-if="isEmpty"
@@ -79,7 +78,6 @@ import { bus } from 'web-pkg/src/instance'
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
 import AppBar from '../components/AppBar/AppBar.vue'
-import ProgressBar from '../components/Upload/ProgressBar.vue'
 import CreateAndUpload from '../components/AppBar/CreateAndUpload.vue'
 import NotFoundMessage from '../components/FilesList/NotFoundMessage.vue'
 import ListInfo from '../components/FilesList/ListInfo.vue'
@@ -95,7 +93,6 @@ const visibilityObserver = new VisibilityObserver()
 export default defineComponent({
   components: {
     AppBar,
-    ProgressBar,
     CreateAndUpload,
     ResourceTable,
     ListInfo,
@@ -119,17 +116,12 @@ export default defineComponent({
       'publicLinkPassword',
       'currentFolder',
       'highlightedFile',
-      'inProgress',
       'totalFilesCount',
       'totalFilesSize'
     ]),
     ...mapGetters(['configuration']),
     ...mapState('Files/sidebar', { sidebarClosed: 'closed' }),
 
-    $_uploadProgressVisible() {
-      return this.inProgress.length > 0
-    },
-
     breadcrumbs() {
       const breadcrumbs = breadcrumbsFromPath(this.$route.path, this.$route.params.item)
       const rootRoute = breadcrumbs.shift()