Merge pull request #1634 from unfoldingWord/bugFix-Joel-1631

Fix - Source side shows Master file for Translation mode
unfoldingWord · Nov 30, 2023 · 840d620 · 840d620
2 parents ac6d090 + c25d269
commit 840d620
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/public/build_number b/public/build_number
@@ -1 +1 @@
-273-2ccee8b
+274-ac6d090
diff --git a/src/components/translatable/Translatable.js b/src/components/translatable/Translatable.js
@@ -55,32 +55,25 @@ function Translatable() {
         <CircularProgress />{' '}
       </div>
     );
-    // console.log("filepathsMatch=", filepathsMatch)
-    // console.log("sourceFileContent", sourceFileContent)
-    // console.log("releasedSourceContent", releasedSourceContent)
-    // console.log("targetFileContent", targetFileContent)
     if (
       filepathsMatch &&
       (sourceFileContent || releasedSourceContent) &&
       targetFileContent
     ) {
+      const organizationName = targetRepository?.full_name.split('/')[0]?.toLowerCase();
       if (filepath.match(/\.md$/)) {
 
         let translatableProps = {
-          original: sourceFileContent ? sourceFileContent : releasedSourceContent,
+          original: organizationName === "unfoldingword" ? sourceFileContent:releasedSourceContent,
           translation: targetFileContent,
           onTranslation: saveTranslation,
           onContentIsDirty: setContentIsDirty,
           translationFontFamily: selectedFont,
         };
-        console.log('Markdown file selected');
         _translatable = <MarkdownContextProvider><MarkDownTranslatable {...translatableProps} /></MarkdownContextProvider>;
       } else if (filepath.match(/\.tsv$/)) {
-        console.log('TSV file selected');
         const onSave = async function (...args) {
-          console.log("branch-merger: started saving");
           const saved = await saveTranslation(...args);
-          console.log("branch-merger: finished saving");
           return saved;
         }
         const onEdit = function (...args) {
@@ -106,6 +99,7 @@ function Translatable() {
     saveTranslation,
     autoSaveOnEdit,
     selectedFont,
+    targetRepository.full_name
   ]);
 
   useEffect(() => {

diff --git a/src/components/translatable/TranslatableTSV.js b/src/components/translatable/TranslatableTSV.js
@@ -58,6 +58,7 @@ export default function TranslatableTSV({
       expandedScripture,
       cachedFile,
       selectedFont,
+      targetRepository,
     },
     actions: { setResourceLinks },
     giteaReactToolkit: {
@@ -66,19 +67,20 @@ export default function TranslatableTSV({
     },
   } = useContext(AppContext);
 
+  const organizationName = targetRepository?.full_name.split('/')[0]?.toLowerCase();
+
   const {
     filepath: sourceFilepath,
     content: sourceContent,
     publishedContent: releasedSourceContent,
   } = sourceFileHook.state || {};
   const { content: targetContent } = targetFileHook.state || {};
   const { content: cachedContent } = cachedFile || {};
-  // console.log("TranslatableTSV() sourceContent, publishedContent:", sourceContent, releasedSourceContent)
   const columnNames = useMemo(() => {
-    const _content = sourceContent || releasedSourceContent;
+    const _content = organizationName === "unfoldingword" ? sourceContent : releasedSourceContent;
     const _columnNames = columnNamesFromContent({ content: _content, delimiters });
     return _columnNames;
-  }, [sourceContent, releasedSourceContent]);
+  }, [sourceContent, releasedSourceContent, organizationName ]);
 
   const {
     actions: { onValidate },
@@ -184,7 +186,7 @@ export default function TranslatableTSV({
       ORIGINAL_LANG_POSITION={ORIGINAL_LANG_POSITION}
     >
       <DataTable
-        sourceFile={sourceContent || releasedSourceContent}
+        sourceFile={organizationName === "unfoldingword" ? sourceContent : releasedSourceContent}
         targetFile={cachedContent || targetContent}
         onSave={onSave}
         onEdit={onEdit}