Merge branch 'main' into backend_pg_proxy

Author: Artuomka

frontend/src/app/services/connections.service.spec.ts

@@ -11,10 +11,8 @@ import { ConnectionType, DBtype } from '../models/connection';
 import { AccessLevel } from '../models/user';
 import { CedarPermissionService } from './cedar-permission.service';
 import { ConnectionsService } from './connections.service';
-import { HostedDatabaseService } from './hosted-database.service';
 import { MasterPasswordService } from './master-password.service';
 import { NotificationsService } from './notifications.service';
-import { UserService } from './user.service';
 import { UsersService } from './users.service';
 
 describe('ConnectionsService', () => {
@@ -26,8 +24,6 @@ describe('ConnectionsService', () => {
 	let mockCanI: ReturnType<typeof vi.fn>;
 	let mockCanIAny: ReturnType<typeof vi.fn>;
 	let mockPermissions: Partial<CedarPermissionService>;
-	let fakeHostedDatabaseService;
-	let fakeUserService;
 
 	const connectionCredsApp = {
 		title: 'Test connection via SSH tunnel to mySQL',
@@ -119,13 +115,6 @@ describe('ConnectionsService', () => {
 			canIAny: mockCanIAny,
 			ready: signal(false).asReadonly(),
 		};
-		fakeHostedDatabaseService = {
-			listHostedDatabases: vi.fn().mockResolvedValue([]),
-		};
-		fakeUserService = {
-			cast: of({ company: { id: 'test-company-id' } }),
-		};
-
 		TestBed.configureTestingModule({
 			imports: [MatSnackBarModule, MatDialogModule],
 			providers: [
@@ -149,14 +138,6 @@ describe('ConnectionsService', () => {
 					provide: CedarPermissionService,
 					useValue: mockPermissions,
 				},
-				{
-					provide: HostedDatabaseService,
-					useValue: fakeHostedDatabaseService,
-				},
-				{
-					provide: UserService,
-					useValue: fakeUserService,
-				},
 			],
 		});
 

frontend/src/app/services/connections.service.ts

@@ -2,16 +2,15 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
 import { IColorConfig, NgxThemeService } from '@brumeilde/ngx-theme';
-import { BehaviorSubject, EMPTY, firstValueFrom, throwError } from 'rxjs';
+import { BehaviorSubject, EMPTY, throwError } from 'rxjs';
 import { catchError, filter, map } from 'rxjs/operators';
+import { environment } from 'src/environments/environment';
 import { AlertActionType, AlertType } from '../models/alert';
 import { Connection, ConnectionSettings, ConnectionType, DBtype } from '../models/connection';
 import { AccessLevel } from '../models/user';
 import { CedarPermissionService } from './cedar-permission.service';
-import { HostedDatabaseService } from './hosted-database.service';
 import { MasterPasswordService } from './master-password.service';
 import { NotificationsService } from './notifications.service';
-import { UserService } from './user.service';
 import { UsersService } from './users.service';
 
 interface LogParams {
@@ -73,8 +72,6 @@ export class ConnectionsService {
 	public defaultDisplayTable: string;
 	public ownConnections: Connection[] = null;
 	public testConnections: Connection[] = null;
-	public isHostedConnection: boolean = false;
-	private hostedDatabaseHostnames: Set<string> = new Set();
 
 	private connectionNameSubject: BehaviorSubject<string> = new BehaviorSubject<string>('Rocketadmin');
 	private connectionSigningKeySubject: BehaviorSubject<string> = new BehaviorSubject<string>(null);
@@ -94,8 +91,6 @@ export class ConnectionsService {
 		private _usersService: UsersService,
 		private _permissions: CedarPermissionService,
 		public _themeService: NgxThemeService<IColorConfig<Palettes, Colors>>,
-		private _hostedDatabaseService: HostedDatabaseService,
-		private _userService: UserService,
 	) {
 		this.connection = { ...this.connectionInitialState };
 		this.router = router;
@@ -145,6 +140,11 @@ export class ConnectionsService {
 		return this.currentPage;
 	}
 
+	get isHostedConnection(): boolean {
+		const host = this.connection?.host;
+		return !!environment.saas && !!host && host.endsWith('.db.rocketadmin.com');
+	}
+
 	canEditConnection() {
 		return this._permissions.canI('connection:edit', 'Connection', this.connectionID)();
 	}
@@ -181,7 +181,6 @@ export class ConnectionsService {
 
 	setConnectionInfo(id: string) {
 		this.defaultDisplayTable = null;
-		this.isHostedConnection = false;
 		if (id) {
 			this.fetchConnection(id).subscribe((res) => {
 				this.connection = res.connection;
@@ -219,7 +218,6 @@ export class ConnectionsService {
 						},
 					});
 				}
-				this.checkIfHostedConnection(res.connection.host);
 			});
 		} else {
 			this.connection = { ...this.connectionInitialState };
@@ -237,9 +235,6 @@ export class ConnectionsService {
 				},
 			});
 		}
-
-		console.log('this.defaultDisplayTable');
-		console.log(this.defaultDisplayTable);
 	}
 
 	isPermitted(accessLevel: AccessLevel) {
@@ -610,30 +605,4 @@ export class ConnectionsService {
 			}),
 		);
 	}
-
-	private async checkIfHostedConnection(connectionHost: string) {
-		if (!connectionHost) {
-			this.isHostedConnection = false;
-			return;
-		}
-		if (this.hostedDatabaseHostnames.size === 0) {
-			await this.loadHostedDatabaseHostnames();
-		}
-		this.isHostedConnection = this.hostedDatabaseHostnames.has(connectionHost);
-	}
-
-	private async loadHostedDatabaseHostnames() {
-		try {
-			const user = await firstValueFrom(this._userService.cast.pipe(filter((u) => !!u?.company?.id)));
-			const databases = await this._hostedDatabaseService.listHostedDatabases(user.company.id);
-			this.hostedDatabaseHostnames.clear();
-			if (databases) {
-				for (const db of databases) {
-					this.hostedDatabaseHostnames.add(db.hostname);
-				}
-			}
-		} catch {
-			// Silently fail - non-hosted path will be used
-		}
-	}
 }

package.json

@@ -22,7 +22,13 @@
 	"pnpm": {
 		"overrides": {
 			"cipher-base": "1.0.7",
-			"tar-fs": "1.16.6"
+			"tar-fs": "1.16.6",
+			"ajv@>=7.0.0-alpha.0 <8.18.0": ">=8.18.0",
+			"picomatch@>=4.0.0 <4.0.4": ">=4.0.4",
+			"path-to-regexp@>=8.0.0 <8.4.0": ">=8.4.0",
+			"lodash@>=4.0.0 <=4.17.23": ">=4.18.0",
+			"lodash@<=4.17.23": ">=4.18.0",
+			"@nestjs/core@<=11.1.17": ">=11.1.18"
 		},
 		"packageExtensions": {
 			"ibm_db": {