From adbeb0116396bb853f7973fdc15b23ed2ae88f53 Mon Sep 17 00:00:00 2001 From: kagora Date: Wed, 4 Mar 2026 08:32:09 +0100 Subject: [PATCH 1/4] fix: [DPS-41226][CMJPOC-7] - Errors while searching for services in cloud manager --- packages/manager/src/features/Search/useAPISearch.ts | 9 ++++++++- .../manager/src/features/Search/useClientSideSearch.ts | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/manager/src/features/Search/useAPISearch.ts b/packages/manager/src/features/Search/useAPISearch.ts index 9c225c188d3..6504e200ee0 100644 --- a/packages/manager/src/features/Search/useAPISearch.ts +++ b/packages/manager/src/features/Search/useAPISearch.ts @@ -13,6 +13,7 @@ import { import { getAPIFilterFromQuery } from '@linode/search'; import { useDebouncedValue } from '@linode/utilities'; +import { useIsACLPLogsEnabled } from 'src/features/Delivery/deliveryUtils'; import { useKubernetesClustersInfiniteQuery } from 'src/queries/kubernetes'; import { databaseToSearchableItem, @@ -119,6 +120,7 @@ const entities = [ searchOptions: { searchableFieldsWithoutOperator: ['label'], }, + requireACLPLogsEnabled: true, }, { getSearchableItem: destinationToSearchableItem, @@ -127,6 +129,7 @@ const entities = [ searchOptions: { searchableFieldsWithoutOperator: ['label'], }, + requireACLPLogsEnabled: true, }, ]; @@ -143,6 +146,7 @@ const entities = [ */ export const useAPISearch = ({ enabled, query }: Props) => { const deboundedQuery = useDebouncedValue(query); + const { isACLPLogsEnabled } = useIsACLPLogsEnabled(); const result = entities.map((entity) => { const { error, filter } = getAPIFilterFromQuery( @@ -155,7 +159,10 @@ export const useAPISearch = ({ enabled, query }: Props) => { parseError: error, ...entity.query( entity.baseFilter ? { ...entity.baseFilter, ...filter } : filter, - enabled && error === null && Boolean(deboundedQuery) + enabled && + error === null && + Boolean(deboundedQuery) && + (!entity.requireACLPLogsEnabled || isACLPLogsEnabled) ), }; }); diff --git a/packages/manager/src/features/Search/useClientSideSearch.ts b/packages/manager/src/features/Search/useClientSideSearch.ts index a96a6d99856..3f86b7584ac 100644 --- a/packages/manager/src/features/Search/useClientSideSearch.ts +++ b/packages/manager/src/features/Search/useClientSideSearch.ts @@ -11,6 +11,7 @@ import { useAllVolumesQuery, } from '@linode/queries'; +import { useIsACLPLogsEnabled } from 'src/features/Delivery/deliveryUtils'; import { useAllKubernetesClustersQuery } from 'src/queries/kubernetes'; import { useObjectStorageBuckets } from 'src/queries/object-storage/queries'; import { @@ -44,6 +45,7 @@ interface Props { */ export const useClientSideSearch = ({ enabled, query }: Props) => { const { isPrivateImageSharingEnabled } = useIsPrivateImageSharingEnabled(); + const { isACLPLogsEnabled } = useIsACLPLogsEnabled(); const { data: domains, @@ -96,12 +98,12 @@ export const useClientSideSearch = ({ enabled, query }: Props) => { data: streams, error: streamsError, isLoading: streamsLoading, - } = useAllStreamsQuery({}, {}, enabled); + } = useAllStreamsQuery({}, {}, enabled && isACLPLogsEnabled); const { data: destinations, error: destinationsError, isLoading: destinationsLoading, - } = useAllDestinationsQuery({}, {}, enabled); + } = useAllDestinationsQuery({}, {}, enabled && isACLPLogsEnabled); const searchableDomains = domains?.map(domainToSearchableItem) ?? []; const searchableVolumes = volumes?.map(volumeToSearchableItem) ?? []; From d891d140a150749b8ba2609627713803a50e3d03 Mon Sep 17 00:00:00 2001 From: kagora Date: Wed, 4 Mar 2026 08:52:45 +0100 Subject: [PATCH 2/4] Added changeset: Errors while searching for Delivery services in cloud manager --- packages/manager/.changeset/pr-13459-fixed-1772610765361.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/manager/.changeset/pr-13459-fixed-1772610765361.md diff --git a/packages/manager/.changeset/pr-13459-fixed-1772610765361.md b/packages/manager/.changeset/pr-13459-fixed-1772610765361.md new file mode 100644 index 00000000000..590aa1c9d47 --- /dev/null +++ b/packages/manager/.changeset/pr-13459-fixed-1772610765361.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Fixed +--- + +Errors while searching for Delivery services in cloud manager ([#13459](https://github.com/linode/manager/pull/13459)) From b0c82f2b300e615bc01829d4a28ff20f6d65faf2 Mon Sep 17 00:00:00 2001 From: kagora Date: Thu, 5 Mar 2026 10:40:25 +0100 Subject: [PATCH 3/4] DPS-41266 add created date to search results --- packages/manager/src/store/selectors/getSearchEntities.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/manager/src/store/selectors/getSearchEntities.ts b/packages/manager/src/store/selectors/getSearchEntities.ts index 2de80d2cad4..a6a30f838e8 100644 --- a/packages/manager/src/store/selectors/getSearchEntities.ts +++ b/packages/manager/src/store/selectors/getSearchEntities.ts @@ -215,6 +215,7 @@ export const streamToSearchableItem = (stream: Stream): SearchableItem => ({ description: getStreamDescription(stream), path: `/logs/delivery/streams/${stream.id}/edit`, status: stream.status, + created: stream.created, }, entityType: 'stream', label: stream.label, @@ -227,6 +228,7 @@ export const destinationToSearchableItem = ( data: { description: getDestinationDescription(destination), path: `/logs/delivery/destinations/${destination.id}/edit`, + created: destination.created, }, entityType: 'destination', label: destination.label, From e38c8910bd9783e5274999f9f4d03c97f81e3bb6 Mon Sep 17 00:00:00 2001 From: kagora Date: Mon, 9 Mar 2026 09:17:16 +0100 Subject: [PATCH 4/4] CR changes 1 --- packages/manager/.changeset/pr-13459-fixed-1772610765361.md | 2 +- packages/manager/src/features/Search/useAPISearch.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/manager/.changeset/pr-13459-fixed-1772610765361.md b/packages/manager/.changeset/pr-13459-fixed-1772610765361.md index 590aa1c9d47..a7ecf54bc4c 100644 --- a/packages/manager/.changeset/pr-13459-fixed-1772610765361.md +++ b/packages/manager/.changeset/pr-13459-fixed-1772610765361.md @@ -2,4 +2,4 @@ "@linode/manager": Fixed --- -Errors while searching for Delivery services in cloud manager ([#13459](https://github.com/linode/manager/pull/13459)) +Unnecessary API requests for Delivery services while searching when feature access is not present ([#13459](https://github.com/linode/manager/pull/13459)) diff --git a/packages/manager/src/features/Search/useAPISearch.ts b/packages/manager/src/features/Search/useAPISearch.ts index 6504e200ee0..53520e6b928 100644 --- a/packages/manager/src/features/Search/useAPISearch.ts +++ b/packages/manager/src/features/Search/useAPISearch.ts @@ -145,12 +145,12 @@ const entities = [ * and do the filtering client-side. */ export const useAPISearch = ({ enabled, query }: Props) => { - const deboundedQuery = useDebouncedValue(query); + const debouncedQuery = useDebouncedValue(query); const { isACLPLogsEnabled } = useIsACLPLogsEnabled(); const result = entities.map((entity) => { const { error, filter } = getAPIFilterFromQuery( - deboundedQuery, + debouncedQuery, entity.searchOptions ); @@ -161,7 +161,7 @@ export const useAPISearch = ({ enabled, query }: Props) => { entity.baseFilter ? { ...entity.baseFilter, ...filter } : filter, enabled && error === null && - Boolean(deboundedQuery) && + Boolean(debouncedQuery) && (!entity.requireACLPLogsEnabled || isACLPLogsEnabled) ), };