umwd-components 0.1.643 → 0.1.644

package/dist/types/context/common/SnackbarContext.d.ts

@@ -1,5 +1,6 @@
 import React, { ReactNode } from "react";
 import { SnackbarState } from "../../types/common/snackbar/Snackbar";
+import { SnackbarCloseReason } from "@mui/material";
 export declare const SnackbarProvider: ({ children }: {
     children: ReactNode;
 }) => React.JSX.Element;
@@ -10,4 +11,9 @@ export declare const useSnackbar: () => {
         message: string;
         severity: "success" | "error" | "info" | "warning";
     }) => void;
+    handleAddMessages: (value: {
+        message: string;
+        severity: "success" | "error" | "info" | "warning";
+    }[]) => void;
+    handleClose: (event: Event | React.SyntheticEvent<any, Event>, reason: SnackbarCloseReason, id: string) => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umwd-components",
-  "version": "0.1.643",
+  "version": "0.1.644",
   "description": "UMWD Component library",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",

package/src/components/e-commerce/invoice/InvoicePDF.tsx

@@ -338,7 +338,7 @@ function InvoicePDF({ props }: { props: { invoice: Invoice } }) {
             <Text
               style={{ ...styles.h3, border: "2px solid black", padding: 10 }}
             >
-              Total Due: € {invoice?.total_incl_vat?.toFixed(2)}
+              Total: € {invoice?.total_incl_vat?.toFixed(2)}
             </Text>
           </View>
 

package/src/components/e-commerce/iro/CreateIROForm.tsx

@@ -17,7 +17,6 @@ import TextField from "@mui/material/TextField";
 import Checkbox from "@mui/material/Checkbox";
 import Alert from "@mui/material/Alert";
 import Stack from "@mui/material/Stack";
-import IroItemDisplay from "./IroItemDisplay";
 
 const INITIAL_STATE = {
   zodErrors: null,

package/src/components/e-commerce/iro/TextualManageIROForm.tsx

@@ -52,6 +52,7 @@ import { Iro } from "../../../types/e-commerce/iro/types";
 import { queryAllProducts } from "../../../data/loaders/e-commerce/queryAllProducts";
 import qs from "qs";
 import { Product } from "../../../types/e-commerce/product/types";
+import { useSnackbar } from "../../../context/common/SnackbarContext";
 
 const INITIAL_STATE = {
   zodErrors: null,
@@ -583,12 +584,28 @@ export default function TextualManageIROForm({
     setItems(newItems);
   };
 
+  const { handleAddMessage } = useSnackbar();
+
   useEffect(() => {
     if (formState?.message === "Iro Updated") {
+      handleAddMessage({
+        message: "Iro Updated",
+        severity: "success",
+      });
+      handleClose && handleClose();
       revalidateCallback && revalidateCallback();
     }
   }, [formState]);
 
+  useEffect(() => {
+    if (formState?.strapiErrors) {
+      handleAddMessage({
+        message: formState.strapiErrors.message || "Error updating IRO",
+        severity: "error",
+      });
+    }
+  }, [formState?.strapiErrors]);
+
   useEffect(() => {
     console.log("data", data);
     if (data.iro_items?.data) {
@@ -881,10 +898,6 @@ export default function TextualManageIROForm({
               <Paper sx={{ p: 2 }}>
                 <Stack direction="row" spacing={2} justifyContent={"end"}>
                   <SubmitButton text="Update items" loadingText="Loading..." />
-                  <StrapiErrors error={formState?.strapiErrors} />
-                  {formState?.message && (
-                    <Alert severity="error">{formState?.message}</Alert>
-                  )}
                 </Stack>
               </Paper>
               <input

package/src/context/common/SnackbarContext.tsx

@@ -1,12 +1,6 @@
 "use client";
 
-import React, {
-  createContext,
-  useContext,
-  useReducer,
-  useEffect,
-  ReactNode,
-} from "react";
+import React, { createContext, useContext, useReducer, ReactNode } from "react";
 import {
   snackbarMessage,
   SnackbarState,
@@ -18,7 +12,6 @@ const initialState: SnackbarState = {
   messages: [],
 };
 
-// TODO this is a work in progress
 const SnackbarContext = createContext<{
   state: SnackbarState;
   dispatch: React.Dispatch<any>;
@@ -26,32 +19,23 @@ const SnackbarContext = createContext<{
     message: string;
     severity: "success" | "error" | "info" | "warning";
   }) => void;
-  /* messages: snackbarMessage[];
-  handleAddMessage: (value: {
-    message: string;
-    severity: "success" | "error" | "info" | "warning";
-  }) => void;
   handleAddMessages: (
     value: {
       message: string;
       severity: "success" | "error" | "info" | "warning";
     }[]
   ) => void;
-  handleOpen: (value: boolean, index: number) => void;
   handleClose: (
     event: Event | React.SyntheticEvent<any, Event>,
     reason: SnackbarCloseReason,
     id: string
-  ) => void; */
+  ) => void;
 }>({
   state: initialState,
   dispatch: () => undefined,
   handleAddMessage: () => undefined,
-  /* messages: [],
-  handleAddMessage: () => undefined,
   handleAddMessages: () => undefined,
-  handleOpen: () => undefined,
-  handleClose: () => undefined, */
+  handleClose: () => undefined,
 });
 
 const snackbarReducer = (state: SnackbarState, action: any): SnackbarState => {
@@ -62,6 +46,8 @@ const snackbarReducer = (state: SnackbarState, action: any): SnackbarState => {
       };
     case "ADD_MESSAGE":
       return { ...state, messages: [...state.messages, action.payload] };
+    case "UPDATE_MESSAGES":
+      return { ...state, messages: action.payload };
     default:
       throw new Error(`No case for type ${action.type}`);
   }
@@ -70,30 +56,22 @@ const snackbarReducer = (state: SnackbarState, action: any): SnackbarState => {
 export const SnackbarProvider = ({ children }: { children: ReactNode }) => {
   const [state, dispatch] = useReducer(snackbarReducer, initialState);
 
-  /* const handleOpen = (value: boolean, index: number) => {
-    const newMessages = [...state.messages];
-    newMessages[index].open = value;
-
-    dispatch({ type: "ADD_MESSAGE", payload: newMessages });
-  }; */
-
-  /* const handleClose = (
+  const handleClose = (
     event: Event | React.SyntheticEvent<any, Event>,
     reason: SnackbarCloseReason,
     id: string
   ) => {
-    console.log(event, reason, id);
     if (reason === "clickaway") {
       return;
     }
 
     const newMessages = [...state.messages];
-
     const index = newMessages.findIndex((message) => message.id === id);
-    newMessages[index].open = false;
-
-    dispatch({ type: "ADD_MESSAGE", payload: newMessages });
-  }; */
+    if (index !== -1) {
+      newMessages[index].open = false;
+      dispatch({ type: "UPDATE_MESSAGES", payload: newMessages });
+    }
+  };
 
   const handleAddMessage = React.useCallback(
     (value: {
@@ -106,35 +84,31 @@ export const SnackbarProvider = ({ children }: { children: ReactNode }) => {
     [dispatch]
   );
 
-  /* const handleAddMessages = (
-    value: {
-      message: string;
-      severity: "success" | "error" | "info" | "warning";
-    }[]
-  ) => {
-    const newMessages = [
-      ...state.messages,
-      ...value.map((item) => ({ ...item, open: true, id: uuidV4() })),
-    ];
-
-    console.log("new messages from contextV2", newMessages);
-
-    dispatch({ type: "ADD_MESSAGE", payload: newMessages });
-  }; */
-
-  /* useEffect(() => {
-    dispatch({ type: "SET_STATE", payload: initialState });
-  }, [initialState]); */
+  const handleAddMessages = React.useCallback(
+    (
+      value: {
+        message: string;
+        severity: "success" | "error" | "info" | "warning";
+      }[]
+    ) => {
+      const newMessages = value.map((item) => ({
+        ...item,
+        open: true,
+        id: uuidV4(),
+      }));
+      newMessages.forEach((message) => {
+        dispatch({ type: "ADD_MESSAGE", payload: message });
+      });
+    },
+    [dispatch]
+  );
 
   const value = {
     state,
     dispatch,
     handleAddMessage,
-    /* messages: state.messages,
-    handleAddMessage,
     handleAddMessages,
-    handleOpen,
-    handleClose, */
+    handleClose,
   };
 
   return (

package/src/data/actions/e-commerce/iro/cancelIroAction.ts

@@ -41,6 +41,7 @@ export async function cancelIroAction(prevState: any, formData: FormData) {
 
   return {
     ...prevState,
+    severity: "success",
     message: "Iro Cancelled Successfully.",
     data: flattenedData,
     strapiErrors: null,