From 38dbc341c8473f383e13efa5b7a92221403ce279 Mon Sep 17 00:00:00 2001
From: Dreamacro <305009791@qq.com>
Date: Tue, 18 Feb 2020 19:33:00 +0800
Subject: [PATCH] Feature: provider order

---
 src/containers/Proxies/components/Provider/index.tsx | 8 +++++++-
 src/containers/Proxies/index.tsx                     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/containers/Proxies/components/Provider/index.tsx b/src/containers/Proxies/components/Provider/index.tsx
index 766d27e..6e278ef 100644
--- a/src/containers/Proxies/components/Provider/index.tsx
+++ b/src/containers/Proxies/components/Provider/index.tsx
@@ -1,9 +1,11 @@
 import * as React from 'react'
+import { useMemo } from 'react'
 import { Card, Tag, Icon, Loading, useLoading } from '@components'
 import { containers } from '@stores'
 import { fromNow } from '@lib/date'
 import { Provider as IProvider, Proxy as IProxy, updateProvider, healthCheckProvider } from '@lib/request'
 import { Proxy } from '../Proxy'
+import { compareDesc } from '../../'
 import './style.scss'
 
 interface ProvidersProps {
@@ -29,6 +31,10 @@ export function Provider (props: ProvidersProps) {
         updateProvider(provider.name).then(() => fetch()).finally(() => hide())
     }
 
+    const proxies = useMemo(() => {
+        return (provider.proxies as IProxy[]).slice().sort((a, b) => -1 * compareDesc(a, b))
+    }, [provider.proxies])
+
     return (
         <Card className="proxy-provider">
             <Loading visible={visible} />
@@ -48,7 +54,7 @@ export function Provider (props: ProvidersProps) {
             </div>
             <ul className="proxies-list">
                 {
-                    provider.proxies.map((p: IProxy) => (
+                    proxies.map((p: IProxy) => (
                         <li key={p.name}>
                             <Proxy className="proxy-provider-item" config={p} />
                         </li>
diff --git a/src/containers/Proxies/index.tsx b/src/containers/Proxies/index.tsx
index d836c34..ce01024 100644
--- a/src/containers/Proxies/index.tsx
+++ b/src/containers/Proxies/index.tsx
@@ -21,7 +21,7 @@ const sortMap = {
     [sortType.Desc]: 'sort-descending'
 }
 
-function compareDesc (a: API.Proxy, b: API.Proxy) {
+export function compareDesc (a: API.Proxy, b: API.Proxy) {
     const lastDelayA = a.history.length ? a.history.slice(-1)[0].delay : 0
     const lastDelayB = b.history.length ? b.history.slice(-1)[0].delay : 0
     return (lastDelayB || Number.MAX_SAFE_INTEGER) - (lastDelayA || Number.MAX_SAFE_INTEGER)