Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions locales/en/plugin__gitops-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,27 +255,33 @@
"No pods": "No pods",
"There are no pods associated with the rollout.": "There are no pods associated with the rollout.",
"Edit Pod": "Edit Pod",
"Edit Rollout": "Edit Rollout",
"Promote": "Promote",
"Full Promote": "Full Promote",
"Abort": "Abort",
"Retry": "Retry",
"Restart": "Restart",
"Edit Rollout": "Edit Rollout",
"Rollback": "Rollback",
"Age": "Age",
"Info": "Info",
"Ready containers": "Ready containers",
"ready": "ready",
"0 Pods": "0 Pods",
"Scaling down in:": "Scaling down in:",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"The current status of the rollout": "The current status of the rollout",
"There is no rollout status. Check that the Rollout Manager is created and is available.": "There is no rollout status. Check that the Rollout Manager is created and is available.",
"Strategy": "Strategy",
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
"FullPromote": "FullPromote",
"Close": "Close",
"Stable": "Stable",
"Active": "Active",
"Preview": "Preview",
"Canary": "Canary",
"Rollout details": "Rollout details",
"Replicas": "Replicas",
"The number of desired replicas for the rollout": "The number of desired replicas for the rollout",
"The current status of the rollout": "The current status of the rollout",
"Strategy": "Strategy",
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
"No Argo Rollouts": "No Argo Rollouts",
"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.",
Expand Down
14 changes: 10 additions & 4 deletions locales/ja/plugin__gitops-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,27 +255,33 @@
"No pods": "No pods",
"There are no pods associated with the rollout.": "There are no pods associated with the rollout.",
"Edit Pod": "Edit Pod",
"Edit Rollout": "Edit Rollout",
"Promote": "Promote",
"Full Promote": "Full Promote",
"Abort": "Abort",
"Retry": "Retry",
"Restart": "Restart",
"Edit Rollout": "Edit Rollout",
"Rollback": "Rollback",
"Age": "Age",
"Info": "Info",
"Ready containers": "Ready containers",
"ready": "ready",
"0 Pods": "0 Pods",
"Scaling down in:": "Scaling down in:",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"The current status of the rollout": "The current status of the rollout",
"There is no rollout status. Check that the Rollout Manager is created and is available.": "There is no rollout status. Check that the Rollout Manager is created and is available.",
"Strategy": "Strategy",
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
"FullPromote": "FullPromote",
"Close": "Close",
"Stable": "Stable",
"Active": "Active",
"Preview": "Preview",
"Canary": "Canary",
"Rollout details": "Rollout details",
"Replicas": "Replicas",
"The number of desired replicas for the rollout": "The number of desired replicas for the rollout",
"The current status of the rollout": "The current status of the rollout",
"Strategy": "Strategy",
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
"No Argo Rollouts": "No Argo Rollouts",
"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.",
Expand Down
14 changes: 10 additions & 4 deletions locales/ko/plugin__gitops-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,27 +255,33 @@
"No pods": "No pods",
"There are no pods associated with the rollout.": "There are no pods associated with the rollout.",
"Edit Pod": "Edit Pod",
"Edit Rollout": "Edit Rollout",
"Promote": "Promote",
"Full Promote": "Full Promote",
"Abort": "Abort",
"Retry": "Retry",
"Restart": "Restart",
"Edit Rollout": "Edit Rollout",
"Rollback": "Rollback",
"Age": "Age",
"Info": "Info",
"Ready containers": "Ready containers",
"ready": "ready",
"0 Pods": "0 Pods",
"Scaling down in:": "Scaling down in:",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"The current status of the rollout": "The current status of the rollout",
"There is no rollout status. Check that the Rollout Manager is created and is available.": "There is no rollout status. Check that the Rollout Manager is created and is available.",
"Strategy": "Strategy",
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
"FullPromote": "FullPromote",
"Close": "Close",
"Stable": "Stable",
"Active": "Active",
"Preview": "Preview",
"Canary": "Canary",
"Rollout details": "Rollout details",
"Replicas": "Replicas",
"The number of desired replicas for the rollout": "The number of desired replicas for the rollout",
"The current status of the rollout": "The current status of the rollout",
"Strategy": "Strategy",
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
"No Argo Rollouts": "No Argo Rollouts",
"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.",
Expand Down
14 changes: 10 additions & 4 deletions locales/zh/plugin__gitops-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,27 +255,33 @@
"No pods": "No pods",
"There are no pods associated with the rollout.": "There are no pods associated with the rollout.",
"Edit Pod": "Edit Pod",
"Edit Rollout": "Edit Rollout",
"Promote": "Promote",
"Full Promote": "Full Promote",
"Abort": "Abort",
"Retry": "Retry",
"Restart": "Restart",
"Edit Rollout": "Edit Rollout",
"Rollback": "Rollback",
"Age": "Age",
"Info": "Info",
"Ready containers": "Ready containers",
"ready": "ready",
"0 Pods": "0 Pods",
"Scaling down in:": "Scaling down in:",
"{{x}} failed with an error.": "{{x}} failed with an error.",
"The current status of the rollout": "The current status of the rollout",
"There is no rollout status. Check that the Rollout Manager is created and is available.": "There is no rollout status. Check that the Rollout Manager is created and is available.",
"Strategy": "Strategy",
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
"FullPromote": "FullPromote",
"Close": "Close",
"Stable": "Stable",
"Active": "Active",
"Preview": "Preview",
"Canary": "Canary",
"Rollout details": "Rollout details",
"Replicas": "Replicas",
"The number of desired replicas for the rollout": "The number of desired replicas for the rollout",
"The current status of the rollout": "The current status of the rollout",
"Strategy": "Strategy",
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
"No Argo Rollouts": "No Argo Rollouts",
"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.",
Expand Down
19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@
},
"devDependencies": {
"@dagrejs/dagre": "^1.1.8",
"@jest/types": "^29.0.0",
"@openshift-console/dynamic-plugin-sdk": "^4.19.1",
"@openshift-console/dynamic-plugin-sdk-internal": "^4.19.1",
"@openshift-console/dynamic-plugin-sdk-webpack": "^4.19.1",
"@openshift-console/plugin-shared": "^0.0.3",
"@patternfly/quickstarts": "^6.4.0",
"@patternfly/react-charts": "^8.4.0",
"@patternfly/react-component-groups": "^6.3.0",
"@patternfly/react-core": "^6.4.0",
"@patternfly/react-data-view": "^6.4.0",
"@patternfly/react-component-groups": "^6.3.0",
"@patternfly/react-icons": "^6.4.0",
"@patternfly/react-styles": "^6.4.0",
"@patternfly/react-table": "^6.4.0",
"@patternfly/react-tokens": "6.4.0",
"@patternfly/react-topology": "^6.2.0",
"@svgr/webpack": "^8.1.0",
"@types/classnames": "^2.3.1",
"@jest/types": "^29.0.0",
"@types/jest": "^29.0.0",
"@types/dagre": "^0.7.53",
"@types/git-url-parse": "^9.0.0",
"@types/jest": "^29.0.0",
"@types/lodash": "^4.14.0",
"@types/node": "^17.0.21",
"@types/react": "17.0.91",
Expand All @@ -67,6 +67,8 @@
"http-server": "0.12.x",
"i18next": "^19.8.3",
"i18next-parser": "^3.3.0",
"jest": "^29.0.0",
"jest-environment-jsdom": "^29.0.0",
"lodash-es": "^4.17.23",
"marked": "15.0.12",
"mobx-react": "^7.6.0",
Expand All @@ -76,16 +78,14 @@
"react-dom": "17.0.2",
"react-i18next": "^11.7.3",
"react-router": "5.3.4",
"semver": "^7.0.0",
"sass": "^1.42.1",
"sass-loader": "^10.1.1",
"semver": "^7.0.0",
"style-loader": "^2.0.0",
"ts-jest": "^29.0.0",
"ts-loader": "^9.5.1",
"ts-node": "^10.7.0",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"jest": "^29.0.0",
"jest-environment-jsdom": "^29.0.0",
"ts-jest": "^29.0.0",
"typesafe-actions": "^4.4.2",
"typescript": "5.9.3",
"webpack": "^5.1.0",
Expand Down Expand Up @@ -122,12 +122,15 @@
"dagre": "^0.8.5",
"git-url-parse": "^13.1.0",
"lodash": "^4.18.1",
"moment": "^2.29.4",
"pnpm": "^11.18.0",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

"pnpm": "^11.18.0" conflicts with packageManager: pnpm@10.33.2 and breaks pnpm run start under Corepack. Do we want to remove from deps?

"react": "17.0.2",
"react-helmet": "^6.1.0",
"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",
"rxjs": "^7.8.1"
},
"//TODO": [
"For @patternfly/react-icons: find another solution for icons from older react-icons version and remove this dependency."
Expand Down
28 changes: 28 additions & 0 deletions pnpm-lock.yaml

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

8 changes: 7 additions & 1 deletion src/gitops/components/rollout/RolloutDetailsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,13 @@ const RolloutDetailsTab: React.FC<RolloutDetailsTabProps> = ({ obj }) => {
<FlexItem>
<RolloutStatusFragment
status={obj?.status?.phase}
message={obj?.status?.message}
message={
obj?.status
? obj.status.message
: t(
'There is no rollout status. Check that the Rollout Manager is created and is available.',
)
}
/>
</FlexItem>
</Flex>
Expand Down
25 changes: 20 additions & 5 deletions src/gitops/components/rollout/RolloutList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const RolloutList: React.FC<RolloutListTabProps> = ({

const { t } = useGitOpsTranslation();

const columnsDV = useColumnsDV(namespace, getSortParams);
const columnsDV = useColumnsDV(namespace, getSortParams, t);
const sortedRollouts = React.useMemo(() => {
return sortData(rollouts, sortBy, direction);
}, [rollouts, sortBy, direction]);
Expand All @@ -132,7 +132,7 @@ const RolloutList: React.FC<RolloutListTabProps> = ({
});
}, [filteredData, searchQuery]);

const rows = useRolloutsRowsDV(filteredBySearch, namespace);
const rows = useRolloutsRowsDV(filteredBySearch, namespace, t);

const empty = (
<Tbody>
Expand Down Expand Up @@ -278,9 +278,9 @@ export const sortData = (
export const useColumnsDV = (
namespace: string,
getSortParams: (columnIndex: number) => ThProps['sort'],
t: (key: string) => string,
) => {
const i: number = namespace ? 0 : 1;
const { t } = useGitOpsTranslation();
const columns: DataViewTh[] = [
{
cell: t('Name'),
Expand Down Expand Up @@ -350,7 +350,11 @@ export const useColumnsDV = (
return columns;
};

export const useRolloutsRowsDV = (rolloutsList, namespace): DataViewTr[] => {
export const useRolloutsRowsDV = (
rolloutsList,
namespace,
t: (key: string) => string,
): DataViewTr[] => {
const rows: DataViewTr[] = [];
if (rolloutsList == undefined || rolloutsList.length == 0) {
return rows;
Expand Down Expand Up @@ -386,7 +390,18 @@ export const useRolloutsRowsDV = (rolloutsList, namespace): DataViewTr[] => {
: []),
{
id: 'status',
cell: <RolloutStatusFragment status={obj.status?.phase as RolloutStatus} />,
cell: (
<RolloutStatusFragment
status={obj.status?.phase as RolloutStatus}
message={
obj?.status === undefined
? t(
'There is no rollout status. Check that the Rollout Manager is created and is available.',
)
: undefined
}
/>
),
},
{
id: 'pods',
Expand Down
Loading
Loading