Replacing 'advanced' with 'expert'

Author: ineiti

src/app/core/shared/search/models/paginated-search-options.model.ts

@@ -14,7 +14,7 @@ export class PaginatedSearchOptions extends SearchOptions {
   pagination?: PaginationComponentOptions;
   sort?: SortOptions;
 
-  constructor(options: {configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[], fixedFilter?: any, pagination?: PaginationComponentOptions, sort?: SortOptions, view?: ViewMode, advanced?: boolean}) {
+  constructor(options: {configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[], fixedFilter?: any, pagination?: PaginationComponentOptions, sort?: SortOptions, view?: ViewMode, expert?: boolean}) {
     super(options);
     this.pagination = options.pagination;
     this.sort = options.sort;

src/app/core/shared/search/models/search-options.model.ts

@@ -16,15 +16,15 @@ export class SearchOptions {
   view?: ViewMode = ViewMode.ListElement;
   scope?: string;
   query?: string;
-  advanced?: boolean;
+  expert?: boolean;
   dsoTypes?: DSpaceObjectType[];
   filters?: SearchFilter[];
   fixedFilter?: string;
 
   constructor(
     options: {
       configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[],
-      fixedFilter?: string, advanced?: boolean
+      fixedFilter?: string, expert?: boolean
     },
   ) {
     this.configuration = options.configuration;
@@ -33,7 +33,7 @@ export class SearchOptions {
     this.dsoTypes = options.dsoTypes;
     this.filters = options.filters;
     this.fixedFilter = options.fixedFilter;
-    this.advanced = options.advanced;
+    this.expert = options.expert;
   }
 
   /**
@@ -50,7 +50,7 @@ export class SearchOptions {
       args.push(this.encodedFixedFilter);
     }
     if (isNotEmpty(this.query)) {
-      if (!this.advanced) {
+      if (!this.expert) {
         args.push(`query=${encodeURIComponent(this.query.replace(':', '\\:'))}`);
       } else {
         args.push(`query=${encodeURIComponent(this.query)}`);

src/app/shared/search-form/search-form.component.html

@@ -10,7 +10,7 @@
         </button>
       }
     <div class="checkbox-wrapper-8">
-      <input class="tgl" id="cb3-8" name="advanced" type="checkbox" [(ngModel)]="advanced"/>
+      <input class="tgl" id="cb3-8" name="expert" type="checkbox" [(ngModel)]="expert"/>
       <label class="tgl-btn" [attr.data-tg-off]="('search.form.expert_off' | translate )" 
         [attr.data-tg-on]="('search.form.expert_on' | translate )" for="cb3-8"></label>
     </div>

src/app/shared/search-form/search-form.component.ts

@@ -56,7 +56,7 @@ export class SearchFormComponent implements OnChanges {
   /**
    * True to pass the search query without esacping of special characters.
    */
-  @Input() advanced: boolean;
+  @Input() expert: boolean;
 
   /**
    * True when the search component should show results on the current page

src/app/shared/search-form/themed-search-form.component.ts

@@ -19,7 +19,7 @@ export class ThemedSearchFormComponent extends ThemedComponent<SearchFormCompone
 
   @Input() query: string;
 
-  @Input() advanced: boolean;
+  @Input() expert: boolean;
 
   @Input() inPlaceSearch: boolean;
 
@@ -41,7 +41,7 @@ export class ThemedSearchFormComponent extends ThemedComponent<SearchFormCompone
 
   protected inAndOutputNames: (keyof SearchFormComponent & keyof this)[] = [
     'query',
-    'advanced',
+    'expert',
     'inPlaceSearch',
     'scope',
     'hideScopeInUrl',

src/app/shared/search/advanced-search/advanced-search.component.ts

@@ -133,7 +133,7 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
     if (isNotEmpty(this.currentValue)) {
       this.searchFilterService.minimizeAll();
       this.subs.push(this.searchConfigurationService.selectNewAppliedFilterParams(this.currentFilter, this.currentValue.trim(), this.currentOperator).pipe(take(1)).subscribe((params: Params) => {
-        params.advanced = true;
+        params.expert = true;
         void this.router.navigate([this.searchService.getSearchLink()], {
           queryParams: params,
         });

src/app/shared/search/search-configuration.service.ts

@@ -188,11 +188,11 @@ export class SearchConfigurationService implements OnDestroy {
   }
 
   /**
-   * @returns {Observable<boolean>} Emits the current advanced string
+   * @returns {Observable<boolean>} Emits the current expert string
    */
-  getCurrentAdvanced(defaultAdvanced: boolean) {
-    return this.routeService.getQueryParameterValue('advanced').pipe(map((advanced) => {
-      return advanced === 'true' || defaultAdvanced;
+  getCurrentExpert(defaultExpert: boolean) {
+    return this.routeService.getQueryParameterValue('expert').pipe(map((expert) => {
+      return expert === 'true' || defaultExpert;
     }));
   }
 
@@ -369,7 +369,7 @@ export class SearchConfigurationService implements OnDestroy {
       this.getConfigurationPart(defaults.configuration),
       this.getScopePart(defaults.scope),
       this.getQueryPart(defaults.query),
-      this.getAdvancedPart(defaults.advanced),
+      this.getExpertPart(defaults.expert),
       this.getDSOTypePart(),
       this.getFiltersPart(),
       this.getFixedFilterPart(),
@@ -394,7 +394,7 @@ export class SearchConfigurationService implements OnDestroy {
       this.getSortPart(paginationId, defaults.sort),
       this.getScopePart(defaults.scope),
       this.getQueryPart(defaults.query),
-      this.getAdvancedPart(defaults.advanced),
+      this.getExpertPart(defaults.expert),
       this.getDSOTypePart(),
       this.getFiltersPart(),
       this.getFixedFilterPart(),
@@ -447,12 +447,11 @@ export class SearchConfigurationService implements OnDestroy {
   }
 
   /**
-   * @returns {Observable<{advanced: boolean}>} Emits the current advanced boolean as a partial SearchOptions object
+   * @returns {Observable<{expert: boolean}>} Emits the current expert boolean as a partial SearchOptions object
    */
-  private getAdvancedPart(defaultAdvanced: boolean): Observable<{advanced: boolean}> {
-    return this.getCurrentAdvanced(defaultAdvanced).pipe(map((advanced) => {
-      console.log("getAdvancedPart", advanced)
-      return { advanced };
+  private getExpertPart(defaultExpert: boolean): Observable<{expert: boolean}> {
+    return this.getCurrentExpert(defaultExpert).pipe(map((expert) => {
+      return { expert };
     }));
   }
 

src/app/shared/search/search.component.html

@@ -106,7 +106,7 @@
 <ng-template #searchForm>
   <ds-search-form id="search-form"
     [query]="(searchOptions$ | async)?.query"
-    [advanced]="(searchOptions$ | async)?.advanced"
+    [expert]="(searchOptions$ | async)?.expert"
     [scope]="(searchOptions$ | async)?.scope"
     [hideScopeInUrl]="hideScopeInUrl"
     [currentUrl]="searchLink"

src/app/shared/search/search.component.spec.ts

@@ -300,7 +300,7 @@ describe('SearchComponent', () => {
       configuration: 'default',
       scope: '',
       sort: sortOptionsList[0],
-      advanced: false,
+      expert: false,
     });
     expect(comp.currentConfiguration$).toBeObservable(cold('b', {
       b: 'default',

src/app/shared/search/search.component.ts

@@ -231,7 +231,7 @@ export class SearchComponent implements OnDestroy, OnInit {
   /**
    * True to pass the query as-is without escaping of special characters.
    */
-  @Input() advanced = false;
+  @Input() expert = false;
 
   /**
    * The fallback scope when no scope is defined in the url, if this is also undefined no scope will be set
@@ -426,7 +426,6 @@ export class SearchComponent implements OnDestroy, OnInit {
       debounceTime(100),
     ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
       // Build the PaginatedSearchOptions object
-      console.log("searchOptions", searchOptions);
       const combinedOptions = Object.assign({}, searchOptions,
         {
           configuration: searchOptions.configuration || configuration,
@@ -435,10 +434,9 @@ export class SearchComponent implements OnDestroy, OnInit {
       if (combinedOptions.query === '') {
         combinedOptions.query = this.query;
       }
-      if (combinedOptions.advanced === undefined) {
-        combinedOptions.advanced = this.advanced;
+      if (combinedOptions.expert === undefined) {
+        combinedOptions.expert = this.expert;
       }
-      console.log(this.advanced, combinedOptions.advanced);
       if (isEmpty(combinedOptions.scope)) {
         combinedOptions.scope = scope;
       }