mes-8441-searchEmptyInputBug (#975)

* Fixed bug where an empty field could be searched * Fixed bug where an numbers could be inputted into application reference
dvsa · Dec 6, 2022 · 0b638cc · 0b638cc
1 parent ecff356
commit 0b638cc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/app/pages/test-results-search/test-results-search.html b/src/app/pages/test-results-search/test-results-search.html
@@ -41,8 +41,9 @@
                     <ion-row class="ion-padding-top">
                         <ion-col size="96">
                             <ion-input
+                                    *ngIf="searchBy !== 'appReference'"
                                     id="test-result-search-{{searchBy}}-input"
-                                    [placeholder]="searchBy === 'appReference' ? 'Enter an application reference' : 'Enter a driver number'"
+                                    [placeholder]="'Enter a driver number'"
                                     type="text"
                                     class="ion-input-styling custom-font-size"
                                     clearInput
@@ -51,14 +52,28 @@
                                     (ionBlur)="setFocus(null)"
                                     [value]="candidateInfo"
                                     [ngClass]="{'input-focus': focusedElement === 'field'}"
-                                    (ionInput)="candidateInfoChanged($event.target.value)">
+                                    (ionChange)="candidateInfoChanged($event.target.value)">
+                            </ion-input>
+                            <ion-input
+                                    *ngIf="searchBy === 'appReference'"
+                                    id="test-result-search-{{searchBy}}-input"
+                                    [placeholder]="'Enter an application reference'"
+                                    type="text"
+                                    class="ion-input-styling custom-font-size"
+                                    clearInput
+                                    numbersOnly
+                                    (ionFocus)="setFocus('field')"
+                                    (ionBlur)="setFocus(null)"
+                                    [value]="candidateInfo"
+                                    [ngClass]="{'input-focus': focusedElement === 'field'}"
+                                    (ionChange)="candidateInfoChanged($event.target.value)">
                             </ion-input>
                         </ion-col>
                     </ion-row>
                     <ion-row class="ion-padding-top">
                         <ion-button
                                 id="test-result-search-button"
-                                [attr.disabled]="showSearchSpinner ? 'true' : null"
+                                [attr.disabled]="showSearchSpinner ? 'true' : isEmpty(candidateInfo)"
                                 class="mes-primary-button search-tests" (click)="searchTests()">
                             <h3 id="test-result-search-button-text">
                                 <ion-icon name="search" class="search-icon"></ion-icon>

diff --git a/src/app/pages/test-results-search/test-results-search.ts b/src/app/pages/test-results-search/test-results-search.ts
@@ -197,4 +197,8 @@ export class TestResultsSearchPage extends BasePageComponent {
   setFocus(focus: string): void {
     this.focusedElement = focus;
   }
+
+  isEmpty(input: string) {
+    return input === null || input.match(/^ *$/) !== null || input.trim() === '';
+  }
 }