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.

Sign up for GitHub

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

[FEATURE] Finding flyout loading state #562

Merged
merged 7 commits into from
May 4, 2023
Merged

[FEATURE] Finding flyout loading state #562

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
732c5c4
[FEATURE] Set loading state for finding fly-out until the data is rea…
jovancvetkovic3006 Apr 27, 2023
38c98c1
Merge branch 'main' of https://github.com/opensearch-project/security…
jovancvetkovic3006 May 3, 2023
229daf3
Merge branch 'main' of https://github.com/opensearch-project/security…
jovancvetkovic3006 May 4, 2023
3b8f07c
fix tests
jovancvetkovic3006 May 4, 2023
59a2ccb
fix tests
jovancvetkovic3006 May 4, 2023
1dff957
Merge branch 'main' of https://github.com/opensearch-project/security…
jovancvetkovic3006 May 4, 2023
bfcc632
Merge branch 'main' of https://github.com/opensearch-project/security…
jovancvetkovic3006 May 4, 2023
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
51 changes: 38 additions & 13 deletions public/pages/Findings/components/FindingDetailsFlyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ interface FindingDetailsFlyoutState {
isCreateIndexPatternModalVisible: boolean;
selectedTab: { id: string; content: React.ReactNode | null };
correlatedFindings: CorrelationFinding[];
isDocumentLoading: boolean;
areCorrelationsLoading: boolean;
}

export default class FindingDetailsFlyout extends Component<
Expand All @@ -80,15 +82,21 @@ export default class FindingDetailsFlyout extends Component<
isCreateIndexPatternModalVisible: false,
selectedTab: { id: FindingFlyoutTabId.DETAILS, content: null },
correlatedFindings: [],
isDocumentLoading: true,
areCorrelationsLoading: true,
};
}

componentDidMount(): void {
this.getIndexPatternId().then((patternId) => {
if (patternId) {
this.setState({ indexPatternId: patternId });
}
});
this.getIndexPatternId()
.then((patternId) => {
if (patternId) {
this.setState({ indexPatternId: patternId });
}
})
.finally(() => {
this.setState({ isDocumentLoading: false });
});

const { id, detector } = this.props.finding;
const allFindings = this.props.findings;
Expand All @@ -106,6 +114,9 @@ export default class FindingDetailsFlyout extends Component<
});
this.setState({ correlatedFindings });
}
})
.finally(() => {
this.setState({ areCorrelationsLoading: false });
});

this.setState({
Expand Down Expand Up @@ -246,7 +257,7 @@ export default class FindingDetailsFlyout extends Component<
return patternId;
};

renderFindingDocuments() {
renderFindingDocuments(isDocumentLoading: boolean) {
const {
finding: { index, document_list, related_doc_ids },
} = this.props;
Expand All @@ -266,6 +277,7 @@ export default class FindingDetailsFlyout extends Component<
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
isLoading={isDocumentLoading}
data-test-subj={'finding-details-flyout-view-surrounding-documents'}
onClick={() => {
if (indexPatternId) {
Expand Down Expand Up @@ -361,13 +373,17 @@ export default class FindingDetailsFlyout extends Component<
}
}

private getTabContent(tabId: FindingFlyoutTabId) {
private getTabContent(
tabId: FindingFlyoutTabId,
isDocumentLoading = false,
areCorrelationsLoading = false
) {
switch (tabId) {
case FindingFlyoutTabId.CORRELATIONS:
return this.createCorrelationsTable();
return this.createCorrelationsTable(areCorrelationsLoading);
case FindingFlyoutTabId.DETAILS:
default:
return this.createFindingDetails();
return this.createFindingDetails(isDocumentLoading);
}
}

Expand All @@ -384,7 +400,7 @@ export default class FindingDetailsFlyout extends Component<
});
};

private createCorrelationsTable() {
private createCorrelationsTable(areCorrelationsLoading: boolean) {
const columns: EuiBasicTableColumn<CorrelationFinding>[] = [
{
field: 'timestamp',
Expand Down Expand Up @@ -441,14 +457,15 @@ export default class FindingDetailsFlyout extends Component<
pagination={true}
search={true}
sorting={true}
loading={areCorrelationsLoading}
/>
</EuiFlexItem>
</EuiFlexGroup>
</>
);
}

private createFindingDetails() {
private createFindingDetails(isDocumentLoading: boolean) {
const {
finding: { queries },
} = this.props;
Expand All @@ -461,7 +478,7 @@ export default class FindingDetailsFlyout extends Component<
<EuiSpacer size={'m'} />
{this.renderRuleDetails(queries)}
<EuiSpacer size="l" />
{this.renderFindingDocuments()}
{this.renderFindingDocuments(isDocumentLoading)}
</>
);
}
Expand All @@ -478,6 +495,7 @@ export default class FindingDetailsFlyout extends Component<
timestamp,
},
} = this.props;
const { isDocumentLoading, areCorrelationsLoading } = this.state;
return (
<EuiFlyout
onClose={closeFlyout}
Expand Down Expand Up @@ -558,7 +576,14 @@ export default class FindingDetailsFlyout extends Component<
isSelected={tab.id === this.state.selectedTab.id}
onClick={() => {
this.setState({
selectedTab: { id: tab.id, content: this.getTabContent(tab.id) },
selectedTab: {
id: tab.id,
content: this.getTabContent(
tab.id,
isDocumentLoading,
areCorrelationsLoading
),
},
});
}}
>
Expand Down