umwd-components 0.1.713 → 0.1.715

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

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { useFormState } from "react-dom";
-import { updateIpoAction } from "../../../data/actions/logistics/ipo/updateIpoAction";
+import { updateIroAction } from "../../../data/actions/e-commerce/iro/updateIroAction";
 import { UploadBase64MediaForm } from "../../../components/common/media/UploadBase64MediaForm";
 import downloadBase64File from "../../../data/loaders/common/media/downloadBase64File";
 import ItemUpdater from "./IroItemUpdater";
@@ -57,7 +57,7 @@ function ConfirmFormDialog({
   revalidateCallback?: () => void;
 }) {
   const [formState, formAction] = useFormState(
-    updateIpoAction,
+    updateIroAction,
     CONFIRMATION_STATE
   );
 
@@ -149,7 +149,7 @@ export default function ManageIROForm({
   role,
 }: ManageIroFormProps) {
   // TODO bind to id of IRO
-  const [formState, formAction] = useFormState(updateIpoAction, INITIAL_STATE);
+  const [formState, formAction] = useFormState(updateIroAction, INITIAL_STATE);
 
   const [items, setItems] = useState<IroItem[]>(
     data.iro_items.data ? data.iro_items.data : []

package/src/components/e-commerce/opo/ManageOpoForm.tsx

@@ -154,8 +154,13 @@ export default function ManageOPOForm({
   handleClose,
   role,
 }: ManageOpoFormProps) {
-  // TODO bind to id of IPO
-  const [formState, formAction] = useFormState(updateOpoAction, INITIAL_STATE);
+  // TODO bind to id of OPO
+  const boundUpdateOpoAction = (prevState: any, formData: FormData) =>
+    updateOpoAction(opo.id, prevState, formData);
+  const [formState, formAction] = useFormState(
+    boundUpdateOpoAction,
+    INITIAL_STATE
+  );
   const { handleAddMessage } = useSnackbar();
 
   const [items, setItems] = useState<OpoItem[]>(

package/src/components/e-commerce/opo/OpoItemUpdater.tsx

@@ -8,7 +8,7 @@ import AmountUpdater from "../../../components/common/AmountUpdater";
 import ArrowButtonDownIcon from "@mui/icons-material/ArrowDropDown";
 import { OpoItemUpdaterProps } from "../../../types/e-commerce/opo/types";
 import ImagePreviewTooltip from "../../../components/common/ImagePreviewTooltip";
-import { Report } from "../../../types/logistics/Report";
+import { Report, PreReport } from "../../../types/logistics/Report";
 import ReportMakingComponent from "../../logistics/report/ReportMakingComponent";
 import ReportsDisplay from "../../logistics/report/ReportsDisplay";
 
@@ -31,11 +31,12 @@ function OpoItemUpdater({
   } = item;
 
   const [open, setOpen] = useState(false);
-
   const picked_reports_quantity = React.useMemo(() => {
     return reports?.data !== undefined && reports.data.length > 0
       ? reports.data
-          .filter((report: Report) => report.type === "picked")
+          .filter(
+            (report): report is Report | PreReport => report.type === "picked"
+          )
           .reduce((a, b) => a + b.quantity, 0)
       : 0;
   }, [reports]);
@@ -43,7 +44,9 @@ function OpoItemUpdater({
   const packed_reports_quantity = React.useMemo(() => {
     return reports?.data !== undefined && reports.data.length > 0
       ? reports.data
-          .filter((report: Report) => report.type === "packed")
+          .filter(
+            (report): report is Report | PreReport => report.type === "packed"
+          )
           .reduce((a, b) => a + b.quantity, 0)
       : 0;
   }, [reports]);
@@ -51,7 +54,9 @@ function OpoItemUpdater({
   const shipped_reports_quantity = React.useMemo(() => {
     return reports?.data !== undefined && reports.data.length > 0
       ? reports.data
-          .filter((report: Report) => report.type === "shipped")
+          .filter(
+            (report): report is Report | PreReport => report.type === "shipped"
+          )
           .reduce((a, b) => a + b.quantity, 0)
       : 0;
   }, [reports]);
@@ -114,7 +119,12 @@ function OpoItemUpdater({
                 Here you can report and correct for damages wrong items etc. Do
                 not forget to click the button!
               </Typography>
-              <ReportsDisplay reports={reports.data} />
+              <ReportsDisplay
+                reports={reports.data.filter(
+                  (report): report is Report =>
+                    "id" in report && typeof report.id === "number"
+                )}
+              />
               <ReportMakingComponent
                 content={"content"}
                 quantity={0}

package/src/data/loaders/logistics/getTableIpos.ts

@@ -12,7 +12,16 @@ const baseUrl = getStrapiURL();
 /**
  * INFO Fetch all IPOs
  * used by the IPOs table in the admin panel
+ * @param currentPage - The current page number for pagination
+ * @param rowsPerPage - The number of rows per page for pagination
+ * @param order - The order direction, either "asc" or "desc"
+ * @param orderBy - The field to order by, defaults to "id"
+ * @param is_archive - An array of booleans to filter by archived status, defaulting to only non-archived IPOs
+ * @param filters - An object containing additional filters to apply
+ * @return A promise that resolves to the fetched IPO data
+ * * @throws Will throw an error if the fetch fails
  */
+
 async function getTableIpos(
   currentPage: number,
   rowsPerPage: number,
@@ -23,10 +32,6 @@ async function getTableIpos(
 ) {
   noStore();
 
-  const user = await getUserRole();
-  const role = user?.data?.role?.type;
-  const isEnduser = role === "enduser";
-
   const url = new URL(`/api/ipos`, baseUrl);
 
   const processedFilters = processFilters(filters);

package/src/data/loaders/logistics/getTableVendors.tsx

@@ -4,23 +4,41 @@ import qs from "qs";
 import { fetchData } from "../loaders";
 import { getStrapiURL } from "../../../lib/utils";
 import { unstable_noStore as noStore } from "next/cache";
-
-// this is the get all product function for the backend, it should be universal so it also works on the frontend
-// this function is based on get all orders which the frontenduser uses to get all orders in it's order table
+import { processFilters } from "../../../lib/processFilters";
 
 const baseUrl = getStrapiURL();
 
-export async function getTableVendors(
+/**
+ * INFO Fetch all vendors
+ * used by the Vendors table in the admin panel
+ * @param currentPage - The current page number for pagination
+ * @param rowsPerPage - The number of rows per page for pagination
+ * @param order - The order direction, either "asc" or "desc"
+ * @param orderBy - The field to order by, defaults to "id"
+ * @return A promise that resolves to the fetched vendor data
+ * @throws Will throw an error if the fetch fails
+ * */
+async function getTableVendors(
   currentPage: number,
   rowsPerPage: number,
   order: "asc" | "desc",
-  orderBy: string
+  orderBy: string,
+  // is_archive: boolean[] = [false], // default to only non-archived OPOs
+  filters: { [key: string]: string } = {}
 ) {
   noStore();
 
   const url = new URL(`/api/vendor-profiles`, baseUrl);
 
+  const processedFilters = processFilters(filters);
+
   url.search = qs.stringify({
+    filters: {
+      // is_archive: {
+      //   $in: is_archive,
+      // },
+      ...processedFilters,
+    },
     sort: `${orderBy || "id"}:${order || "desc"}`,
     populate: {
       business_credentials: true,
@@ -33,3 +51,5 @@ export async function getTableVendors(
 
   return await fetchData(url.href);
 }
+
+export { getTableVendors };