Skip to content

Commit c8b2234

Browse files
committed
Add days filter to the stats and filters payload
1 parent 1f38b36 commit c8b2234

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

src/components/Insights/hooks/useInsightsStats.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { useCallback, useMemo } from "react";
2+
import { getFeatureFlagValue } from "../../../featureFlags";
23
import { useGetInsightsStatsQuery } from "../../../redux/services/digma";
4+
import { useConfigSelector } from "../../../store/config/useConfigSelector";
35
import { useInsightsSelector } from "../../../store/insights/useInsightsSelector";
6+
import { FeatureFlag } from "../../../types";
47

58
const REFRESH_INTERVAL = 10 * 1000; // in milliseconds
69

@@ -15,12 +18,20 @@ export const useInsightsStats = ({
1518
environmentId,
1619
services
1720
}: UseInsightStatsProps) => {
21+
const { backendInfo } = useConfigSelector();
22+
1823
const {
1924
filteredInsightTypes: filteredInsightTypesInSpanScope,
2025
filteredInsightTypesInGlobalScope,
21-
search
26+
search,
27+
lastDays
2228
} = useInsightsSelector();
2329

30+
const isIssuesLastDaysFilterEnabled = getFeatureFlagValue(
31+
backendInfo,
32+
FeatureFlag.IsIssuesLastDaysFilterEnabled
33+
);
34+
2435
const filteredInsightTypes = spanCodeObjectId
2536
? filteredInsightTypesInSpanScope
2637
: filteredInsightTypesInGlobalScope;
@@ -39,7 +50,8 @@ export const useInsightsStats = ({
3950
: undefined,
4051
services:
4152
filteredServices.length > 0 ? filteredServices.join(",") : undefined,
42-
displayName: search.length > 0 ? search : undefined
53+
displayName: search.length > 0 ? search : undefined,
54+
lastDays: isIssuesLastDaysFilterEnabled ? lastDays : undefined
4355
},
4456
{
4557
skip: !environmentId,

src/components/Insights/hooks/useIssuesFilters.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ export const useIssuesFilters = ({ isEnabled }: UseIssuesFiltersProps) => {
2121
filteredCriticalityLevels: filteredCriticalityLevelsInSpanScope,
2222
filteredCriticalityLevelsInGlobalScope,
2323
viewMode,
24-
filters
24+
filters,
25+
lastDays
2526
} = useInsightsSelector();
2627
const { setInsightsIssuesFilters: setData } = useStore.getState();
2728
const { environment, scope, backendInfo, selectedServices } =
@@ -34,6 +35,11 @@ export const useIssuesFilters = ({ isEnabled }: UseIssuesFiltersProps) => {
3435
FeatureFlag.IsIssuesCriticalityLevelsFilterEnabled
3536
);
3637

38+
const isIssuesLastDaysFilterEnabled = getFeatureFlagValue(
39+
backendInfo,
40+
FeatureFlag.IsIssuesLastDaysFilterEnabled
41+
);
42+
3743
const payload: GetIssuesFiltersPayload = useMemo(() => {
3844
const filteredInsightTypes = spanCodeObjectId
3945
? filteredInsightTypesInSpanScope
@@ -65,7 +71,8 @@ export const useIssuesFilters = ({ isEnabled }: UseIssuesFiltersProps) => {
6571
criticalityFilter:
6672
isCriticalityLevelsFilterEnabled && filteredCriticalityLevels.length > 0
6773
? filteredCriticalityLevels
68-
: undefined
74+
: undefined,
75+
lastDays: isIssuesLastDaysFilterEnabled ? lastDays : undefined
6976
};
7077
}, [
7178
search,
@@ -78,7 +85,9 @@ export const useIssuesFilters = ({ isEnabled }: UseIssuesFiltersProps) => {
7885
filteredInsightTypesInSpanScope,
7986
filteredInsightTypesInGlobalScope,
8087
filteredCriticalityLevelsInSpanScope,
81-
filteredCriticalityLevelsInGlobalScope
88+
filteredCriticalityLevelsInGlobalScope,
89+
isIssuesLastDaysFilterEnabled,
90+
lastDays
8291
]);
8392

8493
const { data: issuesFiltersData } = useGetIssuesFiltersQuery(payload, {

src/redux/services/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,7 @@ export interface GetInsightsStatsPayload {
561561
scopedSpanCodeObjectId?: string;
562562
directOnly?: boolean;
563563
environment?: string;
564+
lastDays?: number;
564565
}
565566

566567
export interface GetInsightsStatsResponse {
@@ -604,6 +605,7 @@ export interface GetIssuesFiltersPayload {
604605
displayName?: string;
605606
showDismissed?: boolean;
606607
environment?: string;
608+
lastDays?: number;
607609
}
608610

609611
export interface IssueTypeFilter {

0 commit comments

Comments
 (0)