From b6f60d56996dbe19a852d4eca395f79d78b906b8 Mon Sep 17 00:00:00 2001
From: Remko <remko@conduction.nl>
Date: Thu, 8 Aug 2024 11:17:36 +0200
Subject: [PATCH 1/3] fixed refresh bug

---
 src/views/Views.vue                          | 2 +-
 src/views/catalogi/CatalogiList.vue          | 6 +++++-
 src/views/directory/DirectoryList.vue        | 6 +++++-
 src/views/metaData/MetaDataList.vue          | 6 +++++-
 src/views/organisations/OrganisationList.vue | 6 +++++-
 src/views/publications/PublicationList.vue   | 6 +++++-
 src/views/themes/ThemeList.vue               | 6 +++++-
 7 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/views/Views.vue b/src/views/Views.vue
index 2a720c4f..c91a95af 100644
--- a/src/views/Views.vue
+++ b/src/views/Views.vue
@@ -10,7 +10,7 @@ import { navigationStore, searchStore } from '../store/store.js'
 			<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
index 41cf4074..49031a33 100644
--- 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
index 8716f0eb..79ed239c 100644
--- 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>
@@ -143,6 +143,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
index a435cb49..ad9e6bb2 100644
--- 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
index f4e457cc..fc5af760 100644
--- 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/PublicationList.vue b/src/views/publications/PublicationList.vue
index 9394a73a..87470256 100644
--- 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
index 07903d57..c49c0a8f 100644
--- 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)

From 0c4bae25290334cc5a290b0403c42808305ea65a Mon Sep 17 00:00:00 2001
From: Remko <remko@conduction.nl>
Date: Thu, 8 Aug 2024 11:27:35 +0200
Subject: [PATCH 2/3] Fixed lint errors

---
 src/views/directory/DirectoryList.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/directory/DirectoryList.vue b/src/views/directory/DirectoryList.vue
index 79ed239c..017aad2b 100644
--- a/src/views/directory/DirectoryList.vue
+++ b/src/views/directory/DirectoryList.vue
@@ -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 = ''
@@ -144,7 +140,7 @@ export default {
 	},
 	methods: {
 		refresh(e) {
-		e.preventDefault()
+			e.preventDefault()
 			this.fetchData()
 		},
 		fetchData(search = null) {

From a09616eee36097e1e5efd0329fe59d4fb73fd916 Mon Sep 17 00:00:00 2001
From: Remko <remko@conduction.nl>
Date: Thu, 8 Aug 2024 11:59:47 +0200
Subject: [PATCH 3/3] Added Eigenschappen text and fixed catalogi bug

---
 src/views/Views.vue                          |  1 -
 src/views/publications/PublicationDetail.vue | 65 +++++++++++---------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/views/Views.vue b/src/views/Views.vue
index c91a95af..4816be36 100644
--- a/src/views/Views.vue
+++ b/src/views/Views.vue
@@ -9,7 +9,6 @@ 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'" :search="searchStore.search" />
 			<Directory v-if="navigationStore.selected === 'directory'" />
 			<Publications v-if="navigationStore.selected === 'publication'" />
diff --git a/src/views/publications/PublicationDetail.vue b/src/views/publications/PublicationDetail.vue
index 541fc598..28eb56e3 100644
--- 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