@open-mercato/core 0.7.0 → 0.7.1-develop.7102.1.b41f7e3e51

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

@@ -46,6 +46,10 @@ import {
   refreshIntegrationDetailPanels,
   refreshIntegrationRunActivityPanels
 } from "../detail-page-refresh.js";
+import {
+  buildCredentialEditValues,
+  buildIntegrationCredentialSavePayload
+} from "../credential-secret-fields.js";
 import { isValidCredentialUrl } from "../../../lib/credentials-field-validation.js";
 const UNSUPPORTED_CREDENTIAL_FIELD_TYPES = /* @__PURE__ */ new Set(["oauth", "ssh_keypair"]);
 function isEditableCredentialField(field) {
@@ -170,17 +174,22 @@ function resolvePathnameId(pathname) {
   if (!integrationId || integrationId === "integrations" || integrationId === "bundle") return void 0;
   return decodeURIComponent(integrationId);
 }
-function buildCredentialFields(credFields) {
+function buildCredentialFields(credFields, secretFieldsConfigured, t) {
   return credFields.map((field) => {
+    const baseDescription = field.helpDetails ? /* @__PURE__ */ jsxs("div", { className: "space-y-1", children: [
+      field.helpText ? /* @__PURE__ */ jsx("div", { children: field.helpText }) : null,
+      /* @__PURE__ */ jsx(WebhookSetupGuide, { guide: field.helpDetails })
+    ] }) : field.helpText;
+    const description = field.type === "secret" && secretFieldsConfigured[field.key] ? /* @__PURE__ */ jsxs("div", { className: "space-y-1", children: [
+      baseDescription ? /* @__PURE__ */ jsx("div", { children: baseDescription }) : null,
+      /* @__PURE__ */ jsx("p", { className: "text-xs text-muted-foreground", children: t("integrations.detail.credentials.secretConfigured") })
+    ] }) : baseDescription;
     const shared = {
       id: field.key,
       label: field.label,
-      description: field.helpDetails ? /* @__PURE__ */ jsxs("div", { className: "space-y-1", children: [
-        field.helpText ? /* @__PURE__ */ jsx("div", { children: field.helpText }) : null,
-        /* @__PURE__ */ jsx(WebhookSetupGuide, { guide: field.helpDetails, buttonLabel: "Show details" })
-      ] }) : field.helpText,
+      description,
       placeholder: field.placeholder,
-      required: field.required,
+      required: field.required && !(field.type === "secret" && secretFieldsConfigured[field.key]),
       visibleWhen: field.visibleWhen
     };
     if (field.type === "secret") {
@@ -194,7 +203,8 @@ function buildCredentialFields(credFields) {
             placeholder: field.placeholder,
             value: typeof value === "string" ? value : "",
             onChange: (event) => setValue(event.target.value),
-            disabled
+            disabled,
+            autoComplete: "new-password"
           }
         )
       };
@@ -280,6 +290,7 @@ function IntegrationDetailPage({ params }) {
   const [error, setError] = React.useState(null);
   const [isNotFound, setIsNotFound] = React.useState(false);
   const [credValues, setCredValues] = React.useState({});
+  const [secretFieldsConfigured, setSecretFieldsConfigured] = React.useState({});
   const [credentialsUpdatedAt, setCredentialsUpdatedAt] = React.useState(null);
   const [credentialsFormKey, setCredentialsFormKey] = React.useState(0);
   const [isSavingCredentials, setIsSavingCredentials] = React.useState(false);
@@ -341,6 +352,7 @@ function IntegrationDetailPage({ params }) {
     );
     if (call.ok && call.result) {
       setCredentialsUpdatedAt(call.result.updatedAt ?? null);
+      setSecretFieldsConfigured(call.result.secretFieldsConfigured ?? {});
     }
     if (call.ok && call.result?.credentials) {
       const next = { ...call.result.credentials };
@@ -546,34 +558,27 @@ function IntegrationDetailPage({ params }) {
     if (!currentIntegrationId) return;
     setIsSavingCredentials(true);
     try {
-      const sanitizedValues = { ...values };
-      if (currentIntegrationId === "storage_s3") {
-        const authMode = sanitizedValues.authMode;
-        if (authMode !== "access_keys" && authMode !== "ambient") {
-          const hasKeys = Boolean(sanitizedValues.accessKeyId || sanitizedValues.secretAccessKey);
-          sanitizedValues.authMode = hasKeys ? "access_keys" : "ambient";
-        }
-        if (sanitizedValues.authMode === "ambient") {
-          delete sanitizedValues.accessKeyId;
-          delete sanitizedValues.secretAccessKey;
-          delete sanitizedValues.sessionToken;
-        }
-      }
+      const credentialFields = detail?.integration.credentials?.fields ?? detail?.bundle?.credentials?.fields ?? [];
+      const savePayload = buildIntegrationCredentialSavePayload(
+        currentIntegrationId,
+        values,
+        credentialFields,
+        secretFieldsConfigured
+      );
       const call = await runMutationWithContext({
         actionId: "save-credentials",
         tabId: "credentials",
-        mutationPayload: { integrationId: currentIntegrationId, credentials: sanitizedValues },
+        mutationPayload: { integrationId: currentIntegrationId, ...savePayload },
         operation: () => withScopedApiRequestHeaders(
           buildOptimisticLockHeader(credentialsUpdatedAt),
           () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/credentials`, {
             method: "PUT",
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ credentials: sanitizedValues })
+            body: JSON.stringify(savePayload)
           }, { fallback: null })
         )
       });
       if (call.ok) {
-        setCredValues(sanitizedValues);
         setCredentialsFormKey((current) => current + 1);
         flash(t("integrations.detail.credentials.saved"), "success");
         void loadCredentials();
@@ -586,7 +591,7 @@ function IntegrationDetailPage({ params }) {
     } finally {
       setIsSavingCredentials(false);
     }
-  }, [credentialsUpdatedAt, loadCredentials, resolveCurrentIntegrationId, runMutationWithContext, t]);
+  }, [credentialsUpdatedAt, detail, loadCredentials, resolveCurrentIntegrationId, runMutationWithContext, secretFieldsConfigured, t]);
   const handleVersionChange = React.useCallback(async (version) => {
     const currentIntegrationId = resolveCurrentIntegrationId();
     if (!currentIntegrationId) return;
@@ -661,8 +666,12 @@ function IntegrationDetailPage({ params }) {
     [detail?.bundle?.credentials?.fields, detail?.integration.credentials?.fields]
   );
   const credentialFormFields = React.useMemo(
-    () => buildCredentialFields(editableCredentialFields),
-    [editableCredentialFields]
+    () => buildCredentialFields(editableCredentialFields, secretFieldsConfigured, t),
+    [editableCredentialFields, secretFieldsConfigured, t]
+  );
+  const credentialFormValues = React.useMemo(
+    () => buildCredentialEditValues(credValues, secretFieldsConfigured),
+    [credValues, secretFieldsConfigured]
   );
   const credentialSchema = React.useMemo(() => z.object({}).passthrough().superRefine((rawValues, ctx) => {
     const values = rawValues;
@@ -698,7 +707,7 @@ function IntegrationDetailPage({ params }) {
         return;
       }
       const normalizedValue = typeof value === "string" ? value : "";
-      if (field.required && normalizedValue.trim().length === 0) {
+      if (field.required && normalizedValue.trim().length === 0 && !(field.type === "secret" && secretFieldsConfigured[field.key])) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           path: [field.key],
@@ -727,7 +736,7 @@ function IntegrationDetailPage({ params }) {
         });
       }
     });
-  }), [editableCredentialFields, t]);
+  }), [editableCredentialFields, secretFieldsConfigured, t]);
   const latestHealthLog = React.useMemo(() => logs.find(isHealthLog) ?? null, [logs]);
   const latestOperationalLog = React.useMemo(
     () => logs.find((log) => typeof log.payload?.operationalStatus === "string" || typeof log.payload?.summary === "string") ?? null,
@@ -939,7 +948,7 @@ function IntegrationDetailPage({ params }) {
             entityId: "integrations.integration",
             schema: credentialSchema,
             fields: credentialFormFields,
-            initialValues: credValues,
+            initialValues: credentialFormValues,
             onSubmit: handleSaveCredentials,
             embedded: true,
             hideFooterActions: true