Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Upcoming Features
---

Exclude tags column and filter from entity table for Linode-based Alerts in Cloudpulse Alerting ([#12335](https://github.com/linode/manager/pull/12335))
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,5 @@ describe('AlertsResourcesFilterRenderer', () => {
);

expect(getByPlaceholderText('Select Regions')).toBeInTheDocument();

const tagProps = getAlertResourceFilterProps({
filterKey: 'tags',
handleFilterChange: handleFilterChangeMock,
handleFilteredRegionsChange: handleFilterChangeMock,
regionOptions: [],
tagOptions: ['tag1', 'tag2'],
});
const tagPropKeys = Object.keys(tagProps);
expect(tagPropKeys.includes('handleFilterChange')).toBeTruthy();
expect(tagPropKeys.includes('handleSelectionChange')).toBeFalsy();

// Check for region filter
renderWithTheme(
<AlertResourcesFilterRenderer
component={serviceToFiltersMap['linode'][1].component}
componentProps={tagProps}
/>
);

expect(getByPlaceholderText('Select Tags')).toBeInTheDocument();
});
});
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import React from 'react';

import { engineTypeMap } from '../constants';
import { AlertsEngineTypeFilter } from './AlertsEngineTypeFilter';
import { AlertsRegionFilter } from './AlertsRegionFilter';
import { AlertsTagFilter } from './AlertsTagsFilter';
import { TextWithExtraInfo } from './TextWithExtraInfo';

import type { AlertInstance } from './DisplayAlertResources';
import type { TextWithInfoProp } from './TextWithExtraInfo';
import type {
AlertAdditionalFilterKey,
ServiceColumns,
Expand Down Expand Up @@ -58,14 +53,6 @@ export const serviceTypeBasedColumns: ServiceColumns<AlertInstance> = {
label: 'Region',
sortingKey: 'region',
},
{
accessor: ({ tags }) =>
React.createElement<Required<TextWithInfoProp>>(TextWithExtraInfo, {
values: tags ?? [],
}),
label: 'Tags',
sortingKey: 'tags',
},
],
};

Expand All @@ -78,10 +65,7 @@ export const serviceToFiltersMap: Record<
{ component: AlertsEngineTypeFilter, filterKey: 'engineType' },
{ component: AlertsRegionFilter, filterKey: 'region' },
],
linode: [
{ component: AlertsRegionFilter, filterKey: 'region' },
{ component: AlertsTagFilter, filterKey: 'tags' },
],
linode: [{ component: AlertsRegionFilter, filterKey: 'region' }],
};
export const applicableAdditionalFilterKeys: AlertAdditionalFilterKey[] = [
'engineType', // Extendable in future for filter keys like 'tags', 'plan', etc.
Expand Down