From 73c9681c3c1811eb509b2926f3f7c93e2a7ae0b0 Mon Sep 17 00:00:00 2001
From: ezksd <ezksdo@gmail.com>
Date: Wed, 15 May 2019 17:36:40 +0800
Subject: [PATCH] Feature: make the selector proxies order as same as the order
 in the config file (#12)

* make the proxies order the same as the order in config file

* ...
---
 src/components/Tags/index.tsx                     | 5 ++---
 src/containers/Proxies/components/Group/index.tsx | 3 +--
 src/stores/ConfigStore.ts                         | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/Tags/index.tsx b/src/components/Tags/index.tsx
index e1fdb07..043ea6e 100644
--- a/src/components/Tags/index.tsx
+++ b/src/components/Tags/index.tsx
@@ -6,7 +6,7 @@ import classnames from 'classnames'
 import './style.scss'
 
 interface TagsProps extends BaseComponentProps, I18nProps {
-    data: Set<string>
+    data: string[]
     onClick: (name: string) => void
     select: string
     rowHeight: number
@@ -40,8 +40,7 @@ class TagsClass extends React.Component<TagsProps, TagsState> {
         const rowHeight = this.state.expand ? 'auto' : this.props.rowHeight
         const handleClick = canClick ? onClick : noop
 
-        const tags = [...data]
-            .sort()
+        const tags = data
             .map(t => {
                 const tagClass = classnames({ 'tags-selected': select === t, 'can-click': canClick })
                 return (
diff --git a/src/containers/Proxies/components/Group/index.tsx b/src/containers/Proxies/components/Group/index.tsx
index e549054..e691a20 100644
--- a/src/containers/Proxies/components/Group/index.tsx
+++ b/src/containers/Proxies/components/Group/index.tsx
@@ -21,7 +21,6 @@ export class Group extends React.Component<GroupProps, {}> {
 
     render () {
         const { config } = this.props
-        const proxies = new Set(config.all)
         const canClick = config.type === 'Selector'
         return (
             <div className="proxy-group">
@@ -32,7 +31,7 @@ export class Group extends React.Component<GroupProps, {}> {
                 <div className="proxy-group-tags-container">
                     <Tags
                         className="proxy-group-tags"
-                        data={proxies}
+                        data={config.all}
                         onClick={this.handleChangeProxySelected}
                         select={config.now}
                         canClick={canClick}
diff --git a/src/stores/ConfigStore.ts b/src/stores/ConfigStore.ts
index b6a646e..6d1c45a 100644
--- a/src/stores/ConfigStore.ts
+++ b/src/stores/ConfigStore.ts
@@ -70,13 +70,13 @@ export class ConfigStore {
 
             const policyGroup = new Set(['Selector', 'URLTest', 'Fallback', 'LoadBalance'])
             const unUsedProxy = new Set(['DIRECT', 'REJECT', 'GLOBAL'])
-            const proxies = Object.keys(rawProxies.data.proxies)
+            const proxyList = rawProxies.data.proxies['GLOBAL'] as API.Group
+            const proxies = proxyList.all
                 .filter(key => !unUsedProxy.has(key))
                 .map(key => ({ ...rawProxies.data.proxies[key], name: key }))
             const [proxy, groups] = partition(proxies, proxy => !policyGroup.has(proxy.type))
             this.data.proxy = proxy as API.Proxy[]
             this.data.proxyGroup = groups as API.Group[]
-
             this.data.rules = rules.data.rules
         })
     }