merge develop

CHANGELOG.md

@@ -1,6 +1,6 @@
 # RDS-NG - Changelog
 
-## v1.6.0 - 2026-09-23
+## v1.6.0 - 2026-09-28
 
 ### New
 
@@ -15,6 +15,7 @@
 ### Fixes
 
 - Do not show disabled connectors in the _Upload Project_ form
+- Enforce unique connection names
 - Properly format date values in metadata forms
 - Fixed passing the resource type for InvenioRDM
 

src/common/package.json

@@ -16,9 +16,9 @@
         "primeicons": "^7.0.0",
         "primevue": "^4.5.5",
         "reflect-metadata": "^0.2.2",
-        "sass": "^1.104.1",
+        "sass": "^1.105.0",
         "semver": "^7.8.5",
-        "socket.io-client": "^4.8.3",
+        "socket.io-client": "^4.8.4",
         "tailwindcss": "^3.4.19",
         "tailwindcss-primeui": "^0.6.1",
         "toml": "^3.0.0",
@@ -41,7 +41,7 @@
         "eslint": "^8.57.1",
         "eslint-plugin-vue": "^9.33.0",
         "npm-run-all": "^4.1.5",
-        "prettier": "^3.9.8",
+        "prettier": "^3.9.9",
         "typedoc": "^0.28.20",
         "typescript": "~5.9.3",
         "vite": "^4.5.14",

src/connectors/datasafe/.assets/profiles/default/metadata-profile.json

@@ -151,8 +151,6 @@
                     "options": [
                         "ORCID",
                         "GND",
-                        "ISNI",
-                        "ROR",
                         "other"
                     ],
                     "description": "",
@@ -170,20 +168,6 @@
                                 "label": "GND Search",
                                 "url": "https://explore.gnd.network/"
                             }
-                        },
-                        "ISNI": {
-                            "text": "International Standard Name Identifier.",
-                            "link": {
-                                "label": "ISNI Search",
-                                "url": "https://isni.org/page/search-database/"
-                            }
-                        },
-                        "ROR": {
-                            "text": "Research Organization Registry Identifier.",
-                            "link": {
-                                "label": "ROR Search",
-                                "url": "https://ror.org/search"
-                            }
                         }
                     }
                 },

src/connectors/datastore/.assets/profiles/default/metadata-profile.json

@@ -138,8 +138,6 @@
                     "options": [
                         "ORCID",
                         "GND",
-                        "ISNI",
-                        "ROR",
                         "other"
                     ],
                     "description": "",
@@ -157,20 +155,6 @@
                                 "label": "GND Search",
                                 "url": "https://explore.gnd.network/"
                             }
-                        },
-                        "ISNI": {
-                            "text": "International Standard Name Identifier.",
-                            "link": {
-                                "label": "ISNI Search",
-                                "url": "https://isni.org/page/search-database/"
-                            }
-                        },
-                        "ROR": {
-                            "text": "Research Organization Registry Identifier.",
-                            "link": {
-                                "label": "ROR Search",
-                                "url": "https://ror.org/search"
-                            }
                         }
                     }
                 },

src/frontend/package.json

@@ -44,7 +44,7 @@
         "eslint": "^8.57.1",
         "eslint-plugin-vue": "^9.33.0",
         "npm-run-all": "^4.1.5",
-        "prettier": "^3.9.8",
+        "prettier": "^3.9.9",
         "typedoc": "^0.28.20",
         "typescript": "~5.9.3",
         "vite": "^4.5.14",

src/frontend/src/ui/dialogs/connector/instance/EditConnectorInstanceDialog.vue

@@ -1,21 +1,45 @@
 <script setup lang="ts">
 import { Form } from "@primevue/forms";
+import { storeToRefs } from "pinia";
 import Fieldset from "primevue/fieldset";
 import IftaLabel from "primevue/iftalabel";
 import InputText from "primevue/inputtext";
 import Textarea from "primevue/textarea";
-import { ref } from "vue";
+import { ref, unref } from "vue";
 import * as yup from "yup";
 
 import { useExtendedDialogTools } from "@common/ui/dialogs/ExtendedDialogTools";
+import { ConnectorInstance } from "@common/data/entities/connector/ConnectorInstance.ts";
 
 import MandatoryMark from "@common/ui/components/misc/MandatoryMark.vue";
 
+import { useConnectorsStore } from "@/data/stores/ConnectorsStore.ts";
+import { useUserStore } from "@/data/stores/UserStore.ts";
+
+const consStore = useConnectorsStore();
+const { connectors } = storeToRefs(consStore);
+const userStore = useUserStore();
+const { userSettings } = storeToRefs(userStore);
+
 const { dialogData, acceptDialog, useValidator } = useExtendedDialogTools();
 
+const originalName = dialogData.userData.name;
 const form = ref();
 const validator = useValidator(form, {
-    name: yup.string().trim().required().label("Name"),
+    name: yup
+        .string()
+        .trim()
+        .required()
+        .test("connector-name-unique", "The name of the connection must be unique", (_, ctx) => {
+            const existingInstance = unref(userSettings).connector_instances.find(
+                (instance: ConnectorInstance) => instance.name.localeCompare(dialogData.userData.name) == 0
+            );
+            if (!!existingInstance && originalName != dialogData.userData.name) {
+                return ctx.createError({ path: "name" });
+            }
+            return true;
+        })
+        .label("Name"),
     description: yup.string().notRequired().label("Description")
 });
 const initialFormValues = ref({

src/frontend/src/ui/dialogs/user/settings/connections/NewConnection.vue

@@ -55,6 +55,7 @@ function onSelectConnector(connector: Connector): void {
             placeholder="Add a new connection..."
             class="w-full"
             variant="filled"
+            scrollHeight="24rem"
             @change="(event) => onSelectConnector(event.value as Connector)"
         >
             <template #option="connectorItem">

src/frontend/src/ui/dialogs/user/settings/connections/UserSettingsConnectionsTab.vue

@@ -59,7 +59,7 @@ function onCreateInstance(instance: ConnectorInstance): void {
         </div>
 
         <NewConnection :user-settings="userSettings" @create-instance="onCreateInstance" />
-        <ScrollPanel class="max-h-[29rem]">
+        <ScrollPanel class="h-[29rem]">
             <ConnectionsList :user-settings="userSettings" :new-instance="newInstance" />
         </ScrollPanel>
     </div>