From 1dbd8b0d31a9874bff2ee77d4bf194ecb3b8957a Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Wed, 7 Aug 2024 15:50:35 +0200
Subject: [PATCH 01/18] added stages

---
 .../publication/AddPublicationModal.vue       | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/modals/publication/AddPublicationModal.vue b/src/modals/publication/AddPublicationModal.vue
index 099246f6..4840b527 100644
--- a/src/modals/publication/AddPublicationModal.vue
+++ b/src/modals/publication/AddPublicationModal.vue
@@ -21,19 +21,32 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 			</div>
 			<div class="formContainer">
 				<div v-if="success === null" class="form-group">
-					<NcSelect v-bind="catalogi"
-						v-model="catalogi.value"
-						input-label="Catalogi *"
-						:loading="catalogiLoading"
-						:disabled="publicationLoading"
-						required />
-					<NcSelect v-bind="metaData"
-						v-model="metaData.value"
-						input-label="MetaData *"
-						:loading="metaDataLoading"
-						:disabled="publicationLoading"
-						required />
+					<!-- STAGE 1 -->
+					<div v-if="!catalogi?.value?.id">
+						<NcSelect v-bind="catalogi"
+							v-model="catalogi.value"
+							input-label="Catalogi *"
+							:loading="catalogiLoading"
+							:disabled="publicationLoading"
+							required />
+					</div>
+					<!-- STAGE 2 -->
+					<div v-if="catalogi?.value?.id && !metaData?.value?.id">
+						<NcButton @click="catalogi = {}">
+							Terug naar Catalogi
+						</NcButton>
+						<NcSelect v-bind="metaData"
+							v-model="metaData.value"
+							input-label="MetaData *"
+							:loading="metaDataLoading"
+							:disabled="publicationLoading"
+							required />
+					</div>
+					<!-- STAGE 3 -->
 					<div v-if="catalogi.value?.id && metaData.value?.id">
+						<NcButton @click="catalogi = {}">
+							Terug naar Catalogi
+						</NcButton>
 						<NcTextField :disabled="loading"
 							label="Titel *"
 							required

From 7f359e154c6d7788f0e57dfbd682d016bba24087 Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Wed, 7 Aug 2024 16:40:39 +0200
Subject: [PATCH 02/18] WIP there are fases for add publication

---
 src/modals/publication/AddPublicationModal.vue | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/modals/publication/AddPublicationModal.vue b/src/modals/publication/AddPublicationModal.vue
index 4840b527..0553ac89 100644
--- a/src/modals/publication/AddPublicationModal.vue
+++ b/src/modals/publication/AddPublicationModal.vue
@@ -32,7 +32,7 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					</div>
 					<!-- STAGE 2 -->
 					<div v-if="catalogi?.value?.id && !metaData?.value?.id">
-						<NcButton @click="catalogi = {}">
+						<NcButton @click="catalogi.value = null">
 							Terug naar Catalogi
 						</NcButton>
 						<NcSelect v-bind="metaData"
@@ -44,8 +44,8 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					</div>
 					<!-- STAGE 3 -->
 					<div v-if="catalogi.value?.id && metaData.value?.id">
-						<NcButton @click="catalogi = {}">
-							Terug naar Catalogi
+						<NcButton @click="metaData.value = null">
+							Terug naar Metadata
 						</NcButton>
 						<NcTextField :disabled="loading"
 							label="Titel *"
@@ -68,17 +68,11 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 							label="Portaal"
 							:value.sync="publication.portal" />
 						<span>
-							<p>Published</p>
+							<p>Publicatie datum</p>
 							<NcDateTimePicker v-model="publication.published"
 								:disabled="loading"
 								label="Publicatie datum" />
 						</span>
-						<span>
-							<p>Modified</p>
-							<NcDateTimePicker v-model="publication.modified"
-								:disabled="loading"
-								label="Modified" />
-						</span>
 						<span class="APM-horizontal">
 							<NcCheckboxRadioSwitch :disabled="loading"
 								label="Featured"
