-
+
);
};
@@ -223,13 +225,7 @@ export function PersistentVolumeClaimDetails(props) {
);
})
) : (
-
+
{EMPTY_TEXT_PLACEHOLDER}
),
diff --git a/src/resources/PersistentVolumes/PersistentVolumeDetails.js b/src/resources/PersistentVolumes/PersistentVolumeDetails.js
index 9d1ceacb2b..30f710740a 100644
--- a/src/resources/PersistentVolumes/PersistentVolumeDetails.js
+++ b/src/resources/PersistentVolumes/PersistentVolumeDetails.js
@@ -130,6 +130,7 @@ export function PersistentVolumeDetails(props) {
const Events = () => (
diff --git a/src/resources/PersistentVolumes/PersistentVolumeStatus.js b/src/resources/PersistentVolumes/PersistentVolumeStatus.js
index 45221ebab0..d19612ab80 100644
--- a/src/resources/PersistentVolumes/PersistentVolumeStatus.js
+++ b/src/resources/PersistentVolumes/PersistentVolumeStatus.js
@@ -1,4 +1,3 @@
-import React from 'react';
import { StatusBadge } from 'shared/components/StatusBadge/StatusBadge';
export function PersistentVolumeStatus({ status }) {
@@ -6,12 +5,12 @@ export function PersistentVolumeStatus({ status }) {
switch (status) {
case 'Bound':
case 'Available':
- return 'Success';
+ return 'Positive';
case 'Released':
case 'Pending':
return 'Information';
default:
- return 'Error';
+ return 'Negative';
}
};
diff --git a/src/resources/Pods/ContainerStatus.js b/src/resources/Pods/ContainerStatus.js
index 8ee7dc76e7..cff752bbd1 100644
--- a/src/resources/Pods/ContainerStatus.js
+++ b/src/resources/Pods/ContainerStatus.js
@@ -17,7 +17,7 @@ export function ContainerStatus({ status }) {
case 'running':
case 'completed':
case 'succeeded':
- return 'Success';
+ return 'Positive';
case 'containercreating':
case 'initing':
case 'pending':
@@ -27,7 +27,7 @@ export function ContainerStatus({ status }) {
case 'unknown':
return 'None';
default:
- return 'Error';
+ return 'Negative';
}
};
diff --git a/src/resources/Pods/PodRestarts.js b/src/resources/Pods/PodRestarts.js
index 90f4655ea2..ae8d5c05ee 100644
--- a/src/resources/Pods/PodRestarts.js
+++ b/src/resources/Pods/PodRestarts.js
@@ -5,7 +5,7 @@ export default function PodRestarts({ statuses }) {
const { t } = useTranslation();
const restartCount = statuses?.reduce((acc, c) => acc + c.restartCount, 0);
- const type = restartCount ? 'Error' : 'Success';
+ const type = restartCount ? 'Negative' : 'Positive';
const getTooltipContent = () => {
if (!restartCount) return t('pods.tooltips.no-restarts');
diff --git a/src/resources/Pods/PodStatus.js b/src/resources/Pods/PodStatus.js
index 3589950dcd..50d02d931c 100644
--- a/src/resources/Pods/PodStatus.js
+++ b/src/resources/Pods/PodStatus.js
@@ -32,7 +32,7 @@ const badgeType = status => {
case 'Running':
case 'Succeeded':
case 'Completed':
- return 'Success';
+ return 'Positive';
case 'Terminated':
case 'Pending':
case 'Terminating':
@@ -42,7 +42,7 @@ const badgeType = status => {
case 'Unknown':
return 'None';
default:
- return 'Error';
+ return 'Negative';
}
};
diff --git a/src/resources/Pods/test/PodRestarts.cy.js b/src/resources/Pods/test/PodRestarts.cy.js
new file mode 100644
index 0000000000..a1bb62bde5
--- /dev/null
+++ b/src/resources/Pods/test/PodRestarts.cy.js
@@ -0,0 +1,21 @@
+/* global cy */
+import PodRestarts from '../PodRestarts';
+
+describe('PodRestarts', () => {
+ it('Shows 0 for no statuses', () => {
+ cy.mount(
);
+
+ cy.get('[role="status"]').should('contain.text', '0');
+ });
+
+ it('Sums up restart statuses', () => {
+ const statuses = [
+ { name: 'container-1', restartCount: 10 },
+ { name: 'container-2', restartCount: 3 },
+ ];
+
+ cy.mount(
);
+
+ cy.get('[role="status"]').should('contain.text', '13');
+ });
+});
diff --git a/src/resources/Pods/test/PodRestarts.test.js b/src/resources/Pods/test/PodRestarts.test.js
deleted file mode 100644
index bf06209208..0000000000
--- a/src/resources/Pods/test/PodRestarts.test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { act, render, waitFor } from '@testing-library/react';
-import PodRestarts from '../PodRestarts';
-import { ThemeProvider } from '@ui5/webcomponents-react';
-
-describe('PodRestarts', () => {
- it('Shows 0 for no statuses', async () => {
- const { queryByRole } = render(
-
-
- ,
- );
- await waitFor(async () => {
- await act(async () => {
- expect(queryByRole('status')).toHaveTextContent('0');
- });
- });
- });
-
- it('Sums up restart statuses', async () => {
- const statuses = [
- { name: 'container-1', restartCount: 10 },
- { name: 'container-2', restartCount: 3 },
- ];
-
- const { queryByRole } = render(
-
-
- ,
- );
- await waitFor(async () => {
- await act(async () => {
- expect(queryByRole('status')).toHaveTextContent('13');
- });
- });
- });
-});
diff --git a/src/resources/ResourceQuotas/ResourceQuotaDetails.tsx b/src/resources/ResourceQuotas/ResourceQuotaDetails.tsx
index 2806beb1fd..7d2bdb66ed 100644
--- a/src/resources/ResourceQuotas/ResourceQuotaDetails.tsx
+++ b/src/resources/ResourceQuotas/ResourceQuotaDetails.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
import { ResourceDetails } from 'shared/components/ResourceDetails/ResourceDetails';
import { ResourceDescription } from '.';
import ResourceQuotaCreate from './ResourceQuotaCreate';
@@ -7,7 +8,6 @@ import { LayoutPanelRow } from 'shared/components/LayoutPanelRow/LayoutPanelRow'
import { useTranslation } from 'react-i18next';
import { Tokens } from 'shared/components/Tokens';
import { Text, Title } from '@ui5/webcomponents-react';
-import { spacing } from '@ui5/webcomponents-react-base';
export type ResourceQuotaProps = {
kind: string;
@@ -45,7 +45,7 @@ export default function ResourceQuotaDetails(props: any) {
const customComponents = [
(resource: ResourceQuotaProps) => {
return (
- <>
+
{(resource.spec.scopes || resource.spec.scopeSelector) && (
{resource.spec?.scopes && (
@@ -60,8 +60,8 @@ export default function ResourceQuotaDetails(props: any) {
<>
{scope.scopeName}
@@ -81,11 +81,11 @@ export default function ResourceQuotaDetails(props: any) {
)}
)}
-
+
);
},
(resource: ResourceQuotaProps) => (
-
+
),
];
diff --git a/src/resources/RoleBindings/GenericRoleBindingCreate.js b/src/resources/RoleBindings/GenericRoleBindingCreate.js
index 67838227a0..059bbaa6ff 100644
--- a/src/resources/RoleBindings/GenericRoleBindingCreate.js
+++ b/src/resources/RoleBindings/GenericRoleBindingCreate.js
@@ -19,7 +19,6 @@ import { validateBinding } from './helpers';
import { RoleForm } from './RoleForm';
import { useHasPermissionsFor } from 'hooks/useHasPermissionsFor';
-import { spacing } from '@ui5/webcomponents-react-base';
import { getDescription, SchemaContext } from 'shared/helpers/schema';
export function GenericRoleBindingCreate({
@@ -108,9 +107,9 @@ export function GenericRoleBindingCreate({
/>
{!jp.value(binding, '$.subjects.length') && (
{t('role-bindings.create-modal.at-least-one-subject-required', {
resource: singularName,
diff --git a/src/resources/RoleBindings/RoleRef.js b/src/resources/RoleBindings/RoleRef.js
index c223f1e28c..2c2bd6eda1 100644
--- a/src/resources/RoleBindings/RoleRef.js
+++ b/src/resources/RoleBindings/RoleRef.js
@@ -27,6 +27,7 @@ export function RoleRef({ roleRef }) {
return (
(