From b511b88cd1d426ef3252ba0a0d9f28c4fb6ad826 Mon Sep 17 00:00:00 2001
From: kunish <kunish.butt@gmail.com>
Date: Sun, 3 Sep 2023 06:08:53 +0800
Subject: [PATCH] fix(proxies): latency widget

---
 src/components/{Collpase.tsx => Collapse.tsx} |  0
 src/components/Latency.tsx                    | 24 ++++++++----------
 src/components/ProxyCardGroups.tsx            |  8 +++---
 src/components/ProxyPreviewBar.tsx            |  9 +++----
 src/components/index.ts                       |  2 +-
 src/pages/Proxies.tsx                         | 18 ++++++-------
 src/pages/ProxyProvider.tsx                   | 25 +++++++++++--------
 7 files changed, 43 insertions(+), 43 deletions(-)
 rename src/components/{Collpase.tsx => Collapse.tsx} (100%)

diff --git a/src/components/Collpase.tsx b/src/components/Collapse.tsx
similarity index 100%
rename from src/components/Collpase.tsx
rename to src/components/Collapse.tsx
diff --git a/src/components/Latency.tsx b/src/components/Latency.tsx
index b038847..1ffdf70 100644
--- a/src/components/Latency.tsx
+++ b/src/components/Latency.tsx
@@ -22,18 +22,16 @@ export const Latency = (props: { name?: string }) => {
   })
 
   return (
-    <>
-      <Show
-        when={
-          typeof latency() === 'number' &&
-          latency() !== LATENCY_QUALITY_MAP_HTTP.NOT_CONNECTED
-        }
-      >
-        <span class={`whitespace-nowrap ${textClassName()}`}>
-          {latency()}
-          {t('ms')}
-        </span>
-      </Show>
-    </>
+    <Show
+      when={
+        typeof latency() === 'number' &&
+        latency() !== LATENCY_QUALITY_MAP_HTTP.NOT_CONNECTED
+      }
+    >
+      <span class={`whitespace-nowrap text-xs ${textClassName()}`}>
+        {latency()}
+        {t('ms')}
+      </span>
+    </Show>
   )
 }
