Merge pull request datacite#949 from datacite/pb646-software-field

Make software field for create/update repository required.

Author: svogt0511

app/controllers/providers/show/repositories/new.js

@@ -29,6 +29,7 @@ export default class EditController extends Controller {
   re3data = null;
   softwareList = softwareList;
   softwares = softwareList;
+  isSoftwareFieldActive = false;
   clientTypeList = clientTypeList;
   clientTypes = clientTypeList;
 
@@ -185,4 +186,10 @@ export default class EditController extends Controller {
     this.model.rollbackAttributes();
     this.router.transitionTo('repositories.show', this.model);
   }
+
+  // This helps to manage the validation state of the software field.  The field is required, but we don't want to show it as invalid until the user has interacted with it.
+  @action
+  activateSoftwareField() {
+    return this.set('isSoftwareFieldActive', true);
+  }
 }

app/controllers/repositories/show/edit.js

@@ -156,6 +156,9 @@ const Validations = buildValidations({
       allowBlank: true,
       message: 'ISSN (print) is in the wrong format.'
     })
+  ],
+  software: [
+    validator('presence', true)
   ]
 });
 

app/models/repository.js

@@ -37,4 +37,22 @@ export default class NewRoute extends Route {
       })
     });
   }
+
+  setupController(controller, model) {
+    // Call _super to maintain default behavior (controller.set('model', model))
+    super.setupController(controller, model);
+
+    // Custom setup: Set additional properties
+    controller.set('isSoftwareFieldActive', false);
+  }
+
+  resetController(controller, isExiting, transition) {
+    // If the user is exiting the route entirely, reset the transient properties
+    if (isExiting) {
+      controller.set('isSoftwareFieldActive', false);
+    }
+
+    // Calls the default resetController behavior (important for query params)
+    super.resetController(controller, isExiting, transition);
+  }
 }

app/routes/providers/show/repositories/new.js

@@ -39,5 +39,16 @@ export default class EditRoute extends Route {
 
     controller.set('clientTypeList', filteredClientTypeList);
     controller.set('clientTypes', filteredClientTypeList);
+    controller.set('isSoftwareFieldActive', false);
+  }
+
+  resetController(controller, isExiting, transition) {
+    // If the user is exiting the route entirely, reset the transient properties
+    if (isExiting) {
+      controller.set('isSoftwareFieldActive', false);
+    }
+
+    // Calls the default resetController behavior (important for query params)
+    super.resetController(controller, isExiting, transition);
   }
 }

app/routes/repositories/show/edit.js

@@ -149,7 +149,6 @@ div[doi-format].power-select-fragment .ember-basic-dropdown-trigger div.ember-vi
 /*  VALIDATION - FORM-GROUPS */
 
 .form-group .form-text {
-  font-size: 16px;
   display: block;
   margin-top: 5px;
   margin-bottom: 10px;
@@ -557,7 +556,6 @@ div[doi-publisher] > div {
 .form-group input.is-valid + div.form-text {
     color: #2ecc71;
 }
-*/
 
 /* VALIDATION - text areas (Mostly in doi form upload.) */
 

app/styles/local.css

@@ -13,6 +13,6 @@ module('Integration | Helper | repository-form-errors', function (hooks) {
 
     await render(hbs`{{repository-form-errors this.model}}`);
 
-    assert.dom(this.element).hasText('repository ID, confirm repository ID');
+    assert.dom(this.element).hasText('repository ID, confirm repository ID, software');
   });
 });