@manta-eu/react 0.8.0 → 0.9.0

package/src/routes/datastores/index.tsx

@@ -11,6 +11,7 @@ import {
   useRenameDatastoreGroupMutation,
   useRestoreDatastoreMutation,
   useUnlinkedDatastoresQuery,
+  type GQLRegisterDatastoreMutationVariables,
 } from "@manta-eu/client";
 import { enableDatastoreRemoval } from "@manta-eu/client/shared/constants";
 import { deriveDatastoreId } from "@manta-eu/client/shared/datastore-id";
@@ -18,7 +19,7 @@ import { parseError } from "@manta-eu/client/shared/error-utils";
 import { namesAGroup, pathSegments } from "@manta-eu/client/shared/team";
 import { activeRealm } from "@manta-eu/ldo/realm";
 import { isPresent } from "@manta-eu/lib/present";
-import { useQueryClient } from "@tanstack/react-query";
+import { useMutationState, useQueryClient } from "@tanstack/react-query";
 import type { SortingState } from "@tanstack/react-table";
 import { Archive, Database, EyeOff, type LucideIcon, Plus, RefreshCcw, TriangleAlert } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
@@ -34,12 +35,16 @@ import { RenameDatastoreGroupDialog } from "./components/RenameDatastoreGroupDia
 import { UnlinkedDatastoresPanel } from "./components/UnlinkedDatastoresPanel";
 import {
   existingOrganizationNameKeys,
+  hiddenRemovedRowCount,
   hiddenRowCount,
   matchesProviderFilter,
   nestedDatastoreNamesByRowId,
+  organizationGroupPaths,
   organizationNameKey,
   organizationNames,
+  outsideRemovedSubtrees,
   realmDefaultRow,
+  removedSubtreeRowIds,
   toDatastoreRows,
   unlinkedDatastoreRow,
   visibilityForStatusFilter,
@@ -75,6 +80,8 @@ import { useMantaClient } from "#providers/index";
 
 const realmDatastoreId = activeRealm();
 
+const registerDatastoreMutationKey = ["RegisterDatastore"];
+
 type ActiveTab = "organizations" | "unlinked";
 
 const tabLabels: Record<ActiveTab, string> = {
@@ -233,17 +240,37 @@ export function DatastoresRoute() {
   });
 
   const registerMutation = useRegisterDatastoreMutation(mantaClient, {
-    onSuccess: (result) => {
+    mutationKey: registerDatastoreMutationKey,
+    onSuccess: async (result, variables) => {
       // "Not registered" is treated as settled, so status polling stopped - force a re-check.
-      void queryClient.invalidateQueries({ queryKey: ["DatastoreProvisioningStatuses"] });
-      if (result.registerDatastore.success) toast.success("Datastore registered");
-      else toast.error("Couldn't register the datastore", { description: result.registerDatastore.error ?? undefined });
+      await refreshDatastores();
+      const { success, error, pending } = result.registerDatastore;
+      if (!success) {
+        toast.error("Couldn't build the datastore", { description: error ?? undefined });
+        return;
+      }
+
+      if (pending) {
+        toast.success(`Datastore "${variables.datastoreId}" is being built`, {
+          description: "It is taking longer than usual, and becomes available once its knowledge graph is built.",
+        });
+      } else {
+        toast.success(`Datastore "${variables.datastoreId}" is registered and built`);
+      }
     },
     onError: (error) => {
-      const info = parseError(error, "Couldn't register the datastore");
+      const info = parseError(error, "Couldn't build the datastore");
       toast.error(info.message, { description: info.description });
     },
   });
+  const registeringIds = useMutationState({
+    filters: { mutationKey: registerDatastoreMutationKey, status: "pending" },
+    select: (mutation) => (mutation.state.variables as GQLRegisterDatastoreMutationVariables | undefined)?.datastoreId,
+  });
+  const registeringDatastoreIds = useMemo(
+    () => new Set(registeringIds.filter((id): id is string => id !== undefined)),
+    [registeringIds],
+  );
 
   const renameMutation = useRenameDatastoreGroupMutation(mantaClient, {
     onSuccess: (result) => {
@@ -313,7 +340,7 @@ export function DatastoresRoute() {
     [data],
   );
   const unlinkedRows = useMemo(
-    () => (unlinkedData?.unlinkedDatastores ?? []).map((entry) => unlinkedDatastoreRow(entry.id)),
+    () => (unlinkedData?.unlinkedDatastores ?? []).map((entry) => unlinkedDatastoreRow(entry.id, entry.built)),
     [unlinkedData],
   );
   const allRows = useMemo(() => [...treeRows, ...unlinkedRows], [treeRows, unlinkedRows]);
@@ -323,6 +350,9 @@ export function DatastoresRoute() {
     () => hiddenRowCount(treeRows, visibility, "showUnprovisioned", rows.length),
     [treeRows, visibility, rows.length],
   );
+  const archivedCount = useMemo(() => hiddenRemovedRowCount(treeRows, visibility), [treeRows, visibility]);
+  const groupPathsByOrganization = useMemo(() => organizationGroupPaths(treeRows), [treeRows]);
+  const removedSubtreeIds = useMemo(() => removedSubtreeRowIds(treeRows), [treeRows]);
   const providerLinkEnabled = linkingQuery.data?.organizationLinking?.linkEnabled;
   const linkingUnreadable = linkingQuery.isError || linkingQuery.data?.organizationLinking === null;
   const tableRows = useMemo(
@@ -331,7 +361,7 @@ export function DatastoresRoute() {
   );
   const unlinkedCount = unlinkedRows.length;
   const existingOrganizationNames = useMemo(() => existingOrganizationNameKeys(allRows), [allRows]);
-  const organizationNameOptions = useMemo(() => organizationNames(allRows), [allRows]);
+  const organizationNameOptions = useMemo(() => organizationNames(outsideRemovedSubtrees(allRows)), [allRows]);
   // Mirrors provisionDatastore's assertDatastoreIdAvailable (Infisical folder-per-id is global,
   // not scoped to siblings), so a slug collision is caught before the server round-trip.
   const existingDatastoreIds = useMemo(
@@ -354,7 +384,7 @@ export function DatastoresRoute() {
   );
   const suggestedMatchByDatastoreId = useMemo(() => {
     const matches: Record<string, DatastoreRow> = {};
-    for (const row of treeRows) {
+    for (const row of outsideRemovedSubtrees(treeRows)) {
       if (isPresent(row.datastoreId)) continue;
       const derived = derivedIdForRow(row);
       if (unlinkedIdSet.has(derived)) matches[derived] ??= row;
@@ -383,7 +413,7 @@ export function DatastoresRoute() {
 
   const matchableRowIds = useMemo(() => {
     const ids = new Set<string>();
-    for (const row of allRows) {
+    for (const row of outsideRemovedSubtrees(allRows)) {
       if (!isPresent(row.datastoreId) && unlinkedIdSet.has(derivedIdForRow(row))) ids.add(row.id);
     }
     return ids;
@@ -410,7 +440,11 @@ export function DatastoresRoute() {
       void queryClient.invalidateQueries({ queryKey: useUnlinkedDatastoresQuery.getKey() });
       void queryClient.invalidateQueries({ queryKey: ["DatastoreProvisioningStatuses"] });
       if (result.linkUnlinkedDatastore.success) {
-        toast.success(`Linked to the existing datastore "${result.linkUnlinkedDatastore.datastoreId}"`);
+        toast.success(
+          result.linkUnlinkedDatastore.pending
+            ? `Linked to "${result.linkUnlinkedDatastore.datastoreId}", which is still being built`
+            : `Linked to the existing datastore "${result.linkUnlinkedDatastore.datastoreId}"`,
+        );
         toastProviderWarning(result.linkUnlinkedDatastore.providerWarning);
       } else {
         toast.error("Couldn't link the existing datastore", {
@@ -471,7 +505,9 @@ export function DatastoresRoute() {
 
   const onRegister = useCallback(
     (row: DatastoreRow) => {
-      if (isPresent(row.datastoreId)) registerMutation.mutate({ datastoreId: row.datastoreId });
+      if (isPresent(row.datastoreId)) {
+        registerMutation.mutate({ datastoreId: row.datastoreId, launchProvisioning: true });
+      }
     },
     [registerMutation.mutate],
   );
@@ -524,6 +560,8 @@ export function DatastoresRoute() {
     onRestore,
     onRename: setRenameTarget,
     onRegister,
+    registeringDatastoreIds,
+    removedSubtreeRowIds: removedSubtreeIds,
     onManageUsers,
     onManageCustomApps,
     onBringOnline,
@@ -545,7 +583,19 @@ export function DatastoresRoute() {
             onToggle: () => toggleVisibility("showArchived"),
           },
         ]
-      : []),
+      : showArchived || archivedCount > 0
+        ? [
+            {
+              key: "archived",
+              label: showArchived ? "Hide removed" : `Show removed (${archivedCount})`,
+              description:
+                "Out of use: a permanent delete stopped partway, or they were removed before removal was turned off.",
+              icon: showArchived ? EyeOff : Archive,
+              active: showArchived,
+              onToggle: () => toggleVisibility("showArchived"),
+            },
+          ]
+        : []),
     ...(showUnprovisioned || unprovisionedCount > 0
       ? [
           {
@@ -813,6 +863,7 @@ export function DatastoresRoute() {
           datastoreId={linkDialogTarget}
           suggestedMatch={suggestedLinkTarget(linkDialogTarget)}
           organizationNames={organizationNameOptions}
+          groupPathsByOrganization={groupPathsByOrganization}
           existingOrganizationNames={existingOrganizationNames}
           onClose={() => setLinkDialogTarget(null)}
         />

package/src/routes/integrations/components/connect-forms/GoogleMerchantCenterConnectForm.tsx

@@ -0,0 +1,61 @@
+import {
+  GQLIntegration,
+  useGoogleMerchantCenterSetupConnectMutation,
+  useGoogleMerchantCenterSetupProgressQuery,
+  type GQLGoogleMerchantCenterAccount,
+} from "@manta-eu/client";
+import { useQueryClient } from "@tanstack/react-query";
+import { googleMerchantCenterTreeItems } from "./google-merchant-center-account-tree";
+import { OAuthSetupConnectForm, type OAuthSetup, type SetupCopy } from "./OAuthSetupConnectForm";
+import type { ConnectFormProps } from "./types";
+import { useMantaClient } from "#providers/index";
+
+const copy: SetupCopy = {
+  providerName: "Merchant Center",
+  identityProviderName: "Google",
+  entitySingular: "account",
+  entityPlural: "accounts",
+  signInDescription:
+    "We'll take you to Google sign-in so you can grant Manta access to your Google Merchant Center accounts.",
+  pickTitle: "Pick the Merchant Center accounts to connect",
+  pickDescription:
+    "Choose the accounts whose products Manta should manage. An advanced account only groups its sub-accounts, so connect the sub-accounts. An account whose latest terms aren't accepted yet can be connected once they are accepted in Merchant Center.",
+  noEntitiesLabel:
+    "We couldn't find any Merchant Center accounts on this Google identity. Sign in with a different account or check your Merchant Center access.",
+  noneConnectableLabel:
+    "No connectable Merchant Center accounts remain on this Google identity — they are already connected or unavailable. Sign in with a different Google account to connect a new one.",
+};
+
+function useGoogleMerchantCenterSetup(): OAuthSetup<GQLGoogleMerchantCenterAccount> {
+  const { mantaClient } = useMantaClient();
+  const queryClient = useQueryClient();
+  const progressQuery = useGoogleMerchantCenterSetupProgressQuery(mantaClient, undefined, { staleTime: 0 });
+  const connectMutation = useGoogleMerchantCenterSetupConnectMutation(mantaClient);
+  const progress = progressQuery.data?.googleMerchantCenterSetupProgress;
+
+  return {
+    progress: progress && { state: progress.state, rows: progress.accounts, lastError: progress.lastError },
+    refetchProgress: progressQuery.refetch,
+    resetProgress: () =>
+      queryClient.setQueryData(useGoogleMerchantCenterSetupProgressQuery.getKey(), {
+        googleMerchantCenterSetupProgress: { state: [], accounts: null, lastError: null },
+      }),
+    connect: async (accountIds) => (await connectMutation.mutateAsync({ accountIds })).googleMerchantCenterSetupConnect,
+    isConnecting: connectMutation.isPending,
+  };
+}
+
+export function GoogleMerchantCenterConnectForm(props: ConnectFormProps) {
+  const setup = useGoogleMerchantCenterSetup();
+
+  return (
+    <OAuthSetupConnectForm
+      {...props}
+      integration={GQLIntegration.GoogleMerchantCenter}
+      oauthStartPath="/oauth/google-merchant-center/start"
+      copy={copy}
+      setup={setup}
+      treeItems={googleMerchantCenterTreeItems}
+    />
+  );
+}

package/src/routes/integrations/components/connect-forms/google-merchant-center-account-tree.ts

@@ -0,0 +1,38 @@
+import type { GQLGoogleMerchantCenterAccount } from "@manta-eu/client";
+import { isPresent } from "@manta-eu/lib/present";
+import { unavailableReasonLabel } from "./setup-account-unavailable-reason";
+import { buildTreeRows, type TreeSelectItem } from "#components/tree-multi-select/index";
+
+function rowHint(
+  row: GQLGoogleMerchantCenterAccount,
+  alreadyConnected: boolean,
+  reconnectable: boolean,
+): string | undefined {
+  if (row.advanced === true) return "Advanced account";
+  if (row.isConnectable !== true) return unavailableReasonLabel(row.unavailableReason);
+  if (reconnectable) return "Reconnect";
+  if (alreadyConnected) return "Already connected";
+  if (row.testAccount === true) return "Test account";
+  return undefined;
+}
+
+export function googleMerchantCenterTreeItems(
+  rows: GQLGoogleMerchantCenterAccount[],
+  alreadyConnectedExternalIds: ReadonlySet<string>,
+  reconnectableExternalIds: ReadonlySet<string> = new Set(),
+): TreeSelectItem[] {
+  return buildTreeRows(rows).map(({ node, depth }) => {
+    const reconnectable = isPresent(node.externalId) && reconnectableExternalIds.has(node.externalId);
+    const alreadyConnected =
+      !reconnectable && isPresent(node.externalId) && alreadyConnectedExternalIds.has(node.externalId);
+    return {
+      id: node.id,
+      label: node.name ?? node.externalId ?? node.id,
+      caption: node.name != null ? (node.externalId ?? undefined) : undefined,
+      hint: rowHint(node, alreadyConnected, reconnectable),
+      selectable: node.isConnectable === true,
+      disabled: alreadyConnected,
+      depth,
+    };
+  });
+}

package/src/routes/integrations/components/connect-forms/setup-account-unavailable-reason.ts

@@ -3,6 +3,7 @@ import { isPresent } from "@manta-eu/lib/present";
 
 const unavailableReasonLabels: Record<GQLSetupAccountUnavailableReason, string> = {
   [GQLSetupAccountUnavailableReason.InsufficientPermissions]: "Insufficient permissions",
+  [GQLSetupAccountUnavailableReason.TermsNotAccepted]: "Accept the latest terms in Merchant Center",
 };
 
 export function unavailableReasonLabel(reason: GQLSetupAccountUnavailableReason | null | undefined): string {

package/src/routes/integrations/connect-forms.ts

@@ -11,6 +11,7 @@ export { FigmaConnectForm } from "./components/connect-forms/FigmaConnectForm";
 export { GmailConnectForm } from "./components/connect-forms/GmailConnectForm";
 export { GoogleAdsConnectForm } from "./components/connect-forms/GoogleAdsConnectForm";
 export { GoogleAnalyticsConnectForm } from "./components/connect-forms/GoogleAnalyticsConnectForm";
+export { GoogleMerchantCenterConnectForm } from "./components/connect-forms/GoogleMerchantCenterConnectForm";
 export { KlaviyoConnectForm } from "./components/connect-forms/KlaviyoConnectForm";
 export { LinkedinConnectForm } from "./components/connect-forms/LinkedinConnectForm";
 export { MetaAdsConnectForm } from "./components/connect-forms/MetaAdsConnectForm";

package/src/routes/integrations/connection-view.ts

@@ -42,6 +42,7 @@ const oauthAccountNoun = {
   [GQLIntegration.Slack]: "Workspace",
   [GQLIntegration.Google]: "Customer",
   [GQLIntegration.GoogleAnalytics]: "Property",
+  [GQLIntegration.GoogleMerchantCenter]: "Account",
   [GQLIntegration.Meta]: "Ad account",
   [GQLIntegration.Linkedin]: "Ad account",
   [GQLIntegration.MicrosoftAds]: "Account",

package/src/rules/datalog-ast/DatalogBodyFormulaComponent.tsx

@@ -1,4 +1,4 @@
-/* eslint-disable @manta-eu/no-theme-primitive-colors */
+/* oxlint-disable @manta-eu/no-theme-primitive-colors */
 
 import type {
   AggregateBinding,

package/src/rules/datalog-ast/DatalogTermComponent.tsx

@@ -1,4 +1,4 @@
-/* eslint-disable @manta-eu/no-theme-primitive-colors */
+/* oxlint-disable @manta-eu/no-theme-primitive-colors */
 
 import type { DatalogTerm } from "@manta-eu/datalog-parser";
 import { compactUri } from "@manta-eu/rdf-lib/namespaces";

package/src/shacl/shacl-form-types.ts

@@ -41,7 +41,7 @@ declare module "@ulb-darmstadt/shacl-form" {
 }
 
 declare module "react" {
-  // eslint-disable-next-line @typescript-eslint/no-namespace -- augmenting JSX needs a namespace.
+  // oxlint-disable-next-line typescript/no-namespace -- augmenting JSX needs a namespace.
   namespace JSX {
     interface IntrinsicElements {
       "shacl-form": import("react").DetailedHTMLProps<

package/src/shared/graph-derived-queries.ts

@@ -10,6 +10,7 @@ import {
   useCurrentFactValueQuery,
   useExplainFactQuery,
   useGetActionPlansSummaryQuery,
+  useManualActionProgressQuery,
   useMemoriesQuery,
   useMemorySchemasQuery,
   useNodePropertiesQuery,
@@ -36,6 +37,7 @@ export const graphDerivedQueries: QueryWithGetKey[] = [
   useCurrentFactValueQuery,
   useExplainFactQuery,
   useGetActionPlansSummaryQuery,
+  useManualActionProgressQuery,
   useMemoriesQuery,
   useMemorySchemasQuery,
   useNodePropertiesQuery,

package/src/style.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @manta-eu/no-direct-clsx */
+/* oxlint-disable @manta-eu/no-direct-clsx */
 import clsx, { type ClassValue } from "clsx";
 import { twMerge, type ClassNameValue } from "tailwind-merge";
 

package/src/templates/slack-to-markdown.ts

@@ -19,7 +19,7 @@ export function slackToMarkdown(input: string): string {
 
   output = output.replace(/([^\n])\n(?!\n)/g, "$1  \n");
 
-  // eslint-disable-next-line no-control-regex -- NUL delimits the code placeholders this file writes.
+  // oxlint-disable-next-line no-control-regex -- NUL delimits the code placeholders this file writes.
   output = output.replace(/\x00CODE(\d+)\x00/g, (_, i) => placeholders[Number(i)]!);
 
   return output;