fix(Team): Edit team dialog is directly closed

BLSQ · Jan 25, 2023 · 7951a13 · 7951a13
1 parent 0cc772b
commit 7951a13
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/features/team/TeamActionsMenu.tsx b/src/features/team/TeamActionsMenu.tsx
@@ -1,16 +1,15 @@
 import { gql } from "@apollo/client";
 import { PencilIcon, TrashIcon } from "@heroicons/react/24/outline";
 import Menu from "components/Menu";
-import {
-  TeamActionsMenu_TeamFragment,
-  TeamAuthorizedActions,
-} from "libs/graphql";
+import useToggle from "hooks/useToggle";
+import { TeamActionsMenu_TeamFragment } from "libs/graphql";
 import { useTranslation } from "next-i18next";
 import DeleteTeamTrigger from "./DeleteTeamTrigger";
-import EditTeamTrigger from "./EditTeamTrigger";
+import TeamFormDialog from "./TeamFormDialog";
 
 const TeamActionsMenu = ({ team }: { team: TeamActionsMenu_TeamFragment }) => {
   const { t } = useTranslation();
+  const [isEditing, { toggle: toggleEdit }] = useToggle();
   if (!team.permissions.update && !team.permissions.delete) {
     return null;
   }
@@ -19,14 +18,10 @@ const TeamActionsMenu = ({ team }: { team: TeamActionsMenu_TeamFragment }) => {
     <>
       <Menu label={t("Actions")}>
         {team.permissions.update && (
-          <EditTeamTrigger team={team}>
-            {({ onClick }) => (
-              <Menu.Item onClick={onClick}>
-                <PencilIcon className="mr-2 h-4" />
-                {t("Edit")}
-              </Menu.Item>
-            )}
-          </EditTeamTrigger>
+          <Menu.Item onClick={toggleEdit}>
+            <PencilIcon className="mr-2 h-4" />
+            {t("Edit")}
+          </Menu.Item>
         )}
         {team.permissions.delete && (
           <DeleteTeamTrigger team={team}>
@@ -42,6 +37,7 @@ const TeamActionsMenu = ({ team }: { team: TeamActionsMenu_TeamFragment }) => {
           </DeleteTeamTrigger>
         )}
       </Menu>
+      <TeamFormDialog onClose={toggleEdit} open={isEditing} team={team} />
     </>
   );
 };
@@ -56,8 +52,10 @@ TeamActionsMenu.fragments = {
         delete
       }
       ...DeleteTeamTrigger_team
+      ...TeamFormDialog_team
     }
     ${DeleteTeamTrigger.fragments.team}
+    ${TeamFormDialog.fragments.team}
   `,
 };
 

diff --git a/src/features/team/TeamFormDialog.tsx b/src/features/team/TeamFormDialog.tsx
@@ -158,7 +158,7 @@ const TeamFormDialog = (props: Props) => {
           <Button
             onClick={onCancel}
             disabled={form.isSubmitting}
-            variant="outlined"
+            variant="white"
           >
             {t("Cancel")}
           </Button>

diff --git a/src/libs/graphql.ts b/src/libs/graphql.ts
@@ -3646,8 +3646,10 @@ export const TeamActionsMenu_TeamFragmentDoc = gql`
     delete
   }
   ...DeleteTeamTrigger_team
+  ...TeamFormDialog_team
 }
-    ${DeleteTeamTrigger_TeamFragmentDoc}`;
+    ${DeleteTeamTrigger_TeamFragmentDoc}
+${TeamFormDialog_TeamFragmentDoc}`;
 export const TeamProjectsTable_TeamFragmentDoc = gql`
     fragment TeamProjectsTable_team on Team {
   id