@postgres.ai/shared 4.0.2-pr-1148 → 4.0.2-pr-1149

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postgres.ai/shared",
-  "version": "4.0.2-pr-1148",
+  "version": "4.0.2-pr-1149",
   "main": "index.js",
   "types": "index.d.ts",
   "peerDependencies": {

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

@@ -1,9 +1,3 @@
-export declare type ProviderImageMapping = {
-    imageType: string;
-    defaultTag?: string;
-    fallback: boolean;
-};
-export declare const providerKeyToImage: (providerKey: string, pgMajorVersion: number) => ProviderImageMapping;
 export declare const dockerImageOptions: {
     name: string;
     type: string;

package/pages/Instance/Configuration/configOptions.js

@@ -1,51 +1,3 @@
-import { dockerImagesConfig } 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
-// (ProviderRDS, ProviderAurora, etc.) — see Task 18 in the plan.
-const providerKeyToImageType = {
-    generic: 'Generic Postgres',
-    rds: 'rds',
-    aurora: 'aurora',
-    cloudsql: 'google-cloud-sql',
-    supabase: 'supabase',
-    heroku: 'heroku',
-    timescale: 'timescale-cloud',
-};
-// Reads the most recent tag for a given PG major from the shared catalog.
-// SE images (rds, aurora, etc.) require the platform-only getSeImages call
-// and have no entry here — they return defaultTag: undefined.
-const genericDefaultTag = (pgMajorVersion) => {
-    if (!pgMajorVersion)
-        return undefined;
-    const version = String(pgMajorVersion);
-    const tags = dockerImagesConfig[version];
-    if (!tags || tags.length === 0)
-        return undefined;
-    return `${version}-${tags[0]}`;
-};
-// 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
-// Postgres image and set fallback=true so the UI can warn.
-export const providerKeyToImage = (providerKey, pgMajorVersion) => {
-    const known = providerKeyToImageType[providerKey];
-    if (!known) {
-        return {
-            imageType: 'Generic Postgres',
-            defaultTag: genericDefaultTag(pgMajorVersion),
-            fallback: true,
-        };
-    }
-    if (known === 'Generic Postgres') {
-        return {
-            imageType: 'Generic Postgres',
-            defaultTag: genericDefaultTag(pgMajorVersion),
-            fallback: false,
-        };
-    }
-    return { imageType: known, defaultTag: undefined, fallback: false };
-};
 export const dockerImageOptions = [
     {
         name: 'Generic PostgreSQL (postgresai/extended-postgres)',

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

@@ -1,8 +1,9 @@
 /// <reference types="react" />
-export declare const Configuration: (({ instanceId, switchActiveTab, reload, disableConfigModification, }: {
+export declare const Configuration: (({ instanceId, switchActiveTab, reload, isConfigurationActive, disableConfigModification, }: {
     instanceId: string;
     switchActiveTab: (_: null, activeTab: number) => void;
     reload: () => void;
+    isConfigurationActive: boolean;
     disableConfigModification?: boolean | undefined;
 }) => JSX.Element) & {
     displayName: string;

package/pages/Instance/Configuration/index.js

@@ -5,10 +5,10 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * Unauthorized copying of this file, via any small is strictly prohibited
  *--------------------------------------------------------------------------
  */
-import { useState, useEffect, useMemo, useRef } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import { observer } from 'mobx-react-lite';
 import Editor from '@monaco-editor/react';
-import { Checkbox, FormControlLabel, Typography, Snackbar, makeStyles, Button, Tab, Tabs, Radio, RadioGroup, } from '@material-ui/core';
+import { Checkbox, FormControlLabel, Typography, Snackbar, makeStyles, Button, } from '@material-ui/core';
 import Box from '@mui/material/Box';
 import { Modal } from '@postgres.ai/shared/components/Modal';
 import { StubSpinner } from '@postgres.ai/shared/components/StubSpinner';
@@ -22,11 +22,9 @@ import { ConfigSectionTitle, Header, ModalTitle } from './Header';
 import { dockerImageOptions, imagePgOptions } from './configOptions';
 import { uniqueChipValue, customOrGenericImage, createEnhancedDockerImages, } from './utils';
 import { SelectWithTooltip, InputWithChip, InputWithTooltip, } from './InputWithTooltip';
-import { SimpleMode, buildProjectionFromProposed } from './SimpleMode';
-import { getInitialConfigMode } from './configMode';
-import { PhysicalMode } from './PhysicalMode';
 import styles from './styles.module.scss';
 import { formatTuningParams, formatTuningParamsToObj, } from '@postgres.ai/shared/types/api/endpoints/testDbSource';
+const NON_LOGICAL_RETRIEVAL_MESSAGE = 'Configuration editing is only available in logical mode';
 const PREVENT_MODIFYING_MESSAGE = 'Editing is disabled by admin';
 const useStyles = makeStyles({
     checkboxRoot: {
@@ -37,31 +35,17 @@ const useStyles = makeStyles({
         fontSize: '12px',
     },
 }, { index: 1 });
-export const Configuration = observer(({ instanceId, switchActiveTab, reload, disableConfigModification, }) => {
-    var _a, _b;
+export const Configuration = observer(({ instanceId, switchActiveTab, reload, isConfigurationActive, disableConfigModification, }) => {
     const classes = useStyles();
     const stores = useStores();
     const { config, isConfigurationLoading, updateConfig, getSeImages, fullConfig, testDbSource, configError, getFullConfig, getFullConfigError, getEngine, } = stores.main;
     const configData = config && JSON.parse(JSON.stringify(config));
-    const isConfigurationDisabled = disableConfigModification;
+    const isConfigurationDisabled = !isConfigurationActive || disableConfigModification;
     const [dleEdition, setDledition] = useState('');
     const isCeEdition = dleEdition === 'community';
     const filteredDockerImageOptions = isCeEdition
         ? dockerImageOptions.filter((option) => option.type === 'custom' || option.type === 'Generic Postgres')
         : dockerImageOptions;
-    const [userPickedMode, setUserPickedMode] = useState(null);
-    // Seeded lazily — only once configData transitions from null to non-null.
-    // Prevents the Simple/Expert default from flipping mid-session when an
-    // Apply triggers a refetch and the recomputed default would differ.
-    const [initialMode, setInitialMode] = useState(null);
-    useEffect(() => {
-        if (initialMode === null && configData) {
-            setInitialMode(getInitialConfigMode(configData.host, configData.retrievalMode));
-        }
-    }, [configData, initialMode]);
-    const configMode = (_a = userPickedMode !== null && userPickedMode !== void 0 ? userPickedMode : initialMode) !== null && _a !== void 0 ? _a : 'simple';
-    const setConfigMode = setUserPickedMode;
-    const portInitFromConfig = useRef(false);
     const [isModalOpen, setIsModalOpen] = useState(false);
     const [submitState, setSubmitState] = useState({
         status: '',
@@ -113,8 +97,6 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, di
         });
         await updateConfig({
             ...values,
-            // Preserve configs that originally had no port: key.
-            ...(omitPortOnSubmit && { port: '' }),
             tuningParams: formatTuningParamsToObj(values.tuningParams),
         }, instanceId).then((response) => {
             if (response === null || response === void 0 ? void 0 : response.ok) {
@@ -125,7 +107,7 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, di
             }
         });
     };
-    const [{ formik, connectionData, isConnectionDataValid, connectionString, connectionStringError, onConnectionStringChange, markPortInitialState, omitPortOnSubmit, },] = useForm(onSubmit);
+    const [{ formik, connectionData, isConnectionDataValid }] = useForm(onSubmit);
     // Memoized enhanced Docker images to avoid recreation on every render
     // This combines predefined images with any custom image from configuration
     const enhancedDockerImages = useMemo(() => {
@@ -431,10 +413,6 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, di
     // Set initial data, empty string for password
     useEffect(() => {
         if (configData) {
-            if (!portInitFromConfig.current) {
-                markPortInitialState(configData.port == null || configData.port === '');
-                portInitFromConfig.current = true;
-            }
             for (const [key, value] of Object.entries(configData)) {
                 if (key !== 'password') {
                     formik.setFieldValue(key, value);
@@ -516,98 +494,91 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, di
                 }, anchorOrigin: { vertical: 'bottom', horizontal: 'right' }, open: (isConfigurationDisabled || Boolean(dockerState.error)) &&
                     !isModalOpen, message: Boolean(dockerState.error)
                     ? dockerState.error
-                    : PREVENT_MODIFYING_MESSAGE, className: styles.snackbar }), !config && isConfigurationLoading ? (_jsx("div", { className: styles.spinnerContainer, children: _jsx(Spinner, { size: "lg", className: styles.spinner }) })) : (_jsxs(Box, { children: [_jsx(Header, { retrievalMode: formik.values.retrievalMode, setOpen: handleModalClick }), _jsxs(Tabs, { value: configMode, onChange: (_, value) => setConfigMode(value), indicatorColor: "primary", textColor: "primary", "aria-label": "Configuration mode", children: [_jsx(Tab, { value: "simple", label: "Simple" }), _jsx(Tab, { value: "expert", label: "Expert" })] }), configMode === 'simple' ? (_jsx(SimpleMode, { instanceId: instanceId, disabled: isConfigurationDisabled, onApplied: switchTab, onEdit: (proposed, password) => {
-                            const projection = buildProjectionFromProposed(proposed, password);
-                            formik.setValues({ ...formik.values, ...projection });
-                            setConfigMode('expert');
-                        } })) : null, configMode === 'expert' ? (_jsxs(_Fragment, { children: [_jsxs(Box, { children: [_jsx(Box, { children: _jsx(FormControlLabel, { control: _jsx(Checkbox, { name: "debug", checked: formik.values.debug, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('debug', e.target.checked), classes: {
-                                                    root: classes.checkboxRoot,
-                                                } }), label: 'Debug mode' }) }), _jsxs(Box, { mb: 1, mt: 1, children: [_jsx(ConfigSectionTitle, { tag: "retrieval" }), _jsxs(Box, { mt: 1, mb: 1, children: [_jsx(Typography, { className: styles.subsection, children: "Retrieval mode" }), _jsxs(RadioGroup, { row: true, "aria-label": "retrieval mode", value: formik.values.retrievalMode, onChange: (_, value) => {
-                                                            formik.setFieldValue('retrievalMode', value);
-                                                        }, children: [_jsx(FormControlLabel, { value: "logical", control: _jsx(Radio, { disabled: isConfigurationDisabled }), label: "Logical (dump/restore)" }), _jsx(FormControlLabel, { value: "physical", control: _jsx(Radio, { disabled: isConfigurationDisabled }), label: "Physical (WAL-G / pgBackRest)" })] })] }), formik.values.retrievalMode === 'physical' && (_jsx(PhysicalMode, { values: formik.values, onChange: (key, value) => formik.setFieldValue(key, value, key === 'physicalEnvs'), disabled: isConfigurationDisabled, envsKeyErrors: (_b = formik.errors.physicalEnvs) === null || _b === void 0 ? void 0 : _b.map((row) => row === null || row === void 0 ? void 0 : row.key) })), formik.values.retrievalMode === 'logical' && (_jsxs(Box, { mt: 1, children: [_jsx(Typography, { className: styles.subsection, children: "Subsection \"retrieval.spec.logicalDump\"" }), _jsx("span", { className: classes.grayText, children: "Source database credentials and dumping options." }), _jsx(InputWithTooltip, { label: "Connection string *", value: connectionString, error: connectionStringError ||
-                                                            formik.errors.host ||
-                                                            formik.errors.username ||
-                                                            formik.errors.dbname, tooltipText: () => (_jsxs(_Fragment, { children: ["URI form: ", _jsx("code", { children: "postgres://user@host:5432/dbname" }), ". DSN form is also accepted. Do not include the password here \u2014 use the Password field below."] })), disabled: isConfigurationDisabled, onChange: (e) => onConnectionStringChange(e.target.value) }), _jsx(Box, { mt: 0.5, mb: 1, children: _jsxs("span", { className: classes.grayText, "data-testid": "connection-string-parsed", children: ["host: ", formik.values.host || '—', " | port:", ' ', formik.values.port || '5432 (default)', " | user:", ' ', formik.values.username || '—', " | dbname:", ' ', formik.values.dbname || '—'] }) }), _jsx(InputWithTooltip, { type: "password", value: formik.values.password, label: "source.connection.password", tooltipText: tooltipText.password, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('password', e.target.value) }), _jsx(InputWithChip, { id: "databases", value: formik.values.databases, label: "Databases to copy", tooltipText: tooltipText.databases, handleDeleteChip: handleDeleteChip, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('databases', e.target.value) }), _jsxs(Box, { mt: 3, mb: 3, children: [_jsxs(Button, { variant: "outlined", color: "secondary", onClick: () => {
+                    : disableConfigModification
+                        ? PREVENT_MODIFYING_MESSAGE
+                        : NON_LOGICAL_RETRIEVAL_MESSAGE, className: styles.snackbar }), !config && isConfigurationLoading ? (_jsx("div", { className: styles.spinnerContainer, children: _jsx(Spinner, { size: "lg", className: styles.spinner }) })) : (_jsxs(Box, { children: [_jsx(Header, { retrievalMode: "logical", setOpen: handleModalClick }), _jsxs(Box, { children: [_jsx(Box, { children: _jsx(FormControlLabel, { control: _jsx(Checkbox, { name: "debug", checked: formik.values.debug, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('debug', e.target.checked), classes: {
+                                            root: classes.checkboxRoot,
+                                        } }), label: 'Debug mode' }) }), _jsxs(Box, { mb: 1, mt: 1, children: [_jsx(ConfigSectionTitle, { tag: "retrieval" }), _jsxs(Box, { mt: 1, children: [_jsx(Typography, { className: styles.subsection, children: "Subsection \"retrieval.spec.logicalDump\"" }), _jsx("span", { className: classes.grayText, children: "Source database credentials and dumping options." }), _jsx(InputWithTooltip, { label: "source.connection.host *", value: formik.values.host, error: formik.errors.host, tooltipText: tooltipText.host, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('host', e.target.value) }), _jsx(InputWithTooltip, { label: "source.connection.port *", value: formik.values.port, error: formik.errors.port, tooltipText: tooltipText.port, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('port', e.target.value) }), _jsx(InputWithTooltip, { label: "source.connection.username *", value: formik.values.username, error: formik.errors.username, tooltipText: tooltipText.username, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('username', e.target.value) }), _jsx(InputWithTooltip, { type: "password", value: formik.values.password, label: "source.connection.password", tooltipText: tooltipText.password, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('password', e.target.value) }), _jsx(InputWithTooltip, { label: "source.connection.dbname *", value: formik.values.dbname, error: formik.errors.dbname, tooltipText: tooltipText.dbname, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('dbname', e.target.value) }), _jsx(InputWithChip, { id: "databases", value: formik.values.databases, label: "Databases to copy", tooltipText: tooltipText.databases, handleDeleteChip: handleDeleteChip, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('databases', e.target.value) }), _jsxs(Box, { mt: 3, mb: 3, children: [_jsxs(Button, { variant: "outlined", color: "secondary", onClick: () => {
+                                                            onTestConnectionClick({
+                                                                type: 'default',
+                                                            });
+                                                        }, disabled: testConnectionState.default.loading ||
+                                                            isConfigurationDisabled, children: ["Test connection", testConnectionState.default.loading && (_jsx(Spinner, { size: "sm", className: styles.spinner }))] }), testConnectionState.default.message.status ||
+                                                        testConnectionState.default.error ? (_jsx(ResponseMessage, { type: testConnectionState.default.error
+                                                            ? 'error'
+                                                            : testConnectionState.default.message.status
+                                                                ? testConnectionState.default.message.status
+                                                                : '', message: testConnectionState.default.error ||
+                                                            testConnectionState.default.message.message })) : null] }), _jsx(InputWithTooltip, { label: "pg_dump jobs", value: formik.values.dumpParallelJobs, tooltipText: tooltipText.dumpParallelJobs, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('dumpParallelJobs', e.target.value) }), _jsx(InputWithChip, { value: formik.values.pgDumpCustomOptions, label: "pg_dump customOptions", id: "pgDumpCustomOptions", tooltipText: tooltipText.pgDumpCustomOptions, handleDeleteChip: handleDeleteChip, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('pgDumpCustomOptions', e.target.value) }), _jsx(FormControlLabel, { style: { maxWidth: 'max-content' }, control: _jsx(Checkbox, { name: "dumpIgnoreErrors", checked: formik.values.dumpIgnoreErrors, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('dumpIgnoreErrors', e.target.checked), classes: {
+                                                        root: classes.checkboxRoot,
+                                                    } }), label: 'Ignore errors during logical data dump' })] })] }), _jsxs(Box, { mb: 2, mt: 1, children: [_jsx(ConfigSectionTitle, { tag: "databaseContainer" }), _jsx("span", { className: classes.grayText, style: { margin: '0.5rem 0 1rem 0', display: 'block' }, children: "DBLab manages various database containers, such as clones. This section defines default container settings." }), _jsxs("div", { children: [_jsx(SelectWithTooltip, { label: "dockerImage - choose from the list *", value: formik.values.dockerImageType, error: Boolean(formik.errors.dockerImageType), tooltipText: tooltipText.dockerImageType, disabled: isConfigurationDisabled || dockerState.loading, items: filteredDockerImageOptions.map((image) => {
+                                                    return {
+                                                        value: image.type,
+                                                        children: image.name,
+                                                    };
+                                                }), onChange: handleDockerImageSelect }), formik.values.dockerImageType === 'custom' ? (_jsx(InputWithTooltip, { label: "dockerImage *", value: formik.values.dockerImage, error: formik.errors.dockerImage, tooltipText: tooltipText.dockerImage, disabled: isConfigurationDisabled, onChange: (e) => {
+                                                    formik.setValues({
+                                                        ...formik.values,
+                                                        dockerImage: e.target.value,
+                                                        dockerPath: e.target.value,
+                                                    });
+                                                } })) : (_jsxs(_Fragment, { children: [_jsx(SelectWithTooltip, { label: "dockerImage - Postgres major version *", value: formik.values.dockerImage, error: Boolean(formik.errors.dockerImage), tooltipText: tooltipText.dockerImage, disabled: isConfigurationDisabled ||
+                                                            dockerState.loading ||
+                                                            !dockerState.images.length, loading: dockerState.loading, items: dockerState.images
+                                                            .slice()
+                                                            .reverse()
+                                                            .map((image) => {
+                                                            return {
+                                                                value: image,
+                                                                children: image,
+                                                            };
+                                                        }), onChange: handleDockerVersionSelect }), _jsxs(Box, { mt: 0.5, mb: 2, children: [_jsxs(Button, { variant: "outlined", color: "secondary", onClick: () => {
                                                                     onTestConnectionClick({
-                                                                        type: 'default',
+                                                                        type: 'dockerImage',
                                                                     });
-                                                                }, disabled: testConnectionState.default.loading ||
-                                                                    isConfigurationDisabled, children: ["Test connection", testConnectionState.default.loading && (_jsx(Spinner, { size: "sm", className: styles.spinner }))] }), testConnectionState.default.message.status ||
-                                                                testConnectionState.default.error ? (_jsx(ResponseMessage, { type: testConnectionState.default.error
+                                                                }, disabled: testConnectionState.dockerImage.loading ||
+                                                                    isConfigurationDisabled, children: ["Get version from source", testConnectionState.dockerImage.loading && (_jsx(Spinner, { size: "sm", className: styles.spinner }))] }), testConnectionState.dockerImage.message.status ===
+                                                                'error' || testConnectionState.dockerImage.error ? (_jsx(ResponseMessage, { type: testConnectionState.dockerImage.error ||
+                                                                    testConnectionState.dockerImage.message
                                                                     ? 'error'
-                                                                    : testConnectionState.default.message.status
-                                                                        ? testConnectionState.default.message.status
-                                                                        : '', message: testConnectionState.default.error ||
-                                                                    testConnectionState.default.message.message })) : null] }), _jsx(InputWithTooltip, { label: "pg_dump jobs", value: formik.values.dumpParallelJobs, tooltipText: tooltipText.dumpParallelJobs, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('dumpParallelJobs', e.target.value) }), _jsx(InputWithChip, { value: formik.values.pgDumpCustomOptions, label: "pg_dump customOptions", id: "pgDumpCustomOptions", tooltipText: tooltipText.pgDumpCustomOptions, handleDeleteChip: handleDeleteChip, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('pgDumpCustomOptions', e.target.value) }), _jsx(FormControlLabel, { style: { maxWidth: 'max-content' }, control: _jsx(Checkbox, { name: "dumpIgnoreErrors", checked: formik.values.dumpIgnoreErrors, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('dumpIgnoreErrors', e.target.checked), classes: {
-                                                                root: classes.checkboxRoot,
-                                                            } }), label: 'Ignore errors during logical data dump' })] }))] }), _jsxs(Box, { mb: 2, mt: 1, children: [_jsx(ConfigSectionTitle, { tag: "databaseContainer" }), _jsx("span", { className: classes.grayText, style: { margin: '0.5rem 0 1rem 0', display: 'block' }, children: "DBLab manages various database containers, such as clones. This section defines default container settings." }), _jsxs("div", { children: [_jsx(SelectWithTooltip, { label: "dockerImage - choose from the list *", value: formik.values.dockerImageType, error: Boolean(formik.errors.dockerImageType), tooltipText: tooltipText.dockerImageType, disabled: isConfigurationDisabled || dockerState.loading, items: filteredDockerImageOptions.map((image) => {
-                                                            return {
-                                                                value: image.type,
-                                                                children: image.name,
-                                                            };
-                                                        }), onChange: handleDockerImageSelect }), formik.values.dockerImageType === 'custom' ? (_jsx(InputWithTooltip, { label: "dockerImage *", value: formik.values.dockerImage, error: formik.errors.dockerImage, tooltipText: tooltipText.dockerImage, disabled: isConfigurationDisabled, onChange: (e) => {
+                                                                    : '', message: testConnectionState.dockerImage.error ||
+                                                                    testConnectionState.dockerImage.message.message })) : null] }), _jsx(SelectWithTooltip, { label: "dockerImage - tag *", value: formik.values.dockerTag, error: Boolean(formik.errors.dockerTag), tooltipText: tooltipText.dockerTag, disabled: isConfigurationDisabled ||
+                                                            dockerState.loading ||
+                                                            !dockerState.tags.length, loading: dockerState.loading, onChange: (e) => {
+                                                            var _a;
+                                                            const currentLocation = (_a = dockerState.data.find((image) => image.tag === e.target.value)) === null || _a === void 0 ? void 0 : _a.location;
                                                             formik.setValues({
                                                                 ...formik.values,
-                                                                dockerImage: e.target.value,
-                                                                dockerPath: e.target.value,
+                                                                dockerTag: e.target.value,
+                                                                dockerPath: currentLocation,
                                                             });
-                                                        } })) : (_jsxs(_Fragment, { children: [_jsx(SelectWithTooltip, { label: "dockerImage - Postgres major version *", value: formik.values.dockerImage, error: Boolean(formik.errors.dockerImage), tooltipText: tooltipText.dockerImage, disabled: isConfigurationDisabled ||
-                                                                    dockerState.loading ||
-                                                                    !dockerState.images.length, loading: dockerState.loading, items: dockerState.images
-                                                                    .slice()
-                                                                    .reverse()
-                                                                    .map((image) => {
-                                                                    return {
-                                                                        value: image,
-                                                                        children: image,
-                                                                    };
-                                                                }), onChange: handleDockerVersionSelect }), _jsxs(Box, { mt: 0.5, mb: 2, children: [_jsxs(Button, { variant: "outlined", color: "secondary", onClick: () => {
-                                                                            onTestConnectionClick({
-                                                                                type: 'dockerImage',
-                                                                            });
-                                                                        }, disabled: testConnectionState.dockerImage.loading ||
-                                                                            isConfigurationDisabled, children: ["Get version from source", testConnectionState.dockerImage.loading && (_jsx(Spinner, { size: "sm", className: styles.spinner }))] }), testConnectionState.dockerImage.message.status ===
-                                                                        'error' || testConnectionState.dockerImage.error ? (_jsx(ResponseMessage, { type: testConnectionState.dockerImage.error ||
-                                                                            testConnectionState.dockerImage.message
-                                                                            ? 'error'
-                                                                            : '', message: testConnectionState.dockerImage.error ||
-                                                                            testConnectionState.dockerImage.message.message })) : null] }), _jsx(SelectWithTooltip, { label: "dockerImage - tag *", value: formik.values.dockerTag, error: Boolean(formik.errors.dockerTag), tooltipText: tooltipText.dockerTag, disabled: isConfigurationDisabled ||
-                                                                    dockerState.loading ||
-                                                                    !dockerState.tags.length, loading: dockerState.loading, onChange: (e) => {
-                                                                    var _a;
-                                                                    const currentLocation = (_a = dockerState.data.find((image) => image.tag === e.target.value)) === null || _a === void 0 ? void 0 : _a.location;
-                                                                    formik.setValues({
-                                                                        ...formik.values,
-                                                                        dockerTag: e.target.value,
-                                                                        dockerPath: currentLocation,
-                                                                    });
-                                                                }, items: dockerState.tags.map((image) => {
-                                                                    return {
-                                                                        value: image,
-                                                                        children: image,
-                                                                    };
-                                                                }) })] })), _jsxs(Typography, { paragraph: true, children: ["Cannot find your image? Reach out to support:", ' ', _jsxs("a", { href: 'https://postgres.ai/contact', target: "_blank", className: styles.externalLink, children: ["https://postgres.ai/contact", _jsx(ExternalIcon, { className: styles.externalIcon })] })] })] })] }), _jsxs(Box, { mb: 3, children: [_jsx(ConfigSectionTitle, { tag: "databaseConfigs" }), _jsx("span", { className: classes.grayText, style: { marginTop: '0.5rem', display: 'block' }, children: "Default PostgreSQL configuration used for all PostgreSQL instances running in containers managed by DBLab." }), _jsx(InputWithTooltip, { type: "textarea", label: "shared_buffers parameter", value: formik.values.sharedBuffers, tooltipText: tooltipText.sharedBuffers, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('sharedBuffers', e.target.value) }), _jsx(InputWithTooltip, { type: "textarea", label: "shared_preload_libraries", value: formik.values.sharedPreloadLibraries, tooltipText: tooltipText.sharedPreloadLibraries, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('sharedPreloadLibraries', e.target.value) }), _jsx(InputWithTooltip, { type: "textarea", label: "Query tuning parameters", value: typeof formik.values.tuningParams === 'object'
-                                                    ? Object.entries(formik.values.tuningParams)
-                                                        .map(([key, value]) => `${key}=${value}`)
-                                                        .join('\n')
-                                                    : formik.values.tuningParams, tooltipText: tooltipText.tuningParams, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('tuningParams', e.target.value) }), _jsxs(Button, { variant: "outlined", color: "secondary", onClick: () => {
-                                                    onTestConnectionClick({
-                                                        type: 'fetchTuning',
-                                                    });
-                                                }, disabled: testConnectionState.fetchTuning.loading ||
-                                                    isConfigurationDisabled, children: ["Get from source database", testConnectionState.fetchTuning.loading && (_jsx(Spinner, { size: "sm", className: styles.spinner }))] }), testConnectionState.fetchTuning.message.status === 'error' ||
-                                                testConnectionState.fetchTuning.error ? (_jsx(ResponseMessage, { type: testConnectionState.fetchTuning.error ||
-                                                    testConnectionState.fetchTuning.message
-                                                    ? 'error'
-                                                    : '', message: testConnectionState.fetchTuning.error ||
-                                                    testConnectionState.fetchTuning.message.message })) : null] }), formik.values.retrievalMode === 'logical' && (_jsxs(Box, { children: [_jsxs(Box, { children: [_jsx(Typography, { className: styles.subsection, children: "Subsection \"retrieval.spec.logicalRestore\"" }), _jsx("span", { className: classes.grayText, children: "Restoring options." })] }), _jsx(InputWithTooltip, { label: "pg_restore jobs", value: formik.values.restoreParallelJobs, tooltipText: tooltipText.restoreParallelJobs, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('restoreParallelJobs', e.target.value) }), _jsx(InputWithChip, { value: formik.values.pgRestoreCustomOptions, label: "pg_restore customOptions", id: "pgRestoreCustomOptions", tooltipText: tooltipText.pgRestoreCustomOptions, handleDeleteChip: handleDeleteChip, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('pgRestoreCustomOptions', e.target.value) }), _jsx(InputWithTooltip, { type: "textarea", label: "Restore PostgreSQL configs", value: formik.values.restoreConfigs, tooltipText: tooltipText.restoreConfigs, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('restoreConfigs', e.target.value) }), _jsx(FormControlLabel, { style: { maxWidth: 'max-content' }, control: _jsx(Checkbox, { name: "restoreIgnoreErrors", checked: formik.values.restoreIgnoreErrors, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('restoreIgnoreErrors', e.target.checked), classes: {
-                                                        root: classes.checkboxRoot,
-                                                    } }), label: 'Ignore errors during logical data restore' })] })), _jsx(Box, { mt: 1, children: _jsx(Typography, { className: styles.subsection, children: "Subsection \"retrieval.refresh\"" }) }), _jsxs("span", { className: classes.grayText, children: ["Define full data refresh on schedule. The process requires at least one additional filesystem mount point. The schedule is to be specified using", ' ', _jsxs("a", { href: "https://en.wikipedia.org/wiki/Cron#Overview", target: "_blank", className: styles.externalLink, children: ["crontab format", _jsx(ExternalIcon, { className: styles.externalIcon })] }), "."] }), _jsx(InputWithTooltip, { label: "timetable", value: formik.values.timetable, tooltipText: tooltipText.timetable, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('timetable', e.target.value) })] }), _jsxs(Box, { mt: 2, mb: 2, sx: {
-                                    display: 'flex',
-                                    alignItems: 'center',
-                                }, children: [_jsxs(Button, { variant: "contained", color: "secondary", onClick: () => {
-                                            formik.submitForm().then(() => {
-                                                scrollToField();
+                                                        }, items: dockerState.tags.map((image) => {
+                                                            return {
+                                                                value: image,
+                                                                children: image,
+                                                            };
+                                                        }) })] })), _jsxs(Typography, { paragraph: true, children: ["Cannot find your image? Reach out to support:", ' ', _jsxs("a", { href: 'https://postgres.ai/contact', target: "_blank", className: styles.externalLink, children: ["https://postgres.ai/contact", _jsx(ExternalIcon, { className: styles.externalIcon })] })] })] })] }), _jsxs(Box, { mb: 3, children: [_jsx(ConfigSectionTitle, { tag: "databaseConfigs" }), _jsx("span", { className: classes.grayText, style: { marginTop: '0.5rem', display: 'block' }, children: "Default PostgreSQL configuration used for all PostgreSQL instances running in containers managed by DBLab." }), _jsx(InputWithTooltip, { type: "textarea", label: "shared_buffers parameter", value: formik.values.sharedBuffers, tooltipText: tooltipText.sharedBuffers, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('sharedBuffers', e.target.value) }), _jsx(InputWithTooltip, { type: "textarea", label: "shared_preload_libraries", value: formik.values.sharedPreloadLibraries, tooltipText: tooltipText.sharedPreloadLibraries, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('sharedPreloadLibraries', e.target.value) }), _jsx(InputWithTooltip, { type: "textarea", label: "Query tuning parameters", value: typeof formik.values.tuningParams === 'object'
+                                            ? Object.entries(formik.values.tuningParams)
+                                                .map(([key, value]) => `${key}=${value}`)
+                                                .join('\n')
+                                            : formik.values.tuningParams, tooltipText: tooltipText.tuningParams, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('tuningParams', e.target.value) }), _jsxs(Button, { variant: "outlined", color: "secondary", onClick: () => {
+                                            onTestConnectionClick({
+                                                type: 'fetchTuning',
                                             });
-                                        }, disabled: formik.isSubmitting || isConfigurationDisabled, children: ["Apply changes", formik.isSubmitting && (_jsx(Spinner, { size: "sm", className: styles.spinner }))] }), _jsx(Box, { sx: { px: 2 }, children: _jsx(Button, { variant: "outlined", color: "secondary", onClick: switchTab, children: "Cancel" }) })] }), (submitState.status && submitState.response) || configError ? (_jsx(ResponseMessage, { type: configError ? 'error' : submitState.status, message: configError || submitState.response })) : null] })) : null] })), _jsx(Modal, { title: _jsx(ModalTitle, {}), onClose: () => setIsModalOpen(false), isOpen: isModalOpen, size: "xl", children: _jsx(Editor, { height: "70vh", width: "100%", defaultLanguage: "yaml", value: getFullConfigError ? getFullConfigError : fullConfig, loading: _jsx(StubSpinner, {}), theme: "vs-light", options: { domReadOnly: true, readOnly: true } }) })] }));
+                                        }, disabled: testConnectionState.fetchTuning.loading ||
+                                            isConfigurationDisabled, children: ["Get from source database", testConnectionState.fetchTuning.loading && (_jsx(Spinner, { size: "sm", className: styles.spinner }))] }), testConnectionState.fetchTuning.message.status === 'error' ||
+                                        testConnectionState.fetchTuning.error ? (_jsx(ResponseMessage, { type: testConnectionState.fetchTuning.error ||
+                                            testConnectionState.fetchTuning.message
+                                            ? 'error'
+                                            : '', message: testConnectionState.fetchTuning.error ||
+                                            testConnectionState.fetchTuning.message.message })) : null] }), _jsxs(Box, { children: [_jsxs(Box, { children: [_jsx(Typography, { className: styles.subsection, children: "Subsection \"retrieval.spec.logicalRestore\"" }), _jsx("span", { className: classes.grayText, children: "Restoring options." })] }), _jsx(InputWithTooltip, { label: "pg_restore jobs", value: formik.values.restoreParallelJobs, tooltipText: tooltipText.restoreParallelJobs, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('restoreParallelJobs', e.target.value) }), _jsx(InputWithChip, { value: formik.values.pgRestoreCustomOptions, label: "pg_restore customOptions", id: "pgRestoreCustomOptions", tooltipText: tooltipText.pgRestoreCustomOptions, handleDeleteChip: handleDeleteChip, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('pgRestoreCustomOptions', e.target.value) }), _jsx(InputWithTooltip, { type: "textarea", label: "Restore PostgreSQL configs", value: formik.values.restoreConfigs, tooltipText: tooltipText.restoreConfigs, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('restoreConfigs', e.target.value) }), _jsx(FormControlLabel, { style: { maxWidth: 'max-content' }, control: _jsx(Checkbox, { name: "restoreIgnoreErrors", checked: formik.values.restoreIgnoreErrors, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('restoreIgnoreErrors', e.target.checked), classes: {
+                                                root: classes.checkboxRoot,
+                                            } }), label: 'Ignore errors during logical data restore' })] }), _jsx(Box, { mt: 1, children: _jsx(Typography, { className: styles.subsection, children: "Subsection \"retrieval.refresh\"" }) }), _jsxs("span", { className: classes.grayText, children: ["Define full data refresh on schedule. The process requires at least one additional filesystem mount point. The schedule is to be specified using", ' ', _jsxs("a", { href: "https://en.wikipedia.org/wiki/Cron#Overview", target: "_blank", className: styles.externalLink, children: ["crontab format", _jsx(ExternalIcon, { className: styles.externalIcon })] }), "."] }), _jsx(InputWithTooltip, { label: "timetable", value: formik.values.timetable, tooltipText: tooltipText.timetable, disabled: isConfigurationDisabled, onChange: (e) => formik.setFieldValue('timetable', e.target.value) })] }), _jsxs(Box, { mt: 2, mb: 2, sx: {
+                            display: 'flex',
+                            alignItems: 'center',
+                        }, children: [_jsxs(Button, { variant: "contained", color: "secondary", onClick: () => {
+                                    formik.submitForm().then(() => {
+                                        scrollToField();
+                                    });
+                                }, disabled: formik.isSubmitting || isConfigurationDisabled, children: ["Apply changes", formik.isSubmitting && (_jsx(Spinner, { size: "sm", className: styles.spinner }))] }), _jsx(Box, { sx: { px: 2 }, children: _jsx(Button, { variant: "outlined", color: "secondary", onClick: switchTab, children: "Cancel" }) })] }), (submitState.status && submitState.response) || configError ? (_jsx(ResponseMessage, { type: configError ? 'error' : submitState.status, message: configError || submitState.response })) : null] })), _jsx(Modal, { title: _jsx(ModalTitle, {}), onClose: () => setIsModalOpen(false), isOpen: isModalOpen, size: "xl", children: _jsx(Editor, { height: "70vh", width: "100%", defaultLanguage: "yaml", value: getFullConfigError ? getFullConfigError : fullConfig, loading: _jsx(StubSpinner, {}), theme: "vs-light", options: { domReadOnly: true, readOnly: true } }) })] }));
 });

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

@@ -1,10 +1,4 @@
 /// <reference types="react" />
-export declare type RetrievalMode = 'logical' | 'physical';
-export declare type PhysicalTool = 'walg' | 'pgbackrest' | 'customTool' | '';
-export declare type PhysicalEnv = {
-    key: string;
-    value: string;
-};
 export declare type FormValues = {
     debug: boolean;
     dockerImage: string;
@@ -28,14 +22,6 @@ export declare type FormValues = {
     restoreConfigs: string;
     pgDumpCustomOptions: string;
     pgRestoreCustomOptions: string;
-    retrievalMode: RetrievalMode;
-    physicalTool: PhysicalTool;
-    physicalDockerImage: string;
-    physicalSyncEnabled: boolean;
-    physicalWalgBackupName: string;
-    physicalPgbackrestStanza: string;
-    physicalPgbackrestDelta: boolean;
-    physicalEnvs: PhysicalEnv[];
 };
 export declare const useForm: (onSubmit: (values: FormValues) => void) => {
     formik: {
@@ -94,10 +80,4 @@ export declare const useForm: (onSubmit: (values: FormValues) => void) => {
         dbname: string;
     };
     isConnectionDataValid: string;
-    connectionString: string;
-    connectionStringError: string | null;
-    onConnectionStringChange: (s: string) => void;
-    markPortInitialState: (wasUnset: boolean) => void;
-    markPortDirty: () => void;
-    omitPortOnSubmit: boolean;
 }[];

package/pages/Instance/Configuration/useForm.js

@@ -4,64 +4,14 @@
  * Unauthorized copying of this file, via any medium is strictly prohibited
  *--------------------------------------------------------------------------
  */
-import { useMemo, useState } from 'react';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
-import { ConnectionStringError, connectionStringFromFields, connectionStringToFields, } from './connectionString';
-// Logical-mode required fields. Validation skips the source-connection block
-// when retrievalMode is "physical" — that branch uses tool-specific inputs
-// instead of a connection URL.
 const Schema = Yup.object().shape({
     dockerImage: Yup.string().required('Docker image is required'),
-    dbname: Yup.string().when('retrievalMode', {
-        is: 'logical',
-        then: (s) => s.required('Dbname is required'),
-    }),
-    host: Yup.string().when('retrievalMode', {
-        is: 'logical',
-        then: (s) => s.required('Host is required'),
-    }),
-    port: Yup.string().when('retrievalMode', {
-        is: 'logical',
-        then: (s) => s.required('Port is required'),
-    }),
-    username: Yup.string().when('retrievalMode', {
-        is: 'logical',
-        then: (s) => s.required('Username is required'),
-    }),
-    physicalEnvs: Yup.array()
-        .of(Yup.object().shape({
-        key: Yup.string(),
-        value: Yup.string(),
-    }))
-        .test('unique-keys', '', function (envs) {
-        if (!envs)
-            return true;
-        const positions = new Map();
-        envs.forEach((row, i) => {
-            var _a, _b;
-            const trimmed = ((_a = row === null || row === void 0 ? void 0 : row.key) !== null && _a !== void 0 ? _a : '').trim();
-            if (!trimmed)
-                return;
-            const list = (_b = positions.get(trimmed)) !== null && _b !== void 0 ? _b : [];
-            list.push(i);
-            positions.set(trimmed, list);
-        });
-        const dupes = [];
-        for (const indices of positions.values()) {
-            if (indices.length < 2)
-                continue;
-            for (const i of indices) {
-                dupes.push(this.createError({
-                    path: `${this.path}[${i}].key`,
-                    message: 'Duplicate key',
-                }));
-            }
-        }
-        if (dupes.length === 0)
-            return true;
-        return new Yup.ValidationError(dupes);
-    }),
+    dbname: Yup.string().required('Dbname is required'),
+    host: Yup.string().required('Host is required'),
+    port: Yup.string().required('Port is required'),
+    username: Yup.string().required('Username is required'),
 });
 export const useForm = (onSubmit) => {
     const formik = useFormik({
@@ -88,71 +38,12 @@ export const useForm = (onSubmit) => {
             pgRestoreCustomOptions: '',
             dumpIgnoreErrors: false,
             restoreIgnoreErrors: false,
-            retrievalMode: 'logical',
-            physicalTool: '',
-            physicalDockerImage: '',
-            physicalSyncEnabled: false,
-            physicalWalgBackupName: '',
-            physicalPgbackrestStanza: '',
-            physicalPgbackrestDelta: false,
-            physicalEnvs: [],
         },
         validationSchema: Schema,
         onSubmit,
         validateOnBlur: false,
         validateOnChange: false,
     });
-    const [originalPortWasUnset, setOriginalPortWasUnset] = useState(false);
-    const [portDirty, setPortDirty] = useState(false);
-    const [connectionStringError, setConnectionStringError] = useState(null);
-    const connectionString = useMemo(() => connectionStringFromFields({
-        host: formik.values.host,
-        port: formik.values.port || '5432',
-        username: formik.values.username,
-        dbname: formik.values.dbname,
-    }, { omitDefaultPort: originalPortWasUnset && !portDirty }), [
-        formik.values.host,
-        formik.values.port,
-        formik.values.username,
-        formik.values.dbname,
-        originalPortWasUnset,
-        portDirty,
-    ]);
-    const onConnectionStringChange = (s) => {
-        if (!s.trim()) {
-            setConnectionStringError(null);
-            formik.setValues({
-                ...formik.values,
-                host: '',
-                port: '',
-                username: '',
-                dbname: '',
-            });
-            return;
-        }
-        try {
-            const parsed = connectionStringToFields(s);
-            setConnectionStringError(null);
-            if (parsed.portWasExplicit)
-                setPortDirty(true);
-            formik.setValues({
-                ...formik.values,
-                host: parsed.fields.host,
-                port: parsed.fields.port,
-                username: parsed.fields.username,
-                dbname: parsed.fields.dbname,
-            });
-        }
-        catch (err) {
-            if (err instanceof ConnectionStringError)
-                setConnectionStringError(err.message);
-            else
-                throw err;
-        }
-    };
-    const markPortInitialState = (wasUnset) => setOriginalPortWasUnset(wasUnset);
-    const markPortDirty = () => setPortDirty(true);
-    const omitPortOnSubmit = originalPortWasUnset && !portDirty;
     const formatDatabaseArray = (database) => {
         let databases = [];
         const splitDatabaseArray = database.split(/[,(\s)(\n)(\r)(\t)(\r\n)]/);
@@ -180,17 +71,5 @@ export const useForm = (onSubmit) => {
         formik.values.port &&
         formik.values.username &&
         formik.values.dbname;
-    return [
-        {
-            formik,
-            connectionData,
-            isConnectionDataValid,
-            connectionString,
-            connectionStringError,
-            onConnectionStringChange,
-            markPortInitialState,
-            markPortDirty,
-            omitPortOnSubmit,
-        },
-    ];
+    return [{ formik, connectionData, isConnectionDataValid }];
 };

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

@@ -1,6 +1,22 @@
 import { dockerImageOptions } from '../configOptions';
-import { dockerImagesConfig, genericImagePrefix } from '../dockerCatalog';
 const seContainerRegistry = 'se-images';
+const genericImagePrefix = 'postgresai/extended-postgres';
+// Predefined list of Docker images for UI display
+// This list is shown to users for convenient selection
+// IMPORTANT: if user specified an image in config that's not in this list,
+// it will be automatically added via createEnhancedDockerImages()
+const dockerImagesConfig = {
+    '9.6': ['0.5.3', '0.5.2', '0.5.1'],
+    '10': ['0.5.3', '0.5.2', '0.5.1'],
+    '11': ['0.5.3', '0.5.2', '0.5.1'],
+    '12': ['0.5.3', '0.5.2', '0.5.1'],
+    '13': ['0.5.3', '0.5.2', '0.5.1'],
+    '14': ['0.5.3', '0.5.2', '0.5.1'],
+    '15': ['0.5.3', '0.5.2', '0.5.1'],
+    '16': ['0.5.3', '0.5.2', '0.5.1'],
+    '17': ['0.5.3', '0.5.2', '0.5.1'],
+    '18': ['0.6.1'],
+};
 export const uniqueChipValue = (values) => {
     const splitChipArray = values.split(/[,(\s)(\n)(\r)(\t)(\r\n)]/);
     let databaseArray = [];