@vc-shell/framework 1.0.145 → 1.0.147

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/core/composables/useMenuService/index.ts +3 -1
  3. package/dist/core/composables/useMenuService/index.d.ts.map +1 -1
  4. package/dist/framework.js +2 -3
  5. package/dist/shared/modules/dynamic/pages/dynamic-blade-form.vue.d.ts.map +1 -1
  6. package/package.json +4 -4
  7. package/shared/modules/dynamic/pages/dynamic-blade-form.vue +6 -8
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [1.0.147](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.146...v1.0.147) (2024-01-12)
2
+
3
+
4
+
5
+ ## [1.0.146](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.145...v1.0.146) (2024-01-11)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * **dynamic:** modified as base disabled state in saveChanges method ([9895efb](https://github.com/VirtoCommerce/vc-shell/commit/9895efb16aa70f1b1d5e90359084a25c7237a56e))
11
+ * **useMenuService:** prevent duplication ([1c35bb7](https://github.com/VirtoCommerce/vc-shell/commit/1c35bb72b2c6cd2a035d8c370218b1e869f65044))
12
+
13
+
14
+
1
15
  ## [1.0.145](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.144...v1.0.145) (2024-01-10)
2
16
 
3
17
 
package/core/composables/useMenuService/index.ts CHANGED
@@ -23,7 +23,9 @@ function useMenuServiceFn(): IUseMenuService {
23
23
  }
24
24
 
25
25
  const upsert = createUnrefFn((array: MenuItem[], element: MenuItem) => {
26
- const i = array.findIndex((_element) => _.isEqual(_element, element));
26
+ const i = array.findIndex((_element) => {
27
+ return _.isEqual(_element, element);
28
+ });
27
29
  if (i > -1) array[i] = { ...element };
28
30
  else array.push({ ...element });
29
31
  });
package/dist/core/composables/useMenuService/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useMenuService/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAiB,MAAM,KAAK,CAAC;AAGzC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IACtC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3B,cAAc,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;CAC1C;AAKD,iBAAS,gBAAgB,IAAI,eAAe,CA2E3C;AAED,QAAA,MAAM,cAAc,yBAA2C,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useMenuService/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAiB,MAAM,KAAK,CAAC;AAGzC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IACtC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3B,cAAc,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;CAC1C;AAKD,iBAAS,gBAAgB,IAAI,eAAe,CA6E3C;AAED,QAAA,MAAM,cAAc,yBAA2C,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,CAAC"}
package/dist/framework.js CHANGED
@@ -51496,7 +51496,7 @@ const _V = {
51496
51496
  );
51497
51497
  const y = ge(() => {
51498
51498
  const x = Mu(st(l)?.toolbarOverrides, "saveChanges");
51499
- return !W(x && "disabled" in x && x.disabled) || c.value.validated;
51499
+ return x && !W("disabled" in x && x.disabled) || c.value.modified;
51500
51500
  });
51501
51501
  Aj(y);
51502
51502
  const _ = ge(() => r.model?.settings), b = ge(
@@ -51549,8 +51549,7 @@ const _V = {
51549
51549
  method: "reload"
51550
51550
  }), r.param || i("close:blade"));
51551
51551
  },
51552
- // TODO validate fields without validation
51553
- disabled: ge(() => !c.value.validated)
51552
+ disabled: ge(() => !c.value.modified)
51554
51553
  },
