Merge pull request #4 from nirupama-dev/config-error

Added config error page when project id or region is missing

Author: nirupama-dev

scheduler_jupyter_plugin/credentials.py

@@ -76,5 +76,7 @@ async def get_cached():
         # As such, we treat them being missing as a signal that there is
         # a problem with how the user is logged in to gcloud.
         credentials["login_error"] = 1
+    elif not credentials["project_id"] or not credentials["region_id"]:
+        credentials["config_error"] = 1
 
     return credentials

src/scheduler/NotebookScheduler.tsx

@@ -72,6 +72,7 @@ const NotebookSchedulerComponent = ({
   const abortControllerRef = useRef<any>(null);
   const [apiEnableUrl, setApiEnableUrl] = useState<any>(null);
   const [loginError, setLoginError] = useState<boolean>(false);
+  const [configError, setConfigError] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const [listingScreenFlag, setListingScreenFlag] = useState<boolean>(false);
   const [jobNameUniquenessError, setJobNameUniquenessError] =
@@ -100,7 +101,7 @@ const NotebookSchedulerComponent = ({
 
   useEffect(() => {
     getKernelDetails();
-    checkConfig(setLoginError, setIsLoading);
+    checkConfig(setLoginError, setIsLoading, setConfigError);
   }, []);
 
   const handleJobNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -167,11 +168,12 @@ const NotebookSchedulerComponent = ({
           />
           Loading...
         </div>
-      ) : loginError && !isLoading ? (
+      ) : loginError || configError ? (
         <div className="login-error login-error-main">
           <LoginErrorComponent
             setLoginError={setLoginError}
             loginError={loginError}
+            configError={configError}
           />
         </div>
       ) : (

src/utils/Config.ts

@@ -44,14 +44,18 @@ export const authApi = async (
 
 export const checkConfig = async (
   setLoginError: React.Dispatch<React.SetStateAction<boolean>>,
-  setIsLoading: React.Dispatch<React.SetStateAction<boolean>>
+  setIsLoading: React.Dispatch<React.SetStateAction<boolean>>,
+  setConfigError: React.Dispatch<React.SetStateAction<boolean>>
 ): Promise<void> => {
   const credentials: IAuthCredentials | undefined = await authApi();
   if (credentials) {
     if (credentials.login_error === 1) {
       setLoginError(true);
       setIsLoading(false);
     }
+    if (credentials.config_error === 1) {
+      setConfigError(true);
+    }
     setIsLoading(false);
   }
 };
@@ -291,6 +295,7 @@ export const login = async (
     const loginStatus = (data as { login: string }).login;
     if (loginStatus === STATUS_SUCCESS) {
       setLoginError(false);
+      window.location.reload();
     } else {
       setLoginError(true);
     }

src/utils/LoginErrorComponent.tsx

@@ -22,8 +22,17 @@ import { IconsigninGoogle } from './Icons';
 
 const LoginErrorComponent: React.FC<ILoginErrorProps> = ({
   loginError = false,
-  setLoginError
+  setLoginError,
+  configError = false
 }) => {
+  if (configError) {
+    return (
+      <div className="login-error">
+        Please configure gcloud with account, project-id and region
+      </div>
+    );
+  }
+
   if (loginError) {
     return (
       <>