Skip to content

Show matchExpressions in Progressive Sync Step Groups (#10177) #256

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
aali309 merged 2 commits into from
Aug 7, 2026
+351 −96
Merged

Show matchExpressions in Progressive Sync Step Groups (#10177) #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bd1dab
Show matchExpressions in Progressive Sync Step Groups (#10177)
keithchong Aug 5, 2026
a880928
Atif's comments. More PF6 updates
keithchong Aug 6, 2026
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
9 changes: 6 additions & 3 deletions locales/en/plugin__gitops-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,14 @@
"App Project": "AppProject",
"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.",
"Progressive Sync Step {{x}}": "Progressive Sync Step {{x}}",
"Applications": "Applications",
"Show all match expressions": "Show all match expressions",
"Edit ApplicationSet": "Edit ApplicationSet",
"Delete ApplicationSet": "Delete ApplicationSet",
"View Graph": "View Graph",
"Match Expressions": "Match Expressions",
"Name must be unique within a namespace.": "Name must be unique within a namespace.",
"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",
Expand Down Expand Up @@ -257,6 +261,8 @@
"Created At": "Created At",
"No pods": "No pods",
"There are no pods associated with the rollout.": "There are no pods associated with the rollout.",
"Close": "Close",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"Edit Pod": "Edit Pod",
"Edit Rollout": "Edit Rollout",
"Promote": "Promote",
Expand All @@ -271,9 +277,7 @@
"ready": "ready",
"0 Pods": "0 Pods",
"Scaling down in:": "Scaling down in:",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"Rollout Revisions": "Rollout Revisions",
"Close": "Close",
"Stable": "Stable",
"Active": "Active",
"Preview": "Preview",
Expand Down Expand Up @@ -331,7 +335,6 @@
"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.",
"Edit": "Edit",
Expand Down
9 changes: 6 additions & 3 deletions locales/ja/plugin__gitops-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,14 @@
"App Project": "AppProject",
"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.",
"Progressive Sync Step {{x}}": "Progressive Sync Step {{x}}",
"Applications": "Applications",
"Show all match expressions": "Show all match expressions",
"Edit ApplicationSet": "Edit ApplicationSet",
"Delete ApplicationSet": "Delete ApplicationSet",
"View Graph": "View Graph",
"Match Expressions": "Match Expressions",
"Name must be unique within a namespace.": "Name must be unique within a namespace.",
"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",
Expand Down Expand Up @@ -257,6 +261,8 @@
"Created At": "Created At",
"No pods": "No pods",
"There are no pods associated with the rollout.": "There are no pods associated with the rollout.",
"Close": "Close",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"Edit Pod": "Edit Pod",
"Edit Rollout": "Edit Rollout",
"Promote": "Promote",
Expand All @@ -271,9 +277,7 @@
"ready": "ready",
"0 Pods": "0 Pods",
"Scaling down in:": "Scaling down in:",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"Rollout Revisions": "Rollout Revisions",
"Close": "Close",
"Stable": "Stable",
"Active": "Active",
"Preview": "Preview",
Expand Down Expand Up @@ -331,7 +335,6 @@
"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.",
"Edit": "Edit",
Expand Down
9 changes: 6 additions & 3 deletions locales/ko/plugin__gitops-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,14 @@
"App Project": "App Project",
"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.",
"Progressive Sync Step {{x}}": "Progressive Sync Step {{x}}",
"Applications": "Applications",
"Show all match expressions": "Show all match expressions",
"Edit ApplicationSet": "Edit ApplicationSet",
"Delete ApplicationSet": "Delete ApplicationSet",
"View Graph": "View Graph",
"Match Expressions": "Match Expressions",
"Name must be unique within a namespace.": "Name must be unique within a namespace.",
Comment on lines +104 to +111

@coderabbitai coderabbitai Bot Aug 6, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Translate the new entries in the Korean and Chinese locale files.

The new values are English source text in both non-English locale files. This makes the new ApplicationSet and rollout UI display English instead of localized text.

  • locales/ko/plugin__gitops-plugin.json#L104-L111: Replace the ApplicationSet values with reviewed Korean translations.
  • locales/ko/plugin__gitops-plugin.json#L264-L265: Replace the rollout values with reviewed Korean translations.
  • locales/zh/plugin__gitops-plugin.json#L104-L111: Replace the ApplicationSet values with reviewed Chinese translations.
  • locales/zh/plugin__gitops-plugin.json#L264-L265: Replace the rollout values with reviewed Chinese translations.
📍 Affects 2 files
  • locales/ko/plugin__gitops-plugin.json#L104-L111 (this comment)
  • locales/ko/plugin__gitops-plugin.json#L264-L265
  • locales/zh/plugin__gitops-plugin.json#L104-L111
  • locales/zh/plugin__gitops-plugin.json#L264-L265
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@locales/ko/plugin__gitops-plugin.json` around lines 104 - 111, Translate the
newly added English locale values using reviewed translations: update the
ApplicationSet entries at locales/ko/plugin__gitops-plugin.json lines 104-111
and locales/zh/plugin__gitops-plugin.json lines 104-111, and update the rollout
entries at locales/ko/plugin__gitops-plugin.json lines 264-265 and
locales/zh/plugin__gitops-plugin.json lines 264-265. Preserve the existing keys
and valid JSON structure.

"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",
Expand Down Expand Up @@ -257,6 +261,8 @@
"Created At": "Created At",
"No pods": "No pods",
"There are no pods associated with the rollout.": "There are no pods associated with the rollout.",
"Close": "Close",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"Edit Pod": "Edit Pod",
"Edit Rollout": "Edit Rollout",
"Promote": "Promote",
Expand All @@ -271,9 +277,7 @@
"ready": "ready",
"0 Pods": "0 Pods",
"Scaling down in:": "Scaling down in:",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"Rollout Revisions": "Rollout Revisions",
"Close": "Close",
"Stable": "Stable",
"Active": "Active",
"Preview": "Preview",
Expand Down Expand Up @@ -331,7 +335,6 @@
"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.",
"Edit": "Edit",
Expand Down
9 changes: 6 additions & 3 deletions locales/zh/plugin__gitops-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,14 @@
"App Project": "App Project",
"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.",
"Progressive Sync Step {{x}}": "Progressive Sync Step {{x}}",
"Applications": "Applications",
"Show all match expressions": "Show all match expressions",
"Edit ApplicationSet": "Edit ApplicationSet",
"Delete ApplicationSet": "Delete ApplicationSet",
"View Graph": "View Graph",
"Match Expressions": "Match Expressions",
"Name must be unique within a namespace.": "Name must be unique within a namespace.",
"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",
Expand Down Expand Up @@ -257,6 +261,8 @@
"Created At": "Created At",
"No pods": "No pods",
"There are no pods associated with the rollout.": "There are no pods associated with the rollout.",
"Close": "Close",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"Edit Pod": "Edit Pod",
"Edit Rollout": "Edit Rollout",
"Promote": "Promote",
Expand All @@ -271,9 +277,7 @@
"ready": "ready",
"0 Pods": "0 Pods",
"Scaling down in:": "Scaling down in:",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"Rollout Revisions": "Rollout Revisions",
"Close": "Close",
"Stable": "Stable",
"Active": "Active",
"Preview": "Preview",
Expand Down Expand Up @@ -331,7 +335,6 @@
"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.",
"Edit": "Edit",
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@
"react-redux": "7.2.9",
"react-router-dom-v5-compat": "^6.30.0",
"react-router-hash-link": "2.4.3",
"redux": "4.0.1"
"redux": "4.0.1",
"yaml": "^2.9.0"
},
"//TODO": [
"For @patternfly/react-icons: find another solution for icons from older react-icons version and remove this dependency."
Expand Down
10 changes: 10 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/gitops/components/application/ApplicationDetailsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const ApplicationDetailsTab: React.FC<ApplicationDetailsTabProps> = ({ obj }) =>
</Flex>
<Flex flex={{ default: 'flex_2' }} direction={{ default: 'column' }}>
<FlexItem>
<DescriptionList className="pf-c-description-list">
<DescriptionList className="pf-v6-c-description-list">
<DetailsDescriptionGroup
title={t('Health Status')}
help={t('Health status represents the overall health of the application.')}
Expand Down
28 changes: 14 additions & 14 deletions src/gitops/components/application/ApplicationSyncStatusTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const ApplicationSyncStatusTab: React.FC<ApplicationSyncStatusTabProps> = ({ obj
>
<Flex flex={{ default: 'flex_2' }}>
<FlexItem>
<DescriptionList className="pf-c-description-list">
<DescriptionList className="pf-v6-c-description-list">
<DetailsDescriptionGroup
title={t('Operation')}
help={t('The operation that was performed.')}
Expand All @@ -118,8 +118,8 @@ const ApplicationSyncStatusTab: React.FC<ApplicationSyncStatusTabProps> = ({ obj
{!obj?.status?.operationState && !obj?.status?.conditions && '-'}
</Flex>
</DetailsDescriptionGroup>
<DescriptionListGroup className="pf-c-description-list__group">
<DescriptionListTermHelpText className="pf-c-description-list__term">
<DescriptionListGroup className="pf-v6-c-description-list__group">
<DescriptionListTermHelpText className="pf-v6-c-description-list__term">
<Popover
headerContent={<div>{t('Phase')}</div>}
bodyContent={<div>{t('The operation phase.')}</div>}
Expand All @@ -134,8 +134,8 @@ const ApplicationSyncStatusTab: React.FC<ApplicationSyncStatusTabProps> = ({ obj
</DescriptionListDescription>
</DescriptionListGroup>

<DescriptionListGroup className="pf-c-description-list__group">
<DescriptionListTermHelpText className="pf-c-description-list__term">
<DescriptionListGroup className="pf-v6-c-description-list__group">
<DescriptionListTermHelpText className="pf-v6-c-description-list__term">
<Popover
headerContent={<div>{t('Message')}</div>}
bodyContent={<div>{t('The message from the operation.')}</div>}
Expand All @@ -152,8 +152,8 @@ const ApplicationSyncStatusTab: React.FC<ApplicationSyncStatusTabProps> = ({ obj
</DescriptionListDescription>
</DescriptionListGroup>

<DescriptionListGroup className="pf-c-description-list__group">
<DescriptionListTermHelpText className="pf-c-description-list__term">
<DescriptionListGroup className="pf-v6-c-description-list__group">
<DescriptionListTermHelpText className="pf-v6-c-description-list__term">
<Popover
headerContent={<div>{t('Initiated By')}</div>}
bodyContent={<div>{t('Who initiated the operation.')}</div>}
Expand All @@ -174,9 +174,9 @@ const ApplicationSyncStatusTab: React.FC<ApplicationSyncStatusTabProps> = ({ obj
</Flex>
<Flex flex={{ default: 'flex_2' }} direction={{ default: 'column' }}>
<FlexItem>
<DescriptionList className="pf-c-description-list">
<DescriptionListGroup className="pf-c-description-list__group">
<DescriptionListTermHelpText className="pf-c-description-list__term">
<DescriptionList className="pf-v6-c-description-list">
<DescriptionListGroup className="pf-v6-c-description-list__group">
<DescriptionListTermHelpText className="pf-v6-c-description-list__term">
<Popover
headerContent={<div>{t('Started At')}</div>}
bodyContent={<div>{t('When the operation was started.')}</div>}
Expand All @@ -191,8 +191,8 @@ const ApplicationSyncStatusTab: React.FC<ApplicationSyncStatusTabProps> = ({ obj
</DescriptionListDescription>
</DescriptionListGroup>

<DescriptionListGroup className="pf-c-description-list__group">
<DescriptionListTermHelpText className="pf-c-description-list__term">
<DescriptionListGroup className="pf-v6-c-description-list__group">
<DescriptionListTermHelpText className="pf-v6-c-description-list__term">
<Popover
headerContent={<div>{t('Duration')}</div>}
bodyContent={<div>{t('How long the operation took to complete.')}</div>}
Expand All @@ -217,8 +217,8 @@ const ApplicationSyncStatusTab: React.FC<ApplicationSyncStatusTabProps> = ({ obj
</DescriptionListDescription>
</DescriptionListGroup>

<DescriptionListGroup className="pf-c-description-list__group">
<DescriptionListTermHelpText className="pf-c-description-list__term">
<DescriptionListGroup className="pf-v6-c-description-list__group">
<DescriptionListTermHelpText className="pf-v6-c-description-list__term">
<Popover
headerContent={<div>{t('Finished At')}</div>}
bodyContent={<div>{t('When the operation was finished.')}</div>}
Expand Down
6 changes: 6 additions & 0 deletions src/gitops/components/application/graph/ApplicationGraphView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@

.pf-topology__node__label__background {
fill: var(--pf-t--global--background--color--floating--default);
stroke: var(--pf-t--global--border--color--default);
stroke-width: 1;
}

.pf-topology__node__action-icon:hover svg{
Expand All @@ -191,4 +193,8 @@
fill: var(--pf-t--global--background--color--floating--default);
}
}

.topology-example-sidebar.pf-topology-side-bar {
background-color: var(--pf-t--global--background--color--floating--default);
}
}
4 changes: 4 additions & 0 deletions src/gitops/components/application/graph/graph-utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ const createApplicationNode = (
height: APP_NODE_HEIGHT,
data: {
name: application?.metadata?.name,
namespace: application?.metadata?.namespace,
kind: application?.kind,
version: ApplicationModel.apiVersion || 'v1alpha1',
group: ApplicationModel.apiGroup || 'argoproj.io',
badge: 'A',
badgeColor: RESOURCE_COLORS.get(
RESOURCE_BADGE_COLORS.get('.co-m-resource-' + application?.kind.toLowerCase()),
Expand Down
2 changes: 1 addition & 1 deletion src/gitops/components/appset/AppSetDetailsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
}

// Force dashed border styling for labels in ApplicationSet details
.pf-c-description-list__description .co-label-group {
.pf-v6-c-description-list__description .co-label-group {
border: 1px dashed var(--pf-v6-global--BorderColor--200) !important;
border-radius: var(--pf-v6-global--BorderRadius--sm) !important;
padding: var(--pf-v6-global--spacer--sm) !important;
Expand Down
2 changes: 1 addition & 1 deletion src/gitops/components/appset/AppSetDetailsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const AppSetDetailsTab: React.FC<AppSetDetailsTabProps> = ({ obj, match }) => {
</Flex>
<Flex flex={{ default: 'flex_2' }} direction={{ default: 'column' }}>
<FlexItem>
<DescriptionList className="pf-c-description-list">
<DescriptionList className="pf-v6-c-description-list">
<DetailsDescriptionGroup
title={t('Status')}
help={t('Current health status of the ApplicationSet.')}
Expand Down
Loading