From 829bb77107905a9acb1a1b998575f35846d11e9e Mon Sep 17 00:00:00 2001
From: Keith Chong <kykchong@redhat.com>
Date: Fri, 17 Jul 2026 11:22:37 -0400
Subject: [PATCH 1/5] Externalize strings

Signed-off-by: Keith Chong <kykchong@redhat.com>
---
 locales/en/plugin__gitops-plugin.json              |  4 +++-
 locales/ja/plugin__gitops-plugin.json              |  4 +++-
 locales/ko/plugin__gitops-plugin.json              |  4 +++-
 locales/zh/plugin__gitops-plugin.json              |  4 +++-
 .../application/ApplicationResourcesView.tsx       | 14 +++++++-------
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/locales/en/plugin__gitops-plugin.json b/locales/en/plugin__gitops-plugin.json
index b532aea5a..d9117e16c 100644
--- a/locales/en/plugin__gitops-plugin.json
+++ b/locales/en/plugin__gitops-plugin.json
@@ -32,6 +32,8 @@
   "Name": "Name",
   "Namespace": "Namespace",
   "Sync Wave": "Sync Wave",
+  "No Sync Status": "No Sync Status",
+  "None": "None",
   "Kind": "Kind",
   "Type": "Type",
   "Repository": "Repository",
@@ -284,7 +286,6 @@
   "Create Rollout": "Create Rollout",
   "Pods": "Pods",
   "Selector": "Selector",
-  "No labels": "No labels",
   "Rollout Status": "Rollout Status",
   "Revisions": "Revisions",
   "There was an error retrieving the rollout. Check your connection and reload the page.": "There was an error retrieving the rollout. Check your connection and reload the page.",
@@ -322,6 +323,7 @@
   "There was an error retrieving applicationsets. Check your connection and reload the page.": "There was an error retrieving applicationsets. Check your connection and reload the page.",
   "ApplicationSets": "ApplicationSets",
   "Create ApplicationSet": "Create ApplicationSet",
+  "No labels": "No labels",
   "Name must be unique within a namespace.": "Name must be unique within a namespace.",
   "Namespace defines the space within which each name must be unique.": "Namespace defines the space within which each name must be unique.",
   "Map of string keys and values that can be used to organize and categorize (scope and select) objects.": "Map of string keys and values that can be used to organize and categorize (scope and select) objects.",
diff --git a/locales/ja/plugin__gitops-plugin.json b/locales/ja/plugin__gitops-plugin.json
index 9bf0165f9..e30d7c626 100644
--- a/locales/ja/plugin__gitops-plugin.json
+++ b/locales/ja/plugin__gitops-plugin.json
@@ -32,6 +32,8 @@
   "Name": "Name",
   "Namespace": "Namespace",
   "Sync Wave": "Sync Wave",
+  "No Sync Status": "No Sync Status",
+  "None": "None",
   "Kind": "Kind",
   "Type": "Type",
   "Repository": "Repository",
@@ -284,7 +286,6 @@
   "Create Rollout": "Create Rollout",
   "Pods": "Pods",
   "Selector": "Selector",
-  "No labels": "No labels",
   "Rollout Status": "Rollout Status",
   "Revisions": "Revisions",
   "There was an error retrieving the rollout. Check your connection and reload the page.": "There was an error retrieving the rollout. Check your connection and reload the page.",
@@ -322,6 +323,7 @@
   "There was an error retrieving applicationsets. Check your connection and reload the page.": "There was an error retrieving applicationsets. Check your connection and reload the page.",
   "ApplicationSets": "ApplicationSets",
   "Create ApplicationSet": "Create ApplicationSet",
+  "No labels": "No labels",
   "Name must be unique within a namespace.": "Name must be unique within a namespace.",
   "Namespace defines the space within which each name must be unique.": "Namespace defines the space within which each name must be unique.",
   "Map of string keys and values that can be used to organize and categorize (scope and select) objects.": "Map of string keys and values that can be used to organize and categorize (scope and select) objects.",
diff --git a/locales/ko/plugin__gitops-plugin.json b/locales/ko/plugin__gitops-plugin.json
index b23d99ce1..84efc1ccc 100644
--- a/locales/ko/plugin__gitops-plugin.json
+++ b/locales/ko/plugin__gitops-plugin.json
@@ -32,6 +32,8 @@
   "Name": "Name",
   "Namespace": "Namespace",
   "Sync Wave": "Sync Wave",
+  "No Sync Status": "No Sync Status",
+  "None": "None",
   "Kind": "Kind",
   "Type": "Type",
   "Repository": "Repository",
@@ -284,7 +286,6 @@
   "Create Rollout": "Create Rollout",
   "Pods": "Pods",
   "Selector": "Selector",
-  "No labels": "No labels",
   "Rollout Status": "Rollout Status",
   "Revisions": "Revisions",
   "There was an error retrieving the rollout. Check your connection and reload the page.": "There was an error retrieving the rollout. Check your connection and reload the page.",
@@ -322,6 +323,7 @@
   "There was an error retrieving applicationsets. Check your connection and reload the page.": "There was an error retrieving applicationsets. Check your connection and reload the page.",
   "ApplicationSets": "ApplicationSets",
   "Create ApplicationSet": "Create ApplicationSet",
+  "No labels": "No labels",
   "Name must be unique within a namespace.": "Name must be unique within a namespace.",
   "Namespace defines the space within which each name must be unique.": "Namespace defines the space within which each name must be unique.",
   "Map of string keys and values that can be used to organize and categorize (scope and select) objects.": "Map of string keys and values that can be used to organize and categorize (scope and select) objects.",
diff --git a/locales/zh/plugin__gitops-plugin.json b/locales/zh/plugin__gitops-plugin.json
index e8ce9c289..0ab083b71 100644
--- a/locales/zh/plugin__gitops-plugin.json
+++ b/locales/zh/plugin__gitops-plugin.json
@@ -32,6 +32,8 @@
   "Name": "Name",
   "Namespace": "Namespace",
   "Sync Wave": "Sync Wave",
+  "No Sync Status": "No Sync Status",
+  "None": "None",
   "Kind": "Kind",
   "Type": "Type",
   "Repository": "Repository",
@@ -284,7 +286,6 @@
   "Create Rollout": "Create Rollout",
   "Pods": "Pods",
   "Selector": "Selector",
-  "No labels": "No labels",
   "Rollout Status": "Rollout Status",
   "Revisions": "Revisions",
   "There was an error retrieving the rollout. Check your connection and reload the page.": "There was an error retrieving the rollout. Check your connection and reload the page.",
@@ -322,6 +323,7 @@
   "There was an error retrieving applicationsets. Check your connection and reload the page.": "There was an error retrieving applicationsets. Check your connection and reload the page.",
   "ApplicationSets": "ApplicationSets",
   "Create ApplicationSet": "Create ApplicationSet",
+  "No labels": "No labels",
   "Name must be unique within a namespace.": "Name must be unique within a namespace.",
   "Namespace defines the space within which each name must be unique.": "Namespace defines the space within which each name must be unique.",
   "Map of string keys and values that can be used to organize and categorize (scope and select) objects.": "Map of string keys and values that can be used to organize and categorize (scope and select) objects.",
