fix: fix validation bug in ADD_LABELS (#5237)

* fix: fix validation bug in ADD_LABELS Signed-off-by: yuda <[email protected]> * fix: fix type error Signed-off-by: yuda <[email protected]> --------- Signed-off-by: yuda <[email protected]>
cloudforet-io · Dec 17, 2024 · 9aba5b2 · 9aba5b2
1 parent 08d52c5
commit 9aba5b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.../web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformAddLabels.vue b/.../web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformAddLabels.vue
@@ -5,7 +5,7 @@ import {
 } from 'vue';
 import type { TranslateResult } from 'vue-i18n';
 
-import { random } from 'lodash';
+import { cloneDeep, random } from 'lodash';
 
 import {
     PIconButton, PFieldGroup, PTextInput, PButton, PFieldTitle,
@@ -49,7 +49,7 @@ const storeState = reactive({
 const dataTableInfo = ref<TransformDataTableInfo>({
     dataTableId: props.originData?.data_table_id,
 });
-const labelsInfo = ref<AddLabelsOptions['labels']>(props.originData.labels);
+const labelsInfo = ref<AddLabelsOptions['labels']>(cloneDeep(props.originData.labels));
 const state = reactive({
     proxyOperatorOptions: useProxyValue<AddLabelsOptions>('operator-options', props, emit),
     refinedLabels: [] as AdditionalLabel[],
@@ -60,7 +60,7 @@ const state = reactive({
         const fieldNames = state.refinedLabels.map((label) => label.name);
         if (fieldNames.includes(DATE_FIELD)) return true;
         if (fieldNames.length !== new Set(fieldNames).size) return true;
-        if (Object.keys(labelsInfo.value).some((d) => !isFieldNameValid(d, storeState.currentDataTable))) return true;
+        if (state.refinedLabels.some((d) => !isFieldNameValid(d.name, storeState.currentDataTable))) return true;
         return false;
     }),
 });
@@ -151,7 +151,7 @@ onMounted(() => {
                     <div class="label-set">
                         <p-text-input class="label-input"
                                       block
-                                      :invalid="getInvalidText(idx)"
+                                      :invalid="!!getInvalidText(idx)"
                                       :value.sync="labelInfo.name"
                         />
                         <p-text-input class="label-input"

diff --git a/apps/web/src/common/modules/widgets/types/widget-frame-type.ts b/apps/web/src/common/modules/widgets/types/widget-frame-type.ts
@@ -2,6 +2,7 @@ import type { TranslateResult } from 'vue-i18n';
 
 import type { WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant';
 
+import type { WidgetFieldValue } from '@/common/modules/widgets/_widget-field-value-manager/type';
 import type { WidgetFieldName } from '@/common/modules/widgets/types/widget-field-type';
 import type { WidgetFieldValues } from '@/common/modules/widgets/types/widget-field-value-type';
 import type { WidgetState } from '@/common/modules/widgets/types/widget-model';
@@ -15,7 +16,7 @@ export interface FullDataLink {
 
 export interface WidgetFrameProps {
     widgetId: string;
-    widgetOptions?: Record<WidgetFieldName, WidgetFieldValues>;
+    widgetOptions?: Record<WidgetFieldName, WidgetFieldValue<WidgetFieldValues>>;
     widgetSizes: WidgetSize[];
     dataTableId?: string;
     //