Merge pull request #407 from datacite/alternate-identifiers

use alternative-identifier instead of identifier
datacite · May 4, 2020 · 1e64a15 · 1e64a15
2 parents 284ecbc + 73c25e7
commit 1e64a15
Show file tree

Hide file tree

Showing 188 changed files with 5,532 additions and 11,666 deletions.
diff --git a/app/components/doi-alternate-identifier.js b/app/components/doi-alternate-identifier.js
@@ -34,23 +34,20 @@ export default Component.extend({
         if (!this.selected.includes(select.searchText)) {
           this.alternateIdentifierTypes.push(select.searchText);
           select.actions.choose(select.searchText);
-          this.fragment.set('identifierType', select.searchText);
+          this.fragment.set('alternateIdentifierType', select.searchText);
           this.set('alternateIdentifierTypes', alternateIdentifierTypeList);
         }
       }
     },
-    updateIdentifier(value) {
-      this.fragment.set('identifier', value);
-    },
-    updateIdentifierType(value) {
-      this.fragment.set('identifierType', value);
+    updateAlternateIdentifier(value) {
+      this.fragment.set('alternateIdentifier', value);
     },
     selectAlternateIdentifierType(alternateIdentifierType) {
-      this.fragment.set('identifierType', alternateIdentifierType);
+      this.fragment.set('alternateIdentifierType', alternateIdentifierType);
       this.set('alternateIdentifierTypes', alternateIdentifierTypeList);
     },
-    deleteIdentifier() {
-      this.model.get('identifiers').removeObject(this.fragment);
+    deleteAlternateIdentifier() {
+      this.model.get('alternateIdentifiers').removeObject(this.fragment);
     },
   },
 });
