From 89ae5651f70705eeed81a24315ec822fdcc28ee3 Mon Sep 17 00:00:00 2001 From: geofranzi Date: Wed, 4 Feb 2026 00:28:47 +0100 Subject: [PATCH 1/6] Fix Dataset API: Entity template ID is missing #2368 --- .../Controllers/API/DatasetOutController.cs | 2 +- .../DIM/BExIS.Modules.Dim.UI/Helpers/ApiDatasetHelper.cs | 5 +++-- .../Areas/DIM/BExIS.Modules.Dim.UI/Models/API/ApiModels.cs | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs index f4b5c1530..6602fe15b 100644 --- a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs +++ b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs @@ -120,7 +120,7 @@ public HttpResponseMessage Get(long id) ApiDatasetHelper apiDatasetHelper = new ApiDatasetHelper(); // get content - ApiDatasetModel datasetModel = apiDatasetHelper.GetContent(datasetVersion, id, versionNumber, dataset.MetadataStructure.Id, dataStructureId); + ApiDatasetModel datasetModel = apiDatasetHelper.GetContent(datasetVersion, id, versionNumber, dataset.MetadataStructure.Id, dataStructureId, dataset.EntityTemplate.Id); var datastructureId = dataset.DataStructure==null?0: dataset.DataStructure.Id; // get links diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Helpers/ApiDatasetHelper.cs b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Helpers/ApiDatasetHelper.cs index d70cc9a16..611c272fa 100644 --- a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Helpers/ApiDatasetHelper.cs +++ b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Helpers/ApiDatasetHelper.cs @@ -22,7 +22,7 @@ namespace BExIS.Modules.Dim.UI.Helpers { public class ApiDatasetHelper { - public ApiDatasetModel GetContent(DatasetVersion datasetVersion, long id, int versionNumber, long metadataStructureId, long dataStructureId) + public ApiDatasetModel GetContent(DatasetVersion datasetVersion, long id, int versionNumber, long metadataStructureId, long dataStructureId, long entityTemplateId) { ApiDatasetModel datasetModel = new ApiDatasetModel() { @@ -33,7 +33,8 @@ public ApiDatasetModel GetContent(DatasetVersion datasetVersion, long id, int ve Title = datasetVersion.Title, Description = datasetVersion.Description, DataStructureId = dataStructureId, - MetadataStructureId = metadataStructureId + MetadataStructureId = metadataStructureId, + EntityTemplateId = entityTemplateId }; Dictionary> objects = new Dictionary>(); diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Models/API/ApiModels.cs b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Models/API/ApiModels.cs index 25e7dff01..929208a6b 100644 --- a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Models/API/ApiModels.cs +++ b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Models/API/ApiModels.cs @@ -36,6 +36,7 @@ public class ApiDatasetModel public string Description { get; set; } public long DataStructureId { get; set; } public long MetadataStructureId { get; set; } + public long EntityTemplateId { get; set; } public bool IsPublic { get; set; } public string PublicationDate { get; set; } //public string VersionName { get; set; } From bacc2f92c954d720b85ef0878be5b22743efb677 Mon Sep 17 00:00:00 2001 From: geofranzi Date: Wed, 4 Feb 2026 00:33:33 +0100 Subject: [PATCH 2/6] Fix Dataset API: Entity template ID is missing #2368 --- .../Controllers/API/DatasetOutController.cs | 2 +- .../DIM/BExIS.Modules.Dim.UI/Controllers/ExportController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs index 6602fe15b..a938ec66e 100644 --- a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs +++ b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs @@ -283,7 +283,7 @@ private HttpResponseMessage get(long id, long versionId) ApiDatasetHelper apiDatasetHelper = new ApiDatasetHelper(); // get content - ApiDatasetModel datasetModel = apiDatasetHelper.GetContent(datasetVersion, id, version, metadataStructureId, dataset.DataStructure.Id); + ApiDatasetModel datasetModel = apiDatasetHelper.GetContent(datasetVersion, id, version, metadataStructureId, dataset.DataStructure.Id, dataset.EntityTemplate.Id); EntityReferenceHelper entityReferenceHelper = new EntityReferenceHelper(); diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/ExportController.cs b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/ExportController.cs index c3c0481f1..5ade61ae9 100644 --- a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/ExportController.cs +++ b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/ExportController.cs @@ -369,7 +369,7 @@ public ActionResult GenerateZip(long id, long versionid, string format,bool with // manifest ApiDatasetHelper apiDatasetHelper = new ApiDatasetHelper(); // get content - ApiDatasetModel apimodel = apiDatasetHelper.GetContent(datasetVersion, id, datasetVersionNumber, datasetVersion.Dataset.MetadataStructure.Id, dataStructureId); + ApiDatasetModel apimodel = apiDatasetHelper.GetContent(datasetVersion, id, datasetVersionNumber, datasetVersion.Dataset.MetadataStructure.Id, dataStructureId, datasetVersion.Dataset.EntityTemplate.Id); GeneralMetadataModel datasetModel = GeneralMetadataModel.Map(apimodel); datasetModel.DownloadInformation.DownloadDate = DateTime.Now.ToString(new CultureInfo("en-US")); From a1aceb039431791a8089da733cc7196b168fc1ea Mon Sep 17 00:00:00 2001 From: geofranzi Date: Wed, 4 Feb 2026 00:35:31 +0100 Subject: [PATCH 3/6] Add minimal tag request workflow - add missing dcm setting #1735 --- .../BExIS.Modules.Ddm.UI/Ddm.Settings.json | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Ddm.Settings.json b/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Ddm.Settings.json index 2b6ade261..e65afc4c5 100644 --- a/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Ddm.Settings.json +++ b/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Ddm.Settings.json @@ -38,6 +38,13 @@ "type": "Boolean", "description": "If set to true, the minor version tag can be assigned to dataset versions to display changes in more detail." }, + { + "key": "curator_required_for_tags", + "title": "Manage release tags requires curator", + "value": false, + "type": "Boolean", + "description": "If set to true, only curators can edit and set tags. Users can only send a request." + }, { "key": "search_result_presentation", "title": "Search Result Presentation", @@ -82,18 +89,18 @@ "description": "Group name all curators assigned to. This is needed for the curation tool to know who is curator." }, { - "key": "curation", - "title": "Configuration Settings for Curation", - "value": { - "curationLabels": [ - { - "name": "custom-label-1", - "color": "#ff0000" - } - ] - }, - "type": "JSON", - "description": "Customize the labels that can be used in the curation. \nExample: \"curationLabels\": [ { \"name\": \"custom-label-1\", \"color\": \"#ff0000\" }, ... ]" + "key": "curation", + "title": "Configuration Settings for Curation", + "value": { + "curationLabels": [ + { + "name": "custom-label-1", + "color": "#ff0000" + } + ] + }, + "type": "JSON", + "description": "Customize the labels that can be used in the curation. \nExample: \"curationLabels\": [ { \"name\": \"custom-label-1\", \"color\": \"#ff0000\" }, ... ]" } ] From f1955313f66262c6abbdcf327ffe379f7a3ffc23 Mon Sep 17 00:00:00 2001 From: geofranzi Date: Wed, 4 Feb 2026 00:43:03 +0100 Subject: [PATCH 4/6] Add operations to enable testing, add to seed data #2296 --- .../BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs index 5892e2856..0e725f44d 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs @@ -267,6 +267,13 @@ public void GenerateSeedData() #endregion entity template + #region New Metadata Edit, Config and View + // TODO add to feature + operationManager.Create("DCM", "ComponentConfig", "*"); + // operationManager.Create("DCM", "MetadateEdit", "*"); + + #endregion + #region public available //because of reuse in ddm this controller must be public From c87ef356f81914cffc62c4379ca063813e485286 Mon Sep 17 00:00:00 2001 From: geofranzi Date: Wed, 4 Feb 2026 00:43:47 +0100 Subject: [PATCH 5/6] Add ComponentConfig controller #2296 --- .../Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj index 1982fd36e..de34a9b37 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj @@ -54,6 +54,7 @@ + @@ -468,6 +469,8 @@ + + Web.config From c88ddd51f5bf3f2f466a3be428244e8d4c681dd0 Mon Sep 17 00:00:00 2001 From: geofranzi Date: Wed, 4 Feb 2026 01:15:11 +0100 Subject: [PATCH 6/6] Remove wrong folder for metadiff controller #2296 --- .../Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj index d59efcd3a..6bf353e0d 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj @@ -469,7 +469,6 @@ - Web.config