From 941d15c1bc98f8121a9524bc2fd235731222e4c1 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 10 Sep 2023 11:59:38 +0200
Subject: [PATCH 1/3] Return labels directly from project configuration.

NOTE: This is a breaking API change. Before this it returned an
array of labels, now it returns an object.
---
 lib/www/server/api/middleware/label/list.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/www/server/api/middleware/label/list.js b/lib/www/server/api/middleware/label/list.js
index cc55fa5..55314e3 100644
--- a/lib/www/server/api/middleware/label/list.js
+++ b/lib/www/server/api/middleware/label/list.js
@@ -1,10 +1,11 @@
 
-const { label } = require('../../../lib/db');
+const { project } = require('../../../lib/db');
 
 module.exports = async function (req, res, next) {
 
 	try {
-		res.status(200).send(await label.list(req.params.project, req.query));
+		const labels = (await project.configuration.get(req.params.project))?.labels ?? {};
+		res.status(200).send(labels);
 		next();
 	} catch (err) {
 		next(err);

From 158e0fb788421aad8aab40ecddcf91fdc4fb88d4 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 10 Sep 2023 12:01:30 +0200
Subject: [PATCH 2/3] Adapt Log view to new label payload from API

---
 lib/www/client/source/src/views/Log.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/www/client/source/src/views/Log.vue b/lib/www/client/source/src/views/Log.vue
index 9e0b394..902323e 100644
--- a/lib/www/client/source/src/views/Log.vue
+++ b/lib/www/client/source/src/views/Log.vue
@@ -604,10 +604,10 @@ export default {
     async getLabelDefinitions () {
       const url = `/project/${this.$route.params.project}/label`;
 
-      const labelSet = {};
-      const labels = await this.api([url]) || [];
-      labels.forEach( l => labelSet[l.name] = l.data );
-      this.labels = labelSet;
+      //const labelSet = {};
+      this.labels = await this.api([url]) ?? {};
+      //labels.forEach( l => labelSet[l.name] = l.data );
+      //this.labels = labelSet;
     },
 
     async getPresetRemarks () {

From 5fc51de7d843a7fe507818a0c8a9ff02122f6c36 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 10 Sep 2023 12:01:59 +0200
Subject: [PATCH 3/3] Adapt Log view to new configuration endpoint in the API

---
 lib/www/client/source/src/views/Log.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/www/client/source/src/views/Log.vue b/lib/www/client/source/src/views/Log.vue
index 902323e..1e94849 100644
--- a/lib/www/client/source/src/views/Log.vue
+++ b/lib/www/client/source/src/views/Log.vue
@@ -611,9 +611,9 @@ export default {
     },
 
     async getPresetRemarks () {
-      const url = `/project/${this.$route.params.project}/configuration/events/presetRemarks`;
+      const url = `/project/${this.$route.params.project}/configuration`;
 
-      this.presetRemarks = await this.api([url]);
+      this.presetRemarks = (await this.api([url]))?.events?.presetRemarks ?? {};
     },
 
     newItem (from = {}) {