From b229c3759849cded61c9090e9e10f15b32180c3f Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Sat, 22 Feb 2025 14:11:54 +0200 Subject: [PATCH 1/9] foreign key: add margin bottom --- .../filter-fields/foreign-key/foreign-key.component.css | 4 ++++ .../row-fields/foreign-key/foreign-key.component.css | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/components/ui-components/filter-fields/foreign-key/foreign-key.component.css b/frontend/src/app/components/ui-components/filter-fields/foreign-key/foreign-key.component.css index 0ff312b2f..a692446f5 100644 --- a/frontend/src/app/components/ui-components/filter-fields/foreign-key/foreign-key.component.css +++ b/frontend/src/app/components/ui-components/filter-fields/foreign-key/foreign-key.component.css @@ -18,6 +18,10 @@ grid-template-columns: 1fr 36px; } +.foreign-key ::ng-deep .mat-mdc-form-field-subscript-wrapper { + margin-bottom: 16px; +} + .foreign-key__link { display: flex; /* align-items: center; */ diff --git a/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.css b/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.css index 8a65443a1..7e45a5324 100644 --- a/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.css +++ b/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.css @@ -19,7 +19,7 @@ } .foreign-key ::ng-deep .mat-mdc-form-field-subscript-wrapper { - margin-bottom: 8px; + margin-bottom: 16px; } .hint-link { From ef1281888d32374b55a6e0434bf70af2e82148b2 Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Sat, 22 Feb 2025 14:16:17 +0200 Subject: [PATCH 2/9] record view: fix tooltip --- .../dashboard/db-table-row-view/db-table-row-view.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts index 80b56091b..789e78b3f 100644 --- a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts +++ b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts @@ -8,6 +8,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { NotificationsService } from 'src/app/services/notifications.service'; import { TableStateService } from 'src/app/services/table-state.service'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ selector: 'app-db-table-row-view', @@ -17,6 +18,7 @@ import { TableStateService } from 'src/app/services/table-state.service'; MatIconModule, MatButtonModule, ClipboardModule, + MatTooltipModule, RouterModule, CommonModule ] From f39e1e44b3c7a1170b5818f8d43096e233dc11cd Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Sat, 22 Feb 2025 15:22:43 +0200 Subject: [PATCH 3/9] error banner: update Credentials button name and hide it from Readonly --- frontend/src/app/components/audit/audit.component.html | 5 ++++- .../connection-settings/connection-settings.component.html | 5 ++++- .../src/app/components/dashboard/dashboard.component.html | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/components/audit/audit.component.html b/frontend/src/app/components/audit/audit.component.html index 54d13ec4d..37b4601e2 100644 --- a/frontend/src/app/components/audit/audit.component.html +++ b/frontend/src/app/components/audit/audit.component.html @@ -49,7 +49,10 @@

Rocketadmin can not find any tables

{{serverError.abstract}}

- Connection settings + + Check database credentials + diff --git a/frontend/src/app/components/connection-settings/connection-settings.component.html b/frontend/src/app/components/connection-settings/connection-settings.component.html index 8884ed14e..82ab098b3 100644 --- a/frontend/src/app/components/connection-settings/connection-settings.component.html +++ b/frontend/src/app/components/connection-settings/connection-settings.component.html @@ -24,7 +24,10 @@

Rocketadmin can not find any tables

{{serverError.abstract}}

- Connection settings + + Check database credentials + diff --git a/frontend/src/app/components/dashboard/dashboard.component.html b/frontend/src/app/components/dashboard/dashboard.component.html index de6d936f6..a90321bf9 100644 --- a/frontend/src/app/components/dashboard/dashboard.component.html +++ b/frontend/src/app/components/dashboard/dashboard.component.html @@ -9,7 +9,10 @@

{{serverError.abstract}}

