Merge pull request #123 from ConductionNL/feature/DIMOC-232/refresh-p…

…aram feature/DIMOC-232/refresh-param
OpenCatalogi · Aug 8, 2024 · ebf9cb8 · ebf9cb8
2 parents 4eac87d + a09616e
commit ebf9cb8
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 47 deletions.
diff --git a/src/views/Views.vue b/src/views/Views.vue
@@ -9,8 +9,7 @@ import { navigationStore, searchStore } from '../store/store.js'
 			<Catalogi v-if="navigationStore.selected === 'catalogi'" />
 			<Organisations v-if="navigationStore.selected === 'organisations'" />
 			<Themes v-if="navigationStore.selected === 'themes'" />
-			<Catalogi v-if="navigationStore.selected === 'catalogi'" />
-			<Dashboard v-if="navigationStore.selected === 'dashboard'" />
+			<Dashboard v-if="navigationStore.selected === 'dashboard'" :search="searchStore.search" />
 			<Directory v-if="navigationStore.selected === 'directory'" />
 			<Publications v-if="navigationStore.selected === 'publication'" />
 			<Matadata v-if="navigationStore.selected === 'metaData'" />

diff --git a/src/views/catalogi/CatalogiList.vue b/src/views/catalogi/CatalogiList.vue
@@ -23,7 +23,7 @@ import { catalogiStore, navigationStore } from '../../store/store.js'
 						</template>
 						Help
 					</NcActionButton>
-					<NcActionButton :disabled="loading" @click="fetchData">
+					<NcActionButton :disabled="loading" @click="refresh">
 						<template #icon>
 							<Refresh :size="20" />
 						</template>
