changing the useStateCard for displaying the items

bible-technology · Nov 24, 2023 · 534cb33 · 534cb33
1 parent c03ab31
commit 534cb33
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 64 deletions.
diff --git a/renderer/src/components/EditorPage/Reference/ReferenceCard.js b/renderer/src/components/EditorPage/Reference/ReferenceCard.js
@@ -1,13 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
-import { CardContent } from 'translation-helps-rcl';
+import { CardContent, useCardState } from 'translation-helps-rcl';
+import TranslationhelpsNav from './TranslationhelpsNav';
 
 const ReferenceCard = ({
   items,
-  item,
   filters,
-  markdownView,
   markdown,
   languageId,
   selectedQuote,
@@ -16,23 +14,39 @@ const ReferenceCard = ({
   isLoading,
   font,
 }) => {
+  const {
+    state: {
+      item, itemIndex, markdownView,
+    },
+    actions: {
+      setItemIndex,
+    },
+  } = useCardState({ items });
   console.log({ item });
-
+  console.log('testing');
   return (
-    <div style={{ fontFamily: font || 'sans-serif' }}>
-      <CardContent
-        item={item}
+    <>
+      <TranslationhelpsNav
+        classes
         items={items}
-        filters={filters}
-        markdown={markdown}
-        languageId={languageId}
-        markdownView={markdownView}
-        isLoading={isLoading}
-        selectedQuote={selectedQuote}
-        setQuote={setQuote}
-        viewMode={viewMode}
+        itemIndex={itemIndex}
+        setItemIndex={setItemIndex}
       />
-    </div>
+      <div style={{ fontFamily: font || 'sans-serif' }}>
+        <CardContent
+          item={item}
+          items={items}
+          filters={filters}
+          markdown={markdown}
+          languageId={languageId}
+          markdownView={markdownView}
+          isLoading={isLoading}
+          selectedQuote={selectedQuote}
+          setQuote={setQuote}
+          viewMode={viewMode}
+        />
+      </div>
+    </>
 
   );
 };
@@ -41,9 +55,7 @@ export default ReferenceCard;
 
 ReferenceCard.propTypes = {
   items: PropTypes.array,
-  item: PropTypes.object,
   filters: PropTypes.array,
-  markdownView: PropTypes.bool,
   markdown: PropTypes.object,
   languageId: PropTypes.string.isRequired,
   selectedQuote: PropTypes.string,

diff --git a/renderer/src/components/EditorPage/Reference/TranslationHelpsCard.js b/renderer/src/components/EditorPage/Reference/TranslationHelpsCard.js
@@ -2,11 +2,12 @@ import PropTypes from 'prop-types';
 import { useEffect, useState } from 'react';
 import {
   useContent,
-  useCardState,
+  // useCardState,
+  // CardContent,
 } from 'translation-helps-rcl';
 import localForage from 'localforage';
 import ReferenceCard from './ReferenceCard';
-import TranslationhelpsNav from './TranslationhelpsNav';
+// import TranslationhelpsNav from './TranslationhelpsNav';
 import * as logger from '../../../logger';
 import packageInfo from '../../../../../package.json';
 
@@ -45,15 +46,6 @@ export default function TranslationHelpsCard({
     readyToFetch: true,
   });
 
-  const {
-    state: {
-      item, headers, fontSize, itemIndex, markdownView,
-    },
-    actions: {
-      setFilters, setFontSize, setItemIndex, setMarkdownView,
-    },
-  } = useCardState({ items });
-
   useEffect(() => {
     if (offlineResource && offlineResource.offline) {
       // console.log('offline in Helpscard : ', offlineResource);
@@ -69,22 +61,27 @@ export default function TranslationHelpsCard({
           const currentUser = user?.username;
           const folder = path.join(newpath, packageInfo.name, 'users', `${currentUser}`, 'resources');
           const projectName = `${offlineResource?.data?.value?.meta?.name}_${offlineResource?.data?.value?.meta?.owner}_${offlineResource?.data?.value?.meta?.release?.tag_name}`;
-
+          // const projectName = 'en_tn_unfoldingWord_v77 (copy)';
+          console.log(resourceId);
           // switch resources
           switch (resourceId) {
             case 'tn':
+              console.log(path.join(folder, projectName), fs.existsSync(path.join(folder, projectName)));
               if (fs.existsSync(path.join(folder, projectName))) {
+                console.log('yes');
                 // eslint-disable-next-line array-callback-return
                 const currentFile = offlineResource?.data?.value?.projects.filter((item) => {
+                  console.log('item', item, projectId);
                   if (item?.identifier.toLowerCase() === projectId.toLowerCase()) {
                     return item;
                   }
               });
-              // console.log('project name content : ', currentFile[0].path);
+              console.log('project name content : ', currentFile[0].path);
               const filecontent = await fs.readFileSync(path.join(folder, projectName, currentFile[0].path), 'utf8');
+              console.log(filecontent);
               // convert tsv to json
               const headerArr = filecontent.split('\n')[0].split('\t');
-
+              console.log(headerArr);
               let noteName;
               let indexOfNote;
               if (headerArr.indexOf('Note') > 0) {
@@ -214,45 +211,27 @@ export default function TranslationHelpsCard({
       }
     }
     // reset index
-    setItemIndex(0);
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [verse, chapter, languageId, resourceId, owner, offlineResource, projectId, items, filePath]);
 
   items = !offlineItemsDisable && offlineResource?.offline ? offlineItems : items;
   markdown = offlineResource?.offline ? offlineMarkdown : markdown;
 
-  console.log('==========> ', !offlineItemsDisable && offlineResource?.offline, { items, item, markdown });
+  console.log('==========> ', !offlineItemsDisable && offlineResource?.offline, { items, markdown });
 
   return (
-    <>
-      <TranslationhelpsNav
-        classes
-        items={items}
-        itemIndex={itemIndex}
-        setItemIndex={setItemIndex}
-      />
-      <ReferenceCard
-        items={items}
-        headers={headers}
-        filters={['OccurrenceNote', 'Question', 'Response']}
-        fontSize={fontSize}
-        itemIndex={itemIndex}
-        setFilters={setFilters}
-        setFontSize={setFontSize}
-        setItemIndex={setItemIndex}
-        markdownView={markdownView}
-        setMarkdownView={setMarkdownView}
-        item={item}
-        markdown={markdown}
-        isLoading={isLoading}
-        languageId={languageId}
-        title={title}
-        viewMode={viewMode}
-        selectedQuote={selectedQuote}
-        setQuote={setQuote}
-        font={font}
-      />
-    </>
+    <ReferenceCard
+      items={items}
+      filters={['OccurrenceNote', 'Question', 'Response']}
+      markdown={markdown}
+      isLoading={isLoading}
+      languageId={languageId}
+      title={title}
+      viewMode={viewMode}
+      selectedQuote={selectedQuote}
+      setQuote={setQuote}
+      font={font}
+    />
   );
 }