Merge branch 'fix/ui' into 'main'

fix(ui): fix add database not opening after adding one db

See merge request !71

apps/web/src/components/navbar/AddDatabaseForm/newdatabaseform.tsx

@@ -68,7 +68,6 @@ export const NewDatabaseForm = (props: { onClose(): void; open: boolean }) => {
 
   /** Handles the submit button click. Calls the onSubmit in the props with all the fields. */
   function handleSubmitClicked(): void {
-    ref.current?.close();
     if (!Object.values(hasError).some((e) => e === true)) {
       api
         .AddDatabase(state, { updateDatabaseCache: true, setAsCurrent: true })
@@ -78,8 +77,8 @@ export const NewDatabaseForm = (props: { onClose(): void; open: boolean }) => {
         .catch((e) => {
           dispatch(addError(e.message));
         });
+      props.onClose();
     }
-    // props.onSubmit(state);
   }
 
   return (

apps/web/src/components/navbar/navbar.tsx

@@ -59,27 +59,18 @@ export const Navbar = (props: NavbarComponentProps) => {
   const [menuOpen, setMenuOpen] = useState(false);
   const [subMenuOpen, setSubMenuOpen] = useState<string | undefined>(undefined);
 
-  /**
-   * Called when the user clicks on the 'submit' button of the add database form.
-   */
-  function onAddDatabaseFormSubmit(request: AddDatabaseRequest): Promise<void | Response> {
-    return api
-      .AddDatabase(request, { updateDatabaseCache: true, setAsCurrent: true })
-      .then(() => {
-        schemaApi.RequestSchema(request.name);
-      })
-      .catch((e) => {
-        dispatch(addError(e.message));
-      });
-  }
-
   const currentLogo = !'dark' ? logo_white : logo; // TODO: support dark mode
 
   const buildInfo = import.meta.env.GRAPHPOLARIS_VERSION;
 
   return (
     <div className="w-full h-auto px-5">
-      <NewDatabaseForm open={addDatabaseFormOpen} onClose={() => setAddDatabaseFormOpen(false)} />
+      <NewDatabaseForm
+        open={addDatabaseFormOpen}
+        onClose={() => {
+          setAddDatabaseFormOpen(false);
+        }}
+      />
       <div title="GraphPolaris" className="navbar w-full">
         <a href="https://graphpolaris.com/" className="w-full">
           <img src={currentLogo} />
@@ -118,6 +109,7 @@ export const Navbar = (props: NavbarComponentProps) => {
                             setAddDatabaseFormOpen(true);
                             setMenuOpen(false);
                             setSubMenuOpen(undefined);
+                            console.log('add database', addDatabaseFormOpen, menuOpen, subMenuOpen);
                           }}
                         >
                           Add database
@@ -205,14 +197,6 @@ export const Navbar = (props: NavbarComponentProps) => {
           </div>
         </div>
       </div>
-      {/* <AddDatabaseForm
-        open={state.showAddDatabaseForm}
-        onClose={() => setState({ ...state, showAddDatabaseForm: false })}
-        onSubmit={(...params) => {
-          onAddDatabaseFormSubmit(...params);
-          setState({ ...state, showAddDatabaseForm: false });
-        }}
-      /> */}
     </div>
   );
 };