Merge pull request #6321 from mzimandl/fullsearch

Fix loading actions and split searches into tabs

public/files/js/models/searchHistory/actions.ts

@@ -117,9 +117,10 @@ export class Actions {
         name: 'QUERY_HISTORY_REMOVE_ITEM_FROM_LIST_DONE'
     };
 
-    static ToggleAdvancedSearch:Action<{
+    static ChangeSearchForm:Action<{
+        value:string;
     }> = {
-        name: 'QUERY_HISTORY_TOGGLE_ADVANCED_SEARCH'
+        name: 'QUERY_HISTORY_CHANGE_SEARCH_FORM'
     };
 
     static SetFsPosattrName:Action<{

public/files/js/models/searchHistory/common.ts

@@ -139,7 +139,6 @@ export interface GetHistoryArgs {
     query_supertype:Kontext.QuerySupertype;
     corpname:string;
     archived_only:boolean;
-    extended_search:boolean;
     fsPosattrName?:string;
     fsPosattrValue?:string;
     fsStructureName?:string;
@@ -185,14 +184,14 @@ export interface SearchHistoryModelState {
     archivedOnly:boolean;
     currentItem:number;
     supportsFulltext:boolean;
+    searchFormView:string;
     fsQueryCQLProps:boolean;
     fsPosattrName:string;
     fsPosattrValue:string;
     fsStructureName:string;
     fsStructattrName:string;
     fsStructattrValue:string;
     fsAnyPropertyValue:string;
-    extendedSearchVisible:boolean;
     fsSubcorpus:string;
     fsWlAttr:string;
     fsWlPat:string;

public/files/js/models/searchHistory/index.ts

@@ -86,14 +86,14 @@ export class SearchHistoryModel extends StatefulModel<SearchHistoryModelState> {
                 archivedOnly: false,
                 currentItem: 0,
                 supportsFulltext,
+                searchFormView: 'quick',
                 fsPosattrName: 'word',
                 fsPosattrValue: '',
                 fsStructureName: '',
                 fsStructattrName: '',
                 fsStructattrValue: '',
                 fsAnyPropertyValue: '',
                 fsQueryCQLProps: true,
-                extendedSearchVisible: false,
                 fsSubcorpus: '',
                 fsWlAttr: '',
                 fsWlPat: '',
@@ -112,31 +112,38 @@ export class SearchHistoryModel extends StatefulModel<SearchHistoryModelState> {
             Actions.HistorySetCurrentCorpusOnly,
             action => {
                 this.changeState(state => {
-                    state.isBusy = true;
+                    state.isBusy = !this.isAdvancedSearch();
                     state.currentCorpusOnly = action.payload.value;
                 });
-                this.performLoadAction();
+                if (!this.isAdvancedSearch()) {
+                    this.performLoadAction();
+                }
             }
         );
 
         this.addActionHandler(
             Actions.HistorySetArchivedOnly,
             action => {
                 this.changeState(state => {
-                    state.isBusy = true;
+                    state.isBusy = !this.isAdvancedSearch();
                     state.archivedOnly = action.payload.value;
                 });
-                this.performLoadAction();
+                if (!this.isAdvancedSearch()) {
+                    this.performLoadAction();
+                }
             }
         );
 
         this.addActionHandler(
             Actions.HistorySetQuerySupertype,
             action => {
                 this.changeState(state => {
+                    state.isBusy = !this.isAdvancedSearch();
                     state.querySupertype = action.payload.value;
                 });
-                this.performLoadAction();
+                if (!this.isAdvancedSearch()) {
+                    this.performLoadAction();
+                }
             }
         );
 
@@ -280,11 +287,11 @@ export class SearchHistoryModel extends StatefulModel<SearchHistoryModelState> {
         );
 
         this.addActionHandler(
-            Actions.ToggleAdvancedSearch,
+            Actions.ChangeSearchForm,
             action => {
                 this.changeState(
                     state => {
-                        state.extendedSearchVisible = !state.extendedSearchVisible;
+                        state.searchFormView = action.payload.value;
                     }
                 )
             }
@@ -425,19 +432,10 @@ export class SearchHistoryModel extends StatefulModel<SearchHistoryModelState> {
         this.addActionHandler(
             Actions.SubmitExtendedSearch,
             action => {
-                this.loadData().subscribe({
-                    next: () => {
-                        this.changeState(state => {
-                            state.isBusy = false
-                        });
-                    },
-                    error: (err) => {
-                        this.changeState(state => {
-                            state.isBusy = false
-                        });
-                        this.pageModel.showMessage('error', err);
-                    },
+                this.changeState(state => {
+                    state.isBusy = true;
                 });
+                this.performLoadAction();
             }
         )
     }
@@ -461,28 +459,19 @@ export class SearchHistoryModel extends StatefulModel<SearchHistoryModelState> {
     }
 
     private performLoadAction(widgetMode: boolean = false): void {
-        if (!this.state.extendedSearchVisible) {
-            this.loadData(widgetMode).subscribe({
-                next: () => {
-                    this.changeState(state => {
-                        state.isBusy = false
-                    });
-                },
-                error: (err) => {
-                    this.changeState(state => {
-                        state.isBusy = false
-                    });
-                    this.pageModel.showMessage('error', err);
-                },
-            });
-
-        } else {
-            this.changeState(
-                state => {
-                    state.isBusy = false;
-                }
-            );
-        }
+        this.loadData(widgetMode).subscribe({
+            next: () => {
+                this.changeState(state => {
+                    state.isBusy = false
+                });
+            },
+            error: (err) => {
+                this.changeState(state => {
+                    state.isBusy = false
+                });
+                this.pageModel.showMessage('error', err);
+            },
+        });
     }
 
     private loadData(widgetMode:boolean=false): Observable<GetHistoryResponse> {
@@ -494,9 +483,8 @@ export class SearchHistoryModel extends StatefulModel<SearchHistoryModelState> {
             corpname: !widgetMode && this.state.currentCorpusOnly ?
                 this.pageModel.getCorpusIdent().id : undefined,
             archived_only: !widgetMode && this.state.archivedOnly,
-            extended_search: this.state.extendedSearchVisible,
         };
-        if (this.state.extendedSearchVisible) {
+        if (!widgetMode && this.isAdvancedSearch()) {
             switch (this.state.querySupertype) {
                 case 'conc':
                 case 'pquery':
@@ -641,4 +629,8 @@ export class SearchHistoryModel extends StatefulModel<SearchHistoryModelState> {
             )
         );
     }
+
+    private isAdvancedSearch():boolean {
+        return this.state.searchFormView === 'advanced';
+    }
 }

public/files/js/translations/messages.cs.json

@@ -474,6 +474,7 @@
         "qhistory__th_datetime": "datum a čas",
         "qhistory__open_in_form": "Použít",
         "qhistory__filter_legend": "Filtr",
+        "qhistory__search_legend": "Hledání",
         "qhistory__load_more_link": "Nahrát další",
         "qhistory__archived_as": "Archivováno jako",
         "qhistory__checkbox_archived_only": "Pouze archivované",
@@ -485,7 +486,8 @@
         "qhistory__remove_from_list": "Odstranit ze seznamu",
         "qhistory__item_removed": "Odstraněno ze seznamu",
         "qhistory__blank_query": "nevyplněno",
-        "qhistory__advanced_search": "Rozšířené hledání",
+        "qhistory__quick_search": "Rychlé hledání",
+        "qhistory__extended_search": "Rozšířené hledání",
         "qhistory__used_posattrs_label": "Poziční atribut",
         "qhistory__used_property_value": "obsahuje",
         "qhistory__used_structattrs_label": "Strukturní atribut",

public/files/js/translations/messages.en.json

@@ -474,6 +474,7 @@
         "qhistory__th_datetime": "date and time",
         "qhistory__open_in_form": "Use",
         "qhistory__filter_legend": "Filter",
+        "qhistory__search_legend": "Search",
         "qhistory__load_more_link": "Load more",
         "qhistory__archived_as": "Archived as",
         "qhistory__checkbox_archived_only": "Only archived items",
@@ -485,7 +486,8 @@
         "qhistory__remove_from_list": "Remove from the list",
         "qhistory__item_removed": "Removed from the list",
         "qhistory__blank_query": "blank",
-        "qhistory__advanced_search": "Extended search",
+        "qhistory__quick_search": "Quick search",
+        "qhistory__extended_search": "Extended search",
         "qhistory__used_posattrs_label": "Positional attribute",
         "qhistory__used_property_value": "contains",
         "qhistory__used_structattrs_label": "Structural attribute",

public/files/js/translations/messages.sl.json

@@ -513,6 +513,7 @@
         "qhistory__th_datetime": "datum in čas",
         "qhistory__open_in_form": "Uporabi",
         "qhistory__filter_legend": "Filter",
+        "qhistory__search_legend": "Search UNTRANSLATED",
         "qhistory__load_more_link": "Naloži več",
         "qhistory__archived_as": "Arhivirano kot",
         "qhistory__checkbox_archived_only": "Samo arhivirani elementi",
@@ -935,7 +936,8 @@
         "pquery__parameters_form": "Parametri paradigmatične poizvedbe",
         "pquery__align_type_whole_kwic": "celoten KWIC kot ena beseda",
         "qhistory__curr_corp_only_label_{corpus}": "{corpus} only UNTRANSLATED",
-        "qhistory__advanced_search": "Extended search UNTRANSLATED",
+        "qhistory__quick_search": "Quick search UNTRANSLATED",
+        "qhistory__extended_search": "Extended search UNTRANSLATED",
         "qhistory__used_posattrs_label": "Positional attribute UNTRANSLATED",
         "qhistory__used_property_value": "contains UNTRANSLATED",
         "qhistory__used_structattrs_label": "Structural attribute UNTRANSLATED",

public/files/js/translations/messages.szl.json

@@ -473,6 +473,7 @@
         "qhistory__th_datetime": "data i czas",
         "qhistory__open_in_form": "Use UNTRANSLATED",
         "qhistory__filter_legend": "Filter",
+        "qhistory__search_legend": "Search UNTRANSLATED",
         "qhistory__load_more_link": "Laduj wiyncyj",
         "qhistory__archived_as": "Zarchiwizowane za",
         "qhistory__checkbox_archived_only": "Ino zarchiwizowane elymynta",
@@ -484,7 +485,8 @@
         "qhistory__remove_from_list": "Remove from the list UNTRANSLATED",
         "qhistory__item_removed": "Removed from the list UNTRANSLATED",
         "qhistory__blank_query": "blank UNTRANSLATED",
-        "qhistory__advanced_search": "Extended search UNTRANSLATED",
+        "qhistory__quick_search": "Quick search UNTRANSLATED",
+        "qhistory__extended_search": "Extended search UNTRANSLATED",
         "qhistory__used_posattrs_label": "Positional attribute UNTRANSLATED",
         "qhistory__used_property_value": "contains UNTRANSLATED",
         "qhistory__used_structattrs_label": "Structural attribute UNTRANSLATED",