feat(document): advanced search

If there is only one value in the search type menu, it is disabled. * Adds the new options hideLabelSelectOption on the schema. * Fixes templateOptions to avoid overwriting default values. Co-Authored-by: Bertrand Zuchuat <[email protected]>
Garfield-fr · Jan 30, 2024 · 27e7421 · 27e7421
1 parent 6d2704d
commit 27e7421
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "@ngx-loading-bar/http-client": "^6.0.0",
     "@ngx-loading-bar/router": "^6.0.0",
     "@ngx-translate/core": "^14.0.0",
-    "@rero/ng-core": "^14.7.0",
+    "@rero/ng-core": "^14.8.0",
     "@swimlane/ngx-charts": "^20.1.2",
     "bootstrap": "^4.6.2",
     "crypto-js": "^4.1.1",

diff --git a/...cord/search-view/document-advanced-search-form/document-advanced-search-form.component.ts b/...cord/search-view/document-advanced-search-form/document-advanced-search-form.component.ts
@@ -1,7 +1,7 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2019-2023 RERO
- * Copyright (C) 2021-2023 UCLouvain
+ * Copyright (C) 2019-2024 RERO
+ * Copyright (C) 2021-2024 UCLouvain
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -159,11 +159,8 @@ export class DocumentAdvancedSearchFormComponent implements OnInit {
    */
   private initField(field: any, fieldParentKey: string, subject: BehaviorSubject<any>): void {
     if (Object.keys(this.fieldDataConfig).some(key => key === fieldParentKey)) {
-      field.templateOptions = {
-        options: subject.asObservable(),
-        minItemsToDisplaySearch: 10,
-        sort: false,
-      };
+      field.templateOptions.options = subject.asObservable();
+      field.templateOptions.sort = false;
       field.type = 'select';
       subject.next(this.fieldDataConfig[fieldParentKey]);
     } else {
@@ -179,10 +176,9 @@ export class DocumentAdvancedSearchFormComponent implements OnInit {
    */
   private initFieldSearchType(field: any, fieldParentKey: string, subject: BehaviorSubject<any>): void {
     if (Object.keys(this.fieldsSearchTypeConfig).some(key => key === fieldParentKey)) {
-      field.templateOptions = {
-        options: subject.asObservable(),
-        sort: false,
-      };
+      field.templateOptions.options = subject.asObservable();
+      field.templateOptions.sort = false;
+      field.templateOptions.readonly = this.fieldsSearchTypeConfig[fieldParentKey].length < 2;
       subject.next(this.fieldsSearchTypeConfig[fieldParentKey]);
       const fieldSearchTypeValue = this.fieldsSearchTypeConfig[fieldParentKey][0].value;
       if (
@@ -223,7 +219,9 @@ export class DocumentAdvancedSearchFormComponent implements OnInit {
                 templateOptions: {
                   sort: false,
                   hideLabel: true,
+                  hideLabelSelectOption: true,
                   required: true,
+                  minItemsToDisplaySearch: 999,
                   options: this.advancedSearchService.getFieldsConfig(),
                 },
               },
@@ -233,6 +231,7 @@ export class DocumentAdvancedSearchFormComponent implements OnInit {
                 key: 'searchType',
                 defaultValue: false,
                 templateOptions: {
+                  hideLabelSelectOption: true,
                   options: []
                 },
                 hooks: {
@@ -286,7 +285,9 @@ export class DocumentAdvancedSearchFormComponent implements OnInit {
                   templateOptions: {
                     sort: false,
                     hideLabel: true,
+                    hideLabelSelectOption: true,
                     required: true,
+                    minItemsToDisplaySearch: 999,
                     options: this.advancedSearchService.getFieldsConfig(),
                   },
                 },
@@ -296,6 +297,7 @@ export class DocumentAdvancedSearchFormComponent implements OnInit {
                   key: 'searchType',
                   defaultValue: false,
                   templateOptions: {
+                    hideLabelSelectOption: true,
                     options: []
                   },
                   hooks: {