diff --git a/package.json b/package.json index e41666b00b..2da04a40cb 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.23.3", + "@devtron-labs/devtron-fe-common-lib": "1.23.4", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/src/components/app/list/DevtronAppListContainer.tsx b/src/components/app/list/DevtronAppListContainer.tsx index 7de430f24b..1cafb920b0 100644 --- a/src/components/app/list/DevtronAppListContainer.tsx +++ b/src/components/app/list/DevtronAppListContainer.tsx @@ -126,6 +126,7 @@ const DevtronAppList = ({ clearAllFilters, isArgoInstalled, setAppCount, + appFiltersResponseLoading, }: DevtronAppListProps) => { const [noRows, setNoRows] = useState(false) @@ -152,6 +153,13 @@ const DevtronAppList = ({ const getRows = useCallback( async (_, signal) => { + if (appFiltersResponseLoading) { + return { + rows: [], + totalRows: 0, + } + } + updateDataSyncing(true) const data = await getAppList(getDevtronAppListPayload(filterConfig, environmentList, namespaceList), { signal, @@ -181,7 +189,7 @@ const DevtronAppList = ({ totalRows: totalCount, } }, - [syncListData, filterConfig], + [syncListData, filterConfig, appFiltersResponseLoading], ) const onClearFilters = () => { @@ -209,6 +217,7 @@ const DevtronAppList = ({ id="table__devtron-app-list" getRows={getRows} + loading={appFiltersResponseLoading} paginationVariant={PaginationEnum.PAGINATED} filtersVariant={FiltersTypeEnum.URL} columns={columns} diff --git a/src/components/app/list/NameCellComponent.tsx b/src/components/app/list/NameCellComponent.tsx index 24eb8a3d94..3a105d9135 100644 --- a/src/components/app/list/NameCellComponent.tsx +++ b/src/components/app/list/NameCellComponent.tsx @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom' import DOMPurify from 'dompurify' import { @@ -5,8 +6,10 @@ import { FiltersTypeEnum, highlightSearchText, statusColor, + stopPropagation, TableCellComponentProps, Tooltip, + URLS, } from '@devtron-labs/devtron-fe-common-lib' import { App, Environment, TableAdditionalPropsType } from './types' @@ -31,14 +34,16 @@ export const NameCellComponent = ({ const app = data as App - const { name } = app + const { name, id } = app return (
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */} -