From cfbf63bfbf561cd150e0a9bd9b964725b371f575 Mon Sep 17 00:00:00 2001
From: olensmar <ole@lensmar.com>
Date: Wed, 16 Feb 2022 21:57:00 +0100
Subject: [PATCH 1/6] fix: disable namespace selection elements if a namespace
 is being deployed

---
 .../ModalConfirmWithNamespaceSelect.tsx                      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
index 91b681b80d..bb01f6ec1d 100644
--- a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
+++ b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
@@ -119,6 +119,8 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
     return null;
   }
 
+  const disableNamespaces = !resources.some(r => r.kind !== 'Namespace');
+
   return (
     <Modal
       centered
@@ -136,6 +138,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
         <HeadlineLabel>Select namespace:</HeadlineLabel>
         <Radio.Group
           key={selectedOption}
+          disabled={disableNamespaces}
           onChange={e => {
             setSelectedOption(e.target.value);
             setErrorMessage('');
@@ -152,6 +155,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
           <NamespaceContainer>
             <span>Namespace:</span>
             <Select
+              disabled={disableNamespaces}
               value={selectedNamespace}
               showSearch
               defaultValue={defaultNamespace}
@@ -171,6 +175,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
             <NamespaceContainer>
               <span>Namespace name:</span>
               <Input
+                disabled={disableNamespaces}
                 autoFocus
                 defaultValue={createNamespaceName}
                 placeholder="Enter namespace name"

From 6bb376238cb46e4c23fbc185e174957893b1a527 Mon Sep 17 00:00:00 2001
From: olensmar <ole@lensmar.com>
Date: Wed, 16 Feb 2022 22:07:37 +0100
Subject: [PATCH 2/6] fix: use state instead of const for disableNamespaces

---
 .../ModalConfirmWithNamespaceSelect.tsx                    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
index bb01f6ec1d..e6d8c2fc5b 100644
--- a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
+++ b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
@@ -65,6 +65,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
   const {defaultNamespace, defaultOption} = getDefaultNamespaceForApply(resources);
   const [namespaces] = useTargetClusterNamespaces();
 
+  const [disableNamespaces, setDisableNamespaces] = useState<boolean>();
   const [createNamespaceName, setCreateNamespaceName] = useState<string>();
   const [errorMessage, setErrorMessage] = useState('');
   const [selectedNamespace, setSelectedNamespace] = useState(defaultNamespace);
@@ -115,12 +116,14 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
     }
   }, [defaultOption, defaultNamespace, namespaces]);
 
+  useEffect(() => {
+    setDisableNamespaces(!resources.some(r => r.kind !== 'Namespace'));
+  }, [resources]);
+
   if (!selectedOption) {
     return null;
   }
 
-  const disableNamespaces = !resources.some(r => r.kind !== 'Namespace');
-
   return (
     <Modal
       centered

From 001bdae0c28f9ca3ecd2b82577799729c4058aa2 Mon Sep 17 00:00:00 2001
From: olensmar <ole@lensmar.com>
Date: Thu, 17 Feb 2022 11:10:59 +0100
Subject: [PATCH 3/6] fix: useMemo fix and improved label in multi-deploy
 scenario

---
 .../ModalConfirmWithNamespaceSelect.tsx        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
index e6d8c2fc5b..f631838dba 100644
--- 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';
 
@@ -65,7 +65,6 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
   const {defaultNamespace, defaultOption} = getDefaultNamespaceForApply(resources);
   const [namespaces] = useTargetClusterNamespaces();
 
-  const [disableNamespaces, setDisableNamespaces] = useState<boolean>();
   const [createNamespaceName, setCreateNamespaceName] = useState<string>();
   const [errorMessage, setErrorMessage] = useState('');
   const [selectedNamespace, setSelectedNamespace] = useState(defaultNamespace);
@@ -116,9 +115,8 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
     }
   }, [defaultOption, defaultNamespace, namespaces]);
 
