From 7c7b0c85d900f8260fee874ab90df211a3ecbd1e Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Mon, 5 Jul 2021 17:39:44 +0300
Subject: [PATCH 1/2] chore: CB-1017 cleanup

---
 webapp/packages/core-app/src/index.ts          |  2 +-
 .../shared/ToolsPanel/LogViewer/LogViewer.tsx  |  2 +-
 ...werMenuService.ts => LogViewerBootstrap.ts} |  8 ++------
 .../LogViewer/LogViewerInfoPanel.tsx           | 18 +++++++++++-------
 .../ToolsPanel/LogViewer/LogViewerService.ts   |  4 ++--
 .../SnackbarMarkups/SnackbarStatus.tsx         |  2 +-
 webapp/packages/core-bootstrap/src/manifest.ts |  4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)
 rename webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/{LogViewerMenuService.ts => LogViewerBootstrap.ts} (84%)

diff --git a/webapp/packages/core-app/src/index.ts b/webapp/packages/core-app/src/index.ts
index 2ff7b6b860..4dfeb2a83e 100644
--- a/webapp/packages/core-app/src/index.ts
+++ b/webapp/packages/core-app/src/index.ts
@@ -21,7 +21,7 @@ export * from './shared/NodesManager/NodeLink';
 export * from './shared/NodesManager/NodeManagerUtils';
 export * from './shared/NavigationTabs/NavigationTabsService';
 export * from './shared/NavigationTabs/TabNavigationContext';