@@ -146,6 +146,10 @@ export default {
 		this.fetchData()
 	},
 	methods: {
+		refresh(e) {
+			e.preventDefault()
+			this.fetchData()
+		},
 		fetchData(search = null) {
 			this.loading = true
 			catalogiStore.refreshCatalogiList(search)

diff --git a/src/views/directory/DirectoryList.vue b/src/views/directory/DirectoryList.vue
@@ -22,7 +22,7 @@ import { navigationStore, directoryStore } from '../../store/store.js'
 					</template>
 					Help
 				</NcActionButton>
-				<NcActionButton :disabled="loading" @click="fetchData">
+				<NcActionButton :disabled="loading" @click="refresh">
 					<template #icon>
 						<Refresh :size="20" />
 					</template>
@@ -86,17 +86,15 @@ import { navigationStore, directoryStore } from '../../store/store.js'
 	</ul>
 </template>
 <script>
+import { debounce } from 'lodash'
 import { NcListItem, NcActionButton, NcTextField, NcLoadingIcon, NcActions, NcEmptyContent, NcButton } from '@nextcloud/vue'
-// eslint-disable-next-line n/no-missing-import
-import Magnify from 'vue-material-design-icons/Magnify'
-// eslint-disable-next-line n/no-missing-import
-import LayersOutline from 'vue-material-design-icons/LayersOutline'
+
+// Icons
+import Magnify from 'vue-material-design-icons/Magnify.vue'
+import LayersOutline from 'vue-material-design-icons/LayersOutline.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
-import Pencil from 'vue-material-design-icons/Pencil.vue'
-import Delete from 'vue-material-design-icons/Delete.vue'
 import Refresh from 'vue-material-design-icons/Refresh.vue'
 import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
-import { debounce } from 'lodash'
 
 export default {
 	name: 'DirectoryList',
@@ -114,8 +112,6 @@ export default {
 		HelpCircleOutline,
 		Refresh,
 		Plus,
-		Pencil,
-		Delete,
 	},
 	beforeRouteLeave(to, from, next) {
 		search = ''
@@ -143,6 +139,10 @@ export default {
 		this.fetchData()
 	},
 	methods: {
+		refresh(e) {
+			e.preventDefault()
+			this.fetchData()
+		},
 		fetchData(search = null) {
 			this.loading = true
 			directoryStore.refreshListingList(search)

diff --git a/src/views/metaData/MetaDataList.vue b/src/views/metaData/MetaDataList.vue
@@ -23,7 +23,7 @@ import { navigationStore, metadataStore } from '../../store/store.js'
 						</template>
 						Help
 					</NcActionButton>
-					<NcActionButton :disabled="loading" @click="fetchData">
+					<NcActionButton :disabled="loading" @click="refresh">
 						<template #icon>
 							<Refresh :size="20" />
 						</template>
@@ -146,6 +146,10 @@ export default {
 		this.fetchData()
 	},
 	methods: {
+		refresh(e) {
+			e.preventDefault()
+			this.fetchData()
+		},
 		fetchData(search = null) {
 			this.loading = true
 			metadataStore.refreshMetaDataList(search)

diff --git a/src/views/organisations/OrganisationList.vue b/src/views/organisations/OrganisationList.vue
@@ -23,7 +23,7 @@ import { navigationStore, organisationStore } from '../../store/store.js'
 						</template>
 						Help
 					</NcActionButton>
-					<NcActionButton :disabled="loading" @click="fetchData">
+					<NcActionButton :disabled="loading" @click="refresh">
 						<template #icon>
 							<Refresh :size="20" />
 						</template>
@@ -149,6 +149,10 @@ export default {
 		this.fetchData()
 	},
 	methods: {
+		refresh(e) {
+			e.preventDefault()
+			this.fetchData()
+		},
 		fetchData(search = null) {
 			this.loading = true
 			organisationStore.refreshOrganisationList(search)

diff --git a/src/views/publications/PublicationDetail.vue b/src/views/publications/PublicationDetail.vue
@@ -169,36 +169,41 @@ import { catalogiStore, metadataStore, navigationStore, publicationStore } from
 			<div class="tabContainer">
 				<BTabs content-class="mt-3" justified>
 					<BTab title="Eigenschappen" active>
-						<NcListItem v-for="(value, key, i) in publicationStore.publicationItem?.data"
-							:key="`${key}${i}`"
-							:name="key"
-							:bold="false"
-							:force-display-actions="true"
-							@click="publicationStore.setPublicationDataKey(key)
-							">
-							<template #icon>
-								<CircleOutline :class="publicationStore.publicationDataKey === key && 'selectedZaakIcon'"
-									disable-menu
-									:size="44" />
-							</template>
-							<template #subname>
-								{{ value }}
-							</template>
-							<template #actions>
-								<NcActionButton @click="editPublicationDataItem(key)">
-									<template #icon>
-										<Pencil :size="20" />
-									</template>
-									Bewerken
-								</NcActionButton>
-								<NcActionButton @click="deletePublicationDataItem(key)">
-									<template #icon>
-										<Delete :size="20" />
-									</template>
-									Verwijderen
-								</NcActionButton>
-							</template>
-						</NcListItem>
+						<div v-if="publicationStore.publicationItem?.data.length > 0">
+							<NcListItem v-for="(value, key, i) in publicationStore.publicationItem?.data"
+								:key="`${key}${i}`"
+								:name="key"
+								:bold="false"
+								:force-display-actions="true"
+								@click="publicationStore.setPublicationDataKey(key)
+								">
+								<template #icon>
+									<CircleOutline :class="publicationStore.publicationDataKey === key && 'selectedZaakIcon'"
+										disable-menu
+										:size="44" />
+								</template>
+								<template #subname>
+									{{ value }}
+								</template>
+								<template #actions>
+									<NcActionButton @click="editPublicationDataItem(key)">
+										<template #icon>
+											<Pencil :size="20" />
+										</template>
+										Bewerken
+									</NcActionButton>
+									<NcActionButton @click="deletePublicationDataItem(key)">
+										<template #icon>
+											<Delete :size="20" />
+										</template>
+										Verwijderen
+									</NcActionButton>
+								</template>
+							</NcListItem>
+						</div>
+						<div v-if="publicationStore.publicationItem?.data.length === 0" class="tabPanel">
+							Geen Eigenschappen gevonden
+						</div>
 					</BTab>
 					<BTab title="Bijlagen">
 						<div

diff --git a/src/views/publications/PublicationList.vue b/src/views/publications/PublicationList.vue
@@ -49,7 +49,7 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 						</template>
 						Help
 					</NcActionButton>
-					<NcActionButton :disabled="loading" @click="fetchData">
+					<NcActionButton :disabled="loading" @click="refresh">
 						<template #icon>
 							<Refresh :size="20" />
 						</template>
@@ -227,6 +227,10 @@ export default {
 		this.fetchData()
 	},
 	methods: {
+		refresh(e) {
+			e.preventDefault()
+			this.fetchData()
+		},
 		fetchData(search = null) {
 			this.loading = true
 			publicationStore.refreshPublicationList(search)

diff --git a/src/views/themes/ThemeList.vue b/src/views/themes/ThemeList.vue
@@ -23,7 +23,7 @@ import { navigationStore, themeStore } from '../../store/store.js'
 						</template>
 						Help
 					</NcActionButton>
-					<NcActionButton :disabled="loading" @click="fetchData">
+					<NcActionButton :disabled="loading" @click="refresh">
 						<template #icon>
 							<Refresh :size="20" />
 						</template>
@@ -149,6 +149,10 @@ export default {
 		this.fetchData()
 	},
 	methods: {
+		refresh(e) {
+			e.preventDefault()
+			this.fetchData()
+		},
 		fetchData(search = null) {
 			this.loading = true
 			themeStore.refreshThemeList(search)