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/src/app/app.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

position: sticky;
top: 0;
z-index: 2;
}

.nav-bar_exterior {
Expand Down
22 changes: 12 additions & 10 deletions frontend/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { BrowserModule, Title } from '@angular/platform-browser';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
import { IColorConfig, NgxThemeModule } from "@brumeilde/ngx-theme";
import { MarkdownModule, MarkdownService, provideMarkdown } from "ngx-markdown";
import { Router, RouterModule } from '@angular/router';

import { AccountDeleteConfirmationComponent } from './components/user-settings/account-delete-confirmation/account-delete-confirmation.component';
Expand All @@ -27,6 +28,7 @@ import { BreadcrumbsComponent } from './components/ui-components/breadcrumbs/bre
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ClipboardModule } from '@angular/cdk/clipboard';
import { CodeEditorModule } from '@ngstack/code-editor';
import { CodeRowComponent } from "./components/ui-components/row-fields/code/code.component";
import { CompanyComponent } from './components/company/company.component';
import { CompanyMemberInvitationComponent } from './components/company-member-invitation/company-member-invitation.component';
import { ConfigModule } from './modules/config.module';
Expand All @@ -41,11 +43,13 @@ import { DateFilterComponent } from './components/ui-components/filter-fields/da
import { DateRowComponent } from './components/ui-components/row-fields/date/date.component';
import { DateTimeFilterComponent } from './components/ui-components/filter-fields/date-time/date-time.component';
import { DateTimeRowComponent } from './components/ui-components/row-fields/date-time/date-time.component';
import { Db2CredentialsFormComponent } from "./components/connect-db/db-credentials-forms/db2-credentials-form/db2-credentials-form.component";
import { DbActionLinkDialogComponent } from './components/dashboard/db-action-link-dialog/db-action-link-dialog.component';
import { DbConnectionConfirmDialogComponent } from './components/connect-db/db-connection-confirm-dialog/db-connection-confirm-dialog.component';
import { DbConnectionDeleteDialogComponent } from './components/connect-db/db-connection-delete-dialog/db-connection-delete-dialog.component';
import { DbConnectionIpAccessDialogComponent } from './components/connect-db/db-connection-ip-access-dialog/db-connection-ip-access-dialog.component';
import { DbTableActionsComponent } from "./components/dashboard/db-table-actions/db-table-actions.component";
import { DbTableAiPanelComponent } from "./components/dashboard/db-table-ai-panel/db-table-ai-panel.component";
import { DbTableComponent } from './components/dashboard/db-table/db-table.component';
import { DbTableExportDialogComponent } from './components/dashboard/db-table-export-dialog/db-table-export-dialog.component';
import { DbTableFiltersDialogComponent } from './components/dashboard/db-table-filters-dialog/db-table-filters-dialog.component';
Expand All @@ -58,6 +62,7 @@ import { DbTablesListComponent } from './components/dashboard/db-tables-list/db-
import { DeleteMemberDialogComponent } from './components/company/delete-member-dialog/delete-member-dialog.component';
import { DragDropModule } from '@angular/cdk/drag-drop';
import { DynamicModule } from 'ng-dynamic-component';
import { DynamodbCredentialsFormComponent } from "./components/connect-db/db-credentials-forms/dynamodb-credentials-form/dynamodb-credentials-form.component";
import { EmailChangeComponent } from './components/email-change/email-change.component';
import { EmailValidationDirective } from "./directives/emailValidator.directive";
import { EmailVerificationComponent } from './components/email-verification/email-verification.component';
Expand All @@ -75,6 +80,7 @@ import { HostnameValidationDirective } from "./directives/hostnameValidator.dire
import { IconPickerComponent } from './components/ui-components/icon-picker/icon-picker.component';
import { IdFilterComponent } from "./components/ui-components/filter-fields/id/id.component";
import { IdRowComponent } from "./components/ui-components/row-fields/id/id.component";
import { ImageRowComponent } from "./components/ui-components/row-fields/image/image.component";
import { InfoDialogComponent } from './components/audit/info-dialog/info-dialog.component';
import { InviteMemberDialogComponent } from './components/company/invite-member-dialog/invite-member-dialog.component';
import { IpAddressButtonComponent } from './components/ui-components/ip-address-button/ip-address-button.component';
Expand All @@ -87,13 +93,15 @@ import { MasterEncryptionPasswordComponent } from "./components/connect-db/maste
import { MasterPasswordDialogComponent } from './components/master-password-dialog/master-password-dialog.component';
import { MaterialModule } from './modules/material.module';
import { MongodbCredentialsFormComponent } from "./components/connect-db/db-credentials-forms/mongodb-credentials-form/mongodb-credentials-form.component";
import { MssqlCredentialsFormComponent } from "./components/connect-db/db-credentials-forms/mssql-credentials-form/mssql-credentials-form.component";
import { MysqlCredentialsFormComponent } from "./components/connect-db/db-credentials-forms/mysql-credentials-form/mysql-credentials-form.component";
import { NewVersionComponent } from './components/new-version/new-version.component';
import { NgmatTableQueryReflectorModule } from './modules/ngmat-table-query-reflector.module';
import { NgxStripeModule } from 'ngx-stripe';
import { NotificationsService } from './services/notifications.service';
import { NumberFilterComponent } from './components/ui-components/filter-fields/number/number.component';
import { NumberRowComponent } from './components/ui-components/row-fields/number/number.component';
import { OracledbCredentialsFormComponent } from "./components/connect-db/db-credentials-forms/oracledb-credentials-form/oracledb-credentials-form.component";
import { PageLoaderComponent } from './components/page-loader/page-loader.component';
import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component';
import { PasswordChangeComponent } from './components/password-change/password-change.component';
Expand Down Expand Up @@ -137,6 +145,8 @@ import { TimeRowComponent } from './components/ui-components/row-fields/time/tim
import { TokenInterceptor } from './services/token.interceptor';
import { UpgradeComponent } from './components/upgrade/upgrade.component';
import { UpgradeSuccessComponent } from './components/upgrade-success/upgrade-success.component';
import { UrlRowComponent } from "./components/ui-components/row-fields/url/url.component";
import { UrlValidatorDirective } from "./directives/url-validator.directive";
import { UserAddDialogComponent } from './components/users/user-add-dialog/user-add-dialog.component';
import { UserDeleteDialogComponent } from './components/users/user-delete-dialog/user-delete-dialog.component';
import { UserDeletedSuccessComponent } from './components/user-deleted-success/user-deleted-success.component';
Expand All @@ -148,15 +158,6 @@ import { WidgetComponent } from "./components/dashboard/db-table-widgets/widget/
import { WidgetDeleteDialogComponent } from './components/dashboard/db-table-widgets/widget-delete-dialog/widget-delete-dialog.component';
import { environment } from '../environments/environment';
import { provideZxvbnServiceForPSM } from 'angular-password-strength-meter/zxcvbn';
import { OracledbCredentialsFormComponent } from "./components/connect-db/db-credentials-forms/oracledb-credentials-form/oracledb-credentials-form.component";
import { MssqlCredentialsFormComponent } from "./components/connect-db/db-credentials-forms/mssql-credentials-form/mssql-credentials-form.component";
import { DynamodbCredentialsFormComponent } from "./components/connect-db/db-credentials-forms/dynamodb-credentials-form/dynamodb-credentials-form.component";
import { CodeRowComponent } from "./components/ui-components/row-fields/code/code.component";
import { ImageRowComponent } from "./components/ui-components/row-fields/image/image.component";
import { UrlValidatorDirective } from "./directives/url-validator.directive";
import { DbTableAiPanelComponent } from "./components/dashboard/db-table-ai-panel/db-table-ai-panel.component";
import { MarkdownModule, MarkdownService, provideMarkdown } from "ngx-markdown";
import { UrlRowComponent } from "./components/ui-components/row-fields/url/url.component";

