@deenruv/merchant-plugin 1.0.17-dev.33 → 1.0.17-dev.35

package/dist/plugin-server/api/platform-integration-admin-resolver.d.ts

@@ -8,6 +8,9 @@ export declare class PlatformIntegrationAdminResolver {
     private facebookPlatformIntegrationService;
     private platformIntegrationService;
     constructor(googlePlatformIntegrationService: GooglePlatformIntegrationService, facebookPlatformIntegrationService: FacebookPlatformIntegrationService, platformIntegrationService: PlatformIntegrationService);
+    getGoogleMerchantDataSources(ctx: RequestContext, args: {
+        merchantId: string;
+    }): Promise<string[]>;
     getMerchantPlatformSettings(ctx: RequestContext, args: {
         platform: string;
     }): Promise<MerchantPlatformSettingsEntity | null>;

package/dist/plugin-server/api/platform-integration-admin-resolver.js

@@ -26,6 +26,9 @@ let PlatformIntegrationAdminResolver = class PlatformIntegrationAdminResolver {
         this.facebookPlatformIntegrationService = facebookPlatformIntegrationService;
         this.platformIntegrationService = platformIntegrationService;
     }
+    async getGoogleMerchantDataSources(ctx, args) {
+        return this.googlePlatformIntegrationService.discoverGoogleMerchantDataSources(ctx, args.merchantId);
+    }
     async getMerchantPlatformSettings(ctx, args) {
         const settings = await this.platformIntegrationService.getBaseSettings(ctx, args.platform);
         return settings ? this.redactCredentials(settings) : null;
@@ -85,6 +88,15 @@ let PlatformIntegrationAdminResolver = class PlatformIntegrationAdminResolver {
     }
 };
 exports.PlatformIntegrationAdminResolver = PlatformIntegrationAdminResolver;
+__decorate([
+    (0, graphql_1.Query)(),
+    (0, core_1.Allow)(core_1.Permission.ReadSettings),
+    __param(0, (0, core_1.Ctx)()),
+    __param(1, (0, graphql_1.Args)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
+    __metadata("design:returntype", Promise)
+], PlatformIntegrationAdminResolver.prototype, "getGoogleMerchantDataSources", null);
 __decorate([
     (0, graphql_1.Query)(),
     __param(0, (0, core_1.Ctx)()),

package/dist/plugin-server/extensions/api-extensions.js

@@ -88,6 +88,7 @@ exports.adminApiExtensions = (0, graphql_tag_1.gql) `
   }
 
   extend type Query {
+    getGoogleMerchantDataSources(merchantId: String!): [String!]!
     getMerchantPlatformSettings(
       platform: String!
     ): MerchantPlatformSettingsEntity

package/dist/plugin-server/services/google-merchant-api.d.ts

@@ -5,6 +5,7 @@ import type { GoogleProcessedProduct, GoogleProduct, GoogleProductInput, RemoteP
 export declare const GOOGLE_CONTENT_LANGUAGE = "pl";
 export declare const GOOGLE_FEED_LABEL = "PL";
 export declare const DEFAULT_GOOGLE_WRITE_CONCURRENCY = 4;
+export declare const MAX_GOOGLE_DATA_SOURCE_DISCOVERY_RESULTS = 100;
 type MerchantClientOptions = NonNullable<ConstructorParameters<typeof v1.ProductsServiceClient>[0]>;
 export type GoogleMerchantCredentials = NonNullable<MerchantClientOptions["credentials"]>;
 export type GoogleMerchantSettings = {
@@ -70,6 +71,15 @@ export interface GoogleDataSourcesReader {
         name: string;
     }): Promise<unknown>;
 }
+export interface GoogleDataSourcesDiscoveryClient {
+    close(): Promise<void>;
+    listDataSourcesAsync(request: {
+        parent: string;
+    }): AsyncIterable<{
+        name?: string | null;
+    }>;
+}
+export type GoogleDataSourcesDiscoveryClientFactory = (credentials: GoogleMerchantCredentials) => GoogleDataSourcesDiscoveryClient;
 export type GoogleMerchantRetryOptions = {
     delay?: (attempt: number) => Promise<void>;
     maxAttempts?: number;
@@ -106,6 +116,9 @@ export declare function normalizeGoogleMerchantError(error: unknown): Normalized
 export declare function parseGoogleCredentials(rawCredentials: string): GoogleMerchantCredentials;
 export declare function normalizeMerchantId(rawMerchantId: string): string;
 export declare function normalizeDataSource(rawDataSource: string, merchantId: string): string;
+export declare function parseGoogleDataSourceDiscoverySettings(requestedMerchantId: string, entries: readonly SettingEntry[]): Pick<GoogleMerchantSettings, "accountId" | "credentials">;
+export declare function createGoogleDataSourcesDiscoveryClient(credentials: GoogleMerchantCredentials): GoogleDataSourcesDiscoveryClient;
+export declare function discoverGoogleMerchantDataSources(requestedMerchantId: string, entries: readonly SettingEntry[], createClient?: GoogleDataSourcesDiscoveryClientFactory): Promise<string[]>;
 export declare function parseGoogleMerchantSettings(entries: readonly SettingEntry[]): GoogleMerchantSettings;
 export declare function createGoogleMerchantClients(credentials: GoogleMerchantCredentials): GoogleMerchantClients;
 export declare function buildGoogleProductIdentifier(offerId: string, contentLanguage?: string, feedLabel?: string): string;

package/dist/plugin-server/services/google-merchant-api.js

@@ -18,7 +18,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectRemoteOrphanProducts = exports.diagnoseGoogleMerchantConnection = exports.collectGoogleProductsForDataSource = exports.summarizeMerchantOperations = exports.executeGoogleWriteOperations = exports.runBoundedMerchantOperations = exports.createGoogleDeleteOperation = exports.createGoogleUpdateOperation = exports.createGoogleInsertOperation = exports.buildGoogleUpdateMask = exports.validateGoogleProductUrls = exports.toGoogleProductInput = exports.buildGoogleProductInputName = exports.buildGoogleProductName = exports.buildGoogleProductIdentifier = exports.createGoogleMerchantClients = exports.parseGoogleMerchantSettings = exports.normalizeDataSource = exports.normalizeMerchantId = exports.parseGoogleCredentials = exports.normalizeGoogleMerchantError = exports.DEFAULT_GOOGLE_WRITE_CONCURRENCY = exports.GOOGLE_FEED_LABEL = exports.GOOGLE_CONTENT_LANGUAGE = void 0;
+exports.selectRemoteOrphanProducts = exports.diagnoseGoogleMerchantConnection = exports.collectGoogleProductsForDataSource = exports.summarizeMerchantOperations = exports.executeGoogleWriteOperations = exports.runBoundedMerchantOperations = exports.createGoogleDeleteOperation = exports.createGoogleUpdateOperation = exports.createGoogleInsertOperation = exports.buildGoogleUpdateMask = exports.validateGoogleProductUrls = exports.toGoogleProductInput = exports.buildGoogleProductInputName = exports.buildGoogleProductName = exports.buildGoogleProductIdentifier = exports.createGoogleMerchantClients = exports.parseGoogleMerchantSettings = exports.discoverGoogleMerchantDataSources = exports.createGoogleDataSourcesDiscoveryClient = exports.parseGoogleDataSourceDiscoverySettings = exports.normalizeDataSource = exports.normalizeMerchantId = exports.parseGoogleCredentials = exports.normalizeGoogleMerchantError = exports.MAX_GOOGLE_DATA_SOURCE_DISCOVERY_RESULTS = exports.DEFAULT_GOOGLE_WRITE_CONCURRENCY = exports.GOOGLE_FEED_LABEL = exports.GOOGLE_CONTENT_LANGUAGE = void 0;
 const products_1 = require("@google-shopping/products");
 const datasources_1 = require("@google-shopping/datasources");
 const GOOGLE_OAUTH_SCOPE = "https://www.googleapis.com/auth/content";
@@ -30,6 +30,7 @@ const FEED_LABEL_PATTERN = /^[A-Z0-9_-]{1,20}$/;
 exports.GOOGLE_CONTENT_LANGUAGE = "pl";
 exports.GOOGLE_FEED_LABEL = "PL";
 exports.DEFAULT_GOOGLE_WRITE_CONCURRENCY = 4;
+exports.MAX_GOOGLE_DATA_SOURCE_DISCOVERY_RESULTS = 100;
 class MerchantOperationAttemptError {
     constructor(cause, attempts) {
         this.cause = cause;
@@ -154,6 +155,105 @@ function normalizeDataSource(rawDataSource, merchantId) {
     return `accounts/${match[1]}/dataSources/${match[2]}`;
 }
 exports.normalizeDataSource = normalizeDataSource;
+function parseGoogleDataSourceDiscoverySettings(requestedMerchantId, entries) {
+    var _a;
+    const getValue = (key) => { var _a; return (_a = entries.find((entry) => entry.key === key)) === null || _a === void 0 ? void 0 : _a.value; };
+    const accountId = normalizeMerchantId(requestedMerchantId);
+    const rawCredentials = (_a = getValue("credentials")) === null || _a === void 0 ? void 0 : _a.trim();
+    if (!rawCredentials) {
+        throw new Error("Saved Google credentials are required");
+    }
+    try {
+        return {
+            accountId,
+            credentials: parseGoogleCredentials(rawCredentials),
+        };
+    }
+    catch (_b) {
+        throw new Error("Saved Google credentials are invalid");
+    }
+}
+exports.parseGoogleDataSourceDiscoverySettings = parseGoogleDataSourceDiscoverySettings;
+function createGoogleDataSourcesDiscoveryClient(credentials) {
+    const client = new datasources_1.v1.DataSourcesServiceClient({
+        credentials,
+        scopes: [GOOGLE_OAUTH_SCOPE],
+    });
+    // Google exposes data-source reads under the broad content scope. Actual write
+    // prevention is IAM/operator-owned; this wrapper narrows the runtime API surface.
+    return {
+        close: () => client.close(),
+        listDataSourcesAsync: (request) => client.listDataSourcesAsync(request),
+    };
+}
+exports.createGoogleDataSourcesDiscoveryClient = createGoogleDataSourcesDiscoveryClient;
+function normalizeGoogleDataSourceDiscoveryError(error) {
+    var _a;
+    const normalized = normalizeGoogleMerchantError(error);
+    const messages = {
+        AUTHENTICATION_FAILED: "Google Merchant authentication failed",
+        PERMISSION_DENIED: "Saved Google credentials cannot read this Merchant account",
+        UNAVAILABLE: "Google Merchant data-source discovery is temporarily unavailable",
+    };
+    return new Error((_a = messages[normalized.status]) !== null && _a !== void 0 ? _a : "Google Merchant data-source discovery failed");
+}
+async function discoverGoogleMerchantDataSources(requestedMerchantId, entries, createClient = createGoogleDataSourcesDiscoveryClient) {
+    var _a, e_1, _b, _c;
+    const settings = parseGoogleDataSourceDiscoverySettings(requestedMerchantId, entries);
+    let client;
+    try {
+        client = createClient(settings.credentials);
+    }
+    catch (_d) {
+        throw new Error("Google Merchant data-source client could not be created");
+    }
+    const names = new Set();
+    let discoveryError;
+    try {
+        try {
+            for (var _e = true, _f = __asyncValues(client.listDataSourcesAsync({
+                parent: `accounts/${settings.accountId}`,
+            })), _g; _g = await _f.next(), _a = _g.done, !_a; _e = true) {
+                _c = _g.value;
+                _e = false;
+                const dataSource = _c;
+                if (!dataSource.name)
+                    continue;
+                try {
+                    names.add(normalizeDataSource(dataSource.name, settings.accountId));
+                    if (names.size === exports.MAX_GOOGLE_DATA_SOURCE_DISCOVERY_RESULTS)
+                        break;
+                }
+                catch (_h) {
+                    // Ignore malformed or cross-account resources returned by the remote API.
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (!_e && !_a && (_b = _f.return)) await _b.call(_f);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return [...names].sort();
+    }
+    catch (error) {
+        discoveryError = normalizeGoogleDataSourceDiscoveryError(error);
+        throw discoveryError;
+    }
+    finally {
+        try {
+            await client.close();
+        }
+        catch (_j) {
+            if (!discoveryError) {
+                throw new Error("Google Merchant data-source client could not be closed");
+            }
+        }
+    }
+}
+exports.discoverGoogleMerchantDataSources = discoverGoogleMerchantDataSources;
 function parseGoogleMerchantSettings(entries) {
     var _a, _b, _c, _d, _e, _f, _g;
     const getValue = (key) => { var _a; return (_a = entries.find((entry) => entry.key === key)) === null || _a === void 0 ? void 0 : _a.value; };
@@ -407,7 +507,7 @@ function summarizeMerchantOperations(results) {
 }
 exports.summarizeMerchantOperations = summarizeMerchantOperations;
 async function collectGoogleProductsForDataSource(client, accountId, dataSource) {
-    var _a, e_1, _b, _c;
+    var _a, e_2, _b, _c;
     var _d, _e;
     const products = new Map();
     try {
@@ -426,18 +526,18 @@ async function collectGoogleProductsForDataSource(client, accountId, dataSource)
             });
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
     finally {
         try {
             if (!_f && !_a && (_b = _g.return)) await _b.call(_g);
         }
-        finally { if (e_1) throw e_1.error; }
+        finally { if (e_2) throw e_2.error; }
     }
     return [...products.values()];
 }
 exports.collectGoogleProductsForDataSource = collectGoogleProductsForDataSource;
 async function diagnoseGoogleMerchantConnection(client, settings, dataSourcesClient) {
-    var _a, e_2, _b, _c;
+    var _a, e_3, _b, _c;
     var _d, _e, _f, _g, _h, _j, _k;
     const startedAt = Date.now();
     const issues = [];
@@ -478,12 +578,12 @@ async function diagnoseGoogleMerchantConnection(client, settings, dataSourcesCli
                     disapprovedProductsCount += 1;
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
                 if (!_l && !_a && (_b = _m.return)) await _b.call(_m);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
     }
     catch (error) {

package/dist/plugin-server/services/google-platform-integration.service.d.ts

@@ -19,6 +19,7 @@ export declare class GooglePlatformIntegrationService {
     removeOrphanItems(ctx: RequestContext, items: RemoteProduct[]): Promise<void>;
     getAllProducts(ctx: RequestContext): Promise<RemoteProduct[]>;
     getConnectionDiagnostic(ctx: RequestContext): Promise<import("./google-merchant-api.js").GoogleMerchantConnectionDiagnostic>;
+    discoverGoogleMerchantDataSources(ctx: RequestContext, requestedMerchantId: string): Promise<string[]>;
     getGoogleProduct(ctx: RequestContext, { communicateID }: {
         communicateID: string;
     }): Promise<GoogleProcessedProduct | null>;

package/dist/plugin-server/services/google-platform-integration.service.js

@@ -100,6 +100,15 @@ let GooglePlatformIntegrationService = class GooglePlatformIntegrationService {
             await this.closeClients(clients);
         }
     }
+    async discoverGoogleMerchantDataSources(ctx, requestedMerchantId) {
+        const rawSettings = await this.connection
+            .getRepository(ctx, platform_integration_settings_entity_js_1.MerchantPlatformSettingsEntity)
+            .findOne({ relations: ["entries"], where: { platform: "google" } });
+        if (!rawSettings) {
+            throw new Error("Google Merchant settings not found");
+        }
+        return (0, google_merchant_api_js_1.discoverGoogleMerchantDataSources)(requestedMerchantId, rawSettings.entries);
+    }
     async getGoogleProduct(ctx, { communicateID }) {
         const authorization = await this.getAuthorization(ctx);
         try {

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

@@ -10,6 +10,11 @@ export declare const getMerchantPlatformSettings: TypedDocumentNode<{
 }, {} & {
     platform: string;
 }>;
+export declare const getGoogleMerchantDataSources: TypedDocumentNode<{
+    getGoogleMerchantDataSources: string[];
+}, {
+    merchantId: string;
+}>;
 export declare const getMerchantPlatformInfo: TypedDocumentNode<{
     getMerchantPlatformInfo?: {
         isValidConnection: boolean;

package/dist/plugin-ui/graphql/queries.js

@@ -10,6 +10,11 @@ export const getMerchantPlatformSettings = query({
         merchantPlatformSettingsSelector,
     ],
 });
+export const getGoogleMerchantDataSources = gql `
+  query GetGoogleMerchantDataSources($merchantId: String!) {
+    getGoogleMerchantDataSources(merchantId: $merchantId)
+  }
+`;
 export const getMerchantPlatformInfo = query({
     getMerchantPlatformInfo: [
         { platform: $("platform", "String!") },

package/dist/plugin-ui/locales/en/index.d.ts

@@ -27,6 +27,13 @@ declare const _default: {
         title: string;
         merchantId: string;
         dataSource: string;
+        dataSourceDiscovery: {
+            discover: string;
+            loading: string;
+            empty: string;
+            error: string;
+            select: string;
+        };
         contentLanguage: string;
         feedLabel: string;
         credentials: string;

package/dist/plugin-ui/locales/en/merchant.json

@@ -27,6 +27,13 @@
         "title": "Google Merchant",
         "merchantId": "Merchant ID",
         "dataSource": "Data source",
+        "dataSourceDiscovery": {
+            "discover": "Discover data sources",
+            "loading": "Discovering data sources…",
+            "empty": "No data sources were found for the entered Merchant account.",
+            "error": "Data sources could not be discovered. Check the Merchant ID and saved credentials.",
+            "select": "Select a discovered data source"
+        },
         "contentLanguage": "Content language",
         "feedLabel": "Feed label",
         "credentials": "Google account credentials",

package/dist/plugin-ui/locales/pl/index.d.ts

@@ -27,6 +27,13 @@ declare const _default: {
         title: string;
         merchantId: string;
         dataSource: string;
+        dataSourceDiscovery: {
+            discover: string;
+            loading: string;
+            empty: string;
+            error: string;
+            select: string;
+        };
         contentLanguage: string;
         feedLabel: string;
         credentials: string;

package/dist/plugin-ui/locales/pl/merchant.json

@@ -27,6 +27,13 @@
         "title": "Google Merchant",
         "merchantId": "Identyfikator sprzedawcy",
         "dataSource": "Źródło danych",
+        "dataSourceDiscovery": {
+            "discover": "Wykryj źródła danych",
+            "loading": "Wykrywanie źródeł danych…",
+            "empty": "Nie znaleziono źródeł danych dla podanego konta Merchant.",
+            "error": "Nie udało się wykryć źródeł danych. Sprawdź identyfikator Merchant i zapisane dane logowania.",
+            "select": "Wybierz wykryte źródło danych"
+        },
         "contentLanguage": "Język treści",
         "feedLabel": "Etykieta pliku danych",
         "credentials": "Dane logowania konta Google",

package/dist/plugin-ui/pages/GooglePage.js

@@ -1,14 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState } from "react";
-import { Label, Input, PageBlock, useLazyQuery, useMutation, Checkbox, Button, useTranslation, } from "@deenruv/react-ui-devkit";
-import { getGoogleMerchantDiagnostic, getGoogleMerchantSyncHistory, getMerchantPlatformSettings, } from "../graphql/queries";
+import { useEffect, useRef, useState } from "react";
+import { Label, Input, PageBlock, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, useLazyQuery, useMutation, Checkbox, Button, useTranslation, } from "@deenruv/react-ui-devkit";
+import { getGoogleMerchantDiagnostic, getGoogleMerchantDataSources, getGoogleMerchantSyncHistory, getMerchantPlatformSettings, } from "../graphql/queries";
 import { removeOrphanItems, saveMerchantPlatformSettings, sendAllProductsToMerchantPlatform, } from "../graphql/mutations";
 import { toast } from "sonner";
 import { translationNS } from "../translation-ns.js";
+import { createGoogleDataSourceDiscoveryRequestTracker, isValidGoogleMerchantId, selectDiscoveredGoogleDataSource, } from "./google-data-source-discovery.js";
 export const GooglePage = () => {
     const { t, i18n } = useTranslation(translationNS);
     const [fetchMerchantPlatformSettings] = useLazyQuery(getMerchantPlatformSettings);
     const [fetchMerchantPlatformInfo] = useLazyQuery(getGoogleMerchantDiagnostic);
+    const [fetchGoogleMerchantDataSources] = useLazyQuery(getGoogleMerchantDataSources);
     const [fetchSyncHistory] = useLazyQuery(getGoogleMerchantSyncHistory);
     const [mutate] = useMutation(saveMerchantPlatformSettings);
     const [removeOldItems] = useMutation(removeOrphanItems);
@@ -19,6 +21,12 @@ export const GooglePage = () => {
         productsCount: 0,
         connectionStatus: false,
     });
+    const [discoveredDataSources, setDiscoveredDataSources] = useState([]);
+    const [discoveryAttempted, setDiscoveryAttempted] = useState(false);
+    const [discoveryError, setDiscoveryError] = useState(false);
+    const [isDiscoveringDataSources, setIsDiscoveringDataSources] = useState(false);
+    const discoveryRequestTracker = useRef(createGoogleDataSourceDiscoveryRequestTracker()).current;
+    const currentMerchantId = useRef("");
     const handleSelectedFile = (e) => {
         const file = e.target.files?.[0];
         if (file) {
@@ -112,6 +120,14 @@ export const GooglePage = () => {
     useEffect(() => {
         refetch();
     }, []);
+    useEffect(() => {
+        currentMerchantId.current = settingsForm.merchantId;
+        discoveryRequestTracker.invalidate();
+        setDiscoveredDataSources([]);
+        setDiscoveryAttempted(false);
+        setDiscoveryError(false);
+        setIsDiscoveringDataSources(false);
+    }, [settingsForm.merchantId]);
     const onSubmit = async (e) => {
         e.preventDefault();
         try {
@@ -139,6 +155,34 @@ export const GooglePage = () => {
             }));
         }
     };
+    const discoverDataSources = async () => {
+        const merchantId = settingsForm.merchantId.trim();
+        if (!isValidGoogleMerchantId(merchantId))
+            return;
+        const request = discoveryRequestTracker.begin(merchantId);
+        setDiscoveryAttempted(true);
+        setDiscoveryError(false);
+        setIsDiscoveringDataSources(true);
+        try {
+            const data = await fetchGoogleMerchantDataSources({ merchantId });
+            if (!discoveryRequestTracker.isCurrent(request, currentMerchantId.current)) {
+                return;
+            }
+            setDiscoveredDataSources(data.getGoogleMerchantDataSources);
+        }
+        catch {
+            if (!discoveryRequestTracker.isCurrent(request, currentMerchantId.current)) {
+                return;
+            }
+            setDiscoveredDataSources([]);
+            setDiscoveryError(true);
+        }
+        finally {
+            if (discoveryRequestTracker.isCurrent(request, currentMerchantId.current)) {
+                setIsDiscoveringDataSources(false);
+            }
+        }
+    };
     return (_jsx(PageBlock, { children: _jsxs("div", { style: { position: "relative" }, className: "flex flex-col p-4 relative max-w-[800px] mx-auto", children: [isLoading && (_jsx("div", { role: "status", "aria-label": t("common.loading"), style: {
                         position: "absolute",
                         top: 0,
@@ -157,13 +201,35 @@ export const GooglePage = () => {
                             alignItems: "center",
                             width: "42px",
                             height: "42px",
-                        }, className: "spinner" }) })), _jsx("h2", { className: "mb-4 text-xl font-semibold", children: t("google.title") }), loadError ? (_jsx("div", { className: "mb-4 rounded border border-red-400 p-3 text-red-700", role: "alert", children: t("common.settingsLoadFailed") })) : null, _jsxs("form", { className: "flex flex-col gap-4", onSubmit: onSubmit, children: [_jsxs("div", { className: "flex justify-between gap-4", children: [_jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("common.brand") }), _jsx(Input, { className: "w-full", value: settingsForm.brand, onChange: (e) => setSettingsForm({ ...settingsForm, brand: e.target.value }) })] }), _jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("google.merchantId") }), _jsx(Input, { className: "w-full", required: true, value: settingsForm.merchantId, onChange: (e) => setSettingsForm({
-                                                ...settingsForm,
-                                                merchantId: e.target.value,
-                                            }) })] })] }), _jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("google.dataSource") }), _jsx(Input, { className: "w-full", placeholder: "accounts/{merchantId}/dataSources/{id}", required: true, value: settingsForm.dataSource, onChange: (e) => setSettingsForm({
+                        }, className: "spinner" }) })), _jsx("h2", { className: "mb-4 text-xl font-semibold", children: t("google.title") }), loadError ? (_jsx("div", { className: "mb-4 rounded border border-red-400 p-3 text-red-700", role: "alert", children: t("common.settingsLoadFailed") })) : null, _jsxs("form", { className: "flex flex-col gap-4", onSubmit: onSubmit, children: [_jsxs("div", { className: "flex justify-between gap-4", children: [_jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("common.brand") }), _jsx(Input, { className: "w-full", value: settingsForm.brand, onChange: (e) => setSettingsForm({ ...settingsForm, brand: e.target.value }) })] }), _jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("google.merchantId") }), _jsx(Input, { className: "w-full", required: true, value: settingsForm.merchantId, onChange: (e) => {
+                                                currentMerchantId.current = e.target.value;
+                                                discoveryRequestTracker.invalidate();
+                                                setDiscoveredDataSources([]);
+                                                setDiscoveryAttempted(false);
+                                                setDiscoveryError(false);
+                                                setIsDiscoveringDataSources(false);
+                                                setSettingsForm({
+                                                    ...settingsForm,
+                                                    merchantId: e.target.value,
+                                                });
+                                            } })] })] }), _jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("google.dataSource") }), _jsx(Input, { className: "w-full", placeholder: "accounts/{merchantId}/dataSources/{id}", required: true, value: settingsForm.dataSource, onChange: (e) => setSettingsForm({
                                         ...settingsForm,
                                         dataSource: e.target.value,
-                                    }) })] }), _jsxs("div", { className: "flex justify-between gap-4", children: [_jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("google.contentLanguage") }), _jsx(Input, { required: true, value: settingsForm.contentLanguage, onChange: (e) => setSettingsForm({
+                                    }) }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Button, { disabled: isDiscoveringDataSources ||
+                                                !isValidGoogleMerchantId(settingsForm.merchantId), onClick: discoverDataSources, type: "button", children: isDiscoveringDataSources
+                                                ? t("google.dataSourceDiscovery.loading")
+                                                : t("google.dataSourceDiscovery.discover") }), discoveredDataSources.length > 0 ? (_jsxs(Select, { onValueChange: (selectedValue) => setSettingsForm((current) => ({
+                                                ...current,
+                                                dataSource: selectDiscoveredGoogleDataSource(current.dataSource, selectedValue, discoveredDataSources),
+                                            })), value: discoveredDataSources.includes(settingsForm.dataSource)
+                                                ? settingsForm.dataSource
+                                                : undefined, children: [_jsx(SelectTrigger, { className: "flex-1", children: _jsx(SelectValue, { placeholder: t("google.dataSourceDiscovery.select") }) }), _jsx(SelectContent, { children: discoveredDataSources.map((dataSource) => (_jsx(SelectItem, { value: dataSource, children: dataSource }, dataSource))) })] })) : null] }), _jsx("div", { "aria-live": "polite", className: "text-sm", children: discoveryError
+                                        ? t("google.dataSourceDiscovery.error")
+                                        : discoveryAttempted &&
+                                            !isDiscoveringDataSources &&
+                                            discoveredDataSources.length === 0
+                                            ? t("google.dataSourceDiscovery.empty")
+                                            : null })] }), _jsxs("div", { className: "flex justify-between gap-4", children: [_jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("google.contentLanguage") }), _jsx(Input, { required: true, value: settingsForm.contentLanguage, onChange: (e) => setSettingsForm({
                                                 ...settingsForm,
                                                 contentLanguage: e.target.value,
                                             }) })] }), _jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: t("google.feedLabel") }), _jsx(Input, { required: true, value: settingsForm.feedLabel, onChange: (e) => setSettingsForm({

package/dist/plugin-ui/pages/google-data-source-discovery.d.ts

@@ -0,0 +1,11 @@
+export type GoogleDataSourceDiscoveryRequest = {
+    generation: number;
+    merchantId: string;
+};
+export declare function isValidGoogleMerchantId(value: string): boolean;
+export declare function createGoogleDataSourceDiscoveryRequestTracker(): {
+    begin: (merchantId: string) => GoogleDataSourceDiscoveryRequest;
+    invalidate: () => void;
+    isCurrent: (request: GoogleDataSourceDiscoveryRequest, currentMerchantId: string) => boolean;
+};
+export declare function selectDiscoveredGoogleDataSource(currentValue: string, selectedValue: string, discoveredValues: readonly string[]): string;

package/dist/plugin-ui/pages/google-data-source-discovery.js

@@ -0,0 +1,21 @@
+const MERCHANT_ID_PATTERN = /^[1-9]\d*$/;
+export function isValidGoogleMerchantId(value) {
+    return MERCHANT_ID_PATTERN.test(value.trim());
+}
+export function createGoogleDataSourceDiscoveryRequestTracker() {
+    let generation = 0;
+    return {
+        begin: (merchantId) => ({
+            generation: ++generation,
+            merchantId: merchantId.trim(),
+        }),
+        invalidate: () => {
+            generation += 1;
+        },
+        isCurrent: (request, currentMerchantId) => request.generation === generation &&
+            request.merchantId === currentMerchantId.trim(),
+    };
+}
+export function selectDiscoveredGoogleDataSource(currentValue, selectedValue, discoveredValues) {
+    return discoveredValues.includes(selectedValue) ? selectedValue : currentValue;
+}

package/dist/plugin-ui/pages/google-data-source-discovery.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/plugin-ui/pages/google-data-source-discovery.spec.js

@@ -0,0 +1,34 @@
+import { print } from "graphql";
+import { describe, expect, it } from "vitest";
+import { getGoogleMerchantDataSources } from "../graphql/queries.js";
+import { createGoogleDataSourceDiscoveryRequestTracker, isValidGoogleMerchantId, selectDiscoveredGoogleDataSource, } from "./google-data-source-discovery.js";
+describe("Google data-source discovery selection", () => {
+    it("selects only a resource returned by discovery", () => {
+        const discovered = [
+            "accounts/123/dataSources/456",
+            "accounts/123/dataSources/789",
+        ];
+        expect(selectDiscoveredGoogleDataSource("accounts/123/dataSources/manual", "accounts/123/dataSources/789", discovered)).toBe("accounts/123/dataSources/789");
+        expect(selectDiscoveredGoogleDataSource("accounts/123/dataSources/manual", "accounts/999/dataSources/789", discovered)).toBe("accounts/123/dataSources/manual");
+    });
+    it("builds the raw typed discovery query without Zeus regeneration", () => {
+        expect(print(getGoogleMerchantDataSources)).toContain("getGoogleMerchantDataSources(merchantId: $merchantId)");
+    });
+    it("rejects blank or non-numeric account IDs", () => {
+        expect(isValidGoogleMerchantId("")).toBe(false);
+        expect(isValidGoogleMerchantId("123x")).toBe(false);
+        expect(isValidGoogleMerchantId(" 123 ")).toBe(true);
+    });
+    it("invalidates stale and overlapping discovery requests", () => {
+        const tracker = createGoogleDataSourceDiscoveryRequestTracker();
+        const first = tracker.begin("123");
+        const second = tracker.begin("123");
+        expect(tracker.isCurrent(first, "123")).toBe(false);
+        expect(tracker.isCurrent(second, "123")).toBe(true);
+        tracker.invalidate();
+        expect(tracker.isCurrent(second, "123")).toBe(false);
+        const third = tracker.begin("456");
+        expect(tracker.isCurrent(third, "123")).toBe(false);
+        expect(tracker.isCurrent(third, "456")).toBe(true);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deenruv/merchant-plugin",
-  "version": "1.0.17-dev.33",
+  "version": "1.0.17-dev.35",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -32,11 +32,11 @@
     "react-i18next": "^14.0.5",
     "recharts": "^2.12.7",
     "sonner": "^1.4.41",
-    "@deenruv/admin-types": "^1.0.17-dev.33",
-    "@deenruv/admin-ui": "^1.0.17-dev.33",
-    "@deenruv/react-ui-devkit": "^1.0.17-dev.33",
-    "@deenruv/common": "^1.0.17-dev.33",
-    "@deenruv/ui-devkit": "^1.0.17-dev.33"
+    "@deenruv/common": "^1.0.17-dev.35",
+    "@deenruv/admin-types": "^1.0.17-dev.35",
+    "@deenruv/admin-ui": "^1.0.17-dev.35",
+    "@deenruv/react-ui-devkit": "^1.0.17-dev.35",
+    "@deenruv/ui-devkit": "^1.0.17-dev.35"
   },
   "devDependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
@@ -48,7 +48,7 @@
     "rimraf": "^5.0.10",
     "tslib": "^2.6.2",
     "typescript": "5.3.3",
-    "@deenruv/core": "^1.0.17-dev.33"
+    "@deenruv/core": "^1.0.17-dev.35"
   },
   "peerDependencies": {
     "@deenruv/core": "^1.0.0 || ^1.0.17-dev.0"