Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 382f9f0

Browse files
AdrinlolNikolayS
authored andcommitted
fix(ui): disable token field on edit, render label_or_name instead of name
1 parent 7066199 commit 382f9f0

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

‎ui/packages/platform/src/components/Dashboard/Dashboard.tsx‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ interface DashboardState {
5656
isProcessing: boolean
5757
orgId: number
5858
data: {
59+
label: string
60+
project_label_or_name: string
5961
id: number
6062
name: string
6163
alias: string
@@ -312,7 +314,10 @@ class Dashboard extends Component<DashboardWithStylesProps, DashboardState> {
312314
Clone multi-terabyte databases in seconds and use them to test your
313315
database migrations, optimize SQL, or deploy full-size staging apps.
314316
Start here to work with all Database Lab tools.
315-
<GatewayLink href={settings.rootUrl + '/docs/database-lab'} target="_blank">
317+
<GatewayLink
318+
href={settings.rootUrl + '/docs/database-lab'}
319+
target="_blank"
320+
>
316321
Learn more
317322
</GatewayLink>
318323
.
@@ -333,7 +338,10 @@ class Dashboard extends Component<DashboardWithStylesProps, DashboardState> {
333338
<p>
334339
Automated routine checkup for your PostgreSQL databases. Configure
335340
Checkup agent to start collecting reports (
336-
<GatewayLink href={settings.rootUrl + '/docs/checkup'} target="_blank">
341+
<GatewayLink
342+
href={settings.rootUrl + '/docs/checkup'}
343+
target="_blank"
344+
>
337345
Learn more
338346
</GatewayLink>
339347
).
@@ -356,7 +364,9 @@ class Dashboard extends Component<DashboardWithStylesProps, DashboardState> {
356364
{projects.map((p) => {
357365
return (
358366
<TableRow hover className={classes.row} key={p.id}>
359-
<TableCell className={classes.cell}>{p.name}</TableCell>
367+
<TableCell className={classes.cell}>
368+
{p.project_label_or_name || p.label || p.name}
369+
</TableCell>
360370
<TableCell className={classes.cell}>
361371
<Button
362372
variant="outlined"

‎ui/packages/platform/src/components/DbLabInstanceForm/DbLabInstanceForm.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class DbLabInstanceForm extends Component<
134134

135135
if (dbLabInstances.data) {
136136
that.setState({
137-
project_label: dbLabInstances.data[instanceID]?.project_label,
137+
project_label: dbLabInstances.data[instanceID]?.project_label_or_name,
138138
token: dbLabInstances.data[instanceID]?.verify_token,
139139
useTunnel: dbLabInstances.data[instanceID]?.use_tunnel,
140140
url: dbLabInstances.data[instanceID]?.url,
@@ -291,6 +291,7 @@ class DbLabInstanceForm extends Component<
291291
)
292292

293293
const permitted = !orgPermissions || orgPermissions.dblabInstanceCreate
294+
const disabledOnEdit = this.props.edit
294295
const instancesLoaded = dbLabInstances && dbLabInstances.data
295296

296297
if (!projects || !projects.data || !instancesLoaded) {
@@ -405,7 +406,8 @@ class DbLabInstanceForm extends Component<
405406

406407
<div className={classes.fieldBlock}>
407408
<TextField
408-
disabled={!permitted}
409+
disabled={!permitted || disabledOnEdit}
410+
type={disabledOnEdit ? 'password' : 'text'}
409411
variant="outlined"
410412
id="token"
411413
label="Verification token"
@@ -438,7 +440,7 @@ class DbLabInstanceForm extends Component<
438440
<Button
439441
variant="contained"
440442
color="primary"
441-
disabled={isDataUpdating || !permitted}
443+
disabled={isDataUpdating || !permitted||disabledOnEdit}
442444
onClick={this.generateTokenHandler}
443445
>
444446
Generate

‎ui/packages/platform/src/components/DbLabInstances/DbLabInstances.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ interface DbLabInstancesState {
6868
orgId: number
6969
data: {
7070
[org: string]: {
71+
project_label_or_name: string
7172
project_name: string
7273
project_label: string
7374
url: string
@@ -332,7 +333,7 @@ class DbLabInstances extends Component<
332333
{projects.data.map((p) => {
333334
return (
334335
<MenuItem value={p.id} key={p.id}>
335-
{p?.label || p.name}
336+
{p?.project_label_or_name || p.name}
336337
</MenuItem>
337338
)
338339
})}
@@ -451,7 +452,7 @@ class DbLabInstances extends Component<
451452
style={{ cursor: 'pointer' }}
452453
>
453454
<TableCell className={classes.cell}>
454-
{data.data[index].project_label ||
455+
{data.data[index].project_label_or_name ||
455456
data.data[index].project_name}
456457
</TableCell>
457458

‎ui/packages/platform/src/components/types/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export interface ProjectProps {
159159
data: {
160160
name: string
161161
id: number
162-
label?: string
162+
project_label_or_name: string
163163
}[]
164164
}
165165

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /