Commit 224614b

committed

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

2 parents ae60dc5 + d5fa834 commit 224614bCopy full SHA for 224614b

File tree

+19

-8

lines changed

+19

-8

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,9 @@ export const Configuration = observer(`
`213`	`213`	`const handleDockerImageSelect = (`
`214`	`214`	`e: React.ChangeEvent<HTMLInputElement>,`
`215`	`215`	`) => {`
`216`		`- const newDockerImages = formatDockerImageArray(e.target.value)`
	`216`	`+ const selectedDockerImage =`
	`217`	`+ e.target.value === 'rdsAurora' ? 'rds' : e.target.value`
	`218`	`+ const newDockerImages = formatDockerImageArray(selectedDockerImage)`
`217`	`219`	`setDockerImages(newDockerImages)`
`218`	`220`	`handleSelectPgOptions(`
`219`	`221`	`e,`
`@@ -232,8 +234,13 @@ export const Configuration = observer(`
`232`	`234`	`formik.setFieldValue('dockerImageType', e.target.value)`
`233`	`235`
`234`	`236`	`// select latest Postgres version on dockerImage change`
`235`		`- if (configData?.dockerImageType !== e.target.value) {`
	`237`	`+ if (`
	`238`	`+ configData?.dockerImageType !== e.target.value &&`
	`239`	`+ selectedDockerImage !== 'custom'`
	`240`	`+ ) {`
`236`	`241`	`formik.setFieldValue('dockerImage', newDockerImages.slice(-1)[0])`
	`242`	`+ } else if (selectedDockerImage === 'custom') {`
	`243`	`+ formik.setFieldValue('dockerImage', '')`
`237`	`244`	`} else {`
`238`	`245`	`formik.setFieldValue('dockerImage', configData?.dockerImage)`
`239`	`246`	`}`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,18 @@ export const getImageType = (imageUrl: string) => {`
`65`	`65`	`imageUrl.includes(extendedCustomImage) &&`
`66`	`66`	imageUrl.split(`${extendedCustomImage}-`)[1]?.split(':')[0]
`67`	`67`
	`68`	`+ const formattedDockerImageArray = formatDockerImageArray(`
	`69`	`+ postgresCustomImageType \|\| '',`
	`70`	`+ )`
	`71`	`+`
	`72`	`+ const satisfiesDockerTypeAndImage =`
	`73`	`+ dockerImageOptions.some(`
	`74`	`+ (element) => element.type === postgresCustomImageType,`
	`75`	`+ ) && formattedDockerImageArray.some((image) => image === imageUrl)`
	`76`	`+`
`68`	`77`	`if (imageUrl.includes('postgresai/extended-postgres')) {`
`69`	`78`	`return 'Generic Postgres'`
`70`		`- } else if (`
`71`		`- postgresCustomImageType &&`
`72`		`- dockerImageOptions.some((element) =>`
`73`		`- element.type.includes(postgresCustomImageType),`
`74`		`- )`
`75`		`- ) {`
	`79`	`+ } else if (postgresCustomImageType && satisfiesDockerTypeAndImage) {`
`76`	`80`	`return postgresCustomImageType`
`77`	`81`	`} else {`
`78`	`82`	`return 'custom'`

Comments

(0)