Merge branch 'develop' of github.com:redbox-mint/redbox-portal into d…

…evelop

.github/release.yml

@@ -0,0 +1,19 @@
+changelog:
+  categories:
+    - title: New Features and Enhancements
+      labels:
+        - enhancement
+    - title: Bug Fixes
+      labels:
+        - bug
+    - title: Dependency Updates
+      labels:
+        - dependencies
+    - title: Other Changes
+      labels:
+        - '*'
+      exclude:
+        labels:
+          - dependencies
+          - bug
+          - enhacement

.gitignore

@@ -178,4 +178,7 @@ dev
 core/dist
 api/models/Record.js
 api/models/RecordAudit.js
+support/raido/src
+support/raido/dist
+support/raido/*.tgz
 angular/.angular/cache/

angular-legacy/shared/form/field-contributor.component.ts

@@ -217,8 +217,6 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
     if (this.required) {
       this.enableValidators();
     } else {
-      // disable the validators otherwise they'll get enabled on show/hide
-      this.validators = {};
       // if splitting names, attach handler to individual input form control
       if (this.splitNames) {
         const reqFields = ['family_name', 'given_name'];
@@ -532,15 +530,17 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
         if (!that.visible) {
           // restore validators
           if (that.formModel) {       
+            if (that.required) {
               if(that['enableValidators'] != null && typeof(that['enableValidators']) == 'function') {
                 that['enableValidators']();
               } else {
                 that.formModel.setValidators(that.validators);
               }
-              setTimeout(() => {
-                that.setValue(that.formModel.value,false,true)
-              });
-              that.formModel.updateValueAndValidity();
+            }
+            setTimeout(() => {
+              that.setValue(that.formModel.value,false,true)
+            });
+            that.formModel.updateValueAndValidity();
           }
         }
       }

angular-legacy/shared/form/field-vocab.component.ts

@@ -240,7 +240,7 @@ export class VocabField extends FieldBase<any> {
           const delimPair = this.titleFieldDelim[idx];
           const titleVal = data[titleFld];
           if (titleVal) {
-            title = `${title}${_.isEmpty(title) ? '' : delimPair.prefix}${titleVal}${_.isEmpty(title) ? '' : delimPair.suffix}`;
+            title = `${title}${_.isEmpty(titleVal) ? '' : delimPair.prefix}${titleVal}${_.isEmpty(titleVal) ? '' : delimPair.suffix}`;
           }
         });
       }
@@ -376,6 +376,7 @@ export class VocabField extends FieldBase<any> {
               that.formModel.clearValidators();
             }
             that.formModel.updateValueAndValidity();
+            that.storedEventData = _.clone(that.formModel.value)
           }
         }
       } else {
@@ -494,7 +495,7 @@ class MintLookupDataService extends Subject<CompleterItem[]> implements Complete
 
   constructor(private url: string,
     private http: Http,
-    private fields: string[],
+    private lookupResponseFields: string[],
     private compositeTitleName: string,
     private titleFieldArr: string[],
     private titleFieldDelim: any[],
@@ -532,7 +533,7 @@ class MintLookupDataService extends Subject<CompleterItem[]> implements Complete
       return null;
     }
     const item: any = {};
-    _.forEach(this.fields, (fieldName) => {
+    _.forEach(this.lookupResponseFields, (fieldName) => {
       if (_.isString(fieldName)) {
         item[fieldName] = data[fieldName];
       } else {

angular/package.json

@@ -35,7 +35,7 @@
     "@angular/cli": "^16.2.8",
     "@angular/compiler-cli": "^16.2.11",
     "@schematics/angular": "^16.2.1",
-    "@types/jasmine": "~4.3.5",
+    "@types/jasmine": "~5.1.0",
     "@types/lodash": "^4.14.199",
     "@types/lodash-es": "^4.17.9",
     "@types/luxon": "^3.3.2",

assets/locales/en/translation.json

@@ -749,10 +749,19 @@
   "invalid-format": "Submission format is invalid",
   "server-error": "Server error",
   "unknown-error": "Unknown error",
+  "@dmpt-raid": "RAiD",
+  "@dmpt-raid-help": "RAiD created when you first save your plan. See https://raid.org",
+  "raid-mint-transform-validation-error": "There's an issue preparing your data for RAiD, please contact your administrator. ",
+  "raid-mint-server-error": "There's an issue minting RAiD at the moment, we will try again later.",
+  "raid-mint-transform-missing-contributorid-error": "The ORCID seems to be invalid for ",
   "local-auth-login": "Login",
   "oidc-default-unknown-error": "Login unsuccessful contact your system administrator",
   "oidc-user-doesnt-exist-in-tenant": "User account from identity provider does not exist in tenant. The account needs to be added as an external user in the tenant first.",
   "oidc-user-doesnt-exist-in-tenant-detail": "For email {{-email}} and url {{-url}} and tenant {{-name}}",
   "lang-en": "English",
-  "lang-mri": "Māori"
+  "lang-mri": "Māori",
+  "system-message-enabled": "false",
+  "system-message-title": "System Notification",
+  "system-message-description": "ReDBox will be unavailable from 9am to 12pm on October 20 for system upgrades. Please contact support for any help"
+
 }

assets/styles/default-theme.scss

@@ -192,6 +192,11 @@ z-index: 999;
   padding: 80px 0 130px;
 }
 
+#system-message-area {
+    padding-top: 80px;
+    display: none;
+  }
+
 .site-branding-area {
   background-color: $site-branding-area-background;
 }

config/agendaQueue.js

@@ -37,5 +37,9 @@ module.exports.agendaQueue = {
       name: 'RecordsService-StoreRecordAudit',
       fnName: 'recordsservice.storeRecordAudit',
     },
+    {
+      name: 'RaidMintRetryJob',
+      fnName: 'raidservice.mintRetryJob'
+    }
   ]
 };