`
}
&& .ant-menu-sub .ant-menu-item.ant-menu-item-selected {
- width: 225px;
+ width: 214px;
margin-left: 25px !important;
padding-left: 23px !important;
transition: padding 0s;
diff --git a/src/components/organisms/Footer/Footer.tsx b/src/components/organisms/Footer/Footer.tsx
index c302c01..f36d824 100644
--- a/src/components/organisms/Footer/Footer.tsx
+++ b/src/components/organisms/Footer/Footer.tsx
@@ -1,11 +1,14 @@
import React, { FC } from 'react'
import { Typography } from 'antd'
+import { FOOTER_TEXT } from 'constants/customizationApiGroupAndVersion'
import { Styled } from './styled'
export const Footer: FC = () => {
return (
- PRO Robotech © {new Date().getFullYear()}
+
+ {FOOTER_TEXT} © {new Date().getFullYear()}
+
)
}
diff --git a/src/components/organisms/Header/organisms/Logo/Logo.tsx b/src/components/organisms/Header/organisms/Logo/Logo.tsx
index 7823147..1adf2a0 100644
--- a/src/components/organisms/Header/organisms/Logo/Logo.tsx
+++ b/src/components/organisms/Header/organisms/Logo/Logo.tsx
@@ -3,6 +3,8 @@ import { Flex, theme as antdtheme } from 'antd'
import { useNavigate } from 'react-router-dom'
import { useSelector } from 'react-redux'
import { RootState } from 'store/store'
+import { LOGO_TEXT, CUSTOM_LOGO_SVG, CUSTOM_TENANT_TEXT } from 'constants/customizationApiGroupAndVersion'
+import { renderLogo } from './utils'
import { Styled } from './styled'
export const Logo: FC = () => {
@@ -17,14 +19,23 @@ export const Logo: FC = () => {
return (
-
- navigate(`${baseprefix}`)}>In-Cloud
- {tenant}
+ {CUSTOM_LOGO_SVG && typeof CUSTOM_LOGO_SVG === 'string' && CUSTOM_LOGO_SVG.length > 0 ? (
+ renderLogo(CUSTOM_LOGO_SVG, token.colorText)
+ ) : (
+
+ )}
+
+ navigate(`${baseprefix}`)}>{LOGO_TEXT}
+
+ {CUSTOM_TENANT_TEXT && typeof CUSTOM_TENANT_TEXT === 'string' && CUSTOM_TENANT_TEXT.length > 0
+ ? CUSTOM_TENANT_TEXT
+ : tenant}
+
)
diff --git a/src/components/organisms/Header/organisms/Logo/utils.tsx b/src/components/organisms/Header/organisms/Logo/utils.tsx
new file mode 100644
index 0000000..1d04d21
--- /dev/null
+++ b/src/components/organisms/Header/organisms/Logo/utils.tsx
@@ -0,0 +1,17 @@
+export const renderLogo = (customLogo: string, colorText: string): JSX.Element | null => {
+ if (customLogo) {
+ // Decode base64 SVG and replace all fill placeholders
+ try {
+ const decodedSvg = atob(customLogo)
+ // Replace all instances of {token.colorText} with actual color
+ const svgWithFill = decodedSvg.replace(/\{token\.colorText\}/g, `"${colorText}"`)
+ // eslint-disable-next-line react/no-danger
+ return
+ } catch (error) {
+ // eslint-disable-next-line no-console
+ console.error('Error decoding custom logo:', error)
+ return null
+ }
+ }
+ return null
+}
diff --git a/src/components/organisms/Header/organisms/User/User.tsx b/src/components/organisms/Header/organisms/User/User.tsx
index efe7ac3..69f89ce 100644
--- a/src/components/organisms/Header/organisms/User/User.tsx
+++ b/src/components/organisms/Header/organisms/User/User.tsx
@@ -6,6 +6,7 @@ import { useSelector } from 'react-redux'
import type { RootState } from 'store/store'
import { useAuth } from 'hooks/useAuth'
import { logout } from 'api/auth'
+import { BASE_HIDE_INSIDE } from 'constants/customizationApiGroupAndVersion'
import { Styled } from './styled'
export const User: FC = () => {
@@ -23,10 +24,14 @@ export const User: FC = () => {
// key: '1',
// label: ,
// },
- {
- key: '2',
- label: navigate(`${baseprefix}/inside/clusters`)}>Inside
,
- },
+ ...(BASE_HIDE_INSIDE === 'true'
+ ? []
+ : [
+ {
+ key: '2',
+ label: navigate(`${baseprefix}/inside/clusters`)}>Inside
,
+ },
+ ]),
{
key: '3',
label: (
diff --git a/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx b/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
index b6fb99f..4f52a36 100644
--- a/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
+++ b/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
@@ -1,10 +1,15 @@
import React, { FC, useState } from 'react'
import { Button, Alert, Spin, Typography } from 'antd'
-import { filterSelectOptions, Spacer, useBuiltinResources } from '@prorobotech/openapi-k8s-toolkit'
+import { filterSelectOptions, Spacer, useBuiltinResources, useApiResources } from '@prorobotech/openapi-k8s-toolkit'
import { useNavigate } from 'react-router-dom'
import { useSelector, useDispatch } from 'react-redux'
import { RootState } from 'store/store'
import { setCluster } from 'store/cluster/cluster/cluster'
+import {
+ CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
+ CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
+ CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+} from 'constants/customizationApiGroupAndVersion'
import { Styled } from './styled'
export const ListInsideClusterAndNs: FC = () => {
@@ -17,11 +22,31 @@ export const ListInsideClusterAndNs: FC = () => {
const [selectedCluster, setSelectedCluster] = useState()
const [selectedNamespace, setSelectedNamespace] = useState()
+ const isCustomNamespaceResource =
+ CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP &&
+ typeof CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP === 'string' &&
+ CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP.length > 0 &&
+ CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION &&
+ typeof CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION === 'string' &&
+ CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION.length > 0 &&
+ CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME &&
+ typeof CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME === 'string' &&
+ CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME.length > 0
+
const namespacesData = useBuiltinResources({
clusterName: selectedCluster || '',
typeName: 'namespaces',
limit: null,
- isEnabled: selectedCluster !== undefined,
+ isEnabled: Boolean(selectedCluster !== undefined && !isCustomNamespaceResource),
+ })
+
+ const namespacesDataCustom = useApiResources({
+ clusterName: selectedCluster || '',
+ apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
+ apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
+ typeName: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+ limit: null,
+ isEnabled: Boolean(selectedCluster !== undefined && isCustomNamespaceResource),
})
return (
@@ -55,33 +80,62 @@ export const ListInsideClusterAndNs: FC = () => {
/>
)}
- {selectedCluster && namespacesData.isPending && }
- {selectedCluster && namespacesData.error && (
-
+ {selectedCluster && (isCustomNamespaceResource ? namespacesDataCustom.isPending : namespacesData.isPending) && (
+
)}
- {selectedCluster && selectedCluster.length > 0 && namespacesData.data && namespacesData.data.items.length > 0 && (
- <>
- Namespace
-
- ({
- label: ns.metadata.name,
- value: ns.metadata.name,
- }))}
- filterOption={filterSelectOptions}
- allowClear
- showSearch
- onSelect={value => {
- if (typeof value === 'string') {
- setSelectedNamespace(value)
- }
- }}
- onClear={() => setSelectedNamespace(undefined)}
- />
-
-
+ {selectedCluster && (isCustomNamespaceResource ? namespacesDataCustom.error : namespacesData.error) && (
+
)}
+ {selectedCluster &&
+ selectedCluster.length > 0 &&
+ ((!isCustomNamespaceResource && namespacesData.data && namespacesData.data.items.length > 0) ||
+ (isCustomNamespaceResource && namespacesDataCustom.data && namespacesDataCustom.data.items.length > 0)) && (
+ <>
+ Namespace
+
+ {isCustomNamespaceResource ? (
+ ({
+ label: ns.metadata.name,
+ value: ns.metadata.name,
+ }))}
+ filterOption={filterSelectOptions}
+ allowClear
+ showSearch
+ onSelect={value => {
+ if (typeof value === 'string') {
+ setSelectedNamespace(value)
+ }
+ }}
+ onClear={() => setSelectedNamespace(undefined)}
+ />
+ ) : (
+ ({
+ label: ns.metadata.name,
+ value: ns.metadata.name,
+ }))}
+ filterOption={filterSelectOptions}
+ allowClear
+ showSearch
+ onSelect={value => {
+ if (typeof value === 'string') {
+ setSelectedNamespace(value)
+ }
+ }}
+ onClear={() => setSelectedNamespace(undefined)}
+ />
+ )}
+
+
+ )}