Revert "[WEB-61] Crew sheet duplication (#94)" (#95)

This reverts commit 2eb22cb.
ystv · Feb 22, 2024 · 55654e4 · 55654e4
1 parent 9ed0b93
commit 55654e4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 75 deletions.
diff --git a/app/(authenticated)/calendar/[eventID]/AddEditSignUpSheetForm.tsx b/app/(authenticated)/calendar/[eventID]/AddEditSignUpSheetForm.tsx
@@ -117,12 +117,6 @@ function CrewMemberField(props: { parentName: string }) {
 }
 
 export function AddEditSignUpSheetForm(props: {
-  // NB: this form is used in three cases:
-  // - creating a brand new sign-up sheet
-  // - cloning an existing one
-  // - editing an existing one
-  // In the first case there'll be no initialValues.
-  mode: "create" | "clone" | "edit";
   action: (data: z.infer<typeof SignupSheetSchema>) => Promise<FormResponse>;
   initialValues?: Partial<z.infer<typeof SignupSheetSchema>>;
   onSuccess: () => void;
@@ -138,12 +132,7 @@ export function AddEditSignUpSheetForm(props: {
       submitLabel={props.submitLabel}
     >
       <h1 className={"mb-2 mt-0 text-4xl font-bold"}>
-        {props.mode === "create"
-          ? "New"
-          : props.mode === "clone"
-          ? "Duplicate"
-          : "Edit"}{" "}
-        List
+        {props.initialValues ? "Edit" : "New"} List
       </h1>
       <TextField
         name="title"

diff --git a/app/(authenticated)/calendar/[eventID]/SignupSheet.tsx b/app/(authenticated)/calendar/[eventID]/SignupSheet.tsx
@@ -5,7 +5,7 @@ import { useMemo, useState, useTransition } from "react";
 import { getUserName } from "@/components/UserHelpers";
 import type { UserType } from "@/lib/auth/server";
 import invariant from "@/lib/invariant";
-import { ActionIcon, Button, Menu, Modal, Paper } from "@mantine/core";
+import { Button, Modal, Paper } from "@mantine/core";
 import {
   canManage,
   canManageSignUpSheet,
@@ -15,7 +15,6 @@ import { AddEditSignUpSheetForm } from "@/app/(authenticated)/calendar/[eventID]
 import { CrewType, SignUpSheetType } from "@/features/calendar/signup_sheets";
 import { EventObjectType } from "@/features/calendar/events";
 import { ExposedUser } from "@/features/people";
-import { LuMoreVertical } from "react-icons/lu";
 import {
   createSignUpSheet,
   deleteSignUpSheet,
@@ -39,60 +38,15 @@ function SignupSheet({
   );
   const readOnly = event.is_cancelled;
   const [isEditOpen, setEditOpen] = useState(false);
-  const [isCloneOpen, setCloneOpen] = useState(false);
   const [signUpCrew, setSignUpCrew] = useState<CrewType | null>(null);
-
-  const sheetWithoutCrew = useMemo(() => {
-    const result = { ...sheet };
-    sheet.crews = sheet.crews.map((x) => ({
-      ...x,
-      user_id: null,
-      custom_crew_member_name: null,
-    }));
-    return result;
-  }, [sheet]);
-
   return (
     <>
       <Paper
         shadow="sm"
         radius="md"
         withBorder
-        className="flex-grow-1 relative w-full p-[var(--mantine-spacing-md)] md:w-[calc(50%-theme(gap.4)/2)] lg:flex-grow-0 lg:p-[var(--mantine-spacing-xl)]"
+        className="flex-grow-1 w-full p-[var(--mantine-spacing-md)] md:w-[calc(50%-theme(gap.4)/2)] lg:flex-grow-0 lg:p-[var(--mantine-spacing-xl)]"
       >
-        {canManageSignUpSheet(event, sheet, me) && (
-          <Menu>
-            <Menu.Target>
-              <ActionIcon
-                aria-label="Manage"
-                variant="outline"
-                className="!absolute right-4 top-4"
-              >
-                <LuMoreVertical />
-              </ActionIcon>
-            </Menu.Target>
-            <Menu.Dropdown>
-              <Menu.Item onClick={() => setEditOpen(true)}>Edit</Menu.Item>
-              <Menu.Item onClick={() => setCloneOpen(true)}>
-                Duplicate
-              </Menu.Item>
-              <Menu.Item
-                variant="danger"
-                onClick={async () => {
-                  if (
-                    confirm(
-                      `Are you sure you want to delete the list "${sheet.title}"? This action cannot be undone.`,
-                    )
-                  ) {
-                    await deleteSignUpSheet(sheet.signup_id);
-                  }
-                }}
-              >
-                Delete
-              </Menu.Item>
-            </Menu.Dropdown>
-          </Menu>
-        )}
         <h2 className={"m-0"}>{sheet.title}</h2>
         <strong className={"text-sm font-extrabold"}>
           Arrive at{" "}
@@ -219,34 +173,46 @@ function SignupSheet({
               })}
           </tbody>
         </table>
+
+        {canManageSignUpSheet(event, sheet, me) && (
+          <>
+            <br />
+            <div className={"flex justify-end gap-1"}>
+              <Button
+                variant="danger"
+                size="small"
+                onClick={async () => {
+                  if (
+                    confirm(
+                      `Are you sure you want to delete the list "${sheet.title}"? This action cannot be undone.`,
+                    )
+                  ) {
+                    await deleteSignUpSheet(sheet.signup_id);
+                  }
+                }}
+              >
+                Delete List
+              </Button>
+              <Button size="small" onClick={() => setEditOpen(true)}>
+                Edit List
+              </Button>
+            </div>
+          </>
+        )}
       </Paper>
       <Modal
         opened={isEditOpen}
         onClose={() => setEditOpen(false)}
         size={"95%"}
       >
         <AddEditSignUpSheetForm
-          mode="edit"
           action={async (data) => editSignUpSheet(sheet.signup_id, data)}
           onSuccess={() => setEditOpen(false)}
           initialValues={sheet}
           submitLabel="Save"
         />
         <br />
       </Modal>
-      <Modal
-        opened={isCloneOpen}
-        onClose={() => setCloneOpen(false)}
-        size={"95%"}
-      >
-        <AddEditSignUpSheetForm
-          mode="clone"
-          action={async (data) => createSignUpSheet(event.event_id, data)}
-          onSuccess={() => setCloneOpen(false)}
-          initialValues={sheetWithoutCrew}
-          submitLabel="Create"
-        />
-      </Modal>
       <Modal opened={signUpCrew !== null} onClose={() => setSignUpCrew(null)}>
         {signUpCrew !== null && (
           <MyRoleSignUpModal
@@ -363,7 +329,6 @@ export function SignupSheetsView({
         size={"95%"}
       >
         <AddEditSignUpSheetForm
-          mode="create"
           action={async (sheet) => createSignUpSheet(event.event_id, sheet)}
           onSuccess={() => setCreateOpen(false)}
           initialValues={{