-  useEffect(() => {
-    setDisableNamespaces(!resources.some(r => r.kind !== 'Namespace'));
-  }, [resources]);
+  const onlyNamespaces = useMemo(() => !resources.some(r => r.kind !== 'Namespace'), [resources]);
+  const hasNamespaces = useMemo(() => resources.some(r => r.kind === 'Namespace'), [resources]);
 
   if (!selectedOption) {
     return null;
@@ -138,10 +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={disableNamespaces}
+          disabled={onlyNamespaces}
           onChange={e => {
             setSelectedOption(e.target.value);
             setErrorMessage('');
@@ -158,7 +158,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
           <NamespaceContainer>
             <span>Namespace:</span>
             <Select
-              disabled={disableNamespaces}
+              disabled={onlyNamespaces}
               value={selectedNamespace}
               showSearch
               defaultValue={defaultNamespace}
@@ -178,7 +178,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
             <NamespaceContainer>
               <span>Namespace name:</span>
               <Input
-                disabled={disableNamespaces}
+                disabled={onlyNamespaces}
                 autoFocus
                 defaultValue={createNamespaceName}
                 placeholder="Enter namespace name"

From c4e1df6f8e4d2fefbe2aaf4ab3f1c7311ab966a8 Mon Sep 17 00:00:00 2001
From: olensmar <ole@lensmar.com>
Date: Thu, 17 Feb 2022 11:32:54 +0100
Subject: [PATCH 4/6] fix: fixed missing hook dependencies and removed logging

---
 .../molecules/FormEditor/FormWidgets/NamespaceSelection.tsx     | 2 --
 .../molecules/FormEditor/FormWidgets/ResourceSelection.tsx      | 2 +-
 .../ModalConfirmWithNamespaceSelect.tsx                         | 2 +-
 src/components/molecules/Monaco/Monaco.tsx                      | 1 +
 .../organisms/LocalResourceDiffModal/LocalResourceDiffModal.tsx | 1 +
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/molecules/FormEditor/FormWidgets/NamespaceSelection.tsx b/src/components/molecules/FormEditor/FormWidgets/NamespaceSelection.tsx
index 6bace7ca13..2ff4a5ed74 100644
--- a/src/components/molecules/FormEditor/FormWidgets/NamespaceSelection.tsx
+++ b/src/components/molecules/FormEditor/FormWidgets/NamespaceSelection.tsx
@@ -23,8 +23,6 @@ export const NamespaceSelection = (params: any) => {
   const [selectValue, setSelectValue] = useState<string | undefined>();
   const [inputValue, setInputValue] = useState<string>();
 
-  console.log('Creating namespace selection with params', params);
-
   const handleChange = (providedValue: string) => {
     if (providedValue === NEW_ITEM) {
       setSelectValue(inputValue);
diff --git a/src/components/molecules/FormEditor/FormWidgets/ResourceSelection.tsx b/src/components/molecules/FormEditor/FormWidgets/ResourceSelection.tsx
index 32c24e6d20..4e2a746418 100644
--- 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
index f631838dba..1016f9acd8 100644
--- a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
+++ b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
@@ -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') {
diff --git a/src/components/molecules/Monaco/Monaco.tsx b/src/components/molecules/Monaco/Monaco.tsx
index e43c688e8b..6e22fdc85e 100644
--- 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
index f48b4ae460..f25bc7c0ea 100644
--- 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(() => {

From 6436fa328ddc3934bd925cd89921174e2ea5f665 Mon Sep 17 00:00:00 2001
From: olensmar <ole@lensmar.com>
Date: Thu, 17 Feb 2022 11:33:06 +0100
Subject: [PATCH 5/6] fix: fixed missing hook dependencies and removed logging

---
 .../molecules/FormEditor/FormWidgets/ResourceSelection.tsx      | 2 +-
 .../organisms/LocalResourceDiffModal/LocalResourceDiffModal.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/molecules/FormEditor/FormWidgets/ResourceSelection.tsx b/src/components/molecules/FormEditor/FormWidgets/ResourceSelection.tsx
index 4e2a746418..4dcc70b201 100644
--- 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,options.resourceKinds]);
+  }, [resourceMap, options.resourceKinds]);
 
   return (
     <Select
diff --git a/src/components/organisms/LocalResourceDiffModal/LocalResourceDiffModal.tsx b/src/components/organisms/LocalResourceDiffModal/LocalResourceDiffModal.tsx
index f25bc7c0ea..089a6a2c9b 100644
--- a/src/components/organisms/LocalResourceDiffModal/LocalResourceDiffModal.tsx
+++ b/src/components/organisms/LocalResourceDiffModal/LocalResourceDiffModal.tsx
@@ -266,7 +266,7 @@ const DiffModal = () => {
     resourceFilter.namespace,
     targetResource,
     isDiffModalVisible,
-    configState
+    configState,
   ]);
 
   useEffect(() => {

From e93a1706599ca71392d6e2074fed1f20c8d512f7 Mon Sep 17 00:00:00 2001
From: olensmar <ole@lensmar.com>
Date: Thu, 17 Feb 2022 12:57:48 +0100
Subject: [PATCH 6/6] fix: replaced some with every

---
 .../ModalConfirmWithNamespaceSelect.tsx                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
index 1016f9acd8..76a263a784 100644
--- a/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
+++ b/src/components/molecules/ModalConfirmWithNamespaceSelect/ModalConfirmWithNamespaceSelect.tsx
@@ -115,7 +115,7 @@ const ModalConfirmWithNamespaceSelect: React.FC<IProps> = props => {
     }
   }, [defaultOption, defaultNamespace, namespaces]);
 
-  const onlyNamespaces = useMemo(() => !resources.some(r => r.kind !== 'Namespace'), [resources]);
+  const onlyNamespaces = useMemo(() => resources.every(r => r.kind === 'Namespace'), [resources]);
   const hasNamespaces = useMemo(() => resources.some(r => r.kind === 'Namespace'), [resources]);
 
   if (!selectedOption) {