umwd-components 0.1.687 → 0.1.688

package/dist/types/components/logistics/report/ReportMakingComponent.d.ts

@@ -2,4 +2,4 @@ import React from "react";
 import { ReportMakingComponentProps } from "../../../types/logistics/Report";
 /** INFO Reports can only be created with entities that already excist,
  * this is because the report has to be saved with a relation to the parent entity */
-export default function ReportMakingComponent({ content, related, type, minValue, maxValue, revalidateCallback, }: ReportMakingComponentProps): React.JSX.Element;
+export default function ReportMakingComponent({ content, related, type, minValue, maxValue, revalidateCallback, biggerButton, }: ReportMakingComponentProps): React.JSX.Element;

package/dist/types/data/loaders/e-commerce/getAllOpos.d.ts

@@ -1,2 +1,2 @@
-declare function getAllOpos(currentPage: number, rowsPerPage: number, order: "asc" | "desc", orderBy: string, is_archive: boolean[]): Promise<any>;
+declare function getAllOpos(currentPage: number, rowsPerPage: number, order: "asc" | "desc", orderBy: string, is_archive?: boolean[]): Promise<any>;
 export { getAllOpos };

package/dist/types/data/loaders/e-commerce/getPaginatedCategories.d.ts

@@ -1 +1 @@
-export declare function getPaginatedCategories(currentPage?: number, rowsPerPage?: number, order?: "asc" | "desc", orderBy?: string): Promise<any>;
+export declare function getPaginatedCategories(currentPage?: number, rowsPerPage?: number, order?: "asc" | "desc", orderBy?: string, is_archive?: boolean[]): Promise<any>;

package/dist/types/types/logistics/Report.d.ts

