@webitel/ui-sdk 24.8.20 → 24.8.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webitel/ui-sdk",
-  "version": "24.8.20",
+  "version": "24.8.22",
   "private": false,
   "scripts": {
     "dev": "vite",
@@ -107,7 +107,7 @@
     "jszip": "^3.5.0",
     "jszip-utils": "^0.1.0",
     "lodash": "^4.17.21",
-    "mitt": "^3.0.1",
+    "mitt": "3.0.1",
     "path-browserify": "^1.0.1",
     "plyr": "3.6.3",
     "query-string": "^8.1.0",

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

@@ -99,7 +99,6 @@ export default class FiltersStoreModule extends BaseStoreModule {
     },
 
     RESTORE_FILTERS: async (context) => {
-      context.state._emitter = mitt(); // FIXME wtf
       await Promise.allSettled(context.getters._STATE_FILTER_NAMES.map((name) => {
         return context.dispatch('RESTORE_FILTER', { name });
       }));
@@ -133,7 +132,6 @@ export default class FiltersStoreModule extends BaseStoreModule {
 
     EMIT: async (context, { event, payload }) => {
       return new Promise(async (resolve, reject) => {
-        console.info(context.state._emitter);
         const wildcardListeners = context.state._emitter.all.get('*');
         const eventListeners = context.state._emitter.all.get(event);
 

package/src/store/BaseStoreModules/BaseStoreModule.js

@@ -7,11 +7,7 @@ export default class BaseStoreModule {
 
   actions = {};
 
-  mutations = {
-    SET: (state, { path, value }) => {
-      return set(state, path, value);
-    },
-  };
+  mutations = {};
 
   modules = {};
 
@@ -61,7 +57,13 @@ export default class BaseStoreModule {
       state: { ...this.state, ...state },
       getters: { ...this.getters, ...getters },
       actions: { ...this.actions, ...actions },
-      mutations: { ...this.mutations, ...mutations },
+      mutations: {
+        ...this.mutations,
+        ...mutations,
+        SET: (state, { path, value }) => {
+          return set(state, path, value);
+        },
+      },
       modules: { ...this.modules, ...modules },
     };
   }

package/src/store/new/helpers/createApiStoreModule.js

@@ -4,5 +4,5 @@ import { createBaseStoreModule } from './createBaseStoreModule.js';
 export const createApiStoreModule = (modules = []) => {
   const modulesArr = Array.isArray(modules) ? modules : [modules];
 
-  return createBaseStoreModule([apiStoreModule, ...modulesArr]);
+  return createBaseStoreModule([apiStoreModule(), ...modulesArr]);
 };

package/src/store/new/helpers/createBaseStoreModule.js

@@ -1,9 +1,8 @@
-import deepmerge from 'deepmerge';
-import { createStoreModule } from './createStoreModule.js';
 import baseStoreModule from '../modules/baseStoreModule/baseStoreModule.js';
+import { createStoreModule } from './createStoreModule.js';
 
 export const createBaseStoreModule = (modules = []) => {
   const modulesArr = Array.isArray(modules) ? modules : [modules];
 
-  return createStoreModule([baseStoreModule, ...modulesArr]);
+  return createStoreModule([baseStoreModule(), ...modulesArr]);
 };

package/src/store/new/helpers/createCardStoreModule.js

@@ -1,8 +1,8 @@
-import { createBaseStoreModule } from './createBaseStoreModule.js';
 import cardStoreModule from '../modules/cardStoreModule/cardStoreModule.js';
+import { createBaseStoreModule } from './createBaseStoreModule.js';
 
 export const createCardStoreModule = (modules = []) => {
   const modulesArr = Array.isArray(modules) ? modules : [modules];
 
-  return createBaseStoreModule([cardStoreModule, ...modulesArr]);
+  return createBaseStoreModule([cardStoreModule(), ...modulesArr]);
 };

package/src/store/new/helpers/createStoreModule.js

@@ -1,10 +1,11 @@
-import deepcopy from 'deep-copy';
 import deepmerge from 'deepmerge';
+import isPlainObject from 'lodash/isPlainObject.js';
 
 export const createStoreModule = (modules = []) => {
-  const copied = deepcopy(modules);
+  const modulesArr = Array.isArray(modules) ? modules : [modules];
 
-  const modulesArr = Array.isArray(copied) ? copied : [copied];
-
-  return deepmerge.all(modulesArr);
+  const merged = deepmerge.all(modulesArr, {
+    isMergeableObject: isPlainObject, // don't try to merge Maps!
+  });
+  return merged;
 };

package/src/store/new/helpers/createTableStoreModule.js

@@ -1,8 +1,8 @@
-import { createBaseStoreModule } from './createBaseStoreModule';
 import tableStoreModule from '../modules/tableStoreModule/tableStoreModule';
+import { createBaseStoreModule } from './createBaseStoreModule';
 
 export const createTableStoreModule = (modules = []) => {
   const modulesArr = Array.isArray(modules) ? modules : [modules];
 
-  return createBaseStoreModule([tableStoreModule, ...modulesArr]);
+  return createBaseStoreModule([tableStoreModule(), ...modulesArr]);
 };

package/src/store/new/index.js

@@ -1,7 +1,7 @@
+import { createApiStoreModule } from './helpers/createApiStoreModule.js';
 import { createBaseStoreModule } from './helpers/createBaseStoreModule.js';
-import { createTableStoreModule } from './helpers/createTableStoreModule.js';
 import { createCardStoreModule } from './helpers/createCardStoreModule.js';
-import { createApiStoreModule } from './helpers/createApiStoreModule.js';
+import { createTableStoreModule } from './helpers/createTableStoreModule.js';
 
 import { useCardStore } from './modules/cardStoreModule/useCardStore.js';
 import { useTableStore } from './modules/tableStoreModule/useTableStore.js';

package/src/store/new/modules/apiStoreModule/apiStoreModule.js

@@ -2,9 +2,9 @@ const getParentIdFromContext = (context) => (
   context?.getters?.PARENT_ID || context?.state?.parentId
 );
 
-const state = {
+const state = () => ({
   api: null,
-};
+});
 
 const getters = {};
 
@@ -87,9 +87,9 @@ const actions = {
 
 const mutations = {};
 
-export default {
-  state,
+export default () => ({
+  state: state(),
   getters,
   actions,
   mutations,
-};
+});

package/src/store/new/modules/baseStoreModule/baseStoreModule.js

@@ -1,6 +1,6 @@
 import set from 'lodash/set';
 
-const state = {};
+const state = () => ({});
 
 const getters = {};
 
@@ -12,10 +12,10 @@ const mutations = {
   },
 };
 
-export default {
-  state,
+export default () => ({
+  state: state(),
   getters,
   actions,
   mutations,
   namespaced: true,
-};
+});

package/src/store/new/modules/cardStoreModule/cardStoreModule.js

@@ -1,10 +1,10 @@
 import deepCopy from 'deep-copy';
 import set from 'lodash/set.js';
 
-const state = {
+const state = () => ({
   itemId: 0,
   itemInstance: {},
-};
+});
 
 const actions = {
   SET_PARENT_ITEM_ID: (context, id) => {
@@ -66,9 +66,9 @@ const mutations = {
   },
 };
 
-export default {
-  state,
+export default () => ({
+  state: state(),
   actions,
   mutations,
-};
+});
 

package/src/store/new/modules/tableStoreModule/__tests__/tableStoreModule.spec.js

@@ -1,9 +1,13 @@
 import { createRouter, createWebHistory } from 'vue-router';
 import { createStore } from 'vuex';
+import FilterEvent
+  from '../../../../../modules/Filters/enums/FilterEvent.enum.js';
+import FiltersStoreModule
+  from '../../../../../modules/Filters/store/FiltersStoreModule.js';
 import { SortSymbols } from '../../../../../scripts/sortQueryAdapters.js';
-import FilterEvent from '../../../../../modules/Filters/enums/FilterEvent.enum.js';
-import FiltersStoreModule from '../../../../../modules/Filters/store/FiltersStoreModule.js';
-import { createTableStoreModule } from '../../../helpers/createTableStoreModule.js';
+import {
+  createTableStoreModule,
+} from '../../../helpers/createTableStoreModule.js';
 
 describe('TableStoreModule', () => {
   it('correctly computes FIELDS getter', () => {

package/src/store/new/modules/tableStoreModule/tableStoreModule.js

@@ -1,17 +1,17 @@
+import FilterEvent from '../../../../modules/Filters/enums/FilterEvent.enum.js';
 import {
   queryToSortAdapter,
   sortToQueryAdapter,
 } from '../../../../scripts/sortQueryAdapters.js';
-import FilterEvent from '../../../../modules/Filters/enums/FilterEvent.enum.js';
 
-const state = {
+const state = () => ({
   headers: [],
   dataList: [],
   selected: [],
   error: {},
   isLoading: false,
   isNextPage: false,
-};
+});
 
 const getters = {
   PARENT_ID: () => null, // override me
@@ -225,8 +225,8 @@ const actions = {
   },
 };
 
-export default {
-  state,
+export default () => ({
+  state: state(),
   getters,
   actions,
-};
+});