Update based on Atif's comments (#8558, #9202)

keithchong · keithchong · commit 37e06a4106fc · 2026-03-31T11:34:51.000-04:00
Signed-off-by: Keith Chong &lt;kykchong@redhat.com&gt;
diff --git a/locales/en/plugin__gitops-plugin.json b/locales/en/plugin__gitops-plugin.json
@@ -146,8 +146,8 @@
   "Argo CD project that this ApplicationSet belongs to.": "Argo CD project that this ApplicationSet belongs to.",
   "Git repository URL where the ApplicationSet configuration is stored.": "Git repository URL where the ApplicationSet configuration is stored.",
   "Applications": "ArgoCD Applications",
-  "Edit Application Set": "Edit Application Set",
-  "Delete Application Set": "Delete Application Set",
+  "Edit ApplicationSet": "Edit ApplicationSet",
+  "Delete ApplicationSet": "Delete ApplicationSet",
   "AppSet ownerReference Tree View": "AppSet ownerReference Tree View",
   "Progressive Sync Flow View": "Progressive Sync Flow View",
   "Expand or collapse all progressive sync step groups": "Expand or collapse all progressive sync step groups",
@@ -315,8 +315,8 @@
   "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
   "There are no Argo CD Applications in all projects.": "There are no Argo CD Applications in all projects.",
   "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.",
-  "Application Set Applications": "Application Set Applications",
-  "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.": "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.",
+  "ApplicationSet Applications": "ApplicationSet Applications",
+  "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.",
   "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.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
@@ -339,8 +339,6 @@
   "Stop": "Stop",
   "Refresh": "Refresh",
   "Refresh (Hard)": "Refresh (Hard)",
-  "Edit ApplicationSet": "Edit ApplicationSet",
-  "Delete ApplicationSet": "Delete ApplicationSet",
   "Actions": "Actions",
   "You don't have permission to perform this action": "You don't have permission to perform this action",
   "annotations": "annotations",
diff --git a/locales/ja/plugin__gitops-plugin.json b/locales/ja/plugin__gitops-plugin.json
@@ -146,8 +146,8 @@
   "Argo CD project that this ApplicationSet belongs to.": "Argo CD project that this ApplicationSet belongs to.",
   "Git repository URL where the ApplicationSet configuration is stored.": "Git repository URL where the ApplicationSet configuration is stored.",
   "Applications": "Applications",
-  "Edit Application Set": "Edit Application Set",
-  "Delete Application Set": "Delete Application Set",
+  "Edit ApplicationSet": "Edit ApplicationSet",
+  "Delete ApplicationSet": "Delete ApplicationSet",
   "AppSet ownerReference Tree View": "AppSet ownerReference Tree View",
   "Progressive Sync Flow View": "Progressive Sync Flow View",
   "Expand or collapse all progressive sync step groups": "Expand or collapse all progressive sync step groups",
@@ -315,8 +315,8 @@
   "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
   "There are no Argo CD Applications in all projects.": "There are no Argo CD Applications in all projects.",
   "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.",
-  "Application Set Applications": "Application Set Applications",
-  "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.": "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.",
+  "ApplicationSet Applications": "ApplicationSet Applications",
+  "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.",
   "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.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
@@ -339,8 +339,6 @@
   "Stop": "Stop",
   "Refresh": "Refresh",
   "Refresh (Hard)": "Refresh (Hard)",
-  "Edit ApplicationSet": "Edit ApplicationSet",
-  "Delete ApplicationSet": "Delete ApplicationSet",
   "Actions": "Actions",
   "You don't have permission to perform this action": "You don't have permission to perform this action",
   "annotations": "annotations",
diff --git a/locales/ko/plugin__gitops-plugin.json b/locales/ko/plugin__gitops-plugin.json
@@ -146,8 +146,8 @@
   "Argo CD project that this ApplicationSet belongs to.": "Argo CD project that this ApplicationSet belongs to.",
   "Git repository URL where the ApplicationSet configuration is stored.": "Git repository URL where the ApplicationSet configuration is stored.",
   "Applications": "Applications",
-  "Edit Application Set": "Edit Application Set",
-  "Delete Application Set": "Delete Application Set",
+  "Edit ApplicationSet": "Edit ApplicationSet",
+  "Delete ApplicationSet": "Delete ApplicationSet",
   "AppSet ownerReference Tree View": "AppSet ownerReference Tree View",
   "Progressive Sync Flow View": "Progressive Sync Flow View",
   "Expand or collapse all progressive sync step groups": "Expand or collapse all progressive sync step groups",
@@ -315,8 +315,8 @@
   "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
   "There are no Argo CD Applications in all projects.": "There are no Argo CD Applications in all projects.",
   "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.",
-  "Application Set Applications": "Application Set Applications",
-  "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.": "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.",
+  "ApplicationSet Applications": "ApplicationSet Applications",
+  "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.",
   "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.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
@@ -339,8 +339,6 @@
   "Stop": "Stop",
   "Refresh": "Refresh",
   "Refresh (Hard)": "Refresh (Hard)",
-  "Edit ApplicationSet": "Edit ApplicationSet",
-  "Delete ApplicationSet": "Delete ApplicationSet",
   "Actions": "Actions",
   "You don't have permission to perform this action": "You don't have permission to perform this action",
   "annotations": "annotations",
