Skip to content
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.

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

[Security Solution][Endpoint] Port trusted apps to ArtifactlsListPage component #129208

Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e37c34c
move validations to artifacts
ashokaditya Apr 1, 2022
5599cc2
use ArtifactsListPage
ashokaditya Apr 1, 2022
b91215b
Remove redundant files
ashokaditya Apr 5, 2022
c90fba3
Update trusted app list ftr test
ashokaditya Apr 5, 2022
b296f41
fix test mock
ashokaditya Apr 5, 2022
a5636f2
add trusted app form tests
ashokaditya Apr 6, 2022
e922e14
Merge branch 'main' into task/olm-3092-port-trusted-apps-to-ArtifactL…
ashokaditya Apr 19, 2022
d246bb8
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Apr 19, 2022
ea38543
Merge branch 'main' into task/olm-3092-port-trusted-apps-to-ArtifactL…
ashokaditya Apr 19, 2022
82e6df8
Merge branch 'main' into task/olm-3092-port-trusted-apps-to-ArtifactL…
ashokaditya Apr 19, 2022
f52f60b
default page index to 1 when set to 0
ashokaditya Apr 20, 2022
e82f9ac
add tests for new routing methods
ashokaditya Apr 20, 2022
fbaa8c7
review changes
ashokaditya Apr 20, 2022
534efeb
update fleet integration test
ashokaditya Apr 20, 2022
6a792fc
Merge branch 'main' into task/olm-3092-port-trusted-apps-to-ArtifactL…
ashokaditya Apr 20, 2022
2b2509d
update translation again after merge
ashokaditya Apr 20, 2022
0567f36
Merge branch 'main' into task/olm-3092-port-trusted-apps-to-ArtifactL…
ashokaditya Apr 20, 2022
8527db8
Merge branch 'main' into task/olm-3092-port-trusted-apps-to-ArtifactL…
ashokaditya Apr 21, 2022
3d2cdbc
add a test for search field KQL
ashokaditya Apr 21, 2022
87a649e
remove redundant flyout size
ashokaditya Apr 21, 2022
06f0330
Merge branch 'main' into task/olm-3092-port-trusted-apps-to-ArtifactL…
ashokaditya Apr 21, 2022
83c4e1c
Update trusted_apps_list.test.tsx
ashokaditya Apr 21, 2022
4d287a6
Merge branch 'main' into task/olm-3092-port-trusted-apps-to-ArtifactL…
kibanamachine Apr 21, 2022
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
Expand Up @@ -8,7 +8,7 @@
import { schema } from '@kbn/config-schema';
import { ConditionEntryField, OperatingSystem } from '@kbn/securitysolution-utils';
import { TrustedAppConditionEntry } from '../types';
import { getDuplicateFields, isValidHash } from '../service/trusted_apps/validations';
import { getDuplicateFields, isValidHash } from '../service/artifacts/validations';

export const DeleteTrustedAppsRequestSchema = {
params: schema.object({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import { EndpointAction } from '../../management/pages/endpoint_hosts/store/action';
import { PolicyDetailsAction } from '../../management/pages/policy/store/policy_details';
import { TrustedAppsPageAction } from '../../management/pages/trusted_apps/store/action';
import { EventFiltersPageAction } from '../../management/pages/event_filters/store/action';

export { appActions } from './app';
Expand All @@ -20,5 +19,4 @@ export type AppAction =
| EndpointAction
| RoutingAction
| PolicyDetailsAction
| TrustedAppsPageAction
| EventFiltersPageAction;

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { paginationFromUrlParams } from '../components/hooks/use_url_pagination'
import { EndpointIndexUIQueryParams } from '../pages/endpoint_hosts/types';
import { EventFiltersPageLocation } from '../pages/event_filters/types';
import { PolicyDetailsArtifactsPageLocation } from '../pages/policy/types';
import { TrustedAppsListPageLocation } from '../pages/trusted_apps/state';
import { AdministrationSubTab } from '../types';
import {
MANAGEMENT_DEFAULT_PAGE,
Expand Down Expand Up @@ -150,30 +149,6 @@ export const getPolicyEventFiltersPath = (
)}`;
};

const normalizeTrustedAppsPageLocation = (
location?: Partial<TrustedAppsListPageLocation>
): Partial<TrustedAppsListPageLocation> => {
if (location) {
return {
...(!isDefaultOrMissing(location.page_index, MANAGEMENT_DEFAULT_PAGE)
? { page_index: location.page_index }
: {}),
...(!isDefaultOrMissing(location.page_size, MANAGEMENT_DEFAULT_PAGE_SIZE)
? { page_size: location.page_size }
: {}),
...(!isDefaultOrMissing(location.view_type, 'grid') ? { view_type: location.view_type } : {}),
...(!isDefaultOrMissing(location.show, undefined) ? { show: location.show } : {}),
...(!isDefaultOrMissing(location.id, undefined) ? { id: location.id } : {}),
...(!isDefaultOrMissing(location.filter, '') ? { filter: location.filter } : ''),
...(!isDefaultOrMissing(location.included_policies, '')
? { included_policies: location.included_policies }
: ''),
};
} else {
return {};
}
};

const normalizePolicyDetailsArtifactsListPageLocation = (
location?: Partial<PolicyDetailsArtifactsPageLocation>
): Partial<PolicyDetailsArtifactsPageLocation> => {
Expand Down Expand Up @@ -266,31 +241,12 @@ export const extractArtifactsListPaginationParams = (query: querystring.ParsedUr
included_policies: extractIncludedPolicies(query),
});

export const extractTrustedAppsListPageLocation = (
query: querystring.ParsedUrlQuery
): TrustedAppsListPageLocation => {
const showParamValue = extractFirstParamValue(
query,
'show'
) as TrustedAppsListPageLocation['show'];

return {
...extractTrustedAppsListPaginationParams(query),
view_type: extractFirstParamValue(query, 'view_type') === 'list' ? 'list' : 'grid',
show:
showParamValue && ['edit', 'create'].includes(showParamValue) ? showParamValue : undefined,
id: extractFirstParamValue(query, 'id'),
};
};

export const getTrustedAppsListPath = (location?: Partial<TrustedAppsListPageLocation>): string => {
export const getTrustedAppsListPath = (location?: Partial<ArtifactListPageUrlParams>): string => {
const path = generatePath(MANAGEMENT_ROUTING_TRUSTED_APPS_PATH, {
tabName: AdministrationSubTab.trustedApps,
});

return `${path}${appendSearch(
querystring.stringify(normalizeTrustedAppsPageLocation(location))
)}`;
return getArtifactListPageUrlPath(path, location);
};

export const extractPolicyDetailsArtifactsListPageLocation = (
Expand Down
Loading