Merge pull request #1375 from kubeshop/olelensmar/fix/disable-ns-sett…

…ings-when-deploying-ns fix: disable namespace selection elements if a namespace is being dep…
kubeshop · Feb 17, 2022 · acb0708 · acb0708
2 parents d1f3d27 + a4a6bbe
commit acb0708
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/components/molecules/FormEditor/FormWidgets/ResourceSelection.tsx b/src/components/molecules/FormEditor/FormWidgets/ResourceSelection.tsx
@@ -67,7 +67,7 @@ export function ResourceSelection(props: any) {
     } else {
       setResourceNames([]);
     }
-  }, [resourceMap]);
+  }, [resourceMap, options.resourceKinds]);
 
   return (
     <Select

diff --git a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
@@ -1,6 +1,6 @@
 import * as k8s from '@kubernetes/client-node';
 
-import React, {useCallback, useEffect, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 
 import {Input, Modal, Radio, Select} from 'antd';
 
@@ -97,7 +97,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
     } else if (selectedOption === 'none') {
       onOk();
     }
-  }, [kubeConfigContext, createNamespaceName, kubeConfigPath, selectedNamespace, selectedOption, onOk]);
+  }, [kubeConfigContext, createNamespaceName, kubeConfigPath, selectedNamespace, selectedOption, onOk, configState]);
 
   useEffect(() => {
     if (defaultOption && defaultOption === 'none') {
@@ -115,6 +115,9 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
     }
   }, [defaultOption, defaultNamespace, namespaces]);
 
+  const onlyNamespaces = useMemo(() => resources.every(r => r.kind === 'Namespace'), [resources]);
+  const hasNamespaces = useMemo(() => resources.some(r => r.kind === 'Namespace'), [resources]);
+
   if (!selectedOption) {
     return null;
   }
@@ -133,9 +136,12 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
       onCancel={onCancel}
     >
       <>
-        <HeadlineLabel>Select namespace:</HeadlineLabel>
+        <HeadlineLabel>
+          Select namespace {hasNamespaces && !onlyNamespaces && ' for all non-Namespace resources'}:
+        </HeadlineLabel>
         <Radio.Group
           key={selectedOption}
+          disabled={onlyNamespaces}
           onChange={e => {
             setSelectedOption(e.target.value);
             setErrorMessage('');
@@ -152,6 +158,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
           <NamespaceContainer>
             <span>Namespace:</span>
             <Select
+              disabled={onlyNamespaces}
               value={selectedNamespace}
               showSearch
               defaultValue={defaultNamespace}
@@ -171,6 +178,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
             <NamespaceContainer>
               <span>Namespace name:</span>
               <Input
+                disabled={onlyNamespaces}
                 autoFocus
                 defaultValue={createNamespaceName}
                 placeholder="Enter namespace name"

diff --git a/src/components/molecules/Monaco/Monaco.tsx b/src/components/molecules/Monaco/Monaco.tsx
@@ -280,6 +280,7 @@ const Monaco = (props: {diffSelectedResource: () => void; applySelection: () =>
   }, [
     isInPreviewMode,
     selectedResourceId,
+    selectedResource,
     previewResourceId,
     selectedValuesFileId,
     previewValuesFileId,

diff --git a/src/components/organisms/LocalResourceDiffModal/LocalResourceDiffModal.tsx b/src/components/organisms/LocalResourceDiffModal/LocalResourceDiffModal.tsx
@@ -266,6 +266,7 @@ const DiffModal = () => {
     resourceFilter.namespace,
     targetResource,
     isDiffModalVisible,
+    configState,
   ]);
 
   useEffect(() => {