diff --git a/locales/zh/plugin__gitops-plugin.json b/locales/zh/plugin__gitops-plugin.json
@@ -146,8 +146,8 @@
   "Argo CD project that this ApplicationSet belongs to.": "Argo CD project that this ApplicationSet belongs to.",
   "Git repository URL where the ApplicationSet configuration is stored.": "Git repository URL where the ApplicationSet configuration is stored.",
   "Applications": "Applications",
-  "Edit Application Set": "Edit Application Set",
-  "Delete Application Set": "Delete Application Set",
+  "Edit ApplicationSet": "Edit ApplicationSet",
+  "Delete ApplicationSet": "Delete ApplicationSet",
   "AppSet ownerReference Tree View": "AppSet ownerReference Tree View",
   "Progressive Sync Flow View": "Progressive Sync Flow View",
   "Expand or collapse all progressive sync step groups": "Expand or collapse all progressive sync step groups",
@@ -315,8 +315,8 @@
   "There are no Argo CD Applications in this project.": "There are no Argo CD Applications in this project.",
   "There are no Argo CD Applications in all projects.": "There are no Argo CD Applications in all projects.",
   "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.",
-  "Application Set Applications": "Application Set Applications",
-  "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.": "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.",
+  "ApplicationSet Applications": "ApplicationSet Applications",
+  "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.": "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.",
   "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.",
   "There are no Argo CD ApplicationSets in this project.": "There are no Argo CD ApplicationSets in this project.",
@@ -339,8 +339,6 @@
   "Stop": "Stop",
   "Refresh": "Refresh",
   "Refresh (Hard)": "Refresh (Hard)",
-  "Edit ApplicationSet": "Edit ApplicationSet",
-  "Delete ApplicationSet": "Delete ApplicationSet",
   "Actions": "Actions",
   "You don't have permission to perform this action": "You don't have permission to perform this action",
   "annotations": "annotations",
diff --git a/src/gitops/components/appset/graph/ApplicationSetGraphView.tsx b/src/gitops/components/appset/graph/ApplicationSetGraphView.tsx
@@ -204,13 +204,13 @@ const AppSetContextMenuItem: React.FC<AppSetContextMenuItemProps> = ({
           `/k8s/ns/${applicationSet.metadata?.namespace}/${applicationModelRef}/${applicationSet.metadata?.name}/yaml`,
         );
         break;
-      case t('Edit Application Set'):
+      case t('Edit ApplicationSet'):
         navigate(
           `/k8s/ns/${applicationSet.metadata?.namespace}/${applicationSetModelRef}/${applicationSet.metadata?.name}/yaml`,
         );
         break;
       case t('Delete Application'):
-      case t('Delete Application Set'):
+      case t('Delete ApplicationSet'):
         launchDeleteModal();
         break;
     }
@@ -299,8 +299,8 @@ const createAppSetComponentFactory =
             paramsRef,
             t('Edit labels'),
             t('Edit annotations'),
-            t('Edit Application Set'),
-            t('Delete Application Set'),
+            t('Edit ApplicationSet'),
+            t('Delete ApplicationSet'),
           ),
         )(withSelection()(ApplicationSetNode));
       default:
@@ -334,8 +334,8 @@ export const ApplicationSetGraphView: React.FC<{
   const [treeViewLayout, setTreeViewLayout] = useUserSettings(
     'redhat.gitops.appSetTreeViewLayout',
     isProgressiveSyncEnabled
-      ? TreeViewLayout.OWNER_REFERENCE_LAYOUT
-      : TreeViewLayout.PROGRESSIVE_SYNC_FLOW_LAYOUT,
+      ? TreeViewLayout.PROGRESSIVE_SYNC_FLOW_LAYOUT
+      : TreeViewLayout.OWNER_REFERENCE_LAYOUT,
     false,
   );
   // Track expanded step-groups - only expanded step-groups have their app nodes included in initialNodes
@@ -759,9 +759,6 @@ export const ApplicationSetGraphView: React.FC<{
         // Re-layout with collapsed sizes
         graph.layout();
       });
-    } else if (!initialCollapseAppliedRef.current && treeViewLayout) {
-      // When treeViewLayout is OWNER_REFERENCE_LAYOUT, mark initial collapse as done without collapsing
-      initialCollapseAppliedRef.current = true;
     }
   }, [
     controller,
diff --git a/src/gitops/components/shared/ApplicationList.tsx b/src/gitops/components/shared/ApplicationList.tsx
@@ -226,12 +226,12 @@ const ApplicationList: React.FC<ApplicationProps> = ({
           <Flex flex={{ default: 'flexDefault' }}>
             {/* {showTitle == undefined && ( */}
             <Title headingLevel="h2" className="co-section-heading">
-              {t('Application Set Applications')}
+              {t('ApplicationSet Applications')}
             </Title>
             {/* )} */}
             <FlexItem fullWidth={{ default: 'fullWidth' }}>
               {t(
-                "The graph and table views show the Application Set's applications.  Use the filter below the graph to filter applications based on their health and sync status.",
+                "The graph and table views show the ApplicationSet's applications. Use the filter below the graph to filter applications based on their health and sync status.",
               )}
             </FlexItem>
             <FlexItem
