fix: indicate when contexts are loading

Signed-off-by: Cleopatra Enjeck M <[email protected]>
nextcloud · Mar 7, 2024 · 39b7948 · 39b7948
1 parent 5e8317f
commit 39b7948
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -38,9 +38,9 @@ export default {
 		}
 	},
 	computed: {
-		...mapState(['tablesLoading']),
+		...mapState(['tablesLoading', 'contextsLoading']),
 		somethingIsLoading() {
-			return this.tablesLoading || this.loading
+			return this.tablesLoading || this.contextsLoading || this.loading
 		},
 	},
 	watch: {

diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
@@ -21,22 +21,20 @@
 					<input v-model="title" :class="{ missing: errorTitle }" type="text"
 						:placeholder="t('tables', 'Title of the context')">
 				</div>
-				<div>
-					<div class="row">
-						<div class="col-4 mandatory">
-							{{ t('tables', 'Description') }}
-						</div>
-						<input v-model="description" type="text"
-							:placeholder="t('tables', 'Description of the context')">
-					</div>
+			</div>
+			<div class="row">
+				<div class="col-4 mandatory">
+					{{ t('tables', 'Description') }}
 				</div>
-				<div class="row">
-					<div>
-						{{ t('tables', 'Resources') }}
-					</div>
-					<NcContextResource :resources.sync="resources" />
+				<input v-model="description" type="text" :placeholder="t('tables', 'Description of the context')">
+			</div>
+			<div class="row">
+				<div>
+					{{ t('tables', 'Resources') }}
 				</div>
+				<NcContextResource :resources.sync="resources" />
 			</div>
+
 			<div class="row">
 				<div class="right-additional-button">
 					<NcButton type="primary" @click="submit">

diff --git a/src/modules/navigation/sections/Navigation.vue b/src/modules/navigation/sections/Navigation.vue
@@ -56,6 +56,7 @@
 						:filter-string="filterString" :table="table" />
 				</NcAppNavigationItem>
 			</ul>
+			<div v-if="contextsLoading" class="icon-loading" />
 			<ul v-if="!contextsLoading">
 				<NcAppNavigationCaption :name="t('tables', 'Contexts')">
 					<template #actions>
@@ -70,6 +71,7 @@
 			</ul>
 		</template>
 
+		<!-- TODO make filter work for Contexts -->
 		<div v-if="filterString !== ''" class="search-info">
 			<NcEmptyContent :description="t('tables', 'Your results are filtered.')">
 				<template #icon>

diff --git a/src/store/store.js b/src/store/store.js
@@ -119,6 +119,7 @@ export default new Vuex.Store({
 	},
 	actions: {
 		async insertNewContext({ commit, state, dispatch }, { data }) {
+			commit('setContextsLoading', true)
 			let res = null
 
 			try {
@@ -131,6 +132,7 @@ export default new Vuex.Store({
 			contexts.push(res.data.ocs.data)
 			commit('setContexts', contexts)
 
+			commit('setContextsLoading', false)
 			return res.data.ocs.data
 		},
 		async insertNewTable({ commit, state, dispatch }, { data }) {
@@ -331,6 +333,8 @@ export default new Vuex.Store({
 			const table = state.tables[index]
 			table.favorite = false
 			commit('setTable', table)
+
+			return true
 		},
 		async updateContext({ state, commit, dispatch }, { id, data }) {
 			let res = null
@@ -347,6 +351,7 @@ export default new Vuex.Store({
 			const index = contexts.findIndex(c => c.id === context.id)
 			contexts[index] = context
 			commit('setContexts', [...contexts])
+
 			return context
 		},
 		async transferTable({ state, commit, dispatch }, { id, data }) {