Skip to content

Sort by name by default; Remove ArgoCD from title (#9329) #222

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

Open
keithchong wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −9
Open

Sort by name by default; Remove ArgoCD from title (#9329) #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions locales/en/plugin__gitops-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"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.",
"Applications": "ArgoCD Applications",
"Applications": "Applications",
"Edit ApplicationSet": "Edit ApplicationSet",
"Delete ApplicationSet": "Delete ApplicationSet",
"AppSet ownerReference Tree View": "AppSet ownerReference Tree View",
Expand Down Expand Up @@ -213,7 +213,7 @@
"No Argo CD App Projects": "No Argo CD App Projects",
"Unable to load data": "Unable to load data",
"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.",
"AppProjects": "ArgoCD AppProjects",
"AppProjects": "AppProjects",
"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 AppProject": "Create AppProject",
"Search by name...": "Search by name...",
Expand Down Expand Up @@ -287,7 +287,7 @@
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
"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.",
"Argo Rollouts": "Argo Rollouts",
"Rollouts": "Rollouts",
"Create Rollout": "Create Rollout",
"Pods": "Pods",
"Selector": "Selector",
Expand Down Expand Up @@ -326,7 +326,7 @@
"No matching Argo CD ApplicationSets": "No matching Argo CD ApplicationSets",
"No Argo CD ApplicationSets": "No Argo CD ApplicationSets",
"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": "ArgoCD ApplicationSets",
"ApplicationSets": "ApplicationSets",
"Create ApplicationSet": "Create ApplicationSet",
"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.",
Expand Down
2 changes: 1 addition & 1 deletion locales/ja/plugin__gitops-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
"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.",
"Argo Rollouts": "Argo Rollouts",
"Rollouts": "Rollouts",
"Create Rollout": "Create Rollout",
"Pods": "Pods",
"Selector": "Selector",
Expand Down
2 changes: 1 addition & 1 deletion locales/ko/plugin__gitops-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
"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.",
"Argo Rollouts": "Argo Rollouts",
"Rollouts": "Rollouts",
"Create Rollout": "Create Rollout",
"Pods": "Pods",
"Selector": "Selector",
Expand Down
2 changes: 1 addition & 1 deletion locales/zh/plugin__gitops-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
"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.",
"Argo Rollouts": "Argo Rollouts",
"Rollouts": "Rollouts",
"Create Rollout": "Create Rollout",
"Pods": "Pods",
"Selector": "Selector",
Expand Down
2 changes: 1 addition & 1 deletion src/gitops/components/rollout/RolloutList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const RolloutList: React.FC<RolloutListTabProps> = ({
<>
{showTitle == undefined && (
<ListPageHeader
title={t('Argo Rollouts')}
title={t('Rollouts')}
badge={
location.pathname?.includes('openshift-gitops-operator') ? null : (
<TechPreviewBadge
Expand Down
6 changes: 5 additions & 1 deletion src/gitops/components/shared/DataView/GitOpsDataViewTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@ export const useGitOpsDataViewSort = (
columns: GitOpsDataViewSortConfig[],
): UseGitOpsDataViewSortResult => {
const [searchParams, setSearchParams] = useSearchParams();
const { sortBy, direction, onSort } = useDataViewSort({ searchParams, setSearchParams });
const { sortBy, direction, onSort } = useDataViewSort({
initialSort: { sortBy: 'name', direction: 'asc' },
searchParams,
setSearchParams,
});

const sortByIndex = React.useMemo(
() => columns.findIndex((column) => column.key === sortBy),
Expand Down