Skip to content
代码片段 群组 项目
提交 a9d4fc03 编辑于 作者: David Pisek's avatar David Pisek
浏览文件

Merge branch 'deprecate-image-filter' into 'master'

Deprecate ImageFilter component

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105586



Merged-by: default avatarDavid Pisek <dpisek@gitlab.com>
Approved-by: default avatarNataliia Radina <nradina@gitlab.com>
Approved-by: default avatarDavid Pisek <dpisek@gitlab.com>
Co-authored-by: default avatarSamantha Ming <sming@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -7,7 +7,7 @@ import ProjectFilter from '../filters/project_filter.vue'; ...@@ -7,7 +7,7 @@ import ProjectFilter from '../filters/project_filter.vue';
import ScannerFilter from '../filters/scanner_filter.vue'; import ScannerFilter from '../filters/scanner_filter.vue';
import SimpleFilter from '../filters/simple_filter.vue'; import SimpleFilter from '../filters/simple_filter.vue';
import ClusterFilterDeprecated from '../filters/cluster_filter_deprecated.vue'; import ClusterFilterDeprecated from '../filters/cluster_filter_deprecated.vue';
import ImageFilter from '../filters/image_filter.vue'; import ImageFilterDeprecated from '../filters/image_filter_deprecated.vue';
import ToolFilter from '../filters/tool_filter.vue'; import ToolFilter from '../filters/tool_filter.vue';
import ToolFilterDeprecated from '../filters/tool_filter_deprecated.vue'; import ToolFilterDeprecated from '../filters/tool_filter_deprecated.vue';
import SeverityFilter from '../filters/severity_filter.vue'; import SeverityFilter from '../filters/severity_filter.vue';
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
case CLUSTER: case CLUSTER:
return ClusterFilterDeprecated; return ClusterFilterDeprecated;
case IMAGE: case IMAGE:
return ImageFilter; return ImageFilterDeprecated;
default: default:
return SimpleFilter; return SimpleFilter;
} }
......
...@@ -5,7 +5,7 @@ import { GlTruncate } from '@gitlab/ui'; ...@@ -5,7 +5,7 @@ import { GlTruncate } from '@gitlab/ui';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import { createAlert } from '~/flash'; import { createAlert } from '~/flash';
import createMockApollo from 'helpers/mock_apollo_helper'; import createMockApollo from 'helpers/mock_apollo_helper';
import ImageFilter from 'ee/security_dashboard/components/shared/filters/image_filter.vue'; import ImageFilterDeprecated from 'ee/security_dashboard/components/shared/filters/image_filter_deprecated.vue';
import { IMAGE_FILTER_ERROR } from 'ee/security_dashboard/components/shared/filters/constants'; import { IMAGE_FILTER_ERROR } from 'ee/security_dashboard/components/shared/filters/constants';
import { imageFilter } from 'ee/security_dashboard/helpers'; import { imageFilter } from 'ee/security_dashboard/helpers';
import agentImagesQuery from 'ee/security_dashboard/graphql/queries/agent_images.query.graphql'; import agentImagesQuery from 'ee/security_dashboard/graphql/queries/agent_images.query.graphql';
...@@ -16,7 +16,7 @@ import { agentVulnerabilityImages, projectVulnerabilityImages } from '../../mock ...@@ -16,7 +16,7 @@ import { agentVulnerabilityImages, projectVulnerabilityImages } from '../../mock
jest.mock('~/flash'); jest.mock('~/flash');
describe('Image Filter component', () => { describe('Image Filter component (deprecated)', () => {
let wrapper; let wrapper;
const projectFullPath = 'test/path'; const projectFullPath = 'test/path';
const defaultQueryResolver = { const defaultQueryResolver = {
...@@ -37,7 +37,7 @@ describe('Image Filter component', () => { ...@@ -37,7 +37,7 @@ describe('Image Filter component', () => {
}; };
const createWrapper = ({ agentQueryResolver, projectQueryResolver, provide = {} } = {}) => { const createWrapper = ({ agentQueryResolver, projectQueryResolver, provide = {} } = {}) => {
wrapper = shallowMount(ImageFilter, { wrapper = shallowMount(ImageFilterDeprecated, {
apolloProvider: createMockApolloProvider({ agentQueryResolver, projectQueryResolver }), apolloProvider: createMockApolloProvider({ agentQueryResolver, projectQueryResolver }),
propsData: { filter: imageFilter }, propsData: { filter: imageFilter },
provide: { projectFullPath, ...provide }, provide: { projectFullPath, ...provide },
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册