@@ -147,7 +141,6 @@ export default {
 				description: '',
 				reference: '',
 				license: '',
-				modified: new Date(),
 				featured: false,
 				portal: '',
 				category: '',
@@ -282,7 +275,6 @@ export default {
 							description: '',
 							reference: '',
 							license: '',
-							modified: new Date(),
 							featured: false,
 							portal: '',
 							category: '',

From 0b1ba41c5ef957d2096e01280fa7918b8571a9ea Mon Sep 17 00:00:00 2001
From: Thijn <Thijn@conduction.nl>
Date: Thu, 8 Aug 2024 10:13:46 +0200
Subject: [PATCH 03/18] finished publication modals

---
 .../publication/AddPublicationModal.vue       | 33 ++++++---
 .../publication/EditPublicationModal.vue      | 72 +------------------
 2 files changed, 24 insertions(+), 81 deletions(-)

diff --git a/src/modals/publication/AddPublicationModal.vue b/src/modals/publication/AddPublicationModal.vue
index 0553ac89..8bc10dd8 100644
--- a/src/modals/publication/AddPublicationModal.vue
+++ b/src/modals/publication/AddPublicationModal.vue
@@ -87,19 +87,20 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 						<NcTextField :disabled="loading"
 							label="Licentie"
 							:value.sync="publication.license" />
+
+						<NcButton :disabled="(!publication.title || !catalogi?.value?.id || !metaData?.value?.id || !publication.summary) || loading"
+							class="apm-submit-button"
+							type="primary"
+							@click="addPublication()">
+							<template #icon>
+								<NcLoadingIcon v-if="loading" :size="20" />
+								<Plus v-if="!loading" :size="20" />
+							</template>
+							Toevoegen
+						</NcButton>
 					</div>
 				</div>
 			</div>
-			<NcButton v-if="success === null"
-				:disabled="(!publication.title || !catalogi?.value?.id || !metaData?.value?.id || !publication.summary) || loading"
-				type="primary"
-				@click="addPublication()">
-				<template #icon>
-					<NcLoadingIcon v-if="loading" :size="20" />
-					<Plus v-if="!loading" :size="20" />
-				</template>
-				Toevoegen
-			</NcButton>
 		</div>
 	</NcModal>
 </template>
@@ -191,13 +192,19 @@ export default {
 			})
 				.then((response) => {
 					response.json().then((data) => {
+						const selectedCatalogus = data.results.filter((catalogus) => catalogus.id.toString() === navigationStore.selectedCatalogus.toString())[0]
 
 						this.catalogi = {
 							options: Object.entries(data.results).map((catalog) => ({
 								id: catalog[1].id,
 								label: catalog[1].title,
 							})),
-
+							value: navigationStore.selectedCatalogus
+								? {
+									id: selectedCatalogus.id,
+									label: selectedCatalogus.title,
+								}
+								: null,
 						}
 					})
 					this.catalogiLoading = false
@@ -329,4 +336,8 @@ export default {
     flex-direction: row;
     align-items: center;
 }
+
+.apm-submit-button {
+    margin-block-start: 1rem
+}
 </style>
diff --git a/src/modals/publication/EditPublicationModal.vue b/src/modals/publication/EditPublicationModal.vue
index 43a40a87..6f1674ba 100644
--- a/src/modals/publication/EditPublicationModal.vue
+++ b/src/modals/publication/EditPublicationModal.vue
@@ -41,17 +41,11 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					label="Portaal"
 					:value.sync="publicationItem.portal" />
 				<span>
-					<p>Published</p>
+					<p>Publicatie datum</p>
 					<NcDateTimePicker v-model="publicationItem.published"
 						:disabled="loading"
 						label="Publicatie datum" />
 				</span>
-				<span>
-					<p>Modified</p>
-					<NcDateTimePicker v-model="publicationItem.modified"
-						:disabled="loading"
-						label="Modified" />
-				</span>
 				<span class="EPM-horizontal">
 					<NcCheckboxRadioSwitch :disabled="loading"
 						label="Featured"
@@ -121,7 +115,6 @@ export default {
 				portal: '',
 				featured: false,
 				published: '',
-				modified: '',
 				license: '',
 				catalogi: '',
 				metaData: '',
@@ -154,9 +147,6 @@ export default {
 		if (navigationStore.modal === 'editPublication' && !this.hasUpdated) {
 			publicationStore.publicationItem && (this.publicationItem = publicationStore.publicationItem)
 			this.fetchData(publicationStore.publicationItem.id)
-			// just incase we decide we want to be able to change catalogi and metadata
-			// this.fetchCatalogi()
-			// this.fetchMetaData()
 			this.hasUpdated = true
 		}
 	},
@@ -172,6 +162,7 @@ export default {
 				.then((response) => {
 					response.json().then((data) => {
 						publicationStore.setPublicationItem(data)
+						this.publicationItem = publicationStore.publicationItem
 					})
 					this.loading = false
 				})
@@ -180,65 +171,6 @@ export default {
 					this.loading = false
 				})
 		},
-		fetchCatalogi() {
-			this.catalogiLoading = true
-			fetch('/index.php/apps/opencatalogi/api/catalogi', {
-				method: 'GET',
-			})
-				.then((response) => {
-					response.json().then((data) => {
-
-						const selectedCatalogi = data.results.find((catalogi) => catalogi.id.toString() === this.publicationItem.catalogi.toString())
-
-						this.catalogi = {
-							inputLabel: 'Catalogi',
-							options: data.results.map((catalog) => ({
-								id: catalog.id,
-								label: catalog.title,
-							})),
-							// FIXME: for some reason the NcSelect uses the id instead of the label when displaying
-							value: [{
-								id: selectedCatalogi.id ?? '',
-								label: selectedCatalogi.title ?? '',
-							}],
-						}
-					})
-					this.catalogiLoading = false
-				})
-				.catch((err) => {
-					console.error(err)
-					this.catalogiLoading = false
-				})
-		},
-		fetchMetaData() {
-			this.metaDataLoading = true
-			fetch('/index.php/apps/opencatalogi/api/metadata', {
-				method: 'GET',
-			})
-				.then((response) => {
-					response.json().then((data) => {
-						const selectedMetaData = data.results.find((metadata) => metadata.id.toString() === this.publicationItem.metaData.toString())
-
-						this.metaData = {
-							inputLabel: 'MetaData',
-							options: data.results.map((metaData) => ({
-								id: metaData.id,
-								label: metaData.title,
-							})),
-							// FIXME: for some reason the NcSelect uses the id instead of the label when displaying
-							value: {
-								id: selectedMetaData.id,
-								label: selectedMetaData.title,
-							},
-						}
-					})
-					this.metaDataLoading = false
-				})
-				.catch((err) => {
-					console.error(err)
-					this.metaDataLoading = false
-				})
-		},
 		updatePublication() {
 			this.loading = true
 			fetch(

From 12a380dfab366605e2208cca0d4e1d1358b00942 Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <ruben@conduction.nl>
Date: Thu, 8 Aug 2024 10:42:58 +0200
Subject: [PATCH 04/18] Hotfixes voor catalogi en directory detail pagina

---
 src/modals/catalog/AddCatalogModal.vue      |  4 +--
 src/modals/catalog/EditCatalogModal.vue     |  4 +--
 src/sidebars/directory/DirectorySideBar.vue | 34 ++++++++++++++++++++-
 src/views/catalogi/CatalogiDetails.vue      |  5 +--
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/modals/catalog/AddCatalogModal.vue b/src/modals/catalog/AddCatalogModal.vue
index 9294a4f5..f8afc657 100644
--- a/src/modals/catalog/AddCatalogModal.vue
+++ b/src/modals/catalog/AddCatalogModal.vue
@@ -35,9 +35,9 @@ import { catalogiStore, navigationStore } from '../../store/store.js'
 					maxlength="255"
 					:value.sync="catalogi.description" />
 				<NcCheckboxRadioSwitch :disabled="loading"
-					label="Listed"
+					label="Publiek vindbaar"
 					:checked.sync="catalogi.listed">
-					Listed
+					Publiek vindbaar
 				</NcCheckboxRadioSwitch>
 			</div>
 			<NcButton v-if="success === null"
diff --git a/src/modals/catalog/EditCatalogModal.vue b/src/modals/catalog/EditCatalogModal.vue
index cf2561f2..00d6bf68 100644
--- a/src/modals/catalog/EditCatalogModal.vue
+++ b/src/modals/catalog/EditCatalogModal.vue
@@ -35,9 +35,9 @@ import { catalogiStore, navigationStore } from '../../store/store.js'
 					maxlength="255"
 					:value.sync="catalogiStore.catalogiItem.description" />
 				<NcCheckboxRadioSwitch :disabled="loading"
-					label="Listed"
+					label="Publiek vindbaar"
 					:checked.sync="catalogiStore.catalogiItem.listed">
-					Listed
+					Publiek vindbaar
 				</NcCheckboxRadioSwitch>
 			</div>
 			<NcButton v-if="success === null"
diff --git a/src/sidebars/directory/DirectorySideBar.vue b/src/sidebars/directory/DirectorySideBar.vue
index e0e28842..e072e4c5 100644
--- a/src/sidebars/directory/DirectorySideBar.vue
+++ b/src/sidebars/directory/DirectorySideBar.vue
@@ -28,25 +28,57 @@ import { navigationStore, directoryStore } from '../../store/store.js'
 				</NcButton>
 			</template>
 		</NcEmptyContent>
+		<NcAppSidebarTab v-if="directoryStore.listingItem.id && navigationStore.selected === 'directory'"
+			id="settings-tab"
+			name="Configuratie"
+			:order="1">
+			<template #icon>
+				<CogOutline :size="20" />
+			</template>
+			<NcCheckboxRadioSwitch type="switch">
+				Beschickbaar maken voor mijn zoek opdrachten
+			</NcCheckboxRadioSwitch>
+			<NcCheckboxRadioSwitch type="switch">
+				Standaard mee nemen in de beantwoording van mijn zoekopdrachten
+			</NcCheckboxRadioSwitch>
+		</NcAppSidebarTab>
+		<NcAppSidebarTab v-if="directoryStore.listingItem.id && navigationStore.selected === 'directory'"
+			id="metdata-tab"
+			name="Metadata"
+			:order="2">
+			<template #icon>
+				<FileTreeOutline :size="20" />
+			</template>
+			Welke meta data typen zou u uit deze catalogus willen overnemen?
+			<NcCheckboxRadioSwitch type="switch">
+				Metedata type 1
+			</NcCheckboxRadioSwitch>
+		</NcAppSidebarTab>
 	</NcAppSidebar>
 </template>
 <script>
 
-import { NcAppSidebar, NcEmptyContent, NcButton } from '@nextcloud/vue'
+import { NcAppSidebar, NcEmptyContent, NcButton, NcAppSidebarTab, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import LayersOutline from 'vue-material-design-icons/LayersOutline.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
+import CogOutline from 'vue-material-design-icons/CogOutline.vue'
+import FileTreeOutline from 'vue-material-design-icons/FileTreeOutline.vue'
 
 export default {
 	name: 'DirectorySideBar',
 	components: {
 		NcAppSidebar,
+		NcAppSidebarTab,
 		NcEmptyContent,
 		NcButton,
+		NcCheckboxRadioSwitch,
 		// Icons
 		LayersOutline,
 		Plus,
 		HelpCircleOutline,
+		CogOutline,
+		FileTreeOutline,
 	},
 	data() {
 		return {
diff --git a/src/views/catalogi/CatalogiDetails.vue b/src/views/catalogi/CatalogiDetails.vue
index d7aa264e..bdc03ef6 100644
--- a/src/views/catalogi/CatalogiDetails.vue
+++ b/src/views/catalogi/CatalogiDetails.vue
@@ -52,14 +52,11 @@ import { catalogiStore, navigationStore } from '../../store/store.js'
 		<span>{{ catalogi.summary }}</span>
 		<div class="tabContainer">
 			<BTabs content-class="mt-3" justified>
-				<BTab title="Eigenschappen" active>
-					adsa
-				</BTab>
 				<BTab title="Toegang">
 					Publiek of alleen bepaalde rollen
 				</BTab>
 				<BTab title="Metadata">
-					adsa
+					Metadata list
 				</BTab>
 			</BTabs>
 		</div>

From 8be48f07fdc4519b38608bf88b46acbbfbf4dad4 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 8 Aug 2024 10:53:26 +0200
Subject: [PATCH 05/18] Fix creation call

---
 lib/Service/DirectoryService.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/Service/DirectoryService.php b/lib/Service/DirectoryService.php
index 75d994a1..dc47b754 100644
--- a/lib/Service/DirectoryService.php
+++ b/lib/Service/DirectoryService.php
@@ -6,6 +6,7 @@
 use GuzzleHttp\Client;
 use OCA\OpenCatalogi\Db\Catalog;
 use OCA\OpenCatalogi\Db\CatalogMapper;
+use OCA\OpenCatalogi\Db\Listing;
 use OCA\OpenCatalogi\Db\ListingMapper;
 use OCP\IAppConfig;
 use OCP\IURLGenerator;
@@ -52,21 +53,26 @@ public function registerToExternalDirectory (array $newDirectory = [], ?string $
 
 
 		if($this->config->getValueString($this->appName, 'mongoStorage') !== '1') {
-			$catalogi = $this->catalogMapper->findAll();
+			$catalogi = $this->listingMapper->findAll();
 		} else {
 			$dbConfig['base_uri'] = $this->config->getValueString('opencatalogi', 'mongodbLocation');
 			$dbConfig['headers']['api-key'] = $this->config->getValueString('opencatalogi', 'mongodbKey');
 			$dbConfig['mongodbCluster'] = $this->config->getValueString('opencatalogi', 'mongodbCluster');
 
-			$catalogi = $this->objectService->findObjects(filters: ['_schema' => 'catalog'], config: $dbConfig)['documents'];
+			$catalogi = $this->objectService->findObjects(filters: ['_schema' => 'directory'], config: $dbConfig)['documents'];
 		}
 
 		foreach($catalogi as $catalog) {
-			if($catalog instanceof Catalog) {
+			if($catalog instanceof Listing) {
 				$catalog = $catalog->jsonSerialize();
 			}
-			$directory = $this->getDirectoryEntry($catalog['id']);
-			$result = $this->client->post(uri: $url, options: ['json' => $directory, 'http_errors' => false]);
+			unset($catalog['_id'], $catalog['id'], $catalog['_schema']);
+
+			if($catalog['directory'] !== $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute(routeName:"opencatalogi.directory.index"))) {
+				continue;
+			}
+
+			$result = $this->client->post(uri: $url, options: ['json' => $catalog, 'http_errors' => false]);
 		}
 
 		$externalDirectories = $this->fetchFromExternalDirectory(url: $url);
@@ -107,8 +113,6 @@ private function createDirectoryFromResult(array $result): ?array
 			$this->listingMapper->createFromArray($result);
 		}
 
-		$this->registerToExternalDirectory(newDirectory: $result);
-
 		return $returnData;
 	}
 

From 92e9659d6afb4d69cbf7da2f2e476239e5b8a5f2 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 8 Aug 2024 10:54:01 +0200
Subject: [PATCH 06/18] Fixes on definitions

---
 lib/Db/Catalog.php     | 16 ++++++++++------
 lib/Db/Publication.php |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/Db/Catalog.php b/lib/Db/Catalog.php
index 14e50db8..00ee3c38 100644
--- a/lib/Db/Catalog.php
+++ b/lib/Db/Catalog.php
@@ -9,13 +9,15 @@
 class Catalog extends Entity implements JsonSerializable
 {
 
-	protected ?string $title 	   = null;
-	protected ?string $summary     = null;
-	protected ?string $description = null;
-	protected ?string $image       = null;
-	protected ?string $search	   = null;
+	protected ?string $title 	    = null;
+	protected ?string $summary      = null;
+	protected ?string $description  = null;
+	protected ?string $image        = null;
+	protected ?string $search	    = null;
 
-	protected bool    $listed      = false;
+	protected bool    $listed       = false;
+	protected ?string $organisation = null;
+	protected array   $metadata     = [];
 
 	public function __construct() {
 		$this->addType(fieldName: 'title', type: 'string');
@@ -24,6 +26,8 @@ public function __construct() {
 		$this->addType(fieldName: 'image', type: 'string');
 		$this->addType(fieldName: 'search', type: 'string');
 		$this->addType(fieldName: 'listed', type: 'boolean');
+		$this->addType(fieldName: 'organisation', type: 'string');
+		$this->addType(fieldName: 'metadata', type: 'json');
 
 	}
 
diff --git a/lib/Db/Publication.php b/lib/Db/Publication.php
index 334c1dac..fdfb177d 100644
--- a/lib/Db/Publication.php
+++ b/lib/Db/Publication.php
@@ -75,6 +75,7 @@ public function hydrate(array $object): self
 		$this->setAttachments(null);
 		$this->setOrganization(null);
 		$this->setData(null);
+		$this->setModified(new DateTime());
 
 		foreach($object as $key => $value) {
 			if (in_array($key, $jsonFields) === true && $value === []) {

From 542b5b62ddcc0e33bce7b52ac0f9b1e073f8f5b2 Mon Sep 17 00:00:00 2001
From: Thijn <Thijn@conduction.nl>
Date: Thu, 8 Aug 2024 11:00:17 +0200
Subject: [PATCH 07/18] added disabled state on loading

---
 src/modals/publication/AddPublicationModal.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modals/publication/AddPublicationModal.vue b/src/modals/publication/AddPublicationModal.vue
index 8bc10dd8..9b57bf69 100644
--- a/src/modals/publication/AddPublicationModal.vue
+++ b/src/modals/publication/AddPublicationModal.vue
@@ -32,7 +32,8 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					</div>
 					<!-- STAGE 2 -->
 					<div v-if="catalogi?.value?.id && !metaData?.value?.id">
-						<NcButton @click="catalogi.value = null">
+						<NcButton :disabled="loading"
+							@click="catalogi.value = null">
 							Terug naar Catalogi
 						</NcButton>
 						<NcSelect v-bind="metaData"
@@ -44,7 +45,8 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					</div>
 					<!-- STAGE 3 -->
 					<div v-if="catalogi.value?.id && metaData.value?.id">
-						<NcButton @click="metaData.value = null">
+						<NcButton :disabled="loading"
+							@click="metaData.value = null">
 							Terug naar Metadata
 						</NcButton>
 						<NcTextField :disabled="loading"

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 08/18] 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 09/18] 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 6d3aab5af08e154850461922d27127f6830e5da0 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 8 Aug 2024 11:35:51 +0200
Subject: [PATCH 10/18] Database fixes on catalogus and publication

---
 lib/Db/Catalog.php                           | 12 ++-
 lib/Db/Publication.php                       |  9 ++-
 lib/Migration/Version6Date20240723125106.php |  6 +-
 lib/Migration/Version6Date20240808085441.php | 77 ++++++++++++++++++++
 lib/Migration/Version6Date20240808092738.php | 63 ++++++++++++++++
 lib/Migration/Version6Date20240808093230.php | 62 ++++++++++++++++
 6 files changed, 222 insertions(+), 7 deletions(-)
 create mode 100644 lib/Migration/Version6Date20240808085441.php
 create mode 100644 lib/Migration/Version6Date20240808092738.php
 create mode 100644 lib/Migration/Version6Date20240808093230.php

diff --git a/lib/Db/Catalog.php b/lib/Db/Catalog.php
index 00ee3c38..05958101 100644
--- a/lib/Db/Catalog.php
+++ b/lib/Db/Catalog.php
@@ -17,7 +17,7 @@ class Catalog extends Entity implements JsonSerializable
 
 	protected bool    $listed       = false;
 	protected ?string $organisation = null;
-	protected array   $metadata     = [];
+	protected ?array   $metadata    = null;
 
 	public function __construct() {
 		$this->addType(fieldName: 'title', type: 'string');
@@ -42,11 +42,17 @@ public function getJsonFields(): array
 
 	public function hydrate(array $object): self
 	{
+
+
+		if(isset($object['metadata']) === false) {
+			$object['metadata'] = [];
+		}
+
 		$jsonFields = $this->getJsonFields();
 
 		foreach($object as $key => $value) {
 			if (in_array($key, $jsonFields) === true && $value === []) {
-				$value = null;
+				$value = [];
 			}
 
 			$method = 'set'.ucfirst($key);
@@ -71,6 +77,8 @@ public function jsonSerialize(): array
 			'image' => $this->image,
 			'search' => $this->search,
 			'listed' => $this->listed,
+			'metadata' => $this->metadata,
+			'organisation'=> $this->organisation,
 
 		];
 
diff --git a/lib/Db/Publication.php b/lib/Db/Publication.php
index fdfb177d..9ea2a93b 100644
--- a/lib/Db/Publication.php
+++ b/lib/Db/Publication.php
@@ -77,6 +77,11 @@ public function hydrate(array $object): self
 		$this->setData(null);
 		$this->setModified(new DateTime());
 
+
+		if(isset($object['published']) === false) {
+			$object['published'] = null;
+		}
+
 		foreach($object as $key => $value) {
 			if (in_array($key, $jsonFields) === true && $value === []) {
 				$value = [];
@@ -114,8 +119,8 @@ public function jsonSerialize(): array
 			'portal' => $this->portal,
 			'catalogi' => $this->catalogi,
 			'metaData' => $this->metaData,
-			'published' => $this->published->format('c'),
-			'modified'	=> $this->modified->format('c'),
+			'published' => $this->published?->format('c'),
+			'modified'	=> $this->modified?->format('c'),
 			'featured' => $this->featured !== null ? (bool) $this->featured : null,
 			'organization' => $this->organization,
 			'data' => $this->data,
diff --git a/lib/Migration/Version6Date20240723125106.php b/lib/Migration/Version6Date20240723125106.php
index 4e18cd45..d12ccc8d 100644
--- a/lib/Migration/Version6Date20240723125106.php
+++ b/lib/Migration/Version6Date20240723125106.php
@@ -81,15 +81,15 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			]
 			);
 			$table->addColumn(name: 'organization', typeName: TYPES::JSON, options: [
-				'default' => [],
+				'default' => 'a:0:{}',
 				'notnull' => false,
 			]);
 			$table->addColumn(name: 'data', typeName: TYPES::JSON, options: [
-				'default' => [],
+				'default' => 'a:0:{}',
 				'notnull' => false,
 			]);
 			$table->addColumn(name: 'attachments', typeName: TYPES::JSON, options: [
-				'default' => [],
+				'default' => 'a:0:{}',
 				'notnull' => false,
 			]);
 			$table->addColumn(name: 'attachment_count', typeName: TYPES::INTEGER);
diff --git a/lib/Migration/Version6Date20240808085441.php b/lib/Migration/Version6Date20240808085441.php
new file mode 100644
index 00000000..28e43b3a
--- /dev/null
+++ b/lib/Migration/Version6Date20240808085441.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\OpenCatalogi\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * FIXME Auto-generated migration step: Please modify to your needs!
+ */
+class Version6Date20240808085441 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/**
+		 * @var ISchemaWrapper $schema
+		 */
+		$schema = $schemaClosure();
+
+		if($schema->hasTable(tableName: 'catalogi') === true) {
+			$table = $schema->getTable(tableName: 'catalogi');
+
+			if($table->hasColumn(name: 'organization') === false) {
+				$table->addColumn(
+					name: 'organization',
+					typeName: Types::STRING,
+					options: [
+						'notNull' => false,
+						'default' => null
+					]);
+			}
+			if($table->hasColumn(name: 'metadata') === false) {
+				$table->addColumn(
+					name: 'metadata',
+					typeName: Types::JSON,
+					options: [
+						'notNull' => false,
+						'default' => 'a:0:{}'
+					]);
+			}
+
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+}
diff --git a/lib/Migration/Version6Date20240808092738.php b/lib/Migration/Version6Date20240808092738.php
new file mode 100644
index 00000000..e5babbe7
--- /dev/null
+++ b/lib/Migration/Version6Date20240808092738.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\OpenCatalogi\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * FIXME Auto-generated migration step: Please modify to your needs!
+ */
+class Version6Date20240808092738 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/**
+		 * @var ISchemaWrapper $schema
+		 */
+		$schema = $schemaClosure();
+
+		if($schema->hasTable(tableName: 'publications') === true) {
+			$table = $schema->getTable(tableName: 'publications');
+
+			if($table->hasColumn(name: 'published') === true) {
+				$column = $table->getColumn(name: 'published');
+				$column->setDefault(default: null);
+			}
+
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+}
diff --git a/lib/Migration/Version6Date20240808093230.php b/lib/Migration/Version6Date20240808093230.php
new file mode 100644
index 00000000..81e9d2bc
--- /dev/null
+++ b/lib/Migration/Version6Date20240808093230.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\OpenCatalogi\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * FIXME Auto-generated migration step: Please modify to your needs!
+ */
+class Version6Date20240808093230 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/**
+		 * @var ISchemaWrapper $schema
+		 */
+		$schema = $schemaClosure();
+
+		if($schema->hasTable(tableName: 'publications') === true) {
+			$table = $schema->getTable(tableName: 'publications');
+
+			if($table->hasColumn(name: 'published') === true) {
+				$column = $table->getColumn(name: 'published');
+				$column->setNotnull(notnull: false);
+			}
+
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+}

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 11/18] 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

From f94e3f471d7ea5236f3fe3a25f5ea941f3ebadad Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 8 Aug 2024 13:56:26 +0200
Subject: [PATCH 12/18] Fix organization vs organisation error

---
 lib/Migration/Version6Date20240808115347.php | 71 ++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 lib/Migration/Version6Date20240808115347.php

diff --git a/lib/Migration/Version6Date20240808115347.php b/lib/Migration/Version6Date20240808115347.php
new file mode 100644
index 00000000..4e60dccb
--- /dev/null
+++ b/lib/Migration/Version6Date20240808115347.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\OpenCatalogi\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * FIXME Auto-generated migration step: Please modify to your needs!
+ */
+class Version6Date20240808115347 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/**
+		 * @var ISchemaWrapper $schema
+		 */
+		$schema = $schemaClosure();
+
+		if($schema->hasTable(tableName: 'catalogi') === true) {
+			$table = $schema->getTable(tableName: 'catalogi');
+
+			if($table->hasColumn(name: 'organization') === true) {
+				$column = $table->dropColumn('organization');
+			}
+			if($table->hasColumn(name: 'organisation') === false) {
+				$table->addColumn(
+					name: 'organisation',
+					typeName: Types::STRING,
+					options: [
+						'notNull' => false,
+						'default' => null
+					]);
+			}
+
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+}

From ec37e04fc0b920a19072edd9bc08480882bbab34 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 8 Aug 2024 15:17:45 +0200
Subject: [PATCH 13/18] Enable pagination parameters

---
 lib/Controller/SearchController.php  | 20 +++++++++++++++++---
 lib/Service/ElasticSearchService.php |  8 ++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/SearchController.php b/lib/Controller/SearchController.php
index 48f3c4bd..7e4fcb90 100644
--- a/lib/Controller/SearchController.php
+++ b/lib/Controller/SearchController.php
@@ -95,14 +95,28 @@ public function index(SearchService $searchService): JSONResponse
 
         $fieldsToSearch = ['title', 'description', 'summary'];
 
-		if($this->config->hasKey($this->appName, 'mongoStorage') === false
-			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
+		if($this->config->hasKey($this->appName, 'elasticLocation') === false
+			|| $this->config->getValueString($this->appName, 'elasticLocation') === ''
 		) {
 			$searchParams = $searchService->createMySQLSearchParams(filters: $filters);
 			$searchConditions = $searchService->createMySQLSearchConditions(filters: $filters, fieldsToSearch:  $fieldsToSearch);
+
+			$limit = null;
+			$offset = null;
+
+			if(isset($filters['_limit']) === true) {
+				$limit = $filters['_limit'];
+			}
+
+			if(isset($filters['_page']) === true) {
+				$offset = ($limit * ($filters['_page'] - 1));
+			}
+
 			$filters = $searchService->unsetSpecialQueryParams(filters: $filters);
 
-			return new JSONResponse(['results' => $this->publicationMapper->findAll(limit: null, offset: null, filters: $filters, searchConditions: $searchConditions, searchParams: $searchParams)]);
+
+
+			return new JSONResponse(['results' => $this->publicationMapper->findAll(limit: $limit, offset: $offset, filters: $filters, searchConditions: $searchConditions, searchParams: $searchParams)]);
 		}
 
 		//@TODO: find a better way to get query params. This fixes it for now.
diff --git a/lib/Service/ElasticSearchService.php b/lib/Service/ElasticSearchService.php
index 73bf354c..80354b57 100644
--- a/lib/Service/ElasticSearchService.php
+++ b/lib/Service/ElasticSearchService.php
@@ -124,6 +124,14 @@ public function parseFilters (array $filters): array
 			];
 		}
 
+		if(isset($filters['.limit']) === true) {
+			unset($filters['.limit']);
+		}
+
+		if(isset($filters['.page']) === true) {
+			unset($filters['.page']);
+		}
+
 		unset($filters['.search'], $filters['.queries'], $filters['.catalogi']);
 
 		foreach ($filters as $name => $filter) {

From 0da686468572e3c133420e1417b9a8f59daaece5 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 8 Aug 2024 15:24:52 +0200
Subject: [PATCH 14/18] Add pagination

---
 lib/Service/ElasticSearchService.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Service/ElasticSearchService.php b/lib/Service/ElasticSearchService.php
index 80354b57..e6b93f10 100644
--- a/lib/Service/ElasticSearchService.php
+++ b/lib/Service/ElasticSearchService.php
@@ -125,10 +125,14 @@ public function parseFilters (array $filters): array
 		}
 
 		if(isset($filters['.limit']) === true) {
+			$body['size'] = $filters['.limit'];
 			unset($filters['.limit']);
 		}
 
 		if(isset($filters['.page']) === true) {
+			if(isset($body['size']) === true) {
+				$body['from'] = $body['size'] * ($filters['.page'] - 1);
+			}
 			unset($filters['.page']);
 		}
 

From eca663c95788f6e2970890e48376a22d5c446fd8 Mon Sep 17 00:00:00 2001
From: Barry Brands <barrybrands02@hotmail.com>
Date: Thu, 8 Aug 2024 15:33:38 +0200
Subject: [PATCH 15/18] Small link fix

---
 src/views/publications/PublicationList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/publications/PublicationList.vue b/src/views/publications/PublicationList.vue
index 87470256..1475d78f 100644
--- a/src/views/publications/PublicationList.vue
+++ b/src/views/publications/PublicationList.vue
@@ -43,7 +43,7 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					<NcActionCaption name="Acties" />
 					<NcActionButton
 						title="Bekijk de documentatie over publicaties"
-						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/publicaties')">
+						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/publicaties'), '_blank'">
 						<template #icon>
 							<HelpCircleOutline :size="20" />
 						</template>

From 3960aeace90c61c768bc39bc29183bcb961a183c Mon Sep 17 00:00:00 2001
From: Barry Brands <barrybrands02@hotmail.com>
Date: Thu, 8 Aug 2024 15:54:39 +0200
Subject: [PATCH 16/18] Fix

---
 src/views/publications/PublicationList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/publications/PublicationList.vue b/src/views/publications/PublicationList.vue
index 1475d78f..a330e553 100644
--- a/src/views/publications/PublicationList.vue
+++ b/src/views/publications/PublicationList.vue
@@ -43,7 +43,7 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					<NcActionCaption name="Acties" />
 					<NcActionButton
 						title="Bekijk de documentatie over publicaties"
-						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/publicaties'), '_blank'">
+						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/publicaties', '_blank')">
 						<template #icon>
 							<HelpCircleOutline :size="20" />
 						</template>

From 41ffb4df5c4396ccfc16aba25a9d3f3dec090b86 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 8 Aug 2024 16:18:21 +0200
Subject: [PATCH 17/18] Mock pagination info

---
 lib/Service/SearchService.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php
index a24ee48c..3feb75f8 100644
--- a/lib/Service/SearchService.php
+++ b/lib/Service/SearchService.php
@@ -143,7 +143,15 @@ public function search(array $parameters, array $elasticConfig, array $dbConfig,
 			}
 		}
 
-		return ['results' => $results, 'facets' => $aggregations];
+		return [
+			'results' => $results,
+			'facets' => $aggregations,
+			'count' => count($results),
+			'limit' => 30,
+			'page' => 1,
+			'pages' => 1,
+			'total' => 10
+			];
 	}
 
 	/**

From da30031e666d7f89c2928cc4ad287890adb0cdd9 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 8 Aug 2024 17:02:35 +0200
Subject: [PATCH 18/18] Add complex filters

---
 lib/Service/ElasticSearchService.php | 41 ++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/lib/Service/ElasticSearchService.php b/lib/Service/ElasticSearchService.php
index e6b93f10..fd02b699 100644
--- a/lib/Service/ElasticSearchService.php
+++ b/lib/Service/ElasticSearchService.php
@@ -91,6 +91,42 @@ public function updateObject(string $id, array $object, array $config): array
 		}
 	}
 
+	public function parseFilter(string $name, array $filter): array
+	{
+
+		if(is_array($filter) === false) {
+			return ['match' => [$name => $filter]];
+		}
+
+		foreach($filter as $key => $value) {
+			switch($key) {
+				case 'regexp':
+				case 'like':
+					if(preg_match("/^\/.+\/[a-z]*$/i", $value) !== false) {
+						return ['regexp' => [$name => strtolower($value)]];
+					} else {
+						return ['match' => [$name => $value]];
+					}
+				case '>=':
+				case 'after':
+					return ['range' => [$key => ['gte' => $value]]];
+				case '>':
+				case 'strictly_after':
+					return ['range' => [$key => ['gt' => $value]]];
+				case '<=':
+				case 'before':
+					return ['range' => [$key => ['lte' => $value]]];
+				case '<':
+				case 'strictly_before':
+					return ['range' => [$key => ['lt' => $value]]];
+				default:
+					return ['match' => [$name => $value]];
+			}
+		}
+
+		return ['match' => [$name => $filter]];
+	}
+
 	public function parseFilters (array $filters): array
 	{
 		$body = [
@@ -125,7 +161,7 @@ public function parseFilters (array $filters): array
 		}
 
 		if(isset($filters['.limit']) === true) {
-			$body['size'] = $filters['.limit'];
+			$body['size'] = (int) $filters['.limit'];
 			unset($filters['.limit']);
 		}
 
@@ -139,7 +175,8 @@ public function parseFilters (array $filters): array
 		unset($filters['.search'], $filters['.queries'], $filters['.catalogi']);
 
 		foreach ($filters as $name => $filter) {
-			$body['query']['bool']['must'][] = ['match' => [$name => $filter]];
+
+			$body['query']['bool']['must'][] = $this->parseFilter($name, $filter);
 		}
 
 		return $body;