From c227a8e115963701ef90f7e32cb879eea3426e6d Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 28 Nov 2024 16:23:15 +0100
Subject: [PATCH 01/11] Reinstate template folder

---
 lib/Templates/publication.html.twig | 163 ++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 lib/Templates/publication.html.twig

diff --git a/lib/Templates/publication.html.twig b/lib/Templates/publication.html.twig
new file mode 100644
index 00000000..cd43ad73
--- /dev/null
+++ b/lib/Templates/publication.html.twig
@@ -0,0 +1,163 @@
+<h1>Publicatie {{ publication.title }}</h1>
+
+<style>
+	th, td {
+		border-style: none;
+		padding-right: 5px;
+		padding-bottom: 3px;
+	}
+</style>
+
+{% if publication.catalogi|default %}
+	<h3>Catalogi</h3>
+	<table>
+		<tr>
+			<td>Titel: </td>
+			<td>{{ publication.catalogi.title }}</td>
+		</tr>
+		{% if publication.catalogi.summary|default %}
+			<tr>
+				<td>Samenvatting: </td>
+				<td>{{ publication.catalogi.summary }}</td>
+			</tr>
+		{% endif %}
+		{% if publication.catalogi.description|default %}
+			<tr>
+				<td>Beschrijving: </td>
+				<td>{{ publication.catalogi.description }}</td>
+			</tr>
+		{% endif %}
+		{#	{% if publication.catalogi.organisation|default %}#}
+		{#		<tr>#}
+		{#			<td>Organisatie: </td>#}
+		{#			<td>{{ publication.catalogi.organisation }}</td>#}
+		{#		</tr>#}
+		{#	{% endif %}#}
+	</table>
+{% endif %}
+
+{% if publication.metaData|default %}
+	<h3>Publicatie Type</h3>
+	<table>
+		<tr>
+			<td>Titel: </td>
+			<td>{{ publication.metaData.title }}</td>
+		</tr>
+		{% if publication.metaData.version|default %}
+			<tr>
+				<td>Versie: </td>
+				<td>{{ publication.metaData.version }}</td>
+			</tr>
+		{% endif %}
+		{% if publication.metaData.description|default %}
+			<tr>
+				<td>Beschrijving: </td>
+				<td>{{ publication.metaData.description }}</td>
+			</tr>
+		{% endif %}
+		{#	{% if publication.metaData.required|default %}#}
+		{#		<tr>#}
+		{#			<td>Vereisten: </td>#}
+		{#			<td>{{ publication.metaData.required }}</td>#}
+		{#		</tr>#}
+		{#	{% endif %}#}
+	</table>
+{% endif %}
+
+<hr>
+
+<table>
+	{% if publication.reference|default %}
+		<tr>
+			<td>Referentie: </td>
+			<td>{{ publication.reference }}</td>
+		</tr>
+	{% endif %}
+	{% if publication.summary|default %}
+		<tr>
+			<td>Samenvatting: </td>
+			<td>{{ publication.summary }}</td>
+		</tr>
+	{% endif %}
+	{% if publication.description|default %}
+		<tr>
+			<td>Beschrijving: </td>
+			<td>{{ publication.description }}</td>
+		</tr>
+	{% endif %}
+	{% if publication.category|default %}
+		<tr>
+			<td>Categorie: </td>
+			<td>{{ publication.category }}</td>
+		</tr>
+	{% endif %}
+	{% if publication.portal|default %}
+		<tr>
+			<td>Portal: </td>
+			<td>{{ publication.portal }}</td>
+		</tr>
+	{% endif %}
+	{% if publication.image|default %}
+		<tr>
+			<td>Foto: </td>
+			<td>{{ publication.image }}</td>
+		</tr>
+	{% endif %}
+	{#	{% if publication.themes|default %}#}
+	{#		<tr>#}
+	{#			<td>Thema's: </td>#}
+	{#			<td>{{ publication.themes }}</td>#}
+	{#		</tr>#}
+	{#	{% endif %}#}
+	{% if publication.featured is defined %}
+		<tr>
+			<td>Uitgelicht: </td>
+			<td>{% if publication.featured == true %}Ja{% else %}Nee{% endif %}</td>
+		</tr>
+	{% endif %}
+	{% if publication.license|default %}
+		<tr>
+			<td>Licentie: </td>
+			<td>{{ publication.license }}</td>
+		</tr>
+	{% endif %}
+	{% if publication.status|default %}
+		<tr>
+			<td>Status: </td>
+			<td>{{ publication.status }}</td>
+		</tr>
+	{% endif %}
+	{% if publication.published|default %}
+		<tr>
+			<td>Gepubliceerd: </td>
+			<td>{{ publication.published | date("d-m-Y H:i") }}</td>
+		</tr>
+	{% endif %}
+	{% if publication.modified|default %}
+		<tr>
+			<td>Gewijzigd: </td>
+			<td>{{ publication.modified | date("d-m-Y H:i") }}</td>
+		</tr>
+	{% endif %}
+</table>
+
+{% if publication.data|default %}
+	<style>
+		table.tb { border-collapse: collapse; width:300px; }
+		.tb th, .tb td { padding: 5px; border: solid 1px #777; }
+		.tb th { background-color: lightblue;}
+	</style>
+	<h4>Eigenschappen</h4>
+	<table class="tb" title="Publicatie Data">
+		<tr>
+			<th>Naam</th>
+			<th>Data</th>
+		</tr>
+		{% for key, value in publication.data %}
+			<tr>
+				<td>{{ key }}</td>
+				<td>{{ value }}</td>
+			</tr>
+		{% endfor %}
+	</table>
+{% endif %}

From 1cbd90a6bef882f6aacdcc85986346f568492c16 Mon Sep 17 00:00:00 2001
From: Remko <remko@conduction.nl>
Date: Tue, 3 Dec 2024 15:56:05 +0100
Subject: [PATCH 02/11] Added code editor to PublicationDataModal

---
 css/main.css                                  |  44 ++++
 package-lock.json                             | 243 ++++++++++++++++++
 package.json                                  |   3 +
 .../AddPublicationDataModal.vue               |  34 ++-
 .../EditPublicationDataModal.vue              |  34 ++-
 5 files changed, 344 insertions(+), 14 deletions(-)

diff --git a/css/main.css b/css/main.css
index 1e75f17d..a3db6830 100644
--- a/css/main.css
+++ b/css/main.css
@@ -168,3 +168,47 @@
   margin-left: 16px;
   color: inherit;
 }
+
+/* CodeMirror */
+.codeMirrorContainer {
+  margin-block-start: 6px;
+  text-align: left;
+}
+
+.prettifyButton {
+  margin-block-start: 10px;
+}
+
+.codeMirrorContainer * .cm-content {
+  border-radius: 0 !important;
+  border: none !important;
+}
+.codeMirrorContainer * .cm-editor {
+  outline: none !important;
+}
+.codeMirrorContainer.light > .vue-codemirror {
+  border: 1px dotted silver;
+}
+.codeMirrorContainer.dark > .vue-codemirror {
+  border: 1px dotted grey;
+}
+
+/* value text color */
+.codeMirrorContainer.light * .cm-content *::selection {
+  color: inherit !important;
+  background-color: #add6ff80 !important;
+}
+.codeMirrorContainer.dark * .cm-content *::selection {
+  color: inherit !important;
+  background-color: #add6ff26 !important;
+}
+
+/* value text color */
+.codeMirrorContainer.dark :deep(.ͼ2 .cm-activeLine) {
+  background-color: #add6ff26;
+}
+
+/* text cursor */
+.codeMirrorContainer :deep(.cm-content) * {
+  cursor: text !important;
+}
diff --git a/package-lock.json b/package-lock.json
index 13151b64..3842f7fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "1.0.0",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
+        "@codemirror/lang-json": "^6.0.1",
         "@fortawesome/fontawesome-svg-core": "^6.6.0",
         "@fortawesome/free-solid-svg-icons": "^6.6.0",
         "@nextcloud/axios": "^2.5.0",
@@ -17,6 +18,7 @@
         "@nextcloud/l10n": "^3.1.0",
         "@nextcloud/router": "^3.0.1",
         "@nextcloud/vue": "^8.17.0",
+        "@uiw/codemirror-theme-vscode": "^4.23.6",
         "@vueuse/core": "^11.0.1",
         "apexcharts": "^3.52.0",
         "axios": "^1.7.4",
@@ -32,6 +34,7 @@
         "validator": "^13.12.0",
         "vue": "^2.7.14",
         "vue-apexcharts": "^1.6.2",
+        "vue-codemirror6": "^1.3.8",
         "vue-loader": "^15.11.1 <16.0.0",
         "vue-loading-overlay": "^3.4.3",
         "vue-material-design-icons": "^5.3.0",
@@ -1942,6 +1945,99 @@
         "url": "https://opencollective.com/node-fetch"
       }
     },
+    "node_modules/@codemirror/autocomplete": {
+      "version": "6.18.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.3.tgz",
+      "integrity": "sha512-1dNIOmiM0z4BIBwxmxEfA1yoxh1MF/6KPBbh20a5vphGV0ictKlgQsbJs6D6SkR6iJpGbpwRsa6PFMNlg9T9pQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0"
+      },
+      "peerDependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/commands": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.7.1.tgz",
+      "integrity": "sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.4.0",
+        "@codemirror/view": "^6.27.0",
+        "@lezer/common": "^1.1.0"
+      }
+    },
+    "node_modules/@codemirror/lang-json": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
+      "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@lezer/json": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/language": {
+      "version": "6.10.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.6.tgz",
+      "integrity": "sha512-KrsbdCnxEztLVbB5PycWXFxas4EOyk/fPAfruSOnDDppevQgid2XZ+KbJ9u+fDikP/e7MW7HPBTvTb8JlZK9vA==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.23.0",
+        "@lezer/common": "^1.1.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "node_modules/@codemirror/lint": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.4.tgz",
+      "integrity": "sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.35.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/search": {
+      "version": "6.5.8",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.8.tgz",
+      "integrity": "sha512-PoWtZvo7c1XFeZWmmyaOp2G0XVbOnm+fJzvghqGAktBW3cufwJUWvSCcNG0ppXiBEM05mZu6RhMtXPv2hpllig==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/state": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
+      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==",
+      "license": "MIT"
+    },
+    "node_modules/@codemirror/view": {
+      "version": "6.35.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.0.tgz",
+      "integrity": "sha512-I0tYy63q5XkaWsJ8QRv5h6ves7kvtrBWjBcnf/bzohFJQc5c14a1AQRdE8QpPF9eMp5Mq2FMm59TCj1gDfE7kw==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.4.0",
+        "style-mod": "^4.1.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
     "node_modules/@csstools/css-parser-algorithms": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.1.tgz",
@@ -3295,6 +3391,41 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/@lezer/common": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
+      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+      "license": "MIT"
+    },
+    "node_modules/@lezer/highlight": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
+      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/json": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.2.tgz",
+      "integrity": "sha512-xHT2P4S5eeCYECyKNPhr4cbEL9tc8w83SPwRC373o9uEdrvGKTZoJVAGxpOsZckMlEh9W23Pc72ew918RWQOBQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.2.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/lr": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
+      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
     "node_modules/@linusborg/vue-simple-portal": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/@linusborg/vue-simple-portal/-/vue-simple-portal-0.1.5.tgz",
@@ -5186,6 +5317,37 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@uiw/codemirror-theme-vscode": {
+      "version": "4.23.6",
+      "resolved": "https://registry.npmjs.org/@uiw/codemirror-theme-vscode/-/codemirror-theme-vscode-4.23.6.tgz",
+      "integrity": "sha512-xUo1ic+Kk5hnv5gy+cXU12GZVSnDjic8s8weKq8loPHF1dSR1e6gkKVIKZRnvoOZ302taKRk7phWpBUaWIuKQg==",
+      "license": "MIT",
+      "dependencies": {
+        "@uiw/codemirror-themes": "4.23.6"
+      },
+      "funding": {
+        "url": "https://jaywcjlove.github.io/#/sponsor"
+      }
+    },
+    "node_modules/@uiw/codemirror-themes": {
+      "version": "4.23.6",
+      "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.23.6.tgz",
+      "integrity": "sha512-0dpuLQW+V6zrKvfvor/eo71V3tpr2L2Hsu8QZAdtSzksjWABxTOzH3ShaBRxCEsrz6sU9sa9o7ShwBMMDz59bQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0"
+      },
+      "funding": {
+        "url": "https://jaywcjlove.github.io/#/sponsor"
+      },
+      "peerDependencies": {
+        "@codemirror/language": ">=6.0.0",
+        "@codemirror/state": ">=6.0.0",
+        "@codemirror/view": ">=6.0.0"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -7634,6 +7796,21 @@
         "node": ">= 0.12.0"
       }
     },
+    "node_modules/codemirror": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
+      "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/commands": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/search": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0"
+      }
+    },
     "node_modules/collapse-white-space": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-2.1.0.tgz",
@@ -8169,6 +8346,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "license": "MIT"
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -20729,6 +20912,12 @@
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/style-mod": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
+      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "license": "MIT"
+    },
     "node_modules/style-search": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
@@ -22884,6 +23073,54 @@
         "apexcharts": "^3.26.0"
       }
     },
+    "node_modules/vue-codemirror6": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/vue-codemirror6/-/vue-codemirror6-1.3.8.tgz",
+      "integrity": "sha512-pCOzKzBBSFKi/SjUg+XGranV1vt+8S22z56BES/OeZtmyuj2M0CE0aczYS8qbTWNnKcuJcI5FRDHzVXy2v2Htg==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/commands": "^6.7.1",
+        "@codemirror/language": "^6.10.3",
+        "@codemirror/lint": "^6.8.3",
+        "@codemirror/state": "^6.4.1",
+        "@codemirror/view": "^6.35.0",
+        "codemirror": "^6.0.1",
+        "style-mod": "^4.1.2",
+        "vue-demi": "latest"
+      },
+      "engines": {
+        "pnpm": ">=9.14.2"
+      },
+      "peerDependencies": {
+        "vue": "^2.7.14 || ^3.4"
+      }
+    },
+    "node_modules/vue-codemirror6/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/vue-color": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz",
@@ -23137,6 +23374,12 @@
         "vue": "^2.5.0"
       }
     },
+    "node_modules/w3c-keyname": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+      "license": "MIT"
+    },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
diff --git a/package.json b/package.json
index fdccad01..f7809035 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "extends @nextcloud/browserslist-config"
   ],
   "dependencies": {
+    "@codemirror/lang-json": "^6.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@nextcloud/axios": "^2.5.0",
@@ -28,6 +29,7 @@
     "@nextcloud/l10n": "^3.1.0",
     "@nextcloud/router": "^3.0.1",
     "@nextcloud/vue": "^8.17.0",
+    "@uiw/codemirror-theme-vscode": "^4.23.6",
     "@vueuse/core": "^11.0.1",
     "apexcharts": "^3.52.0",
     "axios": "^1.7.4",
@@ -43,6 +45,7 @@
     "validator": "^13.12.0",
     "vue": "^2.7.14",
     "vue-apexcharts": "^1.6.2",
+    "vue-codemirror6": "^1.3.8",
     "vue-loader": "^15.11.1 <16.0.0",
     "vue-loading-overlay": "^3.4.3",
     "vue-material-design-icons": "^5.3.0",
diff --git a/src/modals/publicationData/AddPublicationDataModal.vue b/src/modals/publicationData/AddPublicationDataModal.vue
index 8074c1b9..33cf8f28 100644
--- a/src/modals/publicationData/AddPublicationDataModal.vue
+++ b/src/modals/publicationData/AddPublicationDataModal.vue
@@ -1,5 +1,7 @@
 <script setup>
 import { navigationStore, publicationStore } from '../../store/store.js'
+import { getTheme } from '../../services/getTheme.js'
+
 </script>
 <template>
 	<NcModal v-if="navigationStore.modal === 'addPublicationData'"
@@ -136,13 +138,20 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 						:loading="loading" />
 
 					<!-- TYPE : OBJECT -->
-					<NcTextArea v-else-if="getSelectedPublicationTypeProperty.type === 'object'"
-						:value.sync="value"
-						label="Object"
-						:error="!verifyInput.success"
-						:helper-text="!verifyInput.success ? verifyInput.helperText : ''"
-						:disabled="loading"
-						:loading="loading" />
+					<div v-else-if="getSelectedPublicationTypeProperty.type === 'object'" :class="`codeMirrorContainer ${getTheme()}`">
+						<CodeMirror
+							v-model="value"
+							:basic="true"
+							:dark="getTheme() === 'dark'"
+							:linter="jsonParseLinter()"
+							:lang="json()" />
+						<NcButton class="prettifyButton" @click="prettifyJson">
+							<template #icon>
+								<AutoFix :size="20" />
+							</template>
+							Prettify
+						</NcButton>
+					</div>
 
 					<!-- TYPE : ARRAY -->
 					<NcTextArea v-else-if="getSelectedPublicationTypeProperty.type === 'array'"
@@ -208,8 +217,12 @@ import {
 import { verifyInput as _verifyInput } from './verifyInput.js'
 import { setDefaultValue as _setDefaultValue } from './setDefaultValue.js'
 
+import CodeMirror from 'vue-codemirror6'
+import { json, jsonParseLinter } from '@codemirror/lang-json'
+
 // icons
 import Plus from 'vue-material-design-icons/Plus.vue'
+import AutoFix from 'vue-material-design-icons/AutoFix.vue'
 
 import { Publication } from '../../entities/index.js'
 
@@ -226,6 +239,7 @@ export default {
 		NcButton,
 		NcNoteCard,
 		NcLoadingIcon,
+		CodeMirror,
 	},
 	data() {
 		return {
@@ -349,6 +363,12 @@ export default {
 					this.error = err
 				})
 		},
+		prettifyJson() {
+			console.log('value', this.value)
+			console.log('parsed', JSON.parse(this.value))
+			console.log('stringify', JSON.stringify(JSON.parse(this.value), null, 2))
+			this.value = JSON.stringify(JSON.parse(this.value), null, 2)
+		},
 		fetchPublicationType(publicationTypeUrl, loading) {
 
 			if (loading) { this.publicationTypeLoading = true }
diff --git a/src/modals/publicationData/EditPublicationDataModal.vue b/src/modals/publicationData/EditPublicationDataModal.vue
index 66f0c7c8..bfb71468 100644
--- a/src/modals/publicationData/EditPublicationDataModal.vue
+++ b/src/modals/publicationData/EditPublicationDataModal.vue
@@ -1,5 +1,7 @@
 <script setup>
 import { navigationStore, publicationStore } from '../../store/store.js'
+import { getTheme } from '../../services/getTheme.js'
+
 </script>
 <template>
 	<NcModal v-if="navigationStore.modal === 'editPublicationData'"
@@ -134,13 +136,20 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 						:loading="loading" />
 
 					<!-- TYPE : OBJECT -->
-					<NcTextArea v-else-if="getActivePublicationTypeProperty.type === 'object'"
-						:value.sync="publication.data[publicationStore.publicationDataKey]"
-						label="Object"
-						:error="!verifyInput.success"
-						:helper-text="!verifyInput.success ? verifyInput.helperText : ''"
-						:disabled="loading"
-						:loading="loading" />
+					<div v-else-if="getActivePublicationTypeProperty.type === 'object'" :class="`codeMirrorContainer ${getTheme()}`">
+						<CodeMirror
+							v-model="publication.data[publicationStore.publicationDataKey]"
+							:basic="true"
+							:dark="getTheme() === 'dark'"
+							:linter="jsonParseLinter()"
+							:lang="json()" />
+						<NcButton class="prettifyButton" @click="prettifyJson">
+							<template #icon>
+								<AutoFix :size="20" />
+							</template>
+							Prettify
+						</NcButton>
+					</div>
 
 					<!-- TYPE : ARRAY -->
 					<NcTextArea v-else-if="getActivePublicationTypeProperty.type === 'array'"
@@ -212,11 +221,16 @@ import {
 	NcCheckboxRadioSwitch,
 	NcLoadingIcon,
 	NcNoteCard,
+	NcTextArea,
 } from '@nextcloud/vue'
 import { verifyInput as _verifyInput } from './verifyInput.js'
 import { setDefaultValue as _setDefaultValue } from './setDefaultValue.js'
 
+import CodeMirror from 'vue-codemirror6'
+import { json, jsonParseLinter } from '@codemirror/lang-json'
+
 import ContentSaveOutline from 'vue-material-design-icons/ContentSaveOutline.vue'
+import AutoFix from 'vue-material-design-icons/AutoFix.vue'
 
 export default {
 	name: 'EditPublicationDataModal',
@@ -226,8 +240,11 @@ export default {
 		NcButton,
 		NcLoadingIcon,
 		NcNoteCard,
+		NcTextArea,
+		CodeMirror,
 		// icons
 		ContentSaveOutline,
+		AutoFix,
 	},
 	data() {
 		return {
@@ -374,6 +391,9 @@ export default {
 					this.publicationTypeLoading = false
 				})
 		},
+		prettifyJson() {
+			this.publication.data[publicationStore.publicationDataKey] = JSON.stringify(JSON.parse(this.publication.data[publicationStore.publicationDataKey]), null, 2)
+		},
 		updatePublication(id) {
 			this.loading = true
 

From 3b54f417f3d94ea46a4900a2b0a12e3e274702da Mon Sep 17 00:00:00 2001
From: Remko <remko@conduction.nl>
Date: Thu, 5 Dec 2024 10:00:53 +0100
Subject: [PATCH 03/11] Updated page

---
 src/entities/page/page.ts                     |  2 +-
 src/modals/page/AddPageModal.vue              | 61 +++++++++----------
 src/modals/page/EditPageModal.vue             | 59 +++++++++---------
 .../AddPublicationDataModal.vue               |  1 +
 .../EditPublicationDataModal.vue              |  1 +
 src/views/AdminSettings.vue                   |  2 +-
 src/views/pages/PageDetail.vue                | 28 ++++++---
 7 files changed, 83 insertions(+), 71 deletions(-)

diff --git a/src/entities/page/page.ts b/src/entities/page/page.ts
index 1a510c98..a58e1d78 100644
--- a/src/entities/page/page.ts
+++ b/src/entities/page/page.ts
@@ -41,7 +41,7 @@ export class Page implements TPage {
 	/* istanbul ignore next */
 	/**
 	 * Validates the page data against a schema
-	 * @returns SafeParseReturnType containing validation result
+	 * @return SafeParseReturnType containing validation result
 	 */
 	public validate(): SafeParseReturnType<TPage, unknown> {
 		// Schema validation for page data
diff --git a/src/modals/page/AddPageModal.vue b/src/modals/page/AddPageModal.vue
index 8f50fd34..3b7b2fc8 100644
--- a/src/modals/page/AddPageModal.vue
+++ b/src/modals/page/AddPageModal.vue
@@ -1,6 +1,8 @@
 <script setup>
 import { navigationStore, pageStore } from '../../store/store.js'
+import { getTheme } from '../../services/getTheme.js'
 </script>
+
 <template>
 	<NcModal
 		v-if="navigationStore.modal === 'pageAdd'"
@@ -34,13 +36,24 @@ import { navigationStore, pageStore } from '../../store/store.js'
 						:value.sync="page.slug"
 						:error="!!inputValidation.fieldErrors?.['slug']"
 						:helper-text="inputValidation.fieldErrors?.['slug']?.[0]" />
-					<NcTextArea
-						:disabled="loading"
-						label="Inhoud"
-						placeholder="{ &quot;key&quot;: &quot;value&quot; }"
-						:value.sync="page.contents"
-						:error="!verifyJsonValidity(page.contents)"
-						:helper-text="!verifyJsonValidity(page.contents) ? 'This is not valid JSON (optional)' : ''" />
+
+					<div :class="`codeMirrorContainer ${getTheme()}`">
+						<CodeMirror
+							v-model="page.contents"
+							:basic="true"
+							placeholder="{ &quot;key&quot;: &quot;value&quot; }"
+							:dark="getTheme() === 'dark'"
+							:tab="true"
+							:gutter="true"
+							:linter="jsonParseLinter()"
+							:lang="json()" />
+						<NcButton class="prettifyButton" :disabled="!page.contents || !verifyJsonValidity(page.contents)" @click="prettifyJson">
+							<template #icon>
+								<AutoFix :size="20" />
+							</template>
+							Prettify
+						</NcButton>
+					</div>
 				</div>
 			</div>
 			<NcButton v-if="success === null"
@@ -64,10 +77,13 @@ import {
 	NcLoadingIcon,
 	NcModal,
 	NcNoteCard,
-	NcTextArea,
 	NcTextField,
 } from '@nextcloud/vue'
+import CodeMirror from 'vue-codemirror6'
+import { json, jsonParseLinter } from '@codemirror/lang-json'
+
 import Plus from 'vue-material-design-icons/Plus.vue'
+import AutoFix from 'vue-material-design-icons/AutoFix.vue'
 
 import { Page } from '../../entities/index.js'
 
@@ -76,12 +92,13 @@ export default {
 	components: {
 		NcModal,
 		NcTextField,
-		NcTextArea,
 		NcButton,
 		NcLoadingIcon,
 		NcNoteCard,
+		CodeMirror,
 		// Icons
 		Plus,
+		AutoFix,
 	},
 	data() {
 		return {
@@ -90,9 +107,6 @@ export default {
 				slug: '',
 				contents: '',
 			},
-
-			errorCode: '',
-			pageLoading: false,
 			hasUpdated: false,
 			loading: false,
 			success: null,
@@ -128,12 +142,16 @@ export default {
 			}
 			return true
 		},
+		prettifyJson() {
+			this.page.contents = JSON.stringify(JSON.parse(this.page.contents), null, 2)
+		},
 		addPage() {
 			this.loading = true
 			this.error = false
 
 			const pageItem = new Page({
 				...this.page,
+				contents: JSON.stringify(JSON.parse(this.page.contents), null, 2),
 			})
 
 			pageStore.addPage(pageItem)
@@ -183,26 +201,7 @@ export default {
   margin-block-end: 10px;
 }
 
-.selectGrid {
-  display: grid;
-  grid-gap: 5px;
-  grid-template-columns: 1fr 1fr;
-}
-
-.zaakDetailsContainer {
-  margin-block-start: var(--OC-margin-20);
-  margin-inline-start: var(--OC-margin-20);
-  margin-inline-end: var(--OC-margin-20);
-}
-
 .success {
   color: green;
 }
-
-.APM-horizontal {
-  display: flex;
-  gap: 4px;
-  flex-direction: row;
-  align-items: center;
-}
 </style>
diff --git a/src/modals/page/EditPageModal.vue b/src/modals/page/EditPageModal.vue
index d5cc5a6b..c1d45ce3 100644
--- a/src/modals/page/EditPageModal.vue
+++ b/src/modals/page/EditPageModal.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { navigationStore, pageStore } from '../../store/store.js'
+import { getTheme } from '../../services/getTheme.js'
 </script>
 <template>
 	<NcModal
@@ -34,13 +35,22 @@ import { navigationStore, pageStore } from '../../store/store.js'
 						:value.sync="pageItem.slug"
 						:error="!!inputValidation.fieldErrors?.['slug']"
 						:helper-text="inputValidation.fieldErrors?.['slug']?.[0]" />
-					<NcTextArea
-						:disabled="loading"
-						label="Inhoud"
-						placeholder="{ &quot;key&quot;: &quot;value&quot; }"
-						:value.sync="pageItem.contents"
-						:error="!verifyJsonValidity(pageItem.contents)"
-						:helper-text="!verifyJsonValidity(pageItem.contents) ? 'This is not valid JSON (optional)' : ''" />
+					<div :class="`codeMirrorContainer ${getTheme()}`">
+						<CodeMirror
+							v-model="pageItem.contents"
+							:basic="true"
+							placeholder="{ &quot;key&quot;: &quot;value&quot; }"
+							:dark="getTheme() === 'dark'"
+							:gutter="true"
+							:linter="jsonParseLinter()"
+							:lang="json()" />
+						<NcButton class="prettifyButton" :disabled="!pageItem.contents || !verifyJsonValidity(pageItem.contents)" @click="prettifyJson">
+							<template #icon>
+								<AutoFix :size="20" />
+							</template>
+							Prettify
+						</NcButton>
+					</div>
 				</div>
 			</div>
 			<NcButton v-if="success === null"
@@ -64,10 +74,13 @@ import {
 	NcLoadingIcon,
 	NcModal,
 	NcNoteCard,
-	NcTextArea,
 	NcTextField,
 } from '@nextcloud/vue'
+import CodeMirror from 'vue-codemirror6'
+import { json, jsonParseLinter } from '@codemirror/lang-json'
+
 import ContentSaveOutline from 'vue-material-design-icons/ContentSaveOutline.vue'
+import AutoFix from 'vue-material-design-icons/AutoFix.vue'
 
 import { Page } from '../../entities/index.js'
 
@@ -76,12 +89,13 @@ export default {
 	components: {
 		NcModal,
 		NcTextField,
-		NcTextArea,
 		NcButton,
 		NcLoadingIcon,
 		NcNoteCard,
+		CodeMirror,
 		// Icons
 		ContentSaveOutline,
+		AutoFix,
 	},
 	data() {
 		return {
@@ -132,16 +146,19 @@ export default {
 			if (pageStore.pageItem?.id) {
 				this.pageItem = {
 					...pageStore.pageItem,
-					contents: pageStore.pageItem.contents || '{}'
+					contents: JSON.stringify(JSON.parse(pageStore.pageItem.contents), null, 2) || '',
 				}
 			}
 		},
+		prettifyJson() {
+			this.pageItem.contents = JSON.stringify(JSON.parse(this.pageItem.contents), null, 2)
+		},
 		editPage() {
 			this.loading = true
 			this.error = false
-
 			const pageItem = new Page({
 				...this.pageItem,
+				contents: JSON.stringify(JSON.parse(this.pageItem.contents), null, 2),
 			})
 
 			pageStore.editPage(pageItem)
@@ -184,27 +201,7 @@ export default {
 .formContainer > * {
   margin-block-end: 10px;
 }
-
-.selectGrid {
-  display: grid;
-  grid-gap: 5px;
-  grid-template-columns: 1fr 1fr;
-}
-
-.zaakDetailsContainer {
-  margin-block-start: var(--OC-margin-20);
-  margin-inline-start: var(--OC-margin-20);
-  margin-inline-end: var(--OC-margin-20);
-}
-
 .success {
   color: green;
 }
-
-.APM-horizontal {
-  display: flex;
-  gap: 4px;
-  flex-direction: row;
-  align-items: center;
-}
 </style>
diff --git a/src/modals/publicationData/AddPublicationDataModal.vue b/src/modals/publicationData/AddPublicationDataModal.vue
index 33cf8f28..9d87b9f8 100644
--- a/src/modals/publicationData/AddPublicationDataModal.vue
+++ b/src/modals/publicationData/AddPublicationDataModal.vue
@@ -143,6 +143,7 @@ import { getTheme } from '../../services/getTheme.js'
 							v-model="value"
 							:basic="true"
 							:dark="getTheme() === 'dark'"
+							:tab="true"
 							:linter="jsonParseLinter()"
 							:lang="json()" />
 						<NcButton class="prettifyButton" @click="prettifyJson">
diff --git a/src/modals/publicationData/EditPublicationDataModal.vue b/src/modals/publicationData/EditPublicationDataModal.vue
index bfb71468..78447d88 100644
--- a/src/modals/publicationData/EditPublicationDataModal.vue
+++ b/src/modals/publicationData/EditPublicationDataModal.vue
@@ -141,6 +141,7 @@ import { getTheme } from '../../services/getTheme.js'
 							v-model="publication.data[publicationStore.publicationDataKey]"
 							:basic="true"
 							:dark="getTheme() === 'dark'"
+							:tab="true"
 							:linter="jsonParseLinter()"
 							:lang="json()" />
 						<NcButton class="prettifyButton" @click="prettifyJson">
diff --git a/src/views/AdminSettings.vue b/src/views/AdminSettings.vue
index fd731879..8aad2e58 100644
--- a/src/views/AdminSettings.vue
+++ b/src/views/AdminSettings.vue
@@ -19,7 +19,7 @@
 					</NcButton>
 				</div>
 
-				<div v-if="!openRegisterInstalled && (settingsData.publication_source === 'openregister' || settingsData.publicationtype_source === 'openregister' || settingsData.catalog_source === 'openregister' || settingsData.listing_source === 'openregister' || settingsData.attachment_source === 'openregister' || settingsData.organization_source === 'openregister' || settingsData.theme_source === 'openregister')">
+				<div v-if="!openRegisterInstalled && (settingsData.publication_source === 'openregister' || settingsData.publicationtype_source === 'openregister' || settingsData.catalog_source === 'openregister' || settingsData.listing_source === 'openregister' || settingsData.attachment_source === 'openregister' || settingsData.organization_source === 'openregister' || settingsData.theme_source === 'openregister' || settingsData.page_source === 'openregister')">
 					<NcNoteCard type="warning">
 						Het lijkt erop dat je een open register hebt geselecteerd maar dat deze nog niet geïnstalleerd is. Dit kan problemen geven. Wil je de instelling resetten?
 					</NcNoteCard>
diff --git a/src/views/pages/PageDetail.vue b/src/views/pages/PageDetail.vue
index a6d07cab..2debbbd3 100644
--- a/src/views/pages/PageDetail.vue
+++ b/src/views/pages/PageDetail.vue
@@ -1,5 +1,7 @@
 <script setup>
 import { navigationStore, pageStore } from '../../store/store.js'
+import { getTheme } from '../../services/getTheme.js'
+
 </script>
 
 <template>
@@ -70,9 +72,14 @@ import { navigationStore, pageStore } from '../../store/store.js'
 		<div class="tabContainer">
 			<BTabs content-class="mt-3" justified>
 				<BTab title="Data" active>
-					<pre class="json-display"><!-- do not remove this comment
-						-->{{ JSON.stringify(page.contents, null, 2) }}
-					</pre>
+					<div :class="`codeMirrorContainer ${getTheme()}`">
+						<CodeMirror
+							v-model="page.contents"
+							:basic="true"
+							:dark="getTheme() === 'dark'"
+							:readonly="true"
+							:lang="json()" />
+					</div>
 				</BTab>
 			</BTabs>
 		</div>
@@ -83,6 +90,8 @@ import { navigationStore, pageStore } from '../../store/store.js'
 // Components
 import { NcActionButton, NcActions, NcLoadingIcon } from '@nextcloud/vue'
 import { BTabs, BTab } from 'bootstrap-vue'
+import CodeMirror from 'vue-codemirror6'
+import { json } from '@codemirror/lang-json'
 
 // Icons
 import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
@@ -90,7 +99,6 @@ import Delete from 'vue-material-design-icons/Delete.vue'
 import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
 import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
 import Pencil from 'vue-material-design-icons/Pencil.vue'
-import Web from 'vue-material-design-icons/Web.vue'
 
 /**
  * Component for displaying and managing page details
@@ -102,6 +110,7 @@ export default {
 		NcLoadingIcon,
 		NcActionButton,
 		NcActions,
+		CodeMirror,
 		// Bootstrap
 		BTabs,
 		BTab,
@@ -111,7 +120,6 @@ export default {
 		Delete,
 		ContentCopy,
 		HelpCircleOutline,
-		Web,
 	},
 	props: {
 		pageItem: {
@@ -141,7 +149,10 @@ export default {
 		},
 	},
 	mounted() {
-		this.page = pageStore.pageItem
+		this.page = {
+			...pageStore.pageItem,
+			contents: JSON.stringify(JSON.parse(pageStore.pageItem.contents), null, 2),
+		}
 		pageStore.pageItem && this.fetchData(pageStore.pageItem.id)
 	},
 	methods: {
@@ -151,7 +162,10 @@ export default {
 			})
 				.then((response) => {
 					response.json().then((data) => {
-						this.page = data
+						this.page = {
+							...data,
+							contents: JSON.stringify(JSON.parse(data.contents), null, 2),
+						}
 					})
 				})
 				.catch((err) => {

From 26088cf46eedc0badf9d87c05b0827ec471cf588 Mon Sep 17 00:00:00 2001
From: Remko <remko@conduction.nl>
Date: Thu, 5 Dec 2024 13:48:02 +0100
Subject: [PATCH 04/11] cleanup

---
 src/modals/publicationData/AddPublicationDataModal.vue | 3 ---
 src/views/AdminSettings.vue                            | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/modals/publicationData/AddPublicationDataModal.vue b/src/modals/publicationData/AddPublicationDataModal.vue
index 9d87b9f8..89a7dbf2 100644
--- a/src/modals/publicationData/AddPublicationDataModal.vue
+++ b/src/modals/publicationData/AddPublicationDataModal.vue
@@ -365,9 +365,6 @@ export default {
 				})
 		},
 		prettifyJson() {
-			console.log('value', this.value)
-			console.log('parsed', JSON.parse(this.value))
-			console.log('stringify', JSON.stringify(JSON.parse(this.value), null, 2))
 			this.value = JSON.stringify(JSON.parse(this.value), null, 2)
 		},
 		fetchPublicationType(publicationTypeUrl, loading) {
diff --git a/src/views/AdminSettings.vue b/src/views/AdminSettings.vue
index 8aad2e58..67d5c8dd 100644
--- a/src/views/AdminSettings.vue
+++ b/src/views/AdminSettings.vue
@@ -13,7 +13,7 @@
 						@click="openLink('/index.php/settings/apps/organization/openregister', '_blank')">
 						<template #icon>
 							<NcLoadingIcon v-if="loading || saving" :size="20" />
-							<Restart v-if="!loading && !savinpage.availableSchemasg" :size="20" />
+							<Restart v-if="!loading && !saving" :size="20" />
 						</template>
 						Installeer Open Registers
 					</NcButton>

From 8d88d0afc0b557a7ce0d792bf4e43976e6084c84 Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <rubenvdlinde@gmail.com>
Date: Sun, 8 Dec 2024 22:49:52 +0100
Subject: [PATCH 05/11] Add uri to objects

---
 lib/Controller/AttachmentsController.php      |  13 ++
 lib/Controller/CatalogiController.php         |  13 ++
 lib/Controller/OrganizationsController.php    |  14 +-
 lib/Controller/PublicationTypesController.php |  13 +-
 lib/Controller/PublicationsController.php     |  12 ++
 lib/Controller/ThemesController.php           |  16 +-
 lib/Db/Attachment.php                         |   3 +
 lib/Db/AttachmentMapper.php                   |  13 +-
 lib/Db/Catalog.php                            |   3 +
 lib/Db/CatalogMapper.php                      |  11 +-
 lib/Db/Organization.php                       |   3 +
 lib/Db/OrganizationMapper.php                 |  10 ++
 lib/Db/Publication.php                        |   3 +
 lib/Db/PublicationMapper.php                  |  11 +-
 lib/Db/PublicationType.php                    |   3 +
 lib/Db/PublicationTypeMapper.php              |  12 +-
 lib/Db/Theme.php                              |   3 +
 lib/Db/ThemeMapper.php                        |  13 +-
 lib/Migration/Version6Date20241208222530.php  | 139 ++++++++++++++++++
 19 files changed, 299 insertions(+), 9 deletions(-)
 create mode 100644 lib/Migration/Version6Date20241208222530.php

diff --git a/lib/Controller/AttachmentsController.php b/lib/Controller/AttachmentsController.php
index d692f5ff..4e37bfe6 100644
--- a/lib/Controller/AttachmentsController.php
+++ b/lib/Controller/AttachmentsController.php
@@ -16,6 +16,7 @@
 use OCP\IAppConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
+use OCP\IURLGenerator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\Uid\Uuid;
@@ -129,6 +130,12 @@ public function create(ObjectService $objectService): JSONResponse
         // Save the new attachment object.
         $object = $this->objectService->saveObject('attachment', $data);
 
+        // If we do not have an uri, we need to generate one
+        if (isset($object['uri']) === false) {
+            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.attachments.show', ['id' => $object['id']]);
+            $object = $this->objectService->saveObject('attachment', $object);
+        }
+
         // Return the created object as a JSON response.
         return new JSONResponse($object);
     }
@@ -152,6 +159,12 @@ public function update(string|int $id, ObjectService $objectService): JSONRespon
 
         // Ensure the ID in the data matches the ID in the URL
         $data['id'] = $id;
+        
+        // If we do not have an uri, we need to generate one
+        if (isset($data['uri']) === false) {
+            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.attachments.show', ['id' => $data['id']]);
+            $data = $this->objectService->saveObject('attachment', $data);
+        }
 
         // Save the updated attachment object
         $object = $this->objectService->saveObject('attachment', $data);
diff --git a/lib/Controller/CatalogiController.php b/lib/Controller/CatalogiController.php
index 002e7fea..55724cb0 100644
--- a/lib/Controller/CatalogiController.php
+++ b/lib/Controller/CatalogiController.php
@@ -13,6 +13,7 @@
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IAppConfig;
 use OCP\IRequest;
+use OCP\IURLGenerator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -114,6 +115,12 @@ public function create(ObjectService $objectService): JSONResponse
         // Save the new catalog object
         $object = $this->objectService->saveObject('catalog', $data);
 
+        // If we do not have an uri, we need to generate one
+        if (isset($object['uri']) === false) {
+            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.catalogs.show', ['id' => $object['id']]);
+            $object = $this->objectService->saveObject('catalog', $object);
+        }
+
 		// Update all external directories
 		$this->broadcastService->broadcast();
 
@@ -142,6 +149,12 @@ public function update(string|int $id, ObjectService $objectService): JSONRespon
         // Ensure the ID in the data matches the ID in the URL
         $data['id'] = $id;
 
+        // If we do not have an uri, we need to generate one
+        if (isset($data['uri']) === false) {
+            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.catalogs.show', ['id' => $data['id']]);
+            $data = $this->objectService->saveObject('catalog', $data);
+        }
+
         // Save the updated catalog object
         $object = $this->objectService->saveObject('catalog', $data);
 
diff --git a/lib/Controller/OrganizationsController.php b/lib/Controller/OrganizationsController.php
index e4865f42..1ad1141d 100644
--- a/lib/Controller/OrganizationsController.php
+++ b/lib/Controller/OrganizationsController.php
@@ -10,7 +10,7 @@
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IAppConfig;
 use OCP\IRequest;
-
+use OCP\IURLGenerator;
 /**
  * Class OrganizationsController
  *
@@ -109,6 +109,12 @@ public function create(): JSONResponse
         // Save the new organization object
         $object = $this->objectService->saveObject('organization', $data);
 
+        // If we do not have an uri, we need to generate one
+        if (isset($object['uri']) === false) {
+            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.organizations.show', ['id' => $object['id']]);
+            $object = $this->objectService->saveObject('organization', $object);
+        }
+
         // Return the created object as a JSON response
         return new JSONResponse($object);
     }
@@ -130,6 +136,12 @@ public function update(string|int $id): JSONResponse
         // Ensure the ID in the data matches the ID in the URL
         $data['id'] = $id;
 
+        // If we do not have an uri, we need to generate one
+        if (isset($data['uri']) === false) {
+            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.organizations.show', ['id' => $data['id']]);
+            $data = $this->objectService->saveObject('organization', $data);
+        }
+
         // Save the updated organization object
         $object = $this->objectService->saveObject('organization', $data);
 
diff --git a/lib/Controller/PublicationTypesController.php b/lib/Controller/PublicationTypesController.php
index eba92db1..de4444e0 100644
--- a/lib/Controller/PublicationTypesController.php
+++ b/lib/Controller/PublicationTypesController.php
@@ -11,7 +11,7 @@
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IAppConfig;
 use OCP\IRequest;
-
+use OCP\IURLGenerator;
 /**
  * Class PublicationTypesController
  *
@@ -118,6 +118,12 @@ public function create(): JSONResponse
         // Save the new publication type object
         $object = $this->objectService->saveObject('publicationType', $data);
 
+        // If we do not have an uri, we need to generate one
+        if (isset($object['uri']) === false) {
+            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publicationTypes.show', ['id' => $object['id']]);
+            $object = $this->objectService->saveObject('publicationType', $object);
+        }
+
 		// Update all external directories
 		$this->broadcastService->broadcast();
 
@@ -142,6 +148,11 @@ public function update(string|int $id): JSONResponse
         // Ensure the ID in the data matches the ID in the URL
         $data['id'] = $id;
 
+        // If we do not have an uri, we need to generate one
+        if (isset($data['uri']) === false) {
+            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publicationTypes.show', ['id' => $data['id']]);
+        }
+
         // Save the updated publication type object
         $object = $this->objectService->saveObject('publicationType', $data);
 
diff --git a/lib/Controller/PublicationsController.php b/lib/Controller/PublicationsController.php
index 47a1c8de..84555ff1 100644
--- a/lib/Controller/PublicationsController.php
+++ b/lib/Controller/PublicationsController.php
@@ -24,6 +24,7 @@
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\IAppConfig;
 use OCP\IRequest;
+use OCP\IURLGenerator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\Uid\Uuid;
@@ -197,6 +198,12 @@ public function create(ObjectService $objectService): JSONResponse
         // Save the new publication object
         $object = $this->objectService->saveObject('publication', $data);
 
+        // If we do not have an uri, we need to generate one
+        if (isset($object['uri']) === false) {
+            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publications.show', ['id' => $object['id']]);
+            $object = $this->objectService->saveObject('publication', $object);
+        }
+
         // Return the created object as a JSON response
         return new JSONResponse($object);
     }
@@ -221,6 +228,11 @@ public function update(string|int $id, ObjectService $objectService): JSONRespon
         // Ensure the ID in the data matches the ID in the URL
         $data['id'] = $id;
 
+        // If we do not have an uri, we need to generate one
+        if (isset($object['uri']) === false) {
+            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publications.show', ['id' => $object['id']]);
+        }
+
         // Save the updated publication object
         $object = $this->objectService->saveObject('publication', $data);
 
diff --git a/lib/Controller/ThemesController.php b/lib/Controller/ThemesController.php
index 341d5292..b9b2fb66 100644
--- a/lib/Controller/ThemesController.php
+++ b/lib/Controller/ThemesController.php
@@ -11,7 +11,7 @@
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IAppConfig;
 use OCP\IRequest;
-
+use OCP\IURLGenerator;
 /**
  * Class ThemesController
  *
@@ -97,6 +97,12 @@ public function create(): JSONResponse
         // Save the new theme object
         $object = $this->objectService->saveObject('theme', $data);
 
+        // If we do not have an uri, we need to generate one
+        if (isset($object['uri']) === false) {
+            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $object['id']]);
+            $object = $this->objectService->saveObject('theme', $object);
+        }
+
         // Return the created object as a JSON response
         return new JSONResponse($object);
     }
@@ -116,7 +122,13 @@ public function update(string|int $id): JSONResponse
         $data = $this->request->getParams();
 
         // Ensure the ID in the data matches the ID in the URL
-        $data['id'] = $id;
+        $data['id'] = $id;  
+
+        // If we do not have an uri, we need to generate one
+        if (isset($data['uri']) === false) {
+            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $data['id']]);
+            $data = $this->objectService->saveObject('theme', $data);
+        }
 
         // Save the updated theme object
         $object = $this->objectService->saveObject('theme', $data);
diff --git a/lib/Db/Attachment.php b/lib/Db/Attachment.php
index dd55e64a..5aa72062 100644
--- a/lib/Db/Attachment.php
+++ b/lib/Db/Attachment.php
@@ -9,6 +9,7 @@
 class Attachment extends Entity implements JsonSerializable
 {
 	protected ?string $uuid = null;
+	protected ?string $uri = null;
 	protected ?string $version = '0.0.1';
 	protected ?string $reference = null;
 	protected ?string $title = null;
@@ -32,6 +33,7 @@ class Attachment extends Entity implements JsonSerializable
 
 	public function __construct() {
 		$this->addType(fieldName: 'uuid', type: 'string');
+		$this->addType(fieldName: 'uri', type: 'string');
 		$this->addType(fieldName: 'version', type: 'string');
 		$this->addType(fieldName: 'reference', type: 'string');
 		$this->addType(fieldName: 'title', type: 'string');
@@ -96,6 +98,7 @@ public function jsonSerialize(): array
 		$array = [
 			'id' => $this->id,
 			'uuid' => $this->uuid,
+			'uri' => $this->uri,
 			'version' => $this->version,
 			'reference' => $this->reference,
 			'title' => $this->title,
diff --git a/lib/Db/AttachmentMapper.php b/lib/Db/AttachmentMapper.php
index f5eec661..c24bb802 100644
--- a/lib/Db/AttachmentMapper.php
+++ b/lib/Db/AttachmentMapper.php
@@ -9,6 +9,7 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\IURLGenerator;
 use Symfony\Component\Uid\Uuid;
 
 /**
@@ -25,8 +26,9 @@ class AttachmentMapper extends QBMapper
 	 * Constructor for AttachmentMapper
 	 *
 	 * @param IDBConnection $db The database connection
+	 * @param IURLGenerator $urlGenerator The URL generator
 	 */
-	public function __construct(IDBConnection $db)
+	public function __construct(IDBConnection $db, IURLGenerator $urlGenerator)
 	{
 		parent::__construct($db, tableName: 'ocat_attachments');
 	}
@@ -105,6 +107,8 @@ public function findAll(int $limit = null, int $offset = null, array $filters =
 	public function createFromArray(array $object): Attachment
 	{
 		$attachment = new Attachment();
+
+		// Hydrate the attachment with the new data
 		$attachment->hydrate(object: $object);
 
 		// Set uuid if not provided
@@ -112,6 +116,9 @@ public function createFromArray(array $object): Attachment
 			$attachment->setUuid(Uuid::v4());
 		}
 
+		// Set the uri
+		$attachment->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.attachments.show', ['id' => $attachment->getUuid()])));
+
 		return $this->insert(entity: $attachment);
 	}
 
@@ -135,8 +142,12 @@ public function updateFromArray(int $id, array $object, bool $updateVersion = tr
 			return $this->createFromArray($object);
 		}
 
+		// Hydrate the attachment with the new data
 		$attachment->hydrate($object);
 
+		// Set the uri
+		$attachment->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.attachments.show', ['id' => $attachment->getUuid()])));
+
 		if ($updateVersion === true) {
 			// Update the version
 			$version = explode('.', $attachment->getVersion());
diff --git a/lib/Db/Catalog.php b/lib/Db/Catalog.php
index bc24ca9d..20aed8db 100644
--- a/lib/Db/Catalog.php
+++ b/lib/Db/Catalog.php
@@ -9,6 +9,7 @@
 class Catalog extends Entity implements JsonSerializable
 {
 	protected ?string $uuid = null;
+	protected ?string $uri = null;
 	protected ?string $version = '0.0.1';
 	protected ?string $title = null;
 	protected ?string $summary = null;
@@ -23,6 +24,7 @@ class Catalog extends Entity implements JsonSerializable
 
 	public function __construct() {
 		$this->addType(fieldName: 'uuid', type: 'string');
+		$this->addType(fieldName: 'uri', type: 'string');
 		$this->addType(fieldName: 'version', type: 'string');
 		$this->addType(fieldName: 'title', type: 'string');
 		$this->addType(fieldName: 'summary', type: 'string');
@@ -78,6 +80,7 @@ public function jsonSerialize(): array
 	{
 		$array = [
 			'id' => $this->id,
+			'uri' => $this->uri,
 			'uuid' => $this->uuid,
 			'version' => $this->version,
 			'title' => $this->title,
diff --git a/lib/Db/CatalogMapper.php b/lib/Db/CatalogMapper.php
index 825597de..9670e9d9 100644
--- a/lib/Db/CatalogMapper.php
+++ b/lib/Db/CatalogMapper.php
@@ -7,6 +7,7 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\IURLGenerator;
 use Symfony\Component\Uid\Uuid;
 
 /**
@@ -23,8 +24,9 @@ class CatalogMapper extends QBMapper
 	 * Constructor for CatalogMapper
 	 *
 	 * @param IDBConnection $db The database connection
+	 * @param IURLGenerator $urlGenerator The URL generator
 	 */
-	public function __construct(IDBConnection $db)
+	public function __construct(IDBConnection $db, IURLGenerator $urlGenerator)
 	{
 		parent::__construct($db, tableName: 'ocat_catalogi');
 	}
@@ -128,6 +130,9 @@ public function createFromArray(array $object): Catalog
 			$catalog->setUuid(Uuid::v4());
 		}
 
+		// Set the uri
+		$catalog->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.catalogs.show', ['id' => $catalog->getUuid()])));
+
 		return $this->insert(entity: $catalog);
 	}
 
@@ -149,8 +154,12 @@ public function updateFromArray(int $id, array $object, bool $updateVersion = tr
 			return $this->createFromArray($object);
 		}
 
+		// Hydrate the catalog with the new data
 		$catalog->hydrate($object);
 
+		// Set the uri
+		$catalog->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.catalogs.show', ['id' => $catalog->getUuid()])));
+
 		if ($updateVersion === true) {
 			// Update the version
 			$version = explode('.', $catalog->getVersion());
diff --git a/lib/Db/Organization.php b/lib/Db/Organization.php
index 8d227c7a..9e46735e 100644
--- a/lib/Db/Organization.php
+++ b/lib/Db/Organization.php
@@ -9,6 +9,7 @@
 class Organization extends Entity implements JsonSerializable
 {
 	protected ?string $uuid = null;
+	protected ?string $uri = null;
 	protected ?string $version = '0.0.1';
 	protected ?string $title = null;
 	protected ?string $summary = null;
@@ -24,6 +25,7 @@ class Organization extends Entity implements JsonSerializable
 
 	public function __construct() {
 		$this->addType(fieldName: 'uuid', type: 'string');
+		$this->addType(fieldName: 'uri', type: 'string');
 		$this->addType(fieldName: 'version', type: 'string');
 		$this->addType(fieldName: 'title', type: 'string');
 		$this->addType(fieldName: 'summary', type: 'string');
@@ -79,6 +81,7 @@ public function jsonSerialize(): array
 		$array = [
 			'id' => $this->id,
 			'uuid' => $this->uuid,
+			'uri' => $this->uri,
 			'version' => $this->version,
 			'title' => $this->title,
 			'summary' => $this->summary,
diff --git a/lib/Db/OrganizationMapper.php b/lib/Db/OrganizationMapper.php
index c83a859c..b6a0841c 100644
--- a/lib/Db/OrganizationMapper.php
+++ b/lib/Db/OrganizationMapper.php
@@ -7,6 +7,7 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\IURLGenerator;
 use Symfony\Component\Uid\Uuid;
 
 /**
@@ -23,6 +24,7 @@ class OrganizationMapper extends QBMapper
 	 * Constructor for OrganizationMapper
 	 *
 	 * @param IDBConnection $db The database connection
+	 * @param IURLGenerator $urlGenerator The URL generator
 	 */
 	public function __construct(IDBConnection $db)
 	{
@@ -123,6 +125,10 @@ public function createFromArray(array $object): Organization
 		if ($organization->getUuid() === null) {
 			$organization->setUuid(Uuid::v4());
 		}
+
+		// Set the uri
+		$organization->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.organizations.show', ['id' => $organization->getUuid()])));
+
 		return $this->insert(entity: $organization);
 	}
 
@@ -144,8 +150,12 @@ public function updateFromArray(int $id, array $object, bool $updateVersion = tr
 			return $this->createFromArray($object);
 		}
 
+		// Hydrate the organization with the new data
 		$organization->hydrate($object);
 
+		// Set the uri
+		$organization->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.organizations.show', ['id' => $organization->getUuid()])));
+
 		if ($updateVersion === true) {
 			// Update the version
 			$version = explode('.', $organization->getVersion());
diff --git a/lib/Db/Publication.php b/lib/Db/Publication.php
index 4b3d3e49..f82a17ec 100644
--- a/lib/Db/Publication.php
+++ b/lib/Db/Publication.php
@@ -9,6 +9,7 @@
 class Publication extends Entity implements JsonSerializable
 {
 	protected ?string $uuid = null;
+	protected ?string $uri = null;
 	protected ?string $version = '0.0.1';
 	protected ?string $title = null;
 	protected ?string $reference = null;
@@ -39,6 +40,7 @@ class Publication extends Entity implements JsonSerializable
 
 	public function __construct() {
 		$this->addType(fieldName: 'uuid', type: 'string');
+		$this->addType(fieldName: 'uri', type: 'string');
 		$this->addType(fieldName: 'version', type: 'string');
 		$this->addType(fieldName: 'title', type: 'string');
 		$this->addType(fieldName: 'reference', type: 'string');
@@ -125,6 +127,7 @@ public function jsonSerialize(): array
 	{
 		$array = [
 			'id' => $this->id,
+			'uri' => $this->uri,
 			'uuid' => $this->uuid,
 			'version' => $this->version,
 			'title' => $this->title,
diff --git a/lib/Db/PublicationMapper.php b/lib/Db/PublicationMapper.php
index c3ced4f0..dc59d07a 100644
--- a/lib/Db/PublicationMapper.php
+++ b/lib/Db/PublicationMapper.php
@@ -8,6 +8,7 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\DB\Types;
 use OCP\IDBConnection;
+use OCP\IURLGenerator;
 use Symfony\Component\Uid\Uuid;
 
 /**
@@ -24,8 +25,9 @@ class PublicationMapper extends QBMapper
 	 * Constructor for PublicationMapper
 	 *
 	 * @param IDBConnection $db The database connection
+	 * @param IURLGenerator $urlGenerator The URL generator
 	 */
-	public function __construct(IDBConnection $db)
+	public function __construct(IDBConnection $db, IURLGenerator $urlGenerator)
 	{
 		parent::__construct($db, tableName: 'ocat_publications');
 	}
@@ -212,6 +214,9 @@ public function createFromArray(array $object): Publication
 			$publication->setUuid(Uuid::v4());
 		}
 
+		// Set the uri
+		$publication->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.publications.show', ['id' => $publication->getUuid()])));
+
 		return $this->insert(entity: $publication);
 	}
 
@@ -233,8 +238,12 @@ public function updateFromArray(int $id, array $object, bool $updateVersion = tr
 			return $this->createFromArray($object);
 		}
 
+		// Hydrate the publication with the new data
 		$publication->hydrate(object: $object);
 
+		// Set the uri
+		$publication->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.publications.show', ['id' => $publication->getUuid()])));
+
 		if ($updateVersion === true) {
 			// Update the version
 			$version = explode('.', $publication->getVersion());
diff --git a/lib/Db/PublicationType.php b/lib/Db/PublicationType.php
index cfc9885d..dd729b82 100644
--- a/lib/Db/PublicationType.php
+++ b/lib/Db/PublicationType.php
@@ -10,6 +10,7 @@
 class PublicationType extends Entity implements JsonSerializable
 {
 	protected ?string $uuid        = null;
+	protected ?string $uri         = null;
 	protected ?string $version     = '0.0.1';
 	protected ?string $title       = null;
 	protected ?string $description = null;
@@ -23,6 +24,7 @@ class PublicationType extends Entity implements JsonSerializable
 
 	public function __construct() {
 		$this->addType(fieldName: 'uuid', type: 'string');
+		$this->addType(fieldName: 'uri', type: 'string');
 		$this->addType(fieldName: 'version', type: 'string');
 		$this->addType(fieldName: 'title', type: 'string');
 		$this->addType(fieldName: 'description', type: 'string');
@@ -87,6 +89,7 @@ public function jsonSerialize(): array
 
 		$array = [
 			'id'          => $this->id,
+			'uri'         => $this->uri,
 			'uuid'        => $this->uuid,
 			'version'     => $this->version,
 			'title'       => $this->title,
diff --git a/lib/Db/PublicationTypeMapper.php b/lib/Db/PublicationTypeMapper.php
index 7a2cc336..b32b31da 100644
--- a/lib/Db/PublicationTypeMapper.php
+++ b/lib/Db/PublicationTypeMapper.php
@@ -9,6 +9,7 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\IURLGenerator;
 use Symfony\Component\Uid\Uuid;
 
 /**
@@ -23,8 +24,9 @@ class PublicationTypeMapper extends QBMapper
 	 * Constructor for PublicationTypeMapper
 	 *
 	 * @param IDBConnection $db The database connection
+	 * @param IURLGenerator $urlGenerator The URL generator
 	 */
-	public function __construct(IDBConnection $db)
+	public function __construct(IDBConnection $db, IURLGenerator $urlGenerator)
 	{
 		parent::__construct($db, tableName: 'ocat_publication_types');
 	}
@@ -141,6 +143,10 @@ public function createFromArray(array $object): PublicationType
 		if ($publicationType->getUuid() === null) {
 			$publicationType->setUuid(Uuid::v4());
 		}
+
+		// Set the uri
+		$publicationType->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.publication_types.show', ['id' => $publicationType->getUuid()])));
+
 		return $this->insert(entity: $publicationType);
 	}
 
@@ -164,8 +170,12 @@ public function updateFromArray(int $id, array $object, bool $updateVersion = tr
 			return $this->createFromArray($object);
 		}
 
+		// Hydrate the publication type with the new data
 		$publicationType->hydrate($object);
 
+		// Set the uri
+		$publicationType->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.publication_types.show', ['id' => $publicationType->getUuid()])));
+
 		if ($updateVersion === true) {
 			// Update the version
 			$version = explode('.', $publicationType->getVersion());
diff --git a/lib/Db/Theme.php b/lib/Db/Theme.php
index 881fdf95..8451c217 100644
--- a/lib/Db/Theme.php
+++ b/lib/Db/Theme.php
@@ -9,6 +9,7 @@
 class Theme extends Entity implements JsonSerializable
 {
 	protected ?string $uuid = null;
+	protected ?string $uri = null;
 	protected ?string $version = '0.0.1';
 	protected ?string $title = null;
 	protected ?string $summary = null;
@@ -19,6 +20,7 @@ class Theme extends Entity implements JsonSerializable
 
 	public function __construct() {
 		$this->addType(fieldName: 'uuid', type: 'string');
+		$this->addType(fieldName: 'uri', type: 'string');
 		$this->addType(fieldName: 'version', type: 'string');
 		$this->addType(fieldName: 'title', type: 'string');
 		$this->addType(fieldName: 'summary', type: 'string');
@@ -70,6 +72,7 @@ public function jsonSerialize(): array
 	{
 		$array = [
 			'id' => $this->id,
+			'uri' => $this->uri,
 			'uuid' => $this->uuid,
 			'version' => $this->version,
 			'title' => $this->title,
diff --git a/lib/Db/ThemeMapper.php b/lib/Db/ThemeMapper.php
index 272159ea..47f9c506 100644
--- a/lib/Db/ThemeMapper.php
+++ b/lib/Db/ThemeMapper.php
@@ -9,6 +9,7 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\IURLGenerator;
 use Symfony\Component\Uid\Uuid;
 
 /**
@@ -25,8 +26,9 @@ class ThemeMapper extends QBMapper
 	 * Constructor for ThemeMapper
 	 *
 	 * @param IDBConnection $db The database connection
+	 * @param IURLGenerator $urlGenerator The URL generator
 	 */
-	public function __construct(IDBConnection $db)
+	public function __construct(IDBConnection $db, IURLGenerator $urlGenerator)
 	{
 		parent::__construct($db, tableName: 'ocat_themes');
 	}
@@ -127,6 +129,10 @@ public function createFromArray(array $object): Theme
 		if ($theme->getUuid() === null) {
 			$theme->setUuid(Uuid::v4());
 		}
+
+		// Set the uri
+		$theme->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.themes.show', ['id' => $theme->getUuid()])));
+
 		return $this->insert(entity: $theme);
 	}
 
@@ -150,7 +156,12 @@ public function updateFromArray(int $id, array $object, bool $updateVersion = tr
 			return $this->createFromArray($object);
 		}
 
+		// Hydrate the theme with the new data
 		$theme->hydrate($object);
+		
+		// Set the uri
+		$theme->setUri($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('opencatalogi.themes.show', ['id' => $theme->getUuid()])));
+
 
 		if ($updateVersion === true) {
 			// Update the version
diff --git a/lib/Migration/Version6Date20241208222530.php b/lib/Migration/Version6Date20241208222530.php
new file mode 100644
index 00000000..33ecb6c5
--- /dev/null
+++ b/lib/Migration/Version6Date20241208222530.php
@@ -0,0 +1,139 @@
+<?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;
+
+/**
+ * Class Version6Date20241208222530
+ * 
+ * Migration to add uri columns to all tables and create missing tables
+ */
+class Version6Date20241208222530 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();
+
+		// Update the ocat_attachments table
+		$table = $schema->getTable('ocat_attachments');
+		if ($table->hasColumn('uri') === false) {
+			$table->addColumn(
+				name: 'uri',
+				typeName: Types::STRING,
+				options: [
+					'notnull' => true,
+					'length'  => 255
+				]
+			)->setDefault('');
+		}
+
+		// Update catalogi table
+		$table = $schema->getTable('ocat_catalogi');
+		if ($table->hasColumn('uri') === false) {
+			$table->addColumn(
+				name: 'uri',
+				typeName: Types::STRING,
+				options: [
+					'notnull' => true,
+					'length'  => 255
+				]
+			)->setDefault('');
+		}
+
+		// Update organizations table
+		$table = $schema->getTable('ocat_organizations');
+		if ($table->hasColumn('uri') === false) {
+			$table->addColumn(
+				name: 'uri',
+				typeName: Types::STRING,
+				options: [
+					'notnull' => true,
+					'length'  => 255
+				]
+			)->setDefault('');
+		}
+
+		// Update publications table
+		$table = $schema->getTable('ocat_publications');
+		if ($table->hasColumn('uri') === false) {
+			$table->addColumn(
+				name: 'uri',
+				typeName: Types::STRING,
+				options: [
+					'notnull' => true,
+					'length'  => 255
+				]
+			)->setDefault('');
+		}
+
+		// Update publication types table
+		$table = $schema->getTable('ocat_publication_types');
+		if ($table->hasColumn('uri') === false) {
+			$table->addColumn(
+				name: 'uri',
+				typeName: Types::STRING,
+				options: [
+					'notnull' => true,
+					'length'  => 255
+				]
+			)->setDefault('');
+			if (!$table->hasIndex('ocat_publication_uuid_index')) {
+				$table->addIndex(['uuid'], 'ocat_publication_uuid_index');
+			}
+		}
+
+		// Update themes table
+		$table = $schema->getTable('ocat_themes');
+		if ($table->hasColumn('uri') === false) {
+			$table->addColumn(
+				name: 'uri',
+				typeName: Types::STRING,
+				options: [
+					'notnull' => true,
+					'length'  => 255
+				]
+			)->setDefault('');
+			if (!$table->hasIndex('ocat_themes_uuid_index')) {
+				$table->addIndex(['uuid'], 'ocat_themes_uuid_index');
+			}
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+}

From c24434f6a32e3ce684a2ec224ad62a41d24d0fd7 Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <rubenvdlinde@gmail.com>
Date: Sun, 8 Dec 2024 23:01:53 +0100
Subject: [PATCH 06/11] fIRST FIX ON URI GENERATION

---
 lib/Controller/AttachmentsController.php      | 11 +++++++++--
 lib/Controller/CatalogiController.php         | 11 +++++++++--
 lib/Controller/OrganizationsController.php    | 11 +++++++++--
 lib/Controller/PublicationTypesController.php |  9 ++++++++-
 lib/Controller/PublicationsController.php     |  9 ++++++++-
 lib/Controller/ThemesController.php           |  9 ++++++++-
 6 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/lib/Controller/AttachmentsController.php b/lib/Controller/AttachmentsController.php
index 4e37bfe6..ec10a9e8 100644
--- a/lib/Controller/AttachmentsController.php
+++ b/lib/Controller/AttachmentsController.php
@@ -38,6 +38,7 @@ class AttachmentsController extends Controller
      * @param FileService $fileService The file service
      * @param IUserSession $userSession The user session
      * @param ObjectService $objectService The object service
+     * @param IURLGenerator $urlGenerator The URL generator
      */
     public function __construct
 	(
@@ -47,7 +48,8 @@ public function __construct
 		private readonly AttachmentMapper $attachmentMapper,
 		private readonly FileService $fileService,
 		private readonly IUserSession $userSession,
-		private readonly ObjectService $objectService
+		private readonly ObjectService $objectService,
+		private readonly IURLGenerator $urlGenerator
 	)
     {
         parent::__construct($appName, $request);
@@ -130,6 +132,11 @@ public function create(ObjectService $objectService): JSONResponse
         // Save the new attachment object.
         $object = $this->objectService->saveObject('attachment', $data);
 
+        // If object is a class change it to array
+        if (is_object($object)) {
+            $object = $object->jsonSerialize();
+        }
+
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
             $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.attachments.show', ['id' => $object['id']]);
@@ -159,7 +166,7 @@ public function update(string|int $id, ObjectService $objectService): JSONRespon
 
         // Ensure the ID in the data matches the ID in the URL
         $data['id'] = $id;
-        
+
         // If we do not have an uri, we need to generate one
         if (isset($data['uri']) === false) {
             $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.attachments.show', ['id' => $data['id']]);
diff --git a/lib/Controller/CatalogiController.php b/lib/Controller/CatalogiController.php
index 55724cb0..0034f4a8 100644
--- a/lib/Controller/CatalogiController.php
+++ b/lib/Controller/CatalogiController.php
@@ -33,7 +33,8 @@ class CatalogiController extends Controller
      * @param CatalogMapper $catalogMapper The catalog mapper
      * @param ObjectService $objectService The object service
 	 * @param DirectoryService $directoryService The directory service
-	 * @param BroadcastService $broadcastService The broadcast service
+	 * @param BroadcastService $broadcastService The broadcast service  
+     * @param IURLGenerator $urlGenerator The URL generator
      */
     public function __construct(
         $appName,
@@ -42,7 +43,8 @@ public function __construct(
         private readonly CatalogMapper $catalogMapper,
         private readonly ObjectService $objectService,
 		private readonly DirectoryService $directoryService,
-		private readonly BroadcastService $broadcastService
+		private readonly BroadcastService $broadcastService,
+        private readonly IURLGenerator $urlGenerator
     )
     {
         parent::__construct($appName, $request);
@@ -115,6 +117,11 @@ public function create(ObjectService $objectService): JSONResponse
         // Save the new catalog object
         $object = $this->objectService->saveObject('catalog', $data);
 
+        // If object is a class change it to array
+        if (is_object($object)) {
+            $object = $object->jsonSerialize();
+        }
+
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
             $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.catalogs.show', ['id' => $object['id']]);
diff --git a/lib/Controller/OrganizationsController.php b/lib/Controller/OrganizationsController.php
index 1ad1141d..9472ef73 100644
--- a/lib/Controller/OrganizationsController.php
+++ b/lib/Controller/OrganizationsController.php
@@ -25,14 +25,16 @@ class OrganizationsController extends Controller
      * @param IRequest $request The request object
      * @param IAppConfig $config The app configuration
      * @param OrganizationMapper $organizationMapper The organization mapper
-     * @param ObjectService $objectService The object service
+     * @param ObjectService $objectService The object service           
+     * @param IURLGenerator $urlGenerator The URL generator
      */
     public function __construct(
         $appName,
         IRequest $request,
         private readonly IAppConfig $config,
         private readonly OrganizationMapper $organizationMapper,
-        private readonly ObjectService $objectService
+        private readonly ObjectService $objectService,
+        private readonly IURLGenerator $urlGenerator
     )
     {
         parent::__construct($appName, $request);
@@ -109,6 +111,11 @@ public function create(): JSONResponse
         // Save the new organization object
         $object = $this->objectService->saveObject('organization', $data);
 
+        // If object is a class change it to array
+        if (is_object($object)) {
+            $object = $object->jsonSerialize();
+        }
+
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
             $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.organizations.show', ['id' => $object['id']]);
diff --git a/lib/Controller/PublicationTypesController.php b/lib/Controller/PublicationTypesController.php
index de4444e0..3ccc0432 100644
--- a/lib/Controller/PublicationTypesController.php
+++ b/lib/Controller/PublicationTypesController.php
@@ -29,6 +29,7 @@ class PublicationTypesController extends Controller
      * @param ObjectService $objectService The object service
      * @param DirectoryService $directoryService The directory service
      * @param BroadcastService $broadcastService The broadcast service
+     * @param IURLGenerator $urlGenerator The URL generator
      */
     public function __construct(
         $appName,
@@ -37,7 +38,8 @@ public function __construct(
         private readonly PublicationTypeMapper $publicationTypeMapper,
         private readonly ObjectService $objectService,
         private readonly DirectoryService $directoryService,
-        private readonly BroadcastService $broadcastService
+        private readonly BroadcastService $broadcastService,
+        private readonly IURLGenerator $urlGenerator
     )
     {
         parent::__construct($appName, $request);
@@ -118,6 +120,11 @@ public function create(): JSONResponse
         // Save the new publication type object
         $object = $this->objectService->saveObject('publicationType', $data);
 
+        // If object is a class change it to array
+        if (is_object($object)) {
+            $object = $object->jsonSerialize();
+        }
+
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
             $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publicationTypes.show', ['id' => $object['id']]);
diff --git a/lib/Controller/PublicationsController.php b/lib/Controller/PublicationsController.php
index 84555ff1..953e45a1 100644
--- a/lib/Controller/PublicationsController.php
+++ b/lib/Controller/PublicationsController.php
@@ -50,6 +50,7 @@ class PublicationsController extends Controller
      * @param FileService $fileService The file service
      * @param DownloadService $downloadService The download service
      * @param ObjectService $objectService The object service
+     * @param IURLGenerator $urlGenerator The URL generator
      */
     public function __construct
 	(
@@ -60,7 +61,8 @@ public function __construct
 		private readonly IAppConfig $config,
 		private readonly FileService $fileService,
 		private readonly DownloadService $downloadService,
-		private ObjectService $objectService
+		private readonly ObjectService $objectService,
+		private readonly IURLGenerator $urlGenerator
 	)
     {
         parent::__construct($appName, $request);
@@ -198,6 +200,11 @@ public function create(ObjectService $objectService): JSONResponse
         // Save the new publication object
         $object = $this->objectService->saveObject('publication', $data);
 
+        // If object is a class change it to array
+        if (is_object($object)) {
+            $object = $object->jsonSerialize();
+        }
+
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
             $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publications.show', ['id' => $object['id']]);
diff --git a/lib/Controller/ThemesController.php b/lib/Controller/ThemesController.php
index b9b2fb66..9d023802 100644
--- a/lib/Controller/ThemesController.php
+++ b/lib/Controller/ThemesController.php
@@ -27,6 +27,7 @@ class ThemesController extends Controller
      * @param ThemeMapper $themeMapper The theme mapper for database operations
      * @param IAppConfig $config The app configuration
      * @param ObjectService $objectService The service for handling object operations
+     * @param IURLGenerator $urlGenerator The URL generator
      */
     public function __construct
 	(
@@ -34,7 +35,8 @@ public function __construct
 		IRequest $request,
 		private readonly ThemeMapper $themeMapper,
 		private readonly IAppConfig $config,
-		private readonly ObjectService $objectService
+		private readonly ObjectService $objectService,
+		private readonly IURLGenerator $urlGenerator
 	)
     {
         parent::__construct($appName, $request);
@@ -97,6 +99,11 @@ public function create(): JSONResponse
         // Save the new theme object
         $object = $this->objectService->saveObject('theme', $data);
 
+        // If object is a class change it to array
+        if (is_object($object)) {
+            $object = $object->jsonSerialize();
+        }
+        
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
             $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $object['id']]);

From 201673404425ea9cb5385e7217263c82c1162f6a Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <rubenvdlinde@gmail.com>
Date: Sun, 8 Dec 2024 23:20:44 +0100
Subject: [PATCH 07/11] Swcond fixes on uri generation

---
 lib/Controller/AttachmentsController.php      | 7 ++-----
 lib/Controller/CatalogiController.php         | 7 ++-----
 lib/Controller/OrganizationsController.php    | 9 +++------
 lib/Controller/PublicationTypesController.php | 7 +++----
 lib/Controller/PublicationsController.php     | 7 +++----
 lib/Controller/ThemesController.php           | 7 ++-----
 6 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/lib/Controller/AttachmentsController.php b/lib/Controller/AttachmentsController.php
index ec10a9e8..e4098d3c 100644
--- a/lib/Controller/AttachmentsController.php
+++ b/lib/Controller/AttachmentsController.php
@@ -139,7 +139,7 @@ public function create(ObjectService $objectService): JSONResponse
 
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
-            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.attachments.show', ['id' => $object['id']]);
+            $object['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.attachments.show', ['id' => $object['id']]));
             $object = $this->objectService->saveObject('attachment', $object);
         }
 
@@ -168,10 +168,7 @@ public function update(string|int $id, ObjectService $objectService): JSONRespon
         $data['id'] = $id;
 
         // If we do not have an uri, we need to generate one
-        if (isset($data['uri']) === false) {
-            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.attachments.show', ['id' => $data['id']]);
-            $data = $this->objectService->saveObject('attachment', $data);
-        }
+        $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.attachments.show', ['id' => $data['id']]));
 
         // Save the updated attachment object
         $object = $this->objectService->saveObject('attachment', $data);
diff --git a/lib/Controller/CatalogiController.php b/lib/Controller/CatalogiController.php
index 0034f4a8..8f10c71c 100644
--- a/lib/Controller/CatalogiController.php
+++ b/lib/Controller/CatalogiController.php
@@ -124,7 +124,7 @@ public function create(ObjectService $objectService): JSONResponse
 
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
-            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.catalogs.show', ['id' => $object['id']]);
+            $object['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.catalogs.show', ['id' => $object['id']]));
             $object = $this->objectService->saveObject('catalog', $object);
         }
 
@@ -157,10 +157,7 @@ public function update(string|int $id, ObjectService $objectService): JSONRespon
         $data['id'] = $id;
 
         // If we do not have an uri, we need to generate one
-        if (isset($data['uri']) === false) {
-            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.catalogs.show', ['id' => $data['id']]);
-            $data = $this->objectService->saveObject('catalog', $data);
-        }
+        $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.catalogs.show', ['id' => $data['id']]));
 
         // Save the updated catalog object
         $object = $this->objectService->saveObject('catalog', $data);
diff --git a/lib/Controller/OrganizationsController.php b/lib/Controller/OrganizationsController.php
index 9472ef73..522f3b7e 100644
--- a/lib/Controller/OrganizationsController.php
+++ b/lib/Controller/OrganizationsController.php
@@ -118,7 +118,7 @@ public function create(): JSONResponse
 
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
-            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.organizations.show', ['id' => $object['id']]);
+            $object['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.organizations.show', ['id' => $object['id']]));
             $object = $this->objectService->saveObject('organization', $object);
         }
 
@@ -144,11 +144,8 @@ public function update(string|int $id): JSONResponse
         $data['id'] = $id;
 
         // If we do not have an uri, we need to generate one
-        if (isset($data['uri']) === false) {
-            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.organizations.show', ['id' => $data['id']]);
-            $data = $this->objectService->saveObject('organization', $data);
-        }
-
+       $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.organizations.show', ['id' => $data['id']]));
+    
         // Save the updated organization object
         $object = $this->objectService->saveObject('organization', $data);
 
diff --git a/lib/Controller/PublicationTypesController.php b/lib/Controller/PublicationTypesController.php
index 3ccc0432..e363e52f 100644
--- a/lib/Controller/PublicationTypesController.php
+++ b/lib/Controller/PublicationTypesController.php
@@ -127,7 +127,7 @@ public function create(): JSONResponse
 
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
-            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publicationTypes.show', ['id' => $object['id']]);
+            $object['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.publicationTypes.show', ['id' => $object['id']]));
             $object = $this->objectService->saveObject('publicationType', $object);
         }
 
@@ -156,9 +156,8 @@ public function update(string|int $id): JSONResponse
         $data['id'] = $id;
 
         // If we do not have an uri, we need to generate one
-        if (isset($data['uri']) === false) {
-            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publicationTypes.show', ['id' => $data['id']]);
-        }
+        $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.publicationTypes.show', ['id' => $data['id']]));
+        
 
         // Save the updated publication type object
         $object = $this->objectService->saveObject('publicationType', $data);
diff --git a/lib/Controller/PublicationsController.php b/lib/Controller/PublicationsController.php
index 953e45a1..143b5d4b 100644
--- a/lib/Controller/PublicationsController.php
+++ b/lib/Controller/PublicationsController.php
@@ -51,6 +51,7 @@ class PublicationsController extends Controller
      * @param DownloadService $downloadService The download service
      * @param ObjectService $objectService The object service
      * @param IURLGenerator $urlGenerator The URL generator
+     * 
      */
     public function __construct
 	(
@@ -207,7 +208,7 @@ public function create(ObjectService $objectService): JSONResponse
 
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
-            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publications.show', ['id' => $object['id']]);
+            $object['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.publications.show', ['id' => $object['id']]));
             $object = $this->objectService->saveObject('publication', $object);
         }
 
@@ -236,9 +237,7 @@ public function update(string|int $id, ObjectService $objectService): JSONRespon
         $data['id'] = $id;
 
         // If we do not have an uri, we need to generate one
-        if (isset($object['uri']) === false) {
-            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.publications.show', ['id' => $object['id']]);
-        }
+        $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.publications.show', ['id' => $data['id']]));
 
         // Save the updated publication object
         $object = $this->objectService->saveObject('publication', $data);
diff --git a/lib/Controller/ThemesController.php b/lib/Controller/ThemesController.php
index 9d023802..80b55864 100644
--- a/lib/Controller/ThemesController.php
+++ b/lib/Controller/ThemesController.php
@@ -106,7 +106,7 @@ public function create(): JSONResponse
         
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
-            $object['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $object['id']]);
+            $object['uri'] = $this->urlGenerator->getAbsoluteURL($$this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $object['id']]));
             $object = $this->objectService->saveObject('theme', $object);
         }
 
@@ -132,10 +132,7 @@ public function update(string|int $id): JSONResponse
         $data['id'] = $id;  
 
         // If we do not have an uri, we need to generate one
-        if (isset($data['uri']) === false) {
-            $data['uri'] = $this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $data['id']]);
-            $data = $this->objectService->saveObject('theme', $data);
-        }
+        $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $data['id']]));
 
         // Save the updated theme object
         $object = $this->objectService->saveObject('theme', $data);

From 8630a7cc5a0b69f3b260d9385d664512e4efbdff Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Mon, 9 Dec 2024 14:42:43 +0100
Subject: [PATCH 08/11] Use catalog to discover if the listing exists already

---
 lib/Service/DirectoryService.php | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/lib/Service/DirectoryService.php b/lib/Service/DirectoryService.php
index 09286299..640c1f9d 100644
--- a/lib/Service/DirectoryService.php
+++ b/lib/Service/DirectoryService.php
@@ -93,7 +93,7 @@ private function getDirectoryFromListing(Listing|array $listing): array
 //		$listing['id'] = $listing['uuid'];
 
 		// Remove unneeded fields
-		unset($listing['status'], $listing['lastSync'], $listing['default'], $listing['available'], $listing['catalog'], $listing['statusCode'],
+		unset($listing['status'], $listing['lastSync'], $listing['default'], $listing['available'], $listing['statusCode'],
 //			$listing['uuid'], //@todo this breaks stuff when trying to find and update a listing
 			$listing['hash']);
 
@@ -159,6 +159,7 @@ private function getDirectoryFromCatalog(Catalog|array $catalog): array
 		// Add the search and directory urls
 		$catalog['search'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("opencatalogi.search.index"));
 		$catalog['directory'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("opencatalogi.directory.index"));
+		$catalog['catalog'] = $catalog['id'];
 
 		// Process publication types
 		if (isset($catalog['publicationTypes']) && is_array($catalog['publicationTypes'])) {
@@ -262,7 +263,7 @@ public function doCronSync(): array {
 	 */
 	public function validateExternalListing(array $listing): bool
 	{
-		if (empty($listing['id']) || !Uuid::isValid($listing['id'])) {
+		if (empty($listing['catalog']) === true || Uuid::isValid($listing['catalog']) === false) {
 			return false;
 		}
 
@@ -368,14 +369,9 @@ public function syncExternalDirectory(string $url): array
 
 		// Get all current listings for this directory
 		$currentListings = $this->objectService->getObjects(
-			objectType: 'listing',
-			filters: [
-				'directory'=>$checkUrls,
-			]
+			objectType: 'listing'
 		);
 
-
-
 		// Remove any listings without a catalog ID from the database
 		foreach ($currentListings as $listing) {
 			if (empty($listing['catalog'])) {
@@ -395,12 +391,15 @@ public function syncExternalDirectory(string $url): array
 			'catalog' // Index by catalog ID
 		);
 
+		$oldListingDirectories = array_unique(array: array_column(array: $currentListings, column_key: 'directory'));
+
 		// Initialize arrays to store results
 		$addedListings = [];
 		$updatedListings = [];
 		$invalidListings = [];
 		$foundDirectories = [];
 		$removedListings = [];
+		$discoveredDirectories = [];
 
 		// Process each new listing
 		foreach ($newListings as $listing) {
@@ -410,13 +409,22 @@ public function syncExternalDirectory(string $url): array
 				continue;
 			}
 
+			if (in_array(needle: $listing['directory'], haystack: $checkUrls) === false
+				&& in_array(needle: $listing['directory'], haystack: $oldListingDirectories) === false
+			) {
+				$discoveredDirectories[] = $listing['directory'];
+
+				continue;
+			} else if (in_array(needle: $listing['directory'], haystack: $checkUrls) === false) {
+				continue;
+			}
+
 			// Check if we already have this listing by looking up its catalog ID in the oldListings array
-			$oldListing = $oldListings[$listing['id']] ?? null;
+			$oldListing = $oldListings[$listing['catalog']] ?? null;
 
 			// If no existing listing found, prepare the new listing data
 			if ($oldListing === null) {
 				$listing['hash'] = hash('sha256', json_encode($listing));
-				$listing['catalog'] = $listing['id'];
 				unset($listing['id']);
 			} else {
 				// Update existing listing
@@ -446,6 +454,10 @@ public function syncExternalDirectory(string $url): array
 			$this->broadcastService->broadcast($foundDirectory);
 		}
 
+		foreach($discoveredDirectories as $discoveredDirectory) {
+			$this->syncExternalDirectory($discoveredDirectory);
+		}
+
 		// Return the results
 		return [
 			'invalidListings' => $invalidListings,

From fe9b9b0dee4c8101e2d1e88224601b800bf94766 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Mon, 9 Dec 2024 15:14:30 +0100
Subject: [PATCH 09/11] Style fixes

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

diff --git a/lib/Service/DirectoryService.php b/lib/Service/DirectoryService.php
index 640c1f9d..323b6fa6 100644
--- a/lib/Service/DirectoryService.php
+++ b/lib/Service/DirectoryService.php
@@ -450,11 +450,11 @@ public function syncExternalDirectory(string $url): array
 		}
 
 		// Lets inform our new friends that we exist
-		foreach($foundDirectories as $foundDirectory){
+		foreach ($foundDirectories as $foundDirectory){
 			$this->broadcastService->broadcast($foundDirectory);
 		}
 
-		foreach($discoveredDirectories as $discoveredDirectory) {
+		foreach ($discoveredDirectories as $discoveredDirectory) {
 			$this->syncExternalDirectory($discoveredDirectory);
 		}
 

From 345d3ce1cd61d2d674e41d0be7709fe6b4bf6c68 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Mon, 9 Dec 2024 16:27:25 +0100
Subject: [PATCH 10/11] Fix dev --> main PR comments

---
 lib/Controller/AttachmentsController.php      | 2 +-
 lib/Controller/CatalogiController.php         | 4 ++--
 lib/Controller/OrganizationsController.php    | 6 +++---
 lib/Controller/PublicationTypesController.php | 6 +++---
 lib/Controller/PublicationsController.php     | 4 ++--
 lib/Controller/ThemesController.php           | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/Controller/AttachmentsController.php b/lib/Controller/AttachmentsController.php
index e4098d3c..ffb8160a 100644
--- a/lib/Controller/AttachmentsController.php
+++ b/lib/Controller/AttachmentsController.php
@@ -133,7 +133,7 @@ public function create(ObjectService $objectService): JSONResponse
         $object = $this->objectService->saveObject('attachment', $data);
 
         // If object is a class change it to array
-        if (is_object($object)) {
+        if (is_object($object) === true) {
             $object = $object->jsonSerialize();
         }
 
diff --git a/lib/Controller/CatalogiController.php b/lib/Controller/CatalogiController.php
index 8f10c71c..23d43adf 100644
--- a/lib/Controller/CatalogiController.php
+++ b/lib/Controller/CatalogiController.php
@@ -33,7 +33,7 @@ class CatalogiController extends Controller
      * @param CatalogMapper $catalogMapper The catalog mapper
      * @param ObjectService $objectService The object service
 	 * @param DirectoryService $directoryService The directory service
-	 * @param BroadcastService $broadcastService The broadcast service  
+	 * @param BroadcastService $broadcastService The broadcast service
      * @param IURLGenerator $urlGenerator The URL generator
      */
     public function __construct(
@@ -118,7 +118,7 @@ public function create(ObjectService $objectService): JSONResponse
         $object = $this->objectService->saveObject('catalog', $data);
 
         // If object is a class change it to array
-        if (is_object($object)) {
+        if (is_object($object) === true) {
             $object = $object->jsonSerialize();
         }
 
diff --git a/lib/Controller/OrganizationsController.php b/lib/Controller/OrganizationsController.php
index 522f3b7e..9ee1f6c1 100644
--- a/lib/Controller/OrganizationsController.php
+++ b/lib/Controller/OrganizationsController.php
@@ -25,7 +25,7 @@ class OrganizationsController extends Controller
      * @param IRequest $request The request object
      * @param IAppConfig $config The app configuration
      * @param OrganizationMapper $organizationMapper The organization mapper
-     * @param ObjectService $objectService The object service           
+     * @param ObjectService $objectService The object service
      * @param IURLGenerator $urlGenerator The URL generator
      */
     public function __construct(
@@ -112,7 +112,7 @@ public function create(): JSONResponse
         $object = $this->objectService->saveObject('organization', $data);
 
         // If object is a class change it to array
-        if (is_object($object)) {
+        if (is_object($object) === true) {
             $object = $object->jsonSerialize();
         }
 
@@ -145,7 +145,7 @@ public function update(string|int $id): JSONResponse
 
         // If we do not have an uri, we need to generate one
        $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.organizations.show', ['id' => $data['id']]));
-    
+
         // Save the updated organization object
         $object = $this->objectService->saveObject('organization', $data);
 
diff --git a/lib/Controller/PublicationTypesController.php b/lib/Controller/PublicationTypesController.php
index e363e52f..ee90e82f 100644
--- a/lib/Controller/PublicationTypesController.php
+++ b/lib/Controller/PublicationTypesController.php
@@ -121,7 +121,7 @@ public function create(): JSONResponse
         $object = $this->objectService->saveObject('publicationType', $data);
 
         // If object is a class change it to array
-        if (is_object($object)) {
+        if (is_object($object) === true) {
             $object = $object->jsonSerialize();
         }
 
@@ -157,7 +157,7 @@ public function update(string|int $id): JSONResponse
 
         // If we do not have an uri, we need to generate one
         $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.publicationTypes.show', ['id' => $data['id']]));
-        
+
 
         // Save the updated publication type object
         $object = $this->objectService->saveObject('publicationType', $data);
@@ -186,7 +186,7 @@ public function destroy(string|int $id): JSONResponse
         // Return the result as a JSON response
 		return new JSONResponse(['success' => $result], $result === true ? '200' : '404');
     }
-    
+
 	/**
 	 * Synchronize or delete a publication type based on listing status
 	 *
diff --git a/lib/Controller/PublicationsController.php b/lib/Controller/PublicationsController.php
index 143b5d4b..5a770793 100644
--- a/lib/Controller/PublicationsController.php
+++ b/lib/Controller/PublicationsController.php
@@ -51,7 +51,7 @@ class PublicationsController extends Controller
      * @param DownloadService $downloadService The download service
      * @param ObjectService $objectService The object service
      * @param IURLGenerator $urlGenerator The URL generator
-     * 
+     *
      */
     public function __construct
 	(
@@ -202,7 +202,7 @@ public function create(ObjectService $objectService): JSONResponse
         $object = $this->objectService->saveObject('publication', $data);
 
         // If object is a class change it to array
-        if (is_object($object)) {
+        if (is_object($object) === true) {
             $object = $object->jsonSerialize();
         }
 
diff --git a/lib/Controller/ThemesController.php b/lib/Controller/ThemesController.php
index 80b55864..b5233943 100644
--- a/lib/Controller/ThemesController.php
+++ b/lib/Controller/ThemesController.php
@@ -100,10 +100,10 @@ public function create(): JSONResponse
         $object = $this->objectService->saveObject('theme', $data);
 
         // If object is a class change it to array
-        if (is_object($object)) {
+        if (is_object($object) === true) {
             $object = $object->jsonSerialize();
         }
-        
+
         // If we do not have an uri, we need to generate one
         if (isset($object['uri']) === false) {
             $object['uri'] = $this->urlGenerator->getAbsoluteURL($$this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $object['id']]));
@@ -129,7 +129,7 @@ public function update(string|int $id): JSONResponse
         $data = $this->request->getParams();
 
         // Ensure the ID in the data matches the ID in the URL
-        $data['id'] = $id;  
+        $data['id'] = $id;
 
         // If we do not have an uri, we need to generate one
         $data['uri'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('openCatalogi.themes.show', ['id' => $data['id']]));

From 1268b60e2469f14562aa2e7cb53226e5ab82192f Mon Sep 17 00:00:00 2001
From: Wilco Louwerse <wilco@conduction.nl>
Date: Mon, 9 Dec 2024 17:00:36 +0100
Subject: [PATCH 11/11] Update all class docblocks

---
 lib/Service/BroadcastService.php           |  9 ++++++---
 lib/Service/DirectoryService.php           |  6 +++++-
 lib/Service/DownloadService.php            |  6 +++++-
 lib/Service/ElasticSearchClientAdapter.php |  7 +++++--
 lib/Service/ElasticSearchService.php       |  7 +++++++
 lib/Service/FileService.php                |  6 +++++-
 lib/Service/ObjectService.php              |  6 +++++-
 lib/Service/SearchService.php              | 19 +++++++++++--------
 lib/Service/ValidationService.php          |  7 +++++--
 9 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/lib/Service/BroadcastService.php b/lib/Service/BroadcastService.php
index f39b6f29..95b3ac11 100644
--- a/lib/Service/BroadcastService.php
+++ b/lib/Service/BroadcastService.php
@@ -15,7 +15,10 @@
 use OCA\OpenCatalogi\Service\ObjectService;
 
 /**
- * Service class for handling directory-related operations
+ * Service for broadcasting this OpenCatalogi directory to other instances.
+ *
+ * Provides functionality to notify external instances about this directory
+ * through HTTP POST requests, either to a specific URL or to all known directories.
  */
 class BroadcastService
 {
@@ -73,10 +76,10 @@ public function broadcast(?string $url = null): void {
 						'directory' => $directoryUrl
 					]
 				]);
-				
+
 				// Log successful broadcast
 				\OC::$server->getLogger()->info('Successfully broadcasted to ' . $hook);
-				
+
 			} catch (\Exception $e) {
 				// Throw a warning since broadcasting failure shouldn't break the application flow
 				// but we still want to notify about the issue
diff --git a/lib/Service/DirectoryService.php b/lib/Service/DirectoryService.php
index 323b6fa6..05521f3f 100644
--- a/lib/Service/DirectoryService.php
+++ b/lib/Service/DirectoryService.php
@@ -25,7 +25,11 @@
 use Symfony\Component\Uid\Uuid;
 
 /**
- * Service class for handling directory-related operations
+ * Service for managing and synchronizing directories and listings.
+ *
+ * This service facilitates operations related to directories, catalogs, and listings.
+ * It supports synchronization with external directories, validation and updates
+ * of listings, and integration with publication types.
  */
 class DirectoryService
 {
diff --git a/lib/Service/DownloadService.php b/lib/Service/DownloadService.php
index 7d582b9a..6376e3b7 100644
--- a/lib/Service/DownloadService.php
+++ b/lib/Service/DownloadService.php
@@ -17,7 +17,11 @@
 use Exception;
 
 /**
- * Service class for handling download-related operations
+ * Service for managing download-related operations.
+ *
+ * Provides functionality to create and manage publication files and archives, including
+ * generating PDFs and ZIP files containing metadata and attachments, and storing files
+ * in NextCloud.
  */
 class DownloadService
 {
diff --git a/lib/Service/ElasticSearchClientAdapter.php b/lib/Service/ElasticSearchClientAdapter.php
index 83efcb6c..1ef01041 100644
--- a/lib/Service/ElasticSearchClientAdapter.php
+++ b/lib/Service/ElasticSearchClientAdapter.php
@@ -5,7 +5,10 @@
 use Elastic\Elasticsearch\Client;
 
 /**
- * Adapter class for Elasticsearch client operations
+ * Adapter for Elasticsearch client operations.
+ *
+ * Provides a wrapper around the Elasticsearch client to facilitate search, indexing,
+ * retrieval, updating, and deletion of documents.
  */
 class ElasticSearchClientAdapter
 {
@@ -83,4 +86,4 @@ public function delete(array $params)
         // Delete the document and return the response
         return $this->client->delete($params);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Service/ElasticSearchService.php b/lib/Service/ElasticSearchService.php
index 73afa1fe..d721e670 100644
--- a/lib/Service/ElasticSearchService.php
+++ b/lib/Service/ElasticSearchService.php
@@ -8,6 +8,13 @@
 use Elastic\Elasticsearch\ClientBuilder;
 use Symfony\Component\Uid\Uuid;
 
+/**
+ * Service for managing interactions with Elasticsearch.
+ *
+ * Provides functionality for indexing, updating, deleting, and searching objects in Elasticsearch,
+ * as well as processing and formatting query results and aggregations.
+ */
+
 class ElasticSearchService
 {
 
diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php
index 4d2fe177..70ec13e2 100644
--- a/lib/Service/FileService.php
+++ b/lib/Service/FileService.php
@@ -29,8 +29,12 @@
 use ZipArchive;
 
 /**
- * Service class for handling file operations in OpenCatalogi
+ * Service for handling file operations in OpenCatalogi.
+ *
+ * Provides functionalities for managing files and folders in NextCloud, creating and managing
+ * share links, handling uploaded files, generating PDF and ZIP files, and managing temporary files.
  */
+
 class FileService
 {
 	/**
diff --git a/lib/Service/ObjectService.php b/lib/Service/ObjectService.php
index 1ffe4a6c..d237e181 100644
--- a/lib/Service/ObjectService.php
+++ b/lib/Service/ObjectService.php
@@ -29,8 +29,12 @@
 use OCA\OpenCatalogi\Db\ThemeMapper;
 
 /**
- * Service class for handling object-related operations
+ * Service for handling object-related operations.
+ *
+ * Provides functionality for retrieving, saving, updating, and deleting objects,
+ * as well as extending entities with related data and managing object mappings.
  */
+
 class ObjectService
 {
 	/** @var string $appName The name of the app */
diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php
index 9ecfdafd..0a0b6704 100644
--- a/lib/Service/SearchService.php
+++ b/lib/Service/SearchService.php
@@ -8,10 +8,13 @@
 use Symfony\Component\Uid\Uuid;
 
 /**
- * Class SearchService
- * 
- * This service handles search operations and related functionalities.
+ * Service for managing search operations and related functionalities.
+ *
+ * Provides methods for performing search queries, merging search results and aggregations,
+ * and creating database-specific filters and sort parameters. Handles both local and
+ * distributed search queries across multiple directories.
  */
+
 class SearchService
 {
     /** @var Client */
@@ -25,7 +28,7 @@ class SearchService
 
     /**
      * SearchService constructor.
-     * 
+     *
      * @param ElasticSearchService $elasticService
      * @param DirectoryService $directoryService
      * @param IURLGenerator $urlGenerator
@@ -40,7 +43,7 @@ public function __construct(
 
     /**
      * Merge facets from existing and new aggregations.
-     * 
+     *
      * @param array $existingAggregation
      * @param array $newAggregation
      * @return array Merged facets
@@ -75,7 +78,7 @@ public function mergeFacets(array $existingAggregation, array $newAggregation):
 
     /**
      * Merge existing and new aggregations.
-     * 
+     *
      * @param array|null $existingAggregations
      * @param array|null $newAggregations
      * @return array Merged aggregations
@@ -98,7 +101,7 @@ private function mergeAggregations(?array $existingAggregations, ?array $newAggr
 
     /**
      * Comparison function for sorting result arrays.
-     * 
+     *
      * @param array $a
      * @param array $b
      * @return int
@@ -110,7 +113,7 @@ public function sortResultArray(array $a, array $b): int
 
     /**
      * Perform a search operation.
-     * 
+     *
      * @param array $parameters Search parameters
      * @param array $elasticConfig Elasticsearch configuration
      * @param array $dbConfig Database configuration
diff --git a/lib/Service/ValidationService.php b/lib/Service/ValidationService.php
index 9ce35df0..8c36e6b7 100644
--- a/lib/Service/ValidationService.php
+++ b/lib/Service/ValidationService.php
@@ -18,10 +18,13 @@
 use Symfony\Component\Uid\Uuid;
 
 /**
- * Class ValidationService
+ * Service for validating catalogs and publications.
  *
- * This service handles validation of catalogs and publications.
+ * Provides methods to validate publications against the schema defined in their associated
+ * publication types, ensuring data consistency and integrity. Handles default values and
+ * reports validation errors.
  */
+
 class ValidationService
 {