-export * from './shared/ToolsPanel/LogViewer/LogViewerMenuService';
+export * from './shared/ToolsPanel/LogViewer/LogViewerBootstrap';
 export * from './shared/ToolsPanel/LogViewer/LogViewerService';
 
 export * from './shared/SessionExpireDialog/SessionExpiredDialogService';
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewer.tsx b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewer.tsx
index cafbcd121b..4dc653a0bc 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewer.tsx
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewer.tsx
@@ -48,7 +48,7 @@ export const LogViewer = observer(function LogViewer() {
   }
 
   return styled(style)(
-    <log-view-wrapper as='div'>
+    <log-view-wrapper>
       <Split mode={logViewerState.selectedItem ? undefined : 'maximize'} keepRatio>
         <Pane main>
           <LogViewerTable
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerMenuService.ts b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerBootstrap.ts
similarity index 84%
rename from webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerMenuService.ts
rename to webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerBootstrap.ts
index 1ba1a5025a..a47ff4f414 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerMenuService.ts
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerBootstrap.ts
@@ -12,7 +12,7 @@ import { EMainMenu, MainMenuService } from '../../../TopNavBar/MainMenu/MainMenu
 import { LogViewerService } from './LogViewerService';
 
 @injectable()
-export class LogViewerMenuService extends Bootstrap {
+export class LogViewerBootstrap extends Bootstrap {
   constructor(
     private mainMenuService: MainMenuService,
     private logViewerService: LogViewerService
@@ -29,14 +29,10 @@ export class LogViewerMenuService extends Bootstrap {
         type: 'checkbox',
         isChecked: () => this.logViewerService.isActive,
         title: 'app_shared_toolsMenu_logViewer',
-        onClick: () => this.toggleLogViewer(),
+        onClick: () => this.logViewerService.toggle(),
       }
     );
   }
 
-  toggleLogViewer() {
-    this.logViewerService.toggle();
-  }
-
   load(): void { }
 }
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerInfoPanel.tsx b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerInfoPanel.tsx
index 5ab467c391..9346e80869 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerInfoPanel.tsx
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerInfoPanel.tsx
@@ -64,29 +64,33 @@ interface Props {
   className?: string;
 }
 
-export const LogViewerInfoPanel: React.FC<Props> = observer(function LogViewerInfoPanel({ selectedItem, onClose, className }) {
+export const LogViewerInfoPanel: React.FC<Props> = observer(function LogViewerInfoPanel({
+  selectedItem,
+  onClose,
+  className,
+}) {
   const translate = useTranslate();
   const copy = useClipboard();
 
   const typeInfo = `${selectedItem.type} ${selectedItem.time}`;
 
-  const сopyMessage = useCallback(() => {
+  const copyMessage = useCallback(() => {
     copy(`${selectedItem.message}\n\n${selectedItem.stackTrace}`, true);
   }, [copy, selectedItem]);
 
   return styled(styles)(
-    <panel-wrapper as='div' className={className}>
-      <buttons as='div'>
-        <Button mod={['unelevated']} onClick={сopyMessage}>
+    <panel-wrapper className={className}>
+      <buttons>
+        <Button mod={['unelevated']} onClick={copyMessage}>
           {translate('ui_copy_to_clipboard')}
         </Button>
         <Button mod={['outlined']} onClick={onClose}>
           {translate('ui_close')}
         </Button>
       </buttons>
-      <content-wrapper as='div'>
+      <content-wrapper>
         <type as='h2'>{typeInfo}</type>
-        <message as='div' title={selectedItem.message}>{selectedItem.message}</message>
+        <message title={selectedItem.message}>{selectedItem.message}</message>
         <TextareaNew
           name="value"
           rows={3}
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerService.ts b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerService.ts
index 2599789f42..bccbc1e4de 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerService.ts
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewer/LogViewerService.ts
@@ -26,7 +26,7 @@ export class LogViewerService {
   }
 
   private log: ILogEntry[] = [];
-  private timeoutTaskId: any = null;
+  private timeoutTaskId: NodeJS.Timeout | null = null;
   private failedRequestsCount = 0;
   private maxFailedRequests = 0;
 
@@ -93,7 +93,7 @@ export class LogViewerService {
       maxEntries: maxLogEntries,
       clearEntries: true,
     });
-    const entries: ILogEntry[] = (log || []).map(item => ({
+    const entries: ILogEntry[] = log.map(item => ({
       ...item,
       id: uuid(),
     }));
diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
index e107d88be9..bf6f1b2864 100644
--- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
@@ -34,7 +34,7 @@ interface SnackbarStatusProps {
 export const SnackbarStatus: React.FC<SnackbarStatusProps> = function SnackbarStatus({ status, className }) {
   return styled(SNACKBAR_STATUS_STYLES)(
     status === ENotificationType.Loading ? (
-      <loader-container className={className} as='div'>
+      <loader-container className={className}>
         <Loader fullSize hideMessage />
       </loader-container>
     ) : <NotificationMark className={className} type={status} />);
diff --git a/webapp/packages/core-bootstrap/src/manifest.ts b/webapp/packages/core-bootstrap/src/manifest.ts
index 36f31b25ae..1701ad77b8 100644
--- a/webapp/packages/core-bootstrap/src/manifest.ts
+++ b/webapp/packages/core-bootstrap/src/manifest.ts
@@ -29,7 +29,7 @@ import {
   NavigationTreeContextMenuService,
   SettingsMenuService,
   LogViewerService,
-  LogViewerMenuService,
+  LogViewerBootstrap,
   TopNavService,
   AppScreenService,
   CoreSettingsService,
@@ -166,7 +166,7 @@ export const coreManifest: PluginManifest = {
     GraphQLService,
     LocalStorageSaveService,
     LocalizationService,
-    LogViewerMenuService,
+    LogViewerBootstrap,
     LogViewerService,
     MainMenuService,
     TopNavService,

From ea24857f9b005bdb76fb29d2e421156ead5f47ce Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Mon, 5 Jul 2021 17:47:32 +0300
Subject: [PATCH 2/2] fix(core-app): CB-921 tab selection event

---
 .../ConnectionSelector/ConnectionSelectorController.ts         | 1 +
 .../src/shared/NavigationTabs/NavigationTabsService.ts         | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
index 982010b3bd..f50e8646f1 100644
--- a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
+++ b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
@@ -117,6 +117,7 @@ export class ConnectionSelectorController {
       currentConnectionIcon: computed,
       objectContainerSelectionDisabled: computed,
       currentObjectContainerIcon: computed,
+      isObjectContainerSelectorVisible: computed,
     });
 
     this.connectionMenu = new ComputedMenuItemModel({
diff --git a/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts b/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
index 03d03e6ee1..c015e29b63 100644
--- a/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
+++ b/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
@@ -146,13 +146,12 @@ export class NavigationTabsService {
       this.userTabsState.history = this.userTabsState.history.filter(id => id !== tabId);
       this.userTabsState.history.unshift(tabId);
       this.userTabsState.currentId = tabId;
+      this.tabSelectSubject.next(tab);
     }
 
     if (!skipHandlers) {
       await this.callHandlerCallback(tab, handler => handler.onSelect);
     }
-
-    this.tabSelectSubject.next(tab);
   }
 
   async closeTab(tabId: string, skipHandlers?: boolean): Promise<void> {