@@ -29,6 +29,7 @@ export interface ReportMakingComponentProps {
     type: ReportType;
     related?: PolymorphicRelation[];
     revalidateCallback?: () => void;
+    biggerButton?: boolean;
 }
 export interface SimpleReportFieldsProps {
     itemID: number;

package/package.json

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

package/src/components/e-commerce/products/EditStockForm.tsx

@@ -392,6 +392,7 @@ export function EditStockForm({
                   type="stock"
                   related={[{ id: id, __type: "api::e-commerce.product" }]}
                   revalidateCallback={revalidateCallback}
+                  biggerButton={true}
                 />
               </Stack>
             </Stack>
@@ -399,7 +400,7 @@ export function EditStockForm({
           <Grid item xs={12}>
             <Stack
               direction="row"
-              justifyContent="space-between"
+              justifyContent="flex-end"
               alignItems="center"
               sx={{ py: 1 }}
             >
@@ -408,11 +409,13 @@ export function EditStockForm({
                   Close
                 </Button>
               )}
+              {/* 
+              Nothing to submit here, the form is just for the reports
               <SubmitButton
                 text="Update Stock"
                 loadingText="Updating..."
                 variant="contained"
-              />
+              /> */}
             </Stack>
           </Grid>
         </Grid>

package/src/components/logistics/note/NoteTakingComponent.tsx

@@ -17,12 +17,14 @@ import { useFormState } from "react-dom";
 import { createNoteAction } from "../../../data/actions/logistics/note/createNoteAction";
 import { NoteTakingComponentProps } from "../../../types/logistics/Note";
 import MarkdownEditor from "../../../components/common/markdown/MarkdownEditor";
+import { useSnackbar } from "../../../context/common/SnackbarContext";
 
 const INITIAL_STATE = {
   zodErrors: null,
   strapiErrors: null,
   data: null,
   message: null,
+  severity: null,
 };
 
 /** INFO Notes can only be created with entities that already excist,
@@ -41,11 +43,28 @@ export default function NoteTakingComponent({
     INITIAL_STATE
   );
 
+  const { handleAddMessage } = useSnackbar();
+
   useEffect(() => {
-    if (formState?.data && revalidateCallback) {
-      revalidateCallback();
+    if (formState?.strapiErrors) {
+      handleAddMessage({
+        message: formState.strapiErrors,
+        severity: formState.severity || "error",
+      });
+    }
+    if (formState?.message) {
+      handleAddMessage({
+        message: formState.message,
+        severity: formState.severity || "success",
+      });
+      if (formState?.severity === "success") {
+        setOpen(false);
+        if (revalidateCallback) {
+          revalidateCallback();
+        }
+      }
     }
-  }, [formState.data]);
+  }, [formState]);
 
   return (
     <>
@@ -60,7 +79,12 @@ export default function NoteTakingComponent({
         <NoteAltIcon fontSize="large" />
       </IconButton>
 
-      <Dialog open={open} fullWidth={true} maxWidth={"lg"}>
+      <Dialog
+        open={open}
+        fullWidth={true}
+        maxWidth={"lg"}
+        onClose={() => setOpen(false)}
+      >
         <form action={formAction}>
           <DialogContent sx={{ p: 1 }}>
             <Paper
@@ -75,22 +99,7 @@ export default function NoteTakingComponent({
               <Stack spacing={2}>
                 <Typography variant="body1" textAlign={"right"}>
                   {dayjs(Date.now()).format("DD-MM-YYYY")}
-                  {/*  format(Date.now(), "dd-MM-yyyy")} */}
                 </Typography>
-                {/* <TextField
-                  id="content"
-                  name="content"
-                  sx={{
-                    color: "black",
-                    label: { color: "black" },
-                    input: { color: "black" },
-                    div: { color: "black" },
-                  }}
-                  label="The note"
-                  multiline
-                  rows={12}
-                  defaultValue={content}
-                /> */}
                 <MarkdownEditor
                   name={"content"}
                   label="The note"
@@ -108,10 +117,6 @@ export default function NoteTakingComponent({
           <DialogActions>
             <Button onClick={() => setOpen(false)}>Cancel</Button>
             <SubmitButton text="Submit" loadingText="Loading..." />
-            <StrapiErrors error={formState?.strapiErrors} />
-            {formState?.message && (
-              <Alert severity="error">{formState?.message}</Alert>
-            )}
           </DialogActions>
         </form>
       </Dialog>

package/src/components/logistics/report/ReportMakingComponent.tsx

@@ -38,6 +38,7 @@ export default function ReportMakingComponent({
   minValue,
   maxValue,
   revalidateCallback,
+  biggerButton = false, // if true, the button will be bigger
 }: ReportMakingComponentProps) {
   const [open, setOpen] = useState(false);
 
@@ -92,14 +93,30 @@ export default function ReportMakingComponent({
   return (
     <>
       <Box sx={{ display: "block", position: "relative" }}>
-        <Tooltip title="Create a report">
-          <IconButton onClick={() => setOpen(true)}>
-            <AnnouncementIcon fontSize="large" />
-          </IconButton>
-        </Tooltip>
+        {biggerButton ? (
+          <Button
+            variant="contained"
+            onClick={() => setOpen(true)}
+            startIcon={<AnnouncementIcon />}
+          >
+            Create Report
+          </Button>
+        ) : (
+          <Tooltip title="Create a report">
+            <IconButton onClick={() => setOpen(true)}>
+              <AnnouncementIcon fontSize="large" />
+            </IconButton>
+          </Tooltip>
+        )}
       </Box>
 
-      <Dialog open={open} fullWidth={true} maxWidth={"lg"}>
+      <Dialog
+        open={open}
+        fullWidth={true}
+        maxWidth={"lg"}
+        sx={{ marginX: 1 }}
+        onClose={() => setOpen(false)}
+      >
         <form action={formAction}>
           <DialogContent sx={{ p: 1 }}>
             {" "}
@@ -159,10 +176,10 @@ export default function ReportMakingComponent({
           <DialogActions>
             <Button onClick={() => setOpen(false)}>Cancel</Button>
             <SubmitButton text="Submit" loadingText="Loading..." />
-            <StrapiErrors error={formState?.strapiErrors} />
+            {/* <StrapiErrors error={formState?.strapiErrors} />
             {formState?.message && (
               <Alert severity="error">{formState?.message}</Alert>
-            )}
+            )} */}
           </DialogActions>
         </form>
       </Dialog>

package/src/data/actions/logistics/note/createNoteAction.ts

@@ -28,6 +28,7 @@ export async function createNoteAction(
       ...prevState,
       strapiErrors: null,
       message: "Ops! Something went wrong. Please try again.",
+      severity: "error",
     };
   }
 
@@ -36,6 +37,7 @@ export async function createNoteAction(
       ...prevState,
       strapiErrors: responseData.error,
       message: "Failed to Create Note.",
+      severity: "error",
     };
   }
 
@@ -44,6 +46,7 @@ export async function createNoteAction(
   return {
     ...prevState,
     message: "New Note Created",
+    severity: "success",
     data: flattenedData,
     strapiErrors: null,
   };

package/src/data/loaders/e-commerce/getAllOpos.ts

@@ -13,7 +13,7 @@ async function getAllOpos(
   rowsPerPage: number,
   order: "asc" | "desc",
   orderBy: string,
-  is_archive: boolean[]
+  is_archive: boolean[] = [false] // default to both archived and non-archived OPOs
 ) {
   noStore();
 

package/src/data/loaders/e-commerce/getPaginatedCategories.ts

@@ -10,7 +10,8 @@ export async function getPaginatedCategories(
   currentPage?: number,
   rowsPerPage?: number,
   order?: "asc" | "desc",
-  orderBy?: string
+  orderBy?: string,
+  is_archive: boolean[] = [false] // default to both archived and non-archived categories
 ) {
   const url = new URL(`/api/product-categories`, baseUrl);
 
@@ -19,10 +20,16 @@ export async function getPaginatedCategories(
     currentPage,
     rowsPerPage,
     order,
-    orderBy
+    orderBy,
+    is_archive
   );
 
   url.search = qs.stringify({
+    filters: {
+      is_archive: {
+        $in: is_archive,
+      },
+    },
     populate: {
       products: {
         populate: {

package/src/types/logistics/Report.ts

@@ -42,6 +42,7 @@ export interface ReportMakingComponentProps {
   type: ReportType;
   related?: PolymorphicRelation[]; // polymorphic relation to the parent entity
   revalidateCallback?: () => void;
+  biggerButton?: boolean; // if true, the button will be bigger
 }
 
 export interface SimpleReportFieldsProps {