@vc-shell/framework 1.0.200 → 1.0.202

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.200",
+  "version": "1.0.202",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -59,9 +59,9 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/quill": "^2.0.14",
-    "@vc-shell/api-client-generator": "^1.0.200",
-    "@vc-shell/config-generator": "^1.0.200",
-    "@vc-shell/ts-config": "^1.0.200",
+    "@vc-shell/api-client-generator": "^1.0.202",
+    "@vc-shell/config-generator": "^1.0.202",
+    "@vc-shell/ts-config": "^1.0.202",
     "@vitejs/plugin-vue": "^5.0.3",
     "sass": "^1.69.6",
     "shx": "^0.3.4",

package/shared/modules/dynamic/components/fields/InputCurrency.ts

@@ -8,7 +8,6 @@ import { InputCurrencySchema } from "../../types";
 import { unrefNested } from "../../helpers/unrefNested";
 import { toValue } from "@vueuse/core";
 
-// TODO fix disabling when blades is disabled
 export default {
   name: "InputCurrency",
   props: componentProps,

package/shared/modules/dynamic/components/fields/storybook/InputField.stories.ts

@@ -34,10 +34,10 @@ export default {
     variant: {
       description: "Field variant.",
       control: "radio",
-      options: ["number", "text", "password", "email", "tel", "url", "time", "date", "datetime-local"],
+      options: ["number", "integer", "text", "password", "email", "tel", "url", "time", "date", "datetime-local"],
       table: {
         type: {
-          summary: "number | text | password | email | tel | url | time | date | datetime-local",
+          summary: "number | integer | text | password | email | tel | url | time | date | datetime-local",
         },
         defaultValue: {
           summary: "text",

package/shared/modules/dynamic/components/fields/storybook/MultivalueField.stories.ts

@@ -106,10 +106,10 @@ export default {
     variant: {
       description: "Multivalue type",
       control: "radio",
-      options: ["number", "text"],
+      options: ["number", "integer", "text"],
       table: {
         type: {
-          summary: "number | text",
+          summary: "number | integer | text",
         },
         defaultValue: {
           summary: "text",

package/shared/modules/dynamic/factories/base/useDetailsFactory.ts

@@ -28,12 +28,13 @@ export const useDetailsFactory = <Item>(factoryParams: UseDetailsFactoryParams<I
       item.value && resetModified(item.value);
     });
 
-    const { loading: manageLoading, action: saveChanges } = useAsync<Item>(async (item) => {
+    const { loading: manageLoading, action: saveChanges } = useAsync<Item, Item | undefined>(async (item) => {
       if (validationState.value.valid) {
-        await factoryParams.saveChanges?.(item as Item);
+        const res = await factoryParams.saveChanges?.(item as Item);
         isModified.value = false;
         isDirty = ref(false);
-        isDirty = ref(false);
+
+        if (res) return res;
       } else throw new Error("Form is not valid");
     });
 

package/shared/modules/dynamic/factories/types/index.ts

@@ -39,7 +39,7 @@ export type CustomQuery = { ids: string[] | null; allSelected?: boolean };
 
 export interface UseDetails<Item, Scope extends DetailsBaseBladeScope = DetailsBaseBladeScope> {
   load: AsyncAction<ItemId>;
-  saveChanges: AsyncAction<Item>;
+  saveChanges: AsyncAction<Item, Item | void>;
   remove?: AsyncAction<ItemId>;
   loading: ComputedRef<boolean>;
   item: Ref<Item | undefined>;

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

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as _ from "lodash-es";
-import { unrefNested } from "./unrefNested";
 
 function setModel(args: {
   property: string;
@@ -11,15 +10,15 @@ function setModel(args: {
 }) {
   const { property, value, option, context, scope } = args;
 
-  if (_.has(unrefNested(context), property)) {
-    _.set(context, property, option ? value[option as keyof typeof value] : value);
-  } else if (scope && _.has(scope, property)) {
+  if (scope && _.has(scope, property)) {
     if (typeof scope[property] === "function") {
       scope[property](value);
     } else {
       _.set(scope, property, value);
     }
+    return;
   }
+  _.set(context, property, option ? value[option as keyof typeof value] : value);
 }
 
 export { setModel };