opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-4067 fixes bug with incorrect host or port during search or changing driverId during connection creation

Browse Source
This commit is contained in:
sergeyteleshev
2025-03-20 14:38:01 +01:00
parent 20357fd408
commit fa2b0b60a8
2 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionFormOpitonsPart.ts
+22 -34
View File
@@ -22,7 +22,6 @@ import {
DBDriverResource,
isJDBCConnection,
type DatabaseConnection,
type IConnectionInfoParams,
} from '@cloudbeaver/core-connections';
import type { ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource, UserInfoResource } from '@cloudbeaver/core-authentication';
@@ -36,7 +35,6 @@ import type { IConnectionFormState } from '../IConnectionFormState.js';
import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
import { ConnectionAuthenticationDialogLoader } from '../../ConnectionAuthentication/ConnectionAuthenticationDialogLoader.js';
import type { NotificationService } from '@cloudbeaver/core-events';
import type { ResourceKeySimple } from '@cloudbeaver/core-resource';
const MAIN_PROPERTY_DATABASE_KEY = 'database';
const MAIN_PROPERTY_HOST_KEY = 'host';
@@ -74,21 +72,12 @@ export class ConnectionFormOptionsPart extends FormPart<IConnectionFormOptionsSt
this.formState.validationTask.addPostHandler(this.askCredentials.bind(this));
this.formState.loadedTask.addPostHandler(this.formAuthState.bind(this));
this.connectionInfoResource.onItemUpdate.removeHandler(this.syncInfo.bind(this));
makeObservable(this, {
setAuthModel: action.bound,
});
}
private async syncInfo(key: ResourceKeySimple<IConnectionInfoParams>) {
if (!this.connectionKey || !this.connectionInfoResource.isIntersect(key, this.connectionKey)) {
return;
}
await this.reload();
}
private async formAuthState(data: IFormState<IConnectionFormState>, contexts: IExecutionContextProvider<IFormState<IConnectionFormState>>) {
const stateContext = contexts.getContext(formStateContext);
@@ -146,26 +135,29 @@ export class ConnectionFormOptionsPart extends FormPart<IConnectionFormOptionsSt
}
override isOutdated(): boolean {
if (!this.state.connectionId || !this.formState.state.projectId) {
if (!this.formState.state.projectId) {
return false;
}
const project = this.projectInfoResource.get(this.formState.state.projectId);
return (
this.connectionInfoResource.isOutdated(createConnectionParam(this.formState.state.projectId, this.state.connectionId)) ||
const isProjectOutdated =
this.projectInfoResource.isOutdated(this.formState.state.projectId) ||
!project?.canEditDataSources ||
!this.projectsService.activeProjects.includes(project)
);
!this.projectsService.activeProjects.includes(project);
if (!this.connectionKey) {
return isProjectOutdated;
}
return this.connectionInfoResource.isOutdated(this.connectionKey) || isProjectOutdated;
}
protected override async loader(): Promise<void> {
if (this.formState.mode === 'create') {
const defaults = await this.getDefaults();
await this.setDefaults();
this.setInitialState({
...defaults,
...defaultStateGetter(),
...this.state,
});
return;
@@ -259,37 +251,33 @@ export class ConnectionFormOptionsPart extends FormPart<IConnectionFormOptionsSt
this.state.authModelId = model.id;
}
private async getDefaults() {
const config = defaultStateGetter();
private async setDefaults() {
if (!this.state.driverId) {
config.name = 'New connection';
return config;
this.state.name = 'New connection';
return;
}
const driver = await this.dbDriverResource.load(this.state.driverId, ['includeProviderProperties']);
config.authModelId = driver?.defaultAuthModel;
config.configurationType = getDefaultConfigurationType(driver);
this.state.authModelId = driver?.defaultAuthModel;
this.state.configurationType = getDefaultConfigurationType(driver);
if (!this.state.host) {
config.host = driver?.defaultServer || 'localhost';
this.state.host = driver?.defaultServer || 'localhost';
}
if (!this.state.port) {
config.port = driver?.defaultPort;
this.state.port = driver?.defaultPort;
}
config.databaseName = driver?.defaultDatabase;
config.url = driver?.sampleURL;
this.state.databaseName = driver?.defaultDatabase;
this.state.url = driver?.sampleURL;
if (isJDBCConnection(driver)) {
config.name = config.url;
this.state.name = this.state.url;
} else {
config.name = getConnectionName(driver.name || '', config.host, config.port, driver.defaultPort);
this.state.name = getConnectionName(driver.name || '', this.state.host, this.state.port, driver.defaultPort);
}
return config;
}
protected override async format(
webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
+12 -10
View File
@@ -99,7 +99,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
const tabsState = useContext(TabsContext);
const isSharedProject = projectInfoResource.isProjectShared(formState.state.projectId);
const optionsPart = getConnectionFormOptionsPart(formState);
const connectionInfoService = useResource(
const connectionInfoResource = useResource(
Options,
ConnectionInfoResource,
createConnectionParam(formState.state.projectId, optionsPart.state.connectionId!),
@@ -117,7 +117,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
);
//@TODO it's here until the profile implementation in the CloudBeaver
const readonly = formState.isDisabled || connectionInfoService.data?.authModel === PROFILE_AUTH_MODEL_ID;
const readonly = formState.isDisabled || connectionInfoResource.data?.authModel === PROFILE_AUTH_MODEL_ID;
useFormValidator(formState.validationTask, formRef.current);
const { credentialsSavingEnabled } = useAdministrationSettings();
@@ -142,7 +142,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
const authModelLoader = useResource(
Options,
DatabaseAuthModelsResource,
getComputed(() => optionsPart.state.authModelId || connectionInfoService.data?.authModel || driver?.defaultAuthModel || null),
getComputed(() => optionsPart.state.authModelId || connectionInfoResource.data?.authModel || driver?.defaultAuthModel || null),
{
onData: optionsPart.setAuthModel.bind(optionsPart),
active: selected,
@@ -166,12 +166,12 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
}
const authentication = useAuthenticationAction({
providerId: authModel?.requiredAuth ?? connectionInfoService.data?.requiredAuth ?? AUTH_PROVIDER_LOCAL_ID,
providerId: authModel?.requiredAuth ?? connectionInfoResource.data?.requiredAuth ?? AUTH_PROVIDER_LOCAL_ID,
});
const edit = formState.mode === 'edit';
const originLocal =
!connectionInfoService.data || (connectionInfoOriginResource.data?.origin && isLocalConnection(connectionInfoOriginResource.data.origin));
!connectionInfoResource.data || (connectionInfoOriginResource.data?.origin && isLocalConnection(connectionInfoOriginResource.data.origin));
const drivers = driverMap.resource.enabledDrivers.filter(({ id, driverInstalled }) => {
if (!edit && !isAdmin && !driverInstalled) {
@@ -188,11 +188,11 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
let properties = authModel?.properties;
if (
connectionInfoService.data?.authProperties &&
connectionInfoService.data.authProperties.length > 0 &&
optionsPart.state.authModelId === connectionInfoService.data.authModel
connectionInfoResource.data?.authProperties &&
connectionInfoResource.data.authProperties.length > 0 &&
optionsPart.state.authModelId === connectionInfoResource.data.authModel
) {
properties = connectionInfoService.data.authProperties;
properties = connectionInfoResource.data.authProperties;
}
const sharedCredentials = optionsPart.state.sharedCredentials && serverConfigResource.data?.distributed;
@@ -208,7 +208,9 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
}
runInAction(() => {
optionsPart.state.driverId = driverId;
optionsPart.state = {
driverId,
};
});
await formState.reload();