TSK-760: Fix scroll issue for mac (#3173)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
hcengineering · May 12, 2023 · dd712fc · dd712fc
1 parent cbe0f74
commit dd712fc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/packages/ui/src/components/Scroller.svelte b/packages/ui/src/components/Scroller.svelte
@@ -369,8 +369,12 @@
   const wheelEvent = (e: WheelEvent) => {
     e = e || window.event
     const deltaY = e.deltaY
-    if (deltaY < 0 && autoscroll && scrolling && beforeContent && beforeContent > 0) scrolling = false
-    else if (deltaY > 0 && autoscroll && !scrolling && belowContent && belowContent <= 10) scrolling = true
+    if (deltaY < 0 && autoscroll && scrolling && beforeContent && beforeContent > 0) {
+      scrolling = false
+    } else if (deltaY > 0 && autoscroll && !scrolling && belowContent && belowContent <= 10) {
+      scrolling = true
+    }
+    scrollY += deltaY
   }
 
   let observer: IntersectionObserver
@@ -478,7 +482,14 @@
         // TODO: Workaround: https://front.hc.engineering/workbench/platform/tracker/TSK-760
         // In Safari scroll could jump on click, with no particular reason.
 
-        if (scrollY !== 0 && Math.abs(newPos - scrollY) > 100 && divScroll !== undefined && isSafari()) {
+        if (
+          !scrolling &&
+          !isScrolling &&
+          scrollY !== 0 &&
+          Math.abs(newPos - scrollY) > 100 &&
+          divScroll !== undefined &&
+          isSafari()
+        ) {
           divScroll.scrollTop = scrollY
         }
         scrollY = divScroll?.scrollTop ?? 0

diff --git a/plugins/workbench-resources/src/components/ServerStatistics.svelte b/plugins/workbench-resources/src/components/ServerStatistics.svelte
@@ -24,9 +24,13 @@
 
 <Card on:close fullSize label={getEmbeddedLabel('Statistics')} okAction={() => {}} okLabel={getEmbeddedLabel('Ok')}>
   {#if data}
-    {#each Object.entries(data.statistics?.activeSessions) as act}
-      {act[0]}: {act[1]}
-    {/each}
+    <div class="flex-column">
+      {#each Object.entries(data.statistics?.activeSessions) as act}
+        <span class="flex-row-center">
+          {act[0]}: {act[1]}
+        </span>
+      {/each}
+    </div>
 
     <span class="fs-title flex-row-center">
       Memory usage: {data.statistics.memoryUsed} / {data.statistics.memoryTotal}

diff --git a/plugins/workbench-resources/src/connect.ts b/plugins/workbench-resources/src/connect.ts
@@ -142,11 +142,15 @@ export async function connect (title: string): Promise<Client | undefined> {
   await setClient(_client)
 
   if (me.role === AccountRole.Owner) {
+    let ep = endpoint.replace(/^ws/g, 'http')
+    if (!ep.endsWith('/')) {
+      ep += '/'
+    }
     setMetadata(ui.metadata.ShowNetwork, (evt: MouseEvent) => {
       showPopup(
         ServerStatistics,
         {
-          endpoint: endpoint.replace(/^ws/g, 'http') + '/' + token
+          endpoint: ep + token
         },
         'top'
       )

diff --git a/server/ws/src/server.ts b/server/ws/src/server.ts
@@ -411,9 +411,14 @@ class TSessionManager implements SessionManager {
               workspace,
               'hello happen',
               service.getUser(),
+              'binary:',
               service.binaryResponseMode,
+              'compression:',
               service.useCompression,
-              this.workspaces.get(workspace)?.sessions?.size
+              'workspace users:',
+              this.workspaces.get(workspace)?.sessions?.size,
+              'total users:',
+              this.sessions.size
             )
           }
           const helloResponse: HelloResponse = { id: -1, result: 'hello', binary: service.binaryResponseMode }
@@ -441,7 +446,7 @@ class TSessionManager implements SessionManager {
             ctx,
             ws,
             resp,
-            this.sessions.size < 100 ? 10000 : 101,
+            this.sessions.size < 100 ? 10000 : 1001,
             service.binaryResponseMode,
             service.useCompression
           )