- Connection settings + + Check database credentials + From 5325b966ef9aa3a2dd6744f6b5b1219f0c692d7d Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Sun, 23 Feb 2025 11:55:16 +0200 Subject: [PATCH 4/9] audit, info dialog: add button module --- .../app/components/audit/info-dialog/info-dialog.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/components/audit/info-dialog/info-dialog.component.ts b/frontend/src/app/components/audit/info-dialog/info-dialog.component.ts index 1d92aa6b1..7fd51978d 100644 --- a/frontend/src/app/components/audit/info-dialog/info-dialog.component.ts +++ b/frontend/src/app/components/audit/info-dialog/info-dialog.component.ts @@ -1,5 +1,6 @@ import { CommonModule } from '@angular/common'; import { Component, Inject, OnInit } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { format } from 'date-fns' import { normalizeFieldName, normalizeTableName } from 'src/app/lib/normalize'; @@ -11,7 +12,8 @@ import { Log } from 'src/app/models/logs'; styleUrls: ['./info-dialog.component.css'], imports: [ CommonModule, - MatDialogModule + MatDialogModule, + MatButtonModule ] }) export class InfoDialogComponent implements OnInit { From ec1853c0ec3eb7ee4eb414eab43d002d97e3298f Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Sun, 23 Feb 2025 19:14:24 +0200 Subject: [PATCH 5/9] company page: WIP Show test connections toggle --- frontend/src/app/components/company/company.component.html | 7 +++++++ frontend/src/app/models/company.ts | 1 + 2 files changed, 8 insertions(+) diff --git a/frontend/src/app/components/company/company.component.html b/frontend/src/app/components/company/company.component.html index bd3dc9746..99ebc6551 100644 --- a/frontend/src/app/components/company/company.component.html +++ b/frontend/src/app/components/company/company.component.html @@ -204,5 +204,12 @@

Members + +

diff --git a/frontend/src/app/models/company.ts b/frontend/src/app/models/company.ts index dd82dae77..039095eff 100644 --- a/frontend/src/app/models/company.ts +++ b/frontend/src/app/models/company.ts @@ -31,6 +31,7 @@ export interface Company { connections: CompanyConnection[], invitations: CompanyMemberInvitation[], is_payment_method_added: boolean, + show_test_connections: boolean } export interface CompanyMember { From b5410bc6223884dd4b80597d82e0da36d5277bad Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Mon, 24 Feb 2025 14:10:26 +0200 Subject: [PATCH 6/9] upgrade: fix saas endpoints url --- frontend/src/app/services/payment.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/services/payment.service.ts b/frontend/src/app/services/payment.service.ts index d4bb57dc3..cba945854 100644 --- a/frontend/src/app/services/payment.service.ts +++ b/frontend/src/app/services/payment.service.ts @@ -21,7 +21,7 @@ export class PaymentService { createIntentToSubscription(companyId: string) { const config = this._configuration.getConfig(); - return this._http.post(config.saasURL + `/company/stripe/${companyId}`, {}) + return this._http.post(config.saasURL + `/saas/company/stripe/${companyId}`, {}) .pipe( map(res => res), catchError((err) => { @@ -41,7 +41,7 @@ export class PaymentService { createSubscription(companyId: string, defaultPaymentMethodId: string | null | PaymentMethod, subscriptionLevel: string) { const config = this._configuration.getConfig(); - return this._http.post(config.saasURL + `/company/setup/intent/${companyId}`, {defaultPaymentMethodId, subscriptionLevel}) + return this._http.post(config.saasURL + `/saas/company/setup/intent/${companyId}`, {defaultPaymentMethodId, subscriptionLevel}) .pipe( map(res => res), catchError((err) => { @@ -61,7 +61,7 @@ export class PaymentService { changeSubscription(companyId: string, subscriptionLevel: string) { const config = this._configuration.getConfig(); - return this._http.post(config.saasURL + `/company/subscription/upgrade/${companyId}`, {subscriptionLevel}) + return this._http.post(config.saasURL + `/saas/company/subscription/upgrade/${companyId}`, {subscriptionLevel}) .pipe( map(res => res), catchError((err) => { From 67663c337ac3c7b57d354410ee89d273b511aed7 Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Mon, 24 Feb 2025 14:23:23 +0200 Subject: [PATCH 7/9] Upgrade page and Add user dialog: fix links --- frontend/src/app/components/company/company.component.ts | 2 ++ .../users/user-add-dialog/user-add-dialog.component.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/frontend/src/app/components/company/company.component.ts b/frontend/src/app/components/company/company.component.ts index f90fefb27..d2d8a7b3a 100644 --- a/frontend/src/app/components/company/company.component.ts +++ b/frontend/src/app/components/company/company.component.ts @@ -24,6 +24,7 @@ import { AlertComponent } from '../ui-components/alert/alert.component'; import { PlaceholderCompanyComponent } from '../skeletons/placeholder-company/placeholder-company.component'; import { PlaceholderTableDataComponent } from '../skeletons/placeholder-table-data/placeholder-table-data.component'; import { NgIf } from '@angular/common'; +import { RouterModule } from '@angular/router'; @Component({ selector: 'app-company', @@ -40,6 +41,7 @@ import { NgIf } from '@angular/common'; MatSlideToggleModule, MatTooltipModule, MatTableModule, + RouterModule, Angulartics2OnModule, AlertComponent, PlaceholderCompanyComponent, diff --git a/frontend/src/app/components/users/user-add-dialog/user-add-dialog.component.ts b/frontend/src/app/components/users/user-add-dialog/user-add-dialog.component.ts index 9aa968d24..bcd315d13 100644 --- a/frontend/src/app/components/users/user-add-dialog/user-add-dialog.component.ts +++ b/frontend/src/app/components/users/user-add-dialog/user-add-dialog.component.ts @@ -12,6 +12,7 @@ import { MatSelectModule } from '@angular/material/select'; import { MatButtonModule } from '@angular/material/button'; import { PlaceholderAddUserDialogComponent } from '../../skeletons/placeholder-add-user-dialog/placeholder-add-user-dialog.component'; import { NgForOf, NgIf } from '@angular/common'; +import { RouterModule } from '@angular/router'; @Component({ selector: 'app-user-add-dialog', @@ -25,6 +26,7 @@ import { NgForOf, NgIf } from '@angular/common'; MatFormFieldModule, MatSelectModule, MatButtonModule, + RouterModule, PlaceholderAddUserDialogComponent ] }) From 019112e92e360f12f782ddaa1a813151158f47aa Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Mon, 24 Feb 2025 14:42:32 +0200 Subject: [PATCH 8/9] company: update role naming --- .../src/app/components/company/company.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/components/company/company.component.html b/frontend/src/app/components/company/company.component.html index 99ebc6551..ccc4e3f7e 100644 --- a/frontend/src/app/components/company/company.component.html +++ b/frontend/src/app/components/company/company.component.html @@ -108,20 +108,20 @@

Members - Chief Account Officer + Account Owner System Admin - Specialist + Member - {{element.role === "ADMIN" ? 'Chief Account Officer' : null}} + {{element.role === "ADMIN" ? 'Account Owner' : null}} {{element.role === "DB_ADMIN" ? 'System Admin' : null}} - {{element.role === "USER" ? 'Specialist' : null}} + {{element.role === "USER" ? 'Member' : null}} From 990b5e05a79451e9c4c9abc354c4aa69e4daad6a Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Mon, 24 Feb 2025 14:47:51 +0200 Subject: [PATCH 9/9] fix unit tests --- frontend/src/app/components/company/company.component.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/components/company/company.component.spec.ts b/frontend/src/app/components/company/company.component.spec.ts index 32ada137f..8d832c2c9 100644 --- a/frontend/src/app/components/company/company.component.spec.ts +++ b/frontend/src/app/components/company/company.component.spec.ts @@ -77,7 +77,8 @@ describe('CompanyComponent', () => { "invitedUserEmail": "admin1@test.com", "role": CompanyMemberRole.CAO, } - ] + ], + show_test_connections: false } const mockMembers = [