Merge pull request #96 from cabcookie/staging

Staging
cabcookie · May 30, 2024 · 1037284 · 1037284
2 parents b12f56d + de2f0ac
commit 1037284
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 59 deletions.
diff --git a/api/ContextAccounts.tsx b/api/ContextAccounts.tsx
@@ -26,7 +26,16 @@ interface AccountsContextType {
   ) => Promise<Schema["Account"]["type"] | undefined>;
   getAccountById: (accountId: string) => Account | undefined;
   updateAccount: (props: UpdateAccountProps) => Promise<string | undefined>;
-  addResponsibility: (newResp: Responsibility) => Promise<string | undefined>;
+  addResponsibility: (
+    accountId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => Promise<string | undefined>;
+  updateResponsibility: (
+    responsibilityId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => Promise<string | undefined>;
   assignController: (
     accountId: string,
     controllerId: string | null
@@ -65,7 +74,7 @@ const selectionSet = [
 type AccountData = SelectionSet<Schema["Account"]["type"], typeof selectionSet>;
 
 export const mapAccount: (account: AccountData) => Account = ({
-  id,
+  id: accountId,
   name,
   controller,
   introduction,
@@ -75,7 +84,7 @@ export const mapAccount: (account: AccountData) => Account = ({
   responsibilities,
   createdAt,
 }) => ({
-  id,
+  id: accountId,
   name,
   introduction: transformNotesVersion({
     version: formatVersion,
@@ -86,11 +95,15 @@ export const mapAccount: (account: AccountData) => Account = ({
   order: order || 0,
   createdAt: new Date(createdAt),
   responsibilities: responsibilities
-    .map(({ id, startDate, endDate }) => ({
-      id,
-      startDate: new Date(startDate),
-      endDate: !endDate ? undefined : new Date(endDate),
-    }))
+    .map(
+      ({ id: respId, startDate, endDate }): Responsibility => ({
+        id: respId,
+        accountId: accountId,
+        accountName: name,
+        startDate: new Date(startDate),
+        endDate: !endDate ? undefined : new Date(endDate),
+      })
+    )
     .sort((a, b) => b.startDate.getTime() - a.startDate.getTime()),
 });
 
@@ -210,24 +223,33 @@ export const AccountsContextProvider: FC<AccountsContextProviderProps> = ({
     return data.id;
   };
 
-  const addResponsibility = async ({
-    id,
-    startDate,
-    endDate,
-  }: Responsibility) => {
+  const addResponsibility = async (
+    accountId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => {
     const updated = accounts?.map((account) =>
-      account.id !== id
+      account.id !== accountId
         ? account
         : {
             ...account,
-            responsibilities: [{ id: crypto.randomUUID(), startDate, endDate }],
+            responsibilities: [
+              ...account.responsibilities,
+              {
+                id: crypto.randomUUID(),
+                accountId: account.id,
+                accountName: account.name,
+                startDate,
+                endDate,
+              },
+            ],
           }
     );
     if (accounts) mutate(updated, false);
 
     const { data, errors } = await client.models.AccountResponsibilities.create(
       {
-        accountId: id,
+        accountId: accountId,
         startDate: toISODateString(startDate),
         endDate: !endDate ? undefined : toISODateString(endDate),
       }
@@ -238,6 +260,35 @@ export const AccountsContextProvider: FC<AccountsContextProviderProps> = ({
     return data.id;
   };
 
+  const updateResponsibility = async (
+    responsibilityId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => {
+    const updated = accounts?.map((account) =>
+      !account.responsibilities.some((r) => r.id === responsibilityId)
+        ? account
+        : {
+            ...account,
+            responsibilities: account.responsibilities.map((r) =>
+              r.id !== responsibilityId ? r : { ...r, startDate, endDate }
+            ),
+          }
+    );
+    if (accounts) mutate(updated, false);
+
+    const { data, errors } = await client.models.AccountResponsibilities.update(
+      {
+        id: responsibilityId,
+        startDate: toISODateString(startDate),
+        endDate: !endDate ? null : toISODateString(endDate),
+      }
+    );
+    if (errors) handleApiErrors(errors, "Error updating responsibility");
+    if (accounts) mutate(updated);
+    return data?.id;
+  };
+
   const updateAccountOrderNo = async (
     id: string,
     order: number
@@ -271,6 +322,7 @@ export const AccountsContextProvider: FC<AccountsContextProviderProps> = ({
         getAccountById,
         updateAccount,
         addResponsibility,
+        updateResponsibility,
         assignController,
         updateOrder,
       }}

diff --git a/api/globals.ts b/api/globals.ts
@@ -1,4 +1,5 @@
-import { flow, map, join } from "lodash/fp";
+import { toast } from "@/components/ui/use-toast";
+import { flow, join, map } from "lodash/fp";
 
 /**
  * Represents a location in a Source.
@@ -56,15 +57,16 @@ export const handleApiErrors = (
   message?: string
 ) => {
   console.error(message, errors);
-  let errorText = flow(
+  const errorText = flow(
     map(
       ({ errorType, message }: GraphQLFormattedError) =>
         `${errorType}: ${message}`
     ),
     join("; ")
   )(errors);
-  if (message) {
-    errorText = `${message}: ${errorText}`;
-  }
-  alert(errorText);
+  toast({
+    title: message || "Error",
+    description: errorText,
+    variant: "destructive",
+  });
 };
diff --git a/components/accounts/AccountDetails.tsx b/components/accounts/AccountDetails.tsx
@@ -11,12 +11,15 @@ import AddControllerDialog from "./AddControllerDialog";
 import LeanAccordianItem from "./LeanAccordionItem";
 import ProjectList from "./ProjectList";
 import ResponsibilitiesList from "./ResponsibilitiesList";
-import { Responsibility } from "./ResponsibilityRecord";
 import ResponsibilitiesDialog from "./responsibilities-dialog";
 
 type AccountDetailsProps = {
   account: Account;
-  addResponsibility: (resp: Responsibility) => void;
+  addResponsibility: (
+    accountId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => void;
   showResponsibilities?: boolean;
   showSubsidaries?: boolean;
   showIntroduction?: boolean;
@@ -56,10 +59,7 @@ const AccountDetails: FC<AccountDetailsProps> = ({
           title="Responsibilities"
           isVisible={showResponsibilities}
         >
-          <ResponsibilitiesList
-            responsibilities={account.responsibilities}
-            onlyCurrent
-          />
+          <ResponsibilitiesList responsibilities={account.responsibilities} />
           <div className="mt-4" />
           <ResponsibilitiesDialog
             account={account}

diff --git a/components/accounts/AccountsList.tsx b/components/accounts/AccountsList.tsx
@@ -14,7 +14,6 @@ import {
 } from "@dnd-kit/sortable";
 import { flow } from "lodash/fp";
 import { FC, useEffect, useState } from "react";
-import { Responsibility } from "./ResponsibilityRecord";
 import AccountRecord from "./account-record";
 
 type ShowInvalidOnly = {
@@ -41,7 +40,11 @@ type AccountsListProps = (
   | ShowSubsidaries
 ) & {
   accounts: Account[];
-  addResponsibility: (resp: Responsibility) => void;
+  addResponsibility: (
+    accountId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => void;
 };
 
 type GetSortedAccountsProps = {

diff --git a/components/accounts/ResponsibilitiesList.tsx b/components/accounts/ResponsibilitiesList.tsx
@@ -1,26 +1,16 @@
-import { addDaysToDate } from "@/helpers/functional";
 import { FC } from "react";
 import ResponsibilityRecord, { Responsibility } from "./ResponsibilityRecord";
 
 type ResponsibilitiesListProps = {
   responsibilities: Responsibility[];
-  onlyCurrent?: boolean;
 };
 
 const ResponsibilitiesList: FC<ResponsibilitiesListProps> = ({
   responsibilities,
-  onlyCurrent,
 }) => {
   return (
     <div>
       {responsibilities
-        .filter(
-          ({ startDate, endDate }) =>
-            !onlyCurrent ||
-            startDate >= new Date() ||
-            !endDate ||
-            endDate >= addDaysToDate(-60)(new Date())
-        )
         .sort((a, b) => a.startDate.getTime() - b.startDate.getTime())
         .map((resp) => (
           <ResponsibilityRecord key={resp.id} responsibility={resp} />

diff --git a/components/accounts/ResponsibilityRecord.tsx b/components/accounts/ResponsibilityRecord.tsx
@@ -1,9 +1,12 @@
+import { useAccountsContext } from "@/api/ContextAccounts";
 import { format } from "date-fns";
 import { FC } from "react";
 import ResponsibilitiesDialog from "./responsibilities-dialog";
 
 export type Responsibility = {
   id: string;
+  accountId: string;
+  accountName: string;
   startDate: Date;
   endDate?: Date;
 };
@@ -13,20 +16,23 @@ type ResponsibilityRecordProps = {
 };
 
 const ResponsibilityRecord: FC<ResponsibilityRecordProps> = ({
-  responsibility: { id, startDate, endDate },
+  responsibility,
 }) => {
+  const { updateResponsibility } = useAccountsContext();
+
   return (
     <div className="flex flex-row gap-2">
       Since{" "}
-      {[startDate, ...(endDate ? [endDate] : [])]
+      {[
+        responsibility.startDate,
+        ...(responsibility.endDate ? [responsibility.endDate] : []),
+      ]
         .map((date) => format(date, "PPP"))
         .join(" to ")}
       .
       <ResponsibilitiesDialog
-        updateAccount={{ id, startDate, endDate }}
-        updateResponsibility={(r) => {
-          console.log(r);
-        }}
+        updateAccount={responsibility}
+        updateResponsibility={updateResponsibility}
       />
     </div>
   );

diff --git a/components/accounts/account-record.tsx b/components/accounts/account-record.tsx
@@ -9,12 +9,15 @@ import {
   AccordionTrigger,
 } from "../ui/accordion";
 import AccountDetails from "./AccountDetails";
-import { Responsibility } from "./ResponsibilityRecord";
 
 type AccountRecordProps = {
   account: Account;
   className?: string;
-  addResponsibility: (resp: Responsibility) => void;
+  addResponsibility: (
+    accountId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => void;
 };
 
 const AccountRecord: FC<AccountRecordProps> = ({

diff --git a/components/accounts/responsibilities-dialog.tsx b/components/accounts/responsibilities-dialog.tsx
@@ -45,7 +45,11 @@ const FormSchema = z
 
 type CreateResponsibility = {
   account: Account;
-  addResponsibility: (newResp: Responsibility) => void;
+  addResponsibility: (
+    accountId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => void;
   updateAccount?: never;
   updateResponsibility?: never;
 };
@@ -54,7 +58,11 @@ type UpdateResponsibility = {
   account?: never;
   addResponsibility?: never;
   updateAccount: Responsibility;
-  updateResponsibility: (newResp: Responsibility) => void;
+  updateResponsibility: (
+    responsibilityId: string,
+    startDate: Date,
+    endDate?: Date
+  ) => void;
 };
 
 type ResponsibilitiesDialogProps = CreateResponsibility | UpdateResponsibility;
@@ -86,7 +94,7 @@ const ResponsibilitiesDialog: FC<ResponsibilitiesDialogProps> = ({
         .join(" to ")}.`,
     });
     setOpen(false);
-    addResponsibility({ id: account.id, startDate, endDate });
+    addResponsibility(account.id, startDate, endDate);
   };
 
   const onUpdateSubmit = ({
@@ -96,15 +104,14 @@ const ResponsibilitiesDialog: FC<ResponsibilitiesDialogProps> = ({
     if (!updateAccount) return;
     toast({
       title: "Responsibility updated",
-      description: `Responsibility updated for the account from ${[
-        startDate,
-        ...(endDate ? [endDate] : []),
-      ]
+      description: `Responsibility updated for account ${
+        updateAccount.accountName
+      } from ${[startDate, ...(endDate ? [endDate] : [])]
         .map(toLocaleDateString)
         .join(" to ")}.`,
     });
     setOpen(false);
-    updateResponsibility({ id: updateAccount.id, startDate, endDate });
+    updateResponsibility(updateAccount.id, startDate, endDate);
   };
 
   const onSubmit = (data: z.infer<typeof FormSchema>) => {
@@ -127,7 +134,7 @@ const ResponsibilitiesDialog: FC<ResponsibilitiesDialogProps> = ({
             <DialogHeader>
               <DialogTitle>
                 {updateAccount
-                  ? "Update Responsibility"
+                  ? `Update Responsibility ${updateAccount.accountName}`
                   : `Responsibilities ${account.name}`}
               </DialogTitle>
             </DialogHeader>

diff --git a/docs/releases/next.md b/docs/releases/next.md
@@ -1,3 +1,3 @@
-# Editieren von Zuständigkeiten (Version :VERSION)
+# Editieren von Zuständigkeiten funktioniert (Version :VERSION)
 
-Die Zuständigkeiten für Accounts können nun editiert werden.
+Die Zuständigkeiten für Accounts können nun editiert werden. Sie wurde zuvor zwar in der Oberfläche angezeigt und angeboten, aber die Änderungen wurden nicht in der Datenbank gespeichert.