Skip to content

Added refresh for assets #633

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 2 commits into from
Mar 6, 2024
Merged

Added refresh for assets #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86feec7
add refresh for assets
opoliarush Mar 6, 2024
df3d721
Update src/components/Assets/index.tsx
kshmidt-digma Mar 6, 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
131 changes: 62 additions & 69 deletions src/components/Assets/AssetList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { useContext, useEffect, useMemo, useRef, useState } from "react";
import {
useCallback,
useContext,
useEffect,
useMemo,
useRef,
useState
} from "react";
import { DefaultTheme, useTheme } from "styled-components";
import { dispatcher } from "../../../dispatcher";
import { getFeatureFlagValue } from "../../../featureFlags";
Expand Down Expand Up @@ -196,16 +203,6 @@ export const AssetList = (props: AssetListProps) => {
const previousServices = usePrevious(props.services);
const previousFilters = usePrevious(props.filters);
const previousViewScope = usePrevious(props.scopeViewOptions);

const entries = data?.data || [];

const assetTypeInfo = getAssetTypeInfo(props.assetTypeId);

const isOverallImpactHidden = getFeatureFlagValue(
config,
FeatureFlag.IS_ASSETS_OVERALL_IMPACT_HIDDEN
);

const isComplexFilterEnabled = useMemo(
() =>
Boolean(
Expand All @@ -217,6 +214,39 @@ export const AssetList = (props: AssetListProps) => {
[config]
);

const refreshData = useCallback(() => {
getData(
props.assetTypeId,
page,
sorting,
props.searchQuery,
props.filters,
props.services,
isComplexFilterEnabled,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId
);
}, [
isComplexFilterEnabled,
page,
props.assetTypeId,
props.filters,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId,
props.searchQuery,
props.services,
sorting
]);

const entries = data?.data || [];

const assetTypeInfo = getAssetTypeInfo(props.assetTypeId);

const isOverallImpactHidden = getFeatureFlagValue(
config,
FeatureFlag.IS_ASSETS_OVERALL_IMPACT_HIDDEN
);

const areAnyFiltersApplied = checkIfAnyFiltersApplied(
isComplexFilterEnabled,
props.filters,
Expand All @@ -231,17 +261,11 @@ export const AssetList = (props: AssetListProps) => {
: Object.values(SORTING_CRITERION);

useEffect(() => {
getData(
props.assetTypeId,
page,
sorting,
props.searchQuery,
props.filters,
props.services,
isComplexFilterEnabled,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId
);
props.setRefresher(refreshData);
}, [refreshData]);

useEffect(() => {
refreshData();
setIsInitialLoading(true);

const handleAssetsData = (data: unknown, timeStamp: number) => {
Expand Down Expand Up @@ -273,67 +297,36 @@ export const AssetList = (props: AssetListProps) => {
(previousFilters && previousFilters !== props.filters) ||
previousViewScope !== props.scopeViewOptions
) {
getData(
props.assetTypeId,
page,
sorting,
props.searchQuery,
props.filters,
props.services,
isComplexFilterEnabled,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId
);
refreshData();
}
}, [
props.assetTypeId,
previousAssetTypeId,
previousSearchQuery,
props.searchQuery,
previousSorting,
sorting,
previousPage,
config.environment?.originalName,
page,
previousAssetTypeId,
previousEnvironment,
config.environment,
props.services,
previousServices,
props.filters,
previousFilters,
isComplexFilterEnabled,
previousPage,
previousSearchQuery,
previousServices,
previousSorting,
previousViewScope,
props.scopeViewOptions
props.assetTypeId,
props.filters,
props.scopeViewOptions,
props.searchQuery,
props.services,
refreshData,
sorting
]);

useEffect(() => {
if (previousLastSetDataTimeStamp !== lastSetDataTimeStamp) {
window.clearTimeout(refreshTimerId.current);
refreshTimerId.current = window.setTimeout(() => {
getData(
props.assetTypeId,
page,
sorting,
props.searchQuery,
props.filters,
props.services,
isComplexFilterEnabled,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId
);
refreshData();
}, REFRESH_INTERVAL);
}
}, [
lastSetDataTimeStamp,
previousLastSetDataTimeStamp,
props.assetTypeId,
page,
sorting,
props.searchQuery,
props.services,
props.filters,
isComplexFilterEnabled,
props.scopeViewOptions
]);
}, [lastSetDataTimeStamp, previousLastSetDataTimeStamp, refreshData]);

useEffect(() => {
if (props.data) {
Expand Down
1 change: 1 addition & 0 deletions src/components/Assets/AssetList/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export interface AssetListProps {
filters?: AssetFilterQuery;
searchQuery: string;
scopeViewOptions: AssetScopeOption | null;
setRefresher: (refresher: () => void) => void;
}

export enum SORTING_CRITERION {
Expand Down
85 changes: 43 additions & 42 deletions src/components/Assets/AssetTypeList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { useContext, useEffect, useMemo, useRef, useState } from "react";
import {
useCallback,
useContext,
useEffect,
useMemo,
useRef,
useState
} from "react";
import { dispatcher } from "../../../dispatcher";
import { getFeatureFlagValue } from "../../../featureFlags";
import { usePrevious } from "../../../hooks/usePrevious";
Expand Down Expand Up @@ -69,7 +76,6 @@ export const AssetTypeList = (props: AssetTypeListProps) => {
const previousFilters = usePrevious(props.filters);
const previousSearchQuery = usePrevious(props.searchQuery);
const previousViewScope = usePrevious(props.scopeViewOptions);

const isComplexFilterEnabled = useMemo(
() =>
Boolean(
Expand All @@ -81,6 +87,30 @@ export const AssetTypeList = (props: AssetTypeListProps) => {
[config]
);

const refreshData = useCallback(
() =>
getData(
props.filters,
props.services,
props.searchQuery,
isComplexFilterEnabled,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId
),
[
isComplexFilterEnabled,
props.filters,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId,
props.searchQuery,
props.services
]
);

useEffect(() => {
props.setRefresher(refreshData);
}, [refreshData]);

const areAnyFiltersApplied = checkIfAnyFiltersApplied(
isComplexFilterEnabled,
props.filters,
Expand All @@ -89,14 +119,7 @@ export const AssetTypeList = (props: AssetTypeListProps) => {
);

useEffect(() => {
getData(
props.filters,
props.services,
props.searchQuery,
isComplexFilterEnabled,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId
);
refreshData();
setIsInitialLoading(true);

const handleCategoriesData = (data: unknown, timeStamp: number) => {
Expand Down Expand Up @@ -130,52 +153,30 @@ export const AssetTypeList = (props: AssetTypeListProps) => {
previousSearchQuery !== props.searchQuery) ||
previousViewScope !== props.scopeViewOptions
) {
getData(
props.filters,
props.services,
props.searchQuery,
isComplexFilterEnabled,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId
);
refreshData();
}
}, [
config.environment?.originalName,
previousEnvironment,
config.environment,
previousServices,
props.services,
previousFilters,
props.filters,
previousSearchQuery,
props.searchQuery,
isComplexFilterEnabled,
previousServices,
previousViewScope,
props.filters,
props.scopeViewOptions,
previousViewScope
props.searchQuery,
props.services,
refreshData
]);

useEffect(() => {
if (previousLastSetDataTimeStamp !== lastSetDataTimeStamp) {
window.clearTimeout(refreshTimerId.current);
refreshTimerId.current = window.setTimeout(() => {
getData(
props.filters,
props.services,
props.searchQuery,
isComplexFilterEnabled,
props.scopeViewOptions?.isDirect,
props.scopeViewOptions?.scopedSpanCodeObjectId
);
refreshData();
}, REFRESH_INTERVAL);
}
}, [
props.services,
previousLastSetDataTimeStamp,
lastSetDataTimeStamp,
props.filters,
props.searchQuery,
isComplexFilterEnabled,
props.scopeViewOptions
]);
}, [lastSetDataTimeStamp, previousLastSetDataTimeStamp, refreshData]);

useEffect(() => {
if (props.data) {
Expand Down
1 change: 1 addition & 0 deletions src/components/Assets/AssetTypeList/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export interface AssetTypeListProps {
filters?: AssetFilterQuery;
searchQuery: string;
scopeViewOptions: AssetScopeOption | null;
setRefresher: (refresher: () => void) => void;
}

export interface AssetCategoriesData {
Expand Down
Loading