From 285a216b4ccb70342caad2efe5343e54c9fa2ab5 Mon Sep 17 00:00:00 2001 From: alex <48489896+devnaumov@users.noreply.github.com> Date: Mon, 25 Nov 2024 18:13:54 +0100 Subject: [PATCH] CB-5125 do not trigger logo in configuration stage (#3096) * CB-5125 do not trigger logo in configuration stage * CB-5125 use publicDisabled field instead * CB-5125 bind method --------- Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- webapp/packages/core-blocks/src/layout/AppLogo.module.css | 3 +++ webapp/packages/core-blocks/src/layout/AppLogo.tsx | 2 +- webapp/packages/core-routing/src/Screen/ScreenService.ts | 2 ++ webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx | 5 +++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/webapp/packages/core-blocks/src/layout/AppLogo.module.css b/webapp/packages/core-blocks/src/layout/AppLogo.module.css index 9dcd006310..0e39924945 100644 --- a/webapp/packages/core-blocks/src/layout/AppLogo.module.css +++ b/webapp/packages/core-blocks/src/layout/AppLogo.module.css @@ -10,6 +10,9 @@ display: flex; align-items: center; padding: 0 14px; +} + +.active { cursor: pointer; } diff --git a/webapp/packages/core-blocks/src/layout/AppLogo.tsx b/webapp/packages/core-blocks/src/layout/AppLogo.tsx index 0f37ddacf3..772dd982a4 100644 --- a/webapp/packages/core-blocks/src/layout/AppLogo.tsx +++ b/webapp/packages/core-blocks/src/layout/AppLogo.tsx @@ -18,7 +18,7 @@ interface Props { export const AppLogo: React.FC = function AppLogo({ title, onClick }) { const style = useS(styles); return ( -
+
); diff --git a/webapp/packages/core-routing/src/Screen/ScreenService.ts b/webapp/packages/core-routing/src/Screen/ScreenService.ts index e73be6ce54..2de940658c 100644 --- a/webapp/packages/core-routing/src/Screen/ScreenService.ts +++ b/webapp/packages/core-routing/src/Screen/ScreenService.ts @@ -32,6 +32,8 @@ export class ScreenService { this.routerService.subscribe(this.onRouteChange.bind(this)); this.routerService.transitionTask.addHandler(this.routeTransition.bind(this)); + this.navigateToRoot = this.navigateToRoot.bind(this); + makeObservable(this, { screen: computed, }); diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx index a8f4d0edd9..8ad702f2c6 100644 --- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx +++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx @@ -9,13 +9,14 @@ import { observer } from 'mobx-react-lite'; import { AppLogo, useResource } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { ProductInfoResource } from '@cloudbeaver/core-root'; +import { PermissionsService, ProductInfoResource } from '@cloudbeaver/core-root'; import { ScreenService } from '@cloudbeaver/core-routing'; import { useAppVersion } from '@cloudbeaver/core-version'; export const Logo = observer(function Logo() { const productInfoResource = useResource(Logo, ProductInfoResource, undefined); const screenService = useService(ScreenService); + const permissionsService = useService(PermissionsService); const { backendVersion, frontendVersion } = useAppVersion(true); const isSameVersion = backendVersion === frontendVersion; @@ -26,5 +27,5 @@ export const Logo = observer(function Logo() { const title = isSameVersion ? backendVersionTitle : commonVersionTitle; - return screenService.navigateToRoot()} />; + return ; });