From 093dfb8f9967c233ba50a9b25cd687b317918b9f Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Wed, 14 Sep 2022 14:16:34 +0200 Subject: [PATCH] Remove unneeded loading states --- .../components/SideBar/Shares/SharesPanel.vue | 17 +++-------------- packages/web-app-files/src/store/actions.ts | 2 -- packages/web-app-files/src/store/getters.ts | 3 --- packages/web-app-files/src/store/mutations.ts | 6 ------ packages/web-app-files/src/store/state.ts | 2 -- .../components/SideBar/Shares/FileLinks.spec.js | 2 -- .../SideBar/Shares/FileShares.spec.js | 1 - .../SideBar/Shares/SharesPanel.spec.js | 3 +-- .../SideBar/Shares/SpaceMembers.spec.js | 1 - 9 files changed, 4 insertions(+), 33 deletions(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue b/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue index 38088aff08f..6e4ccdf6f0e 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue @@ -18,7 +18,7 @@ import { computed, defineComponent, unref } from '@vue/composition-api' import FileLinks from './FileLinks.vue' import FileShares from './FileShares.vue' import SpaceMembers from './SpaceMembers.vue' -import { mapGetters, mapState } from 'vuex' +import { mapState } from 'vuex' import { useStore } from 'web-pkg/src/composables' import { useIncomingParentShare } from '../../../composables/parentShare' @@ -41,17 +41,7 @@ export default defineComponent({ }, setup() { const store = useStore() - const currentFileOutgoingSharesLoading = computed( - () => store.getters['Files/currentFileOutgoingSharesLoading'] - ) - const incomingSharesLoading = computed(() => store.getters['Files/incomingSharesLoading']) - const sharesTreeLoading = computed(() => store.getters['Files/sharesTreeLoading']) - const sharesLoading = computed( - () => - unref(currentFileOutgoingSharesLoading) || - unref(incomingSharesLoading) || - unref(sharesTreeLoading) - ) + const sharesLoading = computed(() => store.getters['Files/sharesTreeLoading']) return { ...useIncomingParentShare(), @@ -59,8 +49,7 @@ export default defineComponent({ } }, computed: { - ...mapGetters('Files', ['currentFileOutgoingSharesLoading']), - ...mapState('Files', ['incomingSharesLoading', 'sharesTreeLoading']) + ...mapState('Files', ['sharesTreeLoading']) }, watch: { sharesLoading: { diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts index 1014bd050f0..ab4c0646f0f 100644 --- a/packages/web-app-files/src/store/actions.ts +++ b/packages/web-app-files/src/store/actions.ts @@ -456,9 +456,7 @@ export default { context.commit('SHARESTREE_ADD', sharesTree) context.commit('SHARESTREE_LOADING', false) context.commit('CURRENT_FILE_OUTGOING_SHARES_SET', outgoingShares) - context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', false) context.commit('INCOMING_SHARES_LOAD', incomingShares) - context.commit('INCOMING_SHARES_LOADING', false) }) }, async loadVersions(context, { client, fileId }) { diff --git a/packages/web-app-files/src/store/getters.ts b/packages/web-app-files/src/store/getters.ts index d2c5a5c9a3d..b061ea3008f 100644 --- a/packages/web-app-files/src/store/getters.ts +++ b/packages/web-app-files/src/store/getters.ts @@ -49,9 +49,6 @@ export default { return ShareTypes.containsAnyValue(ShareTypes.unauthenticated, [share.shareType]) }) }, - currentFileOutgoingSharesLoading: (state) => { - return state.currentFileOutgoingSharesLoading - }, sharesTree: (state) => state.sharesTree, sharesTreeLoading: (state) => state.sharesTreeLoading, quota: (state) => { diff --git a/packages/web-app-files/src/store/mutations.ts b/packages/web-app-files/src/store/mutations.ts index 724a8f8ceff..325a3b08f10 100644 --- a/packages/web-app-files/src/store/mutations.ts +++ b/packages/web-app-files/src/store/mutations.ts @@ -120,9 +120,6 @@ export default { state.currentFileOutgoingShares = [] state.currentFileOutgoingSharesError = error }, - CURRENT_FILE_OUTGOING_SHARES_LOADING(state, loading) { - state.currentFileOutgoingSharesLoading = loading - }, INCOMING_SHARES_LOAD(state, shares) { state.incomingShares = shares }, @@ -130,9 +127,6 @@ export default { state.incomingShares = [] state.incomingSharesError = error }, - INCOMING_SHARES_LOADING(state, loading) { - state.incomingSharesLoading = loading - }, SHARESTREE_PRUNE_OUTSIDE_PATH(state, pathToKeep) { if (pathToKeep !== '' && pathToKeep !== '/') { // clear all children unrelated to the given path diff --git a/packages/web-app-files/src/store/state.ts b/packages/web-app-files/src/store/state.ts index 72d2a955c3e..18bb205798a 100644 --- a/packages/web-app-files/src/store/state.ts +++ b/packages/web-app-files/src/store/state.ts @@ -13,14 +13,12 @@ export default { */ currentFileOutgoingShares: [], currentFileOutgoingSharesError: null, - currentFileOutgoingSharesLoading: false, /** * Incoming shares from currently highlighted element */ incomingShares: [], incomingSharesError: null, - incomingSharesLoading: false, /** * Shares from parent folders diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js index 899bd7634ab..1ef9cfe60a4 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js @@ -141,7 +141,6 @@ describe('FileLinks', () => { isFolder: false, isReceivedShare: jest.fn() }, - currentFileOutgoingSharesLoading = false, sharesTreeLoading = false, expireDate = { enabled: true, @@ -193,7 +192,6 @@ describe('FileLinks', () => { currentFileOutgoingLinks: function () { return links }, - currentFileOutgoingSharesLoading: jest.fn(() => currentFileOutgoingSharesLoading), sharesTreeLoading: jest.fn(() => sharesTreeLoading) }, actions: mapActions, diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js index 67f1b9d2d93..6301b662045 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js @@ -209,7 +209,6 @@ const storeOptions = (data) => { return getResource({ filename: 'testfile', extension: 'jpg', type: 'file', canShare }) }, currentFileOutgoingCollaborators: () => outgoingCollaborators, - currentFileOutgoingSharesLoading: () => false, sharesTreeLoading: () => false }, actions: { diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js index 3ca82e83403..7f9d94fa6e2 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js @@ -53,8 +53,7 @@ describe('SharesPanel', () => { getters: { highlightedFile: (state) => { return state.highlightedFile - }, - currentFileOutgoingSharesLoading: jest.fn() + } }, mutations: { SET_HIGHLIGHTED_FILE(state, file) { diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js index 504de4c88c0..654b31a9f96 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js @@ -148,7 +148,6 @@ const storeOptions = (data, isInLoadingState) => { namespaced: true, getters: { highlightedFile: () => spaceMock, - currentFileOutgoingSharesLoading: () => isInLoadingState, sharesTreeLoading: () => false }, actions: {