Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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 packages/manager/.changeset/pr-13459-fixed-1772610765361.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Fixed
---

Errors while searching for Delivery services in cloud manager ([#13459](https://github.com/linode/manager/pull/13459))
Comment thread
kagora-akamai marked this conversation as resolved.
Outdated
9 changes: 8 additions & 1 deletion packages/manager/src/features/Search/useAPISearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -119,6 +120,7 @@ const entities = [
searchOptions: {
searchableFieldsWithoutOperator: ['label'],
},
requireACLPLogsEnabled: true,
},
{
getSearchableItem: destinationToSearchableItem,
Expand All @@ -127,6 +129,7 @@ const entities = [
searchOptions: {
searchableFieldsWithoutOperator: ['label'],
},
requireACLPLogsEnabled: true,
},
];

Expand All @@ -143,6 +146,7 @@ const entities = [
*/
export const useAPISearch = ({ enabled, query }: Props) => {
const deboundedQuery = useDebouncedValue(query);
Comment thread
kagora-akamai marked this conversation as resolved.
Outdated
const { isACLPLogsEnabled } = useIsACLPLogsEnabled();

const result = entities.map((entity) => {
const { error, filter } = getAPIFilterFromQuery(
Expand All @@ -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)
),
};
});
Expand Down
6 changes: 4 additions & 2 deletions packages/manager/src/features/Search/useClientSideSearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -44,6 +45,7 @@ interface Props {
*/
export const useClientSideSearch = ({ enabled, query }: Props) => {
const { isPrivateImageSharingEnabled } = useIsPrivateImageSharingEnabled();
const { isACLPLogsEnabled } = useIsACLPLogsEnabled();

const {
data: domains,
Expand Down Expand Up @@ -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) ?? [];
Expand Down
2 changes: 2 additions & 0 deletions packages/manager/src/store/selectors/getSearchEntities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down