fix(date-range): refactor date-range widget field (#5223)

Signed-off-by: samuel.park <[email protected]>
cloudforet-io · Dec 16, 2024 · 478ebd5 · 478ebd5
1 parent 6bdedc0
commit 478ebd5
Show file tree

Hide file tree

Showing 9 changed files with 702 additions and 9 deletions.
diff --git a/.../web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformPivotForm.vue b/.../web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformPivotForm.vue
@@ -30,10 +30,7 @@ import type { PivotOptions } from '@/common/modules/widgets/types/widget-model';
 
 const props = defineProps<TransformDataTableProps<PivotOptions>>();
 
-const emit = defineEmits<{(e: 'update:operator-options', value: PivotOptions): void;
-    (e: 'update:form-data', value: Omit<PivotOptions, 'dataTableId'>): void;
-    (e: 'update:data-table-info', value: TransformDataTableInfo): void;
-}>();
+const emit = defineEmits<{(e: 'update:operator-options', value: PivotOptions): void; }>();
 const widgetGenerateStore = useWidgetGenerateStore();
 const widgetGenerateState = widgetGenerateStore.state;
 

diff --git a/...src/common/modules/widgets/_widget-field-value-manager/constant/default-value-registry.ts b/...src/common/modules/widgets/_widget-field-value-manager/constant/default-value-registry.ts
@@ -59,7 +59,12 @@ export const widgetFieldDefaultValueMap: DefaultValueRegistry = {
     dateFormat: {
         format: Object.keys(DATE_FORMAT)[0],
     },
-    dateRange: {},
+    dateRange: {
+        inherit: true,
+        options: {
+            value: 'auto',
+        },
+    },
     displayAnnotation: undefined,
     displaySeriesLabel: undefined,
     granularity: {

diff --git a/...web/src/common/modules/widgets/_widget-field-value-manager/constant/validator-registry.ts b/...web/src/common/modules/widgets/_widget-field-value-manager/constant/validator-registry.ts
@@ -7,6 +7,9 @@ import type { ColorSchemaValue } from '@/common/modules/widgets/_widget-fields/c
 import type { ComparisonValue } from '@/common/modules/widgets/_widget-fields/comparison/type';
 import type { _CustomTableColumnWidthValue } from '@/common/modules/widgets/_widget-fields/custom-table-column-width/type';
 import type { DataFieldOptions, DataFieldValue } from '@/common/modules/widgets/_widget-fields/data-field/type';
+import { DAILY_ENABLED_VALUES, MONTHLY_ENABLED_VALUES, YEARLY_ENABLED_VALUES } from '@/common/modules/widgets/_widget-fields/date-range/constant';
+import { checkInvalidCustomValue } from '@/common/modules/widgets/_widget-fields/date-range/helper';
+import type { DateRangeValue } from '@/common/modules/widgets/_widget-fields/date-range/type';
 import type { DisplayAnnotationValue } from '@/common/modules/widgets/_widget-fields/display-annotation/type';
 import type { DisplaySeriesLabelValue } from '@/common/modules/widgets/_widget-fields/display-series-label/type';
 import type { GranularityValue } from '@/common/modules/widgets/_widget-fields/granularity/type';
@@ -26,6 +29,17 @@ export interface WidgetValidatorRegistry {
 }
 
 export const widgetValidatorRegistry: WidgetValidatorRegistry = {
+    dateRange: (fieldValue: DateRangeValue, widgetConfig, allValueMap) => {
+        const _dateRangeType = fieldValue.options.value;
+        const _granularity = allValueMap.granularity?.value?.granularity;
+        if (!_dateRangeType || !_granularity) return false;
+        if (checkInvalidCustomValue(fieldValue, _granularity).invalid) return false;
+        if (_granularity === 'MONTHLY' && !MONTHLY_ENABLED_VALUES.includes(_dateRangeType)) return false;
+        if (_granularity === 'DAILY' && !DAILY_ENABLED_VALUES.includes(_dateRangeType)) return false;
+        if (_granularity === 'YEARLY' && !YEARLY_ENABLED_VALUES.includes(_dateRangeType)) return false;
+
+        return true;
+    },
     dataField: (fieldValue: DataFieldValue, widgetConfig) => {
         const _fieldsSchema = integrateFieldsSchema(widgetConfig.requiredFieldsSchema, widgetConfig.optionalFieldsSchema);
         const dataFieldOptions = _fieldsSchema.dataField?.options as DataFieldOptions;

diff --git a/apps/web/src/common/modules/widgets/_widget-field-value-manager/index.ts b/apps/web/src/common/modules/widgets/_widget-field-value-manager/index.ts
@@ -61,7 +61,7 @@ export default class WidgetFieldValueManager {
 
         const validator = widgetValidatorRegistry[key];
         if (validator) {
-            const isValid = validator(this.modifiedData[key], this.widgetConfig);
+            const isValid = validator(this.modifiedData[key], this.widgetConfig, this.modifiedData);
             if (!isValid) {
                 this.validationErrors[key as string] = `Invalid value for field "${key}"`;
                 return false;

diff --git a/apps/web/src/common/modules/widgets/_widget-field-value-manager/type.ts b/apps/web/src/common/modules/widgets/_widget-field-value-manager/type.ts
@@ -33,7 +33,7 @@ import type { _XAxisValue } from '@/common/modules/widgets/_widget-fields/x-axis
 import type { _YAxisValue } from '@/common/modules/widgets/_widget-fields/y-axis/type';
 import type { WidgetConfig } from '@/common/modules/widgets/types/widget-config-type';
 
-export type FieldValueValidator<T extends WidgetFieldValue> = (fieldValue: T, widgetConfig: WidgetConfig) => boolean;
+export type FieldValueValidator<T extends WidgetFieldValue> = (fieldValue: T, widgetConfig: WidgetConfig, allValueMap: WidgetFieldValueMap) => boolean;
 export type FieldDefaultValueConvertor<T extends keyof WidgetFieldTypeMap> = (widgetConfig: WidgetConfig, dataTable: PublicDataTableModel|PrivateDataTableModel) => WidgetFieldTypeMap[T]['value'];
 
 export interface WidgetFieldValueMap {