Merge branch 'develop' into fix-foxprogs-linter

Author: foxprogs

src/components/BibleBookList/BibleBookList.js

@@ -1,9 +1,9 @@
-import React, { useState } from 'react';
-import BookList from '../BookList';
-import PropTypes from 'prop-types';
-import { BIBLE_LIST, BIBLE_BOOKS, isEqual } from './config';
-import Checkbox from '@material-ui/core/Checkbox';
-import { FormControlLabel } from '@material-ui/core';
+import React, { useState } from "react";
+import BookList from "../BookList";
+import PropTypes from "prop-types";
+import { BIBLE_LIST, BIBLE_BOOKS } from "./config";
+import Checkbox from "@material-ui/core/Checkbox";
+import { FormControlLabel } from "@material-ui/core";
 
 function BibleBookList({
   labelForCheckbox,
@@ -20,11 +20,6 @@ function BibleBookList({
   testaments,
   sortFirstNT,
 }) {
-  if (isEqual(availableBookList, Object.keys(BIBLE_BOOKS))) {
-    showCheckbox = false;
-  }
-  console.log(availableBookList);
-  console.log(Object.keys(BIBLE_BOOKS));
   const [checkState, setCheckState] = useState(!showInactive);
   const currentBookList = BIBLE_LIST.map((el) => {
     return {
@@ -41,6 +36,11 @@ function BibleBookList({
     setCheckState((prev) => !prev);
   };
 
+  const allBooksIsSet = (bookList) => {
+    const allBooks = bookList.filter((el) => el.isset === false);
+    return allBooks.length > 0;
+  };
+
   let testamentList = [];
 
   switch (testaments) {
@@ -51,6 +51,9 @@ function BibleBookList({
           bookList: currentBookListNT,
         },
       ];
+      if (showCheckbox) {
+        showCheckbox = allBooksIsSet(currentBookListNT);
+      }
       break;
 
     case 'ot':
@@ -60,6 +63,9 @@ function BibleBookList({
           bookList: currentBookListOT,
         },
       ];
+      if (showCheckbox) {
+        showCheckbox = allBooksIsSet(currentBookListOT);
+      }
       break;
     case 'all':
       testamentList = [
@@ -69,12 +75,16 @@ function BibleBookList({
       if (sortFirstNT) {
         testamentList.reverse();
       }
+      if (showCheckbox) {
+        showCheckbox = allBooksIsSet(currentBookListOT) || allBooksIsSet(currentBookListNT);
+      }
       break;
 
     default:
       break;
   }
 
+
   const checkboxRender = showCheckbox ? (
     <FormControlLabel
       classes={{

src/components/BibleBookList/BibleBookList.md

@@ -17,14 +17,20 @@ const onClickBook = (bookId) => setSelectedBookId(bookId);
 
 const availableBookList = ['gen', 'exo', 'lev', 'num', 'mat', 'mrk', 'luk', 'tit'];
 
+const NTBookList = [
+    'mat', 'mrk', 'luk', 'jhn', 'act', 'rom', '1co',
+    '2co', 'gal', 'eph', 'php', 'col', '1th', '2th',
+    '1ti', '2ti', 'tit', 'phm', 'heb', 'jas', '1pe',
+    '2pe', '1jn', '2jn', '3jn', 'jud', 'rev'];
+
 <BibleBookList
   testaments="all"
   sortFirstNT={true}
   showInactive={false}
   titleOT="Old Testament"
   titleNT="New Testament"
   titleBooks={titleBooks}
-  availableBookList={availableBookList}
+  availableBookList={availableBookList} // replace to NTBookList
   selectedBookId={selectedBookId}
   onClickBook={onClickBook}
 />;

src/components/BibleBookList/config.js

@@ -475,14 +475,3 @@ export const NEW_TESTAMENT_LIST = [
   },
 ];
 export const BIBLE_LIST = OLD_TESTAMENT_LIST.concat(NEW_TESTAMENT_LIST);
-export const isEqual = (a, b) => {
-  if (a.length !== b.length) {
-    return false;
-  }
-  a.forEach((item) => {
-    if (!b.includes(item)) {
-      return false;
-    }
-  });
-  return true;
-};