Fixes #681 API calls for reciter (#694)

quran · Mar 19, 2017 · 1fc9bb8 · 1fc9bb8
1 parent 2bff754
commit 1fc9bb8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/src/components/ContentDropdown/index.js b/src/components/ContentDropdown/index.js
@@ -29,24 +29,24 @@ const compareAlphabetically = property =>
 class ContentDropdown extends Component {
   static propTypes = {
     onOptionChange: PropTypes.func.isRequired,
-    content: PropTypes.arrayOf(PropTypes.number).isRequired,
-    translations: PropTypes.arrayOf(contentType),
+    translations: PropTypes.arrayOf(PropTypes.number).isRequired,
+    translationOptions: PropTypes.arrayOf(contentType),
     loadTranslations: PropTypes.func.isRequired,
     className: PropTypes.string
   };
 
   componentDidMount() {
-    if (!this.props.translations.length) {
+    if (!this.props.translationOptions.length) {
       return this.props.loadTranslations();
     }
 
     return false;
   }
 
   getTitle() {
-    const { translations, content } = this.props;
+    const { translationOptions, translations } = this.props;
 
-    return translations.filter(slug => content.includes(slug.id)).map((slug) => {
+    return translationOptions.filter(slug => translations.includes(slug.id)).map((slug) => {
       if (slug.languageName === 'English') return slug.authorName;
 
       return slug.languageName;
@@ -56,24 +56,24 @@ class ContentDropdown extends Component {
   handleRemoveContent = () => {
     const { onOptionChange } = this.props;
 
-    onOptionChange({ content: [] });
+    onOptionChange({ translations: [] });
   }
 
   handleOptionSelected(id) {
-    const { onOptionChange, content } = this.props;
+    const { onOptionChange, translations } = this.props;
 
-    if (content.find(option => option === id)) {
-      onOptionChange({ content: content.filter(option => option !== id) });
+    if (translations.find(option => option === id)) {
+      onOptionChange({ translations: translations.filter(option => option !== id) });
     } else {
-      onOptionChange({ content: [...content, id] });
+      onOptionChange({ translations: [...translations, id] });
     }
   }
 
   renderItems(items, key) {
-    const { content } = this.props;
+    const { translations } = this.props;
 
     return items.map((translation) => {
-      const checked = content.find(option => option === translation.id);
+      const checked = translations.find(option => option === translation.id);
 
       return (
         <li key={translation.id} className={style.item}>
@@ -94,23 +94,23 @@ class ContentDropdown extends Component {
   }
 
   renderEnglishList() {
-    const list = this.props.translations
+    const list = this.props.translationOptions
     .filter(translation => translation.languageName === 'English')
     .sort(compareAlphabetically('authorName'));
 
     return this.renderItems(list, 'authorName');
   }
 
   renderLanguagesList() {
-    const list = this.props.translations
+    const list = this.props.translationOptions
     .filter(translation => translation.languageName !== 'English')
     .sort(compareAlphabetically('languageName'));
 
     return this.renderItems(list, 'languageName');
   }
 
   render() {
-    const { className, content } = this.props;
+    const { className, translations } = this.props;
 
     return (
       <ButtonToolbar>
@@ -121,7 +121,7 @@ class ContentDropdown extends Component {
           title={this.getTitle()}
         >
           {
-            content.length &&
+            translations && translations.length &&
               <MenuItem onClick={this.handleRemoveContent}>
                 <LocaleFormattedMessage id="setting.translations.removeAll" defaultMessage="Remove all" />
               </MenuItem>
@@ -142,6 +142,7 @@ class ContentDropdown extends Component {
 }
 
 export default connect(state => ({
-  translations: state.options.options.translations,
-  loadingTranslations: state.options.loadingTranslations
+  translationOptions: state.options.options.translations,
+  loadingTranslations: state.options.loadingTranslations,
+  translations: state.options.translations
 }), { loadTranslations })(ContentDropdown);
diff --git a/src/components/ReciterDropdown/index.js b/src/components/ReciterDropdown/index.js
@@ -66,5 +66,6 @@ class ReciterDropdown extends Component {
 
 export default connect(state => ({
   recitations: state.options.options.recitations,
-  loadingRecitations: state.options.loadingRecitations
+  loadingRecitations: state.options.loadingRecitations,
+  audio: state.options.audio
 }), { loadRecitations })(ReciterDropdown);
diff --git a/src/components/SettingsModal/index.js b/src/components/SettingsModal/index.js
@@ -48,7 +48,6 @@ const SettingsModal = ({
           </h5>
           <ReciterDropdown
             onOptionChange={handleOptionChange}
-            audio={options.audio}
           />
         </div>
         <div className="form-group">
@@ -57,7 +56,6 @@ const SettingsModal = ({
           </h5>
           <ContentDropdown
             onOptionChange={handleOptionChange}
-            content={options.content}
           />
         </div>
         <div className="form-group">