diff --git a/app/components/doi-alternate-identifiers.js b/app/components/doi-alternate-identifiers.js
@@ -6,14 +6,14 @@ export default Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    if (!this.model.get('identifiers')) {
-      this.model.set('identifiers', []);
+    if (!this.model.get('alternateIdentifiers')) {
+      this.model.set('alternateIdentifiers', []);
     }
   },
 
   actions: {
-    addIdentifier() {
-      this.model.get('identifiers').createFragment();
+    addAlternateIdentifier() {
+      this.model.get('alternateIdentifiers').createFragment();
       this.set('showAlternateIdentifiers', true);
     },
     toggleAlternateIdentifiers() {

diff --git a/app/controllers/dois/show/edit.js b/app/controllers/dois/show/edit.js
@@ -106,8 +106,8 @@ export default Controller.extend({
         }));
 
         // only store identifiers with a  text
-        doi.set('identifiers', A(doi.get('identifiers')).filter(function(identifier) {
-          return !isBlank(identifier.identifier);
+        doi.set('alternateIdentifiers', A(doi.get('alternateIdentifiers')).filter(function(alternateIdentifier) {
+          return !isBlank(alternateIdentifier.identifier);
         }));
 
         // only store rights with a text

diff --git a/app/controllers/dois/show/modify.js b/app/controllers/dois/show/modify.js
@@ -39,7 +39,7 @@ export default Controller.extend({
       doi.set('language', null);
       doi.set('subjects', null);
       doi.set('contributors', null);
-      doi.set('identifiers', null);
+      doi.set('alternateIdentifiers', null);
       doi.set('relatedIdentifiers', null);
       doi.set('fundingReferences', null);
       doi.set('geoLocations', null);

diff --git a/app/controllers/repositories/show/dois/new.js b/app/controllers/repositories/show/dois/new.js
@@ -93,8 +93,8 @@ export default Controller.extend({
         }));
 
         // only store identifiers with a  text
-        doi.set('identifiers', A(doi.get('identifiers')).filter(function(identifier) {
-          return !isBlank(identifier.identifier);
+        doi.set('alternateIdentifiers', A(doi.get('alternateIdentifiers')).filter(function(alternateIdentifier) {
+          return !isBlank(alternateIdentifier.identifier);
         }));
 
         // only store rights with a text

diff --git a/app/controllers/repositories/show/dois/upload.js b/app/controllers/repositories/show/dois/upload.js
@@ -31,7 +31,7 @@ export default Controller.extend({
       doi.set('subjects', null);
       doi.set('language', null);
       doi.set('contributors', null);
-      doi.set('identifiers', null);
+      doi.set('alternateIdentifiers', null);
       doi.set('relatedIdentifiers', null);
       doi.set('fundingReferences', null);
       doi.set('geoLocations', null);

diff --git a/app/helpers/doi-form-errors.js b/app/helpers/doi-form-errors.js
@@ -27,9 +27,9 @@ export function doiFormErrors([ model ]) {
         errorAttributes = errorAttributes.concat(contributor.validations.errors.mapBy('attribute'));
       });
     }
-    if (model.identifiers) {
-      model.identifiers.forEach((identifier) => {
-        errorAttributes = errorAttributes.concat(identifier.validations.errors.mapBy('attribute'));
+    if (model.alternateIdentifiers) {
+      model.alternateIdentifiers.forEach((alternateIdentifier) => {
+        errorAttributes = errorAttributes.concat(alternateIdentifier.validations.errors.mapBy('attribute'));
       });
     }
     if (model.subjects) {

diff --git a/app/models/identifier.js → app/models/alternate-identifier.js b/app/models/identifier.js → app/models/alternate-identifier.js
@@ -5,18 +5,18 @@ import { computed } from '@ember/object';
 import { isBlank } from '@ember/utils';
 
 const Validations = buildValidations({
-  identifierType: [
+  alternateIdentifierType: [
     validator('presence', {
       presence: true,
       message: 'Alternate Identifier must include Identifier Type',
-      disabled: computed('model.identifier', function() {
-        return isBlank(this.model.get('identifier'));
+      disabled: computed('model.alternateIdentifier', function() {
+        return isBlank(this.model.get('alternateIdentifier'));
       }),
     }),
   ],
 });
 
 export default Fragment.extend(Validations, {
-  identifier: DS.attr('string', { defaultValue: null }),
-  identifierType: DS.attr('string', { defaultValue: null }),
+  alternateIdentifier: DS.attr('string', { defaultValue: null }),
+  alternateIdentifierType: DS.attr('string', { defaultValue: null }),
 });
diff --git a/app/models/doi.js b/app/models/doi.js
@@ -131,7 +131,7 @@ export default DS.Model.extend(Validations, {
   publicationYear: DS.attr('number'),
   subjects: fragmentArray('subject', { defaultValue: [] }),
   contributors: fragmentArray('contributor', { defaultValue: [] }),
-  identifiers: fragmentArray('identifier', { defaultValue: [] }),
+  alternateIdentifiers: fragmentArray('alternateIdentifier', { defaultValue: [] }),
   dates: fragmentArray('date', { defaultValue: [] }),
   language: DS.attr('string'),
   types: DS.attr(),

diff --git a/app/templates/components/doi-alternate-identifier.hbs b/app/templates/components/doi-alternate-identifier.hbs
@@ -1,7 +1,7 @@
 <div class="input-group">
-  <input type="text" class="form-control alternate-identifier-field" value={{fragment.identifier}} placeholder="Alternate Identifier" oninput={{action "updateIdentifier" value="target.value"}} data-test-alternate-identifier/>
+  <input type="text" class="form-control alternate-identifier-field" value={{fragment.alternateIdentifier}} placeholder="Alternate Identifier" oninput={{action "updateAlternateIdentifier" value="target.value"}} data-test-alternate-identifier/>
   <span class="input-group-btn">
-    <BsButton @outline={{true}} @onClick={{action "deleteIdentifier" index}}>{{fa-icon "trash"}}</BsButton>
+    <BsButton @outline={{true}} @onClick={{action "deleteAlternateIdentifier" index}}>{{fa-icon "trash"}}</BsButton>
   </span>
 </div>
 
@@ -11,11 +11,11 @@
 <div class="power-select-fragment" disabled={{this.controlledIdentifierType}} data-test-alternate-identifier-type>
   {{#form.element
     controlType="power-select"
-    value=fragment.identifierType
+    value=fragment.alternateIdentifierType
     helpText="The type of Alternate Identifier."
     options=alternateIdentifierTypeList
     disabled=controlledIdentifierType
-    destination=fragment.identifierType as |el|
+    destination=fragment.alternateIdentifierType as |el|
   }}
   {{el.control
     onChange=(action "selectAlternateIdentifierType")

diff --git a/app/templates/components/doi-alternate-identifiers.hbs b/app/templates/components/doi-alternate-identifiers.hbs
@@ -3,22 +3,22 @@
   <div class="col-md-9">
     <div class="label-vertical">An identifier or identifiers other than the primary Identifier applied to the resource being registered.</div>
     {{#if showAlternateIdentifiers}}
-      {{#each model.identifiers as |identifier index|}}
-        <DoiAlternateIdentifier @model={{model}} @fragment={{identifier}} @form={{form}} @index={{index}} />
+      {{#each model.alternateIdentifiers as |alternateIdentifier index|}}
+        <DoiAlternateIdentifier @model={{model}} @fragment={{alternateIdentifier}} @form={{form}} @index={{index}} />
       {{/each}}
 
-      {{#if (lte model.identifiers.length 4)}}
-        <BsButton @class="btn-sm" @id="add-alternate-identifier" @outline={{true}} @onClick={{action "addIdentifier"}}>{{fa-icon "plus"}} Add {{if (gt model.identifiers.length 1) "another "}} alternate identifier</BsButton>
+      {{#if (lte model.alternateIdentifiers.length 4)}}
+        <BsButton @class="btn-sm" @id="add-alternate-identifier" @outline={{true}} @onClick={{action "addAlternateIdentifier"}}>{{fa-icon "plus"}} Add {{if (gt model.alternateIdentifiers.length 1) "another "}} alternate identifier</BsButton>
       {{/if}}
 
-      {{#if (gt model.identifiers.length 0)}}
-        <BsButton @id="toggle-alternate-identifiers" @class="btn-sm" @outline={{true}} @onClick={{action "toggleAlternateIdentifiers"}}>{{fa-icon "eye-slash"}} Hide {{pluralize model.identifiers.length 'alternate identifier'}}</BsButton>
+      {{#if (gt model.alternateIdentifiers.length 0)}}
+        <BsButton @id="toggle-alternate-identifiers" @class="btn-sm" @outline={{true}} @onClick={{action "toggleAlternateIdentifiers"}}>{{fa-icon "eye-slash"}} Hide {{pluralize model.alternateIdentifiers.length 'alternate identifier'}}</BsButton>
       {{/if}}
     {{else}}
-      {{#if (gt model.identifiers.length 0)}}
-        <BsButton @id="toggle-alternate-identifiers" @class="btn-sm" @outline={{true}} @onClick={{action "toggleAlternateIdentifiers"}}>{{fa-icon "eye"}} Show {{pluralize model.identifiers.length 'alternate identifier'}}</BsButton>
+      {{#if (gt model.alternateIdentifiers.length 0)}}
+        <BsButton @id="toggle-alternate-identifiers" @class="btn-sm" @outline={{true}} @onClick={{action "toggleAlternateIdentifiers"}}>{{fa-icon "eye"}} Show {{pluralize model.alternateIdentifiers.length 'alternate identifier'}}</BsButton>
       {{else}}
-        <BsButton @class="btn-sm btn-warning" @id="add-alternate-identifier" @outline={{true}} @onClick={{action "addIdentifier"}}>{{fa-icon "plus"}} Add alternate identifier</BsButton>
+        <BsButton @class="btn-sm btn-warning" @id="add-alternate-identifier" @outline={{true}} @onClick={{action "addAlternateIdentifier"}}>{{fa-icon "plus"}} Add alternate identifier</BsButton>
       {{/if}}
     {{/if}}
   </div>

diff --git a/recordings/Acceptance-anonymous-admin_3497805088/visiting-prefixes_435827572/recording.har b/recordings/Acceptance-anonymous-admin_3497805088/visiting-prefixes_435827572/recording.har
diff --git a/recordings/Acceptance-anonymous-admin_3497805088/visiting-providers_1061836054/recording.har b/recordings/Acceptance-anonymous-admin_3497805088/visiting-providers_1061836054/recording.har
diff --git a/...dings/Acceptance-anonymous-admin_3497805088/visiting-repositories_601244364/recording.har b/...dings/Acceptance-anonymous-admin_3497805088/visiting-repositories_601244364/recording.har
diff --git a/recordings/Acceptance-anonymous-doi_1082049019/visiting-dois_3774702605/recording.har b/recordings/Acceptance-anonymous-doi_1082049019/visiting-dois_3774702605/recording.har
diff --git a/...rdings/Acceptance-anonymous-doi_1082049019/visiting-specific-doi_4109340652/recording.har b/...rdings/Acceptance-anonymous-doi_1082049019/visiting-specific-doi_4109340652/recording.har
diff --git a/...eptance-anonymous-provider_3494033576/visiting-provider-TIB-dois_3257149311/recording.har b/...eptance-anonymous-provider_3494033576/visiting-provider-TIB-dois_3257149311/recording.har
@@ -3,7 +3,7 @@
     "_recordingName": "Acceptance | anonymous | provider/visiting provider TIB dois",
     "browser": {
       "name": "Chrome",
-      "version": "81.0.4044.122"
+      "version": "81.0.4044.129"
     },
     "creator": {
       "comment": "persister:rest",
@@ -63,16 +63,16 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2020-04-23T07:28:55.018Z",
-        "time": 161,
+        "startedDateTime": "2020-05-04T16:39:28.152Z",
+        "time": 104,
         "timings": {
           "blocked": -1,
           "connect": -1,
           "dns": -1,
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 161
+          "wait": 104
         }
       }
     ],

diff --git a/...eptance-anonymous-provider_3494033576/visiting-provider-TIB-info_2741953062/recording.har b/...eptance-anonymous-provider_3494033576/visiting-provider-TIB-info_2741953062/recording.har
@@ -3,7 +3,7 @@
     "_recordingName": "Acceptance | anonymous | provider/visiting provider TIB info",
     "browser": {
       "name": "Chrome",
-      "version": "81.0.4044.122"
+      "version": "81.0.4044.129"
     },
     "creator": {
       "comment": "persister:rest",
@@ -63,16 +63,16 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2020-04-23T07:28:53.906Z",
-        "time": 84,
+        "startedDateTime": "2020-05-04T16:39:27.204Z",
+        "time": 79,
         "timings": {
           "blocked": -1,
           "connect": -1,
           "dns": -1,
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 84
+          "wait": 79
         }
       }
     ],

diff --git a/...ance-anonymous-provider_3494033576/visiting-provider-TIB-prefixes_238909962/recording.har b/...ance-anonymous-provider_3494033576/visiting-provider-TIB-prefixes_238909962/recording.har
@@ -3,7 +3,7 @@
     "_recordingName": "Acceptance | anonymous | provider/visiting provider TIB prefixes",
     "browser": {
       "name": "Chrome",
-      "version": "81.0.4044.122"
+      "version": "81.0.4044.129"
     },
     "creator": {
       "comment": "persister:rest",
@@ -63,16 +63,16 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2020-04-23T07:28:54.642Z",
-        "time": 131,
+        "startedDateTime": "2020-05-04T16:39:27.836Z",
+        "time": 124,
         "timings": {
           "blocked": -1,
           "connect": -1,
           "dns": -1,
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 131
+          "wait": 124
         }
       }
     ],

diff --git a/...anonymous-provider_3494033576/visiting-provider-TIB-repositories_3136768718/recording.har b/...anonymous-provider_3494033576/visiting-provider-TIB-repositories_3136768718/recording.har
@@ -3,7 +3,7 @@
     "_recordingName": "Acceptance | anonymous | provider/visiting provider TIB repositories",
     "browser": {
       "name": "Chrome",
-      "version": "81.0.4044.122"
+      "version": "81.0.4044.129"
     },
     "creator": {
       "comment": "persister:rest",
@@ -63,16 +63,16 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2020-04-23T07:28:54.134Z",
-        "time": 177,
+        "startedDateTime": "2020-05-04T16:39:27.539Z",
+        "time": 90,
         "timings": {
           "blocked": -1,
           "connect": -1,
           "dns": -1,
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 177
+          "wait": 90
         }
       }
     ],

diff --git a/...s/Acceptance-anonymous-provider_3494033576/visiting-provider-TIB_4267189074/recording.har b/...s/Acceptance-anonymous-provider_3494033576/visiting-provider-TIB_4267189074/recording.har
@@ -3,7 +3,7 @@
     "_recordingName": "Acceptance | anonymous | provider/visiting provider TIB",
     "browser": {
       "name": "Chrome",
-      "version": "81.0.4044.122"
+      "version": "81.0.4044.129"
     },
     "creator": {
       "comment": "persister:rest",
@@ -63,16 +63,16 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2020-04-23T07:28:53.462Z",
-        "time": 121,
+        "startedDateTime": "2020-05-04T16:39:26.909Z",
+        "time": 102,
         "timings": {
           "blocked": -1,
           "connect": -1,
           "dns": -1,
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 121
+          "wait": 102
         }
       }
     ],

diff --git a/...nce-anonymous-repository_3808139329/visiting-repository-AWI-dois_2492809532/recording.har b/...nce-anonymous-repository_3808139329/visiting-repository-AWI-dois_2492809532/recording.har
@@ -3,7 +3,7 @@
     "_recordingName": "Acceptance | anonymous | repository/visiting repository AWI dois",
     "browser": {
       "name": "Chrome",
-      "version": "81.0.4044.122"
+      "version": "81.0.4044.129"
     },
     "creator": {
       "comment": "persister:rest",
@@ -63,16 +63,16 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2020-04-23T07:28:56.909Z",
-        "time": 123,
+        "startedDateTime": "2020-05-04T16:39:29.758Z",
+        "time": 134,
         "timings": {
           "blocked": -1,
           "connect": -1,
           "dns": -1,
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 123
+          "wait": 134
         }
       }
     ],

diff --git a/...nce-anonymous-repository_3808139329/visiting-repository-AWI-info_2068777189/recording.har b/...nce-anonymous-repository_3808139329/visiting-repository-AWI-info_2068777189/recording.har
@@ -3,7 +3,7 @@
     "_recordingName": "Acceptance | anonymous | repository/visiting repository AWI info",
     "browser": {
       "name": "Chrome",
-      "version": "81.0.4044.122"
+      "version": "81.0.4044.129"
     },
     "creator": {
       "comment": "persister:rest",
@@ -63,16 +63,16 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2020-04-23T07:28:55.880Z",
-        "time": 104,
+        "startedDateTime": "2020-05-04T16:39:28.811Z",
+        "time": 95,
         "timings": {
           "blocked": -1,
           "connect": -1,
           "dns": -1,
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 104
+          "wait": 95
         }
       }
     ],