Skip to content

chore(data-table): solve data-table project-group filter bug #5607

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
piggggggggy merged 1 commit into from
Jan 23, 2025
Merged

chore(data-table): solve data-table project-group filter bug #5607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardAddForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => ({
Expand Down
11 changes: 9 additions & 2 deletions apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardFilters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
} from 'vue';

import {
cloneDeep,
debounce,
isArray,
isEmpty, unset,
Expand Down Expand Up @@ -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';


Expand Down Expand Up @@ -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';
}) : [];
});
}),
});

Expand Down
Loading