diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java index 5bda8362a2..8420f4e8ba 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java @@ -71,7 +71,7 @@ private void migrateConfiguration( smReverseProxyProviderConfiguration.setProvider(RPAuthProvider.AUTH_PROVIDER); smReverseProxyProviderConfiguration.setDisplayName("Reverse Proxy"); smReverseProxyProviderConfiguration.setDescription( - "Automatically created provider after changing Reverse Proxy configuration way in 23.3.4 version" + "This provider was created automatically" ); smReverseProxyProviderConfiguration .setIconURL(""); Map parameters = new HashMap<>(); diff --git a/webapp/packages/core-blocks/src/Slide/SlideElement.module.css b/webapp/packages/core-blocks/src/Slide/SlideElement.module.css index a12f0a1f81..86b9518fec 100644 --- a/webapp/packages/core-blocks/src/Slide/SlideElement.module.css +++ b/webapp/packages/core-blocks/src/Slide/SlideElement.module.css @@ -11,11 +11,11 @@ display: inline-block; vertical-align: top; white-space: normal; - transition: transform cubic-bezier(0.4, 0, 0.2, 1) 0.6s; + transition: transform ease-in-out 0.4s; transform: translateX(-100%); &:first-child { - transition: width cubic-bezier(0.4, 0, 0.2, 1) 0.6s; + transition: width ease-in-out 0.4s; width: 100%; } } diff --git a/webapp/packages/core-connections/src/DBDriverResource.ts b/webapp/packages/core-connections/src/DBDriverResource.ts index b961c0c4fd..e56aa5f08a 100644 --- a/webapp/packages/core-connections/src/DBDriverResource.ts +++ b/webapp/packages/core-connections/src/DBDriverResource.ts @@ -87,7 +87,7 @@ export class DBDriverResource extends CachedMapResource }) { const translate = useTranslate(); const editing = mode === FormMode.Edit; - const localState = useTabState(() => ({ - selectedOrigin: '0', - })); + const localState = useObservableRef( + () => ({ + selectedOrigin: '0', + }), + { + selectedOrigin: observable.ref, + }, + false, + ); const userInfoLoader = useResource(UserFormOriginInfoPanel, UsersResource, state.userId, { active: editing, }); diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts index b04ff82546..173f07549c 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts @@ -7,7 +7,6 @@ */ import React from 'react'; -import { UsersResource } from '@cloudbeaver/core-authentication'; import { Bootstrap, injectable } from '@cloudbeaver/core-di'; import { FormMode } from '@cloudbeaver/core-ui'; @@ -25,10 +24,7 @@ const UserFormOriginInfoTab = React.lazy(async () => { @injectable() export class UserFormOriginPartBootstrap extends Bootstrap { - constructor( - private readonly administrationUserFormService: AdministrationUserFormService, - private readonly usersResource: UsersResource, - ) { + constructor(private readonly administrationUserFormService: AdministrationUserFormService) { super(); } diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts index d9d393a554..091ac18c5f 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts @@ -38,10 +38,11 @@ export class CreateUserBootstrap extends Bootstrap { this.actionService.addHandler({ id: 'users-table-base', + menus: [MENU_USERS_ADMINISTRATION], actions: [ACTION_CREATE], - isActionApplicable: (context, action) => { - if (action === ACTION_CREATE && !this.administrationUsersManagementService.externalUserProviderEnabled) { - return this.authProvidersResource.has(AUTH_PROVIDER_LOCAL_ID); + isHidden: (context, action) => { + if (action === ACTION_CREATE) { + return this.administrationUsersManagementService.externalUserProviderEnabled || !this.authProvidersResource.has(AUTH_PROVIDER_LOCAL_ID); } return false;