diff --git a/src/components/ProxyCardGroups.tsx b/src/components/ProxyCardGroups.tsx
index 0b7854d..385901d 100644
--- a/src/components/ProxyCardGroups.tsx
+++ b/src/components/ProxyCardGroups.tsx
@@ -3,17 +3,17 @@ import { createMemo, createSignal } from 'solid-js'
 import { ProxyNodeCard } from '~/components'
 
 export const ProxyCardGroups = (props: {
-  proxies: string[]
+  proxyNames: string[]
   now?: string
   onClick?: (name: string) => void
 }) => {
   const [maxRender, setMaxRender] = createSignal(100)
-  const proxies = createMemo(() => props.proxies.slice(0, maxRender()))
+  const proxyNames = createMemo(() => props.proxyNames.slice(0, maxRender()))
 
   return (
     <InfiniteScroll
-      each={proxies()}
-      hasMore={proxies().length < props.proxies.length}
+      each={proxyNames()}
+      hasMore={proxyNames().length < props.proxyNames.length}
       next={() => setMaxRender(maxRender() + 30)}
     >
       {(proxy) => (
diff --git a/src/components/ProxyPreviewBar.tsx b/src/components/ProxyPreviewBar.tsx
index cf486ac..d58b801 100644
--- a/src/components/ProxyPreviewBar.tsx
+++ b/src/components/ProxyPreviewBar.tsx
@@ -8,7 +8,7 @@ export const ProxyPreviewBar = (props: {
 }) => {
   const { latencyMap } = useProxies()
   const latencyList = createMemo(() =>
-    props.proxyNameList.map((i) => latencyMap()[i]),
+    props.proxyNameList.map((name) => latencyMap()[name]),
   )
   const all = createMemo(() => latencyList().length)
   const good = createMemo(
@@ -42,7 +42,7 @@ export const ProxyPreviewBar = (props: {
   )
 
   return (
-    <div class="flex h-6 w-full items-center">
+    <div class="flex h-6 w-full items-center gap-2">
       <div class="flex flex-1 overflow-hidden rounded-2xl">
         <div
           class="h-2 bg-success"
@@ -69,9 +69,8 @@ export const ProxyPreviewBar = (props: {
           }}
         ></div>
       </div>
-      <div class="ml-3 w-8 text-xs">
-        <Latency name={props.now} />
-      </div>
+
+      <Latency name={props.now} />
     </div>
   )
 }
diff --git a/src/components/index.ts b/src/components/index.ts
index ff30046..306ba20 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -1,5 +1,5 @@
 export * from './Button'
-export * from './Collpase'
+export * from './Collapse'
 export * from './ConnectionsTableOrderingModal'
 export * from './ForTwoColumns'
 export * from './Header'
diff --git a/src/pages/Proxies.tsx b/src/pages/Proxies.tsx
index d55f91c..d64808e 100644
--- a/src/pages/Proxies.tsx
+++ b/src/pages/Proxies.tsx
@@ -45,6 +45,12 @@ export default () => {
       </h1>
       <ForTwoColumns
         subChild={proxies().map((proxy) => {
+          const sortedProxyNames = sortProxiesByOrderingType(
+            proxy.all ?? [],
+            latencyMap(),
+            proxiesOrderingType(),
+          )
+
           const title = (
             <>
               <div class="mr-10 flex items-center justify-between">
@@ -61,11 +67,7 @@ export default () => {
               </div>
               <Show when={!collapsedMap()[`group-${proxy.name}`]}>
                 <ProxyNodePreview
-                  proxyNameList={sortProxiesByOrderingType(
-                    proxy.all ?? [],
-                    latencyMap(),
-                    proxiesOrderingType(),
-                  )}
+                  proxyNameList={sortedProxyNames}
                   now={proxy.now}
                 />
               </Show>
@@ -74,11 +76,7 @@ export default () => {
 
           const content = (
             <ProxyCardGroups
-              proxies={sortProxiesByOrderingType(
-                proxy.all ?? [],
-                latencyMap(),
-                proxiesOrderingType(),
-              )}
+              proxyNames={sortedProxyNames}
               now={proxy.now}
               onClick={(name) => {
                 onProxyNodeClick(proxy, name)
diff --git a/src/pages/ProxyProvider.tsx b/src/pages/ProxyProvider.tsx
index dbd8ede..a00a683 100644
--- a/src/pages/ProxyProvider.tsx
+++ b/src/pages/ProxyProvider.tsx
@@ -9,8 +9,12 @@ import {
   ProxyNodePreview,
   SubscriptionInfo,
 } from '~/components'
-import { formatTimeFromNow, getBtnElFromClickEvent } from '~/helpers'
-import { useProxies } from '~/signals'
+import {
+  formatTimeFromNow,
+  getBtnElFromClickEvent,
+  sortProxiesByOrderingType,
+} from '~/helpers'
+import { proxiesOrderingType, useProxies } from '~/signals'
 
 export default () => {
   const [t] = useI18n()
@@ -19,6 +23,7 @@ export default () => {
     updateProviderByProviderName,
     updateAllProvider,
     healthCheckByProviderName,
+    latencyMap,
   } = useProxies()
 
   const [collapsedMap, setCollapsedMap] = createSignal<Record<string, boolean>>(
@@ -66,6 +71,12 @@ export default () => {
       </h1>
       <ForTwoColumns
         subChild={proxyProviders().map((proxyProvider) => {
+          const sortedProxyNames = sortProxiesByOrderingType(
+            proxyProvider.proxies.map((i) => i.name) ?? [],
+            latencyMap(),
+            proxiesOrderingType(),
+          )
+
           const title = (
             <>
               <div class="mr-8 flex items-center justify-between">
@@ -96,18 +107,12 @@ export default () => {
                 {formatTimeFromNow(proxyProvider.updatedAt)}
               </div>
               <Show when={!collapsedMap()[`provider-${proxyProvider.name}`]}>
-                <ProxyNodePreview
-                  proxyNameList={proxyProvider.proxies.map((i) => i.name) ?? []}
-                />
+                <ProxyNodePreview proxyNameList={sortedProxyNames} />
               </Show>
             </>
           )
 
-          const content = (
-            <ProxyCardGroups
-              proxies={proxyProvider.proxies.map((i) => i.name)}
-            />
-          )
+          const content = <ProxyCardGroups proxyNames={sortedProxyNames} />
 
           return (
             <Collapse