Fix logic for config updates (#204)

* add logs

* Update release version to dev-testing

* changes

* changes

* changes

* minor changes

---------

Co-authored-by: actions-user <[email protected]>

Author: ewilliams-cloudera

scripts/release_version.txt

@@ -1 +1 @@
-export RELEASE_TAG=1.18.0-beta
+export RELEASE_TAG=dev-testing

ui/src/pages/Settings/RestartAppModal.tsx

@@ -67,6 +67,51 @@ const PROGRESS_STATES = {
   },
 };
 
+const ProgressIndicator = ({
+  hasSeenRestarting,
+  config,
+  isRestarting,
+  waitingToRestart,
+}: {
+  hasSeenRestarting: boolean;
+  config?: ProjectConfig | null;
+  isRestarting: boolean;
+  waitingToRestart: boolean;
+}) => {
+  const currentProgress = useMemo(() => {
+    if (hasSeenRestarting && config) {
+      return PROGRESS_STATES.READY;
+    }
+
+    if (isRestarting) {
+      return PROGRESS_STATES.RESTARTING;
+    }
+
+    if (waitingToRestart) {
+      return PROGRESS_STATES.WAITING;
+    }
+
+    return PROGRESS_STATES.READY;
+  }, [waitingToRestart, isRestarting]);
+
+  return (
+    <Progress
+      type="circle"
+      percent={currentProgress.percent}
+      steps={3}
+      trailColor={cdlGray200}
+      strokeColor={currentProgress.color}
+      strokeWidth={10}
+      format={() => (
+        <Flex align="center" justify="center">
+          <Typography.Text style={{ fontSize: 10, textWrap: "wrap" }}>
+            {currentProgress.text}
+          </Typography.Text>
+        </Flex>
+      )}
+    />
+  );
+};
 const RestartAppModal = ({
   confirmationModal,
   form,
@@ -99,15 +144,22 @@ const RestartAppModal = ({
       restartApplication.mutate({});
     },
   });
-  const { isError: isProjectConfigError } = useGetAmpConfig(polling);
+  const { data: config } = useGetAmpConfig(polling);
+
+  const isRestarting = !config && polling;
 
-  const isRestarting = isProjectConfigError && polling;
   useEffect(() => {
     if (isRestarting) {
       setHasSeenRestarting(true);
     }
   }, [isRestarting, setHasSeenRestarting]);
 
+  useEffect(() => {
+    if (config && polling && hasSeenRestarting) {
+      setPolling(false);
+    }
+  }, [setPolling, config, polling, hasSeenRestarting]);
+
   const handleSubmit = () => {
     form
       .validateFields()
@@ -134,17 +186,6 @@ const RestartAppModal = ({
   };
 
   const waitingToRestart = polling && !hasSeenRestarting;
-
-  const currentProgress = useMemo(() => {
-    if (waitingToRestart) {
-      return PROGRESS_STATES.WAITING;
-    }
-    if (isRestarting) {
-      return PROGRESS_STATES.RESTARTING;
-    }
-    return PROGRESS_STATES.READY;
-  }, [waitingToRestart, isRestarting]);
-
   const updateInProgress = updateAmpConfig.isSuccess && polling;
 
   return (
@@ -175,21 +216,12 @@ const RestartAppModal = ({
         >
           Update Settings
         </Button>
-        {updateInProgress ? (
-          <Progress
-            type="circle"
-            percent={currentProgress.percent}
-            steps={3}
-            trailColor={cdlGray200}
-            strokeColor={currentProgress.color}
-            strokeWidth={10}
-            format={() => (
-              <Flex align="center" justify="center">
-                <Typography.Text style={{ fontSize: 10, textWrap: "wrap" }}>
-                  {currentProgress.text}
-                </Typography.Text>
-              </Flex>
-            )}
+        {updateAmpConfig.isSuccess ? (
+          <ProgressIndicator
+            hasSeenRestarting={hasSeenRestarting}
+            isRestarting={isRestarting}
+            waitingToRestart={waitingToRestart}
+            config={config}
           />
         ) : null}
         {updateAmpConfig.isSuccess && !waitingToRestart && !isRestarting ? (

ui/src/pages/Settings/SettingsPage.tsx

@@ -82,7 +82,7 @@ const SettingsPage = () => {
 
   return (
     <Flex style={{ marginLeft: 60 }} vertical>
-      {!projectConfig?.is_valid_config && (
+      {!projectConfig?.is_valid_config && !confirmationModal.isModalOpen && (
         <Alert
           message={
             <div>