Skip to content

G
gitlab-ce
Commit 589bf2b7 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska
Browse files
Options

Merge branch '333235-remove-unscanned-vuex-modules' into 'master' 

Remove unused files

See merge request gitlab-org/gitlab!70276
parents 892e3379 314c7983
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 527 deletions
ee/app/assets/javascripts/security_dashboard/store/constants.js
View file @ 589bf2b7
...@@ -29,13 +29,6 @@ export const DASHBOARD_TYPES = { ...@@ -29,13 +29,6 @@ export const DASHBOARD_TYPES = {
INSTANCE: 'instance', INSTANCE: 'instance',
}; };
export const UNSCANNED_PROJECTS_DATE_RANGES = [
{ description: s__('UnscannedProjects|5 or more days'), fromDay: 5, toDay: 15 },
{ description: s__('UnscannedProjects|15 or more days'), fromDay: 15, toDay: 30 },
{ description: s__('UnscannedProjects|30 or more days'), fromDay: 30, toDay: 60 },
{ description: s__('UnscannedProjects|60 or more days'), fromDay: 60, toDay: Infinity },
];
export const PRIMARY_IDENTIFIER_TYPE = 'cve'; export const PRIMARY_IDENTIFIER_TYPE = 'cve';
export const DAYS = { thirty: 30, sixty: 60, ninety: 90 }; export const DAYS = { thirty: 30, sixty: 60, ninety: 90 };
ee/app/assets/javascripts/security_dashboard/store/index.js
View file @ 589bf2b7
...@@ -4,7 +4,6 @@ import { DASHBOARD_TYPES } from './constants'; ...@@ -4,7 +4,6 @@ import { DASHBOARD_TYPES } from './constants';
import filters from './modules/filters/index'; import filters from './modules/filters/index';
import pipelineJobs from './modules/pipeline_jobs/index'; import pipelineJobs from './modules/pipeline_jobs/index';
import unscannedProjects from './modules/unscanned_projects/index';
import vulnerabilities from './modules/vulnerabilities/index'; import vulnerabilities from './modules/vulnerabilities/index';
import vulnerableProjects from './modules/vulnerable_projects/index'; import vulnerableProjects from './modules/vulnerable_projects/index';
import mediator from './plugins/mediator'; import mediator from './plugins/mediator';
...@@ -19,7 +18,6 @@ export const getStoreConfig = (dashboardType = DASHBOARD_TYPES.PROJECT) => ({ ...@@ -19,7 +18,6 @@ export const getStoreConfig = (dashboardType = DASHBOARD_TYPES.PROJECT) => ({
vulnerableProjects, vulnerableProjects,
filters, filters,
vulnerabilities, vulnerabilities,
unscannedProjects,
pipelineJobs, pipelineJobs,
}, },
}); });
......
ee/app/assets/javascripts/security_dashboard/store/modules/unscanned_projects/actions.js deleted 100644 → 0
View file @ 892e3379
import createFlash from '~/flash';
import axios from '~/lib/utils/axios_utils';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { __ } from '~/locale';
import {
REQUEST_UNSCANNED_PROJECTS,
RECEIVE_UNSCANNED_PROJECTS_SUCCESS,
RECEIVE_UNSCANNED_PROJECTS_ERROR,
} from './mutation_types';
export const fetchUnscannedProjects = ({ dispatch }, endpoint) => {
dispatch('requestUnscannedProjects');
return axios
.get(endpoint)
.then(({ data }) => data.map(convertObjectPropsToCamelCase))
.then((data) => {
dispatch('receiveUnscannedProjectsSuccess', data);
})
.catch(() => {
dispatch('receiveUnscannedProjectsError');
});
};
export const requestUnscannedProjects = ({ commit }) => {
commit(REQUEST_UNSCANNED_PROJECTS);
};
export const receiveUnscannedProjectsSuccess = ({ commit }, payload) => {
commit(RECEIVE_UNSCANNED_PROJECTS_SUCCESS, payload);
};
export const receiveUnscannedProjectsError = ({ commit }) => {
createFlash({
message: __('Unable to fetch unscanned projects'),
});
commit(RECEIVE_UNSCANNED_PROJECTS_ERROR);
};
ee/app/assets/javascripts/security_dashboard/store/modules/unscanned_projects/getters.js deleted 100644 → 0
View file @ 892e3379
import { UNSCANNED_PROJECTS_DATE_RANGES } from '../../constants';
import { groupByDateRanges } from './utils';
export const untestedProjects = ({ projects }) =>
projects.filter(({ securityTestsUnconfigured }) => securityTestsUnconfigured === true);
export const untestedProjectsCount = (state, getters) => getters.untestedProjects.length;
export const outdatedProjects = ({ projects }) =>
groupByDateRanges({
ranges: UNSCANNED_PROJECTS_DATE_RANGES,
dateFn: (x) => x.securityTestsLastSuccessfulRun,
projects,
});
export const outdatedProjectsCount = (state, getters) =>
getters.outdatedProjects.reduce((count, currentGroup) => count + currentGroup.projects.length, 0);
ee/app/assets/javascripts/security_dashboard/store/modules/unscanned_projects/index.js deleted 100644 → 0
View file @ 892e3379
import * as actions from './actions';
import * as getters from './getters';
import mutations from './mutations';
import state from './state';
export default {
namespaced: true,
state,
mutations,
actions,
getters,
};
ee/app/assets/javascripts/security_dashboard/store/modules/unscanned_projects/mutation_types.js deleted 100644 → 0
View file @ 892e3379
export const REQUEST_UNSCANNED_PROJECTS = 'REQUEST_UNSCANNED_PROJECTS';
export const RECEIVE_UNSCANNED_PROJECTS_SUCCESS = 'RECEIVE_UNSCANNED_PROJECTS_SUCCESS';
export const RECEIVE_UNSCANNED_PROJECTS_ERROR = 'RECEIVE_UNSCANNED_PROJECTS_ERROR';
ee/app/assets/javascripts/security_dashboard/store/modules/unscanned_projects/mutations.js deleted 100644 → 0
View file @ 892e3379
import {
REQUEST_UNSCANNED_PROJECTS,
RECEIVE_UNSCANNED_PROJECTS_SUCCESS,
RECEIVE_UNSCANNED_PROJECTS_ERROR,
} from './mutation_types';
export default {
[REQUEST_UNSCANNED_PROJECTS](state) {
state.isLoading = true;
},
[RECEIVE_UNSCANNED_PROJECTS_SUCCESS](state, projects) {
state.isLoading = false;
state.projects = projects;
},
[RECEIVE_UNSCANNED_PROJECTS_ERROR](state) {
state.isLoading = false;
},
};
ee/app/assets/javascripts/security_dashboard/store/modules/unscanned_projects/utils.js deleted 100644 → 0
View file @ 892e3379
import { getDayDifference, isValidDate } from '~/lib/utils/datetime_utility';
/**
* Checks if a given number of days is within a date range
*
* @param daysInPast {number}
* @returns {function({fromDay: Number, toDay: Number}): boolean}
*/
const isWithinDateRange = (daysInPast) => ({ fromDay, toDay }) =>
daysInPast >= fromDay && daysInPast < toDay;
/**
* Adds an empty 'projects' array to each item of a given array
*
* @param ranges {*}[]
* @returns {{projects: []}}[]
*/
const withEmptyProjectsArray = (ranges) => ranges.map((range) => ({ ...range, projects: [] }));
/**
* Checks if a given group-object has any projects
*
* @param group {{ projects: [] }}
* @returns {boolean}
*/
const hasProjects = (group) => group.projects.length > 0;
/**
* Takes an array of objects and groups them based on the given ranges
*
* @param ranges {*}[]
* @param dateFn {Function}
* @param projects {*}[]
* @returns {*}[]
*/
export const groupByDateRanges = ({ ranges = [], dateFn = () => {}, projects = [] }) => {
const today = new Date(Date.now());
return projects
.reduce((groups, currentProject) => {
const timeString = dateFn(currentProject);
const pastDate = new Date(timeString);
if (!isValidDate(pastDate) || !timeString) {
return groups;
}
const numDaysInPast = getDayDifference(pastDate, today);
const matchingGroup = groups.find(isWithinDateRange(numDaysInPast));
if (matchingGroup) {
matchingGroup.projects.push(currentProject);
}
return groups;
}, withEmptyProjectsArray(ranges))
.filter(hasProjects);
};
ee/spec/frontend/security_dashboard/store/modules/unscanned_projects/actions_spec.js deleted 100644 → 0
View file @ 892e3379
import MockAdapter from 'axios-mock-adapter';
import * as actions from 'ee/security_dashboard/store/modules/unscanned_projects/actions';
import * as types from 'ee/security_dashboard/store/modules/unscanned_projects/mutation_types';
import createState from 'ee/security_dashboard/store/modules/unscanned_projects/state';
import testAction from 'helpers/vuex_action_helper';
import createFlash from '~/flash';
import axios from '~/lib/utils/axios_utils';
jest.mock('~/flash');
describe('EE Unscanned Projects actions', () => {
const mockEndpoint = 'mock-list-endpoint';
const mockResponse = [{ key_foo: 'valueFoo' }];
let mockAxios;
let state;
beforeEach(() => {
mockAxios = new MockAdapter(axios);
state = createState();
});
afterEach(() => {
mockAxios.restore();
});
describe('fetchUnscannedProjects', () => {
it('calls the unscanned projects endpoint and transforms the response keys into camel case', () => {
mockAxios.onGet(mockEndpoint).replyOnce(200, mockResponse);
const mockResponseCamelCased = [{ keyFoo: 'valueFoo' }];
return testAction(
actions.fetchUnscannedProjects,
mockEndpoint,
state,
[],
[
{ type: 'requestUnscannedProjects' },
{ type: 'receiveUnscannedProjectsSuccess', payload: mockResponseCamelCased },
],
);
});
it('handles an API error by dispatching "receiveUnscannedProjectsError"', () => {
mockAxios.onGet(mockEndpoint).replyOnce(500);
return testAction(
actions.fetchUnscannedProjects,
mockEndpoint,
state,
[],
[{ type: 'requestUnscannedProjects' }, { type: 'receiveUnscannedProjectsError' }],
);
});
});
describe('requestUnscannedProjects', () => {
it('commits the REQUEST_UNSCANNED_PROJECTS mutations', () =>
testAction(
actions.requestUnscannedProjects,
null,
state,
[
{
type: types.REQUEST_UNSCANNED_PROJECTS,
},
],
[],
));
});
describe('receiveUnscannedProjectsSuccess', () => {
it('commits the RECEIVE_UNSCANNED_PROJECTS_SUCCESS mutation', () => {
const projects = [];
return testAction(
actions.receiveUnscannedProjectsSuccess,
projects,
state,
[
{
type: types.RECEIVE_UNSCANNED_PROJECTS_SUCCESS,
payload: projects,
},
],
[],
);
});
});
describe('receiveUnscannedProjectsError', () => {
it('commits the RECEIVE_UNSCANNED_PROJECTS_ERROR mutation', () => {
const projects = [];
return testAction(
actions.receiveUnscannedProjectsError,
projects,
state,
[
{
type: types.RECEIVE_UNSCANNED_PROJECTS_ERROR,
},
],
[],
);
});
it('creates a flash error message', () => {
const mockDispatchContext = { dispatch: () => {}, commit: () => {}, state };
actions.receiveUnscannedProjectsError(mockDispatchContext);
expect(createFlash).toHaveBeenCalledTimes(1);
expect(createFlash).toHaveBeenCalledWith({
message: 'Unable to fetch unscanned projects',
});
});
});
});
ee/spec/frontend/security_dashboard/store/modules/unscanned_projects/getters_spec.js deleted 100644 → 0
View file @ 892e3379
import { UNSCANNED_PROJECTS_DATE_RANGES } from 'ee/security_dashboard/store/constants';
import * as getters from 'ee/security_dashboard/store/modules/unscanned_projects/getters';
import { groupByDateRanges } from 'ee/security_dashboard/store/modules/unscanned_projects/utils';
describe('Unscanned projects getters', () => {
describe('untestedProjects', () => {
it('takes an array of projects and returns only projects that have "securityTestsUnconfigured" set to be "true"', () => {
const projects = [
{ securityTestsUnconfigured: null },
{ securityTestsUnconfigured: true },
{ securityTestsUnconfigured: false },
{ securityTestsUnconfigured: true },
{},
];
expect(getters.untestedProjects({ projects })).toStrictEqual([projects[1], projects[3]]);
});
});
describe('untestedProjectsCount', () => {
it('returns the amount of untestedProjects', () => {
const untestedProjects = [{}, {}, {}];
expect(getters.untestedProjectsCount({}, { untestedProjects })).toBe(untestedProjects.length);
});
});
describe('outdatedProjects', () => {
it('groups the given projects by date ranges', () => {
const mockedDate = new Date(2015, 4, 15);
jest.spyOn(global.Date, 'now').mockImplementation(() => mockedDate.valueOf());
const projects = [
{
description: '5 days ago',
securityTestsLastSuccessfulRun: '2015-05-10T10:00:00.0000',
},
{
description: '6 days ago',
securityTestsLastSuccessfulRun: '2015-05-09T10:00:00.0000',
},
{
description: '30 days ago',
securityTestsLastSuccessfulRun: '2015-04-15T10:00:00.0000',
},
{
description: '60 days ago',
securityTestsLastSuccessfulRun: '2015-03-16T10:00:00',
},
{
description: 'more than 60 days ago',
securityTestsLastSuccessfulRun: '2012-03-16T10:00:00',
},
];
const result = getters.outdatedProjects({ projects });
expect(result).toHaveLength(3);
expect(result).toEqual(
groupByDateRanges({
ranges: UNSCANNED_PROJECTS_DATE_RANGES,
dateFn: (x) => x.securityTestsLastSuccessfulRun,
projects,
}),
);
});
});
describe('outdatedProjectsCount', () => {
it('returns the amount of outdated projects', () => {
const dateRangeOne = [{}, {}];
const dateRangeTwo = [{}];
const outdatedProjects = [{ projects: dateRangeOne }, { projects: dateRangeTwo }];
expect(getters.outdatedProjectsCount({}, { outdatedProjects })).toBe(
dateRangeOne.length + dateRangeTwo.length,
);
});
});
});
ee/spec/frontend/security_dashboard/store/modules/unscanned_projects/mutations_spec.js deleted 100644 → 0
View file @ 892e3379
import * as types from 'ee/security_dashboard/store/modules/unscanned_projects/mutation_types';
import mutations from 'ee/security_dashboard/store/modules/unscanned_projects/mutations';
import createState from 'ee/security_dashboard/store/modules/unscanned_projects/state';
describe('unscannedProjects mutations', () => {
let state;
beforeEach(() => {
state = createState();
});
describe('REQUEST_UNSCANNED_PROJECTS', () => {
it('sets state.isLoading to be "true"', () => {
state.isLoading = false;
mutations[types.REQUEST_UNSCANNED_PROJECTS](state, true);
expect(state.isLoading).toBe(true);
});
});
describe('RECEIVE_UNSCANNED_PROJECTS_SUCCESS', () => {
it('sets state.isLoading to be "false"', () => {
state.isLoading = true;
const payload = [];
mutations[types.RECEIVE_UNSCANNED_PROJECTS_SUCCESS](state, payload);
expect(state.isLoading).toBe(false);
});
it('sets state.projects to the given payload', () => {
const payload = [];
mutations[types.RECEIVE_UNSCANNED_PROJECTS_SUCCESS](state, payload);
expect(state.projects).toBe(payload);
});
});
describe('RECEIVE_UNSCANNED_PROJECTS_ERROR', () => {
it('sets state.isLoading to be "false"', () => {
state.isLoading = true;
mutations[types.RECEIVE_UNSCANNED_PROJECTS_ERROR](state);
expect(state.isLoading).toBe(false);
});
});
});
ee/spec/frontend/security_dashboard/store/modules/unscanned_projects/utils_spec.js deleted 100644 → 0
View file @ 892e3379
import { groupByDateRanges } from 'ee/security_dashboard/store/modules/unscanned_projects/utils';
describe('Project scanning store utils', () => {
describe('groupByDayRanges', () => {
beforeEach(() => {
const mockedDate = new Date(2015, 4, 15);
jest.spyOn(global.Date, 'now').mockImplementation(() => mockedDate.valueOf());
});
afterEach(() => {
jest.clearAllMocks();
});
const ranges = [
{ fromDay: 5, toDay: 15, description: '5 days or older' },
{ fromDay: 30, toDay: 60, description: '30 days or older' },
{ fromDay: 60, toDay: Infinity, description: '60 days or older' },
];
it('groups an array of projects into day-ranges, based on when they were last updated', () => {
const projects = [
{
description: '5 days ago',
lastUpdated: '2015-05-10T10:00:00.0000',
},
{
description: '6 days ago',
lastUpdated: '2015-05-09T10:00:00.0000',
},
{
description: '30 days ago',
lastUpdated: '2015-04-15T10:00:00.0000',
},
{
description: '60 days ago',
lastUpdated: '2015-03-16T10:00:00',
},
{
description: 'more than 60 days ago',
lastUpdated: '2012-03-16T10:00:00',
},
];
const groups = groupByDateRanges({
ranges,
dateFn: (x) => x.lastUpdated,
projects,
});
expect(groups[0].projects).toEqual([projects[0], projects[1]]);
expect(groups[1].projects).toEqual([projects[2]]);
expect(groups[2].projects).toEqual([projects[3], projects[4]]);
});
it('ignores projects that do not match any given group', () => {
const projectWithoutMatchingGroup = {
description: '4 days ago',
lastUpdated: '2015-05-11T10:00:00.0000',
};
const projectWithMatchingGroup = {
description: '6 days ago',
lastUpdated: '2015-05-09T10:00:00.0000',
};
const projects = [projectWithMatchingGroup, projectWithoutMatchingGroup];
const groups = groupByDateRanges({
ranges,
dateFn: (x) => x.lastUpdated,
projects,
});
expect(groups).toHaveLength(1);
expect(groups[0].projects).toEqual([projectWithMatchingGroup]);
});
it('ignores projects that do not contain valid time values', () => {
const projectsWithoutTimeStamp = [
{
description: 'No timestamp prop',
},
{
description: 'No timestamp prop',
lastUpdated: 'foo',
},
{
description: 'No timestamp prop',
lastUpdated: false,
},
];
const groups = groupByDateRanges({
ranges,
dateFn: (x) => x.lastUpdated,
projects: projectsWithoutTimeStamp,
});
expect(groups).toHaveLength(0);
});
});
});
locale/gitlab.pot
View file @ 589bf2b7
...@@ -35921,9 +35921,6 @@ msgstr "" ...@@ -35921,9 +35921,6 @@ msgstr ""
msgid "Unable to fetch branches list, please close the form and try again" msgid "Unable to fetch branches list, please close the form and try again"
msgstr "" msgstr ""
msgid "Unable to fetch unscanned projects"
msgstr ""
msgid "Unable to fetch vulnerable projects" msgid "Unable to fetch vulnerable projects"
msgstr "" msgstr ""
...@@ -36113,18 +36110,6 @@ msgstr "" ...@@ -36113,18 +36110,6 @@ msgstr ""
msgid "Unresolved" msgid "Unresolved"
msgstr "" msgstr ""
msgid "UnscannedProjects|15 or more days"
msgstr ""
msgid "UnscannedProjects|30 or more days"
msgstr ""
msgid "UnscannedProjects|5 or more days"
msgstr ""
msgid "UnscannedProjects|60 or more days"
msgstr ""
msgid "Unschedule job" msgid "Unschedule job"
msgstr "" msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7