Merge pull request #3335 from dzhw/dev-2024-1-2

Bugfix Release 2024.1.2 for Production
dzhw · Apr 17, 2024 · 6bcdab1 · 6bcdab1
2 parents d1ac171 + 4f7f0fb
commit 6bcdab1
Show file tree

Hide file tree

Showing 21 changed files with 131 additions and 106 deletions.
diff --git a/mdm-frontend/package-lock.json b/mdm-frontend/package-lock.json
diff --git a/mdm-frontend/package.json b/mdm-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mdm-frontend",
-  "version": "2024.1.1",
+  "version": "2024.1.2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.conf.json",

diff --git a/mdm-frontend/src/app/legacy/administration/health/health.controller.js b/mdm-frontend/src/app/legacy/administration/health/health.controller.js
@@ -9,9 +9,9 @@ angular.module('metadatamanagementApp').controller('HealthController', [
   '$state',
   'BreadcrumbService',
   'SimpleMessageToastService',
-  'DaraReleaseResource',
+  'DaraReleaseCustomResource',
   function($scope, MonitoringService, $uibModal, ElasticSearchAdminService,
-    PageMetadataService, $state, BreadcrumbService, SimpleMessageToastService, DaraReleaseResource) {
+    PageMetadataService, $state, BreadcrumbService, SimpleMessageToastService, DaraReleaseCustomResource) {
     PageMetadataService.setPageTitle('administration.health.title');
     $scope.isRecreatingIndices = false;
     $scope.updatingHealth = true;
@@ -49,7 +49,7 @@ angular.module('metadatamanagementApp').controller('HealthController', [
      */
     $scope.updateDaraProjects = function(health) {
       $scope.isUpdatingDara = true;
-      DaraReleaseResource.updateDaraProjects().then(function(errorsList) {
+      DaraReleaseCustomResource.updateDaraProjects().then(function(errorsList) {
         if (errorsList.length > 0) {
           // errors occurred during update
           SimpleMessageToastService.openAlertMessageToasts(

diff --git a/...gacy/analysispackagemanagement/components/scriptsection/edit-script-section.controller.js b/...gacy/analysispackagemanagement/components/scriptsection/edit-script-section.controller.js
@@ -81,10 +81,7 @@
         if ($ctrl.scripts && $ctrl.scripts.length === 0) {
           $ctrl.scripts = [{
             uuid: uuid.v4(),
-            title: {
-              de: '',
-              en: ''
-            },
+            title: '',
             softwarePackage: '',
             softwarePackageVersion: '',
             usedLanguage: '',
@@ -138,10 +135,7 @@
       $ctrl.addScript = function() {
         $ctrl.scripts.push({
           uuid: uuid.v4(),
-          title: {
-            de: '',
-            en: ''
-          },
+          title: '',
           softwarePackage: '',
           softwarePackageVersion: '',
           usedLanguage: '',

diff --git a/...p/legacy/analysispackagemanagement/components/scriptsection/edit-script-section.html.tmpl b/...p/legacy/analysispackagemanagement/components/scriptsection/edit-script-section.html.tmpl
@@ -59,6 +59,85 @@
             <input hidden
                    name="scriptsUuid_{{$index}}"
                    ng-model="script.uuid">
+            <md-input-container flex="50"
+                class="ml0 mr8"
+                md-is-error="!$ctrl.currentForm['scriptsTitle_' + $index].$valid && ($ctrl.currentForm['scriptsTitle_' + $index].$dirty || $ctrl.currentForm['scriptsTitle_' + $index].$touched)">
+                <label>{{'analysis-package-management.detail.label.title' | translate}}</label>
+                <input
+                    md-no-asterisk
+                    name="scriptsTitle_{{$index}}"
+                    md-maxlength="2048"
+                    ng-model="script.title">
+                <div class="fdz-input-hint"
+                    ng-if="!$ctrl.currentForm['scriptsTitle_' + $index].$dirty && !$ctrl.currentForm['scriptsTitle_' + $index].$touched">
+                    {{'analysis-package-management.edit.hints.script.title' | translate}}
+                </div>
+                <div multiple ng-messages="$ctrl.currentForm['scriptsTitle_' + $index].$error">
+                    <div ng-message="md-maxlength">
+                        {{'analysis-package-management.error.script.title.i18n-string-size' | translate}}
+                    </div>
+                </div>
+            </md-input-container>
+            <div flex="100"
+                 layout="row"
+                 layout-gt-sm="row"
+                 class="mr8 items-center">
+              <p class="ma0" ng-if="$ctrl.createMode">{{'analysis-package-management.detail.label.save-file' | translate}}</p>
+              <md-input-container class="pa0 ms-flex w-100"
+                                  ng-if="!$ctrl.createMode"
+                                  ngf-drop="$ctrl.addScriptAttachment($file, $index, $event)"
+                                  ngf-drag-over-class="{accept:'fdz-file-drop-accept', delay:0}"
+                                  ngf-select="$ctrl.addScriptAttachment($file, $index, $event)"
+                                  class="pointer"
+                                  md-is-error="!currentForm['filename' + $index].$valid && (currentForm['filename' + $index].$dirty || currentForm['filename' + $index].$touched)">
+
+                <label>{{'analysis-package-management.detail.label.file' | translate}}</label>
+                <input disabled ng-pattern="/^[_A-Za-z0-9äöüÄÖÜß\-.]*$/"
+                       ng-model="script.scriptAttachmentMetadata.fileName"
+                       name="filename_{{$index}}" class="pointer"
+                       ng-if="!ctrl.createMode"
+                       style="border-bottom: 1px rgba(0,0,0,0.12) solid; background-image: none;">
+                <div
+                  ng-if="!currentForm['filename' + $index].$dirty && !currentForm['filename' + $index].$touched"
+                  class="fdz-input-hint">
+                  {{ 'analysis-package-management.edit.hints.script-attachment-metadata.filename' | translate}}
+                </div>
+                <div ng-messages="currentForm['filename' + $index].$error"
+                     multiple>
+                  <div ng-message="unique">
+                    {{'analysis-package-management.error.script-attachment-metadata.filename.not-unique' | translate}}
+                  </div>
+                  <div ng-message="valid">
+                    {{'analysis-package-management.error.script-attachment-metadata.filename.not-valid' | translate}}
+                  </div>
+                  <div ng-message="pattern">
+                    {{'analysis-package-management.error.script-attachment-metadata.filename.pattern' | translate}}
+                  </div>
+                </div>
+              </md-input-container>
+              <div class="fdz-button-wrapper mt18 self-start">
+                <md-button class="md-primary md-icon-button ma0"
+                           ng-click="$ctrl.addScriptAttachmentButton($index)"
+                           ng-if="!$ctrl.createMode && !($ctrl.scriptAttachments | filter: { scriptUuid: script.uuid }).length > 0">
+                  <md-tooltip md-autohide="true" md-direction="bottom"
+                              md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+                    {{'analysis-package-management.detail.script-attachment-metadata.add-attachment-tooltip' | translate
+                    }}
+                  </md-tooltip>
+                  <md-icon md-font-set="material-icons">add</md-icon>
+                </md-button>
+                <md-button class="md-primary md-icon-button ma0"
+                           ng-click="$ctrl.deleteScriptAttachment(script.scriptAttachmentMetadata, $index, true)"
+                           ng-if="!$ctrl.createMode && ($ctrl.scriptAttachments | filter: { scriptUuid: script.uuid }).length > 0">
+                  <md-tooltip md-autohide="true" md-direction="bottom"
+                              md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+                    {{'analysis-package-management.detail.script-attachment-metadata.delete-attachment-tooltip' | translate
+                    }}
+                  </md-tooltip>
+                  <md-icon md-font-set="material-icons">delete_forever</md-icon>
+                </md-button>
+              </div>
+            </div>
           </div>
           <div layout="row"
                layout-gt-sm="row"
@@ -169,66 +248,6 @@
                 </div>
               </div>
             </md-input-container>
-            <div flex="100"
-                 layout="row"
-                 layout-gt-sm="row"
-                 class="mr8 items-center">
-              <p class="ma0" ng-if="$ctrl.createMode">{{'analysis-package-management.detail.label.save-file' | translate}}</p>
-              <md-input-container class="pa0 ms-flex w-100"
-                                  ng-if="!$ctrl.createMode"
-                                  ngf-drop="$ctrl.addScriptAttachment($file, $index, $event)"
-                                  ngf-drag-over-class="{accept:'fdz-file-drop-accept', delay:0}"
-                                  ngf-select="$ctrl.addScriptAttachment($file, $index, $event)"
-                                  class="pointer"
-                                  md-is-error="!currentForm['filename' + $index].$valid && (currentForm['filename' + $index].$dirty || currentForm['filename' + $index].$touched)">
-
-                <label>{{'analysis-package-management.detail.label.file' | translate}}</label>
-                <input disabled ng-pattern="/^[_A-Za-z0-9äöüÄÖÜß\-.]*$/"
-                       ng-model="script.scriptAttachmentMetadata.fileName"
-                       name="filename_{{$index}}" class="pointer"
-                       ng-if="!ctrl.createMode"
-                       style="border-bottom: 1px rgba(0,0,0,0.12) solid; background-image: none;">
-                <div
-                  ng-if="!currentForm['filename' + $index].$dirty && !currentForm['filename' + $index].$touched"
-                  class="fdz-input-hint">
-                  {{ 'analysis-package-management.edit.hints.script-attachment-metadata.filename' | translate}}
-                </div>
-                <div ng-messages="currentForm['filename' + $index].$error"
-                     multiple>
-                  <div ng-message="unique">
-                    {{'analysis-package-management.error.script-attachment-metadata.filename.not-unique' | translate}}
-                  </div>
-                  <div ng-message="valid">
-                    {{'analysis-package-management.error.script-attachment-metadata.filename.not-valid' | translate}}
-                  </div>
-                  <div ng-message="pattern">
-                    {{'analysis-package-management.error.script-attachment-metadata.filename.pattern' | translate}}
-                  </div>
-                </div>
-              </md-input-container>
-              <div class="fdz-button-wrapper mt18 self-start">
-                <md-button class="md-primary md-icon-button ma0"
-                           ng-click="$ctrl.addScriptAttachmentButton($index)"
-                           ng-if="!$ctrl.createMode && !($ctrl.scriptAttachments | filter: { scriptUuid: script.uuid }).length > 0">
-                  <md-tooltip md-autohide="true" md-direction="bottom"
-                              md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
-                    {{'analysis-package-management.detail.script-attachment-metadata.add-attachment-tooltip' | translate
-                    }}
-                  </md-tooltip>
-                  <md-icon md-font-set="material-icons">add</md-icon>
-                </md-button>
-                <md-button class="md-primary md-icon-button ma0"
-                           ng-click="$ctrl.deleteScriptAttachment(script.scriptAttachmentMetadata, $index, true)"
-                           ng-if="!$ctrl.createMode && ($ctrl.scriptAttachments | filter: { scriptUuid: script.uuid }).length > 0">
-                  <md-tooltip md-autohide="true" md-direction="bottom"
-                              md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
-                    {{'analysis-package-management.detail.script-attachment-metadata.delete-attachment-tooltip' | translate
-                    }}
-                  </md-tooltip>
-                  <md-icon md-font-set="material-icons">delete_forever</md-icon>
-                </md-button>
-              </div>
-            </div>
           </div>
         </div>
       </div>

diff --git a/mdm-frontend/src/app/legacy/analysispackagemanagement/configuration/translations-de.js b/mdm-frontend/src/app/legacy/analysispackagemanagement/configuration/translations-de.js
@@ -91,7 +91,7 @@ angular.module('metadatamanagementApp').config([
           },
           'scripts': {
             'table-title': 'Skripte zu diesem Analysepaket',
-            'filename': 'Dateiname',
+            'title': 'Titel',
             'software-package': 'Softwarepaket',
             'language': 'Sprache der Kommentierungen',
             'version': 'Version des Softwarepakets',
@@ -248,6 +248,7 @@ angular.module('metadatamanagementApp').config([
             },
             'license': 'Wenn kein Vertrag unterzeichnet wird, benötigen wir eine Lizenz wie cc-by-sa',
             'script': {
+              'title': 'Geben Sie den Titel des Skripts ein.',
               'used-language': 'Bitte geben Sie die Sprache an, die Sie für die Kommentare im Skript verwendet haben.',
               'software-package': 'Bitte wählen Sie das Softwarepaket aus, für das dieses Skript geschrieben wurde.',
               'software-package-version': 'Version des Softwarepakets'
@@ -342,9 +343,7 @@ angular.module('metadatamanagementApp').config([
         'error': {
           'script': {
             'title': {
-              'not-null': 'Der Titel eines Skripts darf nicht leer sein!',
-              'i18n-string-size': 'Die Maximallänge des Titels eines Skripts ist 2048 Zeichen.',
-              'i18n-string-entire-not-empty': 'Der Titel eines Skripts muss in allen Sprachen vorhanden sein.'
+              'i18n-string-size': 'Die Maximallänge des Titels eines Skripts ist 2048 Zeichen.'
             },
             'used-language': {
               'not-found': 'Keine gültige Skriptsprache gefunden!',

diff --git a/mdm-frontend/src/app/legacy/analysispackagemanagement/configuration/translations-en.js b/mdm-frontend/src/app/legacy/analysispackagemanagement/configuration/translations-en.js
@@ -91,7 +91,7 @@ angular.module('metadatamanagementApp').config([
           },
           'scripts': {
             'table-title': 'Scripts related to this Analysis Package',
-            'filename': 'Filename',
+            'title': 'Title',
             'software-package': 'Software Package',
             'language': 'Language of Commentaries',
             'version': 'Version',
@@ -246,6 +246,7 @@ angular.module('metadatamanagementApp').config([
             },
             'license': 'If no contract is signed we will need a license like cc-by-sa',
             'script': {
+              'title': 'Please enter the title of this script.',
               'used-language': 'Please indicate the language you used for the comments in the script.',
               'software-package': 'Please choose the software package the script is written for.',
               'software-package-version': 'Version of Software Package'

diff --git a/mdm-frontend/src/app/legacy/analysispackagemanagement/templates/scripts.html.tmpl b/mdm-frontend/src/app/legacy/analysispackagemanagement/templates/scripts.html.tmpl
@@ -15,7 +15,7 @@
       <table fdz-table class="mh16 mb16">
         <thead>
         <tr>
-          <th class="fdz-table-third-absorbing-column">{{'analysis-package-management.detail.scripts.filename' | translate }}</th>
+          <th class="fdz-table-third-absorbing-column">{{'analysis-package-management.detail.scripts.title' | translate }}</th>
           <th>{{'analysis-package-management.detail.scripts.language' | translate }}</th>
           <th>{{'analysis-package-management.detail.scripts.software-package' | translate }}</th>
           <th>{{'analysis-package-management.detail.scripts.version' | translate }}</th>
@@ -24,11 +24,11 @@
         </tr>
         </thead>
         <tbody>
-        <tr ng-repeat="row in $ctrl.options">
+          <tr ng-repeat="row in $ctrl.options">
           <td>
-            {{row.attachment.fileName}}
-            </a><strong ng-if="!row.attachment">*</strong>  
-            </td>
+            {{row.title}}
+            </a><strong ng-if="!row.title">*</strong>  
+          </td>
           <td>{{row.usedLanguage | displayIsoLanguage: $ctrl.lang}}</td>
           <td>{{row.softwarePackage}}</td>
           <td>{{row.softwarePackageVersion}}</td>

diff --git a/.../app/legacy/analysispackagemanagement/views/analysis-package-edit-or-create.controller.js b/.../app/legacy/analysispackagemanagement/views/analysis-package-edit-or-create.controller.js
@@ -208,12 +208,7 @@ angular.module('metadatamanagementApp')
                       lastName: ''
                     }],
                     institutions: [],
-                    sponsors: [{
-                      name: {
-                        de: '',
-                        en: ''
-                      }
-                    }],
+                    sponsors: [],
                     scripts: [],
                     analysisDataPackages: []
                   });

diff --git a/.../src/app/legacy/analysispackagemanagement/views/analysis-package-edit-or-create.html.tmpl b/.../src/app/legacy/analysispackagemanagement/views/analysis-package-edit-or-create.html.tmpl
@@ -260,7 +260,7 @@
             <div layout="row">
             <div>
               <md-button class="md-primary md-icon-button mt18 mh0 pl0"
-                         ng-click="ctrl.deleteSponsor($index)" ng-if="ctrl.analysisPackage.sponsors.length > 1">
+                         ng-click="ctrl.deleteSponsor($index)">
                 <md-tooltip md-autohide="true" md-direction="bottom"
                             md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
                   {{'analysis-package-management.edit.delete-sponsor-tooltip' | translate}}
@@ -352,7 +352,7 @@
             </md-autocomplete>
           </div>
           <div layout="row" layout-align="start center">
-            <md-input-container flex="33" ng-style="{'margin-left': ctrl.analysisPackage.sponsors.length > 1 ? '40px' : '0px'}" class="mt0">
+            <md-input-container flex="33" style="margin-left: 40px;" class="mt0">
               <label>{{'analysis-package-management.edit.label.fundingRef' | translate}}</label>
               <input name="sponsorFundingRef_{{$index}}" ng-model="ctrl.analysisPackage.sponsors[$index].fundingRef" autocomplete="off">
               <div
@@ -363,7 +363,7 @@
             </md-input-container>
           </div>
           <div layout="row" layout-align="start center">
-            <md-input-container flex="50" ng-style="{'margin-left': ctrl.analysisPackage.sponsors.length > 1 ? '40px' : '0px'}" class="mt0">
+            <md-input-container flex="50" style="margin-left: 40px;" class="mt0">
               <label>{{'analysis-package-management.edit.label.fundingProgram' | translate}}</label>
               <input name="sponsorFundingProgram_{{$index}}" ng-model="ctrl.analysisPackage.sponsors[$index].fundingProgram" autocomplete="off">
               <div

diff --git a/...rontend/src/app/legacy/dataacquisitionprojectmanagement/resources/daraRelease.resource.js b/...rontend/src/app/legacy/dataacquisitionprojectmanagement/resources/daraRelease.resource.js
@@ -18,8 +18,9 @@ angular.module('metadatamanagementApp')
 /**
  * Method to request the endpoint that updates all projects in dara-template.
  * The response is a list (List<String>) of possible error messages, that occurre during update.
+ * We could not put this into the "DaraReleaseResource"-schema (above), because the URLs would not match.
  */
-angular.module('metadatamanagementApp').factory('DaraReleaseResource', ['$http', 
+angular.module('metadatamanagementApp').factory('DaraReleaseCustomResource', ['$http', 
 function($http) {
   return {
     updateDaraProjects: function() {

diff --git a/mdm-frontend/src/app/legacy/datapackagemanagement/configuration/translations-de.js b/mdm-frontend/src/app/legacy/datapackagemanagement/configuration/translations-de.js
@@ -176,9 +176,9 @@ angular.module('metadatamanagementApp').config([
               'i18n-string-entire-not-empty': 'Die Institution eines Datenpakets muss in beiden Sprachen vorhanden sein.'
             },
             'sponsor': {
-              'not-null': 'Die Geldgeber:in eines Datenpakets darf nicht leer sein!',
-              'i18n-string-size': 'Die Maximallänge der Geldgeber:in eines Datenpakets ist 512 Zeichen.',
-              'i18n-string-entire-not-empty': 'Die Geldgeber:in eines Datenpakets muss in beiden Sprachen vorhanden sein.'
+              'not-empty': 'Die Liste der Geldgeber:innen eines Datenpakets benötigt mindestens ein Element und darf nicht leer sein.',
+              'i18n-string-size': 'Die Maximallänge des Namens der Geldgeber:in eines Datenpakets ist 512 Zeichen.',
+              'i18n-string-entire-not-empty': 'Der Name der Geldgeber:in eines Datenpakets muss in beiden Sprachen vorhanden sein.'
             },
             'study-series': {
               'i18n-string-size': 'Die Maximallänge der Studienreihe ist 512 Zeichen.',