Merge branch '479-fix-docker-image-type' into 'master'

fix(ui): correct docker image generation based on type

See merge request postgres-ai/database-lab!665

Author: agneum

Diff for: ui/packages/shared/pages/Configuration/index.tsx

@@ -213,7 +213,9 @@ export const Configuration = observer(
     const handleDockerImageSelect = (
       e: React.ChangeEvent<HTMLInputElement>,
     ) => {
-      const newDockerImages = formatDockerImageArray(e.target.value)
+      const selectedDockerImage =
+        e.target.value === 'rdsAurora' ? 'rds' : e.target.value
+      const newDockerImages = formatDockerImageArray(selectedDockerImage)
       setDockerImages(newDockerImages)
       handleSelectPgOptions(
         e,
@@ -232,8 +234,13 @@ export const Configuration = observer(
       formik.setFieldValue('dockerImageType', e.target.value)
 
       // select latest Postgres version on dockerImage change
-      if (configData?.dockerImageType !== e.target.value) {
+      if (
+        configData?.dockerImageType !== e.target.value &&
+        selectedDockerImage !== 'custom'
+      ) {
         formik.setFieldValue('dockerImage', newDockerImages.slice(-1)[0])
+      } else if (selectedDockerImage === 'custom') {
+        formik.setFieldValue('dockerImage', '')
       } else {
         formik.setFieldValue('dockerImage', configData?.dockerImage)
       }

Diff for: ui/packages/shared/pages/Configuration/utils/index.ts

@@ -65,14 +65,18 @@ export const getImageType = (imageUrl: string) => {
     imageUrl.includes(extendedCustomImage) &&
     imageUrl.split(`${extendedCustomImage}-`)[1]?.split(':')[0]
 
+  const formattedDockerImageArray = formatDockerImageArray(
+    postgresCustomImageType || '',
+  )
+
+  const satisfiesDockerTypeAndImage =
+    dockerImageOptions.some(
+      (element) => element.type === postgresCustomImageType,
+    ) && formattedDockerImageArray.some((image) => image === imageUrl)
+
   if (imageUrl.includes('postgresai/extended-postgres')) {
     return 'Generic Postgres'
-  } else if (
-    postgresCustomImageType &&
-    dockerImageOptions.some((element) =>
-      element.type.includes(postgresCustomImageType),
-    )
-  ) {
+  } else if (postgresCustomImageType && satisfiesDockerTypeAndImage) {
     return postgresCustomImageType
   } else {
     return 'custom'