@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

package/dist/modules/wms/components/backend/WmsConfigurationPage.js

@@ -10,12 +10,10 @@ import { Page, PageBody } from "@open-mercato/ui/backend/Page";
 import { DataTable } from "@open-mercato/ui/backend/DataTable";
 import { EmptyState } from "@open-mercato/ui/backend/EmptyState";
 import { CrudForm } from "@open-mercato/ui/backend/CrudForm";
-import { extractCustomFieldEntries } from "@open-mercato/shared/lib/crud/custom-fields-client";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
 import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
 import { useConfirmDialog } from "@open-mercato/ui/backend/confirm-dialog";
 import { apiCall } from "@open-mercato/ui/backend/utils/apiCall";
-import { collectCustomFieldValues } from "@open-mercato/ui/backend/utils/customFieldValues";
 import { raiseCrudError } from "@open-mercato/ui/backend/utils/serverErrors";
 import { Button } from "@open-mercato/ui/primitives/button";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@open-mercato/ui/primitives/dialog";
@@ -36,16 +34,23 @@ import {
   inventoryRotationStrategyLabel
 } from "../../lib/inventoryDisplayUi.js";
 import { LocationEditDialog } from "./LocationEditDialog.js";
-import { WarehouseEditDialog } from "./WarehouseEditDialog.js";
-import { formatWarehouseCountryLabel } from "./warehouseFormOptions.js";
 import { useWmsInventoryMutationAccess } from "./useWmsInventoryMutationAccess.js";
 import { flashMutationError } from "../../lib/flashMutationError.js";
