Skip to content

Commit

Permalink
refactors names
Browse files Browse the repository at this point in the history
  • Loading branch information
dplumlee committed Feb 27, 2020
1 parent 57170df commit d38a4ac
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 220 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ export const alertMiddlewareFactory: MiddlewareFactory<AlertListState> = coreSta
api.dispatch({ type: 'serverReturnedAlertsData', payload: response });
}
if (action.type === 'userChangedUrl' && isOnAlertPage(state) && hasSelectedAlert(state)) {
const { selected_alert } = uiQueryParams(state);
const uiParams = uiQueryParams(state);
const response: AlertData = await coreStart.http.get(
`/api/endpoint/alerts/${selected_alert}`
`/api/endpoint/alerts/${uiParams.selected_alert}`
);
api.dispatch({ type: 'serverReturnedAlertDetailsData', payload: response });
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { AppAction } from '../action';
const initialState = (): AlertListState => {
return {
alerts: [],
alert_details: undefined,
alertDetails: undefined,
pageSize: 10,
pageIndex: 0,
total: 0,
Expand Down Expand Up @@ -47,7 +47,7 @@ export const alertListReducer: Reducer<AlertListState, AppAction> = (
} else if (action.type === 'serverReturnedAlertDetailsData') {
return {
...state,
alert_details: action.payload,
alertDetails: action.payload,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const createStructuredSelector: CreateStructuredSelector = createStructuredSelec
*/
export const alertListData = (state: AlertListState) => state.alerts;

export const selectedAlertDetailsData = (state: AlertListState) => state.alert_details;
export const selectedAlertDetailsData = (state: AlertListState) => state.alertDetails;

/**
* Returns the alert list pagination data from state
Expand Down
10 changes: 5 additions & 5 deletions x-pack/plugins/endpoint/public/applications/endpoint/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,22 +93,22 @@ export type AlertListData = AlertResultList;

export interface AlertListState {
/** Array of alert items. */
alerts: ImmutableArray<AlertData>;
readonly alerts: ImmutableArray<AlertData>;

/** The total number of alerts on the page. */
total: number;
readonly total: number;

/** Number of alerts per page. */
pageSize: number;
readonly pageSize: number;

/** Page number, starting at 0. */
pageIndex: number;
readonly pageIndex: number;

/** Current location object from React Router history. */
readonly location?: Immutable<EndpointAppLocation>;

/** Specific Alert data to be shown in the details view */
readonly alert_details?: Immutable<AlertData>;
readonly alertDetails?: Immutable<AlertData>;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ export const AlertDetailsOverview = memo(() => {
);
}, [alertDetailsData]);

const dateFormatter = new Intl.DateTimeFormat(i18n.getLocale(), {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
});

// TODO fix this style
const TokenPrivileges = useMemo(() => {
const privileges: Array<{ title: string; description: string }> = [];
Expand All @@ -49,21 +58,12 @@ export const AlertDetailsOverview = memo(() => {
return (
<>
<EuiAccordion id="accordion4" buttonContent="Privileges">
<EuiDescriptionList type="column" listItems={privileges} style={{ maxWidth: '400px' }} />
<EuiDescriptionList type="column" listItems={privileges} />
</EuiAccordion>
</>
);
}, [alertDetailsData.process.token.privileges]);

const dateFormatter = new Intl.DateTimeFormat(i18n.getLocale(), {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
});

const alertDetailsColumns = useMemo(() => {
return [
{
Expand Down Expand Up @@ -282,56 +282,25 @@ export const AlertDetailsOverview = memo(() => {
paddingSize="l"
initialIsOpen={true}
>
<EuiDescriptionList
type="column"
listItems={alertDetailsColumns}
style={{ maxWidth: '400px' }}
/>
<EuiDescriptionList type="column" listItems={alertDetailsColumns} />
</EuiAccordion>

<EuiSpacer />

<EuiAccordion
id="alertDetailsHostAccordion"
buttonContent="Host"
paddingSize="l"
initialIsOpen={true}
>
<EuiDescriptionList
type="column"
listItems={hostDetailsColumns}
style={{ maxWidth: '400px' }}
/>
<EuiAccordion id="alertDetailsHostAccordion" buttonContent="Host" paddingSize="l">
<EuiDescriptionList type="column" listItems={hostDetailsColumns} />
</EuiAccordion>

<EuiSpacer />

<EuiAccordion
id="alertDetailsHashAccordion"
buttonContent="Hash"
paddingSize="l"
initialIsOpen={true}
>
<EuiDescriptionList
type="column"
listItems={hashDetailsColumns}
style={{ maxWidth: '400px' }}
/>
<EuiAccordion id="alertDetailsHashAccordion" buttonContent="Hash" paddingSize="l">
<EuiDescriptionList type="column" listItems={hashDetailsColumns} />
</EuiAccordion>

<EuiSpacer />

<EuiAccordion
id="alertDetailsFileAccordion"
buttonContent="File"
paddingSize="l"
initialIsOpen={true}
>
<EuiDescriptionList
type="column"
listItems={fileDetailsColumns}
style={{ maxWidth: '400px' }}
/>
<EuiAccordion id="alertDetailsFileAccordion" buttonContent="File" paddingSize="l">
<EuiDescriptionList type="column" listItems={fileDetailsColumns} />
</EuiAccordion>

<EuiSpacer />
Expand All @@ -340,13 +309,8 @@ export const AlertDetailsOverview = memo(() => {
id="alertDetailsSourceProcessAccordion"
buttonContent="Source Process"
paddingSize="l"
initialIsOpen={true}
>
<EuiDescriptionList
type="column"
listItems={sourceProcessDetailsColumns}
style={{ maxWidth: '400px' }}
/>
<EuiDescriptionList type="column" listItems={sourceProcessDetailsColumns} />
</EuiAccordion>

<EuiSpacer />
Expand All @@ -355,13 +319,8 @@ export const AlertDetailsOverview = memo(() => {
id="alertDetailsSourceProcessTokenAccordion"
buttonContent="Source Process Token"
paddingSize="l"
initialIsOpen={true}
>
<EuiDescriptionList
type="column"
listItems={sourceProcessTokenDetailsColumns}
style={{ maxWidth: '400px' }}
/>
<EuiDescriptionList type="column" listItems={sourceProcessTokenDetailsColumns} />
</EuiAccordion>
</>
);
Expand Down
150 changes: 0 additions & 150 deletions x-pack/plugins/endpoint/server/routes/alerts.ts

This file was deleted.

0 comments on commit d38a4ac

Please sign in to comment.