@webitel/ui-sdk 3.2.13 → 3.2.15

package/package.json

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

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

@@ -1,8 +1,6 @@
 import deepEqual from 'deep-equal';
 import isEmpty from '../../../scripts/isEmpty';
 import BaseStoreModule from '../../../store/BaseStoreModules/BaseStoreModule';
-// eslint-disable-next-line import/no-cycle
-import router from '../../../router';
 
 export default class FiltersStoreModule extends BaseStoreModule {
   getters = {
@@ -15,13 +13,14 @@ export default class FiltersStoreModule extends BaseStoreModule {
       };
     }, {}),
     GET_FILTER: (state) => (filter) => {
+      if (!state[filter]) return null;
       const { value, storedProp, multiple } = state[filter];
       if (multiple) return value.map((item) => item[storedProp]); // if arr, map
       if (storedProp) return value[storedProp]; // if object and has specific prop, return this prop
       return value; // else return val
     },
-    GET_VALUE_FROM_QUERY: () => ({ filterQuery }) => (
-      router.currentRoute.value.query[filterQuery]
+    GET_VALUE_FROM_QUERY: (context) => ({ filterQuery }) => (
+      context.state.router.currentRoute.value.query[filterQuery]
     ),
   };
 
@@ -64,11 +63,11 @@ export default class FiltersStoreModule extends BaseStoreModule {
     },
     CHANGE_ROUTE_QUERY: (context, { value, filterQuery }) => {
       if (deepEqual(context.getters.GET_VALUE_FROM_QUERY({ filterQuery }), value)) return;
-      const query = { ...router.currentRoute.value.query };
+      const query = { ...context.state.router.currentRoute.value.query };
       query[filterQuery] = value;
       // eslint-disable-next-line consistent-return
-      return router.replace({
-        name: router.currentRoute.value.name,
+      return context.state.router.replace({
+        name: context.state.router.currentRoute.value.name,
         query,
       });
     },