+const warehouseFormSchema = z.object({
+  name: z.string().trim().min(1),
+  code: z.string().trim().min(1),
+  city: z.string().trim().optional(),
+  country: z.string().trim().optional(),
+  timezone: z.string().trim().optional(),
+  isActive: z.boolean().default(true),
+  isPrimary: z.boolean().default(false)
+});
 const zoneFormSchema = z.object({
   warehouseId: z.string().uuid(),
   code: z.string().trim().min(1).max(80),
   name: z.string().trim().min(1).max(200),
   priority: z.coerce.number().int().min(0).optional()
-}).passthrough();
+});
 function buildInventoryProfileFormSchema(fefoRequiredMsg) {
   return z.object({
     catalogProductId: z.string().uuid(),
@@ -72,7 +77,7 @@ const STRATEGY_OPTIONS = [
   { value: "lifo", label: "LIFO" },
   { value: "fefo", label: "FEFO" }
 ];
-function mergeCreatedWarehouseIntoWarehousesCaches(queryClient, newId, values, updatedAt) {
+function mergeCreatedWarehouseIntoWarehousesCaches(queryClient, newId, values) {
   const row = {
     id: newId,
     name: values.name,
@@ -81,9 +86,7 @@ function mergeCreatedWarehouseIntoWarehousesCaches(queryClient, newId, values, u
     country: values.country || null,
     timezone: values.timezone || null,
     is_active: values.isActive,
-    is_primary: values.isPrimary,
-    updated_at: updatedAt ?? null,
-    updatedAt: updatedAt ?? null
+    is_primary: values.isPrimary
   };
   const haystack = `${values.name}
 ${values.code}`.toLowerCase();
@@ -143,7 +146,6 @@ function SectionCard({
 }
 function WarehouseSection({ viewAllHref } = {}) {
   const t = useT();
-  const locale = useLocale();
   const queryClient = useQueryClient();
   const { confirm, ConfirmDialogElement } = useConfirmDialog();
   const { runMutation } = useGuardedMutation({ contextId: "wms-config-warehouses" });
@@ -151,6 +153,7 @@ function WarehouseSection({ viewAllHref } = {}) {
   const [page, setPage] = React.useState(1);
   const [search, setSearch] = React.useState("");
   const [sorting, setSorting] = React.useState([{ id: "updatedAt", desc: true }]);
+  const [submitting, setSubmitting] = React.useState(false);
   const [dialog, setDialog] = React.useState(null);
   const handleSortingChange = React.useCallback((nextSorting) => {
     setSorting(nextSorting);
@@ -178,6 +181,15 @@ function WarehouseSection({ viewAllHref } = {}) {
       return call.result ?? { items: [], total: 0, totalPages: 1 };
     }
   });
+  const fields = React.useMemo(() => [
+    { id: "name", type: "text", label: t("wms.backend.config.warehouses.form.name", "Name"), required: true },
+    { id: "code", type: "text", label: t("wms.backend.config.warehouses.form.code", "Code"), required: true },
+    { id: "city", type: "text", label: t("wms.backend.config.warehouses.form.city", "City") },
+    { id: "country", type: "text", label: t("wms.backend.config.warehouses.form.country", "Country") },
+    { id: "timezone", type: "text", label: t("wms.backend.config.warehouses.form.timezone", "Timezone") },
+    { id: "isPrimary", type: "checkbox", label: t("wms.backend.config.warehouses.form.primary", "Primary warehouse") },
+    { id: "isActive", type: "checkbox", label: t("wms.backend.config.warehouses.form.active", "Active") }
+  ], [t]);
   const columns = React.useMemo(() => [
     {
       accessorKey: "name",
@@ -187,7 +199,7 @@ function WarehouseSection({ viewAllHref } = {}) {
     },
     { accessorKey: "code", header: t("wms.backend.config.warehouses.columns.code", "Code"), enableSorting: true },
     { accessorKey: "city", header: t("wms.backend.config.warehouses.columns.city", "City"), cell: ({ row }) => row.original.city || "\u2014" },
-    { accessorKey: "country", header: t("wms.backend.config.warehouses.columns.country", "Country"), cell: ({ row }) => formatWarehouseCountryLabel(row.original.country, locale) },
+    { accessorKey: "country", header: t("wms.backend.config.warehouses.columns.country", "Country"), cell: ({ row }) => row.original.country || "\u2014" },
     {
       accessorKey: "is_primary",
       header: t("wms.backend.config.warehouses.columns.primary", "Primary"),
@@ -198,24 +210,79 @@ function WarehouseSection({ viewAllHref } = {}) {
       header: t("wms.backend.config.warehouses.columns.status", "Status"),
       cell: ({ row }) => row.original.is_active === false ? t("wms.common.inactive", "Inactive") : t("wms.common.active", "Active")
     }
-  ], [locale, t]);
+  ], [t]);
+  const initialValues = React.useMemo(() => {
+    if (dialog?.mode === "edit") {
+      return {
+        name: dialog.row.name || "",
+        code: dialog.row.code || "",
+        city: dialog.row.city || "",
+        country: dialog.row.country || "",
+        timezone: dialog.row.timezone || "",
+        isActive: dialog.row.is_active !== false,
+        isPrimary: dialog.row.is_primary === true
+      };
+    }
+    return {
+      name: "",
+      code: "",
+      city: "",
+      country: "",
+      timezone: "",
+      isActive: true,
+      isPrimary: false
+    };
+  }, [dialog]);
   const closeDialog = React.useCallback(() => {
     setDialog(null);
+    setSubmitting(false);
   }, []);
   const refresh = React.useCallback(async () => {
     await queryClient.cancelQueries({ queryKey: ["wms-config", "warehouses"] });
     await queryClient.invalidateQueries({ queryKey: ["wms-config", "warehouses"] });
     await queryClient.refetchQueries({ queryKey: ["wms-config", "warehouses"], type: "all" });
   }, [queryClient]);
-  const handleWarehouseSaved = React.useCallback(async (info) => {
-    closeDialog();
-    if (info.mode === "create" && info.id) {
-      mergeCreatedWarehouseIntoWarehousesCaches(queryClient, info.id, info.values, info.updatedAt);
-      setSearch("");
-      setPage(1);
+  const handleSubmit = React.useCallback(async (values) => {
+    if (!dialog) return;
+    const submitMode = dialog.mode;
+    setSubmitting(true);
+    try {
+      const call = await runMutation({
+        operation: async () => {
+          const result = await apiCall(
+            "/api/wms/warehouses",
+            {
+              method: submitMode === "edit" ? "PUT" : "POST",
+              body: JSON.stringify(
+                submitMode === "edit" ? { id: dialog.row.id, ...values } : values
+              )
+            }
+          );
+          if (!result.ok) {
+            await raiseCrudError(result.response, t("wms.backend.config.warehouses.errors.save", "Failed to save warehouse."));
+          }
+          return result;
+        },
+        context: {},
+        mutationPayload: submitMode === "edit" ? { id: dialog.row.id, ...values } : values
+      });
+      flash(
+        submitMode === "edit" ? t("wms.backend.config.warehouses.flash.updated", "Warehouse updated") : t("wms.backend.config.warehouses.flash.created", "Warehouse created"),
+        "success"
+      );
+      const createdId = submitMode === "create" && call?.result && typeof call.result === "object" && typeof call.result.id === "string" ? call.result.id.trim() : null;
+      closeDialog();
+      if (submitMode === "create" && createdId) {
+        mergeCreatedWarehouseIntoWarehousesCaches(queryClient, createdId, values);
+        setSearch("");
+        setPage(1);
+      }
+      await refresh();
+    } catch (error) {
+      flashMutationError(error, t("wms.backend.config.warehouses.errors.save", "Failed to save warehouse."), t);
+      setSubmitting(false);
     }
-    await refresh();
-  }, [closeDialog, queryClient, refresh]);
+  }, [closeDialog, dialog, queryClient, refresh, runMutation, t]);
   const handleDelete = React.useCallback(async (row) => {
     const confirmed = await confirm({
       title: t("wms.backend.config.warehouses.confirmDelete", 'Archive warehouse "{name}"?', {
@@ -288,7 +355,6 @@ function WarehouseSection({ viewAllHref } = {}) {
               pageSize: 10,
               total: query.data?.total ?? 0,
               totalPages: query.data?.totalPages ?? 1,
-              totalIsCapped: query.data?.totalIsCapped === true,
               onPageChange: setPage
             },
             perspective: { tableId: extensionPoints.hosts.warehousesTable.tableId },
@@ -304,18 +370,23 @@ function WarehouseSection({ viewAllHref } = {}) {
         )
       }
     ),
-    /* @__PURE__ */ jsx(
-      WarehouseEditDialog,
-      {
-        open: dialog !== null,
-        onOpenChange: (next) => {
-          if (!next) closeDialog();
-        },
-        mode: dialog?.mode === "edit" ? "edit" : "create",
-        row: dialog?.mode === "edit" ? dialog.row : null,
-        onSaved: handleWarehouseSaved
-      }
-    ),
+    /* @__PURE__ */ jsx(Dialog, { open: dialog !== null, onOpenChange: (next) => !next && closeDialog(), children: /* @__PURE__ */ jsxs(DialogContent, { className: "max-w-3xl", children: [
+      /* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: dialog?.mode === "edit" ? t("wms.backend.config.warehouses.dialog.edit", "Edit warehouse") : t("wms.backend.config.warehouses.dialog.create", "Create warehouse") }) }),
+      /* @__PURE__ */ jsx(
+        CrudForm,
+        {
+          schema: warehouseFormSchema,
+          fields,
+          entityId: E.wms.warehouse,
+          initialValues,
+          submitLabel: t("common.save", "Save"),
+          onSubmit: handleSubmit,
+          embedded: true,
+          isLoading: submitting,
+          twoColumn: true
+        }
+      )
+    ] }) }),
     ConfirmDialogElement
   ] });
 }
@@ -356,45 +427,19 @@ function ZoneSection({ viewAllHref } = {}) {
       return call.result ?? { items: [], total: 0, totalPages: 1 };
     }
   });
-  const warehouseOptionsQuery = useQuery({
-    queryKey: ["wms-config", "zones", "warehouse-options"],
-    queryFn: () => loadWarehouseOptions(),
-    enabled: dialog !== null,
-    staleTime: 3e4
-  });
-  const warehouseOptions = React.useMemo(
-    () => warehouseOptionsQuery.data ?? [],
-    [warehouseOptionsQuery.data]
-  );
-  const soleWarehouseId = warehouseOptions.length === 1 ? warehouseOptions[0].value : null;
-  const warehouseSeedOptions = React.useMemo(() => {
-    if (dialog?.mode === "edit") {
-      const warehouseId = dialog.row.warehouse_id;
-      if (!warehouseId) return void 0;
-      const label = dialog.row.warehouse_name?.trim() || dialog.row.warehouse_code?.trim() || "";
-      return label ? [{ value: warehouseId, label }] : void 0;
-    }
-    return soleWarehouseId ? warehouseOptions : void 0;
-  }, [dialog, soleWarehouseId, warehouseOptions]);
-  const loadZoneWarehouseOptions = React.useCallback(async (query2) => {
-    const term = query2?.trim();
-    if (!term) return warehouseOptionsQuery.data ?? loadWarehouseOptions();
-    return loadWarehouseOptions(term);
-  }, [warehouseOptionsQuery.data]);
   const fields = React.useMemo(() => [
     {
       id: "warehouseId",
       type: "combobox",
       label: t("wms.backend.config.zones.form.warehouse", "Warehouse"),
       required: true,
-      loadOptions: loadZoneWarehouseOptions,
-      allowCustomValues: false,
-      seedOptions: warehouseSeedOptions
+      loadOptions: loadWarehouseOptions,
+      allowCustomValues: false
     },
     { id: "code", type: "text", label: t("wms.backend.config.zones.form.code", "Code"), required: true },
     { id: "name", type: "text", label: t("wms.backend.config.zones.form.name", "Name"), required: true },
     { id: "priority", type: "number", label: t("wms.backend.config.zones.form.priority", "Priority") }
-  ], [t, loadZoneWarehouseOptions, warehouseSeedOptions]);
+  ], [t]);
   const columns = React.useMemo(() => [
     {
       accessorKey: "name",
@@ -419,22 +464,19 @@ function ZoneSection({ viewAllHref } = {}) {
   const initialValues = React.useMemo(() => {
     if (dialog?.mode === "edit") {
       return {
-        id: dialog.row.id,
-        updatedAt: dialog.row.updated_at ?? null,
         warehouseId: dialog.row.warehouse_id || "",
         code: dialog.row.code || "",
         name: dialog.row.name || "",
-        priority: dialog.row.priority == null ? void 0 : Number(dialog.row.priority),
-        ...extractCustomFieldEntries(dialog.row)
+        priority: dialog.row.priority == null ? void 0 : Number(dialog.row.priority)
       };
     }
     return {
-      warehouseId: soleWarehouseId ?? "",
+      warehouseId: "",
       code: "",
       name: "",
       priority: void 0
     };
-  }, [dialog, soleWarehouseId]);
+  }, [dialog]);
   const closeDialog = React.useCallback(() => {
     setDialog(null);
     setSubmitting(false);
@@ -447,14 +489,10 @@ function ZoneSection({ viewAllHref } = {}) {
     const submitMode = dialog.mode;
     setSubmitting(true);
     try {
-      const customFields = collectCustomFieldValues(values);
       const payload = {
-        warehouseId: values.warehouseId,
-        code: values.code,
-        name: values.name,
+        ...values,
         priority: values.priority === void 0 || Number.isNaN(values.priority) ? void 0 : Number(values.priority)
       };
-      if (Object.keys(customFields).length) payload.customFields = customFields;
       await runMutation({
         operation: async () => {
           const call = await apiCall(
@@ -555,7 +593,6 @@ function ZoneSection({ viewAllHref } = {}) {
               pageSize: 10,
               total: query.data?.total ?? 0,
               totalPages: query.data?.totalPages ?? 1,
-              totalIsCapped: query.data?.totalIsCapped === true,
               onPageChange: setPage
             },
             perspective: { tableId: extensionPoints.hosts.zonesTable.tableId },
@@ -743,7 +780,6 @@ function LocationSection({ viewAllHref } = {}) {
               pageSize: 10,
               total: query.data?.total ?? 0,
               totalPages: query.data?.totalPages ?? 1,
-              totalIsCapped: query.data?.totalIsCapped === true,
               onPageChange: setPage
             },
             perspective: { tableId: extensionPoints.hosts.locationsTable.tableId },
@@ -1019,7 +1055,6 @@ function InventoryProfilesSection() {
               pageSize: 10,
               total: query.data?.total ?? 0,
               totalPages: query.data?.totalPages ?? 1,
-              totalIsCapped: query.data?.totalIsCapped === true,
               onPageChange: setPage
             },
             perspective: { tableId: extensionPoints.hosts.inventoryProfilesTable.tableId },