51555
51554
  remove: {
51556
51555
  async clickHandler() {
package/dist/shared/modules/dynamic/pages/dynamic-blade-form.vue.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dynamic-blade-form.vue.d.ts","sourceRoot":"","sources":["../../../../../shared/modules/dynamic/pages/dynamic-blade-form.vue.ts"],"names":[],"mappings":"AAIA,OAAO,EAWL,WAAW,EAEZ,MAAM,KAAK,CAAC;AACb,OAAO,EAAE,oBAAoB,EAAqC,MAAM,UAAU,CAAC;AAEnF,OAAO,EAGL,eAAe,EAIhB,MAAM,gBAAgB,CAAC;AAOxB,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAIvD,UAAU,KAAK;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,OAAO,CAAC,EAAE;QACR,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;KACtB,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;CACvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8aD,wBAQG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI;KAE1B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACxE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;KACb,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AACN,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
1
+ {"version":3,"file":"dynamic-blade-form.vue.d.ts","sourceRoot":"","sources":["../../../../../shared/modules/dynamic/pages/dynamic-blade-form.vue.ts"],"names":[],"mappings":"AAIA,OAAO,EAWL,WAAW,EAEZ,MAAM,KAAK,CAAC;AACb,OAAO,EAAE,oBAAoB,EAAqC,MAAM,UAAU,CAAC;AAEnF,OAAO,EAGL,eAAe,EAIhB,MAAM,gBAAgB,CAAC;AAOxB,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAIvD,UAAU,KAAK;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,OAAO,CAAC,EAAE;QACR,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;KACtB,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;CACvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4aD,wBAQG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI;KAE1B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACxE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;KACb,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AACN,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vc-shell/framework",
3
- "version": "1.0.145",
3
+ "version": "1.0.147",
4
4
  "type": "module",
5
5
  "main": "./dist/framework.js",
6
6
  "types": "./dist/index.d.ts",
@@ -52,9 +52,9 @@
52
52
  "whatwg-fetch": "^3.6.19"
53
53
  },
54
54
  "devDependencies": {
55
- "@vc-shell/api-client-generator": "^1.0.145",
56
- "@vc-shell/config-generator": "^1.0.145",
57
- "@vc-shell/ts-config": "^1.0.145",
55
+ "@vc-shell/api-client-generator": "^1.0.147",
56
+ "@vc-shell/config-generator": "^1.0.147",
57
+ "@vc-shell/ts-config": "^1.0.147",
58
58
  "@vitejs/plugin-vue": "^5.0.3",
59
59
  "sass": "^1.69.6",
60
60
  "typescript": "^5.3.3",
package/shared/modules/dynamic/pages/dynamic-blade-form.vue CHANGED
@@ -144,24 +144,23 @@ const { loading, item, validationState, scope, load, remove, saveChanges, bladeT
144
144
  const title = ref();
145
145
  const isReady = ref(false);
146
146
 
147
- const unwatchTitle = watch(
147
+ watch(
148
148
  () => bladeTitle?.value,
149
149
  (newVal) => {
150
150
  if (newVal && props.composables) {
151
151
  title.value = newVal;
152
-
153
- // nextTick(() => unwatchTitle());
154
152
  }
155
153
  },
156
154
  { immediate: true },
157
155
  );
158
156
 
159
157
  /**
160
- * Validated state. Uses 'disabled' property from toolbarOverrides.saveChanges OR validationState.validated
158
+ * Validated state. Uses 'disabled' property from toolbarOverrides.saveChanges OR validationState.modified
161
159
  */
162
160
  const validated = computed(() => {
163
- const toolBarSave = _.get(toValue(scope)?.toolbarOverrides, "saveChanges") as unknown as IBladeToolbar;
164
- return !unref(toolBarSave && "disabled" in toolBarSave && toolBarSave.disabled) || validationState.value.validated;
161
+ const toolbarSave = _.get(toValue(scope)?.toolbarOverrides, "saveChanges") as unknown as IBladeToolbar;
162
+
163
+ return (toolbarSave && !unref("disabled" in toolbarSave && toolbarSave.disabled)) || validationState.value.modified;
165
164
  });
166
165
 
167
166
  useBeforeUnload(validated);
@@ -251,8 +250,7 @@ const toolbarComputed =
251
250
  }
252
251
  }
253
252
  },
254
- // TODO validate fields without validation
255
- disabled: computed(() => !validationState.value.validated),
253
+ disabled: computed(() => !validationState.value.modified),
256
254
  },
257
255
  remove: {
258
256
  async clickHandler() {