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

Merge remote-tracking branch 'origin/devel' into devel

Browse Source
This commit is contained in:
Serge Rider
2021-03-24 14:48:50 +03:00
parent 6cf756d534 59a31f54f0
commit 1c60c7fc90
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPageController.ts
+1 -1
View File
@@ -37,7 +37,7 @@ export class ServerConfigurationPageController {
change = (): void => {
this.serverConfigurationService.changed();
if (this.state.serverConfig.enabledAuthProviders.length === 0) {
if (this.state.serverConfig.enabledAuthProviders?.length === 0) {
this.state.serverConfig.authenticationEnabled = false;
}
webapp/packages/plugin-authentication/src/Administration/ServerConfiguration/AuthenticationProviders.tsx
+1 -1
View File
@@ -47,7 +47,7 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
state={serverConfig}
description={translate('administration_configuration_wizard_configuration_authentication_description')}
mod={['primary']}
disabled={serverConfig.enabledAuthProviders.length === 0}
disabled={serverConfig.enabledAuthProviders?.length === 0}
small
autoHide
>
webapp/packages/plugin-authentication/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx
+1 -1
View File
@@ -26,7 +26,7 @@ export const ServerConfigurationAdminForm: React.FC<Props> = observer(function S
const translate = useTranslate();
const style = useStyles(BASE_CONTAINERS_STYLES);
if (!serverConfig.enabledAuthProviders.includes(AUTH_PROVIDER_LOCAL_ID)) {
if (!serverConfig.enabledAuthProviders?.includes(AUTH_PROVIDER_LOCAL_ID)) {
return null;
}
webapp/packages/plugin-authentication/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts
+2 -2
View File
@@ -87,7 +87,7 @@ export class ServerConfigurationAuthenticationBootstrap extends Bootstrap {
if (
data.configurationWizard
&& state.serverConfig.enabledAuthProviders.includes(AUTH_PROVIDER_LOCAL_ID)
&& state.serverConfig.enabledAuthProviders?.includes(AUTH_PROVIDER_LOCAL_ID)
) {
state.serverConfig.adminName = data.state.serverConfig.adminName;
state.serverConfig.adminPassword = data.state.serverConfig.adminPassword;
@@ -99,7 +99,7 @@ export class ServerConfigurationAuthenticationBootstrap extends Bootstrap {
if (
data.configurationWizard
&& data.state.serverConfig.enabledAuthProviders.includes(AUTH_PROVIDER_LOCAL_ID)
&& data.state.serverConfig.enabledAuthProviders?.includes(AUTH_PROVIDER_LOCAL_ID)
) {
if (!data.state.serverConfig.adminName
|| data.state.serverConfig.adminName.length < 6