@@ -141,65 +131,29 @@ 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 (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',
- });
- }
+ 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) {
- 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',
- });
- }
- });
- }
+ existingModule.channels?.push({
+ channel: module.spec.channel,
+ version: module.spec.descriptor.component.version,
+ isBeta:
+ module.metadata.labels['operator.kyma-project.io/beta'] === 'true',
+ });
}
return acc;
}, []);
@@ -282,11 +236,9 @@ 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 5952056e45..3f7800fa4e 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
- : kymaResource?.spec?.modules?.[moduleIndex]?.channel}
+ : EMPTY_TEXT_PLACEHOLDER}
{isChannelOverriden ? (
- {`${(
- 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 28996dbf83..9a1e44cfc0 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,
- )}Gi / ${roundTwoDecimals(memory.capacity)}Gi`}
+ )}GiB / ${roundTwoDecimals(memory.capacity)}GiB`}
/>
diff --git a/src/components/Nodes/nodeQueries.js b/src/components/Nodes/nodeQueries.js
index 55585c57d1..335e35bf15 100644
--- a/src/components/Nodes/nodeQueries.js
+++ b/src/components/Nodes/nodeQueries.js
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import React, { useMemo } from 'react';
import { useGet } from 'shared/hooks/BackendAPI/useGet';
import {
getBytes,
@@ -22,30 +22,27 @@ const formatMemory = memoryStr =>
const createUsageMetrics = (node, metricsForNode) => {
const cpuUsage = formatCpu(metricsForNode?.usage.cpu);
const memoryUsage = formatMemory(metricsForNode?.usage.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);
+ const cpuCapacity = parseInt(node.status.capacity?.cpu || '0') * 1000;
+ const memoryCapacity = formatMemory(node.status.capacity?.memory);
return {
cpu: {
usage: cpuUsage,
capacity: cpuCapacity,
- percentage: cpuPercentage + '%',
- percentageValue: cpuPercentage,
+ percentage: getPercentageFromUsage(cpuUsage, cpuCapacity) + '%',
+ percentageValue: getPercentageFromUsage(cpuUsage, cpuCapacity),
},
memory: {
usage: memoryUsage,
capacity: memoryCapacity,
- percentage: memoryPercentage + '%',
- percentageValue: memoryPercentage,
+ percentage: getPercentageFromUsage(memoryUsage, memoryCapacity) + '%',
+ percentageValue: getPercentageFromUsage(memoryUsage, memoryCapacity),
},
};
};
export function useNodesQuery(skip = false) {
- const [data, setData] = useState(null);
+ const [data, setData] = React.useState(null);
const { data: nodeMetrics, loading: metricsLoading } = useGet(
'/apis/metrics.k8s.io/v1beta1/nodes',
{
@@ -60,7 +57,7 @@ export function useNodesQuery(skip = false) {
loading: nodesLoading,
} = useGet('/api/v1/nodes', { pollingInterval: 5500, skip });
- useEffect(() => {
+ React.useEffect(() => {
if (nodes) {
const getNodeMetrics = node => {
const metricsForNode = nodeMetrics.items.find(
@@ -86,7 +83,7 @@ export function useNodesQuery(skip = false) {
}
export function useNodeQuery(nodeName) {
- const [data, setData] = useState(null);
+ const [data, setData] = React.useState(null);
const {
data: nodeMetrics,
error: metricsError,
@@ -101,7 +98,7 @@ export function useNodeQuery(nodeName) {
loading: nodeLoading,
} = useGet(`/api/v1/nodes/${nodeName}`, { pollingInterval: 3000 });
- useEffect(() => {
+ React.useEffect(() => {
if (node) {
setData({
node,
@@ -155,9 +152,7 @@ function addResources(a, b) {
function sumContainersResources(containers) {
return containers?.reduce((containerAccu, container) => {
- const containerResources = container.resources;
- const updatedResources = addResources(containerAccu, containerResources);
- return updatedResources;
+ return addResources(containerAccu, container.resources);
}, structuredClone(emptyResources));
}
@@ -186,14 +181,14 @@ export function calcNodeResources(pods) {
}
export function useResourceByNode(nodeName) {
- const [data, setData] = useState(null);
+ const [data, setData] = React.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]);
- useEffect(() => {
+ React.useEffect(() => {
if (nodeResources) {
setData(nodeResources);
}
diff --git a/src/resources/Deployments/DeploymentDetails.js b/src/resources/Deployments/DeploymentDetails.js
index c6448828a9..5740639484 100644
--- a/src/resources/Deployments/DeploymentDetails.js
+++ b/src/resources/Deployments/DeploymentDetails.js
@@ -64,12 +64,7 @@ export function DeploymentDetails(props) {
const statusConditions = deployment => {
return deployment?.status?.conditions?.map(condition => {
return {
- header: {
- titleText: condition.type,
- status: condition.status,
- overrideStatusType:
- condition.type === 'ReplicaFailure' ? 'False' : condition.status,
- },
+ header: { titleText: condition.type, status: condition.status },
message: condition.message,
};
});
diff --git a/src/resources/Deployments/DeploymentStatus.js b/src/resources/Deployments/DeploymentStatus.js
index 0fb4fe10d3..5bf2456caf 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 || deployment.spec.replicas || 0;
+ const expected = deployment.status.replicas || 0;
return ;
}
diff --git a/src/resources/Namespaces/AllNamespacesDetails.js b/src/resources/Namespaces/AllNamespacesDetails.js
index 8302f233d6..0fb112b522 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 d935525d1f..2e72432885 100644
--- a/src/resources/Namespaces/NamespaceWorkloads/NamespaceWorkloadsHelpers.js
+++ b/src/resources/Namespaces/NamespaceWorkloads/NamespaceWorkloadsHelpers.js
@@ -1,12 +1,8 @@
import { calculatePodState } from 'resources/Pods/PodStatus';
export function getHealthyReplicasCount(resource) {
- return resource?.filter(r => {
- const running = r.status.readyReplicas || 0;
- const expected = r.status.replicas || r.spec.replicas || 0;
-
- return running === expected;
- })?.length;
+ return resource?.filter(r => r.status.replicas === r.status.readyReplicas)
+ ?.length;
}
export const PodStatusCounterKey = {
diff --git a/src/resources/Namespaces/ResourcesUsage.js b/src/resources/Namespaces/ResourcesUsage.js
index 3bc6eb5426..718403e83f 100644
--- a/src/resources/Namespaces/ResourcesUsage.js
+++ b/src/resources/Namespaces/ResourcesUsage.js
@@ -9,7 +9,6 @@ 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,
@@ -23,13 +22,24 @@ const CPU_SUFFIX_POWER = {
m: 1e-3,
};
-export function getBytes(memoryStr) {
- if (!memoryStr) return 0;
+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, '');
- const unit = String(memoryStr).match(/[a-zA-Z]+/g)?.[0];
- const value = parseFloat(memoryStr);
- const bytes = value * (MEMORY_SUFFIX_POWER[unit] || 1);
- return bytes;
+ const suffixPower = MEMORY_SUFFIX_POWER[suffix];
+ if (!suffixPower) {
+ return number;
+ }
+
+ return number * suffixPower;
}
export function getCpus(cpuString) {
diff --git a/src/resources/other/kymaModules.routes.js b/src/resources/other/kymaModules.routes.js
index 2f0fef3eda..d0a90e2222 100644
--- a/src/resources/other/kymaModules.routes.js
+++ b/src/resources/other/kymaModules.routes.js
@@ -112,7 +112,7 @@ const ColumnWraper = (defaultColumn = 'list') => {
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 dae0b0dab3..397c7390b5 100644
--- a/src/shared/components/ConditionList/ConditionList.tsx
+++ b/src/shared/components/ConditionList/ConditionList.tsx
@@ -18,7 +18,6 @@ type ConditionItem = {
type ConditionHeader = {
titleText: string | ReactNode;
status?: string;
- overrideStatusType?: string;
};
export const ConditionList = ({
@@ -35,7 +34,6 @@ 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 4bc029aaab..3328464404 100644
--- a/src/shared/components/DynamicPageComponent/DynamicPageComponent.js
+++ b/src/shared/components/DynamicPageComponent/DynamicPageComponent.js
@@ -164,7 +164,7 @@ export const DynamicPageComponent = ({
>
{actions && (
- <>
+
{actions}
{(window.location.search.includes('layout') ||
(!window.location.search.includes('layout') &&
@@ -172,7 +172,7 @@ export const DynamicPageComponent = ({
layoutNumber !== 'StartColumn' ? (
) : null}
-
+
)}
{window.location.search.includes('layout') ||
(!window.location.search.includes('layout') &&
@@ -290,7 +290,6 @@ export const DynamicPageComponent = ({
}
actionsBar={actionsBar}
- actionsToolbarProps={{ numberOfAlwaysVisibleItems: 2 }}
/>
);
diff --git a/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss b/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
index 5dc45917cd..a1122a9d0b 100644
--- a/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
+++ b/src/shared/components/DynamicPageComponent/DynamicPageComponent.scss
@@ -32,15 +32,11 @@
display: flex;
align-items: center;
justify-content: flex-end;
- }
-
- [data-component-name='ObjectPageTitleMiddleSection'] > div {
- flex-basis: 100%;
- }
- ui5-button {
- &:not(:last-of-type) {
- margin-right: 0.5rem;
+ ui5-button {
+ &:not(:last-of-type) {
+ margin-right: 0.5rem;
+ }
}
}
@@ -54,18 +50,6 @@
}
}
- .separator {
- display: inline-block;
- width: 1px;
- position: absolute;
- top: 50%;
- height: 1.5rem;
- margin-top: -0.75rem;
- margin-left: 5px;
- background-color: var(--sapList_BorderColor);
- border-radius: 5px;
- }
-
&::part(fit-content) {
position: static;
padding: unset;
diff --git a/src/shared/components/ExpandableListItem/ExpandableListItem.tsx b/src/shared/components/ExpandableListItem/ExpandableListItem.tsx
index bc05a2aef3..0f8ad6751a 100644
--- a/src/shared/components/ExpandableListItem/ExpandableListItem.tsx
+++ b/src/shared/components/ExpandableListItem/ExpandableListItem.tsx
@@ -8,7 +8,6 @@ import './ExpandableListItem.scss';
type ExpandableListItemProps = {
header: string | ReactNode;
status?: string;
- overrideStatusType?: string;
content?: string;
customContent?: CustomContent[];
};
@@ -22,18 +21,12 @@ export type CustomContent = {
export const ExpandableListItem = ({
header,
status,
- overrideStatusType,
content,
customContent,
}: ExpandableListItemProps) => {
const { t } = useTranslation();
const [expanded, setExpanded] = useState(false);
- let statusType = status === 'True' ? 'Positive' : 'Negative';
- if (overrideStatusType !== undefined) {
- statusType = overrideStatusType === 'True' ? 'Positive' : 'Negative';
- }
-
return (
<>
+
{status}
)}
diff --git a/src/shared/components/ResourceDetails/ResourceDetails.js b/src/shared/components/ResourceDetails/ResourceDetails.js
index 698a9304b0..db2588d4ce 100644
--- a/src/shared/components/ResourceDetails/ResourceDetails.js
+++ b/src/shared/components/ResourceDetails/ResourceDetails.js
@@ -208,33 +208,27 @@ function Resource({
{headerActions}
{resourceHeaderActions.map(resourceAction => resourceAction(resource))}
-
- {!disableDelete && (
- <>
-
-
- {createPortal(
- ,
- document.body,
- )}
-
- )}
- {createPortal(, document.body)}
-
+ {!disableDelete && (
+ <>
+
+ {createPortal(
+ ,
+ document.body,
+ )}
+
+ )}
+ {createPortal(, document.body)}
);
diff --git a/src/state/navigation/extensionsAtom.ts b/src/state/navigation/extensionsAtom.ts
index 426102e79e..591e35701d 100644
--- a/src/state/navigation/extensionsAtom.ts
+++ b/src/state/navigation/extensionsAtom.ts
@@ -45,8 +45,6 @@ type ConfigMapData = {
dataSources: string;
translations: string;
presets: string;
- customScript: string;
- customHtml: string;
};
type ConfigMapResponse = K8sResource & {
@@ -63,10 +61,6 @@ type ConfigMapListResponse =
}
| undefined;
-interface ExtensionProps {
- kymaFetchFn: (url: string, options?: any) => Promise;
-}
-
const isTheSameNameAndUrl = (
firstCM: Partial,
secondCM: Partial,
@@ -294,7 +288,6 @@ const getExtensions = async (
kubeconfigNamespace = 'kube-public',
currentNamespace: string,
permissionSet: PermissionSetState,
- extCustomComponentsEnabled: boolean,
) => {
if (!fetchFn) {
return null;
@@ -331,12 +324,6 @@ const getExtensions = async (
) as ExtResource,
};
- if (extCustomComponentsEnabled) {
- extResourceWithMetadata.data.customHtml =
- currentConfigMap.data.customHtml || '';
- extResourceWithMetadata.data.customScript =
- currentConfigMap.data.customScript || '';
- }
if (!extResourceWithMetadata.data) return accumulator;
const indexOfTheSameExtension = accumulator.findIndex(ext =>
@@ -419,43 +406,10 @@ export const useGetExtensions = () => {
const { isEnabled: isExtensibilityWizardEnabled } = useFeature(
'EXTENSIBILITY_WIZARD',
);
- const { isEnabled: isExtensibilityCustomComponentsEnabled } = useFeature(
- 'EXTENSIBILITY_CUSTOM_COMPONENTS',
- );
const { data: crds } = useGet(
`/apis/apiextensions.k8s.io/v1/customresourcedefinitions`,
);
- useEffect(() => {
- if (isExtensibilityCustomComponentsEnabled) {
- // Wrap busola fetch function to be able to use it in the extensions as regular fetch.
- // It reduces the learning curve for the extension developers and introduces loose coupling between Busola and the extensions.
- function asRegularFetch(busolaFetch: FetchFn, url: string, options: any) {
- return busolaFetch({
- relativeUrl: url,
- init: options,
- abortController: options?.signal
- ? { signal: options?.signal, abort: () => {} }
- : undefined,
- });
- }
-
- if (fetchFn) {
- (window as Window & {
- extensionProps?: ExtensionProps;
- }).extensionProps = {
- kymaFetchFn: (url: string, options: any) =>
- asRegularFetch(fetchFn, url, options),
- };
- }
- }
-
- return () => {
- delete (window as Window & { extensionProps?: ExtensionProps })
- .extensionProps;
- };
- }, [fetchFn, auth, isExtensibilityCustomComponentsEnabled]);
-
useEffect(() => {
(crds as any)?.items.forEach((crd: CustomResourceDefinition) => {
RESOURCE_PATH[crd?.spec.names.kind as keyof typeof RESOURCE_PATH] =
@@ -479,7 +433,6 @@ export const useGetExtensions = () => {
cluster.currentContext.namespace || 'kube-public',
namespace,
permissionSet,
- isExtensibilityCustomComponentsEnabled ?? false,
);
const statics = await getStatics(
diff --git a/src/state/types.ts b/src/state/types.ts
index 3d5341721f..453b9ae06d 100644
--- a/src/state/types.ts
+++ b/src/state/types.ts
@@ -22,7 +22,6 @@ export const configFeaturesNames = {
VISUAL_RESOURCES: 'VISUAL_RESOURCES',
EXTENSIBILITY: 'EXTENSIBILITY',
EXTENSIBILITY_INJECTIONS: 'EXTENSIBILITY_INJECTIONS',
- EXTENSIBILITY_CUSTOM_COMPONENTS: 'EXTENSIBILITY_CUSTOM_COMPONENTS',
EXTENSIBILITY_WIZARD: 'EXTENSIBILITY_WIZARD',
TRACKING: 'TRACKING',
PROTECTED_RESOURCES: 'PROTECTED_RESOURCES',
@@ -99,8 +98,6 @@ export type ExtResource = {
presets: any[];
dataSources: Record;
injections?: ExtInjection[];
- customHtml: {};
- customScript: {};
};
export type ExtensibilityNodesExt = {
diff --git a/tests/integration/tests/accessibility/test-acc-cron-jobs.spec.js b/tests/integration/tests/accessibility/test-acc-cron-jobs.spec.js
index ec3540e1db..c76440b73b 100644
--- a/tests/integration/tests/accessibility/test-acc-cron-jobs.spec.js
+++ b/tests/integration/tests/accessibility/test-acc-cron-jobs.spec.js
@@ -91,9 +91,8 @@ context('Accessibility test Cron Jobs', () => {
.clear()
.type('*', { force: true });
- cy.contains(
- 'ui5-label',
- 'Schedule: At 12:00 AM, on day 1 of the month',
+ cy.get(
+ '[aria-label="Schedule: At 12:00 AM, on day 1 of the month, expanded"]',
).click();
cy.contains('Command').click();
diff --git a/tests/integration/tests/cluster/test-custom-resources.spec.js b/tests/integration/tests/cluster/test-custom-resources.spec.js
index c590c4b1f0..774871fde4 100644
--- a/tests/integration/tests/cluster/test-custom-resources.spec.js
+++ b/tests/integration/tests/cluster/test-custom-resources.spec.js
@@ -107,7 +107,6 @@ context('Test Custom Resources', () => {
cy.get('ui5-input[id="search-input"]:visible')
.find('input')
.wait(1000)
- .clear()
.type('cypress');
cy.clickGenericListLink('Tclusters');
diff --git a/tests/integration/tests/namespace/test-service-accounts.spec.js b/tests/integration/tests/namespace/test-service-accounts.spec.js
index e1babfd67e..16866d3ed1 100644
--- a/tests/integration/tests/namespace/test-service-accounts.spec.js
+++ b/tests/integration/tests/namespace/test-service-accounts.spec.js
@@ -98,7 +98,12 @@ context('Test Service Accounts', () => {
});
it('Generate TokenRequest', () => {
- cy.get('[data-component-name="ToolbarChildContainer"]')
+ cy.getMidColumn()
+ .find('header')
+ .find('ui5-toggle-button:visible')
+ .click();
+
+ cy.get('[data-component-name="ToolbarOverflowPopoverContent"]')
.contains('ui5-button', 'Generate TokenRequest')
.click();