@@ -131,29 +141,65 @@ export default function KymaModulesCreate({ resource, ...props }) {
const name =
module.metadata?.labels['operator.kyma-project.io/module-name'];
const existingModule = acc.find(item => item.name === name);
+ const moduleMetaRelase = moduleReleaseMetas?.items.find(
+ item => item.spec.moduleName === name,
+ );
- if (!existingModule) {
- acc.push({
- name: name,
- channels: [
- {
- channel: module.spec.channel,
- version: module.spec.descriptor.component.version,
- isBeta:
- module.metadata.labels['operator.kyma-project.io/beta'] ===
- 'true',
- },
- ],
- docsUrl:
- module.metadata.annotations['operator.kyma-project.io/doc-url'],
- });
+ if (module.spec.channel) {
+ if (!existingModule) {
+ acc.push({
+ name: name,
+ channels: [
+ {
+ channel: module.spec.channel,
+ version: module.spec.descriptor.component.version,
+ isBeta:
+ module.metadata.labels['operator.kyma-project.io/beta'] ===
+ 'true',
+ },
+ ],
+ docsUrl:
+ module.metadata.annotations['operator.kyma-project.io/doc-url'],
+ });
+ } else if (existingModule) {
+ existingModule.channels?.push({
+ channel: module.spec.channel,
+ version: module.spec.descriptor.component.version,
+ isBeta:
+ module.metadata.labels['operator.kyma-project.io/beta'] === 'true',
+ });
+ }
} else {
- existingModule.channels?.push({
- channel: module.spec.channel,
- version: module.spec.descriptor.component.version,
- isBeta:
- module.metadata.labels['operator.kyma-project.io/beta'] === 'true',
- });
+ if (!existingModule) {
+ moduleMetaRelase?.spec.channels.forEach(channel => {
+ if (!acc.find(item => item.name === name)) {
+ acc.push({
+ name: name,
+ channels: [
+ {
+ channel: channel.channel,
+ version: channel.version,
+ isBeta:
+ module.metadata.labels['operator.kyma-project.io/beta'] ===
+ 'true',
+ },
+ ],
+ docsUrl:
+ module.metadata.annotations['operator.kyma-project.io/doc-url'],
+ });
+ } else {
+ acc
+ .find(item => item.name === name)
+ .channels.push({
+ channel: channel.channel,
+ version: channel.version,
+ isBeta:
+ module.metadata.labels['operator.kyma-project.io/beta'] ===
+ 'true',
+ });
+ }
+ });
+ }
}
return acc;
}, []);
@@ -236,9 +282,11 @@ export default function KymaModulesCreate({ resource, ...props }) {
value={channel.channel}
additionalText={channel?.isBeta ? 'Beta' : ''}
>
- {`${channel.channel[0].toUpperCase()}${channel.channel.slice(
- 1,
- )} (v${channel.version})`}{' '}
+ {`${(
+ channel?.channel[0] || ''
+ ).toUpperCase()}${channel.channel.slice(1)} (v${
+ channel.version
+ })`}{' '}
))}
diff --git a/src/components/KymaModules/KymaModulesList.js b/src/components/KymaModules/KymaModulesList.js
index 52ed92a242..5952056e45 100644
--- a/src/components/KymaModules/KymaModulesList.js
+++ b/src/components/KymaModules/KymaModulesList.js
@@ -201,7 +201,7 @@ export default function KymaModulesList({
<>
{moduleStatus?.channel
? moduleStatus?.channel
- : EMPTY_TEXT_PLACEHOLDER}
+ : kymaResource?.spec?.modules?.[moduleIndex]?.channel}
{isChannelOverriden ? (
+
diff --git a/src/components/KymaModules/ModulesCard.js b/src/components/KymaModules/ModulesCard.js
index 747ba14add..84ef68a469 100644
--- a/src/components/KymaModules/ModulesCard.js
+++ b/src/components/KymaModules/ModulesCard.js
@@ -109,9 +109,11 @@ export default function ModulesCard({
value={channel.channel}
additionalText={channel?.isBeta ? 'Beta' : ''}
>
- {`${channel.channel[0].toUpperCase()}${channel.channel.slice(
- 1,
- )} (v${channel.version})`}{' '}
+ {`${(
+ channel?.channel[0] || ''
+ ).toUpperCase()}${channel.channel.slice(1)} (v${
+ channel.version
+ })`}{' '}
))}
diff --git a/src/components/Nodes/NodeResources/NodeResources.js b/src/components/Nodes/NodeResources/NodeResources.js
index 9a1e44cfc0..28996dbf83 100644
--- a/src/components/Nodes/NodeResources/NodeResources.js
+++ b/src/components/Nodes/NodeResources/NodeResources.js
@@ -39,7 +39,7 @@ export function NodeResources({ metrics, resources }) {
max={memory.capacity}
additionalInfo={`${roundTwoDecimals(
memory.usage,
- )}GiB / ${roundTwoDecimals(memory.capacity)}GiB`}
+ )}Gi / ${roundTwoDecimals(memory.capacity)}Gi`}
/>
diff --git a/src/components/Nodes/nodeQueries.js b/src/components/Nodes/nodeQueries.js
index 335e35bf15..55585c57d1 100644
--- a/src/components/Nodes/nodeQueries.js
+++ b/src/components/Nodes/nodeQueries.js
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
import { useGet } from 'shared/hooks/BackendAPI/useGet';
import {
getBytes,
@@ -22,27 +22,30 @@ const formatMemory = memoryStr =>
const createUsageMetrics = (node, metricsForNode) => {
const cpuUsage = formatCpu(metricsForNode?.usage.cpu);
const memoryUsage = formatMemory(metricsForNode?.usage.memory);
- const cpuCapacity = parseInt(node.status.capacity?.cpu || '0') * 1000;
- const memoryCapacity = formatMemory(node.status.capacity?.memory);
+ const cpuCapacity = parseInt(node.status.allocatable?.cpu || '0');
+ const memoryCapacity = formatMemory(node.status.allocatable?.memory);
+
+ const cpuPercentage = getPercentageFromUsage(cpuUsage, cpuCapacity);
+ const memoryPercentage = getPercentageFromUsage(memoryUsage, memoryCapacity);
return {
cpu: {
usage: cpuUsage,
capacity: cpuCapacity,
- percentage: getPercentageFromUsage(cpuUsage, cpuCapacity) + '%',
- percentageValue: getPercentageFromUsage(cpuUsage, cpuCapacity),
+ percentage: cpuPercentage + '%',
+ percentageValue: cpuPercentage,
},
memory: {
usage: memoryUsage,
capacity: memoryCapacity,
- percentage: getPercentageFromUsage(memoryUsage, memoryCapacity) + '%',
- percentageValue: getPercentageFromUsage(memoryUsage, memoryCapacity),
+ percentage: memoryPercentage + '%',
+ percentageValue: memoryPercentage,
},
};
};
export function useNodesQuery(skip = false) {
- const [data, setData] = React.useState(null);
+ const [data, setData] = useState(null);
const { data: nodeMetrics, loading: metricsLoading } = useGet(
'/apis/metrics.k8s.io/v1beta1/nodes',
{
@@ -57,7 +60,7 @@ export function useNodesQuery(skip = false) {
loading: nodesLoading,
} = useGet('/api/v1/nodes', { pollingInterval: 5500, skip });
- React.useEffect(() => {
+ useEffect(() => {
if (nodes) {
const getNodeMetrics = node => {
const metricsForNode = nodeMetrics.items.find(
@@ -83,7 +86,7 @@ export function useNodesQuery(skip = false) {
}
export function useNodeQuery(nodeName) {
- const [data, setData] = React.useState(null);
+ const [data, setData] = useState(null);
const {
data: nodeMetrics,
error: metricsError,
@@ -98,7 +101,7 @@ export function useNodeQuery(nodeName) {
loading: nodeLoading,
} = useGet(`/api/v1/nodes/${nodeName}`, { pollingInterval: 3000 });
- React.useEffect(() => {
+ useEffect(() => {
if (node) {
setData({
node,
@@ -152,7 +155,9 @@ function addResources(a, b) {
function sumContainersResources(containers) {
return containers?.reduce((containerAccu, container) => {
- return addResources(containerAccu, container.resources);
+ const containerResources = container.resources;
+ const updatedResources = addResources(containerAccu, containerResources);
+ return updatedResources;
}, structuredClone(emptyResources));
}
@@ -181,14 +186,14 @@ export function calcNodeResources(pods) {
}
export function useResourceByNode(nodeName) {
- const [data, setData] = React.useState(null);
+ const [data, setData] = useState(null);
const { data: pods, error, loading } = useGet(
`/api/v1/pods?fieldSelector=spec.nodeName=${nodeName},status.phase!=Failed,status.phase!=Succeeded&limit=500`,
);
const nodeResources = useMemo(() => calcNodeResources(pods), [pods]);
- React.useEffect(() => {
+ useEffect(() => {
if (nodeResources) {
setData(nodeResources);
}
diff --git a/src/header/Header.tsx b/src/header/Header.tsx
index 781150edf0..52ac4b7e08 100644
--- a/src/header/Header.tsx
+++ b/src/header/Header.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useState } from 'react';
import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
import {
Avatar,
@@ -8,7 +8,6 @@ import {
MenuDomRef,
ShellBar,
ShellBarItem,
- ShellBarDomRef,
ListItemStandard,
} from '@ui5/webcomponents-react';
import { MenuItemClickEventDetail } from '@ui5/webcomponents/dist/Menu.js';
@@ -55,21 +54,11 @@ export function Header() {
);
const [isFormOpen, setIsFormOpen] = useRecoilState(isFormOpenState);
- const shellbarRef = useRef(null);
- useEffect(() => {
- if (shellbarRef?.current) {
- shellbarRef.current.accessibilityTexts = {
- ...shellbarRef.current.accessibilityTexts,
- logoTitle: 'SAP Kyma logo',
- };
- }
- }, [shellbarRef]);
-
const inactiveClusterNames = Object.keys(clusters || {}).filter(
name => name !== cluster?.name,
);
- const nonBreakableSpaces = (number: int): string => {
+ const nonBreakableSpaces = (number: number): string => {
let spaces = '';
for (let i = 0; i < number; i++) {
spaces += '\u00a0';
@@ -120,10 +109,14 @@ export function Header() {
<>
}
- ref={shellbarRef}
onLogoClick={() => {
handleActionIfFormOpen(
isResourceEdited,
@@ -225,7 +218,6 @@ export function Header() {
text={t('common.labels.version')}
additionalText={busolaVersion}
icon="inspect"
- startsSection
/>
diff --git a/src/resources/Deployments/DeploymentDetails.js b/src/resources/Deployments/DeploymentDetails.js
index 5740639484..c6448828a9 100644
--- a/src/resources/Deployments/DeploymentDetails.js
+++ b/src/resources/Deployments/DeploymentDetails.js
@@ -64,7 +64,12 @@ export function DeploymentDetails(props) {
const statusConditions = deployment => {
return deployment?.status?.conditions?.map(condition => {
return {
- header: { titleText: condition.type, status: condition.status },
+ header: {
+ titleText: condition.type,
+ status: condition.status,
+ overrideStatusType:
+ condition.type === 'ReplicaFailure' ? 'False' : condition.status,
+ },
message: condition.message,
};
});
diff --git a/src/resources/Deployments/DeploymentStatus.js b/src/resources/Deployments/DeploymentStatus.js
index 5bf2456caf..0fb4fe10d3 100644
--- a/src/resources/Deployments/DeploymentStatus.js
+++ b/src/resources/Deployments/DeploymentStatus.js
@@ -4,7 +4,7 @@ import { RunningPodsStatus } from 'shared/components/RunningPodsStatus';
export function DeploymentStatus({ deployment }) {
const running = deployment.status.readyReplicas || 0;
- const expected = deployment.status.replicas || 0;
+ const expected = deployment.status.replicas || deployment.spec.replicas || 0;
return ;
}
diff --git a/src/resources/Namespaces/AllNamespacesDetails.js b/src/resources/Namespaces/AllNamespacesDetails.js
index 0fb112b522..8302f233d6 100644
--- a/src/resources/Namespaces/AllNamespacesDetails.js
+++ b/src/resources/Namespaces/AllNamespacesDetails.js
@@ -44,7 +44,7 @@ export function AllNamespacesDetails() {
const Events = ;
const headerActions = (
- <>
+
{createPortal(, document.body)}
-
+
);
return (
diff --git a/src/resources/Namespaces/NamespaceWorkloads/NamespaceWorkloadsHelpers.js b/src/resources/Namespaces/NamespaceWorkloads/NamespaceWorkloadsHelpers.js
index 2e72432885..d935525d1f 100644
--- a/src/resources/Namespaces/NamespaceWorkloads/NamespaceWorkloadsHelpers.js
+++ b/src/resources/Namespaces/NamespaceWorkloads/NamespaceWorkloadsHelpers.js
@@ -1,8 +1,12 @@
import { calculatePodState } from 'resources/Pods/PodStatus';
export function getHealthyReplicasCount(resource) {
- return resource?.filter(r => r.status.replicas === r.status.readyReplicas)
- ?.length;
+ return resource?.filter(r => {
+ const running = r.status.readyReplicas || 0;
+ const expected = r.status.replicas || r.spec.replicas || 0;
+
+ return running === expected;
+ })?.length;
}
export const PodStatusCounterKey = {
diff --git a/src/resources/Namespaces/ResourcesUsage.js b/src/resources/Namespaces/ResourcesUsage.js
index 718403e83f..3bc6eb5426 100644
--- a/src/resources/Namespaces/ResourcesUsage.js
+++ b/src/resources/Namespaces/ResourcesUsage.js
@@ -9,6 +9,7 @@ import { Card, CardHeader } from '@ui5/webcomponents-react';
const MEMORY_SUFFIX_POWER = {
// must be sorted from the smallest to the largest; it is case sensitive; more info: https://medium.com/swlh/understanding-kubernetes-resource-cpu-and-memory-units-30284b3cc866
m: 1e-3,
+ k: 1e3,
K: 1e3,
Ki: 2 ** 10,
M: 1e6,
@@ -22,24 +23,13 @@ const CPU_SUFFIX_POWER = {
m: 1e-3,
};
-export function getBytes(memoryString) {
- if (!memoryString || memoryString === '0') {
- return 0;
- }
- const suffixMatch = String(memoryString).match(/\D+$/);
-
- if (!suffixMatch?.length) {
- return memoryString;
- }
- const suffix = suffixMatch[0];
- const number = String(memoryString).replace(suffix, '');
+export function getBytes(memoryStr) {
+ if (!memoryStr) return 0;
- const suffixPower = MEMORY_SUFFIX_POWER[suffix];
- if (!suffixPower) {
- return number;
- }
-
- return number * suffixPower;
+ const unit = String(memoryStr).match(/[a-zA-Z]+/g)?.[0];
+ const value = parseFloat(memoryStr);
+ const bytes = value * (MEMORY_SUFFIX_POWER[unit] || 1);
+ return bytes;
}
export function getCpus(cpuString) {
diff --git a/src/resources/ServiceAccounts/TokenRequestModal/TokenRequestModal.tsx b/src/resources/ServiceAccounts/TokenRequestModal/TokenRequestModal.tsx
index bb21cef04a..f32aebef2d 100644
--- a/src/resources/ServiceAccounts/TokenRequestModal/TokenRequestModal.tsx
+++ b/src/resources/ServiceAccounts/TokenRequestModal/TokenRequestModal.tsx
@@ -8,6 +8,7 @@ import { ResourceForm } from 'shared/ResourceForm';
import { ComboboxInput } from 'shared/ResourceForm/inputs';
import { CopiableText } from 'shared/components/CopiableText/CopiableText';
import { Editor } from 'shared/components/MonacoEditorESM/Editor';
+import { useRef } from 'react';
const expirationSecondsOptions = [
{
@@ -71,6 +72,7 @@ export function TokenRequestModal({
}: TokenRequestModalProps) {
const { t } = useTranslation();
const downloadKubeconfig = useDownloadKubeconfigWithToken();
+ const modalRef = useRef(null);
const {
kubeconfigYaml,
@@ -78,7 +80,12 @@ export function TokenRequestModal({
generateTokenRequest,
tokenRequest,
setTokenRequest,
- } = useGenerateTokenRequest(isModalOpen, namespace, serviceAccountName);
+ } = useGenerateTokenRequest(
+ isModalOpen,
+ namespace,
+ serviceAccountName,
+ modalRef,
+ );
const isExpirationSecondsValueANumber = () =>
!Number(tokenRequest.spec.expirationSeconds);
@@ -100,6 +107,7 @@ export function TokenRequestModal({
open={isModalOpen}
onClose={handleCloseModal}
headerText={t('service-accounts.token-request.generate')}
+ ref={modalRef}
footer={
,
) => {
const { t } = useTranslation();
const post = usePost();
@@ -44,6 +45,7 @@ export const useGenerateTokenRequest = (
notifyToast(
{
content: t('service-accounts.token-request.notification.success'),
+ parentContainer: generate ? modalRef?.current : undefined,
},
3000,
);
diff --git a/src/resources/createResourceRoutes.js b/src/resources/createResourceRoutes.js
index 845145da95..9c1052751c 100644
--- a/src/resources/createResourceRoutes.js
+++ b/src/resources/createResourceRoutes.js
@@ -84,17 +84,31 @@ const ColumnWrapper = ({
});
const elementListProps = usePrepareListProps({
- ...props,
+ resourceCustomType: props.resourceCustomType,
+ resourceType: props.resourceType,
+ resourceI18Key: props.resourceI18Key,
+ apiGroup: props.apiGroup,
+ apiVersion: props.apiVersion,
+ hasDetailsView: props.hasDetailsView,
});
const elementDetailsProps = usePrepareDetailsProps({
- ...props,
+ resourceCustomType: props.resourceCustomType,
+ resourceType: props.resourceType,
+ resourceI18Key: props.resourceI18Key,
+ apiGroup: props.apiGroup,
+ apiVersion: props.apiVersion,
resourceName: layoutState?.midColumn?.resourceName ?? resourceName,
namespaceId: layoutState?.midColumn?.namespaceId ?? namespaceId,
+ showYamlTab: props.showYamlTab,
});
const elementCreateProps = usePrepareCreateProps({
- ...props,
+ resourceCustomType: props.resourceCustomType,
+ resourceType: props.resourceType,
+ resourceTypeForTitle: props.resourceType,
+ apiGroup: props.apiGroup,
+ apiVersion: props.apiVersion,
});
const listComponent = React.cloneElement(list, {
@@ -122,16 +136,13 @@ const ColumnWrapper = ({
detailsMidColumn = detailsComponent;
}
- const { schema, loading } = useGetSchema({
+ const { schema } = useGetSchema({
resource: {
group: props?.apiGroup,
version: props.apiVersion,
kind: props?.resourceType.slice(0, -1),
},
});
- if (loading) {
- return null;
- }
const createMidColumn = (
+
{
let startColumnComponent = null;
const headerActions = (
- <>
+
@@ -139,7 +139,7 @@ const ColumnWraper = (defaultColumn = 'list') => {
/>,
document.body,
)}
-
+
);
if (!layout && defaultColumn === 'details') {
diff --git a/src/shared/components/ConditionList/ConditionList.tsx b/src/shared/components/ConditionList/ConditionList.tsx
index 397c7390b5..dae0b0dab3 100644
--- a/src/shared/components/ConditionList/ConditionList.tsx
+++ b/src/shared/components/ConditionList/ConditionList.tsx
@@ -18,6 +18,7 @@ type ConditionItem = {
type ConditionHeader = {
titleText: string | ReactNode;
status?: string;
+ overrideStatusType?: string;
};
export const ConditionList = ({
@@ -34,6 +35,7 @@ export const ConditionList = ({
key={index}
header={cond.header?.titleText}
status={cond.header?.status}
+ overrideStatusType={cond.header?.overrideStatusType}
content={cond.message}
customContent={cond.customContent}
/>
diff --git a/src/shared/components/DynamicPageComponent/DynamicPageComponent.js b/src/shared/components/DynamicPageComponent/DynamicPageComponent.js
index 3328464404..ed25639c62 100644
--- a/src/shared/components/DynamicPageComponent/DynamicPageComponent.js
+++ b/src/shared/components/DynamicPageComponent/DynamicPageComponent.js
@@ -11,7 +11,6 @@ import {
} from '@ui5/webcomponents-react';
import { Toolbar } from '@ui5/webcomponents-react-compat/dist/components/Toolbar/index.js';
import { ToolbarSpacer } from '@ui5/webcomponents-react-compat/dist/components/ToolbarSpacer/index.js';
-import { ToolbarSeparator } from '@ui5/webcomponents-react-compat/dist/components/ToolbarSeparator/index.js';
import './DynamicPageComponent.scss';
import { useEffect, useState, useRef } from 'react';
@@ -164,15 +163,15 @@ export const DynamicPageComponent = ({
>
{actions && (
-
+ <>
{actions}
{(window.location.search.includes('layout') ||
(!window.location.search.includes('layout') &&
layoutColumn?.showCreate?.resourceType)) &&
layoutNumber !== 'StartColumn' ? (
-
+
) : null}
-
+
)}
{window.location.search.includes('layout') ||
(!window.location.search.includes('layout') &&
diff --git a/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss b/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
index 1d512b03ed..a1122a9d0b 100644
--- a/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
+++ b/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
@@ -4,6 +4,7 @@
ui5-dynamic-page-title {
justify-content: center;
min-height: 3rem;
+ padding-left: 2rem;
}
.bold-title {
@@ -27,10 +28,6 @@
display: none;
}
- [data-component-name='ObjectPageTitleMiddleSection'] > div {
- flex-basis: 100%;
- }
-
&__actions {
display: flex;
align-items: center;
@@ -57,6 +54,17 @@
position: static;
padding: unset;
}
+
+ .tab-container {
+ position: sticky;
+ z-index: 1;
+ }
+}
+
+ui5-dynamic-page {
+ .no-shadow {
+ box-shadow: none;
+ }
}
.header-wrapper {
@@ -99,10 +107,6 @@
}
}
-ui5-button[data-component-name='ObjectPageAnchorBarExpandBtn'] {
- display: none;
-}
-
@media (max-width: 768px) {
.column-wrapper {
display: flex;
@@ -110,8 +114,3 @@ ui5-button[data-component-name='ObjectPageAnchorBarExpandBtn'] {
gap: 12px;
}
}
-
-[data-component-name='DynamicPageContent'],
-[data-component-name='ObjectPageContent'] {
- padding: 0 !important;
-}
diff --git a/src/shared/components/ExpandableListItem/ExpandableListItem.tsx b/src/shared/components/ExpandableListItem/ExpandableListItem.tsx
index 0f8ad6751a..0af3a9bad2 100644
--- a/src/shared/components/ExpandableListItem/ExpandableListItem.tsx
+++ b/src/shared/components/ExpandableListItem/ExpandableListItem.tsx
@@ -8,6 +8,7 @@ import './ExpandableListItem.scss';
type ExpandableListItemProps = {
header: string | ReactNode;
status?: string;
+ overrideStatusType?: string;
content?: string;
customContent?: CustomContent[];
};
@@ -21,12 +22,18 @@ export type CustomContent = {
export const ExpandableListItem = ({
header,
status,
+ overrideStatusType,
content,
customContent,
}: ExpandableListItemProps) => {
const { t } = useTranslation();
const [expanded, setExpanded] = useState(false);
+ let statusType = status === 'True' ? 'Success' : 'Error';
+ if (overrideStatusType !== undefined) {
+ statusType = overrideStatusType === 'True' ? 'Success' : 'Error';
+ }
+
return (
<>
+
{status}
)}
diff --git a/src/shared/components/GenericList/GenericList.js b/src/shared/components/GenericList/GenericList.js
index 2c310262fb..e8cf5dab4a 100644
--- a/src/shared/components/GenericList/GenericList.js
+++ b/src/shared/components/GenericList/GenericList.js
@@ -32,6 +32,7 @@ import pluralize from 'pluralize';
import { isResourceEditedState } from 'state/resourceEditedAtom';
import { isFormOpenState } from 'state/formOpenAtom';
import { handleActionIfFormOpen } from '../UnsavedMessageBox/helpers';
+import './GenericList.scss';
const defaultSort = {
name: nameLocaleSort,
@@ -113,9 +114,7 @@ export const GenericList = ({
}, [pageSize, pagination]);
const { i18n, t } = useTranslation();
- const [currentPage, setCurrentPage] = React.useState(
- pagination?.initialPage || 1,
- );
+ const [currentPage, setCurrentPage] = useState(pagination?.initialPage || 1);
const [filteredEntries, setFilteredEntries] = useState(() =>
sorting(sort, entries),
@@ -197,7 +196,7 @@ export const GenericList = ({
const renderTableBody = () => {
if (serverDataError) {
return (
-
+
{getErrorMessage(serverDataError)}
);
@@ -205,7 +204,7 @@ export const GenericList = ({
if (serverDataLoading) {
return (
-
+
);
diff --git a/src/shared/components/GenericList/components.js b/src/shared/components/GenericList/components.js
index 200d53dbc3..4bad7d571d 100644
--- a/src/shared/components/GenericList/components.js
+++ b/src/shared/components/GenericList/components.js
@@ -137,7 +137,7 @@ const DefaultRowRenderer = ({
);
return (
-
+
{cells}
{!!actions.length && actionsCell}
{displayArrow && (
diff --git a/src/shared/components/ListActions/ListActions.js b/src/shared/components/ListActions/ListActions.js
index ba46752312..f635ceef42 100644
--- a/src/shared/components/ListActions/ListActions.js
+++ b/src/shared/components/ListActions/ListActions.js
@@ -22,7 +22,10 @@ const StandaloneAction = ({ action, entry }) => {
return (