diff --git a/src/gitops/components/application/ApplicationResourcesView.tsx b/src/gitops/components/application/ApplicationResourcesView.tsx
index a069b7cc5..7faf51a9f 100644
--- a/src/gitops/components/application/ApplicationResourcesView.tsx
+++ b/src/gitops/components/application/ApplicationResourcesView.tsx
@@ -327,13 +327,13 @@ const filters = (resources: ApplicationResourceStatus[]): RowFilter[] => {
     {
       filterGroupName: t('Sync Status'),
       type: 'resource-sync',
-      reducer: (resource) => (resource.status ? resource.status : 'No Sync Status'),
+      reducer: (resource) => (resource.status ? resource.status : t('No Sync Status')),
       filter: (input, resource) => {
         if (input.selected?.length) {
           if (resource?.status) {
             return input.selected.includes(resource.status);
           } else {
-            return input.selected.includes('No Sync Status');
+            return input.selected.includes(t('No Sync Status'));
           }
         }
         return true;
@@ -341,8 +341,8 @@ const filters = (resources: ApplicationResourceStatus[]): RowFilter[] => {
       items: resources
         .map((resource) => {
           return {
-            id: resource.status ? resource.status : 'No Sync Status',
-            title: resource.status ? resource.status : 'No Sync Status',
+            id: resource.status ? resource.status : t('No Sync Status'),
+            title: resource.status ? resource.status : t('No Sync Status'),
           };
         })
         .reduce<RowFilterItem[]>(function (result: RowFilterItem[], resource: RowFilterItem) {
@@ -355,7 +355,7 @@ const filters = (resources: ApplicationResourceStatus[]): RowFilter[] => {
     {
       filterGroupName: t('Health Status'),
       type: 'resource-health',
-      reducer: (resource) => (resource.health ? resource.health.status : 'None'),
+      reducer: (resource) => (resource.health ? resource.health.status : t('None')),
       filter: (input, resource) => {
         if (input.selected?.length) {
           if (resource?.health?.status) {
@@ -370,8 +370,8 @@ const filters = (resources: ApplicationResourceStatus[]): RowFilter[] => {
       items: resources
         .map((resource) => {
           return {
-            id: resource.health && resource.health.status ? resource.health.status : 'None',
-            title: resource.health && resource.health.status ? resource.health.status : 'None',
+            id: resource.health && resource.health.status ? resource.health.status : t('None'),
+            title: resource.health && resource.health.status ? resource.health.status : t('None'),
           };
         })
         .reduce<RowFilterItem[]>(function (result: RowFilterItem[], resource: RowFilterItem) {

From b01fbe0b878abb5a8a727e8c6f357f11d0ad6709 Mon Sep 17 00:00:00 2001
From: Keith Chong <kykchong@redhat.com>
Date: Fri, 17 Jul 2026 12:10:51 -0400
Subject: [PATCH 2/5] Make all action dropdown have unique id. common up
 ResourceActionsCell

Signed-off-by: Keith Chong <kykchong@redhat.com>
---
 .../application/ApplicationResourcesView.tsx  | 23 ++-----------
 .../application/ApplicationSyncStatusTab.tsx  | 24 ++------------
 .../imageupdater/ImageUpdaterList.tsx         |  7 ++--
 src/gitops/components/project/ProjectList.tsx |  7 ++--
 src/gitops/components/rollout/RolloutList.tsx |  7 ++--
 .../rollout/components/PodList/PodList.tsx    |  7 ++--
 .../components/shared/ApplicationList.tsx     |  6 ++--
 .../components/shared/ApplicationSetList.tsx  |  6 ++--
 .../ResourceActionsCell.tsx                   | 33 +++++++++++++++++++
 9 files changed, 59 insertions(+), 61 deletions(-)
 create mode 100644 src/gitops/components/shared/ResourceActionsCell/ResourceActionsCell.tsx

diff --git a/src/gitops/components/application/ApplicationResourcesView.tsx b/src/gitops/components/application/ApplicationResourcesView.tsx
index 7faf51a9f..ba920b5c7 100644
--- a/src/gitops/components/application/ApplicationResourcesView.tsx
+++ b/src/gitops/components/application/ApplicationResourcesView.tsx
@@ -1,13 +1,10 @@
 import * as React from 'react';
 
-import { useResourceActionsProvider } from '@gitops/hooks/useResourceActionsProvider';
 import HealthStatus from '@gitops/Statuses/HealthStatus';
 import SyncStatus from '@gitops/Statuses/SyncStatus';
-import ActionDropDown from '@gitops/utils/components/ActionDropDown/ActionDropDown';
 import { t } from '@gitops/utils/hooks/useGitOpsTranslation';
 import { ApplicationKind, ApplicationResourceStatus } from '@gitops-models/ApplicationModel';
 import {
-  Action,
   K8sGroupVersionKind,
   ListPageFilter,
   ResourceLink,
@@ -29,6 +26,7 @@ import { CubesIcon } from '@patternfly/react-icons';
 import { Tbody, Td, Tr } from '@patternfly/react-table';
 
 import { GitOpsDataViewTable, useGitOpsDataViewSort } from '../shared/DataView';
+import ResourceActionsCell from '../shared/ResourceActionsCell/ResourceActionsCell';
 
 import { ApplicationGraphView } from './graph/ApplicationGraphView';
 import ApplicationResourcesToolbar from './ApplicationResourcesToolbar';
@@ -297,7 +295,7 @@ const useResourceRowsDV = (
       },
       {
         id: 'actions-' + index,
-        cell: <ResourceActionsCell resource={resource} app={obj} argoBaseURL={argoBaseURL} />,
+        cell: <ResourceActionsCell resource={resource} app={obj} argoBaseURL={argoBaseURL} index={index} />,
         props: { style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 } },
       },
     ]);
@@ -305,23 +303,6 @@ const useResourceRowsDV = (
   return rows;
 };
 
-const ResourceActionsCell: React.FC<{
-  resource: ApplicationResourceStatus;
-  app: ApplicationKind;
-  argoBaseURL: string;
-}> = ({ resource, app, argoBaseURL }) => {
-  const actionList: [actions: Action[]] = useResourceActionsProvider(resource, app, argoBaseURL);
-  return (
-    <div style={{ textAlign: 'right' }}>
-      <ActionDropDown
-        actions={actionList ? actionList[0] : []}
-        id="gitops-application-actions"
-        isKebabToggle={true}
-      />
-    </div>
-  );
-};
-
 const filters = (resources: ApplicationResourceStatus[]): RowFilter[] => {
   return [
     {
diff --git a/src/gitops/components/application/ApplicationSyncStatusTab.tsx b/src/gitops/components/application/ApplicationSyncStatusTab.tsx
index 481a73f4b..8134dad0c 100644
--- a/src/gitops/components/application/ApplicationSyncStatusTab.tsx
+++ b/src/gitops/components/application/ApplicationSyncStatusTab.tsx
@@ -3,15 +3,12 @@ import { RouteComponentProps } from 'react-router';
 import classNames from 'classnames';
 
 import { useArgoServer } from '@gitops/hooks/useArgoServer';
-import { useResourceActionsProvider } from '@gitops/hooks/useResourceActionsProvider';
 import { OperationState } from '@gitops/Statuses/OperationState';
 import SyncStatus from '@gitops/Statuses/SyncStatus';
-import ActionDropDown from '@gitops/utils/components/ActionDropDown/ActionDropDown';
 import { getApplicationArgoUrl, getDuration } from '@gitops/utils/gitops';
 import { t } from '@gitops/utils/hooks/useGitOpsTranslation';
 import { ApplicationKind, ApplicationResourceStatus } from '@gitops-models/ApplicationModel';
 import {
-  Action,
   K8sGroupVersionKind,
   ResourceLink,
   Timestamp,
@@ -38,6 +35,7 @@ import { Tbody, Td, ThProps, Tr } from '@patternfly/react-table';
 
 import { DetailsDescriptionGroup } from '../shared/BaseDetailsSummary/BaseDetailsSummary';
 import { GitOpsDataViewTable, useGitOpsDataViewSort } from '../shared/DataView';
+import ResourceActionsCell from '../shared/ResourceActionsCell/ResourceActionsCell';
 
 import { ConditionsPopover } from './Conditions/ConditionsPopover';
 
@@ -402,7 +400,7 @@ const useResourceRowsDV = (
       },
       {
         id: 'actions-' + index,
-        cell: <ResourceActionsCell resource={resource} app={obj} argoBaseURL={argoBaseURL} />,
+        cell: <ResourceActionsCell resource={resource} app={obj} argoBaseURL={argoBaseURL} index={index} />,
         props: {
           style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 },
           className: 'dropdown-kebab-pf pf-c-table__action',
@@ -413,22 +411,4 @@ const useResourceRowsDV = (
   return rows;
 };
 
-const ResourceActionsCell: React.FC<{
-  resource: ApplicationResourceStatus;
-  app: ApplicationKind;
-  argoBaseURL: string;
-}> = ({ resource, app, argoBaseURL }) => {
-  const actionList: [actions: Action[]] = useResourceActionsProvider(resource, app, argoBaseURL);
-
-  return (
-    <div style={{ textAlign: 'right' }}>
-      <ActionDropDown
-        actions={actionList ? actionList[0] : []}
-        id="gitops-application-actions"
-        isKebabToggle={true}
-      />
-    </div>
-  );
-};
-
 export default ApplicationSyncStatusTab;
diff --git a/src/gitops/components/imageupdater/ImageUpdaterList.tsx b/src/gitops/components/imageupdater/ImageUpdaterList.tsx
index bb3307ea1..9a183b0d2 100644
--- a/src/gitops/components/imageupdater/ImageUpdaterList.tsx
+++ b/src/gitops/components/imageupdater/ImageUpdaterList.tsx
@@ -402,7 +402,7 @@ export const useImageUpdaterRowsDV = (
       },
       {
         id: 'actions-' + index,
-        cell: <ImageUpdaterActionsCell imageUpdater={obj} />,
+        cell: <ImageUpdaterActionsCell imageUpdater={obj} index={index} />,
         props: { className: 'gitops-imageupdater-list__actions-cell' },
       },
     ]);
@@ -412,13 +412,14 @@ export const useImageUpdaterRowsDV = (
 
 const ImageUpdaterActionsCell: React.FC<{
   imageUpdater: ImageUpdaterKind;
-}> = ({ imageUpdater }) => {
+  index: number;
+}> = ({ imageUpdater, index }) => {
   const actionList: Action[] = useImageUpdaterActionsProvider(imageUpdater);
   return (
     <div className="gitops-imageupdater-list__actions">
       <ActionsDropdown
         actions={actionList || []}
-        id="gitops-imageupdater-actions"
+        id={'gitops-imageupdater-actions-' + index}
         isKebabToggle={true}
       />
     </div>
diff --git a/src/gitops/components/project/ProjectList.tsx b/src/gitops/components/project/ProjectList.tsx
index dbfcac004..3eddd7d6f 100644
--- a/src/gitops/components/project/ProjectList.tsx
+++ b/src/gitops/components/project/ProjectList.tsx
@@ -528,7 +528,7 @@ export const useProjectsRowsDV = (
       },
       {
         id: 'actions-' + index,
-        cell: <ProjectActionsCell project={obj} />,
+        cell: <ProjectActionsCell project={obj} index={index} />,
         props: { style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 } },
       },
     ]);
@@ -538,13 +538,14 @@ export const useProjectsRowsDV = (
 
 const ProjectActionsCell: React.FC<{
   project: AppProjectKind;
-}> = ({ project }) => {
+  index: number;
+}> = ({ project, index }) => {
   const actionList: Action[] = useProjectActionsProvider(project);
   return (
     <div style={{ textAlign: 'right' }}>
       <ActionsDropdown
         actions={actionList || []}
-        id="gitops-project-actions"
+        id={'gitops-project-actions-' + index}
         isKebabToggle={true}
       />
     </div>
diff --git a/src/gitops/components/rollout/RolloutList.tsx b/src/gitops/components/rollout/RolloutList.tsx
index 4f47f3b05..d83524c49 100644
--- a/src/gitops/components/rollout/RolloutList.tsx
+++ b/src/gitops/components/rollout/RolloutList.tsx
@@ -445,7 +445,7 @@ export const useRolloutsRowsDV = (rolloutsList, namespace): DataViewTr[] => {
       },
       {
         id: 'actions-' + index,
-        cell: <RolloutActionsCell app={obj} />,
+        cell: <RolloutActionsCell app={obj} index={index} />,
         props: { style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 } },
       },
     ]);
@@ -455,13 +455,14 @@ export const useRolloutsRowsDV = (rolloutsList, namespace): DataViewTr[] => {
 
 const RolloutActionsCell: React.FC<{
   app: RolloutKind;
-}> = ({ app }) => {
+  index: number;
+}> = ({ app, index }) => {
   const actionList: [actions: Action[]] = useRolloutActionsProvider(app);
   return (
     <div style={{ textAlign: 'right' }}>
       <ActionsDropdown
         actions={actionList ? actionList[0] : []}
-        id="gitops-rollout-actions"
+        id={'gitops-rollout-actions-' + index}
         isKebabToggle={true}
       />
     </div>
diff --git a/src/gitops/components/rollout/components/PodList/PodList.tsx b/src/gitops/components/rollout/components/PodList/PodList.tsx
index 28ae41064..3a4a3ef34 100644
--- a/src/gitops/components/rollout/components/PodList/PodList.tsx
+++ b/src/gitops/components/rollout/components/PodList/PodList.tsx
@@ -317,7 +317,7 @@ const usePodRowsDV = (podsList: PodKind[], memResults, cpuResults, namespace): D
       },
       {
         id: 'actions-' + index,
-        cell: <PodRowActions pod={obj} />,
+        cell: <PodRowActions pod={obj} index={index} />,
         props: { className: 'dropdown-kebab-pf pf-c-table__action' },
       },
     ]);
@@ -327,13 +327,14 @@ const usePodRowsDV = (podsList: PodKind[], memResults, cpuResults, namespace): D
 
 const PodRowActions: React.FC<{
   pod: PodKind;
-}> = ({ pod }) => {
+  index: number;
+}> = ({ pod, index }) => {
   const actionList: [actions: Action[]] = usePodActionsProvider(pod);
   return (
     <div style={{ textAlign: 'right' }}>
       <ActionsDropdown
         actions={actionList ? actionList[0] : []}
-        id="gitops-rollout-actions"
+        id={'gitops-rollout-actions-' + index}
         isKebabToggle={true}
       />
     </div>
diff --git a/src/gitops/components/shared/ApplicationList.tsx b/src/gitops/components/shared/ApplicationList.tsx
index 4c5388cc3..9afa12f2d 100644
--- a/src/gitops/components/shared/ApplicationList.tsx
+++ b/src/gitops/components/shared/ApplicationList.tsx
@@ -335,14 +335,14 @@ export const sortData = (
   });
 };
 
-const ApplicationActionsCell: React.FC<{ app: ApplicationKind }> = ({ app }) => {
+const ApplicationActionsCell: React.FC<{ app: ApplicationKind, index: number }> = ({ app, index}) => {
   const actionList: [actions: Action[]] = useApplicationActionsProvider(app);
 
   return (
     <div style={{ textAlign: 'right' }}>
       <ActionsDropdown
         actions={actionList ? actionList[0] : []}
-        id="gitops-application-actions"
+        id={'gitops-application-actions-' + index}
         isKebabToggle={true}
       />
     </div>
@@ -444,7 +444,7 @@ const useApplicationRowsDV = (applicationsList, namespace): DataViewTr[] => {
       },
       {
         id: 'actions-' + index,
-        cell: <ApplicationActionsCell app={app} />,
+        cell: <ApplicationActionsCell app={app} index={index}/>,
         props: { style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 } },
       },
     ]);
diff --git a/src/gitops/components/shared/ApplicationSetList.tsx b/src/gitops/components/shared/ApplicationSetList.tsx
index 96f799663..0e74f387c 100644
--- a/src/gitops/components/shared/ApplicationSetList.tsx
+++ b/src/gitops/components/shared/ApplicationSetList.tsx
@@ -294,11 +294,11 @@ const ApplicationSetList: React.FC<ApplicationSetProps> = ({
   );
 };
 
-const ApplicationSetActionsCell: React.FC<{ appSet: ApplicationSetKind }> = ({ appSet }) => {
+const ApplicationSetActionsCell: React.FC<{ appSet: ApplicationSetKind, index: number }> = ({ appSet, index }) => {
   const [actions] = useApplicationSetActionsProvider(appSet);
   return (
     <div style={{ textAlign: 'right' }}>
-      <ActionsDropdown actions={actions} id="gitops-applicationset-actions" isKebabToggle={true} />
+      <ActionsDropdown actions={actions} id={'gitops-applicationset-actions-' + index} isKebabToggle={true} />
     </div>
   );
 };
@@ -353,7 +353,7 @@ const useApplicationSetRowsDV = (
       },
       {
         id: 'actions-' + index,
-        cell: <ApplicationSetActionsCell appSet={appSet} />,
+        cell: <ApplicationSetActionsCell appSet={appSet} index={index} />,
         props: { style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 } },
       },
     ]);
diff --git a/src/gitops/components/shared/ResourceActionsCell/ResourceActionsCell.tsx b/src/gitops/components/shared/ResourceActionsCell/ResourceActionsCell.tsx
new file mode 100644
index 000000000..54b5843b1
--- /dev/null
+++ b/src/gitops/components/shared/ResourceActionsCell/ResourceActionsCell.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+
+import { useResourceActionsProvider } from '@gitops/hooks/useResourceActionsProvider';
+import ActionDropDown from '@gitops/utils/components/ActionDropDown/ActionDropDown';
+import { ApplicationKind, ApplicationResourceStatus } from '@gitops-models/ApplicationModel';
+
+type ResourceActionsCellProps = {
+  resource: ApplicationResourceStatus;
+  app: ApplicationKind;
+  argoBaseURL: string;
+  index: number;
+};
+
+export const ResourceActionsCell: React.FC<ResourceActionsCellProps> = ({
+  resource,
+  app,
+  argoBaseURL,
+  index,
+}) => {
+  const actionList = useResourceActionsProvider(resource, app, argoBaseURL);
+
+  return (
+    <div style={{ textAlign: 'right' }}>
+      <ActionDropDown
+        actions={actionList ? actionList[0] : []}
+        id={`gitops-app-resource-actions-${index}`}
+        isKebabToggle={true}
+      />
+    </div>
+  );
+};
+
+export default ResourceActionsCell;

From 3f188791ac6c4f388ba510fd12bff3574126f2f6 Mon Sep 17 00:00:00 2001
From: Keith Chong <kykchong@redhat.com>
Date: Fri, 17 Jul 2026 12:20:13 -0400
Subject: [PATCH 3/5] Assisted-by: Cursor Grok, coderabbitai -

Signed-off-by: Keith Chong <kykchong@redhat.com>
---
 src/gitops/components/application/ApplicationResourcesView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gitops/components/application/ApplicationResourcesView.tsx b/src/gitops/components/application/ApplicationResourcesView.tsx
index ba920b5c7..18e12c249 100644
--- a/src/gitops/components/application/ApplicationResourcesView.tsx
+++ b/src/gitops/components/application/ApplicationResourcesView.tsx
@@ -341,7 +341,7 @@ const filters = (resources: ApplicationResourceStatus[]): RowFilter[] => {
         if (input.selected?.length) {
           if (resource?.health?.status) {
             return input.selected.includes(resource.health.status);
-          } else if (input.selected.includes('None')) {
+          } else if (input.selected.includes(t('None'))) {
             return true;
           }
           return false;

From abc0fcc458846c4a00c6d68fbb048d83b5f2acda Mon Sep 17 00:00:00 2001
From: Keith Chong <kykchong@redhat.com>
Date: Sun, 2 Aug 2026 15:11:18 -0400
Subject: [PATCH 4/5] Feedback comments, enable name filter on resources

Signed-off-by: Keith Chong <kykchong@redhat.com>
---
 locales/en/plugin__gitops-plugin.json         | 16 +++---
 locales/ja/plugin__gitops-plugin.json         | 16 +++---
 locales/ko/plugin__gitops-plugin.json         | 16 +++---
 locales/zh/plugin__gitops-plugin.json         | 16 +++---
 .../application/ApplicationResourcesTab.tsx   | 15 +++---
 .../application/ApplicationResourcesView.tsx  | 49 +++++++++++++------
 .../application/ApplicationSyncStatusTab.tsx  |  9 +++-
 .../components/shared/ApplicationList.tsx     | 43 ++++++++--------
 .../shared/ApplicationSetApplicationsView.tsx | 15 ++++--
 .../components/shared/ApplicationSetList.tsx  | 29 ++++++++---
 .../shared/DataView/GitOpsDataViewTable.tsx   | 10 +++-
 11 files changed, 150 insertions(+), 84 deletions(-)

diff --git a/locales/en/plugin__gitops-plugin.json b/locales/en/plugin__gitops-plugin.json
index d9117e16c..21db0d47a 100644
--- a/locales/en/plugin__gitops-plugin.json
+++ b/locales/en/plugin__gitops-plugin.json
@@ -29,6 +29,8 @@
   "The graph and table views show health and sync status for the application's immediate resources only. Click the Argo CD Link to see the complete resource tree. Use the filter to filter resources based on status and kind.": "The graph and table views show health and sync status for the application's immediate resources only. Click the Argo CD Link to see the complete resource tree. Use the filter to filter resources based on status and kind.",
   "No resources": "No resources",
   "There are no resources associated with the application.": "There are no resources associated with the application.",
+  "There are no resources based on the applied filters. Adjust the filters to see more resources.": "There are no resources based on the applied filters. Adjust the filters to see more resources.",
+  "Search by name...": "Search by name...",
   "Name": "Name",
   "Namespace": "Namespace",
   "Sync Wave": "Sync Wave",
@@ -137,7 +139,6 @@
   "ImageUpdaters": "ImageUpdaters",
   "This list page is under tech preview, but not necessarily the resources it represents": "This list page is under tech preview, but not necessarily the resources it represents",
   "Create ImageUpdater": "Create ImageUpdater",
-  "Search by name...": "Search by name...",
   "Apps": "Apps",
   "Images": "Images",
   "Last Checked": "Last Checked",
@@ -304,18 +305,19 @@
   "Analysis Templates": "Analysis Templates",
   "The analysis and cluster-scoped analysis templates used for the canary strategy": "The analysis and cluster-scoped analysis templates used for the canary strategy",
   "Topology view": "Topology view",
-  "No matching Argo CD Applications": "No matching Argo CD Applications",
   "No Argo CD Applications": "No Argo CD Applications",
-  "No Argo CD Applications match the label filter": "No Argo CD Applications match the label filter",
-  "Try removing the filter or selecting a different label to see more applications.": "Try removing the filter or selecting a different label to see more applications.",
-  "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
+  "Loading Argo CD Applications...": "Loading Argo CD Applications...",
+  "No Argo CD Applications match the filter": "No Argo CD Applications match the filter",
+  "Adjust the filter to see more applications.": "Adjust the filter to see more applications.",
+  "There are no Argo CD Applications in this application set.": "There are no Argo CD Applications in this application set.",
   "There are no Argo CD Applications in all projects.": "There are no Argo CD Applications in all projects.",
+  "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
   "There was an error retrieving applications. Check your connection and reload the page.": "There was an error retrieving applications. Check your connection and reload the page.",
   "ApplicationSet Applications": "ApplicationSet Applications",
   "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.",
   "Revision": "Revision",
-  "No Argo CD ApplicationSets match the label filter": "No Argo CD ApplicationSets match the label filter",
-  "Try removing the filter or selecting a different label to see more ApplicationSets.": "Try removing the filter or selecting a different label to see more ApplicationSets.",
+  "No Argo CD ApplicationSets match the filter": "No Argo CD ApplicationSets match the filter",
+  "Try changing the filter to see more ApplicationSets.": "Try changing the filter to see more ApplicationSets.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
   "There are no Argo CD ApplicationSets in all projects.": "There are no Argo CD ApplicationSets in all projects.",
   "No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
diff --git a/locales/ja/plugin__gitops-plugin.json b/locales/ja/plugin__gitops-plugin.json
index e30d7c626..741645ce9 100644
--- a/locales/ja/plugin__gitops-plugin.json
+++ b/locales/ja/plugin__gitops-plugin.json
@@ -29,6 +29,8 @@
   "The graph and table views show health and sync status for the application's immediate resources only. Click the Argo CD Link to see the complete resource tree. Use the filter to filter resources based on status and kind.": "The graph and table views show health and sync status for the application's immediate resources only. Click the Argo CD Link to see the complete resource tree. Use the filter to filter resources based on status and kind.",
   "No resources": "No resources",
   "There are no resources associated with the application.": "There are no resources associated with the application.",
+  "There are no resources based on the applied filters. Adjust the filters to see more resources.": "There are no resources based on the applied filters. Adjust the filters to see more resources.",
+  "Search by name...": "Search by name...",
   "Name": "Name",
   "Namespace": "Namespace",
   "Sync Wave": "Sync Wave",
@@ -137,7 +139,6 @@
   "ImageUpdaters": "ImageUpdaters",
   "This list page is under tech preview, but not necessarily the resources it represents": "This list page is under tech preview, but not necessarily the resources it represents",
   "Create ImageUpdater": "Create ImageUpdater",
-  "Search by name...": "Search by name...",
   "Apps": "Apps",
   "Images": "Images",
   "Last Checked": "Last Checked",
@@ -304,18 +305,19 @@
   "Analysis Templates": "Analysis Templates",
   "The analysis and cluster-scoped analysis templates used for the canary strategy": "The analysis and cluster-scoped analysis templates used for the canary strategy",
   "Topology view": "Topology view",
-  "No matching Argo CD Applications": "No matching Argo CD Applications",
   "No Argo CD Applications": "No Argo CD Applications",
-  "No Argo CD Applications match the label filter": "No Argo CD Applications match the label filter",
-  "Try removing the filter or selecting a different label to see more applications.": "Try removing the filter or selecting a different label to see more applications.",
-  "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
+  "Loading Argo CD Applications...": "Loading Argo CD Applications...",
+  "No Argo CD Applications match the filter": "No Argo CD Applications match the filter",
+  "Adjust the filter to see more applications.": "Adjust the filter to see more applications.",
+  "There are no Argo CD Applications in this application set.": "There are no Argo CD Applications in this application set.",
   "There are no Argo CD Applications in all projects.": "There are no Argo CD Applications in all projects.",
+  "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
   "There was an error retrieving applications. Check your connection and reload the page.": "There was an error retrieving applications. Check your connection and reload the page.",
   "ApplicationSet Applications": "ApplicationSet Applications",
   "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.",
   "Revision": "リビジョン",
-  "No Argo CD ApplicationSets match the label filter": "No Argo CD ApplicationSets match the label filter",
-  "Try removing the filter or selecting a different label to see more ApplicationSets.": "Try removing the filter or selecting a different label to see more ApplicationSets.",
+  "No Argo CD ApplicationSets match the filter": "No Argo CD ApplicationSets match the filter",
+  "Try changing the filter to see more ApplicationSets.": "Try changing the filter to see more ApplicationSets.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
   "There are no Argo CD ApplicationSets in all projects.": "There are no Argo CD ApplicationSets in all projects.",
   "No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
diff --git a/locales/ko/plugin__gitops-plugin.json b/locales/ko/plugin__gitops-plugin.json
index 84efc1ccc..1db538c73 100644
--- a/locales/ko/plugin__gitops-plugin.json
+++ b/locales/ko/plugin__gitops-plugin.json
@@ -29,6 +29,8 @@
   "The graph and table views show health and sync status for the application's immediate resources only. Click the Argo CD Link to see the complete resource tree. Use the filter to filter resources based on status and kind.": "The graph and table views show health and sync status for the application's immediate resources only. Click the Argo CD Link to see the complete resource tree. Use the filter to filter resources based on status and kind.",
   "No resources": "No resources",
   "There are no resources associated with the application.": "There are no resources associated with the application.",
+  "There are no resources based on the applied filters. Adjust the filters to see more resources.": "There are no resources based on the applied filters. Adjust the filters to see more resources.",
+  "Search by name...": "Search by name...",
   "Name": "Name",
   "Namespace": "Namespace",
   "Sync Wave": "Sync Wave",
@@ -137,7 +139,6 @@
   "ImageUpdaters": "ImageUpdaters",
   "This list page is under tech preview, but not necessarily the resources it represents": "This list page is under tech preview, but not necessarily the resources it represents",
   "Create ImageUpdater": "Create ImageUpdater",
-  "Search by name...": "Search by name...",
   "Apps": "Apps",
   "Images": "Images",
   "Last Checked": "Last Checked",
@@ -304,18 +305,19 @@
   "Analysis Templates": "Analysis Templates",
   "The analysis and cluster-scoped analysis templates used for the canary strategy": "The analysis and cluster-scoped analysis templates used for the canary strategy",
   "Topology view": "Topology view",
-  "No matching Argo CD Applications": "No matching Argo CD Applications",
   "No Argo CD Applications": "No Argo CD Applications",
-  "No Argo CD Applications match the label filter": "No Argo CD Applications match the label filter",
-  "Try removing the filter or selecting a different label to see more applications.": "Try removing the filter or selecting a different label to see more applications.",
-  "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
+  "Loading Argo CD Applications...": "Loading Argo CD Applications...",
+  "No Argo CD Applications match the filter": "No Argo CD Applications match the filter",
+  "Adjust the filter to see more applications.": "Adjust the filter to see more applications.",
+  "There are no Argo CD Applications in this application set.": "There are no Argo CD Applications in this application set.",
   "There are no Argo CD Applications in all projects.": "There are no Argo CD Applications in all projects.",
+  "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
   "There was an error retrieving applications. Check your connection and reload the page.": "There was an error retrieving applications. Check your connection and reload the page.",
   "ApplicationSet Applications": "ApplicationSet Applications",
   "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.",
   "Revision": "개정 버전",
-  "No Argo CD ApplicationSets match the label filter": "No Argo CD ApplicationSets match the label filter",
-  "Try removing the filter or selecting a different label to see more ApplicationSets.": "Try removing the filter or selecting a different label to see more ApplicationSets.",
+  "No Argo CD ApplicationSets match the filter": "No Argo CD ApplicationSets match the filter",
+  "Try changing the filter to see more ApplicationSets.": "Try changing the filter to see more ApplicationSets.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
   "There are no Argo CD ApplicationSets in all projects.": "There are no Argo CD ApplicationSets in all projects.",
   "No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
diff --git a/locales/zh/plugin__gitops-plugin.json b/locales/zh/plugin__gitops-plugin.json
index 0ab083b71..177716628 100644
--- a/locales/zh/plugin__gitops-plugin.json
+++ b/locales/zh/plugin__gitops-plugin.json
@@ -29,6 +29,8 @@
   "The graph and table views show health and sync status for the application's immediate resources only. Click the Argo CD Link to see the complete resource tree. Use the filter to filter resources based on status and kind.": "The graph and table views show health and sync status for the application's immediate resources only. Click the Argo CD Link to see the complete resource tree. Use the filter to filter resources based on status and kind.",
   "No resources": "No resources",
   "There are no resources associated with the application.": "There are no resources associated with the application.",
+  "There are no resources based on the applied filters. Adjust the filters to see more resources.": "There are no resources based on the applied filters. Adjust the filters to see more resources.",
+  "Search by name...": "Search by name...",
   "Name": "Name",
   "Namespace": "Namespace",
   "Sync Wave": "Sync Wave",
@@ -137,7 +139,6 @@
   "ImageUpdaters": "ImageUpdaters",
   "This list page is under tech preview, but not necessarily the resources it represents": "This list page is under tech preview, but not necessarily the resources it represents",
   "Create ImageUpdater": "Create ImageUpdater",
-  "Search by name...": "Search by name...",
   "Apps": "Apps",
   "Images": "Images",
   "Last Checked": "Last Checked",
@@ -304,18 +305,19 @@
   "Analysis Templates": "Analysis Templates",
   "The analysis and cluster-scoped analysis templates used for the canary strategy": "The analysis and cluster-scoped analysis templates used for the canary strategy",
   "Topology view": "Topology view",
-  "No matching Argo CD Applications": "No matching Argo CD Applications",
   "No Argo CD Applications": "No Argo CD Applications",
-  "No Argo CD Applications match the label filter": "No Argo CD Applications match the label filter",
-  "Try removing the filter or selecting a different label to see more applications.": "Try removing the filter or selecting a different label to see more applications.",
-  "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
+  "Loading Argo CD Applications...": "Loading Argo CD Applications...",
+  "No Argo CD Applications match the filter": "No Argo CD Applications match the filter",
+  "Adjust the filter to see more applications.": "Adjust the filter to see more applications.",
+  "There are no Argo CD Applications in this application set.": "There are no Argo CD Applications in this application set.",
   "There are no Argo CD Applications in all projects.": "There are no Argo CD Applications in all projects.",
+  "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
   "There was an error retrieving applications. Check your connection and reload the page.": "There was an error retrieving applications. Check your connection and reload the page.",
   "ApplicationSet Applications": "ApplicationSet Applications",
   "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.",
   "Revision": "修订",
-  "No Argo CD ApplicationSets match the label filter": "No Argo CD ApplicationSets match the label filter",
-  "Try removing the filter or selecting a different label to see more ApplicationSets.": "Try removing the filter or selecting a different label to see more ApplicationSets.",
+  "No Argo CD ApplicationSets match the filter": "No Argo CD ApplicationSets match the filter",
+  "Try changing the filter to see more ApplicationSets.": "Try changing the filter to see more ApplicationSets.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
   "There are no Argo CD ApplicationSets in all projects.": "There are no Argo CD ApplicationSets in all projects.",
   "No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
diff --git a/src/gitops/components/application/ApplicationResourcesTab.tsx b/src/gitops/components/application/ApplicationResourcesTab.tsx
index 162b28458..36500399f 100644
--- a/src/gitops/components/application/ApplicationResourcesTab.tsx
+++ b/src/gitops/components/application/ApplicationResourcesTab.tsx
@@ -3,7 +3,7 @@ import { RouteComponentProps } from 'react-router';
 import classNames from 'classnames';
 
 import { useArgoServer } from '@gitops/hooks/useArgoServer';
-
+import { getApplicationArgoUrl } from '@gitops/utils/gitops';
 import { t } from '@gitops/utils/hooks/useGitOpsTranslation';
 import { ApplicationKind, ApplicationResourceStatus } from '@gitops-models/ApplicationModel';
 import { useUserSettings } from '@openshift-console/dynamic-plugin-sdk';
@@ -15,13 +15,14 @@ import {
   PageSectionVariants,
   Title,
 } from '@patternfly/react-core';
+
 import ArgoCDLink from '../shared/ArgoCDLink/ArgoCDLink';
+
 import ApplicationResourcesView from './ApplicationResourcesView';
 import {
   APPLICATION_RESOURCES_VIEW_SETTING_KEY,
   ApplicationResourcesViewType,
 } from './ApplicationResourcesViewType';
-import { getApplicationArgoUrl } from '@gitops/utils/gitops';
 
 type ApplicationResourcesTabProps = RouteComponentProps<{
   ns: string;
@@ -35,11 +36,11 @@ const ApplicationResourcesTab: React.FC<ApplicationResourcesTabProps> = ({ obj }
   const argoURL = getApplicationArgoUrl(argoServer, obj);
 
   const [savedViewType, setSavedViewType, viewSettingsLoaded] =
-  useUserSettings<ApplicationResourcesViewType>(
-    APPLICATION_RESOURCES_VIEW_SETTING_KEY,
-    ApplicationResourcesViewType.graph,
-    false,
-  );
+    useUserSettings<ApplicationResourcesViewType>(
+      APPLICATION_RESOURCES_VIEW_SETTING_KEY,
+      ApplicationResourcesViewType.graph,
+      false,
+    );
   const [viewType, setViewType] = React.useState<ApplicationResourcesViewType>(
     ApplicationResourcesViewType.graph,
   );
diff --git a/src/gitops/components/application/ApplicationResourcesView.tsx b/src/gitops/components/application/ApplicationResourcesView.tsx
index 18e12c249..0e2ea4bb4 100644
--- a/src/gitops/components/application/ApplicationResourcesView.tsx
+++ b/src/gitops/components/application/ApplicationResourcesView.tsx
@@ -64,9 +64,18 @@ const ApplicationResourcesView: React.FC<ApplicationResourcesViewProps> = ({
     [resources, sortBy, direction],
   );
 
-  const resourceFilters = React.useMemo(() => filters(sortedResources), [sortedResources]);
+  const filterableResources = React.useMemo(
+    () =>
+      sortedResources.map((resource) => ({
+        ...resource,
+        metadata: { name: resource.name },
+      })),
+    [sortedResources],
+  );
+
+  const resourceFilters = React.useMemo(() => filters(filterableResources), [filterableResources]);
   const [data, filteredResources, onFilterChange] = useListPageFilter(
-    sortedResources,
+    filterableResources,
     resourceFilters,
   );
 
@@ -80,7 +89,11 @@ const ApplicationResourcesView: React.FC<ApplicationResourcesViewProps> = ({
         <Td colSpan={columnsDV.length}>
           <EmptyState headingLevel="h4" icon={CubesIcon} titleText={t('No resources')}>
             <EmptyStateBody>
-              {t('There are no resources associated with the application.')}
+              {resources.length === 0
+                ? t('There are no resources associated with the application.')
+                : t(
+                    'There are no resources based on the applied filters. Adjust the filters to see more resources.',
+                  )}
             </EmptyStateBody>
           </EmptyState>
         </Td>
@@ -102,19 +115,16 @@ const ApplicationResourcesView: React.FC<ApplicationResourcesViewProps> = ({
           <Flex alignItems={{ default: 'alignItemsCenter' }}>
             <FlexItem flex={{ default: 'flex_1' }}>
               <ListPageFilter
-                hideNameLabelFilters
                 data={data}
                 loaded={true}
                 rowFilters={resourceFilters}
                 onFilterChange={onFilterChange}
+                nameFilterPlaceholder={t('plugin__gitops-plugin~Search by name...')}
+                hideLabelFilter
               />
             </FlexItem>
             <FlexItem className="gitops-graph-list-view__header">
-              <ApplicationResourcesToolbar
-                viewType={viewType}
-                onViewChange={onViewChange}
-                isDisabled={resources.length === 0}
-              />
+              <ApplicationResourcesToolbar viewType={viewType} onViewChange={onViewChange} />
             </FlexItem>
           </Flex>
         </StackItem>
@@ -164,8 +174,8 @@ const sortData = (
         bValue = b.namespace || '';
         break;
       case 'sync-wave':
-        aValue = a.syncWave || '';
-        bValue = b.syncWave || '';
+        aValue = a.syncWave ?? '';
+        bValue = b.syncWave ?? '';
         break;
       case 'sync-status':
         aValue = a.status || '';
@@ -266,17 +276,17 @@ const useResourceRowsDV = (
           </div>
         ),
         id: resource.name + '-' + index,
-        dataLabel: 'Name',
+        dataLabel: t('Name'),
       },
       {
         cell: resource.namespace ? resource.namespace : '-',
         id: resource.namespace,
-        dataLabel: 'Namespace',
+        dataLabel: t('Namespace'),
       },
       {
         id: 'sync-wave-' + index,
-        cell: <>{resource.syncWave || '-'}</>,
-        dataLabel: 'Sync Order',
+        cell: <>{resource.syncWave ?? '-'}</>,
+        dataLabel: t('Sync Wave'),
       },
       {
         id: 'sync-status-' + index,
@@ -295,7 +305,14 @@ const useResourceRowsDV = (
       },
       {
         id: 'actions-' + index,
-        cell: <ResourceActionsCell resource={resource} app={obj} argoBaseURL={argoBaseURL} index={index} />,
+        cell: (
+          <ResourceActionsCell
+            resource={resource}
+            app={obj}
+            argoBaseURL={argoBaseURL}
+            index={index}
+          />
+        ),
         props: { style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 } },
       },
     ]);
diff --git a/src/gitops/components/application/ApplicationSyncStatusTab.tsx b/src/gitops/components/application/ApplicationSyncStatusTab.tsx
index 8134dad0c..3ba77f172 100644
--- a/src/gitops/components/application/ApplicationSyncStatusTab.tsx
+++ b/src/gitops/components/application/ApplicationSyncStatusTab.tsx
@@ -400,7 +400,14 @@ const useResourceRowsDV = (
       },
       {
         id: 'actions-' + index,
-        cell: <ResourceActionsCell resource={resource} app={obj} argoBaseURL={argoBaseURL} index={index} />,
+        cell: (
+          <ResourceActionsCell
+            resource={resource}
+            app={obj}
+            argoBaseURL={argoBaseURL}
+            index={index}
+          />
+        ),
         props: {
           style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 },
           className: 'dropdown-kebab-pf pf-c-table__action',
diff --git a/src/gitops/components/shared/ApplicationList.tsx b/src/gitops/components/shared/ApplicationList.tsx
index 9afa12f2d..f22f78174 100644
--- a/src/gitops/components/shared/ApplicationList.tsx
+++ b/src/gitops/components/shared/ApplicationList.tsx
@@ -157,28 +157,29 @@ const ApplicationList: React.FC<ApplicationProps> = ({
     <Tbody>
       <Tr key="loading" ouiaId="table-tr-loading">
         <Td colSpan={columnsDV.length}>
-          <EmptyState
-            headingLevel="h4"
-            icon={CubesIcon}
-            titleText={
-              searchQuery ? t('No matching Argo CD Applications') : t('No Argo CD Applications')
-            }
-          >
+          <EmptyState headingLevel="h4" icon={CubesIcon} titleText={t('No Argo CD Applications')}>
             <EmptyStateBody>
               {(() => {
-                if (searchQuery) {
+                if (!loaded) {
+                  return t('Loading Argo CD Applications...');
+                }
+                if (
+                  searchQuery ||
+                  (filteredBySearch.length === 0 && sortedApplications.length !== 0)
+                ) {
                   return (
                     <>
-                      {t('No Argo CD Applications match the label filter')}{' '}
-                      <strong>&quot;{searchQuery}&quot;</strong>.
-                      <br />
-                      {t(
-                        'Try removing the filter or selecting a different label to see more applications.',
-                      )}
+                      {t('No Argo CD Applications match the filter')} <br />
+                      {t('Adjust the filter to see more applications.')}
                     </>
                   );
                 }
-                return namespace
+                // eslint-disable-next-line no-nested-ternary
+                return appset
+                  ? namespace
+                    ? t('There are no Argo CD Applications in this application set.')
+                    : t('There are no Argo CD Applications in all projects.')
+                  : namespace
                   ? t('There are no Argo CD Applications in this project.')
                   : t('There are no Argo CD Applications in all projects.');
               })()}
@@ -190,7 +191,7 @@ const ApplicationList: React.FC<ApplicationProps> = ({
   );
   const error = loadError && (
     <Tbody>
-      <Tr key="loading" ouiaId={'table-tr-loading'}>
+      <Tr key="loading-error" ouiaId={'table-tr-loading-error'}>
         <Td colSpan={columnsDV.length}>
           <ErrorState
             titleText={t('Unable to load data')}
@@ -254,8 +255,7 @@ const ApplicationList: React.FC<ApplicationProps> = ({
         {appset && (
           <ApplicationSetApplicationsView
             applicationSet={appset as ApplicationSetKind}
-            ownedApps={ownedApps as ApplicationKind[]}
-            filteredApplications={filteredData as ApplicationKind[]}
+            filteredApplications={filteredBySearch as ApplicationKind[]}
             hideNameLabelFilters={hideNameLabelFilters}
             hasOwnedApplications={hasOwnedApplications}
             rowFilters={filters}
@@ -335,7 +335,10 @@ export const sortData = (
   });
 };
 
-const ApplicationActionsCell: React.FC<{ app: ApplicationKind, index: number }> = ({ app, index}) => {
+const ApplicationActionsCell: React.FC<{ app: ApplicationKind; index: number }> = ({
+  app,
+  index,
+}) => {
   const actionList: [actions: Action[]] = useApplicationActionsProvider(app);
 
   return (
@@ -444,7 +447,7 @@ const useApplicationRowsDV = (applicationsList, namespace): DataViewTr[] => {
       },
       {
         id: 'actions-' + index,
-        cell: <ApplicationActionsCell app={app} index={index}/>,
+        cell: <ApplicationActionsCell app={app} index={index} />,
         props: { style: { paddingTop: 8, paddingRight: 0, paddingLeft: 0, width: 10 } },
       },
     ]);
diff --git a/src/gitops/components/shared/ApplicationSetApplicationsView.tsx b/src/gitops/components/shared/ApplicationSetApplicationsView.tsx
index c3acb54dd..2ff53f875 100644
--- a/src/gitops/components/shared/ApplicationSetApplicationsView.tsx
+++ b/src/gitops/components/shared/ApplicationSetApplicationsView.tsx
@@ -17,7 +17,6 @@ import './GitOpsGraphListView.scss';
 
 type ApplicationSetApplicationsViewProps = {
   applicationSet: ApplicationSetKind;
-  ownedApps: ApplicationKind[];
   filteredApplications: ApplicationKind[];
   hideNameLabelFilters?: boolean;
   hasOwnedApplications: boolean;
@@ -36,7 +35,6 @@ type ApplicationSetApplicationsViewProps = {
 
 const ApplicationSetApplicationsView: React.FC<ApplicationSetApplicationsViewProps> = ({
   applicationSet,
-  ownedApps,
   filteredApplications,
   hideNameLabelFilters,
   hasOwnedApplications,
@@ -106,7 +104,6 @@ const ApplicationSetApplicationsView: React.FC<ApplicationSetApplicationsViewPro
               <GitOpsViewSwitcher
                 viewType={viewType}
                 onViewChange={onViewChange}
-                isDisabled={ownedApps.length === 0}
                 testId="application-set-applications-view-switcher"
               />
             </FlexItem>
@@ -123,10 +120,20 @@ const ApplicationSetApplicationsView: React.FC<ApplicationSetApplicationsViewPro
                 columns={columns}
                 rows={rows}
                 isEmpty={isEmpty}
+                isLoading={!loaded}
                 emptyState={emptyState}
                 errorState={errorState}
                 isError={isError}
-                activeState={isEmpty ? DataViewState.empty : null}
+                activeState={
+                  // eslint-disable-next-line no-nested-ternary
+                  isError
+                    ? DataViewState.error // eslint-disable-next-line no-nested-ternary
+                    : !loaded // eslint-disable-next-line no-nested-ternary
+                    ? DataViewState.loading
+                    : isEmpty // eslint-disable-next-line no-nested-ternary
+                    ? DataViewState.empty
+                    : undefined
+                }
               />
             ) : (
               <div className="gitops-graph-list-view__graph">
diff --git a/src/gitops/components/shared/ApplicationSetList.tsx b/src/gitops/components/shared/ApplicationSetList.tsx
index 0e74f387c..dae0a6745 100644
--- a/src/gitops/components/shared/ApplicationSetList.tsx
+++ b/src/gitops/components/shared/ApplicationSetList.tsx
@@ -16,6 +16,7 @@ import {
 import { ErrorState } from '@patternfly/react-component-groups';
 import { EmptyState, EmptyStateBody } from '@patternfly/react-core';
 import { DataViewTh, DataViewTr } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
+import { DataViewState } from '@patternfly/react-data-view/dist/esm/DataView';
 import { CubesIcon } from '@patternfly/react-icons';
 import { Tbody, Td, ThProps, Tr } from '@patternfly/react-table';
 
@@ -194,13 +195,12 @@ const ApplicationSetList: React.FC<ApplicationSetProps> = ({
   }, [sortedApplicationSets]);
 
   const getEmptyStateBody = () => {
-    if (searchQuery) {
+    if (searchQuery || (filteredBySearch.length === 0 && sortedApplicationSets.length > 0)) {
       return (
         <>
-          {t('No Argo CD ApplicationSets match the label filter')}{' '}
-          <strong>&quot;{searchQuery}&quot;</strong>.
+          {t('No Argo CD ApplicationSets match the filter')}
           <br />
-          {t('Try removing the filter or selecting a different label to see more ApplicationSets.')}
+          {t('Try changing the filter to see more ApplicationSets.')}
         </>
       );
     }
@@ -244,7 +244,10 @@ const ApplicationSetList: React.FC<ApplicationSetProps> = ({
     </Tbody>
   );
 
-  const isEmptyState = !loadError && filteredBySearch.length === 0;
+  const isEmptyState =
+    applicationSets.length === 0 ||
+    sortedApplicationSets.length === 0 ||
+    filteredBySearch.length === 0;
 
   return (
     <div>
@@ -286,19 +289,31 @@ const ApplicationSetList: React.FC<ApplicationSetProps> = ({
           columns={columnsDV}
           isEmpty={isEmptyState}
           emptyState={empty}
+          isLoading={!loaded}
           isError={!!loadError}
           errorState={error}
+          activeState={
+            // eslint-disable-next-line no-nested-ternary
+            !loaded ? DataViewState.loading : isEmptyState ? DataViewState.empty : undefined
+          }
         />
       </ListPageBody>
     </div>
   );
 };
 
-const ApplicationSetActionsCell: React.FC<{ appSet: ApplicationSetKind, index: number }> = ({ appSet, index }) => {
+const ApplicationSetActionsCell: React.FC<{ appSet: ApplicationSetKind; index: number }> = ({
+  appSet,
+  index,
+}) => {
   const [actions] = useApplicationSetActionsProvider(appSet);
   return (
     <div style={{ textAlign: 'right' }}>
-      <ActionsDropdown actions={actions} id={'gitops-applicationset-actions-' + index} isKebabToggle={true} />
+      <ActionsDropdown
+        actions={actions}
+        id={'gitops-applicationset-actions-' + index}
+        isKebabToggle={true}
+      />
     </div>
   );
 };
diff --git a/src/gitops/components/shared/DataView/GitOpsDataViewTable.tsx b/src/gitops/components/shared/DataView/GitOpsDataViewTable.tsx
index 66da6ab00..5d221d6a9 100644
--- a/src/gitops/components/shared/DataView/GitOpsDataViewTable.tsx
+++ b/src/gitops/components/shared/DataView/GitOpsDataViewTable.tsx
@@ -28,6 +28,10 @@ export type GitOpsDataViewTableProps = {
    * Whether the table should display its error state.
    */
   isError?: boolean;
+  /**
+   * Whether the table should display its loading state.
+   */
+  isLoading?: boolean;
   /**
    * Optional custom error state body.
    */
@@ -63,6 +67,7 @@ export const GitOpsDataViewTable: React.FC<GitOpsDataViewTableProps> = ({
   columns,
   rows,
   isEmpty,
+  isLoading,
   emptyState,
   isError,
   errorState,
@@ -82,6 +87,9 @@ export const GitOpsDataViewTable: React.FC<GitOpsDataViewTableProps> = ({
     if (activeState !== undefined) {
       return activeState;
     }
+    if (isLoading) {
+      return DataViewState.loading;
+    }
     if (isError) {
       return DataViewState.error;
     }
@@ -89,7 +97,7 @@ export const GitOpsDataViewTable: React.FC<GitOpsDataViewTableProps> = ({
       return DataViewState.empty;
     }
     return null;
-  }, [activeState, isEmpty, isError]);
+  }, [activeState, isEmpty, isError, isLoading]);
 
   return (
     <DataView activeState={resolvedActiveState}>

From 80b0f68aa30062c57ebfb4bd9606fd47e84bd862 Mon Sep 17 00:00:00 2001
From: Keith Chong <kykchong@redhat.com>
Date: Sun, 2 Aug 2026 15:14:35 -0400
Subject: [PATCH 5/5] Change wording

Signed-off-by: Keith Chong <kykchong@redhat.com>
---
 locales/en/plugin__gitops-plugin.json               | 2 +-
 locales/ja/plugin__gitops-plugin.json               | 2 +-
 locales/ko/plugin__gitops-plugin.json               | 2 +-
 locales/zh/plugin__gitops-plugin.json               | 2 +-
 src/gitops/components/shared/ApplicationSetList.tsx | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/en/plugin__gitops-plugin.json b/locales/en/plugin__gitops-plugin.json
index 21db0d47a..1455d2a8f 100644
--- a/locales/en/plugin__gitops-plugin.json
+++ b/locales/en/plugin__gitops-plugin.json
@@ -317,7 +317,7 @@
   "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.",
   "Revision": "Revision",
   "No Argo CD ApplicationSets match the filter": "No Argo CD ApplicationSets match the filter",
-  "Try changing the filter to see more ApplicationSets.": "Try changing the filter to see more ApplicationSets.",
+  "Adjust the filter to see more ApplicationSets.": "Adjust the filter to see more ApplicationSets.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
   "There are no Argo CD ApplicationSets in all projects.": "There are no Argo CD ApplicationSets in all projects.",
   "No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
diff --git a/locales/ja/plugin__gitops-plugin.json b/locales/ja/plugin__gitops-plugin.json
index 741645ce9..41667b432 100644
--- a/locales/ja/plugin__gitops-plugin.json
+++ b/locales/ja/plugin__gitops-plugin.json
@@ -317,7 +317,7 @@
   "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.",
   "Revision": "リビジョン",
   "No Argo CD ApplicationSets match the filter": "No Argo CD ApplicationSets match the filter",
-  "Try changing the filter to see more ApplicationSets.": "Try changing the filter to see more ApplicationSets.",
+  "Adjust the filter to see more ApplicationSets.": "Adjust the filter to see more ApplicationSets.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
   "There are no Argo CD ApplicationSets in all projects.": "There are no Argo CD ApplicationSets in all projects.",
   "No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
diff --git a/locales/ko/plugin__gitops-plugin.json b/locales/ko/plugin__gitops-plugin.json
index 1db538c73..e12220c77 100644
--- a/locales/ko/plugin__gitops-plugin.json
+++ b/locales/ko/plugin__gitops-plugin.json
@@ -317,7 +317,7 @@
   "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.",
   "Revision": "개정 버전",
   "No Argo CD ApplicationSets match the filter": "No Argo CD ApplicationSets match the filter",
-  "Try changing the filter to see more ApplicationSets.": "Try changing the filter to see more ApplicationSets.",
+  "Adjust the filter to see more ApplicationSets.": "Adjust the filter to see more ApplicationSets.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
   "There are no Argo CD ApplicationSets in all projects.": "There are no Argo CD ApplicationSets in all projects.",
   "No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
diff --git a/locales/zh/plugin__gitops-plugin.json b/locales/zh/plugin__gitops-plugin.json
index 177716628..615806e12 100644
--- a/locales/zh/plugin__gitops-plugin.json
+++ b/locales/zh/plugin__gitops-plugin.json
@@ -317,7 +317,7 @@
   "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter to filter applications based on their health and sync status.",
   "Revision": "修订",
   "No Argo CD ApplicationSets match the filter": "No Argo CD ApplicationSets match the filter",
-  "Try changing the filter to see more ApplicationSets.": "Try changing the filter to see more ApplicationSets.",
+  "Adjust the filter to see more ApplicationSets.": "Adjust the filter to see more ApplicationSets.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
   "There are no Argo CD ApplicationSets in all projects.": "There are no Argo CD ApplicationSets in all projects.",
   "No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
diff --git a/src/gitops/components/shared/ApplicationSetList.tsx b/src/gitops/components/shared/ApplicationSetList.tsx
index dae0a6745..ae4cc9341 100644
--- a/src/gitops/components/shared/ApplicationSetList.tsx
+++ b/src/gitops/components/shared/ApplicationSetList.tsx
@@ -200,7 +200,7 @@ const ApplicationSetList: React.FC<ApplicationSetProps> = ({
         <>
           {t('No Argo CD ApplicationSets match the filter')}
           <br />
-          {t('Try changing the filter to see more ApplicationSets.')}
+          {t('Adjust the filter to see more ApplicationSets.')}
         </>
       );
     }