@postgres.ai/shared 4.0.2-pr-1148.1 → 4.0.2-pr-1200

package/pages/Instance/Configuration/PhysicalMode/EnvsEditor/index.js

@@ -1,6 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button, IconButton, TextField, Typography } from '@material-ui/core';
 import Box from '@mui/material/Box';
+// MASKED_ENV_VALUE is what the engine returns instead of a stored env value:
+// envs carry WAL-G and pgBackRest credentials, so GET /admin/config lists
+// the keys only. Posting the mask back for a key keeps the stored value.
+export const MASKED_ENV_VALUE = '****';
+export const isMaskedEnvValue = (value) => value === MASKED_ENV_VALUE;
+const MASKED_HINT = 'Stored on the server; kept unless you change it';
 // EnvsEditor renders a rows-of-key/value editor with add/remove and a
 // click-to-add suggestion list. Engine consumes envs as a free-form map
 // (physical.go:76, CopyOptions.Envs map[string]string); the UI is a thin
@@ -20,5 +26,6 @@ export const EnvsEditor = ({ envs, onChange, suggestions = [], disabled, keyErro
         onChange([...envs, { key, value: '' }]);
     };
     const usedKeys = new Set(envs.map((e) => e.key));
-    return (_jsxs(Box, { mt: 1, "data-testid": "envs-editor", children: [_jsx(Typography, { variant: "subtitle2", children: "Environment variables" }), envs.length === 0 ? (_jsx(Box, { mt: 1, mb: 1, children: _jsx(Typography, { variant: "caption", color: "textSecondary", children: "No environment variables set. Use suggestions below or click \"Add\"." }) })) : (envs.map((env, i) => (_jsxs(Box, { display: "flex", alignItems: "center", mt: 1, "data-testid": `envs-row-${i}`, children: [_jsx(TextField, { size: "small", label: "Name", value: env.key, disabled: disabled, error: Boolean(keyErrors[i]), helperText: keyErrors[i], onChange: (e) => updateRow(i, { key: e.target.value }), inputProps: { 'data-testid': `envs-key-${i}` } }), _jsx(Box, { mx: 1, children: _jsx(TextField, { size: "small", label: "Value", value: env.value, disabled: disabled, onChange: (e) => updateRow(i, { value: e.target.value }), inputProps: { 'data-testid': `envs-value-${i}` } }) }), _jsx(IconButton, { size: "small", "aria-label": "remove env", disabled: disabled, onClick: () => removeRow(i), "data-testid": `envs-remove-${i}`, children: "\u00D7" })] }, i)))), _jsx(Box, { mt: 1, children: _jsx(Button, { size: "small", variant: "outlined", disabled: disabled, onClick: () => addRow(), "data-testid": "envs-add", children: "+ Add" }) }), suggestions.length > 0 && (_jsxs(Box, { mt: 1, children: [_jsx(Typography, { variant: "caption", color: "textSecondary", children: "Suggestions:" }), _jsx(Box, { mt: 0.5, children: suggestions.map((s) => (_jsx(Button, { size: "small", variant: "text", disabled: disabled || usedKeys.has(s), onClick: () => addRow(s), "data-testid": `envs-suggest-${s}`, children: s }, s))) })] }))] }));
+    const hasMasked = envs.some((e) => isMaskedEnvValue(e.value));
+    return (_jsxs(Box, { mt: 1, "data-testid": "envs-editor", children: [_jsx(Typography, { variant: "subtitle2", children: "Environment variables" }), hasMasked && (_jsx(Box, { mt: 0.5, children: _jsxs(Typography, { variant: "caption", color: "textSecondary", "data-testid": "envs-masked-hint", children: ["Values shown as ", MASKED_ENV_VALUE, " are stored on the server and are kept unless you change them. Renaming such a variable requires entering its value again."] }) })), envs.length === 0 ? (_jsx(Box, { mt: 1, mb: 1, children: _jsx(Typography, { variant: "caption", color: "textSecondary", children: "No environment variables set. Use suggestions below or click \"Add\"." }) })) : (envs.map((env, i) => (_jsxs(Box, { display: "flex", alignItems: "center", mt: 1, "data-testid": `envs-row-${i}`, children: [_jsx(TextField, { size: "small", label: "Name", value: env.key, disabled: disabled, error: Boolean(keyErrors[i]), helperText: keyErrors[i], onChange: (e) => updateRow(i, { key: e.target.value }), inputProps: { 'data-testid': `envs-key-${i}` } }), _jsx(Box, { mx: 1, children: _jsx(TextField, { size: "small", label: "Value", value: env.value, disabled: disabled, helperText: isMaskedEnvValue(env.value) ? MASKED_HINT : undefined, onChange: (e) => updateRow(i, { value: e.target.value }), inputProps: { 'data-testid': `envs-value-${i}` } }) }), _jsx(IconButton, { size: "small", "aria-label": "remove env", disabled: disabled, onClick: () => removeRow(i), "data-testid": `envs-remove-${i}`, children: "\u00D7" })] }, i)))), _jsx(Box, { mt: 1, children: _jsx(Button, { size: "small", variant: "outlined", disabled: disabled, onClick: () => addRow(), "data-testid": "envs-add", children: "+ Add" }) }), suggestions.length > 0 && (_jsxs(Box, { mt: 1, children: [_jsx(Typography, { variant: "caption", color: "textSecondary", children: "Suggestions:" }), _jsx(Box, { mt: 0.5, children: suggestions.map((s) => (_jsx(Button, { size: "small", variant: "text", disabled: disabled || usedKeys.has(s), onClick: () => addRow(s), "data-testid": `envs-suggest-${s}`, children: s }, s))) })] }))] }));
 };

