Skip to content

Make service filter global #980

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 1 commit into from
Aug 20, 2024
Merged

Make service filter global #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 12 additions & 20 deletions src/components/Assets/AssetList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const getData = (
page: number,
sorting: Sorting,
searchQuery: string,
filters: AssetFilterQuery | undefined,
filters: AssetFilterQuery = { services: [], operations: [], insights: [] },
isDirect?: boolean,
scopedSpanCodeObjectId?: string
) => {
Expand All @@ -116,14 +116,8 @@ const getData = (
sortOrder: sorting.order,
directOnly: isDirect,
scopedSpanCodeObjectId,
...(searchQuery && searchQuery.length > 0
? { displayName: searchQuery }
: {}),
...(filters ?? {
services: [],
operations: [],
insights: []
})
...(searchQuery.length > 0 ? { displayName: searchQuery } : {}),
...(scopedSpanCodeObjectId ? { ...filters, services: [] } : filters)
}
}
});
Expand All @@ -140,7 +134,6 @@ export const AssetList = ({
}: AssetListProps) => {
const [data, setData] = useState<AssetsData>();
const previousData = usePrevious(data);
const [isInitialLoading, setIsInitialLoading] = useState(false);
const [lastSetDataTimeStamp, setLastSetDataTimeStamp] = useState<number>();
const previousLastSetDataTimeStamp = usePrevious(lastSetDataTimeStamp);
const [sorting, setSorting] = useState<Sorting>({
Expand All @@ -164,6 +157,8 @@ export const AssetList = ({
const refreshTimerId = useRef<number>();
const previousEnvironment = usePrevious(environment);
const previousViewScope = usePrevious(scopeViewOptions);
const scope = useGlobalStore.use.scope();
const isServicesFilterEnabled = !scope?.span?.spanCodeObjectId;

const refreshData = useCallback(() => {
getData(
Expand Down Expand Up @@ -196,13 +191,16 @@ export const AssetList = ({

const sortingCriteria = getSortingCriteria(isImpactHidden);

const areAnyFiltersApplied = checkIfAnyFiltersApplied(filters, searchQuery);
const areAnyFiltersApplied = checkIfAnyFiltersApplied(
filters,
searchQuery,
isServicesFilterEnabled
);

const isInitialLoading = !data;

useEffect(() => {
refreshData();
if (!data) {
setIsInitialLoading(true);
}
}, [refreshData]);

useEffect(() => {
Expand Down Expand Up @@ -260,12 +258,6 @@ export const AssetList = ({
}
}, [lastSetDataTimeStamp, previousLastSetDataTimeStamp, refreshData]);

useEffect(() => {
if (!previousData && data) {
setIsInitialLoading(false);
}
}, [previousData, data]);

useEffect(() => {
if (
isImpactHidden &&
Expand Down
28 changes: 15 additions & 13 deletions src/components/Assets/AssetTypeList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const ASSET_TYPE_IDS = [
];

const getData = (
filters: AssetFilterQuery | undefined,
filters: AssetFilterQuery = { services: [], operations: [], insights: [] },
searchQuery: string,
isDirect?: boolean,
scopedSpanCodeObjectId?: string
Expand All @@ -42,7 +42,12 @@ const getData = (
query: {
directOnly: isDirect,
scopedSpanCodeObjectId,
...(filters ?? { services: [], operations: [], insights: [] }),
...(scopedSpanCodeObjectId
? {
...filters,
services: []
}
: filters),
...(searchQuery.length > 0 ? { displayName: searchQuery } : {})
}
}
Expand All @@ -64,13 +69,15 @@ export const AssetTypeList = ({
const previousData = usePrevious(data);
const [lastSetDataTimeStamp, setLastSetDataTimeStamp] = useState<number>();
const previousLastSetDataTimeStamp = usePrevious(lastSetDataTimeStamp);
const [isInitialLoading, setIsInitialLoading] = useState(false);
const scope = useGlobalStore.use.scope();
const environment = useGlobalStore.use.environment();
const previousEnvironment = usePrevious(environment);
const refreshTimerId = useRef<number>();
const previousSearchQuery = usePrevious(searchQuery);
const previousViewScope = usePrevious(scopeViewOptions);
const isServicesFilterEnabled = !scope?.span?.spanCodeObjectId;

const isInitialLoading = !data;

const refreshData = useCallback(
() =>
Expand All @@ -92,13 +99,14 @@ export const AssetTypeList = ({
setRefresher(refreshData);
}, [refreshData, setRefresher]);

const areAnyFiltersApplied = checkIfAnyFiltersApplied(filters, searchQuery);
const areAnyFiltersApplied = checkIfAnyFiltersApplied(
filters,
searchQuery,
isServicesFilterEnabled
);

useEffect(() => {
refreshData();
if (!data) {
setIsInitialLoading(true);
}
}, [refreshData]);

useEffect(() => {
Expand Down Expand Up @@ -161,12 +169,6 @@ export const AssetTypeList = ({
}
}, [lastSetDataTimeStamp, previousLastSetDataTimeStamp, refreshData]);

useEffect(() => {
if (!previousData && data) {
setIsInitialLoading(false);
}
}, [previousData, data]);

const handleAssetTypeClick = (assetTypeId: string) => {
onAssetTypeSelect(assetTypeId);
};
Expand Down
Loading