From 1230129a4b0e3acd7bd7e3a8c5c8675697cb5b39 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 31 Aug 2019 13:07:53 -0500
Subject: [PATCH] refactor SubscribeButton for SRP -> Primary Button &
 MirrorButtons

---
 .../src/components/ListInfoDrawer.tsx         |  4 +-
 ...bscribeButton.tsx => SubscribeButtons.tsx} | 59 +++++++++++--------
 2 files changed, 38 insertions(+), 25 deletions(-)
 rename src/FilterLists.Web.V2/src/components/{SubscribeButton.tsx => SubscribeButtons.tsx} (67%)

diff --git a/src/FilterLists.Web.V2/src/components/ListInfoDrawer.tsx b/src/FilterLists.Web.V2/src/components/ListInfoDrawer.tsx
index db10f89c0..54fe5df6f 100644
--- a/src/FilterLists.Web.V2/src/components/ListInfoDrawer.tsx
+++ b/src/FilterLists.Web.V2/src/components/ListInfoDrawer.tsx
@@ -11,7 +11,7 @@ import { Description } from './Description';
 import { LanguageCloud } from './languageCloud';
 import { LicenseTag } from './LicenseTag';
 import { LinkButton } from './LinkButton';
-import { SubscribeButton } from './SubscribeButton';
+import { SubscribeButtons } from './SubscribeButtons';
 import { TagCloud } from './tagCloud';
 
 interface Props {
@@ -64,7 +64,7 @@ export class ListInfoDrawer extends React.Component<RouteComponentProps & Props,
         : null}
       <Divider />
       <ButtonGroup style={{ display: "inherit" }}>
-        {this.props.list.viewUrl && <SubscribeButton {...this.props.list} />}
+        {this.props.list.viewUrl && <SubscribeButtons {...this.props.list} />}
         {this.props.list.viewUrl &&
           <LinkButton url={this.props.list.viewUrl}
             text="View"
diff --git a/src/FilterLists.Web.V2/src/components/SubscribeButton.tsx b/src/FilterLists.Web.V2/src/components/SubscribeButtons.tsx
similarity index 67%
rename from src/FilterLists.Web.V2/src/components/SubscribeButton.tsx
rename to src/FilterLists.Web.V2/src/components/SubscribeButtons.tsx
index 89acdde27..48a91809e 100644
--- a/src/FilterLists.Web.V2/src/components/SubscribeButton.tsx
+++ b/src/FilterLists.Web.V2/src/components/SubscribeButtons.tsx
@@ -8,40 +8,53 @@ interface Props {
   viewUrlMirrors: string[];
 };
 
-export const SubscribeButton = (props: Props) => {
+export const SubscribeButtons = (props: Props) =>
+  <>
+    <PrimaryButton {...props} />
+    <MirrorButtons {...props} />
+  </>;
+
+const PrimaryButton = (props: Props) => {
   const buttonProps = buildButtonProps(props.name, props.viewUrl);
   return (
-    <>
-      <PrimaryButton {...buttonProps} />
-      <MirrorButtons {...props} />
-    </>
+    <Button disabled={buttonProps[1]}
+      block
+      icon="import"
+      {...buttonProps[0]}>
+      Subscribe
+  </Button>
   )
 };
 
-const PrimaryButton = (props: [ButtonProps, boolean]) =>
-  <Button disabled={props[1]}
-    block
-    icon="import"
-    {...props[0]}>
-    Subscribe
-  </Button>;
-
 const MirrorButtons = (props: Props) =>
   <>
     {props.viewUrlMirrors && props.viewUrlMirrors.length
-      ? props.viewUrlMirrors.map((viewUrlMirror: string, i: number) => {
-        const buttonProps = buildButtonProps(props.name, viewUrlMirror);
-        return <Button key={i}
-          disabled={buttonProps[1]}
-          block
-          icon="import"
-          {...buttonProps[0]}>
-          {`Subscribe (Mirror ${i + 1})`}
-        </Button>
-      })
+      ? props.viewUrlMirrors.map((viewUrlMirror: string, i: number) =>
+        <MirrorButton index={i} viewUrlMirror={viewUrlMirror} name={props.name} />
+      )
       : null}
   </>;
 
+interface MirrorButtonProps {
+  index: number;
+  viewUrlMirror: string;
+  name: string;
+}
+
+const MirrorButton = (props: MirrorButtonProps) => {
+  const buttonProps = buildButtonProps(props.name, props.viewUrlMirror);
+  return (
+    <Button
+      key={props.index}
+      disabled={buttonProps[1]}
+      block
+      icon="import"
+      {...buttonProps[0]}>
+      {`Subscribe (Mirror ${props.index + 1})`}
+    </Button>
+  )
+}
+
 const buildButtonProps = (name: string, viewUrl: string): [ButtonProps, boolean] => {
   let type: ButtonType = "primary";
   let disabled: boolean = false;