chore(widget): add defensive code (#5429)

Signed-off-by: samuel.park <samuel.park@megazone.com>
cloudforet-io · Jan 5, 2025 · c7e0cb3 · c7e0cb3
1 parent 5a04959
commit c7e0cb3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue b/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue
@@ -257,8 +257,8 @@ const drawChart = (rawData: WidgetLoadResponse|null) => {
     const _seriesData: any[] = [];
     let _dataFields: string[] = widgetOptionsState.dataFieldInfo?.data as string[] || [];
     if (state.isPivotDataTable) {
-        const _excludeFields = [...Object.keys(rawData?.labels_info), SUB_TOTAL_NAME];
-        _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v));
+        const _excludeFields = [...Object.keys(rawData?.labels_info ?? {}), SUB_TOTAL_NAME];
+        _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)) || [];
     }
     _dataFields.forEach((field) => {
         const _unit: string|undefined = state.unitMap[field];

diff --git a/.../src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue b/.../src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue
@@ -89,7 +89,7 @@ const state = reactive({
     yAxisData: computed<string[]>(() => {
         if (!state.data?.results?.length) return [];
         if (state.isPivotDataTable) {
-            const _excludeFields = [...Object.keys(state.data?.labels_info), SUB_TOTAL_NAME];
+            const _excludeFields = [...Object.keys(state.data?.labels_info ?? {}), SUB_TOTAL_NAME];
             return state.data.order?.filter((v) => !_excludeFields.includes(v)) || [];
         }
         return widgetOptionsState.dataFieldInfo?.data as string[] || [];

diff --git a/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue b/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue
@@ -85,7 +85,7 @@ const state = reactive({
     yAxisData: computed<string[]>(() => {
         if (!state.data?.results?.length) return [];
         if (state.isPivotDataTable) {
-            const _excludeFields = [...Object.keys(state.data?.labels_info), SUB_TOTAL_NAME];
+            const _excludeFields = [...Object.keys(state.data?.labels_info ?? {}), SUB_TOTAL_NAME];
             return state.data.order?.filter((v) => !_excludeFields.includes(v)) || [];
         }
         return (widgetOptionsState.dataFieldInfo?.data ?? []) as string[];

diff --git a/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue b/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue
@@ -239,8 +239,8 @@ const drawChart = (rawData: WidgetLoadResponse|null) => {
     const _defaultValue = widgetOptionsState.missingValueInfo?.type === 'lineToZero' ? 0 : undefined;
     let _dataFields: string[] = widgetOptionsState.dataFieldInfo?.data as string[] || [];
     if (state.isPivotDataTable) {
-        const _excludeFields = [...Object.keys(rawData?.labels_info), SUB_TOTAL_NAME];
-        _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v));
+        const _excludeFields = [...Object.keys(rawData?.labels_info ?? {}), SUB_TOTAL_NAME];
+        _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)) || [];
     }
     _dataFields.forEach((_dataField) => {
         const _unit: string|undefined = state.unitMap[_dataField];

diff --git a/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue b/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue
@@ -232,8 +232,8 @@ const drawChart = (rawData?: WidgetLoadResponse|null) => {
     const _seriesData: any[] = [];
     let _dataFields: string[] = widgetOptionsState.dataFieldInfo?.data as string[] || [];
     if (state.isPivotDataTable) {
-        const _excludeFields = [...Object.keys(rawData?.labels_info), SUB_TOTAL_NAME];
-        _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v));
+        const _excludeFields = [...Object.keys(rawData?.labels_info ?? {}), SUB_TOTAL_NAME];
+        _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)) || [];
     }
     _dataFields.forEach((_dataField) => {
         const _unit: string|undefined = state.unitMap[_dataField];

diff --git a/...ommon/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue b/...ommon/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue
@@ -224,9 +224,10 @@ const drawChart = (rawData?: WidgetLoadResponse|null) => {
 
     const _seriesData: any[] = [];
     let _dataFields: string[] = widgetOptionsState.dataFieldInfo?.data as string[] || [];
+
     if (state.isPivotDataTable) {
-        const _excludeFields = [...Object.keys(rawData?.labels_info), SUB_TOTAL_NAME];
-        _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v));
+        const _excludeFields = [...Object.keys(rawData?.labels_info ?? {}), SUB_TOTAL_NAME];
+        _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)) || [];
     }
     _dataFields.forEach((_dataField) => {
         const _unit: string|undefined = state.unitMap[_dataField];