@vc-shell/framework 1.0.159 → 1.0.161

package/dist/shared/modules/dynamic/composables/useFilterBuilder/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../shared/modules/dynamic/composables/useFilterBuilder/index.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,QAAQ,EAKR,eAAe,EACf,YAAY,EACZ,KAAK,EACL,WAAW,EAIZ,MAAM,KAAK,CAAC;AAGb,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAI9D,OAAO,EAAE,UAAU,EAAmC,MAAM,aAAa,CAAC;AAU1E,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,CAAC,WAAW,EAAE;QAAE,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,KAChD,KAAK,CACH,YAAY,EACZ,eAAe,EACf;QAEE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CACF,GACD,SAAS,CAAC;IACd,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,eAAe,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACtC;;UAGO,UAAU,GAAG,SAAS;;;WAGrB,YAAY,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS;MACjD,gBAAgB;AALpB,wBAiNE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../shared/modules/dynamic/composables/useFilterBuilder/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,QAAQ,EAIR,eAAe,EACf,YAAY,EACZ,KAAK,EACL,WAAW,EAIZ,MAAM,KAAK,CAAC;AAGb,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAAE,UAAU,EAAmC,MAAM,aAAa,CAAC;AAS1E,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,CAAC,WAAW,EAAE;QAAE,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,KAChD,KAAK,CACH,YAAY,EACZ,eAAe,EACf;QAEE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CACF,GACD,SAAS,CAAC;IACd,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,eAAe,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACtC;;UAGO,UAAU,GAAG,SAAS;;;WAGrB,YAAY,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS;MACjD,gBAAgB;AALpB,wBA+ME"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.159",
+  "version": "1.0.161",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -53,9 +53,9 @@
     "whatwg-fetch": "^3.6.19"
   },
   "devDependencies": {
-    "@vc-shell/api-client-generator": "^1.0.159",
-    "@vc-shell/config-generator": "^1.0.159",
-    "@vc-shell/ts-config": "^1.0.159",
+    "@vc-shell/api-client-generator": "^1.0.161",
+    "@vc-shell/config-generator": "^1.0.161",
+    "@vc-shell/ts-config": "^1.0.161",
     "@vitejs/plugin-vue": "^5.0.3",
     "sass": "^1.69.6",
     "typescript": "^5.3.3",

package/shared/modules/dynamic/composables/useFilterBuilder/index.ts

@@ -1,3 +1,4 @@
+import { toReactive, createUnrefFn } from "@vueuse/core";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import {
   h,
@@ -7,7 +8,6 @@ import {
   unref,
   Component,
   onMounted,
-  reactive,
   RendererElement,
   RendererNode,
   VNode,
@@ -20,10 +20,8 @@ import * as _ from "lodash-es";
 import { Checkbox, InputField } from "../../components/factories";
 import { AsyncAction } from "../../../../../core/composables";
 import { VcButton, VcCol, VcContainer, VcRow } from "../../../../../ui/components";
-import { createUnrefFn } from "@vueuse/core";
 import { useI18n } from "vue-i18n";
 import { FilterBase, FilterCheckbox, FilterDateInput } from "../../types";
-import { onBeforeUnmount } from "vue";
 
 interface Control {
   title: string;
@@ -165,14 +163,14 @@ export default <Query>(args: {
   }
 
   async function applyFilters(filterHandlerFn: () => void) {
+    appliedFilter.value = {
+      ...filter.value,
+    };
     filterHandlerFn();
     await _search({
       ...unref(args.query),
       ...filter.value,
     });
-    appliedFilter.value = {
-      ...filter.value,
-    };
   }
 
   async function resetFilters(filterHandlerFn: () => void) {
@@ -192,9 +190,7 @@ export default <Query>(args: {
       VcContainer,
       {
         onVnodeBeforeMount: () => {
-          if (Object.keys(appliedFilter.value).length) {
-            filter.value = _.cloneDeep(appliedFilter.value);
-          }
+          filter.value = { ...appliedFilter.value };
         },
       },
       () => [
@@ -247,7 +243,7 @@ export default <Query>(args: {
   }
 
   async function reset() {
-    Object.keys(filter).forEach((key: string) => (filter.value[key] = undefined));
+    Object.keys(filter.value).forEach((key: string) => (filter.value[key] = undefined));
 
     appliedFilter.value = {};
   }
@@ -255,7 +251,7 @@ export default <Query>(args: {
   return {
     filterComponent: render,
     activeFilterCount,
-    filter: readonly(filter.value),
+    filter: readonly(toReactive(filter)),
     isFilterVisible: computed(() => isFilterVisible.value),
     reset,
   };