Skip to content

Commit 105e873

Browse files
committed
Merge branch 'main' into backend_ai_table_schema_reponses
2 parents ebcb604 + 52edbf2 commit 105e873

5 files changed

Lines changed: 74 additions & 20 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
# dependencies
1111
/node_modules
12+
.yarn/
1213

1314
# profiling files
1415
chrome-profiler-events*.json

frontend/src/app/components/connections-list/hosted-database-success-dialog/hosted-database-success-dialog.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ <h1 mat-dialog-title>
6464
[cdkCopyToClipboard]="credentialsText"
6565
(cdkCopyToClipboardCopied)="handleCredentialsCopied()">
6666
@if (copied) {
67-
<mat-icon class="hosted-dialog__copy-check">check</mat-icon>
68-
Credentials copied
67+
<ng-container>
68+
<mat-icon class="hosted-dialog__copy-check">check</mat-icon>
69+
Credentials copied
70+
</ng-container>
6971
} @else {
7072
Copy connection string
7173
}

frontend/src/app/components/connections-list/own-connections/own-connections.component.css

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@
267267
.connection {
268268
display: flex;
269269
flex-direction: column;
270+
gap: 10px;
270271
border: 1px solid rgba(0, 0, 0, 0.12);
271272
border-radius: 4px;
272273
color: inherit;
@@ -283,7 +284,7 @@
283284
}
284285
}
285286

286-
.connection:hover {
287+
.connection:has(.connectionLogoPreview:hover) {
287288
border: 1px solid var(--color-primaryPalette-500);
288289
box-shadow:
289290
0px 4px 5px 0px rgba(0, 0, 0, 0.2),
@@ -292,7 +293,7 @@
292293
}
293294

294295
@media (prefers-color-scheme: dark) {
295-
.connection:hover {
296+
.connection:has(.connectionLogoPreview:hover) {
296297
border: 1px solid #636363;
297298
}
298299
}
@@ -333,18 +334,65 @@
333334
width: 100%;
334335
}
335336

336-
/* ── Schema button inside card ── */
337+
/* ── Schema button row at the bottom of the card ── */
337338

338339
.connectionSchemaButton {
339-
margin-left: auto;
340-
flex-shrink: 0;
341-
color: rgba(255, 255, 255, 0.7);
340+
position: relative;
341+
align-self: stretch;
342+
justify-content: center;
343+
color: var(--mdc-text-button-label-text-color) !important;
344+
font-size: 13px;
345+
font-weight: 500;
346+
line-height: 1;
347+
height: 34px;
348+
transition: color 150ms ease, background-color 150ms ease;
349+
}
350+
351+
.connectionSchemaButton mat-icon {
352+
font-size: 16px !important;
353+
width: 16px !important;
354+
height: 16px !important;
355+
margin-right: 6px;
356+
transition: color 150ms ease;
357+
}
358+
359+
.connectionSchemaButton__ai {
360+
color: var(--color-accentedPalette-500) !important;
361+
}
362+
363+
.connectionSchemaButton__arrow {
364+
position: absolute;
365+
right: 12px;
366+
top: 50%;
367+
margin: 0 !important;
368+
transform: translate(-4px, -50%);
369+
opacity: 0;
370+
transition: opacity 150ms ease, transform 150ms ease;
342371
}
343372

344373
.connectionSchemaButton:hover {
345-
color: #fff;
374+
color: var(--color-accentedPalette-500) !important;
346375
}
347376

377+
@media (prefers-color-scheme: dark) {
378+
.connectionSchemaButton:hover {
379+
color: var(--color-accentedPalette-100) !important;
380+
background: var(--color-accentedPalette-900);
381+
}
382+
383+
.connectionSchemaButton:hover .connectionSchemaButton__ai {
384+
color: var(--color-accentedPalette-100) !important;
385+
}
386+
}
387+
388+
.connectionSchemaButton:hover .connectionSchemaButton__arrow {
389+
opacity: 1;
390+
transform: translate(0, -50%);
391+
}
392+
393+
394+
395+
348396
/* ── Show more / less ── */
349397

350398
.showAllButton {

frontend/src/app/components/connections-list/own-connections/own-connections.component.html

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,17 @@ <h1 class="mat-display-1">Create your first connection</h1>
3030
<h2 class="connectionInfo__connectionTitle">{{ $any(connectionItem).displayTitle }}</h2>
3131
<span class="mat-body-2">{{ supportedDatabasesTitles[connectionItem.connection.type] }}</span>
3232
</div>
33-
@if (connectionItem.accessLevel === 'edit') {
34-
<a mat-icon-button
35-
class="connectionSchemaButton"
36-
routerLink="/edit-database-schema/{{connectionItem.connection.id}}"
37-
matTooltip="Edit schema"
38-
(click)="$event.stopPropagation()">
39-
<mat-icon>schema</mat-icon>
40-
</a>
41-
}
4233
</div>
34+
@if (connectionItem.accessLevel === 'edit') {
35+
<a mat-button color="accent"
36+
class="connectionSchemaButton"
37+
routerLink="/edit-database-schema/{{connectionItem.connection.id}}"
38+
(click)="$event.stopPropagation()">
39+
<mat-icon class="connectionSchemaButton__ai">auto_awesome</mat-icon>
40+
<span>Edit schema</span>
41+
<mat-icon iconPositionEnd class="connectionSchemaButton__arrow">arrow_forward</mat-icon>
42+
</a>
43+
}
4344
</a>
4445
</li>
4546
}

frontend/src/app/components/hosted-databases/hosted-database-reset-password-dialog/hosted-database-reset-password-dialog.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ <h1 mat-dialog-title>New password for <strong>{{ result()!.databaseName }}</stro
4747
[cdkCopyToClipboard]="credentialsText"
4848
(cdkCopyToClipboardCopied)="handleCredentialsCopied()">
4949
@if (copied()) {
50-
<mat-icon class="reset-dialog__copy-check">check</mat-icon>
51-
Credentials copied
50+
<ng-container>
51+
<mat-icon class="reset-dialog__copy-check">check</mat-icon>
52+
Credentials copied
53+
</ng-container>
5254
} @else {
5355
Copy connection string
5456
}

0 commit comments

Comments
 (0)