Skip to content

Commit 3803bcd

Browse files
committed
Merge branch 'se-billing-ui' into 'master'
feat(ui): SE billing UI (PLATFORM ONLY) See merge request postgres-ai/database-lab!723
2 parents 34e31d7 + 521f4b1 commit 3803bcd

File tree

94 files changed

+6423
-1692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+6423
-1692
lines changed

ui/cspell.json

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,43 @@
138138
"Formik",
139139
"healthz",
140140
"SAST",
141-
"rehype"
141+
"rehype",
142+
"selfassigned_instance_id",
143+
"Paulo",
144+
"Aviv",
145+
"northamerica",
146+
"Montréal",
147+
"southamerica",
148+
"eastasia",
149+
"japaneast",
150+
"southeastasia",
151+
"australiaeast",
152+
"australiasoutheast",
153+
"westcentral",
154+
"northeurope",
155+
"uksouth",
156+
"ukwest",
157+
"westeurope",
158+
"canadacentral",
159+
"canadaeast",
160+
"centralus",
161+
"eastus",
162+
"northcentralus",
163+
"southcentralus",
164+
"westcentralus",
165+
"westus",
166+
"brazilsouth",
167+
"Hetzner",
168+
"hetzner",
169+
"japanwest",
170+
"vcpu",
171+
"Createdb",
172+
"BYOM",
173+
"vcpus",
174+
"postgresai",
175+
"nvme",
176+
"HCLOUD",
177+
"gserviceaccount",
178+
"pgrst"
142179
]
143180
}

ui/packages/ce/src/api/engine/getEngine.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
import {
2+
EngineDto,
3+
formatEngineDto,
4+
} from '@postgres.ai/shared/types/api/endpoints/getEngine'
15
import { request } from 'helpers/request'
2-
import { EngineDto, formatEngineDto } from 'types/api/entities/engine'
36

47
export const getEngine = async () => {
58
const response = await request('/healthz')

ui/packages/ce/src/api/instances/getInstance.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import { GetInstance } from '@postgres.ai/shared/types/api/endpoints/getInstance'
9-
import { formatInstanceDto } from '@postgres.ai/shared/types/api/entities/instance'
9+
import { formatInstanceDto, InstanceDto } from '@postgres.ai/shared/types/api/entities/instance'
1010
import { InstanceStateDto } from '@postgres.ai/shared/types/api/entities/instanceState'
1111

1212
import { request } from 'helpers/request'
@@ -24,7 +24,7 @@ export const getInstance: GetInstance = async () => {
2424
: null
2525

2626
return {
27-
response: responseDto ? formatInstanceDto(responseDto) : null,
27+
response: responseDto ? formatInstanceDto(responseDto as InstanceDto) : null,
2828
error: response.ok ? null : response,
2929
}
3030
}

ui/packages/ce/src/stores/app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { makeAutoObservable } from 'mobx'
22

33
import { getEngine } from 'api/engine/getEngine'
4-
import { Engine } from 'types/api/entities/engine'
4+
import { EngineType } from '@postgres.ai/shared/types/api/endpoints/getEngine'
55

66
type EngineProp = {
7-
data: Engine | null | undefined
7+
data: EngineType | null | undefined
88
isLoading: boolean
99
}
1010

ui/packages/ce/src/types/api/entities/engine.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

ui/packages/platform/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"@postgres.ai/ce": "link:../ce",
2020
"@postgres.ai/platform": "link:./",
2121
"@postgres.ai/shared": "link:../shared",
22+
"@sentry/react": "^6.11.0",
23+
"@sentry/tracing": "^6.11.0",
2224
"@stripe/react-stripe-js": "^1.1.2",
2325
"@stripe/stripe-js": "^1.9.0",
2426
"@types/d3": "^7.4.0",
@@ -29,6 +31,7 @@
2931
"@types/react-dom": "^17.0.3",
3032
"@types/react-router": "^5.1.17",
3133
"@types/react-router-dom": "^5.1.7",
34+
"@types/react-syntax-highlighter": "^15.5.6",
3235
"bootstrap": "^4.3.1",
3336
"byte-size": "^7.0.1",
3437
"classnames": "^2.3.1",
@@ -61,6 +64,7 @@
6164
"react-router-dom": "^5.1.2",
6265
"react-router-hash-link": "^1.2.2",
6366
"react-scripts": "^5.0.0",
67+
"react-syntax-highlighter": "^15.5.0",
6468
"reflux": "^6.4.1",
6569
"rehype-raw": "^6.1.1",
6670
"remark-gfm": "^3.0.1",
Lines changed: 2 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 2 additions & 0 deletions
Loading
6.57 KB
Loading

0 commit comments

Comments
 (0)