Skip to content

fix: remove app list filter empty state on clear search #3080

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
AbhishekA1509 merged 1 commit into from
Mar 24, 2026
Merged

fix: remove app list filter empty state on clear search #3080

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
81 changes: 47 additions & 34 deletions src/components/app/list/DevtronAppListContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
PaginationEnum,
Table,
TableRowActionsOnHoverComponentProps,
TableViewWrapperProps,
URLS as CommonURLS,
} from '@devtron-labs/devtron-fe-common-lib'

Expand Down Expand Up @@ -73,6 +74,49 @@ const HoverComponent = ({ row: { data } }: TableRowActionsOnHoverComponentProps<
)
}

const renderGuidedCards = () => (
<div className="devtron-app-guided-cards-container">
<h2 className="fs-24 fw-6 lh-32 m-0 pt-40 dc__align-center">Create your first application</h2>
<div className="devtron-app-guided-cards-wrapper">
<ContentCard
datatestid="deploy-basic-k8snode"
redirectTo={DEVTRON_NODE_DEPLOY_VIDEO}
isExternalRedirect
imgSrc={NodeAppThumbnail}
title={HELM_GUIDED_CONTENT_CARDS_TEXTS.WatchVideo.title}
linkText={HELM_GUIDED_CONTENT_CARDS_TEXTS.WatchVideo.linkText}
LinkIcon={PlayMedia}
linkIconClass="scb-5 mr-8"
linkIconPlacement={CardLinkIconPlacement.BeforeLink}
/>
<ContentCard
datatestid="create-application"
redirectTo={CommonURLS.APPLICATION_MANAGEMENT_CREATE_DEVTRON_APP}
rootClassName="ev-5"
imgSrc={DeployCICD}
title={HELM_GUIDED_CONTENT_CARDS_TEXTS.StackManager.title}
linkText={HELM_GUIDED_CONTENT_CARDS_TEXTS.StackManager.createLintText}
LinkIcon={ArrowRight}
linkIconClass="scb-5"
linkIconPlacement={CardLinkIconPlacement.AfterLinkApart}
/>
</div>
</div>
)

const ViewWrapper = ({
children,
noRows,
isSearchOrFilterApplied,
}: TableViewWrapperProps<App | Environment, FiltersTypeEnum.URL, TableAdditionalPropsType>) => {
if (noRows && !isSearchOrFilterApplied) {
return renderGuidedCards()
}

// eslint-disable-next-line react/jsx-no-useless-fragment
return <>{children}</>
Comment thread
AbhishekA1509 marked this conversation as resolved.
}

const DevtronAppList = ({
filterConfig,
environmentList,
Expand Down Expand Up @@ -106,36 +150,6 @@ const DevtronAppList = ({
return `${URLS.APPLICATION_MANAGEMENT_APP}/${app.id}/trigger`
}

const renderGuidedCards = () => (
<div className="devtron-app-guided-cards-container">
<h2 className="fs-24 fw-6 lh-32 m-0 pt-40 dc__align-center">Create your first application</h2>
<div className="devtron-app-guided-cards-wrapper">
<ContentCard
datatestid="deploy-basic-k8snode"
redirectTo={DEVTRON_NODE_DEPLOY_VIDEO}
isExternalRedirect
imgSrc={NodeAppThumbnail}
title={HELM_GUIDED_CONTENT_CARDS_TEXTS.WatchVideo.title}
linkText={HELM_GUIDED_CONTENT_CARDS_TEXTS.WatchVideo.linkText}
LinkIcon={PlayMedia}
linkIconClass="scb-5 mr-8"
linkIconPlacement={CardLinkIconPlacement.BeforeLink}
/>
<ContentCard
datatestid="create-application"
redirectTo={CommonURLS.APPLICATION_MANAGEMENT_CREATE_DEVTRON_APP}
rootClassName="ev-5"
imgSrc={DeployCICD}
title={HELM_GUIDED_CONTENT_CARDS_TEXTS.StackManager.title}
linkText={HELM_GUIDED_CONTENT_CARDS_TEXTS.StackManager.createLintText}
LinkIcon={ArrowRight}
linkIconClass="scb-5"
linkIconPlacement={CardLinkIconPlacement.AfterLinkApart}
/>
</div>
</div>
)

const getRows = useCallback(
async (_, signal) => {
updateDataSyncing(true)
Expand Down Expand Up @@ -191,10 +205,6 @@ const DevtronAppList = ({

const columns = useMemo(() => getTableColumns(isArgoInstalled), [isArgoInstalled])

if (noRows && !isSearchOrFilterApplied) {
return renderGuidedCards()
}

return (
<Table<App | Environment, FiltersTypeEnum.URL, TableAdditionalPropsType>
id="table__devtron-app-list"
Expand All @@ -208,6 +218,8 @@ const DevtronAppList = ({
}}
additionalProps={{
filterConfig,
noRows,
isSearchOrFilterApplied,
}}
additionalFilterProps={{
initialSortKey: AppListSortableKeys.APP_NAME,
Expand All @@ -225,6 +237,7 @@ const DevtronAppList = ({
size: 18,
}}
onRowClick={onRowClick}
ViewWrapper={ViewWrapper}
/>
)
}
Expand Down
5 changes: 4 additions & 1 deletion src/components/app/list/types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,7 @@ export interface GetEnvironmentsFromClusterNamespaceProps {
namespaceList: EnvironmentListHelmResult[]
}

export interface TableAdditionalPropsType extends Pick<DevtronAppListProps, 'filterConfig'> {}
export interface TableAdditionalPropsType extends Pick<DevtronAppListProps, 'filterConfig'> {
noRows: boolean
isSearchOrFilterApplied: boolean
}
Loading