type Palettes = { primaryPalette: string, accentedPalette: string, warnPalette: string };
type Colors = { myColorName: string };
Expand Down Expand Up @@ -318,7 +319,8 @@ const saasExtraProviders = (environment as any).saas ? [
DynamodbCredentialsFormComponent,
ImageRowComponent,
DbTableAiPanelComponent,
UrlRowComponent
UrlRowComponent,
Db2CredentialsFormComponent
],
providers: [
ConnectionsService,
Expand Down
14 changes: 14 additions & 0 deletions frontend/src/app/components/connect-db/connect-db.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@
grid-row: 5 / span 4;
}

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

.credentials-fieldset-no-warning {
display: grid;
grid-template-columns: subgrid;
Expand All @@ -36,6 +43,13 @@
grid-row: 4 / span 4;
}

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

.mat-h1 {
margin-top: 2vw;
}
Expand Down
14 changes: 14 additions & 0 deletions frontend/src/app/components/connect-db/connect-db.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,20 @@ <h1 class="mat-h1 connectForm__fullLine">
(masterKeyChange)="handleMasterKeyChange($event)">
</app-mssql-credentials-form>

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

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

<div class="instruction__docker">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.connectForm__hostname,
.connectForm__port {
padding-bottom: 20px;
}

@media (width <= 600px) {
.connectForm__hostname {
padding-bottom: 44px;
}

.connectForm__port {
padding-bottom: 0;
}
}
Loading
Loading