@open-mercato/core 0.7.1-develop.7153.1.7145d295e6 → 0.7.1-develop.7170.1.d95074d7ba

package/dist/modules/integrations/backend/integrations/[id]/page.js

@@ -2,7 +2,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import { extensionPoints } from "@open-mercato/core/modules/integrations/extension-points";
-import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { z } from "zod";
 import { Page, PageBody } from "@open-mercato/ui/backend/Page";
 import { CrudForm } from "@open-mercato/ui/backend/CrudForm";
@@ -166,16 +166,6 @@ const CATEGORY_ICONS = {
   storage: HardDrive,
   webhook: Webhook
 };
-function resolveRouteId(value) {
-  if (Array.isArray(value)) return value[0];
-  return value;
-}
-function resolvePathnameId(pathname) {
-  const parts = pathname.split("/").filter(Boolean);
-  const integrationId = parts.at(-1);
-  if (!integrationId || integrationId === "integrations" || integrationId === "bundle") return void 0;
-  return decodeURIComponent(integrationId);
-}
 function buildCredentialFields(credFields, secretFieldsConfigured, t) {
   return credFields.map((field) => {
     const baseDescription = field.helpDetails ? /* @__PURE__ */ jsxs("div", { className: "space-y-1", children: [
@@ -282,10 +272,9 @@ function splitLogPayload(payload) {
   return { inlineEntries, nestedEntries };
 }
 function IntegrationDetailPage({ params }) {
-  const pathname = usePathname();
   const router = useRouter();
   const searchParams = useSearchParams();
-  const integrationId = resolveRouteId(params?.id) ?? resolvePathnameId(pathname);
+  const integrationId = params?.id;
   const t = useT();
   const [detail, setDetail] = React.useState(null);
   const [isLoading, setIsLoading] = React.useState(true);
@@ -311,13 +300,9 @@ function IntegrationDetailPage({ params }) {
     isLoading: isLoadingCredentialsAccess,
     canManageCredentials
   } = useIntegrationCredentialsFeatureAccess();
-  const resolveCurrentIntegrationId = React.useCallback(() => {
-    return integrationId ?? (typeof window !== "undefined" ? resolvePathnameId(window.location.pathname) : void 0);
-  }, [integrationId]);
   const loadDetail = React.useCallback(async (options) => {
     const showLoading = options?.showLoading ?? true;
-    const currentIntegrationId = resolveCurrentIntegrationId();
-    if (!currentIntegrationId) {
+    if (!integrationId) {
       if (showLoading) setIsLoading(false);
       if (showLoading) setError(t("integrations.detail.loadError", "Failed to load integration"));
       return;
@@ -327,7 +312,7 @@ function IntegrationDetailPage({ params }) {
     if (showLoading) setIsLoading(true);
     try {
       const call = await apiCall(
-        `/api/integrations/${encodeURIComponent(currentIntegrationId)}`,
+        `/api/integrations/${encodeURIComponent(integrationId)}`,
         void 0,
         { fallback: null }
       );
@@ -347,12 +332,11 @@ function IntegrationDetailPage({ params }) {
       if (showLoading) setError(t("integrations.detail.loadError", "Failed to load integration"));
       if (showLoading) setIsLoading(false);
     }
-  }, [resolveCurrentIntegrationId, t]);
+  }, [integrationId, t]);
   const loadCredentials = React.useCallback(async () => {
-    const currentIntegrationId = resolveCurrentIntegrationId();
-    if (!currentIntegrationId) return;
+    if (!integrationId) return;
     const call = await apiCall(
-      `/api/integrations/${encodeURIComponent(currentIntegrationId)}/credentials`,
+      `/api/integrations/${encodeURIComponent(integrationId)}/credentials`,
       { headers: credentialsRequestHeaders },
       { fallback: null }
     );
@@ -362,7 +346,7 @@ function IntegrationDetailPage({ params }) {
     }
     if (call.ok && call.result?.credentials) {
       const next = { ...call.result.credentials };
-      if (currentIntegrationId === "storage_s3") {
+      if (integrationId === "storage_s3") {
         const authMode = next.authMode;
         if (authMode !== "access_keys" && authMode !== "ambient") {
           const hasKeys = Boolean(next.accessKeyId || next.secretAccessKey);
@@ -372,12 +356,11 @@ function IntegrationDetailPage({ params }) {
       setCredValues(next);
       setCredentialsFormKey((current) => current + 1);
     }
-  }, [resolveCurrentIntegrationId]);
+  }, [integrationId]);
   const loadLogs = React.useCallback(async () => {
-    const currentIntegrationId = resolveCurrentIntegrationId();
-    if (!currentIntegrationId) return;
+    if (!integrationId) return;
     setIsLoadingLogs(true);
-    const params2 = new URLSearchParams({ integrationId: currentIntegrationId, pageSize: "50" });
+    const params2 = new URLSearchParams({ integrationId, pageSize: "50" });
     if (logLevel) params2.set("level", logLevel);
     const call = await apiCall(
       `/api/integrations/logs?${params2.toString()}`,
@@ -388,7 +371,7 @@ function IntegrationDetailPage({ params }) {
       setLogs(call.result.items);
     }
     setIsLoadingLogs(false);
-  }, [logLevel, resolveCurrentIntegrationId]);
+  }, [logLevel, integrationId]);
   const detailWidgetSpotId = React.useMemo(
     () => resolveIntegrationDetailWidgetSpotId(detail?.integration ?? null, extensionPoints.hosts.legacyDetailTabs.spotId),
     [detail?.integration]
@@ -523,16 +506,15 @@ function IntegrationDetailPage({ params }) {
     void loadLogs();
   }, [loadLogs]);
   const handleToggleState = React.useCallback(async (enabled) => {
-    const currentIntegrationId = resolveCurrentIntegrationId();
-    if (!currentIntegrationId) return;
+    if (!integrationId) return;
     setIsTogglingState(true);
     try {
       const call = await runMutationWithContext({
         actionId: "toggle-state",
-        mutationPayload: { integrationId: currentIntegrationId, isEnabled: enabled },
+        mutationPayload: { integrationId, isEnabled: enabled },
         operation: () => withScopedApiRequestHeaders(
           buildOptimisticLockHeader(detail?.state.updatedAt),
-          () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/state`, {
+          () => apiCall(`/api/integrations/${encodeURIComponent(integrationId)}/state`, {
             method: "PUT",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify({ isEnabled: enabled })
@@ -558,15 +540,14 @@ function IntegrationDetailPage({ params }) {
     } finally {
       setIsTogglingState(false);
     }
-  }, [detail?.state.updatedAt, refreshDetail, resolveCurrentIntegrationId, runMutationWithContext, t]);
+  }, [detail?.state.updatedAt, refreshDetail, integrationId, runMutationWithContext, t]);
   const handleSaveCredentials = React.useCallback(async (values) => {
-    const currentIntegrationId = resolveCurrentIntegrationId();
-    if (!currentIntegrationId) return;
+    if (!integrationId) return;
     setIsSavingCredentials(true);
     try {
       const credentialFields = detail?.integration.credentials?.fields ?? detail?.bundle?.credentials?.fields ?? [];
       const savePayload = buildIntegrationCredentialSavePayload(
-        currentIntegrationId,
+        integrationId,
         values,
         credentialFields,
         secretFieldsConfigured
@@ -574,10 +555,10 @@ function IntegrationDetailPage({ params }) {
       const call = await runMutationWithContext({
         actionId: "save-credentials",
         tabId: "credentials",
-        mutationPayload: { integrationId: currentIntegrationId, ...savePayload },
+        mutationPayload: { integrationId, ...savePayload },
         operation: () => withScopedApiRequestHeaders(
           buildOptimisticLockHeader(credentialsUpdatedAt),
-          () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/credentials`, {
+          () => apiCall(`/api/integrations/${encodeURIComponent(integrationId)}/credentials`, {
             method: "PUT",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify(savePayload)
@@ -597,18 +578,17 @@ function IntegrationDetailPage({ params }) {
     } finally {
       setIsSavingCredentials(false);
     }
-  }, [credentialsUpdatedAt, detail, loadCredentials, resolveCurrentIntegrationId, runMutationWithContext, secretFieldsConfigured, t]);
+  }, [credentialsUpdatedAt, detail, loadCredentials, integrationId, runMutationWithContext, secretFieldsConfigured, t]);
   const handleVersionChange = React.useCallback(async (version) => {
-    const currentIntegrationId = resolveCurrentIntegrationId();
-    if (!currentIntegrationId) return;
+    if (!integrationId) return;
     try {
       const call = await runMutationWithContext({
         actionId: "change-version",
         tabId: "version",
-        mutationPayload: { integrationId: currentIntegrationId, apiVersion: version },
+        mutationPayload: { integrationId, apiVersion: version },
         operation: () => withScopedApiRequestHeaders(
           buildOptimisticLockHeader(detail?.state.updatedAt),
-          () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/version`, {
+          () => apiCall(`/api/integrations/${encodeURIComponent(integrationId)}/version`, {
             method: "PUT",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify({ apiVersion: version })
@@ -625,18 +605,17 @@ function IntegrationDetailPage({ params }) {
     } catch {
       flash(t("integrations.detail.version.saveError"), "error");
     }
-  }, [detail?.state.updatedAt, refreshDetail, resolveCurrentIntegrationId, runMutationWithContext, t]);
+  }, [detail?.state.updatedAt, refreshDetail, integrationId, runMutationWithContext, t]);
   const handleHealthCheck = React.useCallback(async () => {
-    const currentIntegrationId = resolveCurrentIntegrationId();
-    if (!currentIntegrationId) return;
+    if (!integrationId) return;
     setIsCheckingHealth(true);
     try {
       const call = await runMutationWithContext({
         actionId: "run-health-check",
         tabId: "health",
-        mutationPayload: { integrationId: currentIntegrationId },
+        mutationPayload: { integrationId },
         operation: () => apiCall(
-          `/api/integrations/${encodeURIComponent(currentIntegrationId)}/health`,
+          `/api/integrations/${encodeURIComponent(integrationId)}/health`,
           { method: "POST" },
           { fallback: null }
         )
@@ -663,7 +642,7 @@ function IntegrationDetailPage({ params }) {
     } finally {
       setIsCheckingHealth(false);
     }
-  }, [refreshLogs, resolveCurrentIntegrationId, runMutationWithContext, t]);
+  }, [refreshLogs, integrationId, runMutationWithContext, t]);
   const hasVersions = Boolean(detail?.integration.apiVersions?.length);
   const integration = detail?.integration ?? null;
   const state = detail?.state ?? null;
@@ -794,17 +773,16 @@ function IntegrationDetailPage({ params }) {
     setActiveTab(resolveRequestedIntegrationDetailTab(searchParams?.get("tab"), visibleTabIds));
   }, [searchParams, visibleTabIds]);
   const handleTabChange = React.useCallback((nextValue) => {
-    const currentIntegrationId = resolveCurrentIntegrationId();
     const nextTab = resolveRequestedIntegrationDetailTab(nextValue, visibleTabIds);
     setActiveTab(nextTab);
-    if (!currentIntegrationId) return;
-    const basePath = `/backend/integrations/${encodeURIComponent(currentIntegrationId)}`;
+    if (!integrationId) return;
+    const basePath = `/backend/integrations/${encodeURIComponent(integrationId)}`;
     const params2 = new URLSearchParams(searchParams?.toString() ?? "");
     if (nextTab === "credentials") params2.delete("tab");
     else params2.set("tab", nextTab);
     const query = params2.toString();
     router.replace(query ? `${basePath}?${query}` : basePath);
-  }, [resolveCurrentIntegrationId, router, searchParams, visibleTabIds]);
+  }, [integrationId, router, searchParams, visibleTabIds]);
   React.useEffect(() => {
     if (!runIdFromUrl) {
       setActiveRunDetail(null);