@vc-shell/framework 1.0.168 → 1.0.169

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":"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"}
+{"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,wBA8ME"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.168",
+  "version": "1.0.169",
   "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.168",
-    "@vc-shell/config-generator": "^1.0.168",
-    "@vc-shell/ts-config": "^1.0.168",
+    "@vc-shell/api-client-generator": "^1.0.169",
+    "@vc-shell/config-generator": "^1.0.169",
+    "@vc-shell/ts-config": "^1.0.169",
     "@vitejs/plugin-vue": "^5.0.3",
     "sass": "^1.69.6",
     "typescript": "^5.3.3",

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

@@ -127,7 +127,6 @@ export default <Query>(args: {
     });
   }
 
-  // TODO add to documentation support of dynamic data for filter
   function createCheckboxFromData(data: MaybeRef<Record<string, string>[]>, control: FilterCheckbox) {
     if (!(toValue(data) && toValue(data).length)) return;
     return toValue(data).reduce(

package/shared/modules/dynamic/helpers/override.ts

@@ -25,17 +25,45 @@ const upsertHelper = (overrides: OverridesSchema, schemaCopy: { [key: string]: D
       overrides.upsert
         ?.filter((x) => clonedSchema.settings.id === x.id)
         .forEach((args) => {
-          const valueByPath = _.get(clonedSchema, args.path);
-          if (Array.isArray(valueByPath) && valueByPath.length && typeof args.value === "object" && "index" in args) {
+          let valueByPath = _.get(clonedSchema, args.path);
+          let currentPath: string | (string | number)[] = args.path;
+
+          // if we can't get value with lodash - try to parse path, cause it could be path with elements id's
+          if (!valueByPath) {
+            const pathParts = args.path.split(".");
+
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            let current: any = clonedSchema;
+            const generatedPath = [];
+            for (const part of pathParts) {
+              if (Array.isArray(current)) {
+                const currentCopy = [...current];
+                current = current.find((x) => Object.entries(x).some(([key, value]) => key === part || value === part));
+
+                const fountElIndex = currentCopy.findIndex((x) => x === current);
+
+                generatedPath.push(fountElIndex);
+              } else {
+                current = current[part];
+                generatedPath.push(part);
+              }
+            }
+
+            currentPath = generatedPath;
+
+            valueByPath = current;
+          }
+
+          if (Array.isArray(valueByPath) && valueByPath.length && typeof args.value === "object") {
             const findIndex = _.findIndex(valueByPath, { id: args.value.id });
 
             const spliced = valueByPath /* @ts-expect-error  - toSpliced is not parsed correctly by ts */
-              .toSpliced(findIndex >= 0 ? findIndex : args.index, findIndex >= 0 ? 1 : 0, args.value);
-            _.set(clonedSchema, args.path, spliced);
+              .toSpliced(findIndex >= 0 ? findIndex : args.index ?? 0, findIndex >= 0 ? 1 : 0, args.value);
+            _.set(clonedSchema, currentPath, spliced);
           } else {
-            _.set(clonedSchema, args.path, args.value);
+            _.set(clonedSchema, currentPath, args.value);
           }
-        }, {});
+        });
       obj[name] = clonedSchema;
       return obj;
     },
@@ -60,9 +88,33 @@ const removeHelper = (overrides: OverridesSchema, schemaCopy: Record<string, Dyn
 };
 
 function removePath(obj: DynamicSchema, path: string) {
-  const parentPath = path.slice(0, path.lastIndexOf("["));
-  _.unset(obj, path);
-  _.update(obj, parentPath, _.compact);
+  const removeItem = _.get(obj, path);
+
+  if (removeItem) {
+    const parentPath = path.slice(0, path.lastIndexOf("["));
+    _.unset(obj, path);
+    _.update(obj, parentPath, _.compact);
+  } else {
+    const pathParts = path.split(".");
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let current: any = obj;
+    const generatedPath = [];
+    for (const part of pathParts) {
+      if (Array.isArray(current)) {
+        const currentCopy = [...current];
+        current = current.find((x) => Object.entries(x).some(([key, value]) => key === part || value === part));
+
+        const foundElIndex = currentCopy.findIndex((x) => x === current);
+
+        generatedPath.push(foundElIndex);
+      } else {
+        current = current[part];
+        generatedPath.push(part);
+      }
+    }
+    _.unset(obj, generatedPath);
+    _.update(obj, generatedPath, _.compact);
+  }
 }
 
 // this part sorts paths with indexes in descending order to avoid deleting items with already changed indexes