Merge branch 'develop' into feature-project-alert-manager

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>

Author: skdud4659

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "2.0.0-dev302",
+  "version": "2.0.0-dev306",
   "private": true,
   "description": "Cloudforet Console Web Application",
   "author": "Cloudforet",

apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardAddForm.vue

@@ -155,8 +155,8 @@ const assetFilterState = reactive({
     metricItems: computed<MenuItem[]>(() => assetFilterState.refinedLabelKeys.map((d) => ({ name: d.key, label: d.name }))),
     metricFilterItems: computed<MenuItem[]>(() => {
         const _refinedLabelKeys = cloneDeep(assetFilterState.refinedLabelKeys);
-        const projectLabelInfoIndex = _refinedLabelKeys.find((d) => d.key === 'project_id');
-        if (projectLabelInfoIndex) {
+        const projectLabelInfoIndex = _refinedLabelKeys.findIndex((d) => d.key === 'project_id');
+        if (projectLabelInfoIndex > -1) {
             _refinedLabelKeys.splice(projectLabelInfoIndex, 0, PROJECT_GROUP_LABEL_INFO);
         }
         return _refinedLabelKeys.map((d) => ({

apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardFilters.vue

@@ -5,6 +5,7 @@ import {
 } from 'vue';
 
 import {
+    cloneDeep,
     debounce,
     isArray,
     isEmpty, unset,
@@ -47,6 +48,7 @@ import { useWidgetGenerateStore } from '@/common/modules/widgets/_store/widget-g
 import type { DataTableQueryFilterForDropdown } from '@/common/modules/widgets/types/widget-data-table-type';
 import type { DataTableSourceType, DataTableQueryFilter } from '@/common/modules/widgets/types/widget-model';
 
+import { PROJECT_GROUP_LABEL_INFO } from '@/services/asset-inventory-v1/constants/asset-analysis-constant';
 import { GROUP_BY } from '@/services/cost-explorer/constants/cost-explorer-constant';
 
 
@@ -119,10 +121,15 @@ const state = reactive({
 const assetFilterState = reactive({
     refinedLabelKeys: computed(() => {
         const metricLabelsInfo = storeState.metrics[props.sourceId ?? ''].data.labels_info;
-        return metricLabelsInfo ? metricLabelsInfo.filter((labelInfo) => {
+        const _refinedLabelKeys = cloneDeep(metricLabelsInfo || []);
+        const projectLabelInfoIndex = _refinedLabelKeys.findIndex((d) => d.key === 'project_id');
+        if (projectLabelInfoIndex > -1) {
+            _refinedLabelKeys.splice(projectLabelInfoIndex, 0, PROJECT_GROUP_LABEL_INFO);
+        }
+        return _refinedLabelKeys.filter((labelInfo) => {
             if (storeState.isAdminMode) return true;
             return labelInfo.key !== 'workspace_id';
-        }) : [];
+        });
     }),
 });
 

apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleFormCard.vue

@@ -81,7 +81,7 @@ const state = reactive({
         { name: EVENT_RULE_CONDITIONS_POLICY.ANY, label: i18n.t('ALERT_MANAGER.EVENT_RULE.SET_CONDITION') },
     ]),
     selectedPolicyButton: EVENT_RULE_CONDITIONS_POLICY.ALWAYS as EventRuleConditionsPolicyType,
-    conditionsPolicy: 'ALL' as EventRuleConditionsPolicyType,
+    conditionsPolicy: EVENT_RULE_CONDITIONS_POLICY.ALL as EventRuleConditionsPolicyType,
     conditions: [] as EventRuleConditionsDataType[],
     stopProcessing: false,
     actions: undefined as EventRuleActionsType|undefined,
@@ -181,7 +181,7 @@ const {
 const initializeState = () => {
     setForm('name', '');
     state.selectedPolicyButton = EVENT_RULE_CONDITIONS_POLICY.ALWAYS;
-    state.conditionsPolicy = 'ALL';
+    state.conditionsPolicy = EVENT_RULE_CONDITIONS_POLICY.ALL;
     state.conditions = [{
         key: 'title',
         value: '',
@@ -198,8 +198,21 @@ const updateStateFromEventRuleInfo = () => {
     state.selectedPolicyButton = eventRuleInfo.conditions_policy === EVENT_RULE_CONDITIONS_POLICY.ALWAYS
         ? EVENT_RULE_CONDITIONS_POLICY.ALWAYS
         : EVENT_RULE_CONDITIONS_POLICY.ANY;
-    state.conditionsPolicy = eventRuleInfo.conditions_policy;
-    state.conditions = eventRuleInfo.conditions || [{
+    if (state.selectedPolicyButton !== EVENT_RULE_CONDITIONS_POLICY.ALWAYS) {
+        state.conditionsPolicy = eventRuleInfo.conditions_policy;
+    }
+
+    state.conditions = eventRuleInfo.conditions.map((i) => {
+        if (i.key.includes('additional_info')) {
+            return {
+                key: 'additional_info',
+                value: i.value,
+                operator: i.operator,
+                subKey: i.key.split('.')[1],
+            };
+        }
+        return i;
+    }) || [{
         key: 'title',
         value: '',
         operator: 'contain',

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudforet-console",
-  "version": "2.0.0-dev302",
+  "version": "2.0.0-dev306",
   "private": true,
   "workspaces": [
     "apps/*",