Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"chart.js": "^4.5.1",
"chartjs-adapter-date-fns": "^3.0.0",
"color-string": "^2.0.1",
"connection-string-parser": "^1.0.4",
"convert": "^5.12.0",
"date-fns": "^4.1.0",
"ipaddr.js": "^2.2.0",
Expand Down
40 changes: 31 additions & 9 deletions frontend/src/app/components/connect-db/connect-db.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,28 @@
}
}

.credentials-fieldset {
:host ::ng-deep .credentials-fieldset {
display: grid;
grid-template-columns: subgrid;
grid-template-rows: subgrid;
grid-column: 1 / span 4;
grid-row: 5 / span 4;
grid-row: 6 / span 4;
}

:host ::ng-deep .connectForm__typeSwitch + ndc-dynamic + .credentials-fieldset {
Copy link

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The selector .connectForm__typeSwitch + ndc-dynamic + .credentials-fieldset does not match the new template structure: the credentials form class is applied via ndcDynamicAttributes to the dynamically created component inside <ndc-dynamic>, not to a sibling following ndc-dynamic. As written, this rule will never apply and can break the intended grid positioning. Adjust the selector to target the element that actually has the class (e.g., ndc-dynamic .credentials-fieldset or apply the class on ndc-dynamic itself and update the selector accordingly).

Suggested change
:host ::ng-deep .connectForm__typeSwitch + ndc-dynamic + .credentials-fieldset {
:host ::ng-deep .connectForm__typeSwitch + ndc-dynamic .credentials-fieldset {

Copilot uses AI. Check for mistakes.
grid-row: 4 / span 4;
}



@media (width <= 600px) {
.credentials-fieldset {
:host ::ng-deep .credentials-fieldset {
display: flex;
flex-direction: column;
}
}

.credentials-fieldset-no-warning {
/* :host ::ng-deep .credentials-fieldset-no-warning {
display: grid;
grid-template-columns: subgrid;
grid-template-rows: subgrid;
Expand All @@ -48,11 +54,11 @@
}

@media (width <= 600px) {
.credentials-fieldset-no-warning {
:host ::ng-deep .credentials-fieldset-no-warning {
display: flex;
flex-direction: column;
}
}
} */

.mat-h1 {
margin-top: 2vw;
Expand Down Expand Up @@ -87,7 +93,8 @@
}

.connectForm__ipAlert {
--alert-margin: 0;
--alert-margin: 0 !important;
margin-bottom: 12px;
}

.connectForm__title {
Expand All @@ -103,11 +110,11 @@
grid-column: 1 / span 4;
}

.connectForm__typeSwitch {
.connectForm__toggle {
margin-bottom: 12px;
}

.connectForm__typeSwitch ::ng-deep .mat-button-toggle-checked {
.connectForm__toggle ::ng-deep .mat-button-toggle-checked {
background-color: rgba(0, 0, 0, 0.08) !important;
}

Expand Down Expand Up @@ -200,6 +207,21 @@
padding: 8px 12px;
}

.connectForm__connectionString {
display: flex;
align-items: flex-start;
gap: 12px;
}

.connectForm__connectionString ::ng-deep .mat-mdc-text-field-wrapper {
padding-right: 80px;
}

.connectForm__connectionString button {
margin-top: 4px;
margin-left: -80px;
}

.agent-token {
display: flex;
margin-top: 32px;
Expand Down
200 changes: 48 additions & 152 deletions frontend/src/app/components/connect-db/connect-db.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@ <h1 class="mat-h1 connectForm__fullLine">
</mat-select>
</mat-form-field>

<div class="connectForm__fullLine">
<div class="connectForm__fullLine connectForm__toggle connectForm__typeSwitch">
<mat-button-toggle-group name="connectionType"
data-testid="connection-type-toggle"
class="connectForm__typeSwitch"
[disabled]="submitting || db.isTestConnection || db.type === 'dynamodb'"
[(ngModel)]="db.connectionType">
<mat-button-toggle value="direct">Direct connection</mat-button-toggle>
Expand All @@ -51,7 +50,7 @@ <h1 class="mat-h1 connectForm__fullLine">

<div *ngIf="db && db.connectionType === 'direct' && !db.isTestConnection && isSaas && db.type !== 'dynamodb'"
data-testid="direct-connection-warning"
class="connectForm__fullLine">
class="connectForm__fullLine connectForm__warningMessage">
<div *ngIf="connectionID; else warningAlert" class="warningMessage">
<mat-icon class="warningMessage__icon">warning_amber</mat-icon>
<div class="mat-body-1">
Expand All @@ -72,156 +71,53 @@ <h1 class="mat-h1 connectForm__fullLine">
</ng-template>
</div>

<app-mysql-credentials-form *ngIf="db.type === 'mysql' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent()"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-mysql-credentials-form>

<app-postgres-credentials-form *ngIf="db.type === 'postgres' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-postgres-credentials-form>

<app-mongodb-credentials-form *ngIf="db.type === 'mongodb' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-mongodb-credentials-form>

<app-dynamodb-credentials-form *ngIf="db.type === 'dynamodb' && db.connectionType === 'direct'"
class="credentials-fieldset-no-warning"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-dynamodb-credentials-form>

<app-cassandra-credentials-form *ngIf="db.type === 'cassandra' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-cassandra-credentials-form>

<app-oracledb-credentials-form *ngIf="db.type === 'oracledb' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-oracledb-credentials-form>

<app-mssql-credentials-form *ngIf="db.type === 'mssql' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-mssql-credentials-form>

<app-redis-credentials-form *ngIf="db.type === 'redis' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-redis-credentials-form>

<app-elastic-credentials-form *ngIf="db.type === 'elasticsearch' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-elastic-credentials-form>

<app-clickhouse-credentials-form *ngIf="db.type === 'clickhouse' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent()"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-clickhouse-credentials-form>
@if (db.connectionType === 'direct' && !db.id) {
<div class="connectForm__fullLine connectForm__connectionString">
<mat-form-field appearance="outline" style="width: 100%">
<mat-label>Connection string</mat-label>
<input matInput name="connectionString"
#connectionStringInput="ngModel"
data-testid="connection-string-input"
placeholder="e.g. postgresql://user:password@host:5432/dbname"
connectionStringValidator
[disabled]="submitting"
[(ngModel)]="connectionString">
<mat-hint>Paste your database connection URI to auto-fill credentials</mat-hint>
@if (connectionStringInput.errors?.invalidConnectionStringFormat) {
<mat-error>Invalid format. Expected: scheme://user:password@host:port/database</mat-error>
}
@if (connectionStringInput.errors?.unsupportedScheme) {
<mat-error>Unsupported scheme "{{ connectionStringInput.errors?.unsupportedScheme }}"</mat-error>
}
@if (connectionStringInput.errors?.invalidConnectionString) {
<mat-error>Failed to parse connection string</mat-error>
}
</mat-form-field>
<button type="button" mat-button color="primary"
class="connectForm__connectionStringApplyButton"
data-testid="connection-string-apply-button"
[disabled]="submitting || !connectionString.trim() || connectionStringInput.invalid"
(click)="applyConnectionString()">
Apply
</button>
</div>
}

<app-db2-credentials-form *ngIf="db.type === 'ibmdb2' && db.connectionType === 'direct'"
[ngClass]="{
'credentials-fieldset': !db.isTestConnection,
'credentials-fieldset-no-warning': db.isTestConnection || !isSaas
}"
[connection]="db"
[submitting]="submitting"
[accessLevel]="accessLevel"
[masterKey]="masterKey"
[readonly]="(accessLevel === 'readonly' || db.isTestConnection) && db.id"
(switchToAgent)="switchToAgent"
(masterKeyChange)="handleMasterKeyChange($event)">
</app-db2-credentials-form>
@if (db.connectionType === 'direct') {
<ndc-dynamic
[ndcDynamicComponent]="credentialsFormComponent"
[ndcDynamicInputs]="{
connection: db,
submitting: submitting,
accessLevel: accessLevel,
masterKey: masterKey,
readonly: !!((accessLevel === 'readonly' || db.isTestConnection) && db.id)
}"
[ndcDynamicOutputs]="credentialsFormOutputs"
[ndcDynamicAttributes]="credentialsFormAttributes"
></ndc-dynamic>
}


<div *ngIf="db.connectionType === 'agent'" class="connectForm__fullLine instruction">

Expand Down
Loading
Loading