diff --git a/apps/web/src/services/alert-manager/v2/components/ServiceDetailTabsSettingsEventRuleActionAsset.vue b/apps/web/src/services/alert-manager/v2/components/ServiceDetailTabsSettingsEventRuleActionAsset.vue index 0f3b04cc15..97aa8b9b88 100644 --- a/apps/web/src/services/alert-manager/v2/components/ServiceDetailTabsSettingsEventRuleActionAsset.vue +++ b/apps/web/src/services/alert-manager/v2/components/ServiceDetailTabsSettingsEventRuleActionAsset.vue @@ -6,8 +6,6 @@ import { PFieldGroup, PFieldTitle, PI, - PRadio, - PRadioGroup, PBadge, PSelectDropdown, PTextInput, PToggleButton, screens, @@ -151,12 +149,12 @@ const handleUpdateToggle = (action: string, value: boolean) => { watch([ () => state.selectedActions, () => state.key, () => state.selectedAssetList, () => state.selectedTempAssetRadio, () => state.period, -], ([selectedActions, key, assetList, tempAsset, period]) => { +], ([selectedActions, key, assetList, period]) => { emit('change-form', { match_asset: selectedActions.match_asset ? { key, asset_types: assetList?.map((asset) => asset.name), - create_temporary_asset: tempAsset === 'CREATE', + // create_temporary_asset: tempAsset === 'CREATE', } : undefined, merge_asset_labels: selectedActions.merge_asset_labels ? { period, @@ -283,7 +281,8 @@ watch(() => storeState.isEventRuleEditMode, (isEditMode) => { /> -
+ +
0 && state.actions.match_asset.key !== ''; - if (!matchAssetValid) return false; - } + // if (state.actions.match_asset?.create_temporary_asset) { + // const matchAssetValid = state.actions.match_asset.asset_types.length > 0 && state.actions.match_asset.key !== ''; + // if (!matchAssetValid) return false; + // } if (state.actions.merge_asset_labels?.period !== undefined) { return state.actions.merge_asset_labels?.period !== ''; } @@ -202,7 +202,7 @@ const updateStateFromEventRuleInfo = () => { state.conditionsPolicy = eventRuleInfo.conditions_policy; } - state.conditions = eventRuleInfo.conditions.map((i) => { + state.conditions = eventRuleInfo.conditions?.map((i) => { if (i.key.includes('additional_info')) { return { key: 'additional_info', diff --git a/apps/web/src/services/cost-explorer/pages/admin/AdminAnomalyDetectionConfigurationPage.vue b/apps/web/src/services/cost-explorer/pages/admin/AdminAnomalyDetectionConfigurationPage.vue index 96a690e823..9fb7ed768e 100644 --- a/apps/web/src/services/cost-explorer/pages/admin/AdminAnomalyDetectionConfigurationPage.vue +++ b/apps/web/src/services/cost-explorer/pages/admin/AdminAnomalyDetectionConfigurationPage.vue @@ -217,7 +217,7 @@ onMounted(async () => { class="notification-align notification-rules-content" >