From d15b67fc4437f7c701b38652edbb6f626a5d3242 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 9 Apr 2026 12:49:50 +0000 Subject: [PATCH 1/2] Initial plan From 1ce439d559af054dbae6ffa1d079040a1bbe8a75 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 9 Apr 2026 12:54:44 +0000 Subject: [PATCH 2/2] Add SIARD 2.2 validation support Agent-Logs-Url: https://github.com/keeps/dbptk-ui/sessions/3b348422-2eca-4b14-bcbc-8c64bb077310 Co-authored-by: hmiguim <1252710+hmiguim@users.noreply.github.com> --- .../SIARDPanel/navigation/ValidationNavigationPanel.java | 3 ++- .../common/server/controller/SIARDController.java | 3 ++- .../resources/config/i18n/client/ClientMessages.properties | 2 +- .../resources/config/i18n/client/ClientMessages_cs.properties | 2 +- .../resources/config/i18n/client/ClientMessages_da.properties | 2 +- .../resources/config/i18n/client/ClientMessages_de.properties | 2 +- .../resources/config/i18n/client/ClientMessages_et.properties | 2 +- .../config/i18n/client/ClientMessages_pt_PT.properties | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/ValidationNavigationPanel.java b/src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/ValidationNavigationPanel.java index a7384d61a..a5c0121d3 100644 --- a/src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/ValidationNavigationPanel.java +++ b/src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/ValidationNavigationPanel.java @@ -116,7 +116,8 @@ private void buildValidateButton() { btnValidate.addStyleName("btn btn-outline-primary btn-play"); btnValidate.addClickHandler(event -> { - if (database.getVersion().equals(ViewerConstants.SIARD_V21)) { + if (database.getVersion().equals(ViewerConstants.SIARD_V21) + || database.getVersion().equals(ViewerConstants.SIARD_V22)) { if (database.getPath() != null && !database.getPath().isEmpty()) { if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) { Dialogs.showValidatorSettings(messages.SIARDValidatorSettings(), messages.basicActionCancel(), diff --git a/src/main/java/com/databasepreservation/common/server/controller/SIARDController.java b/src/main/java/com/databasepreservation/common/server/controller/SIARDController.java index 2aa90ff6e..b0944f423 100644 --- a/src/main/java/com/databasepreservation/common/server/controller/SIARDController.java +++ b/src/main/java/com/databasepreservation/common/server/controller/SIARDController.java @@ -1170,7 +1170,8 @@ private static DatabaseModuleFactory getDatabaseImportModuleFactory(String modul private static DatabaseModuleFactory getSIARDImportModuleFactory(String version) { Set databaseModuleFactories = ReflectionUtils.collectDatabaseModuleFactories(); final String moduleName; - if (version.equals(ViewerConstants.SIARD_V20) || version.equals(ViewerConstants.SIARD_V21)) { + if (version.equals(ViewerConstants.SIARD_V20) || version.equals(ViewerConstants.SIARD_V21) + || version.equals(ViewerConstants.SIARD_V22)) { moduleName = "siard-2"; } else if (version.equals(ViewerConstants.SIARD_V10)) { moduleName = "siard-1"; diff --git a/src/main/resources/config/i18n/client/ClientMessages.properties b/src/main/resources/config/i18n/client/ClientMessages.properties index b851034be..8e505d2b4 100644 --- a/src/main/resources/config/i18n/client/ClientMessages.properties +++ b/src/main/resources/config/i18n/client/ClientMessages.properties @@ -800,7 +800,7 @@ validatorPageTextForDatabaseName=Database Name: validatorPageTextForStatus=Status: SIARDValidatorSettings=Validation settings SIARDValidatorDialogInformationTitle=Validation Information -SIARDValidatorTextForVersionCannotBeValidated=Validator only supports SIARD version 2.1, in order to validate the SIARD export it using the option '"'migrate to SIARD'"' available in the '"'SIARD'"' options. +SIARDValidatorTextForVersionCannotBeValidated=Validator only supports SIARD versions 2.1 and 2.2, in order to validate the SIARD export it using the option '"'migrate to SIARD'"' available in the '"'SIARD'"' options. allowedTypes=Allowed data types: reporterDestinationFolder=Report destination folder: reporterTip=Path to store the SIARD validation report diff --git a/src/main/resources/config/i18n/client/ClientMessages_cs.properties b/src/main/resources/config/i18n/client/ClientMessages_cs.properties index c46c26835..7e5e5ef1a 100644 --- a/src/main/resources/config/i18n/client/ClientMessages_cs.properties +++ b/src/main/resources/config/i18n/client/ClientMessages_cs.properties @@ -707,7 +707,7 @@ uploadSIARDTextForDoneUpload=Aktivace byla dokončena. Nyní lze aktivovat dalš ############################################################################# SIARDValidatorSettings=Nastavení validátoru SIARDValidatorDialogInformationTitle=Validátor - informace -SIARDValidatorTextForVersionCannotBeValidated=Validátor podporuje pouze soubory SIARD verze 2.1, pro validaci exportu SIARD je nezbytné provést migraci '"'migrovat do SIARD'"' přístupnou v '"'SIARD'"' možnosti. +SIARDValidatorTextForVersionCannotBeValidated=Validátor podporuje pouze soubory SIARD verzí 2.1 a 2.2, pro validaci exportu SIARD je nezbytné provést migraci '"'migrovat do SIARD'"' přístupnou v '"'SIARD'"' možnosti. allowedTypes=Povolené datové typy: reporterDestinationFolder=Adresář pro validačních zpráv: reporterTip=Cesta do úložižtě validačních zpráv diff --git a/src/main/resources/config/i18n/client/ClientMessages_da.properties b/src/main/resources/config/i18n/client/ClientMessages_da.properties index 26408b3aa..c8ed40910 100644 --- a/src/main/resources/config/i18n/client/ClientMessages_da.properties +++ b/src/main/resources/config/i18n/client/ClientMessages_da.properties @@ -795,7 +795,7 @@ validatorPageTextForDatabaseName=Databasenavn: validatorPageTextForStatus=Status: SIARDValidatorSettings=Valideringsindstillinger SIARDValidatorDialogInformationTitle=Valideringsinformation -SIARDValidatorTextForVersionCannotBeValidated=Valideringsværktøjet understøtter kun SIARD version 2.1. For at validere SIARD-filen, eksportér den ved hjælp af valgmuligheden "migrér til SIARD" under "SIARD"-indstillingerne. +SIARDValidatorTextForVersionCannotBeValidated=Valideringsværktøjet understøtter kun SIARD versioner 2.1 og 2.2. For at validere SIARD-filen, eksportér den ved hjælp af valgmuligheden "migrér til SIARD" under "SIARD"-indstillingerne. allowedTypes=Tilladte datatyper: reporterDestinationFolder=Destinationsmappe til rapporten: reporterTip=Sti til hvor SIARD valideringsrapporten gemmes diff --git a/src/main/resources/config/i18n/client/ClientMessages_de.properties b/src/main/resources/config/i18n/client/ClientMessages_de.properties index 817bd49bf..10ff6bc76 100644 --- a/src/main/resources/config/i18n/client/ClientMessages_de.properties +++ b/src/main/resources/config/i18n/client/ClientMessages_de.properties @@ -709,7 +709,7 @@ validatorPageTextForDatabaseName=Datenbankname: validatorPageTextForStatus=Status: SIARDValidatorSettings=Validator-Einstellungen SIARDValidatorDialogInformationTitle=Validator-Informationen -SIARDValidatorTextForVersionCannotBeValidated=Validator unterstützt nur SIARD Version 2.1, um andere SIARD-Versionen zu validieren, exportieren Sie es mit der Option '"'auf SIARD migrieren'"', die in den Optionen '"'SIARD'"' verfügbar ist +SIARDValidatorTextForVersionCannotBeValidated=Validator unterstützt nur SIARD Versionen 2.1 und 2.2, um andere SIARD-Versionen zu validieren, exportieren Sie es mit der Option '"'auf SIARD migrieren'"', die in den Optionen '"'SIARD'"' verfügbar ist allowedTypes=Zulässige Datentypen: reporterDestinationFolder=Zielordner für Validierungsbericht: reporterTip=URI zum Speichern des SIARD-Validierungsberichts diff --git a/src/main/resources/config/i18n/client/ClientMessages_et.properties b/src/main/resources/config/i18n/client/ClientMessages_et.properties index 178065548..4e89991b4 100644 --- a/src/main/resources/config/i18n/client/ClientMessages_et.properties +++ b/src/main/resources/config/i18n/client/ClientMessages_et.properties @@ -731,7 +731,7 @@ validatorPageTextForDatabaseName=Andmebaasi nimi: validatorPageTextForStatus=Olek: SIARDValidatorSettings=Valideerimise sätted SIARDValidatorDialogInformationTitle=Valideerimise informatsioon -SIARDValidatorTextForVersionCannotBeValidated=Validaator toetab ainult SIARD versiooni 2.1, kui soovite vanemaid formaate valideerida, siis kasutage '"'migreeri SIARD faili'"', mis on kättesaadav '"'SIARD'"' valikute all +SIARDValidatorTextForVersionCannotBeValidated=Validaator toetab ainult SIARD versioone 2.1 ja 2.2, kui soovite vanemaid formaate valideerida, siis kasutage '"'migreeri SIARD faili'"', mis on kättesaadav '"'SIARD'"' valikute all allowedTypes=Lubatud andmetüübid: reporterDestinationFolder=Raporti asukoht: reporterTip=Teekond SIARD faili valideerimisraporti salvestamiseks diff --git a/src/main/resources/config/i18n/client/ClientMessages_pt_PT.properties b/src/main/resources/config/i18n/client/ClientMessages_pt_PT.properties index 1443b2500..fd447e53c 100644 --- a/src/main/resources/config/i18n/client/ClientMessages_pt_PT.properties +++ b/src/main/resources/config/i18n/client/ClientMessages_pt_PT.properties @@ -780,7 +780,7 @@ reporterDestinationFolder=Pasta de destino do relatório: reporterTip=Pasta onde o relatório relativo à validação do SIARD será guardado allowedTypesTip=Ficheiro onde estão descritos os tipos de dados definidos pelo utilizador permitidos para a validação do SIARD. Um ficheiro com a extensão .txt com um tipo por linha. clear=Limpar -SIARDValidatorTextForVersionCannotBeValidated=A validação do SIARD é apenas suportada para a versão 2.1. +SIARDValidatorTextForVersionCannotBeValidated=A validação do SIARD é apenas suportada para as versões 2.1 e 2.2. validatorPageTextForTitle=Validação reportFile=Relatório: SIARDValidatorDialogInformationTitle=Informação sobre a validação