Commit 89cfbf4

committed

Merge branch 'missing-label-and-reload-button' into 'master'

fix(ui): add missing alias and reload request on button click See merge request postgres-ai/database-lab!825

2 parents 51fa47d + 59b460f commit 89cfbf4Copy full SHA for 89cfbf4

File tree

4 files changed

+23

-7

lines changed

ui/packages
- platform/src/pages/Instance
  - index.tsx
- shared/pages/Instance
  - context.ts
  - index.tsx
  - stores
    - Main.ts

4 files changed

+23

-7

lines changed

`‎ui/packages/platform/src/pages/Instance/index.tsx‎`

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import { useState } from 'react'`
`1`	`2`	`import { useParams } from 'react-router-dom'`
`2`	`3`
`3`	`4`	`import { Instance as InstancePage } from '@postgres.ai/shared/pages/Instance'`
`@@ -27,6 +28,7 @@ type Params = {`
`27`	`28`
`28`	`29`	`export const Instance = () => {`
`29`	`30`	`const params = useParams<Params>()`
	`31`	`+ const [projectAlias, setProjectAlias] = useState<string>('')`
`30`	`32`
`31`	`33`	`const routes = {`
`32`	`34`	`createClone: () =>`
`@@ -73,6 +75,14 @@ export const Instance = () => {`
`73`	`75`	`hideDeprecatedApiBanner: bannersStore.hideDeprecatedApi,`
`74`	`76`	`}`
`75`	`77`
	`78`	+ const instanceTitle = `#${params.instanceId} ${
	`79`	`+ projectAlias`
	`80`	+ ? `(${projectAlias})`
	`81`	`+ : params.project`
	`82`	+ ? `(${params.project})`
	`83`	`+ : ''`
	`84`	+ }`
	`85`	`+`
`76`	`86`	`const elements = {`
`77`	`87`	`breadcrumbs: (`
`78`	`88`	`<ConsoleBreadcrumbsWrapper`
`@@ -82,9 +92,7 @@ export const Instance = () => {`
`82`	`92`	`breadcrumbs={[`
`83`	`93`	`{ name: 'Database Lab Instances', url: 'instances' },`
`84`	`94`	`{`
`85`		- name: `Instance #${params.instanceId} ${
`86`		- params.project ? `(${params.project})` : ''
`87`		- }`,
	`95`	+ name: `Instance ${instanceTitle}`,
`88`	`96`	`url: null,`
`89`	`97`	`},`
`90`	`98`	`]}`
`@@ -95,9 +103,8 @@ export const Instance = () => {`
`95`	`103`	`return (`
`96`	`104`	`<InstancePage`
`97`	`105`	`isPlatform`
`98`		- title={`Database Lab instance #${params.instanceId} ${
`99`		- params.project ? `(${params.project})` : ''
`100`		- }`}
	`106`	`+ setProjectAlias={setProjectAlias}`
	`107`	+ title={`Database Lab instance ${instanceTitle}`}
`101`	`108`	`instanceId={params.instanceId}`
`102`	`109`	`routes={routes}`
`103`	`110`	`api={api}`

`‎ui/packages/shared/pages/Instance/context.ts‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ export type Host = {`
`27`	`27`	`}`
`28`	`28`	`wsHost?: string`
`29`	`29`	`isPlatform?: boolean`
	`30`	`+ setProjectAlias?: (alias: string) => void`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`// Host context.`

`‎ui/packages/shared/pages/Instance/index.tsx‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,17 @@ export const Instance = observer((props: Props) => {`
`97`	`97`	`load(instanceId)`
`98`	`98`	`}, [instanceId])`
`99`	`99`
	`100`	`+ useEffect(() => {`
	`101`	`+ if (props.setProjectAlias) props.setProjectAlias(instance?.projectAlias \|\| '')`
	`102`	`+ }, [instance])`
	`103`	`+`
`100`	`104`	`useEffect(() => {`
`101`	`105`	`if (`
`102`	`106`	`instance &&`
`103`	`107`	`instance?.state?.retrieving?.status === 'pending' &&`
`104`	`108`	`isConfigurationActive &&`
`105`		`- !props.isPlatform && !hasBeenRedirected`
	`109`	`+ !props.isPlatform &&`
	`110`	`+ !hasBeenRedirected`
`106`	`111`	`) {`
`107`	`112`	`setActiveTab(2)`
`108`	`113`	`setHasBeenRedirected(true)`

`‎ui/packages/shared/pages/Instance/stores/Main.ts‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ export class MainStore {`
`106`	`106`	`this.instance = null`
`107`	`107`	`this.isReloadingInstance = true`
`108`	`108`	`this.loadInstance(instanceId, false).then(() => {`
	`109`	`+ if (this.api.refreshInstance)`
	`110`	`+ this.api.refreshInstance({ instanceId: instanceId })`
	`111`	`+`
`109`	`112`	`if (this.instance?.url) {`
`110`	`113`	`this.snapshots.load(instanceId)`
`111`	`114`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 89cfbf4

File tree

4 files changed

4 files changed

`‎ui/packages/platform/src/pages/Instance/index.tsx‎`

`‎ui/packages/shared/pages/Instance/context.ts‎`

`‎ui/packages/shared/pages/Instance/index.tsx‎`

`‎ui/packages/shared/pages/Instance/stores/Main.ts‎`

0 commit comments