@postgres.ai/shared 4.0.0-pr-1042.2 → 4.0.0-pr-1043

package/package.json

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

package/pages/Instance/Configuration/index.js

@@ -5,7 +5,7 @@ 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 } 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, } from '@material-ui/core';
@@ -20,7 +20,7 @@ import { useForm } from './useForm';
 import { ResponseMessage } from './ResponseMessage';
 import { ConfigSectionTitle, Header, ModalTitle } from './Header';
 import { dockerImageOptions, imagePgOptions } from './configOptions';
-import { uniqueChipValue, customOrGenericImage, genericDockerImages, } from './utils';
+import { uniqueChipValue, customOrGenericImage, createEnhancedDockerImages, } from './utils';
 import { SelectWithTooltip, InputWithChip, InputWithTooltip, } from './InputWithTooltip';
 import styles from './styles.module.scss';
 import { formatTuningParams, formatTuningParamsToObj, } from '@postgres.ai/shared/types/api/endpoints/testDbSource';
@@ -108,6 +108,25 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, is
         });
     };
     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(() => {
+        return createEnhancedDockerImages((configData === null || configData === void 0 ? void 0 : configData.dockerImageType) === 'Generic Postgres' ? configData === null || configData === void 0 ? void 0 : configData.dockerPath : undefined, (configData === null || configData === void 0 ? void 0 : configData.dockerImageType) === 'Generic Postgres' ? configData === null || configData === void 0 ? void 0 : configData.dockerTag : undefined);
+    }, [configData === null || configData === void 0 ? void 0 : configData.dockerPath, configData === null || configData === void 0 ? void 0 : configData.dockerTag, configData === null || configData === void 0 ? void 0 : configData.dockerImageType]);
+    // Memoized computed values from enhanced images
+    const dockerImageVersions = useMemo(() => {
+        return enhancedDockerImages
+            .map((image) => image.pg_major_version)
+            .filter((value, index, self) => self.indexOf(value) === index)
+            .sort((a, b) => Number(a) - Number(b));
+    }, [enhancedDockerImages]);
+    // Memoized tags and locations for performance
+    const dockerTags = useMemo(() => {
+        return enhancedDockerImages.map((image) => image.tag);
+    }, [enhancedDockerImages]);
+    const dockerLocations = useMemo(() => {
+        return enhancedDockerImages.map((image) => image.location);
+    }, [enhancedDockerImages]);
     const scrollToField = () => {
         const errorElement = document.querySelector('.Mui-error');
         if (errorElement) {
@@ -310,28 +329,21 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, is
     };
     const handleDockerImageSelect = (e) => {
         if (e.target.value === 'Generic Postgres') {
-            const genericImageVersions = genericDockerImages
-                .map((image) => image.pg_major_version)
-                .filter((value, index, self) => self.indexOf(value) === index)
-                .sort((a, b) => Number(a) - Number(b));
-            const currentDockerImage = genericImageVersions.slice(-1)[0];
+            // Use memoized enhanced list for better performance
+            const currentDockerImage = dockerImageVersions.slice(-1)[0];
             setDockerState({
                 ...dockerState,
-                tags: genericDockerImages
-                    .map((image) => image.tag)
-                    .filter((tag) => tag.startsWith(currentDockerImage)),
-                locations: genericDockerImages
-                    .map((image) => image.location)
-                    .filter((location) => location === null || location === void 0 ? void 0 : location.includes(currentDockerImage)),
-                images: genericImageVersions,
-                data: genericDockerImages,
+                tags: dockerTags.filter((tag) => tag.startsWith(currentDockerImage)),
+                locations: dockerLocations.filter((location) => location === null || location === void 0 ? void 0 : location.includes(currentDockerImage)),
+                images: dockerImageVersions,
+                data: enhancedDockerImages,
             });
             formik.setValues({
                 ...formik.values,
                 dockerImage: currentDockerImage,
                 dockerImageType: e.target.value,
-                dockerTag: genericDockerImages.map((image) => image.tag)[0],
-                dockerPath: genericDockerImages.map((image) => image.location)[0],
+                dockerTag: dockerTags[0],
+                dockerPath: dockerLocations[0],
                 sharedPreloadLibraries: 'pg_stat_statements,pg_stat_kcache,pg_cron,pgaudit,anon',
             });
         }
@@ -367,13 +379,26 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, is
                 ...dockerState,
                 tags: updatedDockerTags,
             });
