diff --git a/.eslintrc.json b/.eslintrc.json
index 6f8ad86b2..d759d089c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -32,6 +32,7 @@
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"react/display-name": "off",
+ "react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"prettier/prettier": [
"error",
diff --git a/src/gitops/Statuses/HealthStatus.test.tsx b/src/gitops/Statuses/HealthStatus.test.tsx
index 28051d55a..a35b1feaf 100644
--- a/src/gitops/Statuses/HealthStatus.test.tsx
+++ b/src/gitops/Statuses/HealthStatus.test.tsx
@@ -4,25 +4,25 @@ import HealthStatus, { HealthStatusIcon } from './HealthStatus';
describe('HealthStatus', () => {
it('renders Healthy', () => {
expect(renderToStaticMarkup()).toMatchInlineSnapshot(
- `"
"`,
+ `""`,
);
});
it('renders Degraded', () => {
expect(renderToStaticMarkup()).toMatchInlineSnapshot(
- `""`,
+ `""`,
);
});
it('renders Progressing', () => {
expect(renderToStaticMarkup()).toMatchInlineSnapshot(
- `""`,
+ `""`,
);
});
it('renders Unknown for unrecognized status', () => {
expect(renderToStaticMarkup()).toMatchInlineSnapshot(
- `""`,
+ `""`,
);
});
@@ -30,7 +30,7 @@ describe('HealthStatus', () => {
expect(
renderToStaticMarkup(),
).toMatchInlineSnapshot(
- `""`,
+ `""`,
);
});
});
diff --git a/src/gitops/Statuses/OperationState.test.tsx b/src/gitops/Statuses/OperationState.test.tsx
index bc4660a66..4b0d1a0e6 100644
--- a/src/gitops/Statuses/OperationState.test.tsx
+++ b/src/gitops/Statuses/OperationState.test.tsx
@@ -27,7 +27,7 @@ describe('OperationState', () => {
expect(
renderToStaticMarkup(),
).toMatchInlineSnapshot(
- `" Syncing"`,
+ `" Syncing"`,
);
});
@@ -35,7 +35,7 @@ describe('OperationState', () => {
expect(
renderToStaticMarkup(),
).toMatchInlineSnapshot(
- `" Sync failed"`,
+ `" Sync failed"`,
);
});
@@ -43,7 +43,7 @@ describe('OperationState', () => {
expect(
renderToStaticMarkup(),
).toMatchInlineSnapshot(
- `" Sync error"`,
+ `" Sync error"`,
);
});
@@ -51,7 +51,7 @@ describe('OperationState', () => {
expect(
renderToStaticMarkup(),
).toMatchInlineSnapshot(
- `" Sync OK"`,
+ `" Sync OK"`,
);
});
@@ -59,7 +59,7 @@ describe('OperationState', () => {
expect(
renderToStaticMarkup(),
).toMatchInlineSnapshot(
- `" Terminated"`,
+ `" Terminated"`,
);
});
@@ -73,7 +73,7 @@ describe('OperationState', () => {
expect(
renderToStaticMarkup(),
).toMatchInlineSnapshot(
- `" Syncing"`,
+ `" Syncing"`,
);
});
});
diff --git a/src/gitops/Statuses/SyncStatus.test.tsx b/src/gitops/Statuses/SyncStatus.test.tsx
index 1796a6c8a..aca380f0e 100644
--- a/src/gitops/Statuses/SyncStatus.test.tsx
+++ b/src/gitops/Statuses/SyncStatus.test.tsx
@@ -10,13 +10,13 @@ describe('SyncStatus', () => {
it('renders OutOfSync', () => {
expect(renderToStaticMarkup()).toMatchInlineSnapshot(
- `" OutOfSync"`,
+ `" OutOfSync"`,
);
});
it('renders Unknown', () => {
expect(renderToStaticMarkup()).toMatchInlineSnapshot(
- `" Unknown"`,
+ `" Unknown"`,
);
});
diff --git a/src/gitops/components/application/graph/ApplicationGraphView.scss b/src/gitops/components/application/graph/ApplicationGraphView.scss
index 34d5cdc64..9b49c75d2 100644
--- a/src/gitops/components/application/graph/ApplicationGraphView.scss
+++ b/src/gitops/components/application/graph/ApplicationGraphView.scss
@@ -81,10 +81,10 @@
.step-edge {
&.step-edge-healthy {
- stroke: var(--pf-v5-global--success-color--100);
+ stroke: var(--pf-t--global--icon--color--status--success--default);
}
&.step-edge-warning {
- stroke: var(--pf-v5-global--warning-color--100);
+ stroke: var(--pf-t--global--icon--color--status--warning--default);
}
&.step-edge-progressing {
stroke: lightblue;
@@ -93,12 +93,12 @@
.step-edge-terminal.pf-topology-connector-arrow {
&.step-edge-terminal-healthy {
- stroke: var(--pf-v5-global--success-color--100);
- fill: var(--pf-v5-global--success-color--100);
+ stroke: var(--pf-t--global--icon--color--status--success--default);
+ fill: var(--pf-t--global--icon--color--status--success--default);
}
&.step-edge-terminal-warning {
- stroke: var(--pf-v5-global--warning-color--100);
- fill: var(--pf-v5-global--warning-color--100);
+ stroke: var(--pf-t--global--icon--color--status--warning--default);
+ fill: var(--pf-t--global--icon--color--status--warning--default);
}
&.step-edge-terminal-progressing {
stroke: lightblue;
diff --git a/src/gitops/components/appset/generators/ClusterGenerator.tsx b/src/gitops/components/appset/generators/ClusterGenerator.tsx
index 2e8f4b0bc..7cd8a1288 100644
--- a/src/gitops/components/appset/generators/ClusterGenerator.tsx
+++ b/src/gitops/components/appset/generators/ClusterGenerator.tsx
@@ -29,8 +29,8 @@ const ClusterGenerator: React.FC = ({ generator }) => {
whiteSpace: 'pre-wrap',
wordBreak: 'break-word',
padding: '8px',
- backgroundColor: 'var(--pf-v5-global--BackgroundColor--200)',
- border: '1px solid var(--pf-v5-global--BorderColor--200)',
+ backgroundColor: 'var(--pf-t--global--background--color--secondary--default)',
+ border: '1px solid var(--pf-t--global--border--color--default)',
borderRadius: '4px',
}}
>
diff --git a/src/gitops/components/appset/generators/GenericGenerator.tsx b/src/gitops/components/appset/generators/GenericGenerator.tsx
index bc52536bd..ae6e9b4c1 100644
--- a/src/gitops/components/appset/generators/GenericGenerator.tsx
+++ b/src/gitops/components/appset/generators/GenericGenerator.tsx
@@ -29,8 +29,8 @@ const GenericGenerator: React.FC = ({ gentype, generator
whiteSpace: 'pre-wrap',
wordBreak: 'break-word',
padding: '8px',
- backgroundColor: 'var(--pf-v5-global--BackgroundColor--200)',
- border: '1px solid var(--pf-v5-global--BorderColor--200)',
+ backgroundColor: 'var(--pf-t--global--background--color--secondary--default)',
+ border: '1px solid var(--pf-t--global--border--color--default)',
borderRadius: '4px',
}}
>
diff --git a/src/gitops/components/project/ProjectAllowDenyTab.tsx b/src/gitops/components/project/ProjectAllowDenyTab.tsx
index c977f725f..5c3feace4 100644
--- a/src/gitops/components/project/ProjectAllowDenyTab.tsx
+++ b/src/gitops/components/project/ProjectAllowDenyTab.tsx
@@ -106,10 +106,10 @@ const ProjectAllowDenyTab: React.FC = ({ obj }) => {
)}
-
+
-
+
{t('Repositories')}
@@ -117,7 +117,7 @@ const ProjectAllowDenyTab: React.FC = ({ obj }) => {
-
+
{t('Namespaces')}
@@ -137,10 +137,10 @@ const ProjectAllowDenyTab: React.FC = ({ obj }) => {
title={t('Allowed Destinations')}
helpText={t('Allowed Destinations help')}
/>
-
+
-
+
@@ -159,10 +159,10 @@ const ProjectAllowDenyTab: React.FC = ({ obj }) => {
title={t('Resource Allow/Deny Lists')}
helpText={t('Resource Allow/Deny Lists help')}
/>
-
+
-
+
{t('Cluster Resource Allow List')}
@@ -172,7 +172,7 @@ const ProjectAllowDenyTab: React.FC = ({ obj }) => {
-
+
{t('Cluster Resource Deny List')}
@@ -182,7 +182,7 @@ const ProjectAllowDenyTab: React.FC = ({ obj }) => {
-
+
{t('Namespace Resource Allow List')}
@@ -192,7 +192,7 @@ const ProjectAllowDenyTab: React.FC = ({ obj }) => {
-
+
{t('Namespace Resource Deny List')}
diff --git a/src/gitops/components/project/ProjectRolesTab.tsx b/src/gitops/components/project/ProjectRolesTab.tsx
index 751af8ab7..18f0e7aaf 100644
--- a/src/gitops/components/project/ProjectRolesTab.tsx
+++ b/src/gitops/components/project/ProjectRolesTab.tsx
@@ -56,7 +56,7 @@ const formatPolicyDescription = (policy: string, t: (key: string) => string): Re
<>
{' '}
{t('Allow')}
>
@@ -64,7 +64,7 @@ const formatPolicyDescription = (policy: string, t: (key: string) => string): Re
<>
{' '}
{t('Deny')}
>
diff --git a/src/gitops/components/rollout/strategy/CanaryServices.tsx b/src/gitops/components/rollout/strategy/CanaryServices.tsx
index f578c41a9..014b26170 100644
--- a/src/gitops/components/rollout/strategy/CanaryServices.tsx
+++ b/src/gitops/components/rollout/strategy/CanaryServices.tsx
@@ -39,7 +39,7 @@ const getAnalysisTemplates = (steps, namespace: string, t: TFunction) => {
}}
/>
string): R