From 2f5d8b5564ad966ef783d98e1e9002e57ec88000 Mon Sep 17 00:00:00 2001
From: Yongtae Park <samuel.park@megazone.com>
Date: Thu, 29 Aug 2024 17:16:10 +0900
Subject: [PATCH 1/2] fix: edit table widget style

Signed-off-by: samuel.park <samuel.park@megazone.com>
---
 .../widgets/_widgets/table/_component/WidgetDataTable.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/common/modules/widgets/_widgets/table/_component/WidgetDataTable.vue b/apps/web/src/common/modules/widgets/_widgets/table/_component/WidgetDataTable.vue
index de830f2199..a9ba6aca79 100644
--- a/apps/web/src/common/modules/widgets/_widgets/table/_component/WidgetDataTable.vue
+++ b/apps/web/src/common/modules/widgets/_widgets/table/_component/WidgetDataTable.vue
@@ -397,7 +397,7 @@ const getFieldWidth = (field: TableWidgetField): string|undefined => {
                             minWidth: getFieldMinWidth(field),
                             width: getFieldWidth(field),
                             maxWidth: getFieldWidth(field),
-                            ...(rowIndex !== props.items?.length - 1 ? getHeatmapColorStyle(item, field) : {}),
+                            ...(rowIndex !== props.items?.length - 1 || !props.totalInfo?.toggleValue ? getHeatmapColorStyle(item, field) : {}),
                         }"
                     >
                         <span ref="labelRef"
@@ -494,8 +494,8 @@ const getFieldWidth = (field: TableWidgetField): string|undefined => {
     tbody {
         tr {
             &:nth-child(odd) {
+                @apply bg-gray-100;
                 td {
-                    @apply bg-gray-100;
                     &.sub-total {
                         @apply bg-violet-150;
                     }

From 45e7999a65fff13972cf36e4c893ac156d56804f Mon Sep 17 00:00:00 2001
From: Yongtae Park <samuel.park@megazone.com>
Date: Thu, 29 Aug 2024 17:16:39 +0900
Subject: [PATCH 2/2] fix: apply new dashboard label filter planning

Signed-off-by: samuel.park <samuel.park@megazone.com>
---
 .../dashboards/components/DashboardCreateStep1.vue | 14 +++++++++++++-
 .../DashboardCreateStep1SearchFilter.vue           |  8 +++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/services/dashboards/components/DashboardCreateStep1.vue b/apps/web/src/services/dashboards/components/DashboardCreateStep1.vue
index 81aebb0eda..214086beb3 100644
--- a/apps/web/src/services/dashboards/components/DashboardCreateStep1.vue
+++ b/apps/web/src/services/dashboards/components/DashboardCreateStep1.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive } from 'vue';
 
+import { flatMapDeep, uniq } from 'lodash';
+
 import { PEmpty, PFieldTitle, PSearch } from '@cloudforet/mirinae';
 import type { BoardSet } from '@cloudforet/mirinae/types/data-display/board/type';
 
@@ -48,6 +50,15 @@ const state = reactive({
             labels: d.labels,
         }));
     }),
+    allExistingLabels: computed(() => {
+        const OOTBTemplates = getFilteredTemplates(dashboardCreatePageState.dashboardTemplates, '', [], []);
+        const dashboards: DashboardModel[] = storeState.isWorkspaceMember ? dashboardGetters.privateItems : dashboardGetters.allItems;
+        const existingTemplates = getFilteredTemplates(dashboards, '', [], []);
+        return uniq([
+            ...flatMapDeep(OOTBTemplates.map((d) => d.labels)),
+            ...flatMapDeep(existingTemplates.map((d) => d.labels)),
+        ]);
+    }),
 });
 
 const filterState = reactive({
@@ -90,7 +101,8 @@ onMounted(() => {
     <div class="dashboard-create-step-1">
         <p-search :value.sync="filterState.inputValue" />
         <div class="contents-container">
-            <dashboard-create-step1-search-filter @select-label="handleSelectLabels"
+            <dashboard-create-step1-search-filter :labels="state.allExistingLabels"
+                                                  @select-label="handleSelectLabels"
                                                   @select-provider="handleSelectProvider"
             />
             <div class="template-contents-area">
diff --git a/apps/web/src/services/dashboards/components/DashboardCreateStep1SearchFilter.vue b/apps/web/src/services/dashboards/components/DashboardCreateStep1SearchFilter.vue
index fa2524b1ae..36da3a19dc 100644
--- a/apps/web/src/services/dashboards/components/DashboardCreateStep1SearchFilter.vue
+++ b/apps/web/src/services/dashboards/components/DashboardCreateStep1SearchFilter.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { computed, reactive } from 'vue';
 
+import { uniq } from 'lodash';
+
 import {
     PFieldTitle, PCheckboxGroup, PCheckbox, PLazyImg, PSelectDropdown,
 } from '@cloudforet/mirinae';
@@ -17,7 +19,11 @@ export interface FilterLabelItem {
     name: string;
     image?: string;
 }
+interface Props {
+    labels: string[];
+}
 
+const props = defineProps<Props>();
 const emit = defineEmits<{(e:'select-label', labels: FilterLabelItem[]):void;
     (e:'select-provider', plugins: FilterLabelItem[]):void;
     (e:'select-plugin', plugins: PluginItem[]):void;
@@ -34,7 +40,7 @@ const state = reactive({
         image: provider.icon,
     }))),
     labels: computed(() => Object.values(DASHBOARD_LABELS)),
-    labelList: computed(() => state.labels.map((label) => ({
+    labelList: computed(() => uniq([...state.labels, ...props.labels]).map((label) => ({
         label,
         name: label,
         image: null,