@webitel/ui-sdk 3.2.24 → 3.2.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webitel/ui-sdk",
-  "version": "3.2.24",
+  "version": "3.2.25",
   "private": false,
   "scripts": {
     "serve-lib": "vue-cli-service serve",

package/src/modules/Filters/store/FiltersStoreModule.js

@@ -75,6 +75,7 @@ export default class FiltersStoreModule extends BaseStoreModule {
     // eslint-disable-next-line consistent-return
     RESTORE_FILTER: (context, { filter }) => {
       const value = context.getters.GET_VALUE_FROM_QUERY({ filterQuery: filter });
+      if (filter === 'sort') context.dispatch('RESTORE_SORT', { value });
       if (value) return context.dispatch('SET_FILTER', ({ filter, value }));
     },
     RESTORE_FILTERS: (context) => {
@@ -85,7 +86,17 @@ export default class FiltersStoreModule extends BaseStoreModule {
       context.commit('RESET_FILTERS');
     },
     ON_FILTER_SET: (context, { filter, value }) => context.dispatch('LOAD_DATA_LIST'),
-    LOAD_DATA_LIST: () => console.error('please override LOAD_DATA_LIST action in filters store'),
+
+    LOAD_DATA_LIST: (context) => context.dispatch(
+      `${context.getters.TABLE_NAMESPACE}/LOAD_DATA_LIST`,
+      { filters: context.getters.GET_FILTERS },
+      { root: true },
+    ),
+    RESTORE_SORT: (context, { value }) => context.dispatch(
+      `${context.getters.TABLE_NAMESPACE}/RESTORE_SORT_FROM_FILTER`,
+      { value },
+      { root: true },
+    ),
   };
 
   mutations = {

package/src/modules/TableStoreModule/store/TableStoreModule.js

@@ -1,4 +1,5 @@
 import {
+  queryToSortAdapter,
   SortSymbols,
   sortToQueryAdapter,
 } from '../../../scripts/sortQueryAdapters';
@@ -101,10 +102,13 @@ export default class TableStoreModule extends BaseStoreModule {
       const sort = nextSortOrder
         ? `${sortToQueryAdapter(nextSortOrder)}${header.field}`
         : nextSortOrder;
-      context.commit('SET_SORT', sort);
-      context.dispatch('UPDATE_HEADER_SORT', { header, nextSortOrder });
-      await context.dispatch('RESET_PAGE');
-      return context.dispatch('LOAD_DATA_LIST');
+      await context.dispatch('filters/SET_FILTER', { filter: 'sort', value: sort });
+      await context.dispatch('UPDATE_HEADER_SORT', { header, nextSortOrder });
+    },
+    RESTORE_SORT_FROM_FILTER: (context, { value }) => {
+      const sort = queryToSortAdapter(value.slice(0, 1));
+      const header = sort ? value.slice(1) : value;
+      return context.dispatch('UPDATE_HEADER_SORT', { header, nextSortOrder: sort });
     },
     UPDATE_HEADER_SORT: (context, { header, nextSortOrder }) => {
       const headers = context.state.headers.map((oldHeader) => {
@@ -185,9 +189,6 @@ export default class TableStoreModule extends BaseStoreModule {
     SET_PAGE: (state, page) => {
       state.page = page;
     },
-    SET_SORT: (state, sort) => {
-      state.sort = sort;
-    },
     SET_IS_NEXT: (state, next) => {
       state.isNextPage = next;
     },