Merge pull request #958 from datacite/pb636-remove-re3data

svogt0511 · web-flow · commit 73007419edf0 · 2026-04-16T15:24:59.000-04:00
Remove re3data from Fabrica.
diff --git a/app/components/repository-list.hbs b/app/components/repository-list.hbs
@@ -460,20 +460,6 @@
               </span>
             </h5>
             {{repository.symbol}}
-            {{#if repository.re3data}}
-              <h5>
-                re3data Record
-                <span>
-                  <i class="fas fa-question-circle"></i>
-                  <BsTooltip @renderInPlace={{true}} @placement="top" @viewportPadding={{10}}>
-                    re3data is a registry of research data repositories.
-                  </BsTooltip>
-                </span>
-              </h5>
-              <a href="{{repository.re3data}}">
-                {{repository.re3data}}
-              </a>
-            {{/if}}
             {{#if repository.systemEmail}}
               <h5>
                 System Email
diff --git a/app/controllers/providers/show/repositories/new.js b/app/controllers/providers/show/repositories/new.js
@@ -19,7 +19,6 @@ export default class NewController extends Controller {
   @service
   flashMessages;
 
-  re3data = null;
   softwareList = softwareList;
   softwares = softwareList;
   isSoftwareFieldActive = false;
@@ -39,82 +38,6 @@ export default class NewController extends Controller {
     this.repositories = this.repositories || [];
   }
 
-  @action
-  searchRe3DataAction(query) {
-    let self = this;
-    this.store
-      .query('re3data', { query, 'page[size]': 25 })
-      .then(function (repositories) {
-        self.set('repositories', repositories);
-      })
-      .catch(function (reason) {
-        console.debug(reason);
-        self.set('repositories', []);
-      });
-  }
-
-  @action
-  selectRe3DataAction(re3data) {
-    if (re3data) {
-      let self = this;
-      this.store
-        .findRecord('re3data', re3data.id)
-        .then(function (repo) {
-          self.set('re3data', repo);
-          self.model.repository.set('clientType', 'repository');
-          self.model.repository.set(
-            're3data',
-            'https://doi.org/' + repo.get('id')
-          );
-          self.model.repository.set('name', repo.get('repositoryName'));
-          self.model.repository.set('description', repo.get('description'));
-          if (repo.get('additionalNames').length > 0) {
-            self.model.repository.set(
-              'alternateName',
-              A(repo.get('additionalNames')).get('firstObject').text
-            );
-          } else {
-            self.model.repository.set('alternateName', null);
-          }
-          self.model.repository.set('url', repo.get('repositoryUrl'));
-          if (repo.get('software').length > 0) {
-            let software = repo.get('software')[0].name;
-            if (software === 'DataVerse') {
-              software = 'Dataverse';
-            } else if (software === 'unknown') {
-              software = 'Other';
-            }
-            self.model.repository.set('software', capitalize(software));
-          }
-          if (repo.get('repositoryLanguages').length > 0) {
-            self.model.repository.set(
-              'language',
-              A(repo.get('repositoryLanguages')).map(function (l) {
-                return langs.where('2', l.text)['1'];
-              })
-            );
-          }
-          if (repo.get('types').length > 0) {
-            self.model.repository.set(
-              'repositoryType',
-              A(repo.get('types')).mapBy('text')
-            );
-          }
-          if (repo.get('certificates').length > 0) {
-            self.model.repository.set(
-              'certificate',
-              A(repo.get('certificates')).mapBy('text')
-            );
-          }
-        })
-        .catch(function (reason) {
-          console.debug(reason);
-        });
-    } else {
-      this.model.repository.set('re3data', null);
-    }
-  }
-
   @action
   searchClientTypeAction(query) {
     let clientTypes = this.clientTypeList.filter(function (clientType) {
diff --git a/app/controllers/repositories/show/edit.js b/app/controllers/repositories/show/edit.js
@@ -26,7 +26,6 @@ export default class EditController extends Controller {
   delete = false;
   provider = null;
   setPassword = false;
-  re3data = null;
   softwareList = softwareList;
   softwares = softwareList;
   isSoftwareFieldActive = false;
@@ -46,85 +45,6 @@ export default class EditController extends Controller {
     this.repositories = this.repositories || [];
   }
 
-  @action
-  searchRe3DataAction(query) {
-    let self = this;
-    this.store
-      .query('re3data', { query, 'page[size]': 25 })
-      .then(function (repositories) {
-        self.set('repositories', repositories);
-      })
-      .catch(function (reason) {
-        console.debug(reason);
-        self.set('repositories', []);
-      });
-  }
-
-  @action
-  selectRe3DataAction(re3data) {
-    if (re3data) {
-      let self = this;
-      this.store
-        .findRecord('re3data', re3data.id)
-        .then(function (repo) {
-          self.set('re3data', repo);
-          self.model.set('clientType', 'repository');
-          self.model.set('re3data', 'https://doi.org/' + repo.get('id'));
-          self.model.set('name', repo.get('repositoryName'));
-          self.model.set('description', repo.get('description'));
-          if (repo.get('additionalNames').length > 0) {
-            self.model.set(
-              'alternateName',
-              A(repo.get('additionalNames')).get('firstObject').text
-            );
-          } else {
-            self.model.set('alternateName', null);
-          }
-          self.model.set('url', repo.get('repositoryUrl'));
-          if (repo.get('software').length > 0) {
-            let software = repo.get('software')[0].name;
-            if (software === 'DataVerse') {
-              software = 'Dataverse';
-            } else if (software === 'unknown') {
-              software = 'Other';
-            }
-            self.model.set('software', capitalize(software));
-          }
-          if (repo.get('repositoryLanguages').length > 0) {
-            self.model.set(
-              'language',
-              A(repo.get('repositoryLanguages')).map(function (l) {
-                return langs.where('2', l.text)['1'];
-              })
-            );
-          }
-          if (repo.get('types').length > 0) {
-            self.model.set(
-              'repositoryType',
-              A(repo.get('types')).mapBy('text')
-            );
-          }
-          if (
-            repo.get('subjects').length > 0 &&
-            self.model.get('isDisciplinary')
-          ) {
-            self.model.set('subjects', repo.get('fosSubjects'));
-          }
-          if (repo.get('certificates').length > 0) {
-            self.model.set(
-              'certificate',
-              A(repo.get('certificates')).mapBy('text')
-            );
-          }
-        })
-        .catch(function (reason) {
-          console.debug(reason);
-        });
-    } else {
-      this.model.set('re3data', null);
-    }
-  }
-
   @action
   searchClientTypeAction(query) {
     let clientTypes = this.clientTypeList.filter(function (clientType) {
diff --git a/app/helpers/repository-form-errors.js b/app/helpers/repository-form-errors.js
@@ -5,7 +5,6 @@ const labelList = {
   symbol: 'repository ID',
   confirmSymbol: 'confirm repository ID',
   globusUuid: 'globus UUID',
-  re3data: 're3data ID',
   name: 'repository name',
   alternateName: 'repository alternate name',
   systemEmail: 'system email'
diff --git a/app/initializers/custom-inflector-rules.js b/app/initializers/custom-inflector-rules.js
@@ -3,7 +3,6 @@ import Inflector from 'ember-inflector';
 export function initialize(/* application */) {
   const inflector = Inflector.inflector;
 
-  inflector.uncountable('re3data');
 }
 
 export default {
diff --git a/app/models/re3data.js b/app/models/re3data.js
diff --git a/app/models/repository.js b/app/models/repository.js
@@ -192,9 +192,6 @@ export default class Repository extends Model.extend(Validations) {
   @attr('string')
   globusUuid;
 
-  @attr('string')
-  re3data;
-
   @attr('string', { defaultValue: '*' })
   domains;
 
@@ -268,20 +265,6 @@ export default class Repository extends Model.extend(Validations) {
     });
   }
 
-  @computed('re3data')
-  get badgeUrl() {
-    if (this.re3data) {
-      return (
-        ENV.API_URL +
-        '/re3data/' +
-        this.re3data.substr(this.re3data.indexOf('1')) +
-        '/badge'
-      );
-    } else {
-      return null;
-    }
-  }
-
   get isDisciplinary() {
     return this.repositoryType.includes('disciplinary');
   }
diff --git a/app/routes/repositories/show.js b/app/routes/repositories/show.js
@@ -33,7 +33,6 @@ export default class ShowRoute extends Route {
       .then(function (repository) {
         self.headData.set('title', repository.name);
         self.headData.set('description', repository.description);
-        self.headData.set('image', repository.badgeUrl);
 
         return repository;
       })
diff --git a/app/templates/providers/show/repositories/new.hbs b/app/templates/providers/show/repositories/new.hbs
@@ -27,12 +27,6 @@
 
       {{#if (eq this.model.repository.clientType "periodical")}}
         <RepositoryIssn @model={{this.model.repository}} @fragment={{this.model.repository.issn}} @form={{form}} />
-      {{else}}
-        <form.element @controlType="power-select" id="re3data" class="form-group" @property="re3data" @label="re3data Record (optional)" @optionLabelPath="re3data" @options={{this.repositories}} @destination={{this.re3data}} @helpText="re3data is a registry of research data repositories." as |el|>
-          <el.control @onChange={{action "selectRe3DataAction"}} @search={{action "searchRe3DataAction"}} @searchField="repositoryName" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
-            {{if item.name item.name this.model.repository.re3data}}
-          </el.control>
-        </form.element>
       {{/if}}
 
       <form.element @controlType="text" id="name" class="form-group" @label="Repository Name" @property="name" @useIcons={{false}} />
diff --git a/app/templates/repositories/show.hbs b/app/templates/repositories/show.hbs
@@ -55,13 +55,6 @@
       </ol>
     {{/if}}
     <div id="show">
-      {{#if this.model.re3data}}
-        <div class="pull-right">
-          <a href="{{this.model.re3data}}">
-            <img class="img-responsive" src="{{this.model.badgeUrl}}" />
-          </a>
-        </div>
-      {{/if}}
       <h2 class="work">
         {{this.model.name}}
         {{#unless this.model.isActive}}
diff --git a/app/templates/repositories/show/edit.hbs b/app/templates/repositories/show/edit.hbs
@@ -28,12 +28,6 @@
 
       {{#if (eq this.model.clientType "periodical")}}
         <RepositoryIssn @model={{this.model}} @fragment={{this.model.issn}} @form={{form}} />
-      {{else}}
-        <form.element @controlType="power-select" id="re3data" class="form-group" @property="re3data" @label="re3data Record (optional)" @optionLabelPath="re3data" @options={{this.repositories}} @destination={{this.re3data}} @helpText="re3data is a registry of research data repositories." as |el|>
-          <el.control @onChange={{action "selectRe3DataAction"}} @search={{action "searchRe3DataAction"}} @searchField="repositoryName" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
-            {{if item.name item.name this.model.re3data}}
-          </el.control>
-        </form.element>
       {{/if}}
 
       <form.element @controlType="text" id="name" class="form-group" @label="Repository Name" @property="name" as |el| ><el.control id="name-field" /></form.element>
diff --git a/app/templates/repositories/show/settings.hbs b/app/templates/repositories/show/settings.hbs
diff --git a/cypress/e2e/client_admin/info.test.ts b/cypress/e2e/client_admin/info.test.ts
diff --git a/cypress/e2e/organization_admin/repositories.test.ts b/cypress/e2e/organization_admin/repositories.test.ts
diff --git a/tests/unit/models/re3data-test.js b/tests/unit/models/re3data-test.js

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ import Inflector from 'ember-inflector';`
`3`	`3`	`export function initialize(/* application */) {`
`4`	`4`	`const inflector = Inflector.inflector;`
`5`	`5`
`6`		`- inflector.uncountable('re3data');`
`7`	`6`	`}`
`8`	`7`
`9`	`8`	`export default {`