@deenruv/merchant-plugin 1.0.17-dev.18 → 1.0.17-dev.23

package/dist/plugin-server/ui/graphql/queries.ts

@@ -2,6 +2,8 @@ import { typedGql } from "../zeus/typedDocumentNode";
 import { scalars } from "./scalars";
 import { merchantPlatformSettingsSelector } from "./mutations";
 import { $ } from "../zeus/index";
+import { gql } from "graphql-tag";
+import type { TypedDocumentNode } from "@graphql-typed-document-node/core";
 
 const query = typedGql("query", { scalars });
 export const getMerchantPlatformSettings = query({
@@ -16,3 +18,100 @@ export const getMerchantPlatformInfo = query({
     { isValidConnection: true, productsCount: true },
   ],
 });
+
+export type GoogleMerchantDiagnostic = {
+  checkedAt?: string;
+  connectionStatus?: string;
+  dataSourceVerified?: boolean;
+  disapprovedProductsCount?: number;
+  isValidConnection: boolean;
+  issues?: Array<{
+    code: string;
+    description: string;
+    offerId: string;
+    severity: string;
+  }>;
+  issuesCount?: number;
+  lastError?: {
+    code: string;
+    message: string;
+    retryable: boolean;
+  };
+  latencyMs?: number;
+  productsCount: number;
+};
+
+export type MerchantSyncRunSummary = {
+  createdAt: string;
+  errorSummary?: string;
+  failed: number;
+  finishedAt?: string;
+  id: string;
+  items: Array<{
+    attempts: number;
+    errorCode?: string;
+    errorMessage?: string;
+    offerId: string;
+    operation: string;
+    status: string;
+  }>;
+  status: string;
+  succeeded: number;
+  total: number;
+  trigger: string;
+};
+
+export const getGoogleMerchantDiagnostic = gql`
+  query GetGoogleMerchantDiagnostic {
+    getMerchantPlatformInfo(platform: "google") {
+      isValidConnection
+      productsCount
+      connectionStatus
+      dataSourceVerified
+      checkedAt
+      latencyMs
+      disapprovedProductsCount
+      issuesCount
+      lastError {
+        code
+        message
+        retryable
+      }
+      issues {
+        offerId
+        code
+        description
+        severity
+      }
+    }
+  }
+` as TypedDocumentNode<{
+  getMerchantPlatformInfo?: GoogleMerchantDiagnostic[];
+}>;
+
+export const getGoogleMerchantSyncHistory = gql`
+  query GetGoogleMerchantSyncHistory($take: Int) {
+    getMerchantSyncHistory(platform: "google", take: $take) {
+      id
+      createdAt
+      trigger
+      status
+      total
+      succeeded
+      failed
+      errorSummary
+      finishedAt
+      items {
+        offerId
+        operation
+        status
+        errorCode
+        errorMessage
+        attempts
+      }
+    }
+  }
+` as TypedDocumentNode<
+  { getMerchantSyncHistory: MerchantSyncRunSummary[] },
+  { take?: number }
+>;

package/dist/plugin-server/ui/pages/GooglePage.tsx

@@ -9,10 +9,14 @@ import { NotificationService } from "@deenruv/admin-ui/core";
 import {
   removeOrphanItems,
   saveMerchantPlatformSettings,
+  sendAllProductsToMerchantPlatform,
 } from "../graphql/mutations";
 import {
-  getMerchantPlatformInfo,
+  getGoogleMerchantDiagnostic,
+  getGoogleMerchantSyncHistory,
   getMerchantPlatformSettings,
+  GoogleMerchantDiagnostic,
+  MerchantSyncRunSummary,
 } from "../graphql/queries";
 
 export const GooglePage = () => {
@@ -20,9 +24,16 @@ export const GooglePage = () => {
   const [fetchMerchantPlatformSettings] = useLazyQuery(
     getMerchantPlatformSettings,
   );
-  const [fetchMerchantPlatformInfo] = useLazyQuery(getMerchantPlatformInfo);
+  const [fetchMerchantPlatformInfo] = useLazyQuery(
+    getGoogleMerchantDiagnostic,
+  );
+  const [fetchSyncHistory] = useLazyQuery(getGoogleMerchantSyncHistory);
   const [mutate] = useMutation(saveMerchantPlatformSettings);
   const [removeOldItems] = useMutation(removeOrphanItems);
+  const [sendAllProducts] = useMutation(sendAllProductsToMerchantPlatform);
+  const [diagnostic, setDiagnostic] =
+    useState<GoogleMerchantDiagnostic | null>(null);
+  const [syncHistory, setSyncHistory] = useState<MerchantSyncRunSummary[]>([]);
   const [serviceInfo, setServiceInfo] = useState({
     productsCount: 0,
     connectionStatus: false,
@@ -55,6 +66,8 @@ export const GooglePage = () => {
     brand: "",
     merchantId: "",
     dataSource: "",
+    contentLanguage: "pl",
+    feedLabel: "PL",
     credentials: "",
     autoUpdate: true,
     firstSync: true,
@@ -63,9 +76,10 @@ export const GooglePage = () => {
   const refetch = async () => {
     try {
       setIsLoading(true);
-      const [settingsData, infoData] = await Promise.all([
+      const [settingsData, infoData, historyData] = await Promise.all([
         fetchMerchantPlatformSettings({ platform: "google" }),
-        fetchMerchantPlatformInfo({ platform: "google" }),
+        fetchMerchantPlatformInfo(),
+        fetchSyncHistory({ take: 10 }),
       ]);
       const settings =
         settingsData?.getMerchantPlatformSettings?.entries?.reduce(
@@ -79,6 +93,12 @@ export const GooglePage = () => {
             if (key === "dataSource") {
               acc.dataSource = value;
             }
+            if (key === "contentLanguage") {
+              acc.contentLanguage = value;
+            }
+            if (key === "feedLabel") {
+              acc.feedLabel = value;
+            }
             if (key === "credentials") {
               acc.credentials = value;
             }
@@ -94,17 +114,20 @@ export const GooglePage = () => {
             brand: string;
             merchantId: string;
             dataSource: string;
+            contentLanguage: string;
+            feedLabel: string;
             credentials: string;
             autoUpdate: boolean;
             firstSync: boolean;
           },
         );
       setSettingsForm((prev) => ({ ...prev, ...settings }));
+      const currentDiagnostic = infoData?.getMerchantPlatformInfo?.[0];
+      setDiagnostic(currentDiagnostic ?? null);
+      setSyncHistory(historyData?.getMerchantSyncHistory ?? []);
       setServiceInfo({
-        productsCount:
-          infoData?.getMerchantPlatformInfo?.[0]?.productsCount || 0,
-        connectionStatus:
-          infoData?.getMerchantPlatformInfo?.[0]?.isValidConnection || false,
+        productsCount: currentDiagnostic?.productsCount || 0,
+        connectionStatus: currentDiagnostic?.isValidConnection || false,
       });
       setIsLoading(false);
     } catch (error) {
@@ -137,7 +160,11 @@ export const GooglePage = () => {
       }
     } catch (error) {
       console.error(error);
-      toast.error("Failed to save settings");
+      toast.error(
+        `Failed to save settings: ${
+          error instanceof Error ? error.message : "Unknown error"
+        }`,
+      );
     }
   };
 
@@ -214,6 +241,34 @@ export const GooglePage = () => {
               }
             />
           </div>
+          <div className="flex justify-between gap-4">
+            <div className="w-full flex flex-col gap-2">
+              <label>Content language</label>
+              <input
+                required
+                value={settingsForm.contentLanguage}
+                onChange={(e) =>
+                  setSettingsForm({
+                    ...settingsForm,
+                    contentLanguage: e.target.value,
+                  })
+                }
+              />
+            </div>
+            <div className="w-full flex flex-col gap-2">
+              <label>Feed label</label>
+              <input
+                required
+                value={settingsForm.feedLabel}
+                onChange={(e) =>
+                  setSettingsForm({
+                    ...settingsForm,
+                    feedLabel: e.target.value,
+                  })
+                }
+              />
+            </div>
+          </div>
           <div className="flex flex-col gap-4">
             <div className="flex flex-col">
               <label>Google Account Credentials</label>
@@ -271,7 +326,67 @@ export const GooglePage = () => {
         </form>
         <div className="flex gap-2">
           <span>Connection status</span>
-          {serviceInfo.connectionStatus ? <div>💚</div> : <div>💔</div>}
+          <strong>
+            {serviceInfo.connectionStatus ? "Connected" : "Disconnected"}
+          </strong>
+        </div>
+        <div className="flex gap-2">
+          <span>Products count</span>
+          <span>{serviceInfo.productsCount}</span>
+        </div>
+        <div className="flex flex-col gap-1">
+          <span>Diagnostic: {diagnostic?.connectionStatus ?? "UNKNOWN"}</span>
+          <span>
+            Data source verified:{" "}
+            {diagnostic?.dataSourceVerified ? "yes" : "no"}
+          </span>
+          <span>Latency: {diagnostic?.latencyMs ?? 0} ms</span>
+          <span>
+            Disapproved products: {diagnostic?.disapprovedProductsCount ?? 0}
+          </span>
+          <span>Product issues: {diagnostic?.issuesCount ?? 0}</span>
+          {diagnostic?.lastError ? (
+            <div className="alert alert-danger">
+              {diagnostic.lastError.code}: {diagnostic.lastError.message}
+            </div>
+          ) : null}
+          {(diagnostic?.issues ?? []).slice(0, 20).map((issue) => (
+            <div
+              className="alert alert-warning"
+              key={`${issue.offerId}-${issue.code}`}
+            >
+              {issue.offerId} · {issue.severity} · {issue.code}:{" "}
+              {issue.description}
+            </div>
+          ))}
+        </div>
+        <div className="mt-4 flex gap-2">
+          <button
+            type="button"
+            className="btn btn-secondary"
+            onClick={async () => {
+              await refetch();
+              toast.success("Connection diagnostic completed");
+            }}
+          >
+            Test connection
+          </button>
+          <button
+            type="button"
+            className="btn btn-primary"
+            onClick={async () => {
+              try {
+                await sendAllProducts({ platform: "google" });
+                toast.success("Full synchronization queued");
+                await refetch();
+              } catch (error) {
+                console.error(error);
+                toast.error("Failed to queue full synchronization");
+              }
+            }}
+          >
+            Synchronize all
+          </button>
         </div>
         {serviceInfo.connectionStatus ? (
           <div style={{ marginTop: "12px" }}>
@@ -280,11 +395,11 @@ export const GooglePage = () => {
               onClick={async () => {
                 try {
                   await removeOldItems({ platform: "google" });
-                  toast.success("Old items removed successfully");
+                  toast.success("Orphan cleanup queued");
                   refetch();
                 } catch (error) {
                   console.error(error);
-                  toast.error("Failed to remove old items");
+                  toast.error("Failed to queue orphan cleanup");
                 }
               }}
             >
@@ -292,10 +407,37 @@ export const GooglePage = () => {
             </button>
           </div>
         ) : null}
-        {/* <div className="flex gap-2">
-          <span>Products count</span>
-          <span>{serviceInfo.productsCount}</span>
-        </div> */}
+        <div className="mt-8 flex flex-col gap-2">
+          <h3>Recent synchronizations</h3>
+          {syncHistory.length === 0 ? (
+            <span>No synchronization history</span>
+          ) : (
+            syncHistory.map((run) => (
+              <div className="border rounded p-2" key={run.id}>
+                <div>
+                  {run.status} · {run.succeeded}/{run.total} successful ·{" "}
+                  {run.failed} failed
+                </div>
+                <div>{new Date(run.createdAt).toLocaleString()}</div>
+                {run.errorSummary ? (
+                  <div className="text-danger">{run.errorSummary}</div>
+                ) : null}
+                {run.items
+                  .filter((item) => item.status === "FAILED")
+                  .slice(0, 20)
+                  .map((item) => (
+                    <div
+                      className="text-danger"
+                      key={`${run.id}-${item.offerId}-${item.operation}`}
+                    >
+                      {item.offerId} · {item.errorCode ?? "ERROR"} · attempts:{" "}
+                      {item.attempts} · {item.errorMessage}
+                    </div>
+                  ))}
+              </div>
+            ))
+          )}
+        </div>
       </div>
     </PageDetailLayout>
   );

package/dist/plugin-server/ui/zeus/const.ts

@@ -176,6 +176,15 @@ export const AllTypesProps: Record<string,any> = {
 		},
 		getMerchantPlatformInfo:{
 
+		},
+		getMerchantSyncHistory:{
+
+		},
+		chartMetric:{
+			input:"ChartMetricInput"
+		},
+		orderSummaryMetric:{
+			input:"OrderSummaryMetricInput"
 		},
 		getInpostOrganizations:{
 			input:"GetInpostOrganizationsInput"
@@ -1465,6 +1474,21 @@ export const AllTypesProps: Record<string,any> = {
 	SaveMerchantPlatformSettingInput:{
 		entries:"MerchantPlatformSettingInput"
 	},
+	MetricRangeType: "enum" as const,
+	MetricIntervalType: "enum" as const,
+	ChartMetricType: "enum" as const,
+	BetterMetricRangeInput:{
+		start:"DateTime",
+		end:"DateTime"
+	},
+	OrderSummaryMetricInput:{
+		range:"BetterMetricRangeInput"
+	},
+	ChartMetricInput:{
+		range:"BetterMetricRangeInput",
+		interval:"MetricIntervalType",
+		types:"ChartMetricType"
+	},
 	SetInpostShippingMethodConfigInput:{
 
 	},
@@ -1994,6 +2018,10 @@ export const ReturnTypes: Record<string,any> = {
 		zone:"Zone",
 		getMerchantPlatformSettings:"MerchantPlatformSettingsEntity",
 		getMerchantPlatformInfo:"MerchantPlatformInfo",
+		getMerchantSyncHistory:"MerchantSyncRun",
+		additionalOrderStates:"AdditionalOrderState",
+		chartMetric:"ChartMetrics",
+		orderSummaryMetric:"OrderSummaryMetrics",
 		getInpostConfig:"InpostConfig",
 		getInpostOrganizations:"InpostOrganizationResponse",
 		metricSummary:"MetricSummary"
@@ -3902,7 +3930,84 @@ export const ReturnTypes: Record<string,any> = {
 	},
 	MerchantPlatformInfo:{
 		isValidConnection:"Boolean",
-		productsCount:"Int"
+		productsCount:"Int",
+		connectionStatus:"String",
+		dataSourceVerified:"Boolean",
+		checkedAt:"DateTime",
+		latencyMs:"Int",
+		disapprovedProductsCount:"Int",
+		issuesCount:"Int",
+		lastError:"MerchantPlatformError",
+		issues:"MerchantProductIssue"
+	},
+	MerchantPlatformError:{
+		code:"String",
+		message:"String",
+		retryable:"Boolean"
+	},
+	MerchantProductIssue:{
+		offerId:"String",
+		code:"String",
+		description:"String",
+		severity:"String"
+	},
+	MerchantSyncItem:{
+		id:"ID",
+		offerId:"String",
+		operation:"String",
+		status:"String",
+		errorCode:"String",
+		errorMessage:"String",
+		attempts:"Int"
+	},
+	MerchantSyncRun:{
+		id:"ID",
+		createdAt:"DateTime",
+		platform:"String",
+		trigger:"String",
+		status:"String",
+		jobId:"String",
+		total:"Int",
+		succeeded:"Int",
+		failed:"Int",
+		errorSummary:"String",
+		startedAt:"DateTime",
+		finishedAt:"DateTime",
+		items:"MerchantSyncItem"
+	},
+	AdditionalOrderState:{
+		state:"String",
+		selectedByDefault:"Boolean"
+	},
+	ChartDataType:{
+		type:"ChartMetricType",
+		title:"String",
+		entries:"ChartEntry"
+	},
+	ChartMetrics:{
+		data:"ChartDataType"
+	},
+	OrderSummaryMetrics:{
+		data:"OrderSummaryDataMetric"
+	},
+	OrderSummaryDataMetric:{
+		currencyCode:"CurrencyCode",
+		total:"Float",
+		totalWithTax:"Float",
+		orderCount:"Float",
+		averageOrderValue:"Float",
+		averageOrderValueWithTax:"Float",
+		productCount:"Float"
+	},
+	ChartEntryAdditionalData:{
+		id:"String",
+		name:"String",
+		quantity:"Float"
+	},
+	ChartEntry:{
+		intervalTick:"Int",
+		value:"Float",
+		additionalData:"ChartEntryAdditionalData"
 	},
 	InpostConfig:{
 		shippingMethodId:"ID",