package/pages/Instance/Configuration/SimpleMode/PreviewCard.d.ts

@@ -1,11 +1,13 @@
 /// <reference types="react" />
 import { ProposedConfig } from '@postgres.ai/shared/types/api/endpoints/probeSource';
+import { ResolvedImage } from '../configOptions';
 declare type Props = {
     proposed: ProposedConfig;
+    resolved: ResolvedImage;
     applying: boolean;
     applyError: string | null;
     onApply: () => void;
     onEdit: () => void;
 };
-export declare const PreviewCard: ({ proposed, applying, applyError, onApply, onEdit, }: Props) => JSX.Element;
+export declare const PreviewCard: ({ proposed, resolved, applying, applyError, onApply, onEdit, }: Props) => JSX.Element;
 export {};

package/pages/Instance/Configuration/SimpleMode/PreviewCard.js

@@ -3,12 +3,12 @@ import { Button, Link, Typography } from '@material-ui/core';
 import Box from '@mui/material/Box';
 import { Spinner } from '@postgres.ai/shared/components/Spinner';
 import { providerKeyToImage } from '../configOptions';
-const Field = ({ label, value }) => (_jsxs(Box, { display: "flex", mb: 0.5, children: [_jsx(Box, { minWidth: 220, fontWeight: 600, children: label }), _jsx(Box, { style: { wordBreak: 'break-all' }, children: value })] }));
-const Callout = ({ children }) => (_jsx(Box, { mt: 1, p: 1, bgcolor: "#fff8e1", borderLeft: "4px solid #f5a623", fontSize: 13, children: children }));
-export const PreviewCard = ({ proposed, applying, applyError, onApply, onEdit, }) => {
-    var _a, _b;
+const Field = ({ label, value }) => (_jsxs(Box, { display: "flex", mb: 0.5, children: [_jsx(Box, { minWidth: 220, fontWeight: 600, children: label }), _jsx(Box, { minWidth: 0, style: { overflowWrap: 'anywhere' }, children: value })] }));
+const Callout = ({ children }) => (_jsx(Box, { mt: 1, p: 1, bgcolor: "#fff8e1", borderLeft: "4px solid #f5a623", fontSize: 13, style: { overflowWrap: 'anywhere' }, children: children }));
+export const PreviewCard = ({ proposed, resolved, applying, applyError, onApply, onEdit, }) => {
+    var _a, _b, _c;
     const mapping = providerKeyToImage(proposed.dockerImage, proposed.pgMajorVersion);
-    const resolvedTag = proposed.dockerTag || mapping.defaultTag || '(latest)';
-    const tuningEntries = Object.entries((_a = proposed.queryTuning) !== null && _a !== void 0 ? _a : {});
-    return (_jsxs(Box, { mt: 2, p: 2, border: "1px solid #e0e0e0", borderRadius: 4, "data-testid": "preview-card", children: [_jsx(Typography, { variant: "h6", children: "Proposed configuration" }), _jsxs(Box, { mt: 2, children: [_jsx(Field, { label: "Detected provider", value: proposed.detectedProvider || 'unknown' }), _jsx(Field, { label: "Docker image", value: mapping.imageType }), _jsx(Field, { label: "Docker tag", value: resolvedTag }), _jsx(Field, { label: "Postgres major version", value: String(proposed.pgMajorVersion || 'unknown') }), _jsx(Field, { label: "Databases", value: ((_b = proposed.databases) === null || _b === void 0 ? void 0 : _b.join(', ')) || '(none)' }), _jsx(Field, { label: "shared_buffers", value: proposed.sharedBuffers || '' }), _jsx(Field, { label: "shared_preload_libraries", value: proposed.sharedPreloadLibraries || '' })] }), tuningEntries.length > 0 && (_jsxs(Box, { mt: 2, children: [_jsx(Typography, { variant: "subtitle2", children: "Query tuning" }), _jsx(Box, { component: "table", mt: 1, style: { borderCollapse: 'collapse' }, children: _jsx("tbody", { children: tuningEntries.map(([k, v]) => (_jsxs("tr", { children: [_jsx("td", { style: { padding: '2px 16px 2px 0', fontWeight: 600 }, children: k }), _jsx("td", { style: { padding: '2px 0' }, children: v })] }, k))) }) })] })), _jsxs(Box, { mt: 2, children: [(mapping.fallback || proposed.detectedProvider === 'generic') && (_jsx(Callout, { children: "Could not detect a managed cloud provider; using the generic Postgres image. Switch to Expert mode if your source runs on a managed service and we missed it." })), !proposed.memoryProbed && (_jsxs(Callout, { children: ["Could not detect host memory; ", _jsx("code", { children: "shared_buffers" }), " is set to a 1\u00A0GB safe default. Adjust in Expert mode if your host has more RAM."] })), _jsx(Callout, { children: "Query tuning is copied from your source. If you use the RDS refresh tool, these values may not match production \u2014 review in Expert mode after the first retrieval run." }), _jsxs(Callout, { children: ["We'll ship ", _jsx("code", { children: proposed.sharedPreloadLibraries }), ". If the chosen image does not bundle one of these libraries, the clone container will fail to start with a \"could not load library\" error \u2014 check ", _jsx("code", { children: "docker logs dblab_server" }), " after Apply."] })] }), _jsxs(Box, { mt: 2, display: "flex", alignItems: "center", children: [_jsxs(Button, { variant: "contained", color: "secondary", onClick: onApply, disabled: applying, "data-testid": "preview-apply", children: ["Apply & start retrieval", applying && _jsx(Spinner, { size: "sm" })] }), _jsx(Box, { ml: 2, children: _jsx(Link, { component: "button", type: "button", onClick: onEdit, "data-testid": "preview-edit", children: "Edit before applying" }) })] }), applyError && (_jsx(Box, { mt: 1, color: "#d32f2f", fontSize: 13, "data-testid": "apply-error", children: applyError }))] }));
+    const preloadLibraries = (_a = resolved.sharedPreloadLibraries) !== null && _a !== void 0 ? _a : proposed.sharedPreloadLibraries;
+    const tuningEntries = Object.entries((_b = proposed.queryTuning) !== null && _b !== void 0 ? _b : {});
+    return (_jsxs(Box, { mt: 2, p: 2, border: "1px solid #e0e0e0", borderRadius: 4, "data-testid": "preview-card", children: [_jsx(Typography, { variant: "h6", children: "Proposed configuration" }), _jsxs(Box, { mt: 2, children: [_jsx(Field, { label: "Detected provider", value: proposed.detectedProvider || 'unknown' }), _jsx(Field, { label: "Docker image", value: resolved.dockerPath || mapping.imageType }), _jsx(Field, { label: "Postgres major version", value: String(proposed.pgMajorVersion || 'unknown') }), _jsx(Field, { label: "Databases", value: ((_c = proposed.databases) === null || _c === void 0 ? void 0 : _c.join(', ')) || '(none)' }), _jsx(Field, { label: "shared_buffers", value: proposed.sharedBuffers || '' }), _jsx(Field, { label: "shared_preload_libraries", value: preloadLibraries || '' })] }), tuningEntries.length > 0 && (_jsxs(Box, { mt: 2, children: [_jsx(Typography, { variant: "subtitle2", children: "Query tuning" }), _jsx(Box, { component: "table", mt: 1, style: { borderCollapse: 'collapse' }, children: _jsx("tbody", { children: tuningEntries.map(([k, v]) => (_jsxs("tr", { children: [_jsx("td", { style: { padding: '2px 16px 2px 0', fontWeight: 600 }, children: k }), _jsx("td", { style: { padding: '2px 0' }, children: v })] }, k))) }) })] })), _jsxs(Box, { mt: 2, children: [(mapping.fallback || proposed.detectedProvider === 'generic') && (_jsx(Callout, { children: "Could not detect a managed cloud provider; using the generic Postgres image. Switch to Expert mode if your source runs on a managed service and we missed it." })), !proposed.memoryProbed && (_jsxs(Callout, { children: ["Could not detect host memory; ", _jsx("code", { children: "shared_buffers" }), " is set to a 1\u00A0GB safe default. Adjust in Expert mode if your host has more RAM."] })), _jsx(Callout, { children: "Query tuning is copied from your source. If you use the RDS refresh tool, these values may not match production \u2014 review in Expert mode after the first retrieval run." }), resolved.isSe ? (_jsxs(Callout, { children: ["Shipping the ", _jsx("code", { children: resolved.dockerPath }), " image with its curated ", _jsx("code", { children: "shared_preload_libraries" }), " preset, so the detected extensions are bundled."] })) : (_jsxs(Callout, { children: ["We'll ship ", _jsx("code", { children: preloadLibraries }), ". If the chosen image does not bundle one of these libraries, the clone container will fail to start with a \"could not load library\" error \u2014 check", ' ', _jsx("code", { children: "docker logs dblab_server" }), " after Apply."] }))] }), _jsxs(Box, { mt: 2, display: "flex", alignItems: "center", children: [_jsxs(Button, { variant: "contained", color: "secondary", onClick: onApply, disabled: applying, "data-testid": "preview-apply", children: ["Apply & start retrieval", applying && _jsx(Spinner, { size: "sm" })] }), _jsx(Box, { ml: 2, children: _jsx(Link, { component: "button", type: "button", onClick: onEdit, "data-testid": "preview-edit", children: "Edit before applying" }) })] }), applyError && (_jsx(Box, { mt: 1, color: "#d32f2f", fontSize: 13, "data-testid": "apply-error", children: applyError }))] }));
 };

package/pages/Instance/Configuration/SimpleMode/index.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="react" />
+import { SeImages } from '@postgres.ai/shared/types/api/endpoints/getSeImages';
 import { ProposedConfig } from '@postgres.ai/shared/types/api/endpoints/probeSource';
+import { ResolvedImage } from '../configOptions';
 import { FormValues } from '../useForm';
 declare type Props = {
     instanceId: string;
@@ -7,7 +9,10 @@ declare type Props = {
     onApplied?: () => void;
     onEdit?: (proposed: ProposedConfig, password: string) => void;
 };
-export declare const buildProjectionFromProposed: (proposed: ProposedConfig, password: string) => FormValues;
+export declare const buildProjectionFromProposed: (proposed: ProposedConfig, password: string, resolved?: ResolvedImage) => FormValues;
+export declare const resolveProbeImage: (proposed: ProposedConfig, getSeImages: (args: {
+    packageGroup: string;
+}) => Promise<SeImages[] | null | undefined>) => Promise<ResolvedImage>;
 export declare const SimpleMode: (({ instanceId, disabled, onApplied, onEdit }: Props) => JSX.Element) & {
     displayName: string;
 };

package/pages/Instance/Configuration/SimpleMode/index.js

@@ -5,28 +5,41 @@ import { Button, TextField, Typography } from '@material-ui/core';
 import Box from '@mui/material/Box';
 import { Spinner } from '@postgres.ai/shared/components/Spinner';
 import { useStores } from '@postgres.ai/shared/pages/Instance/context';
-import { providerKeyToImage } from '../configOptions';
-import { genericImagePrefix } from '../dockerCatalog';
+import { providerKeyToImage, resolveDockerImagePath, selectSeImage, } from '../configOptions';
 import { PreviewCard } from './PreviewCard';
+// genericFallbackImage resolves the generic CE image for a probed source. Used
+// when no SE image is available (CE, or a managed provider with no SE image for
+// the detected major version).
+const genericFallbackImage = (proposed) => {
+    const mapping = providerKeyToImage(proposed.dockerImage, proposed.pgMajorVersion);
+    const isGeneric = mapping.imageType === 'Generic Postgres';
+    return {
+        dockerPath: resolveDockerImagePath(proposed.dockerImage, proposed.pgMajorVersion, proposed.dockerTag),
+        dockerTag: isGeneric ? proposed.dockerTag || mapping.defaultTag || '' : '',
+        sharedPreloadLibraries: proposed.sharedPreloadLibraries,
+        isSe: false,
+    };
+};
 // Translates a ProposedConfig from POST /admin/probe-source into the
 // FormValues shape the Expert form uses. Both Apply (→ updateConfig) and
 // Edit (→ formik.setValues) consume it, so the engine receives the same
-// projection regardless of which flow the user picks.
-export const buildProjectionFromProposed = (proposed, password) => {
+// projection regardless of which flow the user picks. The resolved image (SE
+// or generic) is passed in so the preview and the applied config never diverge.
+export const buildProjectionFromProposed = (proposed, password, resolved) => {
+    var _a;
     const mapping = providerKeyToImage(proposed.dockerImage, proposed.pgMajorVersion);
-    const tag = proposed.dockerTag || mapping.defaultTag || '';
     const isGeneric = mapping.imageType === 'Generic Postgres';
-    const dockerPath = isGeneric ? `${genericImagePrefix}:${tag}` : '';
+    const image = resolved !== null && resolved !== void 0 ? resolved : genericFallbackImage(proposed);
     return {
         debug: false,
         dockerImage: isGeneric
             ? String(proposed.pgMajorVersion)
             : mapping.imageType,
         dockerImageType: mapping.imageType,
-        dockerPath,
-        dockerTag: tag,
+        dockerPath: image.dockerPath,
+        dockerTag: image.dockerTag,
         sharedBuffers: proposed.sharedBuffers,
-        sharedPreloadLibraries: proposed.sharedPreloadLibraries,
+        sharedPreloadLibraries: (_a = image.sharedPreloadLibraries) !== null && _a !== void 0 ? _a : proposed.sharedPreloadLibraries,
         // tuningParams is typed as string on FormValues but updateConfig.ts
         // spreads it as a key-value object; cast matches the Expert form's
         // formatTuningParamsToObj(...) as unknown as string pattern.
@@ -41,10 +54,14 @@ export const buildProjectionFromProposed = (proposed, password) => {
         dumpParallelJobs: '',
         dumpIgnoreErrors: false,
         restoreParallelJobs: '',
-        restoreIgnoreErrors: false,
+        // managed sources reference cloud-only extensions/objects (e.g. supabase_vault)
+        // that are absent from the clone image; best-effort restore skips them.
+        restoreIgnoreErrors: true,
         restoreConfigs: '',
         pgDumpCustomOptions: '',
-        pgRestoreCustomOptions: '',
+        // skip ownership and privileges on restore: managed sources (Supabase, RDS)
+        // reference roles that do not exist in the clone, which would abort pg_restore.
+        pgRestoreCustomOptions: '--no-owner --no-privileges --no-tablespaces',
         retrievalMode: 'logical',
         physicalTool: '',
         physicalDockerImage: '',
@@ -55,6 +72,27 @@ export const buildProjectionFromProposed = (proposed, password) => {
         physicalEnvs: [],
     };
 };
+// resolveProbeImage selects the platform SE image for a managed provider when
+// the SE catalog is reachable — SE/Enterprise instances expose it (platformUrl
+// set), CE returns undefined. Falls back to the generic image for CE and for
+// managed providers with no SE image at the detected major version.
+export const resolveProbeImage = async (proposed, getSeImages) => {
+    var _a;
+    const mapping = providerKeyToImage(proposed.dockerImage, proposed.pgMajorVersion);
+    if (mapping.imageType !== 'Generic Postgres') {
+        const seImages = await getSeImages({ packageGroup: mapping.imageType });
+        const se = selectSeImage(seImages, proposed.pgMajorVersion);
+        if (se) {
+            return {
+                dockerPath: se.location,
+                dockerTag: se.tag,
+                sharedPreloadLibraries: (_a = se.pg_config_presets) === null || _a === void 0 ? void 0 : _a.shared_preload_libraries,
+                isSe: true,
+            };
+        }
+    }
+    return genericFallbackImage(proposed);
+};
 export const SimpleMode = observer(({ instanceId, disabled, onApplied, onEdit }) => {
     const stores = useStores();
     const main = stores.main;
@@ -63,45 +101,66 @@ export const SimpleMode = observer(({ instanceId, disabled, onApplied, onEdit })
     const [probing, setProbing] = useState(false);
     const [probeError, setProbeError] = useState(null);
     const [proposed, setProposed] = useState(null);
+    const [resolved, setResolved] = useState(null);
     const [applying, setApplying] = useState(false);
     const [applyError, setApplyError] = useState(null);
     const onDetect = async () => {
         setProbing(true);
         setProbeError(null);
         setProposed(null);
+        setResolved(null);
         setApplyError(null);
         const result = await main.probeSource({ url, password });
-        setProbing(false);
         if (!result) {
+            setProbing(false);
             setProbeError('Probe is not available on this instance.');
             return;
         }
         if (result.error) {
+            setProbing(false);
             setProbeError(result.error.message);
             return;
         }
-        if (result.response)
+        if (result.response) {
+            const image = await resolveProbeImage(result.response, main.getSeImages);
+            setResolved(image);
             setProposed(result.response);
+        }
+        setProbing(false);
     };
     const onApply = async () => {
         var _a;
-        if (!proposed)
+        if (!proposed || !resolved)
             return;
         setApplying(true);
         setApplyError(null);
-        const projection = buildProjectionFromProposed(proposed, password);
-        const response = await main.updateConfig(projection, instanceId);
-        setApplying(false);
-        if (!response) {
-            setApplyError((_a = main.configError) !== null && _a !== void 0 ? _a : 'Could not apply the proposed configuration.');
-            return;
+        try {
+            const projection = buildProjectionFromProposed(proposed, password, resolved);
+            const response = await main.updateConfig(projection, instanceId);
+            if (!response) {
+                setApplyError((_a = main.configError) !== null && _a !== void 0 ? _a : 'Could not apply the proposed configuration.');
+                return;
+            }
+            const refresh = await main.fullRefresh(instanceId);
+            if (refresh === null || refresh === void 0 ? void 0 : refresh.error) {
+                setApplyError(`Configuration applied, but starting data retrieval failed: ${refresh.error.message}`);
+                return;
+            }
+            onApplied === null || onApplied === void 0 ? void 0 : onApplied();
+        }
+        catch (err) {
+            setApplyError(err instanceof Error
+                ? err.message
+                : 'Could not apply the proposed configuration.');
+        }
+        finally {
+            setApplying(false);
         }
-        onApplied === null || onApplied === void 0 ? void 0 : onApplied();
     };
     const handleEdit = () => {
         if (proposed)
             onEdit === null || onEdit === void 0 ? void 0 : onEdit(proposed, password);
     };
     const canDetect = !probing && url.trim().length > 0 && password.length > 0 && !disabled;
-    return (_jsxs(Box, { mt: 2, mb: 2, "data-testid": "simple-mode", children: [!proposed && (_jsxs(Box, { children: [_jsx(Typography, { variant: "h6", children: "Simple configuration" }), _jsx(Typography, { variant: "body2", children: "Paste your source connection string and password. We'll probe the source, propose a configuration, and let you review before starting retrieval." }), _jsx(Box, { mt: 2, children: _jsx(TextField, { label: "Connection string", placeholder: "postgres://user@host:5432/dbname", value: url, onChange: (e) => setUrl(e.target.value), fullWidth: true, disabled: probing || disabled, inputProps: { 'data-testid': 'simple-url' } }) }), _jsx(Box, { mt: 2, children: _jsx(TextField, { label: "Password", type: "password", value: password, onChange: (e) => setPassword(e.target.value), fullWidth: true, disabled: probing || disabled, inputProps: { 'data-testid': 'simple-password' } }) }), _jsx(Box, { mt: 2, children: _jsxs(Button, { variant: "contained", color: "secondary", onClick: onDetect, disabled: !canDetect, "data-testid": "simple-detect", children: ["Detect & preview", probing && _jsx(Spinner, { size: "sm" })] }) }), probeError && (_jsx(Box, { mt: 1, color: "#d32f2f", fontSize: 13, "data-testid": "probe-error", children: probeError }))] })), proposed && (_jsx(PreviewCard, { proposed: proposed, applying: applying, applyError: applyError, onApply: onApply, onEdit: handleEdit }))] }));
+    return (_jsxs(Box, { mt: 2, mb: 2, "data-testid": "simple-mode", children: [!proposed && (_jsxs(Box, { children: [_jsx(Typography, { variant: "h6", children: "Simple configuration" }), _jsx(Typography, { variant: "body2", children: "Paste your source connection string and password. We'll probe the source, propose a configuration, and let you review before starting retrieval." }), _jsx(Box, { mt: 2, children: _jsx(TextField, { label: "Connection string", placeholder: "postgres://user@host:5432/dbname", value: url, onChange: (e) => setUrl(e.target.value), fullWidth: true, disabled: probing || disabled, inputProps: { 'data-testid': 'simple-url' } }) }), _jsx(Box, { mt: 2, children: _jsx(TextField, { label: "Password", type: "password", value: password, onChange: (e) => setPassword(e.target.value), fullWidth: true, disabled: probing || disabled, inputProps: { 'data-testid': 'simple-password' } }) }), _jsx(Box, { mt: 2, children: _jsxs(Button, { variant: "contained", color: "secondary", onClick: onDetect, disabled: !canDetect, "data-testid": "simple-detect", children: ["Detect & preview", probing && _jsx(Spinner, { size: "sm" })] }) }), probeError && (_jsx(Box, { mt: 1, color: "#d32f2f", fontSize: 13, "data-testid": "probe-error", children: probeError }))] })), proposed && resolved && (_jsx(PreviewCard, { proposed: proposed, resolved: resolved, applying: applying, applyError: applyError, onApply: onApply, onEdit: handleEdit }))] }));
 });

package/pages/Instance/Configuration/configOptions.d.ts

@@ -1,8 +1,18 @@
+import { SeImages } from '@postgres.ai/shared/types/api/endpoints/getSeImages';
 export declare type ProviderImageMapping = {
     imageType: string;
     defaultTag?: string;
     fallback: boolean;
 };
+export declare const genericImagePathForVersion: (pgMajorVersion: number) => string;
+export declare type ResolvedImage = {
+    dockerPath: string;
+    dockerTag: string;
+    sharedPreloadLibraries?: string;
+    isSe: boolean;
+};
+export declare const selectSeImage: (seImages: SeImages[] | null | undefined, pgMajorVersion: number) => SeImages | undefined;
+export declare const resolveDockerImagePath: (providerKey: string, pgMajorVersion: number, dockerTag?: string) => string;
 export declare const providerKeyToImage: (providerKey: string, pgMajorVersion: number) => ProviderImageMapping;
 export declare const dockerImageOptions: {
     name: string;

package/pages/Instance/Configuration/configOptions.js

@@ -1,4 +1,4 @@
-import { dockerImagesConfig } from './dockerCatalog';
+import { dockerImagesConfig, genericImagePrefix } from './dockerCatalog';
 // Mapping from the engine probe's provider key (probe.Provider) to a
 // dockerImageOptions.type value the form already understands. Keys must
 // match the values defined in engine/internal/retrieval/probe/provider.go
@@ -24,6 +24,29 @@ const genericDefaultTag = (pgMajorVersion) => {
         return undefined;
     return `${version}-${tags[0]}`;
 };
+// genericImagePathForVersion returns a pullable generic extended-postgres
+// reference for a PG major version, or '' when the version is unknown. Simple
+// mode uses it as the CE fallback for managed providers, whose SE images are
+// only resolvable through the platform-only getSeImages call.
+export const genericImagePathForVersion = (pgMajorVersion) => {
+    const tag = genericDefaultTag(pgMajorVersion);
+    return tag ? `${genericImagePrefix}:${tag}` : '';
+};
+// selectSeImage picks the SE catalog entry matching the detected major version.
+// Returns undefined when the catalog is empty (CE) or has no matching version,
+// which signals the caller to fall back to the generic image.
+export const selectSeImage = (seImages, pgMajorVersion) => seImages === null || seImages === void 0 ? void 0 : seImages.find((image) => image.pg_major_version === String(pgMajorVersion));
+// resolveDockerImagePath returns the concrete image reference Simple mode ships
+// for a probed source. Managed providers fall back to the generic image in CE,
+// so both the Apply payload and the preview show the same value.
+export const resolveDockerImagePath = (providerKey, pgMajorVersion, dockerTag) => {
+    const mapping = providerKeyToImage(providerKey, pgMajorVersion);
+    const tag = dockerTag || mapping.defaultTag || '';
+    if (mapping.imageType === 'Generic Postgres') {
+        return tag ? `${genericImagePrefix}:${tag}` : '';
+    }
+    return genericImagePathForVersion(pgMajorVersion);
+};
 // Resolves a probe provider key to a concrete docker image type the
 // Configuration form can write into the projection. Unknown keys (including
 // "azure", which has no matching SE image today) fall back to the generic

package/pages/Instance/Info/Snapshots/Calendar/Day/index.js

@@ -16,7 +16,7 @@ const useStyles = makeStyles({
         position: 'relative',
         cursor: 'default',
         flex: `0 0 ${CELL_SIZE}px`,
-        background: '#f4f4f4',
+        background: 'rgba(128, 128, 128, 0.1)',
         height: `${CELL_SIZE}px`,
         display: 'flex',
         borderRadius: `${CELL_SIZE / 2}px`,
@@ -26,7 +26,7 @@ const useStyles = makeStyles({
         fontSize: '12px',
     },
     rootHasSnapshots: {
-        background: colors.secondary2.lightLight,
+        background: 'rgba(15, 135, 157, 0.32)',
         cursor: 'pointer',
     },
     rootCurrent: {
@@ -41,7 +41,7 @@ const useStyles = makeStyles({
         right: '-6px',
         position: 'absolute',
         fontSize: '8px',
-        backgroundColor: colors.white,
+        backgroundColor: 'inherit',
         border: `1px solid ${colors.secondary2.lightLight}`,
         borderRadius: '8px',
         height: '16px',

package/pages/Instance/Info/Snapshots/Calendar/utils.d.ts

@@ -17,6 +17,9 @@ export declare const getCalendar: (monthStartDate: Date, snapshots: Snapshot[])
             logicalSize: number;
             message: string;
             branch: string;
+            protected: boolean;
+            protectedTill?: string | undefined;
+            deleteAt?: string | undefined;
         }[];
         isBreak: boolean;
         isDisabled: boolean;

package/pages/Instance/Info/Snapshots/utils.d.ts

@@ -16,6 +16,9 @@ export declare const getEdgeSnapshots: (snapshots: Snapshot[]) => {
         logicalSize: number;
         message: string;
         branch: string;
+        protected: boolean;
+        protectedTill?: string | undefined;
+        deleteAt?: string | undefined;
     };
     lastSnapshot: {
         createdAtDate: Date;
@@ -30,5 +33,8 @@ export declare const getEdgeSnapshots: (snapshots: Snapshot[]) => {
         logicalSize: number;
         message: string;
         branch: string;
+        protected: boolean;
+        protectedTill?: string | undefined;
+        deleteAt?: string | undefined;
     };
 };

package/pages/Instance/Snapshots/components/SnapshotsList/index.js

@@ -41,6 +41,16 @@ const useStyles = makeStyles({
     header: {
         fontWeight: 500,
     },
+    protectedBadge: {
+        marginLeft: '8px',
+        padding: '1px 6px',
+        fontSize: '11px',
+        fontWeight: 400,
+        color: '#1a7f37',
+        border: '1px solid #1a7f37',
+        borderRadius: '4px',
+        whiteSpace: 'nowrap',
+    },
     infoContent: {
         fontSize: '12px',
         color: '#808080',
@@ -113,7 +123,7 @@ const SnapshotListItem = ({ snapshot, setSnapshotModal, openClonesModal, }) => {
     const timeAgo = formatDistanceSafe(snapshot.createdAtDate);
     const history = useHistory();
     const host = useHost();
-    return (_jsx("div", { className: classes.commitItem, children: _jsxs("div", { className: classes.gridContainer, children: [_jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: snapshot.message || '-' }), _jsx("div", { className: classes.infoContent, title: snapshot.dataStateAt, children: timeAgo })] }), _jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: "Pool" }), _jsx("div", { className: classes.infoContent, children: (_a = snapshot.pool) !== null && _a !== void 0 ? _a : '-' })] }), _jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: "Number of clones" }), _jsx("div", { className: classes.infoContent, children: (_b = snapshot.numClones) !== null && _b !== void 0 ? _b : '-' })] }), _jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: "Logical Size" }), _jsx("div", { className: classes.infoContent, children: snapshot.logicalSize ? formatBytesIEC(snapshot.logicalSize) : '-' })] }), _jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: "Physical Size" }), _jsx("div", { className: classes.infoContent, children: snapshot.physicalSize
+    return (_jsx("div", { className: classes.commitItem, children: _jsxs("div", { className: classes.gridContainer, children: [_jsxs("div", { className: classes.infoBlock, children: [_jsxs("div", { className: classes.header, children: [snapshot.message || '-', snapshot.protected && (_jsx("span", { className: classes.protectedBadge, title: "Protected from deletion", children: "Protected" }))] }), _jsx("div", { className: classes.infoContent, title: snapshot.dataStateAt, children: timeAgo })] }), _jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: "Pool" }), _jsx("div", { className: classes.infoContent, children: (_a = snapshot.pool) !== null && _a !== void 0 ? _a : '-' })] }), _jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: "Number of clones" }), _jsx("div", { className: classes.infoContent, children: (_b = snapshot.numClones) !== null && _b !== void 0 ? _b : '-' })] }), _jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: "Logical Size" }), _jsx("div", { className: classes.infoContent, children: snapshot.logicalSize ? formatBytesIEC(snapshot.logicalSize) : '-' })] }), _jsxs("div", { className: classes.infoBlock, children: [_jsx("div", { className: classes.header, children: "Physical Size" }), _jsx("div", { className: classes.infoContent, children: snapshot.physicalSize
                                 ? formatBytesIEC(snapshot.physicalSize)
                                 : '-' })] }), _jsxs("div", { className: classes.actionsContainer, onClick: (e) => e.stopPropagation(), children: [_jsx("div", { className: classes.snapshotId, children: snapshot.id }), _jsx("div", { className: classes.copyButtonContainer, title: "Copy snapshot ID", children: _jsx(IconButton, { className: classes.copyButton, onClick: (e) => {
                                     e.stopPropagation();

package/pages/Instance/Snapshots/index.js

@@ -37,6 +37,9 @@ const useStyles = makeStyles({
         transform: 'translate(-50%, -50%)',
     },
 }, { index: 1 });
+// listRefreshIntervalMs is how often the snapshot list is silently refreshed so background
+// auto-deletion does not leave stale rows in the list.
+const listRefreshIntervalMs = 30000;
 export const Snapshots = observer(({ instanceId }) => {
     var _a;
     const host = useHost();
@@ -80,9 +83,14 @@ export const Snapshots = observer(({ instanceId }) => {
         fetchInitialData();
     }, []);
     useEffect(() => {
-        if (selectedBranch) {
-            stores.main.reloadSnapshots(selectedBranch === 'All branches' ? '' : selectedBranch);
-        }
+        if (!selectedBranch)
+            return;
+        const branchName = selectedBranch === 'All branches' ? '' : selectedBranch;
+        stores.main.reloadSnapshots(branchName);
+        const intervalId = setInterval(() => {
+            stores.main.reloadSnapshots(branchName, true);
+        }, listRefreshIntervalMs);
+        return () => clearInterval(intervalId);
     }, [selectedBranch]);
     if (!instance && !snapshots.isLoading)
         return _jsx(_Fragment, {});

package/pages/Instance/Snapshots/utils/index.d.ts

@@ -13,4 +13,7 @@ export declare const groupSnapshotsByCreatedAtDate: (snapshots: Snapshot[]) => {
     logicalSize: number;
     message: string;
     branch: string;
+    protected: boolean;
+    protectedTill?: string | undefined;
+    deleteAt?: string | undefined;
 }[][];

package/pages/Instance/Tabs/styles.js

@@ -1,6 +1,5 @@
 import { makeStyles } from '@material-ui/core';
-import { colors } from '@postgres.ai/shared/styles/colors';
-export const useTabsStyles = makeStyles({
+export const useTabsStyles = makeStyles((theme) => ({
     tabsRoot: {
         minHeight: 0,
         marginTop: '-8px',
@@ -21,7 +20,7 @@ export const useTabsStyles = makeStyles({
             height: '18px',
         },
         '& a': {
-            color: colors.black,
+            color: theme.palette.text.primary,
             textDecoration: 'none',
             '@media (max-width: 700px)': {
                 display: 'flex',
@@ -39,18 +38,19 @@ export const useTabsStyles = makeStyles({
         height: '3px',
     },
     tabRoot: {
+        color: theme.palette.text.primary,
         fontWeight: 400,
         minWidth: 0,
         minHeight: 0,
         width: '100%',
         padding: '6px 16px',
-        borderBottom: `3px solid ${colors.consoleStroke}`,
+        borderBottom: `3px solid ${theme.palette.divider}`,
         '& + $tabRoot': {
             marginLeft: '10px',
         },
         '&.Mui-disabled': {
             opacity: 1,
-            color: colors.pgaiDarkGray,
+            color: theme.palette.text.disabled,
         },
         '@media (max-width: 700px)': {
             width: 'max-content',
@@ -59,4 +59,4 @@ export const useTabsStyles = makeStyles({
     tabHidden: {
         display: 'none',
     },
-}, { index: 1 });
+}), { index: 1 });

package/pages/Instance/stores/Main.d.ts

@@ -80,7 +80,7 @@ export declare class MainStore {
     get isDisabledInstance(): boolean;
     load: (instanceId: string, isPlatform?: boolean) => void;
     reload: (instanceId: string) => void;
-    reloadSnapshots: (branchName?: string) => Promise<void>;
+    reloadSnapshots: (branchName?: string, silent?: boolean) => Promise<void>;
     reloadInstanceRetrieval: () => Promise<void>;
     private loadInstanceRetrieval;
     private loadInstance;
@@ -151,7 +151,7 @@ export declare class MainStore {
     destroyClone: (cloneId: string) => Promise<boolean | undefined>;
     private liveUpdateInstance;
     reloadClones: () => Promise<void>;
-    getBranches: (instanceId: string) => Promise<import("@postgres.ai/shared/types/api/endpoints/getBranches").Branch[] | null | undefined>;
+    getBranches: (instanceId: string, silent?: boolean) => Promise<import("@postgres.ai/shared/types/api/endpoints/getBranches").Branch[] | null | undefined>;
     deleteBranch: (branchName: string, instanceId: string) => Promise<{
         response: Response | null;
         error: globalThis.Error | null;

package/pages/Instance/stores/Main.js

@@ -80,10 +80,10 @@ export class MainStore {
                 }
             });
         };
-        this.reloadSnapshots = async (branchName) => {
+        this.reloadSnapshots = async (branchName, silent) => {
             if (!this.instance)
                 return;
-            await this.snapshots.reload(this.instance.id, branchName);
+            await this.snapshots.reload(this.instance.id, branchName, silent);
         };
         this.reloadInstanceRetrieval = async () => {
             if (!this.instance)
@@ -164,15 +164,17 @@ export class MainStore {
             return response;
         };
         this.getFullConfig = async (instanceId) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             if (!this.api.getFullConfig)
                 return;
             const { response, error } = await this.api.getFullConfig(instanceId);
             if (response) {
                 this.fullConfig = response;
                 const splitYML = this.fullConfig.split('---');
-                this.platformUrl = (_b = (_a = splitYML[0]) === null || _a === void 0 ? void 0 : _a.split('url: ')[1]) === null || _b === void 0 ? void 0 : _b.split('\n')[0];
-                this.uiVersion = (_e = (_d = (_c = splitYML[0]) === null || _c === void 0 ? void 0 : _c.split('dockerImage: "postgresai/ce-ui:')[2]) === null || _d === void 0 ? void 0 : _d.split('\n')[0]) === null || _e === void 0 ? void 0 : _e.replace(/['"]+/g, '');
+                const platformSection = (_b = (_a = splitYML[0]) === null || _a === void 0 ? void 0 : _a.split('\nplatform:')[1]) !== null && _b !== void 0 ? _b : '';
+                const rawPlatformUrl = (_c = platformSection.split('url: ')[1]) === null || _c === void 0 ? void 0 : _c.split('\n')[0];
+                this.platformUrl = rawPlatformUrl === null || rawPlatformUrl === void 0 ? void 0 : rawPlatformUrl.replace(/['"]+/g, '').trim().split(/\s+/)[0];
+                this.uiVersion = (_f = (_e = (_d = splitYML[0]) === null || _d === void 0 ? void 0 : _d.split('dockerImage: "postgresai/ce-ui:')[2]) === null || _e === void 0 ? void 0 : _e.split('\n')[0]) === null || _f === void 0 ? void 0 : _f.replace(/['"]+/g, '');
             }
             if (error)
                 this.getFullConfigError = await error
@@ -272,13 +274,19 @@ export class MainStore {
             await this.loadInstanceRetrieval(this.instance.id);
             this.isReloadingClones = false;
         };
-        this.getBranches = async (instanceId) => {
+        this.getBranches = async (instanceId, silent) => {
             if (!this.api.getBranches)
                 return;
-            this.isBranchesLoading = true;
+            if (!silent)
+                this.isBranchesLoading = true;
             const { response, error } = await this.api.getBranches(instanceId);
-            this.isBranchesLoading = false;
-            if (error)
+            if (!silent)
+                this.isBranchesLoading = false;
+            if (response)
+                this.getBranchesError = null;
+            // a silent background refresh must not replace the rendered list with an error stub on a
+            // transient failure; errors surface only on a foreground load.
+            if (error && !silent)
                 this.getBranchesError = await error.json().then((err) => err);
             return response;
         };