fix(namespace): wait for system ns setting to load before selecting existing ns [EE-6917] (#11484)

Co-authored-by: testa113 <testa113>
pull/11507/head
Ali 8 months ago committed by GitHub
parent e5f6363244
commit 5f89255d9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -77,14 +77,12 @@ export function ApplicationsStacksDatatable({
namespaces={namespaces}
value={namespace}
onChange={onNamespaceChange}
showSystem={tableState.showSystemResources}
showSystem={showSystem}
/>
</div>
<div className="space-y-2">
<SystemResourceDescription
showSystemResources={tableState.showSystemResources}
/>
<SystemResourceDescription showSystemResources={showSystem} />
</div>
</div>
}

@ -7,13 +7,17 @@ import { InputGroup } from '@@/form-components/InputGroup';
import { Namespace } from './types';
function transformNamespaces(namespaces: Namespace[], showSystem: boolean) {
return namespaces
.filter((ns) => showSystem || !ns.IsSystem)
.map(({ Name, IsSystem }) => ({
label: IsSystem ? `${Name} - system` : Name,
value: Name,
}));
function transformNamespaces(namespaces: Namespace[], showSystem?: boolean) {
const transformedNamespaces = namespaces.map(({ Name, IsSystem }) => ({
label: IsSystem ? `${Name} - system` : Name,
value: Name,
isSystem: IsSystem,
}));
if (showSystem === undefined) {
return transformedNamespaces;
}
// only filter when showSystem is set
return transformedNamespaces.filter((ns) => showSystem || !ns.isSystem);
}
export function NamespaceFilter({
@ -25,19 +29,22 @@ export function NamespaceFilter({
namespaces: Namespace[];
value: string;
onChange: (value: string) => void;
showSystem: boolean;
showSystem?: boolean;
}) {
const transformedNamespaces = transformNamespaces(namespaces, showSystem);
// sync value with displayed namespaces
useEffect(() => {
const names = transformedNamespaces.map((ns) => ns.value);
if (value && !names.find((ns) => ns === value)) {
onChange(
names.length > 0 ? names.find((ns) => ns === 'default') || names[0] : ''
);
const isSelectedNamespaceFound = names.some((ns) => ns === value);
if (value && !isSelectedNamespaceFound) {
const newNamespaceValue =
names.length > 0
? names.find((ns) => ns === 'default') || names[0]
: '';
onChange(newNamespaceValue);
}
}, [value, onChange, transformedNamespaces]);
}, [value, onChange, transformedNamespaces, showSystem]);
return (
<InputGroup>

@ -3,11 +3,11 @@ import { Authorized } from '@/react/hooks/useUser';
import { TextTip } from '@@/Tip/TextTip';
interface Props {
showSystemResources: boolean;
showSystemResources?: boolean;
}
export function SystemResourceDescription({ showSystemResources }: Props) {
return !showSystemResources ? (
return showSystemResources === false ? (
<Authorized authorizations="K8sAccessSystemNamespaces" adminOnlyCE>
<TextTip color="blue" className="!mb-0">
System resources are hidden, this can be changed in the table settings

Loading…
Cancel
Save