From b463bca39d1531042ea654ed6008dd8164b2b0f9 Mon Sep 17 00:00:00 2001 From: elias Date: Wed, 25 Sep 2024 14:05:00 +0200 Subject: [PATCH 1/3] added @JsonProperty Annotations to fields in Requirements-class, because Jackson ObjectMapper adjusted filednames while deserializing (isDataPackagesRequired --> dataPackagesRequired) --- .../projectmanagement/domain/Requirements.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Requirements.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Requirements.java index f779202583..33d8a4c3b7 100644 --- a/src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Requirements.java +++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Requirements.java @@ -2,6 +2,7 @@ import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonProperty; import org.javers.core.metamodel.annotation.ValueObject; import eu.dzhw.fdz.metadatamanagement.projectmanagement.domain.validation.EitherDataPackagesOrAnalysisPackagesRequired; @@ -36,46 +37,55 @@ public class Requirements implements Serializable { * Defines if dataPackage data is required for a release (either this object type is mandatory or * analysis packages). */ + @JsonProperty("isDataPackagesRequired") private boolean isDataPackagesRequired; /** * Defines if analysis package data is required for a release (either this object type is * mandatory or data packages). */ + @JsonProperty("isAnalysisPackagesRequired") private boolean isAnalysisPackagesRequired; /** * Defines if survey data is required for a release. */ + @JsonProperty("isSurveysRequired") private boolean isSurveysRequired; /** * Defines if instrument data is required for a release. */ + @JsonProperty("isInstrumentsRequired") private boolean isInstrumentsRequired; /** * Defines if question data is required for a release. */ + @JsonProperty("isQuestionsRequired") private boolean isQuestionsRequired; /** * Defines if data set data is required for a release. */ + @JsonProperty("isDataSetsRequired") private boolean isDataSetsRequired; /** * Defines if variable data is required for a release. */ + @JsonProperty("isVariablesRequired") private boolean isVariablesRequired; /** * Defines if publication data is required for a release. */ + @JsonProperty("isPublicationsRequired") private boolean isPublicationsRequired; /** * Defines if concept data is required for a release. */ + @JsonProperty("isConceptsRequired") private boolean isConceptsRequired; } From 72a9a78764332ca7e0db19328f0851f888ab4f79 Mon Sep 17 00:00:00 2001 From: theresa Date: Thu, 17 Oct 2024 10:33:50 +0200 Subject: [PATCH 2/3] #3233 updated all project cockpit requirements requests to use new ES field 'is[type]Required' --- .../metadata-type-state-card.directive.js | 8 ++++---- .../metadata-type-state-card.html.tmpl | 6 +++--- .../project-cockpit-config.html.tmpl | 18 +++++++++--------- .../project-cockpit-status.directive.js | 2 +- .../project-cockpit-status.html.tmpl | 4 ++-- .../project-cockpit-versions.html.tmpl | 4 ++-- .../services/projectUpdateAccessService.js | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-type-state-card.directive.js b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-type-state-card.directive.js index 778ac977a0..a26c936794 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-type-state-card.directive.js +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-type-state-card.directive.js @@ -152,8 +152,8 @@ angular.module('metadatamanagementApp') }; ctrl.isRequired = function() { - return _.get(ctrl, 'project.configuration.requirements.' + - ctrl.type + 'Required'); + return _.get(ctrl, 'project.configuration.requirements.' + 'is' + + ctrl.type.charAt(0).toUpperCase() + ctrl.type.slice(1) + 'Required'); }; ctrl.getModifyButtonLabel = function(group) { @@ -182,8 +182,8 @@ angular.module('metadatamanagementApp') }; ctrl.isUpdateAllowed = function(type) { - return !_.get(ctrl, 'project.configuration.requirements.' + - type + 'Required'); + return !_.get(ctrl, 'project.configuration.requirements.is' + + type.charAt(0).toUpperCase() + type.slice(1) + 'Required'); }; ctrl.isUploadAllowed = function(type) { diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-type-state-card.html.tmpl b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-type-state-card.html.tmpl index 064913c272..a647bfc623 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-type-state-card.html.tmpl +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-type-state-card.html.tmpl @@ -1,4 +1,4 @@ - + @@ -50,13 +50,13 @@ {{'data-acquisition-project-management.project-cockpit.config.upload' | translate}} {{ctrl.getTooltip(ctrl.type) | translate}} - + {{'related-publication-management.report-publications.button.text' | translate}} {{'related-publication-management.report-publications.button.tooltip' | translate }} - + {{'related-publication-management.report-publications.button.text' | translate}} {{'related-publication-management.report-publications.button.analysis-package.tooltip' | translate }} diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-config.html.tmpl b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-config.html.tmpl index 3bde70b0a5..07d0db21e8 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-config.html.tmpl +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-config.html.tmpl @@ -54,56 +54,56 @@ - + {{'data-acquisition-project-management.project-cockpit.requirements.dataPackages' | translate}} - + {{'data-acquisition-project-management.project-cockpit.requirements.surveys' | translate}} - + {{'data-acquisition-project-management.project-cockpit.requirements.instruments' | translate}} - + {{'data-acquisition-project-management.project-cockpit.requirements.questions' | translate}} - + {{'data-acquisition-project-management.project-cockpit.requirements.dataSets' | translate}} - + {{'data-acquisition-project-management.project-cockpit.requirements.variables' | translate}} - + {{'data-acquisition-project-management.project-cockpit.requirements.publications' | translate}} - + {{'data-acquisition-project-management.project-cockpit.requirements.concepts' | translate}} @@ -112,7 +112,7 @@ - + {{'data-acquisition-project-management.project-cockpit.requirements.analysisPackages' | translate}} diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-status.directive.js b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-status.directive.js index 50c826cf13..3b41d6cd03 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-status.directive.js +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-status.directive.js @@ -44,7 +44,7 @@ angular.module('metadatamanagementApp') var optionalStates = ['surveys', 'instruments', 'questions', 'dataSets', 'variables', 'publications', 'concepts', 'fake1']; var activeStates = _.filter(optionalStates, function(state) { - return ctrl.project.configuration.requirements[state + 'Required']; + return ctrl.project.configuration.requirements['is' + state.charAt(0).toUpperCase() + state.slice(1) + 'Required']; }); var inactiveStates = _.difference(optionalStates, activeStates); return activeStates.concat(inactiveStates); diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-status.html.tmpl b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-status.html.tmpl index a537eac03b..7ac1363418 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-status.html.tmpl +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-status.html.tmpl @@ -25,8 +25,8 @@
- - + +
diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-versions.html.tmpl b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-versions.html.tmpl index d446f2f3e6..a05dff4fbc 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-versions.html.tmpl +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-versions.html.tmpl @@ -4,13 +4,13 @@
- + {{('analysis-package-management.detail.label.version' | translate) + ' ' + shadow.release.version}} {{'(' + ('analysis-package-management.detail.label.published-at' | translate) + ' ' + (shadow.release.lastDate + 'Z' | date:'mediumDate') + ')'}} {{'(' + ('analysis-package-management.detail.label.pre-published-at' | translate) + ' ' + (shadow.release.lastDate + 'Z' | date:'mediumDate') + ')'}} - + {{('data-package-management.detail.label.version' | translate) + ' ' + shadow.release.version}} {{'(' + ('data-package-management.detail.label.published-at' | translate) + ' ' + (shadow.release.lastDate + 'Z' | date:'mediumDate') + ')'}} {{'(' + ('data-package-management.detail.label.pre-published-at' | translate) + ' ' + (shadow.release.lastDate + 'Z' | date:'mediumDate') + ')'}} diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/services/projectUpdateAccessService.js b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/services/projectUpdateAccessService.js index 3656d9a916..22382a2b2d 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/services/projectUpdateAccessService.js +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/services/projectUpdateAccessService.js @@ -36,8 +36,8 @@ angular.module('metadatamanagementApp').service('ProjectUpdateAccessService', [ type = type === 'data_sets' ? 'dataSets' : type; type = type === 'data_packages' ? 'dataPackages' : type; type = type === 'analysis_packages' ? 'analysisPackages' : type; - return _.get(project, 'configuration.requirements.' + type + - 'Required'); + return _.get(project, 'configuration.requirements.is' + type.charAt(0).toUpperCase() + + type.slice(1) + 'Required'); } else { return false; } From 248694eb89e459b5768a434f9f860a30a9120267 Mon Sep 17 00:00:00 2001 From: theresa Date: Mon, 21 Oct 2024 14:47:24 +0200 Subject: [PATCH 3/3] #3233 updated even more requirements requests to use the new ES field 'is[type]Required' in embargo warning, navbar, cockpit, release dialog and search controller --- .../embargo-warning.directive.js | 2 +- ...sition-project-navbar-module.controller.js | 2 +- .../project-cockpit-config.directive.js | 24 +++++++++---------- .../services/projectStatusScoringService.js | 2 +- .../release-project-dialog.controller.js | 4 ++-- .../views/release-project-dialog.html.tmpl | 2 +- .../views/search.controller.js | 18 +++++++------- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/mdm-frontend/src/app/legacy/common/embargo-warning/embargo-warning.directive.js b/mdm-frontend/src/app/legacy/common/embargo-warning/embargo-warning.directive.js index c7450fa0b1..a89fa49ec3 100644 --- a/mdm-frontend/src/app/legacy/common/embargo-warning/embargo-warning.directive.js +++ b/mdm-frontend/src/app/legacy/common/embargo-warning/embargo-warning.directive.js @@ -27,7 +27,7 @@ angular.module('metadatamanagementApp') } this.project = $scope.project; this.type = this.project - && this.project.configuration.requirements.dataPackagesRequired ? 'data-package' : 'analysis-package'; + && this.project.configuration.requirements.isDataPackagesRequired ? 'data-package' : 'analysis-package'; }], link: function (ctrl) { diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js index 443d764d20..e7a499e991 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js @@ -81,7 +81,7 @@ angular.module('metadatamanagementApp') project.configuration = { publishers: [identity.login], requirements: { - dataPackagesRequired: true + isDataPackagesRequired: true } }; project.assigneeGroup = 'PUBLISHER'; diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-config.directive.js b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-config.directive.js index bd0e26edb5..77ee68690e 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-config.directive.js +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/project-cockpit-config.directive.js @@ -95,24 +95,24 @@ angular.module('metadatamanagementApp') * Sets basic requirements in case of analysis packages being selected as the project type. */ ctrl.isAnalysisPackageChecked = function() { - req.analysisPackagesRequired = true; - req.dataPackagesRequired = false; - req.surveysRequired = false; - req.instrumentsRequired = false; - req.questionsRequired = false; - req.dataSetsRequired = false; - req.variablesRequired = false; - req.publicationsRequired = true; - req.conceptsRequired = false; + req.isAnalysisPackagesRequired = true; + req.isDataPackagesRequired = false; + req.isSurveysRequired = false; + req.isInstrumentsRequired = false; + req.isQuestionsRequired = false; + req.isDataSetsRequired = false; + req.isVariablesRequired = false; + req.isPublicationsRequired = true; + req.isConceptsRequired = false; }; /** * Sets basic requirements in case of data packages being selected as the project type. */ ctrl.isDataPackageChecked = function() { - req.analysisPackagesRequired = false; - req.dataPackagesRequired = true; - req.publicationsRequired = false; + req.isAnalysisPackagesRequired = false; + req.isDataPackagesRequired = true; + req.isPublicationsRequired = false; }; /** diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/services/projectStatusScoringService.js b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/services/projectStatusScoringService.js index ba8868a6e6..35131905b5 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/services/projectStatusScoringService.js +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/services/projectStatusScoringService.js @@ -11,7 +11,7 @@ angular.module('metadatamanagementApp') .service('ProjectStatusScoringService', function() { var scoreProjectStatus = function(project, type) { var isRequired = project.configuration - .requirements[type + 'Required']; + .requirements['is' + type.charAt(0).toUpperCase() + type.slice(1) + 'Required']; var typeState = project.configuration[type + 'State']; diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/views/release-project-dialog.controller.js b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/views/release-project-dialog.controller.js index 8028374740..14131e787a 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/views/release-project-dialog.controller.js +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/views/release-project-dialog.controller.js @@ -104,14 +104,14 @@ angular.module('metadatamanagementApp') var excludes = ['nested*','variables','questions', 'surveys','instruments', 'relatedPublications', 'concepts']; - if (project.configuration.requirements.dataPackagesRequired) { + if (project.configuration.requirements.isDataPackagesRequired) { // request the data package to get its title and doi through the master id DataPackageSearchService.findDataPackageById( DataPackageIdBuilderService.buildDataPackageId(project.id), excludes) .promise.then(function(response) { $scope.setTweetPlaceholder(response); }); - } else if (project.configuration.requirements.analysisPackagesRequired) { + } else if (project.configuration.requirements.isAnalysisPackagesRequired) { // request the analysis package to get its title and doi through the master id AnalysisPackageSearchService.findAnalysisPackageById( AnalysisPackageIdBuilderService.buildAnalysisPackageId(project.id), excludes) diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/views/release-project-dialog.html.tmpl b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/views/release-project-dialog.html.tmpl index 682ca73c51..ddee53ae90 100644 --- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/views/release-project-dialog.html.tmpl +++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/views/release-project-dialog.html.tmpl @@ -71,7 +71,7 @@ - + {{'data-acquisition-project-management.release.pin-to-start-page' | translate }} diff --git a/mdm-frontend/src/app/legacy/searchmanagement/views/search.controller.js b/mdm-frontend/src/app/legacy/searchmanagement/views/search.controller.js index 2dac9d9738..f367b03448 100644 --- a/mdm-frontend/src/app/legacy/searchmanagement/views/search.controller.js +++ b/mdm-frontend/src/app/legacy/searchmanagement/views/search.controller.js @@ -584,31 +584,31 @@ angular.module('metadatamanagementApp').controller('SearchController', [ if (project) { var inactiveStates = []; - if (!project.configuration.requirements.dataPackagesRequired) { + if (!project.configuration.requirements.isDataPackagesRequired) { inactiveStates.push('dataPackages'); } - if (!project.configuration.requirements.analysisPackagesRequired) { + if (!project.configuration.requirements.isAnalysisPackagesRequired) { inactiveStates.push('analysisPackages'); } - if (!project.configuration.requirements.conceptsRequired) { + if (!project.configuration.requirements.isConceptsRequired) { inactiveStates.push('concepts'); } - if (!project.configuration.requirements.surveysRequired) { + if (!project.configuration.requirements.isSurveysRequired) { inactiveStates.push('surveys'); } - if (!project.configuration.requirements.instrumentsRequired) { + if (!project.configuration.requirements.isInstrumentsRequired) { inactiveStates.push('instruments'); } - if (!project.configuration.requirements.questionsRequired) { + if (!project.configuration.requirements.isQuestionsRequired) { inactiveStates.push('questions'); } - if (!project.configuration.requirements.dataSetsRequired) { + if (!project.configuration.requirements.isDataSetsRequired) { inactiveStates.push('dataSets'); } - if (!project.configuration.requirements.variablesRequired) { + if (!project.configuration.requirements.isVariablesRequired) { inactiveStates.push('variables'); } - if (!project.configuration.requirements.publicationsRequired) { + if (!project.configuration.requirements.isPublicationsRequired) { inactiveStates.push('publications'); }