From 856e1ad4496c49a6ec78e83bf5dd00078ee7a67e Mon Sep 17 00:00:00 2001 From: Jim Ehrismann Date: Thu, 28 Oct 2021 16:18:48 -0400 Subject: [PATCH] refactor with some bulletproofing Signed-off-by: Jim Ehrismann --- .../+namespaces/namespace-select-filter.tsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/renderer/components/+namespaces/namespace-select-filter.tsx b/src/renderer/components/+namespaces/namespace-select-filter.tsx index df435d9d4d..9ad0c60a4c 100644 --- a/src/renderer/components/+namespaces/namespace-select-filter.tsx +++ b/src/renderer/components/+namespaces/namespace-select-filter.tsx @@ -37,14 +37,15 @@ const Placeholder = observer((props: PlaceholderProps) => { const getPlaceholder = (): React.ReactNode => { const namespaces = namespaceStore.contextNamespaces; - switch (namespaceStore.selectedNamespaces.length) { - case 0: - return <>All namespaces; - case 1: - return <>Namespace: {namespaces[0]}; - default: - return <>Namespaces: {namespaces.join(", ")}; + if (!namespaceStore.selectedNamespaces.length || !namespaces.length) { + return <>All namespaces; } + + if (namespaces.length === 1) { + return <>Namespace: {namespaces[0]}; + } + + return <>Namespaces: {namespaces.join(", ")}; }; return ( @@ -100,9 +101,9 @@ export class NamespaceSelectFilter extends React.Component { return (
- + {namespace} - {isSelected && } + {isSelected && }
); }