Merge pull request #5364 from archana-s/arch/addFormValidationForScri…

…ptstage fix(core): Validators for script stage
spinnaker · May 23, 2018 · e585e2e · e585e2e
2 parents bd2b5b8 + 9e03d01
commit e585e2e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.html b/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.html
@@ -13,11 +13,11 @@
            ng-model="stage.repoBranch"/>
   </stage-config-field>
   <stage-config-field label="Script Path" help-key="pipeline.config.script.path">
-    <input type="text" class="form-control input-sm"
+    <input type="text" class="form-control input-sm" required
            ng-model="stage.scriptPath"/>
   </stage-config-field>
   <stage-config-field label="Command" help-key="pipeline.config.script.command">
-    <textarea class="form-control input-sm"
+    <textarea class="form-control input-sm" required
               ng-model="stage.command"/>
   </stage-config-field>
   <stage-config-field label="Output File" help-key="pipeline.config.script.propertyFile">

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.ts
@@ -21,6 +21,7 @@ module(SCRIPT_STAGE, [])
       templateUrl: require('./scriptStage.html'),
       executionDetailsSections: [ScriptExecutionDetails, ExecutionDetailsTasks],
       strategy: true,
+      validators: [{ type: 'requiredField', fieldName: 'command' }, { type: 'requiredField', fieldName: 'scriptPath' }],
     });
   })
   .controller('ScriptStageCtrl', function($scope: IScope, stage: IStage) {

diff --git a/app/scripts/modules/core/src/presentation/main.less b/app/scripts/modules/core/src/presentation/main.less
@@ -799,6 +799,7 @@ select:invalid {
     &.ng-dirty,
     &.ng-invalid-validate-min,
     &.ng-invalid-validate-max,
+    &.ng-invalid-required,
     &.highlight-pristine {
       border-color: var(--color-danger);
       .box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075)); // Redeclare so transitions work