Skip to content

feat: reflect additional requirements for alert period selection #5770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skdud4659 merged 3 commits into from
Apr 14, 2025
Merged

feat: reflect additional requirements for alert period selection #5770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33e00bd
chore: changed translations
skdud4659 Apr 14, 2025
eb38b61
feat: changed date format at datetime picker
skdud4659 Apr 14, 2025
c62a867
feat: reflect additional requirements for alert period selection
skdud4659 Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 48 additions & 27 deletions apps/web/src/services/alert-manager/v2/components/AlertsManagementTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import {
ALERT_STATUS_FILTERS, ALERT_PERIOD_DROPDOWN_MENU,
} from '@/services/alert-manager/v2/constants/alert-table-constant';
import {
convertRelativePeriodToPeriod, initiatePeriodByGranularity,
convertRelativePeriodToPeriod,
} from '@/services/alert-manager/v2/helpers/alert-period-helper';
import { ALERT_MANAGER_ROUTE } from '@/services/alert-manager/v2/routes/route-constant';
import { useAlertPageStore } from '@/services/alert-manager/v2/stores/alert-page-store';
Expand Down Expand Up @@ -111,26 +111,31 @@ const filterState = reactive({
{ label: i18n.t('ALERT_MANAGER.ALERTS.HIGH'), name: ALERT_URGENCY.HIGH },
{ label: i18n.t('ALERT_MANAGER.ALERTS.LOW'), name: ALERT_URGENCY.LOW },
])),
period: initiatePeriodByGranularity()[0],
period: { start: undefined, end: undefined },
periodMenuItems: computed<AlertPeriodItemType[]>(() => [
{
type: 'item',
name: 'ALL',
label: i18n.t('ALERT_MANAGER.ALERTS.ALL'),
},
{
name: ALERT_PERIOD_DROPDOWN_MENU.LAST_1_MONTH,
relativePeriod: { value: 1 },
label: i18n.t('ALERT_MANAGER.ALERTS.LAST_1_MONTHS'),
},
{
name: ALERT_PERIOD_DROPDOWN_MENU.LAST_3_MONTHS,
relativePeriod: { value: 2 },
relativePeriod: { value: 3 },
label: i18n.t('ALERT_MANAGER.ALERTS.LAST_3_MONTHS'),
},
{
name: ALERT_PERIOD_DROPDOWN_MENU.LAST_6_MONTHS,
relativePeriod: { value: 5 },
relativePeriod: { value: 6 },
label: i18n.t('ALERT_MANAGER.ALERTS.LAST_6_MONTHS'),
},
{
name: ALERT_PERIOD_DROPDOWN_MENU.LAST_12_MONTHS,
relativePeriod: { value: 11 },
relativePeriod: { value: 12 },
label: i18n.t('ALERT_MANAGER.ALERTS.LAST_12_MONTHS'),
},
{
Expand All @@ -152,7 +157,8 @@ const filterState = reactive({
const { isStartInvalid, isEndInvalid } = checkPeriod(LIMIT_MONTH);
return isStartInvalid || isEndInvalid;
}),
selectedPeriod: ALERT_PERIOD_DROPDOWN_MENU.LAST_1_MONTH as string,
selectedPeriod: ALERT_PERIOD_DROPDOWN_MENU.ALL as string,
showPeriodBadge: computed<boolean>(() => filterState.selectedPeriod === ALERT_PERIOD_DROPDOWN_MENU.CUSTOM && filterState.period.start && filterState.period.end),
serviceDropdownList: computed<SelectDropdownMenuItem[]>(() => alertPageGetters.serviceDropdownList),
statusFields: computed<AlertFilterType[]>(() => ([
{ label: i18n.t('ALERT_MANAGER.ALERTS.OPEN'), name: ALERT_STATUS_FILTERS.OPEN },
Expand Down Expand Up @@ -237,6 +243,9 @@ const handleSelectPeriod = async (periodMenuName: AlertPeriodDropdownMenuType) =
state.customRangeModalVisible = true;
return;
}
if (periodMenuName === ALERT_PERIOD_DROPDOWN_MENU.ALL) {
filterState.period = { start: undefined, end: undefined };
}
filterState.selectedPeriod = periodMenuName;
const selectedPeriodItem = filterState.periodMenuItems.find((d) => d.name === periodMenuName) || {} as AlertPeriodItemType;
filterState.period = selectedPeriodItem.relativePeriod ? convertRelativePeriodToPeriod(selectedPeriodItem.relativePeriod) : filterState.period;
Expand Down Expand Up @@ -274,13 +283,14 @@ const handleExportToExcel = async () => {
});
};
const handleCustomRangeModalConfirm = (start: string, end: string) => {
filterState.period = { start: dayjs(start).startOf('month').format('YYYY-MM-DD'), end: dayjs(end).endOf('month').format('YYYY-MM-DD') };
filterState.period = { start, end };
filterState.selectedPeriod = ALERT_PERIOD_DROPDOWN_MENU.CUSTOM;
state.customRangeModalVisible = false;
fetchAlertsList();
};

const fetchAlertsList = async () => {
state.loading = true;
try {
filterQueryHelper.setFilters([]);
if (storeState.selectedUrgency !== 'ALL') {
Expand All @@ -295,12 +305,17 @@ const fetchAlertsList = async () => {
filterQueryHelper.addFilter({ k: 'labels', v: filterState.selectedLabels.map((i) => i.name), o: '=' });
}

if (filterState.period.start) {
if (filterState.period.start && filterState.period.end && (filterState.period.start === filterState.period.end)) {
filterQueryHelper.addFilter({ k: 'created_at', v: filterState.period.start, o: '>=' });
} else {
if (filterState.period.start) {
filterQueryHelper.addFilter({ k: 'created_at', v: filterState.period.start, o: '>=' });
}
if (filterState.period.end) {
filterQueryHelper.addFilter({ k: 'created_at', v: filterState.period.end, o: '<=' });
}
}
if (filterState.period.end) {
filterQueryHelper.addFilter({ k: 'created_at', v: filterState.period.end, o: '<=' });
}


if (state.isServicePage) {
filterQueryHelper.addFilter({ k: 'service_id', v: storeState.serviceId, o: '=' });
Expand All @@ -320,6 +335,8 @@ const fetchAlertsList = async () => {
await alertPageStore.fetchAlertsList(params);
} catch (e) {
ErrorHandler.handleError(e, true);
} finally {
state.loading = false;
}
};

Expand All @@ -343,12 +360,7 @@ watch(() => storeState.serviceId, async (serviceId) => {
await queryTagHelper.setURLQueryStringFilters(route.query.filters);
}

try {
state.loading = true;
await fetchAlertsList();
} finally {
state.loading = false;
}
await fetchAlertsList();
})();
</script>

Expand Down Expand Up @@ -398,15 +410,24 @@ watch(() => storeState.serviceId, async (serviceId) => {
<span>{{ item.label }}</span>
</template>
</p-select-dropdown>
<p-select-dropdown :menu="filterState.periodMenuItems"
:selection-label="$t('ALERT_MANAGER.ALERTS.PERIOD')"
disable-proxy
style-type="rounded"
use-fixed-menu-style
:selected="filterState.selectedPeriod"
:invalid="filterState.isPeriodInvalid"
@select="handleSelectPeriod"
/>
<div>
<p-select-dropdown :menu="filterState.periodMenuItems"
:selection-label="$t('ALERT_MANAGER.ALERTS.PERIOD')"
disable-proxy
style-type="rounded"
use-fixed-menu-style
:selected="filterState.selectedPeriod"
:invalid="filterState.isPeriodInvalid"
@select="handleSelectPeriod"
/>
<p-badge v-if="filterState.showPeriodBadge"
badge-type="subtle"
style-type="gray200"
class="ml-2"
>
{{ `${dayjs.utc(filterState.period.start).format('MMM D, YYYY')} ~ ${dayjs.utc(filterState.period.end).format('MMM D, YYYY')}` }}
</p-badge>
</div>
<p-divider vertical
class="divider"
/>
Expand Down Expand Up @@ -521,7 +542,7 @@ watch(() => storeState.serviceId, async (serviceId) => {
<custom-date-modal :visible.sync="state.customRangeModalVisible"
:start="filterState.period?.start"
:end="filterState.period?.end"
:datetime-picker-data-type="'yearToMonth'"
:datetime-picker-data-type="'yearToDate'"
use-restricted-mode
@confirm="handleCustomRangeModalConfirm"
/>
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/services/alert-manager/v2/constants/alert-table-constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type { ExcelDataField } from '@/lib/helper/file-download-helper/type';
import type { AlertManagementTableHandlerType } from '@/services/alert-manager/v2/types/alert-manager-type';

export const ALERT_PERIOD_DROPDOWN_MENU = {
ALL: 'ALL',
LAST_1_MONTH: 'LAST_1_MONTH',
LAST_3_MONTHS: 'LAST_3_MONTHS',
LAST_6_MONTHS: 'LAST_6_MONTHS',
Expand Down
5 changes: 0 additions & 5 deletions apps/web/src/services/alert-manager/v2/helpers/alert-period-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,3 @@ export const convertRelativePeriodToPeriod = (alertRelativePeriod: AlertRelative
start: today.subtract(alertRelativePeriod.value, 'month').format('YYYY-MM-DD'),
};
};

export const initiatePeriodByGranularity = (): [Period, AlertRelativePeriod|undefined] => {
const last1MonthsRelativePeriod: AlertRelativePeriod = { value: 1 };
return [convertRelativePeriodToPeriod(last1MonthsRelativePeriod), last1MonthsRelativePeriod];
};
4 changes: 2 additions & 2 deletions packages/language-pack/ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"CREATED_BY": "생성자: {user}",
"CREATE_ALERT": "얼럿 생성",
"CRITICAL": "위험 경고",
"CUSTOM": "기간 선택",
"CUSTOM": "커스텀",
"CUSTOM_DATE_RANGE": "상세 기간 선택",
"DESC": "설명",
"DETAILS": "상세 정보",
Expand Down Expand Up @@ -954,7 +954,7 @@
"FORM": {
"CANCEL": "취소",
"CREATE": "생성",
"CUSTOM_RANGE": "기간 선택",
"CUSTOM_RANGE": "커스텀",
"FROM": "시작",
"TO": "종료"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/mirinae/src/controls/datetime-picker/PDatetimePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ export default defineComponent({
mode: state.mode,
defaultDate,
altInput: false,
altFormat: state.enableTime ? 'Y/m/d H:i' : 'Y/m/d',
dateFormat: state.enableTime ? 'Y/m/d H:i' : 'Y/m/d',
altFormat: state.enableTime ? 'Y-m-d H:i' : 'Y-m-d',
dateFormat: state.enableTime ? 'Y-m-d H:i' : 'Y-m-d',
enableTime: state.enableTime,
minDate: props.minDate,
maxDate: props.maxDate,
Expand Down
Loading