Skip to content

Commit 0a14d06

Browse files
authored
Merge pull request #222 from keithchong/9329-PartB-PartC-SuggestedChanges
Sort by name by default; Remove ArgoCD from title (#9329)
2 parents 6bf30e5 + 2d7630f commit 0a14d06

6 files changed

Lines changed: 13 additions & 9 deletions

File tree

locales/en/plugin__gitops-plugin.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
"App Project": "AppProject",
148148
"Argo CD project that this ApplicationSet belongs to.": "Argo CD project that this ApplicationSet belongs to.",
149149
"Git repository URL where the ApplicationSet configuration is stored.": "Git repository URL where the ApplicationSet configuration is stored.",
150-
"Applications": "ArgoCD Applications",
150+
"Applications": "Applications",
151151
"Edit ApplicationSet": "Edit ApplicationSet",
152152
"Delete ApplicationSet": "Delete ApplicationSet",
153153
"AppSet ownerReference Tree View": "AppSet ownerReference Tree View",
@@ -214,7 +214,7 @@
214214
"No Argo CD App Projects": "No Argo CD App Projects",
215215
"Unable to load data": "Unable to load data",
216216
"There was an error retrieving App Projects. Check your connection and reload the page.": "There was an error retrieving App Projects. Check your connection and reload the page.",
217-
"AppProjects": "ArgoCD AppProjects",
217+
"AppProjects": "AppProjects",
218218
"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",
219219
"Create AppProject": "Create AppProject",
220220
"Search by name...": "Search by name...",
@@ -288,7 +288,7 @@
288288
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
289289
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
290290
"There was an error retrieving rollouts. Check your connection and reload the page.": "There was an error retrieving rollouts. Check your connection and reload the page.",
291-
"Argo Rollouts": "Argo Rollouts",
291+
"Rollouts": "Rollouts",
292292
"Create Rollout": "Create Rollout",
293293
"Pods": "Pods",
294294
"Selector": "Selector",
@@ -327,7 +327,7 @@
327327
"No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
328328
"No Argo CD ApplicationSets": "No Argo CD ApplicationSets",
329329
"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.",
330-
"ApplicationSets": "ArgoCD ApplicationSets",
330+
"ApplicationSets": "ApplicationSets",
331331
"Create ApplicationSet": "Create ApplicationSet",
332332
"Name must be unique within a namespace.": "Name must be unique within a namespace.",
333333
"Namespace defines the space within which each name must be unique.": "Namespace defines the space within which each name must be unique.",

locales/ja/plugin__gitops-plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
289289
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
290290
"There was an error retrieving rollouts. Check your connection and reload the page.": "There was an error retrieving rollouts. Check your connection and reload the page.",
291-
"Argo Rollouts": "Argo Rollouts",
291+
"Rollouts": "Rollouts",
292292
"Create Rollout": "Create Rollout",
293293
"Pods": "Pods",
294294
"Selector": "Selector",

locales/ko/plugin__gitops-plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
289289
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
290290
"There was an error retrieving rollouts. Check your connection and reload the page.": "There was an error retrieving rollouts. Check your connection and reload the page.",
291-
"Argo Rollouts": "Argo Rollouts",
291+
"Rollouts": "Rollouts",
292292
"Create Rollout": "Create Rollout",
293293
"Pods": "Pods",
294294
"Selector": "Selector",

locales/zh/plugin__gitops-plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
289289
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
290290
"There was an error retrieving rollouts. Check your connection and reload the page.": "There was an error retrieving rollouts. Check your connection and reload the page.",
291-
"Argo Rollouts": "Argo Rollouts",
291+
"Rollouts": "Rollouts",
292292
"Create Rollout": "Create Rollout",
293293
"Pods": "Pods",
294294
"Selector": "Selector",

src/gitops/components/rollout/RolloutList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ const RolloutList: React.FC<RolloutListTabProps> = ({
179179
<>
180180
{showTitle == undefined && (
181181
<ListPageHeader
182-
title={t('Argo Rollouts')}
182+
title={t('Rollouts')}
183183
badge={
184184
location.pathname?.includes('openshift-gitops-operator') ? null : (
185185
<TechPreviewBadge

src/gitops/components/shared/DataView/GitOpsDataViewTable.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,11 @@ export const useGitOpsDataViewSort = (
120120
columns: GitOpsDataViewSortConfig[],
121121
): UseGitOpsDataViewSortResult => {
122122
const [searchParams, setSearchParams] = useSearchParams();
123-
const { sortBy, direction, onSort } = useDataViewSort({ searchParams, setSearchParams });
123+
const { sortBy, direction, onSort } = useDataViewSort({
124+
initialSort: { sortBy: 'name', direction: 'asc' },
125+
searchParams,
126+
setSearchParams,
127+
});
124128

125129
const sortByIndex = React.useMemo(
126130
() => columns.findIndex((column) => column.key === sortBy),

0 commit comments

Comments
 (0)