@streamoid/catalogix-chat 0.2.20 → 0.2.22

package/dist/index.d.ts

@@ -186,11 +186,12 @@ interface EditFeedProps {
     sourceMp: string;
     marketplaceOv: number | string;
     transformedUrl: string;
+    mappingKey: string;
     submitted?: boolean;
     submittedValues?: Record<string, unknown>;
     onSubmit: (values: Record<string, unknown>, message?: string) => void;
 }
-declare function EditFeed({ criticalIssues: initialCriticalIssues, rawErrorData: initialRawErrorData, dataIssuesRaw: initialDataIssuesRaw, columns: initialColumns, skuField, storeId, feedFileType, downloadUrl, userId, mappingObj, sourceMp, marketplaceOv, transformedUrl: initialTransformedUrl, submitted, submittedValues, onSubmit, }: EditFeedProps): react_jsx_runtime.JSX.Element;
+declare function EditFeed({ criticalIssues: initialCriticalIssues, rawErrorData: initialRawErrorData, dataIssuesRaw: initialDataIssuesRaw, columns: initialColumns, skuField, storeId, feedFileType, downloadUrl, userId, mappingObj, sourceMp, marketplaceOv, transformedUrl: initialTransformedUrl, mappingKey, submitted, submittedValues, onSubmit, }: EditFeedProps): react_jsx_runtime.JSX.Element;
 
 interface ProductAutomationProps {
     storeId: string;

package/dist/index.js

@@ -3085,7 +3085,7 @@ import {
   ChevronDown as ChevronDown3,
   ChevronRight as ChevronRight3,
   Pencil as Pencil3,
-  Info as Info2,
+  Send as Send2,
   Loader2 as Loader26,
   X as X2,
   RefreshCw
@@ -3125,66 +3125,33 @@ function buildDataIssueMap(issues) {
   }
   return map;
 }
-function rowsToCsvBlob(rows, columns) {
-  const escape = (v) => {
-    if (v.includes(",") || v.includes('"') || v.includes("\n")) {
-      return `"${v.replace(/"/g, '""')}"`;
-    }
-    return v;
-  };
-  const lines = [columns.map(escape).join(",")];
-  for (const row of rows) {
-    lines.push(columns.map((c) => escape(row[c] ?? "")).join(","));
-  }
-  return new Blob([lines.join("\n")], { type: "text/csv" });
-}
-async function uploadCorrectedCsv(storeId, csvBlob, fileName) {
+async function validateRow(storeId, mappingKey, rowData) {
   const { catalogixBaseUrl } = getApiConfig();
-  const form = new FormData();
-  form.append("file_type", "csv");
-  form.append("file_data", csvBlob, fileName);
-  form.append("data", JSON.stringify({ fileName, size: csvBlob.size / 1024 }));
-  const resp = await fetch(
-    `${catalogixBaseUrl}/api/v1/store/${storeId}/feed/onboard`,
-    { method: "POST", credentials: "include", body: form }
+  const params = new URLSearchParams({ mapping_key: mappingKey });
+  return fetchJson(
+    `${catalogixBaseUrl}/api/v1/feed/${storeId}/validate/row?${params}`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify([rowData])
+    }
   );
-  if (!resp.ok) throw new Error(`Upload failed: ${resp.status}`);
-  const json = await resp.json();
-  return json.data.download_url;
 }
-async function validateFeed(storeId, fileUrl, feedFileType, clientFeedUrl, userId, mappingObj, sourceMp, marketplaceOv, reValidate) {
+async function mergeFeed(fileUrl, feedFormat, changes) {
   const { catalogixBaseUrl } = getApiConfig();
   const params = new URLSearchParams({
     file_url: fileUrl,
-    feed_format: feedFileType,
-    client_feed_url: clientFeedUrl,
-    catalogix_user_id: userId,
-    re_validate: String(reValidate)
+    feed_format: feedFormat
   });
   return fetchJson(
-    `${catalogixBaseUrl}/api/v1/feed/${storeId}/validate/v2?${params}`,
+    `${catalogixBaseUrl}/api/v1/feed/merge?${params}`,
     {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        mapping: {
-          ...mappingObj,
-          catalogix_user_id: userId,
-          mp: sourceMp,
-          template: reValidate ? null : "",
-          source_ov: reValidate ? marketplaceOv : String(marketplaceOv)
-        }
-      })
+      body: JSON.stringify(changes)
     }
   );
 }
-async function fetchValidationErrors(issueFilesUrl) {
-  const { catalogixBaseUrl } = getApiConfig();
-  const params = new URLSearchParams({ excelUrl: issueFilesUrl });
-  return fetchJson(
-    `${catalogixBaseUrl}/api/v1/format-sheet-data-for-mapping?${params}`
-  );
-}
 function EditableCell2({
   value,
   hasError,
@@ -3198,7 +3165,7 @@ function EditableCell2({
     setEditing(false);
     if (draft !== value) onChange(draft);
   }, [draft, value, onChange]);
-  if (readOnly || !hasError) {
+  if (readOnly) {
     return /* @__PURE__ */ jsxs11(
       "div",
       {
@@ -3256,19 +3223,19 @@ function EditableCell2({
     }
   );
 }
-function MissingAttributesBanner({ text }) {
-  const [open, setOpen] = useState8(false);
+function MissingAttributesBanner({ text, defaultOpen = false }) {
+  const [open, setOpen] = useState8(defaultOpen);
   const attrs = text.split(",").map((s) => s.trim().replace(/^'|'$/g, ""));
   const preview = attrs.slice(0, 3);
-  return /* @__PURE__ */ jsxs11("div", { className: "text-xs text-muted-foreground px-2 py-1.5 border-t border-dashed bg-muted/30", children: [
+  return /* @__PURE__ */ jsxs11("div", { className: "text-xs px-2 py-1.5 border-t border-dashed border-amber-300/60 bg-amber-50/40 dark:bg-amber-950/20 text-amber-700 dark:text-amber-400", children: [
     /* @__PURE__ */ jsxs11(
       "button",
       {
         type: "button",
-        className: "flex items-center gap-1 hover:text-foreground transition-colors",
+        className: "flex items-center gap-1 hover:text-amber-900 dark:hover:text-amber-300 transition-colors",
         onClick: () => setOpen((v) => !v),
         children: [
-          /* @__PURE__ */ jsx22(Info2, { className: "h-3 w-3" }),
+          /* @__PURE__ */ jsx22(AlertTriangle2, { className: "h-3 w-3" }),
           /* @__PURE__ */ jsx22("span", { className: "font-medium", children: "Missing attributes:" }),
           !open && /* @__PURE__ */ jsxs11("span", { children: [
             preview.join(", "),
@@ -3310,6 +3277,7 @@ function EditFeed({
   sourceMp,
   marketplaceOv,
   transformedUrl: initialTransformedUrl,
+  mappingKey,
   submitted,
   submittedValues,
   onSubmit
@@ -3326,6 +3294,9 @@ function EditFeed({
       return out;
     })
   );
+  const [rowNumbers, setRowNumbers] = useState8(
+    () => initialRawErrorData.map((r) => Number(r.row_number ?? 0))
+  );
   const [criticalIssues, setCriticalIssues] = useState8(initialCriticalIssues);
   const [dataIssuesRaw, setDataIssuesRaw] = useState8(initialDataIssuesRaw);
   const [columns] = useState8(
@@ -3367,77 +3338,71 @@ function EditFeed({
     setIsLoading(true);
     setErrorMsg("");
     try {
-      setStatusMsg("Building corrected CSV...");
-      const csvBlob = rowsToCsvBlob(rows, columns);
-      const fileName = `corrected_${Date.now()}.csv`;
-      setStatusMsg("Uploading corrected feed...");
-      const newFileUrl = await uploadCorrectedCsv(storeId, csvBlob, fileName);
-      setStatusMsg("Re-validating feed...");
-      const result = await validateFeed(
-        storeId,
-        newFileUrl,
-        feedFileType,
-        downloadUrl,
-        userId,
-        mappingObj,
-        sourceMp,
-        marketplaceOv,
-        true
-      );
-      const data = result.data;
-      if (data.validation) {
-        setStatusMsg("Validation passed!");
-        onSubmit(
-          { transformedUrl: data.transformed_url },
-          "Feed corrections validated successfully."
-        );
+      const editedRowIndices = /* @__PURE__ */ new Set();
+      for (const key of editedCells) {
+        const idx = parseInt(key.split(":")[0], 10);
+        editedRowIndices.add(idx);
+      }
+      if (editedRowIndices.size === 0) {
+        if (errorCount === 0) {
+          onSubmit(
+            { transformedUrl },
+            "No critical errors. Proceeding with current feed."
+          );
+          return;
+        }
+        setErrorMsg("No cells have been edited. Please fix the highlighted values first.");
+        setIsLoading(false);
         return;
       }
-      setStatusMsg("Validation still failing \u2014 fetching new errors...");
-      const issueUrl = data.errors?.issue_files_url;
-      if (issueUrl) {
-        const errResp = await fetchValidationErrors(issueUrl);
-        const newRaw = errResp.data.raw_error_data ?? [];
-        const newRows = newRaw.map((r) => {
-          const out = {};
-          for (const [k, v] of Object.entries(r)) {
-            if (k !== "row_number") out[k] = String(v ?? "");
+      const failedRows = [];
+      for (const rowIdx of editedRowIndices) {
+        const rowNum = rowNumbers[rowIdx];
+        setStatusMsg(`Validating row ${rowIdx + 1} of ${rows.length}...`);
+        const fullRowData = { ...rows[rowIdx], row_number: rowNum };
+        const result = await validateRow(storeId, mappingKey, fullRowData);
+        if (!result.data.validation) {
+          failedRows.push({ rowIdx, errors: result.data.errors });
+        }
+      }
+      if (failedRows.length > 0) {
+        const newCritical = [];
+        for (const { rowIdx, errors } of failedRows) {
+          const sku = rows[rowIdx][skuField] ?? "";
+          for (const err of errors) {
+            if (err["Invalid Value"] || err["Invalid Attribute"]) {
+              newCritical.push({
+                rowNumber: rowNumbers[rowIdx],
+                columnNumber: err["Column Number"] || void 0,
+                skuCode: err["SKU Code"] || sku,
+                errorMessage: [err["Invalid Attribute"], err["Invalid Value"]].filter(Boolean).join(": ")
+              });
+            }
           }
-          return out;
-        });
-        setRows(newRows);
+        }
+        if (newCritical.length > 0) setCriticalIssues(newCritical);
         setEditedCells(/* @__PURE__ */ new Set());
-        const newCritical = (errResp.data.critical_issues ?? []).map(
-          (ci) => {
-            let errMsgRaw = String(ci.error_message ?? "");
-            errMsgRaw = errMsgRaw.replace(/^[{' ]+|[}' ]+$/g, "");
-            return {
-              rowNumber: ci["Row Number"],
-              columnNumber: ci["Column Number"],
-              skuCode: String(ci["SKU Code"] ?? ""),
-              errorMessage: errMsgRaw
-            };
-          }
-        );
-        setCriticalIssues(newCritical);
-        const newDataIssues = (errResp.data.data_issues_raw ?? []).map(
-          (di) => ({
-            rowNumber: String(di["Row Number"] ?? ""),
-            skuCode: String(di["SKU Code"] ?? ""),
-            missingAttributes: String(
-              di["Attribute Required For Listing"] ?? ""
-            )
-          })
-        );
-        setDataIssuesRaw(newDataIssues);
-        setErrorMsg(
-          "Validation still has errors. Please fix the remaining issues and try again."
-        );
-      } else {
         setErrorMsg(
-          "Validation failed but no detailed error info was returned."
+          `${failedRows.length} row(s) still have errors. Please fix the remaining issues and try again.`
         );
+        return;
+      }
+      setStatusMsg("Merging corrections into feed...");
+      const changes = {};
+      for (const key of editedCells) {
+        const [idxStr, col] = [key.split(":")[0], key.slice(key.indexOf(":") + 1)];
+        const rowIdx = parseInt(idxStr, 10);
+        const rowNum = String(rowNumbers[rowIdx]);
+        if (!changes[rowNum]) changes[rowNum] = {};
+        changes[rowNum][col] = rows[rowIdx][col] ?? "";
       }
+      const mergeResult = await mergeFeed(transformedUrl, feedFileType, changes);
+      const newFileUrl = mergeResult.data.new_file_url;
+      setStatusMsg("Validation passed!");
+      onSubmit(
+        { transformedUrl: newFileUrl },
+        "Feed corrections validated successfully."
+      );
     } catch (err) {
       setErrorMsg(
         `Error: ${err instanceof Error ? err.message : String(err)}`
@@ -3448,31 +3413,37 @@ function EditFeed({
     }
   }, [
     rows,
+    rowNumbers,
     columns,
+    editedCells,
+    errorCount,
     storeId,
     feedFileType,
-    downloadUrl,
-    userId,
-    mappingObj,
-    sourceMp,
-    marketplaceOv,
+    mappingKey,
+    transformedUrl,
+    skuField,
     onSubmit
   ]);
   return /* @__PURE__ */ jsxs11("div", { className: "flex flex-col gap-3", children: [
     /* @__PURE__ */ jsx22("div", { className: "flex items-center justify-between px-1", children: /* @__PURE__ */ jsxs11("div", { className: "flex items-center gap-2", children: [
       /* @__PURE__ */ jsx22(AlertTriangle2, { className: "h-4 w-4 text-destructive" }),
       /* @__PURE__ */ jsx22("span", { className: "font-medium text-sm", children: "Feed Validation Issues" }),
-      /* @__PURE__ */ jsxs11(Badge, { variant: "destructive", className: "text-[10px]", children: [
+      errorCount > 0 && /* @__PURE__ */ jsxs11(Badge, { variant: "destructive", className: "text-[10px]", children: [
         errorCount,
         " error",
         errorCount !== 1 ? "s" : ""
       ] }),
+      dataIssuesRaw.length > 0 && /* @__PURE__ */ jsxs11(Badge, { variant: "outline", className: "text-[10px] border-amber-400 text-amber-600 dark:text-amber-400", children: [
+        dataIssuesRaw.length,
+        " warning",
+        dataIssuesRaw.length !== 1 ? "s" : ""
+      ] }),
       editedCells.size > 0 && /* @__PURE__ */ jsxs11(Badge, { variant: "secondary", className: "text-[10px]", children: [
         editedCells.size,
         " edited"
       ] })
     ] }) }),
-    /* @__PURE__ */ jsx22("p", { className: "text-xs text-muted-foreground px-1", children: "Click on the highlighted cells to edit their values, then submit to re-validate." }),
+    /* @__PURE__ */ jsx22("p", { className: "text-xs text-muted-foreground px-1", children: errorCount > 0 ? "Click on the highlighted cells to edit their values, then submit to re-validate." : "No critical errors found. Review the warnings below and edit values if needed, or proceed." }),
     statusMsg && /* @__PURE__ */ jsxs11("div", { className: "flex items-center gap-2 px-2 py-1.5 rounded bg-muted text-xs text-muted-foreground", children: [
       /* @__PURE__ */ jsx22(Loader26, { className: "h-3 w-3 animate-spin" }),
       statusMsg
@@ -3508,7 +3479,7 @@ function EditFeed({
                 ) }, col);
               })
             ] }),
-            missingAttrs && /* @__PURE__ */ jsx22("tr", { children: /* @__PURE__ */ jsx22("td", { colSpan: columns.length + 1, children: /* @__PURE__ */ jsx22(MissingAttributesBanner, { text: missingAttrs }) }) })
+            missingAttrs && /* @__PURE__ */ jsx22("tr", { children: /* @__PURE__ */ jsx22("td", { colSpan: columns.length + 1, children: /* @__PURE__ */ jsx22(MissingAttributesBanner, { text: missingAttrs, defaultOpen: errorCount === 0 }) }) })
           ] }, rowIdx);
         }),
         rows.length === 0 && /* @__PURE__ */ jsx22(TableRow, { children: /* @__PURE__ */ jsx22(
@@ -3544,8 +3515,8 @@ function EditFeed({
           className: "gap-1.5",
           disabled: isLoading,
           children: [
-            isLoading ? /* @__PURE__ */ jsx22(Loader26, { className: "h-3.5 w-3.5 animate-spin" }) : /* @__PURE__ */ jsx22(RefreshCw, { className: "h-3.5 w-3.5" }),
-            "Fix & Re-validate"
+            isLoading ? /* @__PURE__ */ jsx22(Loader26, { className: "h-3.5 w-3.5 animate-spin" }) : errorCount > 0 ? /* @__PURE__ */ jsx22(RefreshCw, { className: "h-3.5 w-3.5" }) : /* @__PURE__ */ jsx22(Send2, { className: "h-3.5 w-3.5" }),
+            errorCount > 0 ? "Fix & Re-validate" : editedCells.size > 0 ? "Fix & Re-validate" : "Proceed"
           ]
         }
       )
@@ -4708,6 +4679,7 @@ function CatalogixChat(props) {
         sourceMp: uiProps.sourceMp ?? "SMP",
         marketplaceOv: uiProps.marketplaceOv ?? 34,
         transformedUrl: uiProps.transformedUrl ?? "",
+        mappingKey: uiProps.mappingKey ?? "",
         submitted: props.submitted,
         submittedValues: props.submittedValues,
         onSubmit: (values, msg) => onSubmit(values, msg)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamoid/catalogix-chat",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "description": "Catalogix chat components for the Streamoid chat host — store creation, product selection, automations",
   "type": "module",
   "main": "./dist/index.js",