Skip to content

Fix insights selection #1028

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

Merged
merged 4 commits into from
Sep 3, 2024
Merged

Fix insights selection #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9194ae1
Fix insights selection
opoliarush Sep 2, 2024
f4fa406
Update src/components/Insights/useInsightsData.ts
kshmidt-digma Sep 3, 2024
8bbe42c
Fix view
opoliarush Sep 3, 2024
07929e7
Update src/components/Insights/useInsightsData.ts
kshmidt-digma Sep 3, 2024
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
5 changes: 5 additions & 0 deletions src/components/Insights/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ export interface Method {
name: string;
}

export interface WrappedInsightData {
insightsViewMode: string;
data: InsightsData;
}

export interface InsightsData {
insights: GenericCodeObjectInsight[];
totalCount: number;
Expand Down
13 changes: 10 additions & 3 deletions src/components/Insights/useInsightsData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { InsightFilterType, ViewMode } from "./InsightsCatalog/types";
import { actions as issuesActions } from "./Issues/actions";
import { GetIssuesDataListQuery } from "./Issues/types";
import { actions } from "./actions";
import { InsightsData, InsightViewType } from "./types";
import { InsightViewType, WrappedInsightData } from "./types";

interface UseInsightsDataProps {
areFiltersRehydrated: boolean;
Expand Down Expand Up @@ -235,8 +235,15 @@ export const useInsightsData = ({
timeStamp: number,
error: DigmaMessageError | undefined
) => {
const insightsData = data as WrappedInsightData;

//Do not handle the response message if the view mode has been already changed
if (insightViewType !== insightsData.insightsViewMode) {
return;
}

if (!error) {
setData(data as InsightsData);
setData(insightsData.data);
}
setIsLoading(false);
setLastSetDataTimeStamp(timeStamp);
Expand All @@ -258,7 +265,7 @@ export const useInsightsData = ({
handleInsightsData
);
};
}, [setData, setIsLoading]);
}, [setData, setIsLoading, insightViewType]);

useEffect(() => {
if (previousLastSetDataTimeStamp !== lastSetDataTimeStamp) {
Expand Down