From 4f930869098db8f2165bec48a8c68cfba59f440f Mon Sep 17 00:00:00 2001
From: Clint Brown <clint.brown@fairfaxmedia.com.au>
Date: Thu, 8 Mar 2018 12:21:07 +1100
Subject: [PATCH 1/5] Add classname hooks for default and active state

---
 plugin-api/beta/client/components/SortOption.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugin-api/beta/client/components/SortOption.js b/plugin-api/beta/client/components/SortOption.js
index 8ed0dd149..0b3b48871 100644
--- a/plugin-api/beta/client/components/SortOption.js
+++ b/plugin-api/beta/client/components/SortOption.js
@@ -1,11 +1,19 @@
 import React from 'react';
+import cn from 'classnames';
 import styles from './SortOption.css';
 import PropTypes from 'prop-types';
 
+const pluginName = 'talk-slot-viewing-options-sort-option';
+
 export default class SortOption extends React.Component {
+
   render() {
     return (
-      <label className={styles.label}>
+      <label className={cn([
+        styles.label,
+        pluginName,
+        { [`${pluginName}-active`]: this.props.active },
+      ])}>
         <input
           type="radio"
           onChange={this.props.setSort}

From e5891822fbe6206a4bab13f2241fbc033d68e1d3 Mon Sep 17 00:00:00 2001
From: Clint Brown <clint.brown@fairfaxmedia.com.au>
Date: Thu, 8 Mar 2018 12:38:25 +1100
Subject: [PATCH 2/5] Fix linting issue

---
 plugin-api/beta/client/components/SortOption.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugin-api/beta/client/components/SortOption.js b/plugin-api/beta/client/components/SortOption.js
index 0b3b48871..41c462511 100644
--- a/plugin-api/beta/client/components/SortOption.js
+++ b/plugin-api/beta/client/components/SortOption.js
@@ -6,14 +6,15 @@ import PropTypes from 'prop-types';
 const pluginName = 'talk-slot-viewing-options-sort-option';
 
 export default class SortOption extends React.Component {
-
   render() {
     return (
-      <label className={cn([
-        styles.label,
-        pluginName,
-        { [`${pluginName}-active`]: this.props.active },
-      ])}>
+      <label
+        className={cn([
+          styles.label,
+          pluginName,
+          { [`${pluginName}-active`]: this.props.active },
+        ])}
+      >
         <input
           type="radio"
           onChange={this.props.setSort}

From c22de3832cdd8123ea37c7c072aa7ab307d0a9e7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Mar 2018 19:52:35 +0100
Subject: [PATCH 3/5] Move SortOption to talk-plugin-viewing-options

---
 .../talk-plugin-sort-most-liked/client/index.js    |  2 +-
 .../talk-plugin-sort-most-loved/client/index.js    |  2 +-
 .../talk-plugin-sort-most-replied/client/index.js  |  2 +-
 .../client/index.js                                |  2 +-
 plugins/talk-plugin-sort-newest/client/index.js    |  2 +-
 plugins/talk-plugin-sort-oldest/client/index.js    |  2 +-
 .../client/api}/components/SortOption.css          |  0
 .../client/api}/components/SortOption.js           | 14 +++++++-------
 .../client/api}/factories/index.js                 |  2 +-
 .../client/constants.js                            |  5 ++++-
 10 files changed, 18 insertions(+), 15 deletions(-)
 rename {plugin-api/beta/client => plugins/talk-plugin-viewing-options/client/api}/components/SortOption.css (100%)
 rename {plugin-api/beta/client => plugins/talk-plugin-viewing-options/client/api}/components/SortOption.js (76%)
 rename {plugin-api/beta/client => plugins/talk-plugin-viewing-options/client/api}/factories/index.js (85%)

diff --git a/plugins/talk-plugin-sort-most-liked/client/index.js b/plugins/talk-plugin-sort-most-liked/client/index.js
index eb49045af..ef7892403 100644
--- a/plugins/talk-plugin-sort-most-liked/client/index.js
+++ b/plugins/talk-plugin-sort-most-liked/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(
diff --git a/plugins/talk-plugin-sort-most-loved/client/index.js b/plugins/talk-plugin-sort-most-loved/client/index.js
index 371ff4deb..a2a70e354 100644
--- a/plugins/talk-plugin-sort-most-loved/client/index.js
+++ b/plugins/talk-plugin-sort-most-loved/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(
diff --git a/plugins/talk-plugin-sort-most-replied/client/index.js b/plugins/talk-plugin-sort-most-replied/client/index.js
index 5bd61eb5e..77d66a0e0 100644
--- a/plugins/talk-plugin-sort-most-replied/client/index.js
+++ b/plugins/talk-plugin-sort-most-replied/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(
diff --git a/plugins/talk-plugin-sort-most-respected/client/index.js b/plugins/talk-plugin-sort-most-respected/client/index.js
index 21f726ede..7d72ef5ae 100644
--- a/plugins/talk-plugin-sort-most-respected/client/index.js
+++ b/plugins/talk-plugin-sort-most-respected/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(
diff --git a/plugins/talk-plugin-sort-newest/client/index.js b/plugins/talk-plugin-sort-newest/client/index.js
index e49ef4f7e..ff58833b7 100644
--- a/plugins/talk-plugin-sort-newest/client/index.js
+++ b/plugins/talk-plugin-sort-newest/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(() => t('talk-plugin-sort-newest.label'), {
diff --git a/plugins/talk-plugin-sort-oldest/client/index.js b/plugins/talk-plugin-sort-oldest/client/index.js
index 5e010e2c4..f7d072388 100644
--- a/plugins/talk-plugin-sort-oldest/client/index.js
+++ b/plugins/talk-plugin-sort-oldest/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(() => t('talk-plugin-sort-oldest.label'), {
diff --git a/plugin-api/beta/client/components/SortOption.css b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.css
similarity index 100%
rename from plugin-api/beta/client/components/SortOption.css
rename to plugins/talk-plugin-viewing-options/client/api/components/SortOption.css
diff --git a/plugin-api/beta/client/components/SortOption.js b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
similarity index 76%
rename from plugin-api/beta/client/components/SortOption.js
rename to plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
index 41c462511..cb71fe879 100644
--- a/plugin-api/beta/client/components/SortOption.js
+++ b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
@@ -2,18 +2,18 @@ import React from 'react';
 import cn from 'classnames';
 import styles from './SortOption.css';
 import PropTypes from 'prop-types';
-
-const pluginName = 'talk-slot-viewing-options-sort-option';
+import {PLUGIN_NAME} from '../constants';
 
 export default class SortOption extends React.Component {
   render() {
+    const className = cn([
+      styles.label,
+      `${PLUGIN_NAME}-sort-option`,
+      { [`${PLUGIN_NAME}-sort-option-active`]: this.props.active },
+    ]);
     return (
       <label
-        className={cn([
-          styles.label,
-          pluginName,
-          { [`${pluginName}-active`]: this.props.active },
-        ])}
+        className={className}
       >
         <input
           type="radio"
diff --git a/plugin-api/beta/client/factories/index.js b/plugins/talk-plugin-viewing-options/client/api/factories/index.js
similarity index 85%
rename from plugin-api/beta/client/factories/index.js
rename to plugins/talk-plugin-viewing-options/client/api/factories/index.js
index 364537cd5..0d3fdb5b9 100644
--- a/plugin-api/beta/client/factories/index.js
+++ b/plugins/talk-plugin-viewing-options/client/api/factories/index.js
@@ -1,4 +1,4 @@
-import withSortOption from '../hocs/withSortOption';
+import withSortOption from 'plugin-api/beta/client/hocs/withSortOption';
 import SortOption from '../components/SortOption';
 
 /**
diff --git a/plugins/talk-plugin-viewing-options/client/constants.js b/plugins/talk-plugin-viewing-options/client/constants.js
index c1b6a8216..2b2dafe6d 100644
--- a/plugins/talk-plugin-viewing-options/client/constants.js
+++ b/plugins/talk-plugin-viewing-options/client/constants.js
@@ -1,4 +1,7 @@
-const prefix = 'TALK_VIEWING_OPTIONS';
+export const PLUGIN_NAME = 'talk-plugin-viewing-options';
 
+/* Contants for redux actions */
+const prefix = 'TALK_VIEWING_OPTIONS';
 export const OPEN_MENU = `${prefix}_OPEN_MENU`;
 export const CLOSE_MENU = `${prefix}_CLOSE_MENU`;
+

From 3c854d0468d85e1771a4b39e99a9e0dddaad1fc1 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Mar 2018 19:54:16 +0100
Subject: [PATCH 4/5] Fix path

---
 .../client/api/components/SortOption.js                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
index cb71fe879..88ec7b60b 100644
--- a/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
+++ b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import styles from './SortOption.css';
 import PropTypes from 'prop-types';
-import {PLUGIN_NAME} from '../constants';
+import {PLUGIN_NAME} from '../../constants';
 
 export default class SortOption extends React.Component {
   render() {

From 0708025f81122cdb612a325ad6d55924f415e91e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 9 Mar 2018 19:58:54 +0100
Subject: [PATCH 5/5] Fix lint issues

---
 .../client/api/components/SortOption.js                     | 6 ++----
 plugins/talk-plugin-viewing-options/client/constants.js     | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
index 88ec7b60b..f8bd7e6fb 100644
--- a/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
+++ b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import styles from './SortOption.css';
 import PropTypes from 'prop-types';
-import {PLUGIN_NAME} from '../../constants';
+import { PLUGIN_NAME } from '../../constants';
 
 export default class SortOption extends React.Component {
   render() {
@@ -12,9 +12,7 @@ export default class SortOption extends React.Component {
       { [`${PLUGIN_NAME}-sort-option-active`]: this.props.active },
     ]);
     return (
-      <label
-        className={className}
-      >
+      <label className={className}>
         <input
           type="radio"
           onChange={this.props.setSort}
diff --git a/plugins/talk-plugin-viewing-options/client/constants.js b/plugins/talk-plugin-viewing-options/client/constants.js
index 2b2dafe6d..cc45c20e1 100644
--- a/plugins/talk-plugin-viewing-options/client/constants.js
+++ b/plugins/talk-plugin-viewing-options/client/constants.js
@@ -4,4 +4,3 @@ export const PLUGIN_NAME = 'talk-plugin-viewing-options';
 const prefix = 'TALK_VIEWING_OPTIONS';
 export const OPEN_MENU = `${prefix}_OPEN_MENU`;
 export const CLOSE_MENU = `${prefix}_CLOSE_MENU`;
-