Merge branch 'devel' into CB-5719-easy-config-part

dbeaver · Sep 30, 2024 · 3e22916 · 3e22916
2 parents 0fe35bd + 3118eac
commit 3e22916
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/...io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java b/...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<String, Object> 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
@@ -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
@@ -87,7 +87,7 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, DBDriv
 
   async addDriverLibraries(driverId: string, files: File[]) {
     await this.graphQLService.sdk.uploadDriverLibrary(driverId, files);
-    await this.refresh(driverId);
+    await this.markOutdated(driverId);
   }
 
   protected override dataSet(key: string, value: DBDriver): void {

diff --git a/...ation-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx b/...ation-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx
@@ -5,6 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { Fragment } from 'react';
 
@@ -17,13 +18,14 @@ import {
   Group,
   GroupItem,
   ObjectPropertyInfoForm,
+  useObservableRef,
   useResource,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { FormMode, type TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui';
+import { FormMode, type TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui';
 
 import type { UserFormProps } from '../AdministrationUserFormService.js';
 
@@ -39,9 +41,15 @@ export const UserFormOriginInfoPanel: TabContainerPanelComponent<UserFormProps>
 }) {
   const translate = useTranslate();
   const editing = mode === FormMode.Edit;
-  const localState = useTabState<IState>(() => ({
-    selectedOrigin: '0',
-  }));
+  const localState = useObservableRef<IState>(
+    () => ({
+      selectedOrigin: '0',
+    }),
+    {
+      selectedOrigin: observable.ref,
+    },
+    false,
+  );
   const userInfoLoader = useResource(UserFormOriginInfoPanel, UsersResource, state.userId, {
     active: editing,
   });

diff --git a/...on-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts b/...on-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/...-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts b/...-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;