no conflict notification and checks

bible-technology · Apr 30, 2024 · 0639043 · 0639043
1 parent 999bb24
commit 0639043
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
@@ -2,7 +2,7 @@ import updateTranslationSB from '@/core/burrito/updateTranslationSB';
 import packageInfo from '../../../../package.json';
 import { commitChanges } from '../Sync/Isomorphic/utils';
 
-export const mergeTextTranslationProject = async (incomingPath, currentUser, setConflictPopup, setProcessMerge, incomingMeta) => {
+export const mergeTextTranslationProject = async (incomingPath, currentUser, setConflictPopup, setProcessMerge, incomingMeta, triggerSnackBar) => {
   try {
     // update the metadata of current md5 --- updateTranslationSB (src/core/burrito/)
     const fse = window.require('fs-extra');
@@ -88,8 +88,8 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
         });
       } else {
         setProcessMerge(false);
+        triggerSnackBar('success', 'No Conflict Found');
         console.log('No Conflict =================>');
-        return 'noConflict';
       }
 
       setProcessMerge(false);

diff --git a/renderer/src/layouts/projects/ImportProjectPopUp.js b/renderer/src/layouts/projects/ImportProjectPopUp.js
@@ -200,10 +200,7 @@ export default function ImportProjectPopUp(props) {
     }else if (sbData?.burritoType === 'scripture / textTranslation') {
       console.log("Started Indentify Merge conflicts ------");
       try {
-        const response = await mergeTextTranslationProject(folderPath, currentUser, setConflictPopup, setProcessMerge, sbData)
-        if(response === "noConflict") {
-          triggerSnackBar('success', "No Conflict Found",)
-        }
+        await mergeTextTranslationProject(folderPath, currentUser, setConflictPopup, setProcessMerge, sbData, triggerSnackBar)
         console.log("completed merge idenitfy process ------");
       } catch(err) {