-            const currentLocation = (_a = dockerState.data.find((image) => image.tag === updatedDockerTags[0])) === null || _a === void 0 ? void 0 : _a.location;
-            formik.setValues({
-                ...formik.values,
-                dockerTag: updatedDockerTags[0],
-                dockerImage: e.target.value,
-                dockerPath: currentLocation,
-            });
+            // Add safety check for empty array
+            const firstTag = updatedDockerTags[0];
+            if (firstTag) {
+                const currentLocation = (_a = dockerState.data.find((image) => image.tag === firstTag)) === null || _a === void 0 ? void 0 : _a.location;
+                formik.setValues({
+                    ...formik.values,
+                    dockerTag: firstTag,
+                    dockerImage: e.target.value,
+                    dockerPath: currentLocation || '',
+                });
+            }
+            else {
+                // Fallback when no matching tags found
+                formik.setValues({
+                    ...formik.values,
+                    dockerImage: e.target.value,
+                    dockerTag: '',
+                    dockerPath: '',
+                });
+            }
         }
         else {
             formik.setValues({
@@ -395,22 +420,32 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, is
                 }
                 if (customOrGenericImage(configData === null || configData === void 0 ? void 0 : configData.dockerImageType)) {
                     if ((configData === null || configData === void 0 ? void 0 : configData.dockerImageType) === 'Generic Postgres') {
-                        const genericImageVersions = genericDockerImages
-                            .map((image) => image.pg_major_version)
-                            .filter((value, index, self) => self.indexOf(value) === index)
-                            .sort((a, b) => Number(a) - Number(b));
-                        const currentDockerImage = genericDockerImages.filter((image) => image.location === (configData === null || configData === void 0 ? void 0 : configData.dockerPath))[0] ||
-                            genericDockerImages.filter((image) => { var _a; return (_a = configData === null || configData === void 0 ? void 0 : configData.dockerPath) === null || _a === void 0 ? void 0 : _a.includes(image.pg_major_version); })[0];
-                        setDockerState({
-                            ...dockerState,
-                            tags: genericDockerImages
-                                .map((image) => image.tag)
-                                .filter((tag) => tag.startsWith(currentDockerImage.pg_major_version)),
-                            images: genericImageVersions,
-                            data: genericDockerImages,
-                        });
-                        formik.setFieldValue('dockerTag', currentDockerImage === null || currentDockerImage === void 0 ? void 0 : currentDockerImage.tag);
-                        formik.setFieldValue('dockerImage', currentDockerImage.pg_major_version);
+                        // Use memoized enhanced list for better performance
+                        const currentDockerImage = enhancedDockerImages.find((image) => image.location === (configData === null || configData === void 0 ? void 0 : configData.dockerPath) || image.tag === (configData === null || configData === void 0 ? void 0 : configData.dockerTag));
+                        if (currentDockerImage) {
+                            setDockerState({
+                                ...dockerState,
+                                tags: dockerTags.filter((tag) => tag.startsWith(currentDockerImage.pg_major_version)),
+                                images: dockerImageVersions,
+                                data: enhancedDockerImages,
+                            });
+                            formik.setFieldValue('dockerTag', currentDockerImage.tag);
+                            formik.setFieldValue('dockerImage', currentDockerImage.pg_major_version);
+                            formik.setFieldValue('dockerPath', currentDockerImage.location);
+                        }
+                        else {
+                            // Fallback: shouldn't happen with enhancedDockerImages, but keep for safety
+                            const fallbackVersion = dockerImageVersions.slice(-1)[0];
+                            setDockerState({
+                                ...dockerState,
+                                tags: dockerTags.filter((tag) => tag.startsWith(fallbackVersion)),
+                                images: dockerImageVersions,
+                                data: enhancedDockerImages,
+                            });
+                            formik.setFieldValue('dockerTag', (configData === null || configData === void 0 ? void 0 : configData.dockerTag) || '');
+                            formik.setFieldValue('dockerImage', fallbackVersion);
+                            formik.setFieldValue('dockerPath', (configData === null || configData === void 0 ? void 0 : configData.dockerPath) || '');
+                        }
                     }
                     else {
                         formik.setFieldValue('dockerImage', configData === null || configData === void 0 ? void 0 : configData.dockerPath);
@@ -418,7 +453,7 @@ export const Configuration = observer(({ instanceId, switchActiveTab, reload, is
                 }
             }
         }
-    }, [config]);
+    }, [config, configData === null || configData === void 0 ? void 0 : configData.dockerPath, configData === null || configData === void 0 ? void 0 : configData.dockerTag, configData === null || configData === void 0 ? void 0 : configData.dockerImageType]);
     useEffect(() => {
         getEngine(instanceId).then((res) => {
             setDledition(String(res === null || res === void 0 ? void 0 : res.edition));

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

@@ -19,4 +19,7 @@ export declare const formatDatabases: (databases: DatabaseType | null) => string
 export declare const formatDumpCustomOptions: (options: string[] | null) => string;
 export declare const postUniqueCustomOptions: (options: string) => string[];
 export declare const customOrGenericImage: (dockerImage: string | undefined) => boolean;
+export declare const createFallbackDockerImage: (dockerPath: string, dockerTag: string) => DockerImage;
+export declare const createEnhancedDockerImages: (configDockerPath?: string, configDockerTag?: string) => DockerImage[];
+export declare const isConfigLoadedImage: (dockerPath: string, dockerTag: string) => boolean;
 export {};

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

@@ -1,7 +1,10 @@
 import { dockerImageOptions } from '../configOptions';
 const seContainerRegistry = 'se-images';
 const genericImagePrefix = 'postgresai/extended-postgres';
-// since some tags are rc, we need to specify the exact tags to use
+// 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'],
@@ -73,11 +76,23 @@ export const getImageType = (imageUrl) => {
     }
 };
 export const getImageMajorVersion = (pgImage) => {
-    const pgImageVersion = pgImage === null || pgImage === void 0 ? void 0 : pgImage.split(':')[1];
-    const pgServerVersion = pgImageVersion === null || pgImageVersion === void 0 ? void 0 : pgImageVersion.split('-')[0];
-    return (pgServerVersion === null || pgServerVersion === void 0 ? void 0 : pgServerVersion.includes('.'))
-        ? pgServerVersion === null || pgServerVersion === void 0 ? void 0 : pgServerVersion.split('.')[0]
-        : pgServerVersion;
+    if (!pgImage)
+        return undefined;
+    try {
+        const pgImageVersion = pgImage.split(':')[1];
+        if (!pgImageVersion)
+            return undefined;
+        const pgServerVersion = pgImageVersion.split('-')[0];
+        if (!pgServerVersion)
+            return undefined;
+        return pgServerVersion.includes('.')
+            ? pgServerVersion.split('.')[0]
+            : pgServerVersion;
+    }
+    catch (error) {
+        // Return undefined for malformed image strings
+        return undefined;
+    }
 };
 export const formatDatabases = (databases) => {
     let formattedDatabases = '';
@@ -103,3 +118,53 @@ export const postUniqueCustomOptions = (options) => {
     return uniqueOptions;
 };
 export const customOrGenericImage = (dockerImage) => dockerImage === 'Generic Postgres' || dockerImage === 'custom';
+export const createFallbackDockerImage = (dockerPath, dockerTag) => {
+    const majorVersion = getImageMajorVersion(dockerPath) || '16'; // Default to 16 if version can't be extracted
+    return {
+        package_group: 'postgresai',
+        pg_major_version: majorVersion,
+        tag: dockerTag || `${majorVersion}-custom`,
+        location: dockerPath,
+    };
+};
+// Creates enhanced list of Docker images, including image from configuration
+export const createEnhancedDockerImages = (configDockerPath, configDockerTag) => {
+    let enhancedImages = [...genericDockerImages];
+    // If there's an image in config, check if we need to add it
+    if (configDockerPath && configDockerTag) {
+        const existingImage = genericDockerImages.find((image) => image.location === configDockerPath || image.tag === configDockerTag);
+        // If image not found in predefined list, add it
+        if (!existingImage) {
+            // Check if this is a Generic Postgres image
+            if (configDockerPath.includes(genericImagePrefix)) {
+                // For Generic Postgres images create proper structure
+                const majorVersion = getImageMajorVersion(configDockerPath);
+                if (majorVersion) {
+                    const configImage = {
+                        package_group: 'postgresai',
+                        pg_major_version: majorVersion,
+                        tag: configDockerTag,
+                        location: configDockerPath,
+                    };
+                    enhancedImages.push(configImage);
+                }
+                else {
+                    // Fallback if version extraction failed
+                    const configImage = createFallbackDockerImage(configDockerPath, configDockerTag);
+                    enhancedImages.push(configImage);
+                }
+            }
+            else {
+                // For custom images use fallback
+                const configImage = createFallbackDockerImage(configDockerPath, configDockerTag);
+                enhancedImages.push(configImage);
+            }
+        }
+    }
+    return enhancedImages;
+};
+// Checks if image is loaded from configuration (not from predefined list)
+export const isConfigLoadedImage = (dockerPath, dockerTag) => {
+    const existingImage = genericDockerImages.find((image) => image.location === dockerPath || image.tag === dockerTag);
+    return !existingImage;
+};

package/types/api/entities/config.js

@@ -7,12 +7,15 @@ export const formatConfig = (config) => {
         debug: (_b = config.global) === null || _b === void 0 ? void 0 : _b.debug,
         dockerImage: isSeDockerImage(dockerImage)
             ? getImageMajorVersion(dockerImage)
-            : dockerImage,
+            : dockerImage && getImageType(dockerImage) === 'Generic Postgres'
+                ? getImageMajorVersion(dockerImage) || dockerImage
+                : dockerImage,
         ...(dockerImage && {
             dockerImageType: getImageType(dockerImage),
         }),
-        ...(isSeDockerImage(dockerImage) && {
-            dockerTag: dockerImage === null || dockerImage === void 0 ? void 0 : dockerImage.split(':')[1],
+        // Extract dockerTag for both SE images and Generic Postgres images
+        ...(dockerImage && dockerImage.includes(':') && {
+            dockerTag: dockerImage.split(':')[1],
         }),
         dockerPath: dockerImage,
         tuningParams: formatTuningParams((_c = config.databaseConfigs) === null || _c === void 0 ? void 0 : _c.configs),