Fix dialog

thunderstore-io · Aug 27, 2024 · 0c19c37 · 0c19c37
1 parent 217505d
commit 0c19c37
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 25 deletions.
diff --git a/apps/cyberstorm-remix/app/settings/teams/Teams.tsx b/apps/cyberstorm-remix/app/settings/teams/Teams.tsx
@@ -44,7 +44,6 @@ export function HydrateFallback() {
 export default function Teams() {
   // REMIX TODO: Move current user to stand-alone loader and revalidate only currentUser
   const { currentUser } = useLoaderData<typeof clientLoader>();
-  const [dialogOpen, setOpenDialog] = useState(false);
   const revalidator = useRevalidator();
   const [isRefetching, setIsRefetching] = useState(false);
 
@@ -73,8 +72,6 @@ export default function Teams() {
           description="Manage your teams"
           additionalLeftColumnContent={
             <Dialog.Root
-              open={dialogOpen}
-              onOpenChange={setOpenDialog}
               title="Create Team"
               trigger={
                 <Button.Root colorScheme="primary" paddingSize="large">
@@ -85,10 +82,7 @@ export default function Teams() {
                 </Button.Root>
               }
             >
-              <CreateTeamForm
-                dialogOnChange={setOpenDialog}
-                updateTrigger={createTeamRevalidate}
-              />
+              <CreateTeamForm updateTrigger={createTeamRevalidate} />
             </Dialog.Root>
           }
           content={

diff --git a/...ix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccountList/ServiceAccountList.tsx b/...ix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccountList/ServiceAccountList.tsx
@@ -18,7 +18,6 @@ interface Props {
 export function ServiceAccountList(props: Props) {
   const { serviceAccounts } = props;
 
-  const [dialogOpen, setOpenDialog] = useState(false);
   const tableData = serviceAccounts.map((serviceAccount, index) => {
     return [
       { value: serviceAccount.name, sortValue: serviceAccount.name },
@@ -29,8 +28,6 @@ export function ServiceAccountList(props: Props) {
       {
         value: (
           <Dialog.Root
-            open={dialogOpen}
-            onOpenChange={setOpenDialog}
             key={`${serviceAccount.name}_${index}`}
             title="Confirm service account removal"
             trigger={
@@ -40,7 +37,6 @@ export function ServiceAccountList(props: Props) {
             }
           >
             <RemoveServiceAccountForm
-              dialogOnChange={setOpenDialog}
               teamName={props.teamName}
               serviceAccountNickname={serviceAccount.name}
               serviceAccountIdentifier={serviceAccount.identifier}

diff --git a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Settings/Settings.tsx b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Settings/Settings.tsx
@@ -40,9 +40,7 @@ export function HydrateFallback() {
 
 // REMIX TODO: Make sure user is redirected of this page, if the user is not logged in
 export default function Settings() {
-  const { teamName, currentUser } = useLoaderData<
-    typeof loader | typeof clientLoader
-  >();
+  const { teamName, currentUser } = useLoaderData<typeof clientLoader>();
 
   return (
     <div>

diff --git a/packages/cyberstorm-forms/src/forms/CreateTeamForm.tsx b/packages/cyberstorm-forms/src/forms/CreateTeamForm.tsx
@@ -10,10 +10,7 @@ import {
   useFormToaster,
 } from "@thunderstore/cyberstorm-forms";
 
-export function CreateTeamForm(props: {
-  dialogOnChange: (v: boolean) => void;
-  updateTrigger: () => Promise<void>;
-}) {
+export function CreateTeamForm(props: { updateTrigger: () => Promise<void> }) {
   const { onSubmitSuccess, onSubmitError } = useFormToaster({
     successMessage: "Team created",
   });
@@ -23,7 +20,6 @@ export function CreateTeamForm(props: {
       onSubmitSuccess={() => {
         props.updateTrigger();
         onSubmitSuccess();
-        props.dialogOnChange(false);
       }}
       onSubmitError={onSubmitError}
       schema={createTeamFormSchema}

diff --git a/packages/cyberstorm-forms/src/forms/RemoveServiceAccountForm.tsx b/packages/cyberstorm-forms/src/forms/RemoveServiceAccountForm.tsx
@@ -12,7 +12,6 @@ import { faTriangleExclamation } from "@fortawesome/free-solid-svg-icons";
 import { Alert } from "@thunderstore/cyberstorm";
 
 export function RemoveServiceAccountForm(props: {
-  dialogOnChange: (v: boolean) => void;
   serviceAccountIdentifier: string;
   serviceAccountNickname: string;
   teamName: string;
@@ -27,7 +26,6 @@ export function RemoveServiceAccountForm(props: {
       onSubmitSuccess={() => {
         onSubmitSuccess();
         props.updateTrigger();
-        props.dialogOnChange(false);
       }}
       onSubmitError={onSubmitError}
       schema={z.object({})}

diff --git a/packages/cyberstorm/src/components/Dialog/Dialog.tsx b/packages/cyberstorm/src/components/Dialog/Dialog.tsx
@@ -9,8 +9,6 @@ import { Tooltip } from "../..";
 import { classnames } from "../../utils/utils";
 
 interface DialogProps extends PropsWithChildren {
-  open?: boolean;
-  onOpenChange?: (v: boolean) => void;
   trigger?: ReactNode;
   title?: string;
   showHeaderBorder?: boolean;
@@ -23,8 +21,6 @@ interface DialogProps extends PropsWithChildren {
 export function Dialog(props: DialogProps) {
   const {
     children,
-    // open,
-    // onOpenChange,
     trigger,
     title = undefined,
     showHeaderBorder = false,