Merge pull request #4273 from 4Science/task/main/DURACOM-354

Fix missing input fields for integer script parameters

Author: tdonohue

src/app/process-page/form/process-parameters/parameter-value-input/number-value-input/integer-value-input.component.html

@@ -0,0 +1,11 @@
+<input [attr.aria-label]="'process.new.parameter.label' | translate" required #integer="ngModel" type="number" step="1" name="integer-value-{{index}}" class="form-control" id="integer-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+@if (integer.invalid && (integer.dirty || integer.touched)) {
+  <div
+    class="alert alert-danger validation-error mb-0">
+    @if (integer.errors.required) {
+      <div>
+        {{'process.new.parameter.integer.required' | translate}}
+      </div>
+    }
+  </div>
+}

src/app/process-page/form/process-parameters/parameter-value-input/number-value-input/integer-value-input.component.scss

@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--bs-spacer) / 2);
+}

src/app/process-page/form/process-parameters/parameter-value-input/number-value-input/integer-value-input.component.spec.ts

@@ -0,0 +1,81 @@
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { IntegerValueInputComponent } from './integer-value-input.component';
+
+describe('IntegerValueInputComponent', () => {
+  let component: IntegerValueInputComponent;
+  let fixture: ComponentFixture<IntegerValueInputComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+        IntegerValueInputComponent,
+      ],
+      providers: [],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IntegerValueInputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty', fakeAsync(() => {
+    component.value = undefined;
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  }));
+
+  it('should not show a validation error if the input field was touched but not left empty', fakeAsync(() => {
+    component.value = 1;
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  }));
+});

src/app/process-page/form/process-parameters/parameter-value-input/number-value-input/integer-value-input.component.ts

@@ -0,0 +1,49 @@
+import {
+  Component,
+  Input,
+  OnInit,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  FormsModule,
+  NgForm,
+} from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { controlContainerFactory } from '../../../process-form-factory';
+import { ValueInputComponent } from '../value-input.component';
+
+/**
+ * Represents the user-inputted value of an integer parameter
+ */
+@Component({
+  selector: 'ds-integer-value-input',
+  templateUrl: './integer-value-input.component.html',
+  styleUrls: ['./integer-value-input.component.scss'],
+  viewProviders: [{ provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] }],
+  standalone: true,
+  imports: [FormsModule, TranslateModule],
+})
+export class IntegerValueInputComponent extends ValueInputComponent<number> implements OnInit {
+  /**
+   * The current value of the integer
+   */
+  value: number;
+
+  /**
+   * Initial value of the field
+   */
+  @Input() initialValue;
+
+  ngOnInit(): void {
+    this.value = this.initialValue;
+  }
+
+  setValue(value) {
+    this.value = value;
+    this.updateValue.emit(value);
+  }
+}

src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html

@@ -3,6 +3,9 @@
     @case (parameterTypes.STRING) {
       <ds-string-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
     }
+    @case (parameterTypes.INTEGER) {
+      <ds-integer-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-integer-value-input>
+    }
     @case (parameterTypes.OUTPUT) {
       <ds-string-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
     }

src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts

@@ -17,6 +17,7 @@ import { controlContainerFactory } from '../../process-form-factory';
 import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component';
 import { DateValueInputComponent } from './date-value-input/date-value-input.component';
 import { FileValueInputComponent } from './file-value-input/file-value-input.component';
+import { IntegerValueInputComponent } from './number-value-input/integer-value-input.component';
 import { StringValueInputComponent } from './string-value-input/string-value-input.component';
 
 /**
@@ -30,7 +31,7 @@ import { StringValueInputComponent } from './string-value-input/string-value-inp
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [StringValueInputComponent, DateValueInputComponent, FileValueInputComponent, BooleanValueInputComponent],
+  imports: [StringValueInputComponent, DateValueInputComponent, FileValueInputComponent, BooleanValueInputComponent, IntegerValueInputComponent],
 })
 export class ParameterValueInputComponent {
   @Input() index: number;

src/app/process-page/scripts/script-parameter-type.model.ts

@@ -3,6 +3,7 @@
  */
 export enum ScriptParameterType {
   STRING = 'String',
+  INTEGER = 'Integer',
   DATE = 'date',
   BOOLEAN = 'boolean',
   FILE = 'InputStream',

src/assets/i18n/ar.json5

@@ -6045,6 +6045,9 @@
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "يرجى تحديد ملف",
 
+  // "process.new.parameter.integer.required": "Parameter value is required",
+  "process.new.parameter.integer.required": "قيمة المتغير مطلوبة",
+
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "قيمة المتغير مطلوبة",
 
@@ -11456,4 +11459,4 @@
   "embargo.listelement.badge": "Embargo until {{ date }}",
 
 
-}
+}

src/assets/i18n/bn.json5

@@ -6525,6 +6525,9 @@
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "দয়াকরে একটি ফাইল নির্বাচন করুন",
 
+  // "process.new.parameter.integer.required": "Parameter value is required",
+  "process.new.parameter.integer.required": "পরামিতির মান প্রয়োজন",
+
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "পরামিতির মান প্রয়োজন",
 
@@ -12379,4 +12382,4 @@
   "embargo.listelement.badge": "Embargo until {{ date }}",
 
 
-}
+}

src/assets/i18n/ca.json5

@@ -5850,6 +5850,9 @@
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "Si us plau seleccioneu un fitxer",
 
+  // "process.new.parameter.integer.required": "Parameter value is required",
+  "process.new.parameter.integer.required": "Es requereix el valor del paràmetre",
+
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "Es requereix el valor del paràmetre",
 
@@ -10771,4 +10774,4 @@
   "embargo.listelement.badge": "Embargo until {{ date }}",
 
 
-}
+}