= ({ canWrite }) => {
return ;
}
return (
-
-
- {getToolbar(categories)}
- {settingsStatus === FetchStatus.inProgress ? (
-
- ) : (
- <>
- {getTable()}
- {getPagination(isDisabled, true)}
-
- )}
-
+
+ {getToolbar(categories)}
+ {settingsStatus === FetchStatus.inProgress ? (
+
+ ) : (
+ <>
+ {getTable()}
+
{getPagination(isDisabled, true)}
+
+ )}
+
{value, select, cpu {CPU} cluster {Cluster} memory {Memory} node {Node} persistent_volume_claims {Persistent volume claims} storage {Storage} other {}}{"value":"Node"}
| ,
{value, select, cpu {CPU} cluster {Cluster} memory {Memory} node {Node} persistent_volume_claims {Persistent volume claims} storage {Storage} other {}}{"value":"CPU"}
| ,
{value, select, cpu {CPU} cluster {Cluster} memory {Memory} node {Node} persistent_volume_claims {Persistent volume claims} storage {Storage} other {}}{"value":"CPU"}
| ,
{value, select, cpu {CPU} cluster {Cluster} memory {Memory} node {Node} persistent_volume_claims {Persistent volume claims} storage {Storage} other {}}{"value":"CPU"}
diff --git a/src/routes/settings/costModels/components/__snapshots__/warningIcon.test.tsx.snap b/src/routes/settings/costModels/components/__snapshots__/warningIcon.test.tsx.snap
index b2edbad87..c6e6e3638 100644
--- a/src/routes/settings/costModels/components/__snapshots__/warningIcon.test.tsx.snap
+++ b/src/routes/settings/costModels/components/__snapshots__/warningIcon.test.tsx.snap
@@ -3,7 +3,7 @@
exports[`warning icon 1`] = `
|
)}
diff --git a/src/routes/settings/costModels/costModelsDetails/utils/dialog.tsx b/src/routes/settings/costModels/costModelsDetails/utils/dialog.tsx
index d932b12e8..12be2b3cb 100644
--- a/src/routes/settings/costModels/costModelsDetails/utils/dialog.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/utils/dialog.tsx
@@ -3,13 +3,10 @@ import {
AlertVariant,
Button,
ButtonVariant,
+ Content,
+ ContentVariants,
Stack,
StackItem,
- Text,
- TextContent,
- TextList,
- TextListItem,
- TextListVariants,
} from '@patternfly/react-core';
import React from 'react';
@@ -62,19 +59,21 @@ function CannotDeleteContent({ head, body, sources }: CannotDeleteContentProps):
return (
-
- {head}
-
+
+ {head}
+
-
- {body}
-
+
+ {body}
+
{sources.map(source => (
- {source}
+
+ {source}
+
))}
-
-
+
+
);
diff --git a/src/routes/settings/costModels/costModelsDetails/utils/filters.tsx b/src/routes/settings/costModels/costModelsDetails/utils/filters.tsx
index 989c343d1..b2d39c6a7 100644
--- a/src/routes/settings/costModels/costModelsDetails/utils/filters.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/utils/filters.tsx
@@ -143,7 +143,12 @@ const DescriptionFilterBase: React.FC = ({
/>
) : null;
return (
-
+
{children}
);
@@ -218,7 +223,12 @@ const NameFilterBase: React.FC = ({
/>
) : null;
return (
-
+
{children}
);
@@ -310,7 +320,12 @@ const SourceTypeFilterBase: React.FC = ({
/>
) : null;
return (
-
+
{children}
);
diff --git a/src/routes/settings/platformProjects/platformProjects.scss b/src/routes/settings/platformProjects/platformProjects.scss
index 31a1a9a99..0006032db 100644
--- a/src/routes/settings/platformProjects/platformProjects.scss
+++ b/src/routes/settings/platformProjects/platformProjects.scss
@@ -1,5 +1,5 @@
@media only screen and (min-width: 1450px) {
- .pf-v5-c-table__td {
+ .pf-v6-c-table__td {
&.defaultColumn {
width: 70%;
}
diff --git a/src/routes/settings/platformProjects/platformProjects.styles.ts b/src/routes/settings/platformProjects/platformProjects.styles.ts
index 19d3215ba..40533795e 100644
--- a/src/routes/settings/platformProjects/platformProjects.styles.ts
+++ b/src/routes/settings/platformProjects/platformProjects.styles.ts
@@ -1,20 +1,16 @@
-import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100';
+import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg';
import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md';
+import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm';
import type React from 'react';
export const styles = {
action: {
marginLeft: global_spacer_md.var,
},
- descContainer: {
- backgroundColor: global_BackgroundColor_light_100.value,
- paddingLeft: global_spacer_md.value,
- paddingRight: global_spacer_md.value,
- paddingTop: global_spacer_md.value,
+ paginationContainer: {
+ marginTop: global_spacer_sm.var,
},
- pagination: {
- backgroundColor: global_BackgroundColor_light_100.value,
- paddingBottom: global_spacer_md.value,
- paddingTop: global_spacer_md.value,
+ tableContainer: {
+ marginTop: global_spacer_lg.var,
},
} as { [className: string]: React.CSSProperties };
diff --git a/src/routes/settings/platformProjects/platformProjects.tsx b/src/routes/settings/platformProjects/platformProjects.tsx
index 7eed9e24f..c62ed45ad 100644
--- a/src/routes/settings/platformProjects/platformProjects.tsx
+++ b/src/routes/settings/platformProjects/platformProjects.tsx
@@ -1,4 +1,4 @@
-import { PageSection, Pagination, PaginationVariant } from '@patternfly/react-core';
+import { Card, CardBody, Pagination, PaginationVariant } from '@patternfly/react-core';
import type { Query } from 'api/queries/query';
import { getQuery } from 'api/queries/query';
import type { Settings } from 'api/settings';
@@ -11,8 +11,8 @@ import { useIntl } from 'react-intl';
import { useDispatch, useSelector } from 'react-redux';
import type { AnyAction } from 'redux';
import type { ThunkDispatch } from 'redux-thunk';
-import { Loading } from 'routes/components/page/loading';
import { NotAvailable } from 'routes/components/page/notAvailable';
+import { LoadingState } from 'routes/components/state/loadingState';
import * as queryUtils from 'routes/utils/query';
import type { RootState } from 'store';
import { FetchStatus } from 'store/common';
@@ -221,8 +221,8 @@ const PlatformProjects: React.FC = ({ canWrite }) => {
return ;
}
return (
-
-
- {getToolbar(categories)}
- {settingsStatus === FetchStatus.inProgress ? (
-
- ) : (
- <>
- {getTable()}
- {getPagination(isDisabled, true)}
-
- )}
-
+
+ {getToolbar(categories)}
+ {settingsStatus === FetchStatus.inProgress ? (
+
+ ) : (
+ <>
+ {getTable()}
+
{getPagination(isDisabled, true)}
+
+ )}
+