More propagation of 'advanced', and correct replacement of ':'

Author: ineiti

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

@@ -50,10 +50,11 @@ export class SearchOptions {
       args.push(this.encodedFixedFilter);
     }
     if (isNotEmpty(this.query)) {
-      if (!this.advanced){
-        this.query.replace(':', '\:');
+      if (!this.advanced) {
+        args.push(`query=${encodeURIComponent(this.query.replace(':', '\\:'))}`);
+      } else {
+        args.push(`query=${encodeURIComponent(this.query)}`);
       }
-      args.push(`query=${encodeURIComponent(this.query)}`);
     }
     if (isNotEmpty(this.scope)) {
       args.push(`scope=${encodeURIComponent(this.scope)}`);

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

@@ -12,7 +12,7 @@
       <input type="text" [(ngModel)]="query" name="query" class="form-control"
         [attr.aria-label]="searchPlaceholder" [attr.data-test]="'search-box' | dsBrowserOnly"
         [placeholder]="searchPlaceholder" tabindex="0">
-      <input type="checkbox" [(ngModel)]="advanced" [attr.name]="{{ ('search.form.advanced' | translate ) }}" checked />
+      <input type="checkbox" [(ngModel)]="advanced" name="advanced" checked /><label for="advanced">{{ "('search.form.advanced' | translate )" }}</label>
       <button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly" role="button" tabindex="0"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
     </div>
   </div>

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

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

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

@@ -133,6 +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;
         void this.router.navigate([this.searchService.getSearchLink()], {
           queryParams: params,
         });

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

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