UFAL/Searching problems in Manage Handles table (#882)

* locked searchbar when searchOption is not picked

* edited Resource Type search option to not be case-sensitive

* edited Resource Type search option to show nothing when there is no match

* try to set lowercase constants without toLowerCase method

* Added full list of handles for empty Resource Type search option

* refactored empty searchQueries handling and added comment for invalid resourcetype search inputs

Author: jr-rk

src/app/handle-page/handle-table/handle-table.component.html

@@ -21,7 +21,8 @@ <h5 class="card-header">{{ 'handle-table.title' | translate }}</h5>
         </div>
       </div>
         <input type="text" id="clarin-dc-search-box" class="form-control" aria-label="Text input with dropdown button"
-               [(ngModel)]="searchQuery">
+               [(ngModel)]="searchQuery"
+               [disabled]="!searchOption">
         <span class="input-group-append" (click)="searchHandles()">
           <button type="submit" class="btn btn-primary search-button">
             <i class="fas fa-search"></i>{{'handle-table.dropdown.search-button' | translate}}</button>

src/app/handle-page/handle-table/handle-table.component.ts

@@ -373,40 +373,45 @@ export class HandleTableComponent implements OnInit {
     // parse searchQuery for the server request
     // the new sorting query is in the format e.g. `handle:123456`, `resourceTypeId:2`, `url:internal`
     let parsedSearchOption = '';
-    let parsedSearchQuery = this.searchQuery;
-    switch (this.searchOption) {
-      case this.handleOption:
-        parsedSearchOption = HANDLE_SEARCH_OPTION;
-        break;
-      case this.internalOption:
-        // if the handle doesn't have the URL - is internal, if it does - is external
-        parsedSearchOption = URL_SEARCH_OPTION;
-        if (this.searchQuery.toLowerCase() === 'yes') {
-          parsedSearchQuery = 'internal';
-        } else if (this.searchQuery.toLowerCase() === 'no') {
-          parsedSearchQuery = 'external';
-        }
-        break;
-      case this.resourceTypeOption:
-        parsedSearchOption = RESOURCE_TYPE_SEARCH_OPTION;
-        // parse resourceType from string to the number because the resourceType is integer on the server
-        switch (this.searchQuery) {
-          case ITEM:
-            parsedSearchQuery = '' + 2;
-            break;
-          case COLLECTION:
-            parsedSearchQuery = '' + 3;
-            break;
-          case COMMUNITY:
-            parsedSearchQuery = '' + 4;
-            break;
-          case SITE:
-            parsedSearchQuery = '' + 5;
-        }
-        break;
-      default:
-        parsedSearchOption = '';
-        break;
+    let parsedSearchQuery = '';
+    if (this.searchQuery) {
+      parsedSearchQuery = this.searchQuery;
+      switch (this.searchOption) {
+        case this.handleOption:
+          parsedSearchOption = HANDLE_SEARCH_OPTION;
+          break;
+        case this.internalOption:
+          // if the handle doesn't have the URL - is internal, if it does - is external
+          parsedSearchOption = URL_SEARCH_OPTION;
+          if (this.searchQuery.toLowerCase() === 'yes') {
+            parsedSearchQuery = 'internal';
+          } else if (this.searchQuery.toLowerCase() === 'no') {
+            parsedSearchQuery = 'external';
+          }
+          break;
+        case this.resourceTypeOption:
+          parsedSearchOption = RESOURCE_TYPE_SEARCH_OPTION;
+          // parse resourceType from string to the number because the resourceType is integer on the server
+          switch (this.searchQuery.toLowerCase()) {
+            case ITEM.toLowerCase():
+              parsedSearchQuery = '' + 2;
+              break;
+            case COLLECTION.toLowerCase():
+              parsedSearchQuery = '' + 3;
+              break;
+            case COMMUNITY.toLowerCase():
+              parsedSearchQuery = '' + 4;
+              break;
+            case SITE.toLowerCase():
+              parsedSearchQuery = '' + 5;
+              break;
+            // no results for invalid search inputs
+            default:
+              parsedSearchQuery = '' + -1;
+              break;
+          }
+          break;
+      }
     }
 
     this.sortConfiguration.field = parsedSearchOption + ':' + parsedSearchQuery;

src/assets/i18n/cs.json5

@@ -2469,7 +2469,7 @@
   // "handle-table.table.handle": "Handle",
   "handle-table.table.handle": "Handle",
   // "handle-table.table.internal": "Internal",
-  "handle-table.table.internal": "Interní",
+  "handle-table.table.internal": "Je interní",
   // "handle-table.table.is-internal": "Yes",
   "handle-table.table.is-internal": "Ano",
   // "handle-table.table.not-internal": "No",

src/assets/i18n/en.json5

@@ -2029,7 +2029,7 @@
 
   "handle-table.table.handle": "Handle",
 
-  "handle-table.table.internal": "Internal",
+  "handle-table.table.internal": "Is Internal",
 
   "handle-table.table.is-internal": "Yes",