Skip to content

Commit ac99ee3

Browse files
authored
Merge pull request #2826 from devtron-labs/fix/k8s-list
fix: k8s list error state when filters are applied
2 parents b774fa8 + 4b29563 commit ac99ee3

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
abortPreviousRequests,
2222
ErrorScreenManager,
2323
FiltersTypeEnum,
24+
GenericFilterEmptyState,
2425
getAIAnalyticsEvents,
2526
getIsRequestAborted,
2627
LARGE_PAGE_SIZE_OPTIONS,
@@ -124,7 +125,11 @@ export const K8SResourceList = ({
124125
const { clusterId } = useParams<K8sResourceListURLParams>()
125126

126127
// STATES
127-
const { selectedNamespace = 'all', ...filters } = useUrlFilters<string, K8sResourceListFilterType>({
128+
const {
129+
selectedNamespace = 'all',
130+
clearFilters,
131+
...filters
132+
} = useUrlFilters<string, K8sResourceListFilterType>({
128133
parseSearchParams: parseK8sResourceListSearchParams,
129134
})
130135

@@ -241,11 +246,18 @@ export const K8SResourceList = ({
241246
if (resourceListError && !isResourceListLoadingWithoutNullState) {
242247
return (
243248
<div className="flexbox-col flex-grow-1 border__primary--left">
244-
<ErrorScreenManager
245-
code={(resourceListError as ServerErrors).code}
246-
reload={reloadResourceList}
247-
redirectURL={URLS.RESOURCE_BROWSER}
248-
/>
249+
{filters.areFiltersApplied ? (
250+
<GenericFilterEmptyState
251+
title={`No ${selectedResource?.gvk.Kind ?? 'Resource'} found`}
252+
handleClearFilters={clearFilters}
253+
/>
254+
) : (
255+
<ErrorScreenManager
256+
code={(resourceListError as ServerErrors).code}
257+
reload={reloadResourceList}
258+
redirectURL={URLS.RESOURCE_BROWSER}
259+
/>
260+
)}
249261
</div>
250262
)
251263
}

0 commit comments

Comments
 (0)