0) {
// move imported project to backup folder
const USFMMergeDirPath = path.join(newpath, packageInfo.name, 'users', currentUser, '.merge-usfm');
-
- if (!fs.existsSync(path.join(USFMMergeDirPath, `${incomingMeta.projectName}_${incomingMeta.id[0]}`))) {
- fs.mkdirSync(path.join(USFMMergeDirPath, `${incomingMeta.projectName}_${incomingMeta.id[0]}`), { recursive: true });
+ const projectDirName = `${incomingMeta.projectName}_${incomingMeta.id[0]}`;
+ if (!fs.existsSync(path.join(USFMMergeDirPath, projectDirName))) {
+ fs.mkdirSync(path.join(USFMMergeDirPath, projectDirName), { recursive: true });
}
- await fse.copy(incomingPath, path.join(USFMMergeDirPath, `${incomingMeta.projectName}_${incomingMeta.id[0]}`, 'incoming'));
+ await fse.copy(incomingPath, path.join(USFMMergeDirPath, projectDirName, 'incoming'));
// TODO : CREATE A BACKUP in GIT - with a proper message of backup before merge and Timestamp (Idea is to manual git reset to commit based on timestamp)
// conflcit section
@@ -51,12 +51,14 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
data: {
projectType: 'textTranslation',
files: conflictedIngFilePaths,
- incomingPath: path.join(USFMMergeDirPath, `${incomingMeta.projectName}_${incomingMeta.id[0]}`, 'incoming'),
+ incomingPath: path.join(USFMMergeDirPath, projectDirName, 'incoming'),
incomingMeta,
currentMeta: updatedCurrentMeta,
projectId: incomingMeta.id[0],
projectName: incomingMeta.projectName,
- projectFullName: `${incomingMeta.projectName}_${incomingMeta.id[0]}`,
+ projectFullName: projectDirName,
+ sourceProjectPath: path.join(newpath, packageInfo.name, 'users', currentUser, 'projects', projectDirName),
+ projectMergePath: path.join(USFMMergeDirPath, projectDirName),
currentUser,
},
});
diff --git a/renderer/src/components/TextTranslationMerge/processUsfmObjs.js b/renderer/src/components/TextTranslationMerge/processUsfmObjs.js
index 62616f3e7..ccc6071ec 100644
--- a/renderer/src/components/TextTranslationMerge/processUsfmObjs.js
+++ b/renderer/src/components/TextTranslationMerge/processUsfmObjs.js
@@ -1,6 +1,5 @@
async function processAndIdentiyVerseChangeinUSFMJsons(currentJson, IncomingJson) {
// process USFM JSONs and generate comparaison object
-
const mergeTempJson = JSON.parse(JSON.stringify(currentJson));
const conflictedChapters = [];
@@ -14,6 +13,7 @@ async function processAndIdentiyVerseChangeinUSFMJsons(currentJson, IncomingJson
// console.log(IncomingVerse);
if (content.verseText !== IncomingVerse.verseText) {
// add incoming data
+ content.current = JSON.parse(JSON.stringify(content));
content.incoming = IncomingVerse;
content.resolved = { status: false, resolvedContent: null };
!conflictedChapters.includes(chapter.chapterNumber) && conflictedChapters.push(chapter.chapterNumber);
diff --git a/renderer/src/layouts/projects/Layout.js b/renderer/src/layouts/projects/Layout.js
index 8aae80731..b85d064a6 100644
--- a/renderer/src/layouts/projects/Layout.js
+++ b/renderer/src/layouts/projects/Layout.js
@@ -1,4 +1,5 @@
import React, { useContext, useState } from 'react';
+import { SnackBar } from '@/components/SnackBar';
import PropTypes from 'prop-types';
import {
ArchiveBoxIcon,
@@ -35,6 +36,16 @@ export default function ProjectsLayout(props) {
data: undefined,
});
+ const [snackBar, setOpenSnackBar] = useState(false);
+ const [snackText, setSnackText] = useState('');
+ const [notify, setNotify] = useState();
+
+ const triggerSnackBar = (status, message) => {
+ setNotify(status);
+ setSnackText(message);
+ setOpenSnackBar(true);
+ };
+
function closeMergeWindow() {
setConflictPopup({
open: false,
@@ -55,15 +66,16 @@ export default function ProjectsLayout(props) {
}
return (
-
+ <>
+
-
+
-
+
-
+
- {title && (
+ {title && (
)}
-
- {children}
-
+
+ {children}
+
+
-
-
+
+
);
}
From f5ca445b1538d568c2f749d836c7dae7fe5ef2ec Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Fri, 19 Apr 2024 12:09:57 +0530
Subject: [PATCH 30/50] added auto select chapter for the current parsed book
in the ui
---
.../TranslationMergeUI.jsx | 14 ++++++++++-
.../mergeTextTranslationProject.js | 25 +++++++++++++++----
2 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 8c1221e1e..3749feffb 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -15,6 +15,7 @@ import LoadingScreen from '../Loading/LoadingScreen';
import UsfmConflictEditor from './UsfmConflictEditor';
import { processAndIdentiyVerseChangeinUSFMJsons } from './processUsfmObjs';
import packageInfo from '../../../../package.json';
+import { commitChanges } from '../Sync/Isomorphic/utils';
const grammar = require('usfm-grammar');
const path = require('path');
@@ -121,9 +122,13 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
console.log('process usfm : ', err);
});
const mergeJson = processOutArr[0];
+ const conflcitedChapters = processOutArr[1];
console.log('processOutArr[1] : ', processOutArr[1]);
currentJson && currentJson?.valid && setUsfmJsons((prev) => ({ ...prev, [selectedBook]: { ...prev[selectedBook], current: currentJson.data, mergeJson } }));
setConflictedChapters((prev) => ({ ...prev, [selectedBook]: processOutArr[1] }));
+ if (conflcitedChapters && conflcitedChapters?.length > 0) {
+ setSelectedChapter(conflcitedChapters[0]);
+ }
setLoading(false);
// old UI logic of import and parse already saved book
@@ -171,6 +176,10 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
// remove .merge/project
await fs.rmSync(usfmJsons.conflictMeta.projectMergePath, { recursive: true, force: true });
+ // commit all changes after merge finish
+ const commitAuthor = { name: 'scribeInternal', email: 'scribe@bridgeconn.com' };
+ const backupMessage = `Scribe Internal Commit After Text Merge Finish : ${usfmJsons.conflictMeta.projectFullName} : ${new Date()}`;
+ await commitChanges(fs, usfmJsons.conflictMeta.sourceProjectPath, commitAuthor, backupMessage, true);
setLoading(false);
triggerSnackBar('success', 'Conflict Resolved Successfully');
@@ -217,7 +226,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
useEffect(() => {
setUsfmJsons((prev) => ({ ...prev, conflictMeta: conflictData.data }));
setSelectedBook(conflictData?.data?.files[0]);
- // TODO : Auto Select first Chapter of the selected Book
}, [conflictData]);
// handle conflict check for a book on book nav
@@ -226,6 +234,10 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
(async () => {
setLoading(true);
if (conflictedChapters[selectedBook]) {
+ // TODO : Auto Select first Chapter of the selected Book
+ if (conflictedChapters[selectedBook] && conflictedChapters[selectedBook].length > 0) {
+ setSelectedChapter(conflictedChapters[selectedBook][0]);
+ }
setLoading(false);
} else {
await checkForConflictInSelectedBook(selectedBook);
diff --git a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
index 77482b2f8..c8fc62b9a 100644
--- a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
+++ b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
@@ -1,5 +1,6 @@
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) => {
try {
@@ -36,16 +37,29 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
console.log('conflict', { conflictedIngFilePaths });
if (conflictedIngFilePaths.length > 0) {
- // move imported project to backup folder
+ /**
+ * Check the current Project is new or inprogres
+ * Check the current ProjectName in => ./merge/ProjectName
+ * move imported project to backup folder
+ * create a GIT Backup before start merge : Create a COMMIT with Proper Msg and Timestamp
+ * TODO: Idea is to manual git reset to commit based on timestamp
+ */
const USFMMergeDirPath = path.join(newpath, packageInfo.name, 'users', currentUser, '.merge-usfm');
const projectDirName = `${incomingMeta.projectName}_${incomingMeta.id[0]}`;
+ const sourceProjectPath = path.join(newpath, packageInfo.name, 'users', currentUser, 'projects', projectDirName);
+ let isNewProjectMerge = true;
if (!fs.existsSync(path.join(USFMMergeDirPath, projectDirName))) {
fs.mkdirSync(path.join(USFMMergeDirPath, projectDirName), { recursive: true });
+ await fse.copy(incomingPath, path.join(USFMMergeDirPath, projectDirName, 'incoming'));
+ // commit existing changes before merge start
+ const commitAuthor = { name: 'scribeInternal', email: 'scribe@bridgeconn.com' };
+ const backupMessage = `Scribe Internal Commit Before Text Merge Start : ${projectDirName} : ${new Date()}`;
+ await commitChanges(fs, sourceProjectPath, commitAuthor, backupMessage, true);
+ } else {
+ isNewProjectMerge = false;
}
- await fse.copy(incomingPath, path.join(USFMMergeDirPath, projectDirName, 'incoming'));
- // TODO : CREATE A BACKUP in GIT - with a proper message of backup before merge and Timestamp (Idea is to manual git reset to commit based on timestamp)
- // conflcit section
+ // conflcit section - set values and open conflict window
setConflictPopup({
open: true,
data: {
@@ -57,9 +71,10 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
projectId: incomingMeta.id[0],
projectName: incomingMeta.projectName,
projectFullName: projectDirName,
- sourceProjectPath: path.join(newpath, packageInfo.name, 'users', currentUser, 'projects', projectDirName),
+ sourceProjectPath,
projectMergePath: path.join(USFMMergeDirPath, projectDirName),
currentUser,
+ isNewProjectMerge,
},
});
} else {
From ced52498f209565d17896084f1ba6e888a36870c Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Fri, 19 Apr 2024 16:52:15 +0530
Subject: [PATCH 31/50] updated meta and md5 on final replace
---
.../TranslationMergeUI.jsx | 82 +++++++++++++++++--
.../mergeTextTranslationProject.js | 12 ++-
2 files changed, 86 insertions(+), 8 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 3749feffb..670aa7cd5 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -19,6 +19,7 @@ import { commitChanges } from '../Sync/Isomorphic/utils';
const grammar = require('usfm-grammar');
const path = require('path');
+const md5 = require('md5');
function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar }) {
const { t } = useTranslation();
@@ -160,20 +161,31 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
const resolvedBooks = { ...usfmJsons };
delete resolvedBooks.conflictMeta;
- console.log('after delete ============> ', resolvedBooks, usfmJsons);
+
+ const currentSourceMeta = usfmJsons?.conflictMeta?.currentMeta;
+
// TODO : Disable all clicks when loading is true
+ const sourceIngredientPath = path.join(usfmJsons.conflictMeta.sourceProjectPath);
// loop over the resolved books
// eslint-disable-next-line no-restricted-syntax
for (const bookName of Object.keys(resolvedBooks)) {
const resolvedMergeJson = resolvedBooks[bookName]?.mergeJson;
// eslint-disable-next-line no-await-in-loop
const generatedUSFM = await parseJsonToUsfm(resolvedMergeJson);
- const sourceIngredientPath = path.join(usfmJsons.conflictMeta.sourceProjectPath);
+
// overwrite the source file with new file
fs.writeFileSync(path.join(sourceIngredientPath, 'ingredients', `${resolvedMergeJson.book.bookCode}.usfm`), generatedUSFM);
+
+ // get and update the usfms ingredients
+ const stat = fs.statSync(path.join(sourceIngredientPath, 'ingredients', `${resolvedMergeJson.book.bookCode}.usfm`));
+ currentSourceMeta.ingredients[bookName].checksum.md5 = md5(generatedUSFM);
+ currentSourceMeta.ingredients[bookName].size = stat.size;
}
+ // write updated metadata here
+ fs.writeFileSync(path.join(sourceIngredientPath, 'metadata.json'), JSON.stringify(currentSourceMeta));
+
// remove .merge/project
await fs.rmSync(usfmJsons.conflictMeta.projectMergePath, { recursive: true, force: true });
// commit all changes after merge finish
@@ -191,10 +203,11 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
// remove current chapter from conflicted list
const restOfTheChapters = conflictedChapters[selectedBook]?.filter((chNo) => chNo !== selectedChapter);
setConflictedChapters((prev) => ({ ...prev, [selectedBook]: restOfTheChapters }));
-
+ let isBookResolved = false;
if (restOfTheChapters?.length === 0) {
// completed conflicts for that particualr book
setResolvedBooks((prev) => [...prev, selectedBook]);
+ isBookResolved = true;
} else {
// current book have pending chapter , // Switch to next chapter or book
setSelectedChapter(restOfTheChapters[0]);
@@ -204,15 +217,63 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
const { projectFullName } = usfmJsons.conflictMeta;
const newpath = localStorage.getItem('userPath');
const path = require('path');
+ // resolved chapters of each book and resolved books in the conflictMeta and store in the BE
+ const currentUSFMJsonsData = JSON.parse(JSON.stringify(usfmJsons));
+ // initial time (if resolved chapters exist for the project)
+ if (currentUSFMJsonsData.conflictMeta?.resolvedStatus) {
+ currentUSFMJsonsData.conflictMeta.resolvedStatus[selectedBook] = { conflictedChapters: restOfTheChapters, isBookResolved };
+ } else {
+ currentUSFMJsonsData.conflictMeta.resolvedStatus = { [selectedBook]: { conflictedChapters: restOfTheChapters, isBookResolved } };
+ }
+ setUsfmJsons(currentUSFMJsonsData);
localforage.getItem('userProfile').then((user) => {
const USFMMergeDirPath = path.join(newpath, packageInfo.name, 'users', user?.username, '.merge-usfm');
if (!fs.existsSync(path.join(USFMMergeDirPath, projectFullName))) {
fs.mkdirSync(path.join(USFMMergeDirPath, projectFullName), { recursive: true });
}
- fs.writeFileSync(path.join(USFMMergeDirPath, projectFullName, 'usfmJsons.json'), JSON.stringify({ usfmJsons }));
+ fs.writeFileSync(path.join(USFMMergeDirPath, projectFullName, 'usfmJsons.json'), JSON.stringify(currentUSFMJsonsData));
});
};
+ /**
+ * existing project merge
+ * read usfm json data from backend
+ */
+ const getInprogressMergeProject = async (data) => {
+ const fs = window.require('fs');
+ if (fs.existsSync(path.join(data.projectMergePath, 'usfmJsons.json'))) {
+ let usfmJsonsContent = fs.readFileSync(path.join(data.projectMergePath, 'usfmJsons.json'), 'utf8');
+ usfmJsonsContent = JSON.parse(usfmJsonsContent);
+ if (usfmJsonsContent) {
+ setUsfmJsons(usfmJsonsContent);
+ // check the books is already resolved or not => then select current book and unresolved chapters
+ let bookToSelect;
+ const resolvedBooksArr = [];
+ const conflictedChsOfBooks = {};
+ // eslint-disable-next-line no-restricted-syntax
+ for (const book in usfmJsonsContent.conflictMeta.resolvedStatus) {
+ if (book in usfmJsonsContent.conflictMeta.resolvedStatus) {
+ const currentBook = usfmJsonsContent.conflictMeta.resolvedStatus[book];
+ if (!currentBook.isBookResolved && !bookToSelect) {
+ bookToSelect = book;
+ }
+ if (currentBook.isBookResolved) {
+ resolvedBooksArr.push(book);
+ }
+ conflictedChsOfBooks[book] = currentBook.conflictedChapters;
+ }
+ }
+ setSelectedBook(bookToSelect);
+ setResolvedBooks(resolvedBooksArr);
+ setConflictedChapters(conflictedChsOfBooks);
+ } else {
+ console.error('Inprogress project config is corrupted');
+ }
+ } else {
+ console.error('Unable to get the inprogress config');
+ }
+ };
+
// useEffect to trigger comleted all conflict Resolution
useEffect(() => {
if (resolvedBooks.length >= Object.keys(conflictedChapters).length) {
@@ -224,8 +285,15 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
// store conflict data to usfm jsons meta
useEffect(() => {
- setUsfmJsons((prev) => ({ ...prev, conflictMeta: conflictData.data }));
- setSelectedBook(conflictData?.data?.files[0]);
+ /**
+ * check the project merge is new or existing
+ */
+ if (conflictData.data.isNewProjectMerge) {
+ setUsfmJsons((prev) => ({ ...prev, conflictMeta: conflictData.data }));
+ setSelectedBook(conflictData?.data?.files[0]);
+ } else {
+ getInprogressMergeProject(conflictData.data);
+ }
}, [conflictData]);
// handle conflict check for a book on book nav
@@ -234,7 +302,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
(async () => {
setLoading(true);
if (conflictedChapters[selectedBook]) {
- // TODO : Auto Select first Chapter of the selected Book
+ // Auto Select first Chapter of the selected Book
if (conflictedChapters[selectedBook] && conflictedChapters[selectedBook].length > 0) {
setSelectedChapter(conflictedChapters[selectedBook][0]);
}
diff --git a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
index c8fc62b9a..83f661c4d 100644
--- a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
+++ b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
@@ -47,6 +47,7 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
const USFMMergeDirPath = path.join(newpath, packageInfo.name, 'users', currentUser, '.merge-usfm');
const projectDirName = `${incomingMeta.projectName}_${incomingMeta.id[0]}`;
const sourceProjectPath = path.join(newpath, packageInfo.name, 'users', currentUser, 'projects', projectDirName);
+ let existingIncomingMeta;
let isNewProjectMerge = true;
if (!fs.existsSync(path.join(USFMMergeDirPath, projectDirName))) {
fs.mkdirSync(path.join(USFMMergeDirPath, projectDirName), { recursive: true });
@@ -57,6 +58,13 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
await commitChanges(fs, sourceProjectPath, commitAuthor, backupMessage, true);
} else {
isNewProjectMerge = false;
+ // read existing meta of incoming instead of using the new because the merge is inprogress
+ if (fs.existsSync(path.join(path.join(USFMMergeDirPath, projectDirName, 'incoming', 'metadata.json')))) {
+ existingIncomingMeta = fs.readFileSync(path.join(path.join(USFMMergeDirPath, projectDirName, 'incoming', 'metadata.json')), 'utf-8');
+ existingIncomingMeta = JSON.parse(existingIncomingMeta);
+ } else {
+ throw new Error('Can not proceed Merge, Unable to find the metadata for imported Project');
+ }
}
// conflcit section - set values and open conflict window
@@ -66,7 +74,7 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
projectType: 'textTranslation',
files: conflictedIngFilePaths,
incomingPath: path.join(USFMMergeDirPath, projectDirName, 'incoming'),
- incomingMeta,
+ incomingMeta: isNewProjectMerge ? incomingMeta : existingIncomingMeta,
currentMeta: updatedCurrentMeta,
projectId: incomingMeta.id[0],
projectName: incomingMeta.projectName,
@@ -79,6 +87,7 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
});
} else {
// TODO : ADD A MESSGAGE HERE -nothing to merge
+ return;
}
setProcessMerge(false);
@@ -90,5 +99,6 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
} catch (err) {
setProcessMerge(false);
console.error('Failue in MergeText Process : ', err);
+ throw new Error(err);
}
};
From 50f33e921da01ecc5b923379bb09f269006f30f3 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Mon, 22 Apr 2024 17:09:58 +0530
Subject: [PATCH 32/50] added docs and flow diagram
---
.../Offline-Merge-TextTransaltion.svg | 890 ++++++++++++++++++
.../development.md | 18 +
2 files changed, 908 insertions(+)
create mode 100644 docs/Development/Offline Merge Text Translation/Offline-Merge-TextTransaltion.svg
create mode 100644 docs/Development/Offline Merge Text Translation/development.md
diff --git a/docs/Development/Offline Merge Text Translation/Offline-Merge-TextTransaltion.svg b/docs/Development/Offline Merge Text Translation/Offline-Merge-TextTransaltion.svg
new file mode 100644
index 000000000..5730939d0
--- /dev/null
+++ b/docs/Development/Offline Merge Text Translation/Offline-Merge-TextTransaltion.svg
@@ -0,0 +1,890 @@
+
+
+
+
+
+
+
+ Text
+ Offline Merge
+
+ Import Same
+ Project
+
+ Replace / Merge
+
+
+
+
+
+
+
+
+
+
+ Parse USFMs and
+ Find conflicts
+
+
+
+
+
+
+
+
+
+
+ Merge
+
+ Commit Current State with TimeStamp
+
+
+
+
+
+
+
+
+
+ UI
+ process data and Shows Conflicted Books and Chapter
+
+
+
+
+
+
+
+
+
+ Send Data to
+ UI
+
+ store the parsed
+ JSON with
+ orginal , incoming and merged Jsons Update on chapter conflict
+ finish .merge/projectName
+
+
+
+
+
+
+
+ ROM 1 2 3 4 Chapter Done
+
+
+ Finish Click
+ on Chapter Conflict Done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Book Count : 3
+ PSA
+
+
+
+ 1
+
+ 2
+
+ 5 ACT
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Finish
+
+ Complete All
+ Conflict
+
+
+
+
+
+
+
+
+
+ Get
+ Merged Json from BE
+
+
+
+
+
+
+
+
+
+ Convert JSON To
+ USFM Book by Book
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Replace in the
+ original Project Source
+
+ Remove .merge and
+ project
+
+ check for In progress Merge
+
+
+
+
+
+
+
+
+
+
+
+ NO
+
+
+
+ Yes
+
+
+
+
+
+
+
+
+
+ load existing
+ config and
+ data Load Existing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Not
+ Found data
+
+ Error Load Data
+ / Config
+ Corrupted
+
+ Update MD5 and
+ Metadata
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ If conflict
+
+
+
+
+
+
+
+
+
+ Yes
+
+ Commit Finish Conflict Status with TimeStamp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update mergeJson
+ content based
+ on selection /
+ reset
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/Development/Offline Merge Text Translation/development.md b/docs/Development/Offline Merge Text Translation/development.md
new file mode 100644
index 000000000..50c39281c
--- /dev/null
+++ b/docs/Development/Offline Merge Text Translation/development.md
@@ -0,0 +1,18 @@
+## Offline Merge Transaltion
+
+- Offline Merge Feature for Text Translation
+- Merge Option available on Import Existing Project ( Flavour Text Translation )
+- The Merge Can be resumed later from the check point ( Check Point will be the completion of each chapter. The system will only take care of chapter by chapter . You can not stop and continue from middle of a chapter )
+- The merge will be corrupted if back end data is modified / removed manually. Can not be restored
+- One commit will be created on merge start with all the changes before the merge ( timestamp and commit message can be used to identify the commit)
+- One commit will be created after the merge with all the merged changes ( timestamp and commit message can be used to identify)
+- This commit can be used to revert back to earlier stage ( **advanced option** )
+- Can not re work on chapter or book once you finish the conflicts with book / chapter
+- updating `metadata.json` with new USFM's metadata on finish merge conflict for entire project
+- Merge UI ( options)
+ - Accept all new changes
+ - Keep All existing changes
+ - Revert All changes
+ - Accept single changes ( current or new )
+ - Chapter Completion ( Check point )
+ - Merge Conflict Completion ( on completion : replace the original USFM with new merge USFM )
From 39c58c3adc9e6f7ac518e72bdc45e101993ba2fb Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Wed, 24 Apr 2024 11:10:40 +0530
Subject: [PATCH 33/50] refactor fucntions; checkpoint for config store on
initial load; fix for load back from inprogress on initial load
---
.../TranslationMergeUI.jsx | 61 ++++++++++++-------
.../mergeTextTranslationProject.js | 4 +-
.../layouts/projects/ImportProjectPopUp.js | 17 +++++-
3 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 670aa7cd5..4518d4fe8 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -98,6 +98,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
const checkForConflictInSelectedBook = async (selectedBook) => {
// parse imported
const fs = window.require('fs');
+ console.log('..............................>>>>>>>>>>>>>>>>>>> ', usfmJsons.conflictMeta, selectedBook);
const IncomingUsfm = fs.readFileSync(path.join(usfmJsons.conflictMeta.incomingPath, selectedBook), 'utf8');
if (IncomingUsfm) {
const importedJson = await parseUsfm(IncomingUsfm);
@@ -198,7 +199,21 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
closeMergeWindow();
};
- const resolveAndMarkDoneChapter = () => {
+ // Function to write back the current usfmJSON data as config in the .merge
+ const writeBackConflictConfigData = async (projectFullName, configData) => {
+ const fs = window.require('fs');
+ const newpath = localStorage.getItem('userPath');
+ const path = require('path');
+ localforage.getItem('userProfile').then((user) => {
+ const USFMMergeDirPath = path.join(newpath, packageInfo.name, 'users', user?.username, '.merge-usfm');
+ if (!fs.existsSync(path.join(USFMMergeDirPath, projectFullName))) {
+ fs.mkdirSync(path.join(USFMMergeDirPath, projectFullName), { recursive: true });
+ }
+ fs.writeFileSync(path.join(USFMMergeDirPath, projectFullName, 'usfmJsons.json'), JSON.stringify(configData));
+ });
+ };
+
+ const resolveAndMarkDoneChapter = async () => {
setChapterResolveDone(false);
// remove current chapter from conflicted list
const restOfTheChapters = conflictedChapters[selectedBook]?.filter((chNo) => chNo !== selectedChapter);
@@ -213,10 +228,9 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
setSelectedChapter(restOfTheChapters[0]);
}
// store the jsons to the backend (/.merge/projectName/BookID.json)
- const fs = window.require('fs');
+
const { projectFullName } = usfmJsons.conflictMeta;
- const newpath = localStorage.getItem('userPath');
- const path = require('path');
+
// resolved chapters of each book and resolved books in the conflictMeta and store in the BE
const currentUSFMJsonsData = JSON.parse(JSON.stringify(usfmJsons));
// initial time (if resolved chapters exist for the project)
@@ -226,13 +240,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
currentUSFMJsonsData.conflictMeta.resolvedStatus = { [selectedBook]: { conflictedChapters: restOfTheChapters, isBookResolved } };
}
setUsfmJsons(currentUSFMJsonsData);
- localforage.getItem('userProfile').then((user) => {
- const USFMMergeDirPath = path.join(newpath, packageInfo.name, 'users', user?.username, '.merge-usfm');
- if (!fs.existsSync(path.join(USFMMergeDirPath, projectFullName))) {
- fs.mkdirSync(path.join(USFMMergeDirPath, projectFullName), { recursive: true });
- }
- fs.writeFileSync(path.join(USFMMergeDirPath, projectFullName, 'usfmJsons.json'), JSON.stringify(currentUSFMJsonsData));
- });
+ await writeBackConflictConfigData(projectFullName, currentUSFMJsonsData);
};
/**
@@ -250,19 +258,27 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
let bookToSelect;
const resolvedBooksArr = [];
const conflictedChsOfBooks = {};
- // eslint-disable-next-line no-restricted-syntax
- for (const book in usfmJsonsContent.conflictMeta.resolvedStatus) {
- if (book in usfmJsonsContent.conflictMeta.resolvedStatus) {
- const currentBook = usfmJsonsContent.conflictMeta.resolvedStatus[book];
- if (!currentBook.isBookResolved && !bookToSelect) {
- bookToSelect = book;
- }
- if (currentBook.isBookResolved) {
- resolvedBooksArr.push(book);
+
+ // loading config - config have data of atleast 1 chapter of any book resolved ( checkpoint )
+ if (usfmJsonsContent.conflictMeta.resolvedStatus) {
+ // eslint-disable-next-line no-restricted-syntax
+ for (const book in usfmJsonsContent.conflictMeta.resolvedStatus) {
+ if (book in usfmJsonsContent.conflictMeta.resolvedStatus) {
+ const currentBook = usfmJsonsContent.conflictMeta.resolvedStatus[book];
+ if (!currentBook.isBookResolved && !bookToSelect) {
+ bookToSelect = book;
+ }
+ if (currentBook.isBookResolved) {
+ resolvedBooksArr.push(book);
+ }
+ conflictedChsOfBooks[book] = currentBook.conflictedChapters;
}
- conflictedChsOfBooks[book] = currentBook.conflictedChapters;
}
+ } else {
+ // checkpoint - stored on initially and not worked on any chapter
+ bookToSelect = usfmJsonsContent.conflictMeta.files[0];
}
+
setSelectedBook(bookToSelect);
setResolvedBooks(resolvedBooksArr);
setConflictedChapters(conflictedChsOfBooks);
@@ -274,6 +290,8 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
}
};
+ console.log({ conflictData, conflictedChapters, resolvedBooks });
+
// useEffect to trigger comleted all conflict Resolution
useEffect(() => {
if (resolvedBooks.length >= Object.keys(conflictedChapters).length) {
@@ -309,6 +327,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
setLoading(false);
} else {
await checkForConflictInSelectedBook(selectedBook);
+ await writeBackConflictConfigData(usfmJsons.conflictMeta.projectFullName, usfmJsons);
}
})();
} else {
diff --git a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
index 83f661c4d..74fd68247 100644
--- a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
+++ b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
@@ -26,6 +26,7 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
const incomingMd5 = val.checksum.md5;
if (currentMd5 && incomingMd5) {
if (currentMd5 !== incomingMd5) {
+ console.log('MD5s xxxxxxxxxxxxxx : ', { bookId, currentMd5, incomingMd5 }, currentMd5 === incomingIngredients);
conflictedIngFilePaths.push(key);
}
} else {
@@ -86,8 +87,7 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
},
});
} else {
- // TODO : ADD A MESSGAGE HERE -nothing to merge
- return;
+ return 'noConflict';
}
setProcessMerge(false);
diff --git a/renderer/src/layouts/projects/ImportProjectPopUp.js b/renderer/src/layouts/projects/ImportProjectPopUp.js
index f7858ccf1..65f17f0cc 100644
--- a/renderer/src/layouts/projects/ImportProjectPopUp.js
+++ b/renderer/src/layouts/projects/ImportProjectPopUp.js
@@ -61,6 +61,12 @@ export default function ImportProjectPopUp(props) {
completedSteps: 0,
});
+ const triggerSnackBar = (status, message) => {
+ setNotify(status);
+ setSnackText(message);
+ setOpenSnackBar(true);
+ };
+
async function close(triggeredFrom) {
logger.debug('ImportProjectPopUp.js', `Closing the Dialog box : Triggered from : ${triggeredFrom}`);
removeExtractedZipDir()
@@ -193,8 +199,15 @@ export default function ImportProjectPopUp(props) {
await mergeProject(folderPath, currentUser, setConflictPopup, setModel, setProcessMerge);
}else if (sbData?.burritoType === 'scripture / textTranslation') {
console.log("Started Indentify Merge conflicts ------");
- await mergeTextTranslationProject(folderPath, currentUser, setConflictPopup, setProcessMerge, sbData)
- console.log("completed merge idenitfy process ------");
+ try {
+ const response = await mergeTextTranslationProject(folderPath, currentUser, setConflictPopup, setProcessMerge, sbData)
+ if(response === "noConflict") {
+ triggerSnackBar('success', "No Conflict Found",)
+ }
+ console.log("completed merge idenitfy process ------");
+ } catch(err) {
+
+ }
}
setMerge(false)
setSbData({});
From 998fbea845e4c2c10794217f11a5513ad58c8d26 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Wed, 24 Apr 2024 11:35:35 +0530
Subject: [PATCH 34/50] fixed issue : showing current and incoming incorrect.
---
.../TextTranslationMerge/TranslationMergeUI.jsx | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 4518d4fe8..335b77f0c 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -98,7 +98,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
const checkForConflictInSelectedBook = async (selectedBook) => {
// parse imported
const fs = window.require('fs');
- console.log('..............................>>>>>>>>>>>>>>>>>>> ', usfmJsons.conflictMeta, selectedBook);
const IncomingUsfm = fs.readFileSync(path.join(usfmJsons.conflictMeta.incomingPath, selectedBook), 'utf8');
if (IncomingUsfm) {
const importedJson = await parseUsfm(IncomingUsfm);
@@ -120,7 +119,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
if (currentBookUsfm) {
const currentJson = await parseUsfm(currentBookUsfm);
// generate the merge object with current , incoming , merge verses
- const processOutArr = await processAndIdentiyVerseChangeinUSFMJsons(importedJson.data, currentJson.data).catch((err) => {
+ const processOutArr = await processAndIdentiyVerseChangeinUSFMJsons(currentJson.data, importedJson.data).catch((err) => {
console.log('process usfm : ', err);
});
const mergeJson = processOutArr[0];
@@ -290,16 +289,19 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
}
};
- console.log({ conflictData, conflictedChapters, resolvedBooks });
+ console.log({
+ conflictData, conflictedChapters, resolvedBooks, finishedConflict,
+ });
// useEffect to trigger comleted all conflict Resolution
useEffect(() => {
- if (resolvedBooks.length >= Object.keys(conflictedChapters).length) {
+ console.log('finish check =============> ', resolvedBooks.length >= usfmJsons?.conflictMeta?.files?.length.length);
+ if (resolvedBooks.length >= usfmJsons?.conflictMeta?.files?.length) {
setFinishedConflict(true);
} else {
setFinishedConflict(false);
}
- }, [resolvedBooks, conflictedChapters]);
+ }, [resolvedBooks]);
// store conflict data to usfm jsons meta
useEffect(() => {
From 59c163d763012539a570e3d678b0a643f19468bd Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Wed, 24 Apr 2024 15:58:06 +0530
Subject: [PATCH 35/50] updated abort modal and fixed loading issue in no
conflcit
---
.../src/components/TextTranslationMerge/TranslationMergeUI.jsx | 2 +-
.../TextTranslationMerge/mergeTextTranslationProject.js | 2 ++
renderer/src/translations/ar.js | 1 +
renderer/src/translations/en.js | 1 +
renderer/src/translations/fa.js | 1 +
renderer/src/translations/fr.js | 1 +
renderer/src/translations/hi.js | 1 +
renderer/src/translations/ne.js | 1 +
renderer/src/translations/ru.js | 1 +
9 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 335b77f0c..d1b8756db 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -50,7 +50,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
setModel({
openModel: true,
title: t('modal-title-abort-conflict-resolution'),
- confirmMessage: t('msg-abort-conflict-resolution'),
+ confirmMessage: t('text-msg-abort-conflict-resolution'),
buttonName: t('label-abort'),
});
}
diff --git a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
index 74fd68247..ee18890ee 100644
--- a/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
+++ b/renderer/src/components/TextTranslationMerge/mergeTextTranslationProject.js
@@ -87,6 +87,8 @@ export const mergeTextTranslationProject = async (incomingPath, currentUser, set
},
});
} else {
+ setProcessMerge(false);
+ console.log('No Conflict =================>');
return 'noConflict';
}
diff --git a/renderer/src/translations/ar.js b/renderer/src/translations/ar.js
index 740f81ea2..a8004fe57 100644
--- a/renderer/src/translations/ar.js
+++ b/renderer/src/translations/ar.js
@@ -262,6 +262,7 @@ export const Ar = {
'label-overwrite': 'إستبدال',
'modal-title-abort-conflict-resolution': 'إلغاء حل النزاعات',
'msg-abort-conflict-resolution': 'هل تريد إلغاء عملية حل النزاع. إذا قمت بالإلغاء، سوف تفقد كل تقدمك وتحتاج إلى البدء من جديد.',
+ 'text-msg-abort-conflict-resolution': 'هل تريد إجهاض عملية حل النزاع. يرجى التأكد من وصولك إلى نقطة التفتيش للمتابعة لاحقًا. نقطة التفتيش هي الانتهاء من كل فصل. إذا قمت بالإجهاض في منتصف الفصل، فسوف تفقد كل التقدم الذي أحرزته في الفصل وستحتاج إلى البدء من جديد.',
'label-done': 'تم',
'label-resolved': 'محلولة',
'label-resolve-conflict': 'حل النزاع',
diff --git a/renderer/src/translations/en.js b/renderer/src/translations/en.js
index fe6e091eb..7e9263b8a 100644
--- a/renderer/src/translations/en.js
+++ b/renderer/src/translations/en.js
@@ -262,6 +262,7 @@ export const En = {
'label-overwrite': 'Overwrite',
'modal-title-abort-conflict-resolution': 'Abort Conflict Resolution',
'msg-abort-conflict-resolution': 'Do you want to abort conflict Resolution process. If you abort , you will loose all your progress and need to start over.',
+ 'text-msg-abort-conflict-resolution': 'Do you want to abort conflict Resolution process. Please ensure you have reached a checkpoint to continue later. The checkpoint is the completion of each chapter. If you abort in the middle of a chapter , you will loose all your progress of the chapter and need to start over the chapter.',
'label-done': 'Done',
'label-resolved': 'Resolved',
'label-resolve-conflict': 'Resolve Conflict',
diff --git a/renderer/src/translations/fa.js b/renderer/src/translations/fa.js
index 30bce2101..f9d7edb1c 100644
--- a/renderer/src/translations/fa.js
+++ b/renderer/src/translations/fa.js
@@ -262,6 +262,7 @@ export const Fa = {
'label-overwrite': 'بازنویسی',
'modal-title-abort-conflict-resolution': 'لغو حل مشکل تعارض',
'msg-abort-conflict-resolution': 'آیا می خواهید فرآیند حل مشکل تعارض را متوقف کنید؟ اگر لغو کنید، تمام تغییرات انجام شده را از دست خواهید داد و باید از نو شروع کنید.',
+ 'text-msg-abort-conflict-resolution': 'آیا می خواهید فرآیند حل تعارض را متوقف کنید؟ لطفاً مطمئن شوید که به یک ایست بازرسی رسیدهاید تا بعداً ادامه دهید. نقطه بازرسی تکمیل هر فصل است. اگر در وسط یک فصل سقط شوید، تمام پیشرفت فصل خود را از دست خواهید داد و باید از فصل شروع کنید.',
'label-done': 'انجام شد',
'label-resolved': 'حل شد',
'label-resolve-conflict': 'حل تعارضها',
diff --git a/renderer/src/translations/fr.js b/renderer/src/translations/fr.js
index 38e602bb0..472b65695 100644
--- a/renderer/src/translations/fr.js
+++ b/renderer/src/translations/fr.js
@@ -262,6 +262,7 @@ export const Fr = {
'label-overwrite': 'Écraser',
'modal-title-abort-conflict-resolution': 'Abandonner la résolution des conflits',
'msg-abort-conflict-resolution': 'Voulez-vous abandonner le processus de résolution des conflits. Si vous abandonnez, vous perdrez toute votre progression et devrez recommencer.',
+ 'text-msg-abort-conflict-resolution': 'Voulez-vous abandonner le processus de résolution des conflits. Veuillez vous assurer d\'avoir atteint un point de contrôle pour continuer plus tard. Le point de contrôle est l’achèvement de chaque chapitre. Si vous abandonnez au milieu d\'un chapitre, vous perdrez toute votre progression dans le chapitre et devrez recommencer le chapitre.',
'label-done': 'fait',
'label-resolved': 'résolu',
'label-resolve-conflict': 'résoudre un conflit',
diff --git a/renderer/src/translations/hi.js b/renderer/src/translations/hi.js
index a942a7503..b774d4cb5 100644
--- a/renderer/src/translations/hi.js
+++ b/renderer/src/translations/hi.js
@@ -262,6 +262,7 @@ export const Hi = {
'label-overwrite': 'ओवरराइट',
'modal-title-abort-conflict-resolution': 'संघर्ष समाधान निरस्त करें',
'msg-abort-conflict-resolution': 'क्या आप संघर्ष समाधान प्रक्रिया को निरस्त करना चाहते हैं? यदि आप गर्भपात करते हैं, तो आप अपनी सारी प्रगति और दोबारा शुरू करने की आवश्यकता खो देंगे।',
+ 'text-msg-abort-conflict-resolution': 'क्या आप संघर्ष समाधान प्रक्रिया को निरस्त करना चाहते हैं? कृपया सुनिश्चित करें कि आप बाद में जारी रखने के लिए चेकपॉइंट पर पहुंच गए हैं। चेकप्वाइंट प्रत्येक अध्याय का पूरा होना है। यदि आप किसी अध्याय को बीच में ही समाप्त कर देते हैं, तो आप अध्याय की अपनी सारी प्रगति खो देंगे और अध्याय को फिर से शुरू करने की आवश्यकता होगी।',
'label-done': 'हो गया',
'label-resolved': 'हल किया',
'label-resolve-conflict': 'विवाद हल करो',
diff --git a/renderer/src/translations/ne.js b/renderer/src/translations/ne.js
index a54aa0b1a..2d93dc700 100644
--- a/renderer/src/translations/ne.js
+++ b/renderer/src/translations/ne.js
@@ -262,6 +262,7 @@ export const Ne = {
'label-overwrite': 'अधिलेखन गर्नुहोस्',
'modal-title-abort-conflict-resolution': 'द्वन्द्व समाधान रद्द गर्नुहोस्',
'msg-abort-conflict-resolution': 'तपाईं द्वन्द्व समाधान प्रक्रिया रद्द गर्न चाहनुहुन्छ। यदि तपाईंले रद्द गर्नुभयो भने, तपाईंले आफ्नो सबै प्रगति गुमाउनुहुनेछ र फेरि सुरु गर्न आवश्यक छ।',
+ 'text-msg-abort-conflict-resolution': 'तपाईं द्वन्द्व समाधान प्रक्रिया रद्द गर्न चाहनुहुन्छ। कृपया पछि जारी राख्नको लागि तपाईं चेकपोइन्टमा पुग्नुभएको सुनिश्चित गर्नुहोस्। चेकपोइन्ट भनेको प्रत्येक अध्यायको समाप्ति हो। यदि तपाईंले अध्यायको बिचमा रद्द गर्नुभयो भने, तपाईंले अध्यायको सबै प्रगति गुमाउनुहुनेछ र अध्यायबाट सुरु गर्न आवश्यक छ।',
'label-done': 'सकियो',
'label-resolved': 'समाधान गरियो',
'label-resolve-conflict': 'विवाद समाधान',
diff --git a/renderer/src/translations/ru.js b/renderer/src/translations/ru.js
index 712fac96f..fd5d4841c 100644
--- a/renderer/src/translations/ru.js
+++ b/renderer/src/translations/ru.js
@@ -262,6 +262,7 @@ export const Ru = {
'label-overwrite': 'Перезаписать',
'modal-title-abort-conflict-resolution': 'Прервать разрешение конфликта',
'msg-abort-conflict-resolution': 'Хотите прервать процесс разрешения конфликта? Если вы прервете, вы потеряете весь свой прогресс и вам придется начинать все сначала.',
+ 'text-msg-abort-conflict-resolution': 'Хотите прервать процесс разрешения конфликта? Пожалуйста, убедитесь, что вы достигли контрольно-пропускного пункта, чтобы продолжить позже. Контрольной точкой является завершение каждой главы. Если вы прервете чтение в середине главы, вы потеряете весь прогресс в этой главе и вам придется начинать ее заново.',
'label-done': 'сделанный',
'label-resolved': 'решено',
'label-resolve-conflict': 'разрешить конфликт',
From e9c4385da1ce6e498ca49e9ca36772dfba2e5788 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 13:27:45 +0530
Subject: [PATCH 36/50] added new hook for grammar to perf usfm conversion.
logic added in sidebar. need to move to mergeUI before writing.
---
.../TranslationMergeUI.jsx | 6 +-
renderer/src/hooks/useGrammartoPerf.js | 77 ++++++++++++++++
renderer/src/layouts/projects/SideBar.js | 87 +++++++++++++++++++
3 files changed, 169 insertions(+), 1 deletion(-)
create mode 100644 renderer/src/hooks/useGrammartoPerf.js
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index d1b8756db..35ba416fd 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -174,8 +174,12 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
// eslint-disable-next-line no-await-in-loop
const generatedUSFM = await parseJsonToUsfm(resolvedMergeJson);
+ // TODO : convert here to PERF
+
+ const perfUSFM = '';
+
// overwrite the source file with new file
- fs.writeFileSync(path.join(sourceIngredientPath, 'ingredients', `${resolvedMergeJson.book.bookCode}.usfm`), generatedUSFM);
+ fs.writeFileSync(path.join(sourceIngredientPath, 'ingredients', `${resolvedMergeJson.book.bookCode}.usfm`), perfUSFM);
// get and update the usfms ingredients
const stat = fs.statSync(path.join(sourceIngredientPath, 'ingredients', `${resolvedMergeJson.book.bookCode}.usfm`));
diff --git a/renderer/src/hooks/useGrammartoPerf.js b/renderer/src/hooks/useGrammartoPerf.js
new file mode 100644
index 000000000..681e751dc
--- /dev/null
+++ b/renderer/src/hooks/useGrammartoPerf.js
@@ -0,0 +1,77 @@
+import React, { useEffect, useState } from 'react';
+import { useProskomma, useImport, useCatalog } from 'proskomma-react-hooks';
+import {
+ useDeepCompareCallback,
+ useDeepCompareEffect,
+ useDeepCompareMemo,
+} from 'use-deep-compare';
+import EpiteleteHtml from 'epitelete-html';
+import usePerf from '../components/EditorPage/TextEditor/hooks/usePerf';
+import htmlMap from '../components/EditorPage/TextEditor/hooks/htmlmap';
+
+export const useGrammartoPerf = (perfArr = [], selectedBook = '') => {
+ let selectedDocument;
+ let refName;
+
+ console.log({ perfArr });
+
+ const { proskomma, stateId, newStateId } = useProskomma({ verbose: false });
+
+ console.log({ proskomma, stateId, newStateId });
+
+ const { done } = useImport({
+ proskomma,
+ stateId,
+ newStateId,
+ documents: perfArr,
+ });
+
+ console.log({ done });
+
+ const { catalog } = useCatalog({ proskomma, stateId, verbose: false });
+ const { id: docSetId, documents } = (done && catalog.docSets[0]) || {}; // why documents no getting -----------------------
+
+ console.log(' ----------------- ------------ >', { catalog, docSetId, documents });
+
+ if (done) {
+ selectedDocument = documents?.find(
+ (doc) => {
+ console.log('finidng book code ===> ', doc.bookCode, selectedBook);
+ return doc.bookCode === selectedBook;
+ },
+ );
+ }
+
+ console.log({ selectedDocument });
+
+ const { bookCode, h: bookName } = selectedDocument || {};
+ const ready = (docSetId && bookCode) || false;
+
+ console.log({ bookCode, ready });
+
+ const epiteleteHtml = useDeepCompareMemo(
+ () => ready
+ && new EpiteleteHtml({
+ proskomma,
+ docSetId,
+ htmlMap,
+ options: { historySize: 100 },
+ }),
+ [proskomma, ready, docSetId, refName],
+ );
+
+ useDeepCompareEffect(() => {
+ console.log('Triggering useDeepCompareEffect ==========> ');
+ if (epiteleteHtml) {
+ console.log('Insde useDeepCompareEffect ......................', bookCode);
+ const fs = window.require('fs');
+ epiteleteHtml.readHtml(bookCode, { cloning: false }, htmlMap).then(async (_htmlPerf) => {
+ console.log('INSIDE READ HTML =============> ', _htmlPerf);
+ const usfmPerfString = await epiteleteHtml?.readUsfm(bookCode);
+ await fs.writeFileSync('testedUSFMTIT.usfm', usfmPerfString);
+ console.log(' ============> ', usfmPerfString);
+ // remove htmlMap for default classes
+ });
+ }
+ }, [epiteleteHtml, bookCode]);
+};
diff --git a/renderer/src/layouts/projects/SideBar.js b/renderer/src/layouts/projects/SideBar.js
index d5a484e4f..3a1ed33d6 100644
--- a/renderer/src/layouts/projects/SideBar.js
+++ b/renderer/src/layouts/projects/SideBar.js
@@ -8,9 +8,66 @@ import LogoIcon from '@/icons/logo.svg';
import ProjectsIcon from '@/icons/projects.svg';
import NewProjectIcon from '@/icons/new.svg';
import SyncIcon from '@/icons/sync.svg';
+import { useGrammartoPerf } from '@/hooks2/useGrammartoPerf';
import AboutModal from '../editor/AboutModal';
+const usfmGrammarString = `\\id TIT
+ \\h TIT
+ \\mt1 TIT
+ \\c 1
+ \\p
+ \\v 1 .verse1..
+ \\v 2 .verse2..
+ \\v 3 .verse3..
+ \\v 4 .verse4..
+ \\v 5 ...
+ \\v 6 ...
+ \\v 7 ...
+ \\v 8 ...
+ \\v 9 ...
+ \\v 10 ...
+ \\v 11 ...
+ \\v 12 ...
+ \\v 13 ...
+ \\v 14 ...
+ \\v 15 ...
+ \\v 16 ...
+ \\c 2
+ \\p
+ \\v 1 ...
+ \\v 2 ...
+ \\v 3 ...
+ \\v 4 ...
+ \\v 5 ...
+ \\v 6 ...
+ \\v 7 ...
+ \\v 8 ...
+ \\v 9 ...
+ \\v 10 ...
+ \\v 11 ...
+ \\v 12 ...
+ \\v 13 ...
+ \\v 14 ...
+ \\v 15 ...
+ \\c 3
+ \\p
+ \\v 1 ...
+ \\v 2 ...
+ \\v 3 ...
+ \\v 4 ...
+ \\v 5 ...
+ \\v 6 ...
+ \\v 7 ...
+ \\v 8 ...
+ \\v 9 ...
+ \\v 10 ...
+ \\v 11 ...
+ \\v 12 ...
+ \\v 13 ...
+ \\v 14 ...
+ \\v 15 ...`;
+
export default function SideBar() {
const [open, setOpen] = useState(false);
// const [appMode, setAppMode] = useState();
@@ -28,6 +85,12 @@ export default function SideBar() {
setOpen(isOpen);
}
+ const [selected, setselectedBook] = useState('');
+ const [perfArr, setPerfArr] = useState([]);
+
+ // Testing HOOk for usfm to perf
+ useGrammartoPerf(perfArr, selected);
+
return (
@@ -85,6 +148,30 @@ export default function SideBar() {
+ {/* Testing link ----------------------------------------------------------================================================= */}
+
+ {
+ setPerfArr([{
+ selectors: { org: 'unfoldingWord', lang: 'en', abbr: 'ult' },
+ bookCode: 'tit',
+ data: usfmGrammarString,
+ }]); setselectedBook('TIT');
+}}
+ className="flex flex-col items-center"
+ >
+
+ PERF
+
+
+
{/*
{/* contents section */}
-
+
handleFinishedResolution()}
+ onClick={() => handleFinishMergeProcess()}
className="px-4 py-1 rounded-md uppercase bg-success/75 cursor-pointer hover:bg-success text-white"
>
Finish
) : (
- resolveAndMarkDoneChapter()}
- disabled={!chapterResolveDone}
- className={`px-4 py-1 rounded-md uppercase
+ !resolvedBooks.includes(selectedBook) && (
+ resolveAndMarkDoneChapter()}
+ disabled={!chapterResolveDone}
+ className={`px-4 py-1 rounded-md uppercase
${chapterResolveDone ? 'bg-success/75 cursor-pointer hover:bg-success text-white' : 'bg-gray-300 text-black cursor-not-allowed '}
`}
- >
- Resolve
-
+ >
+ {conflictedChapters?.[selectedBook]?.length <= 1 ? 'Resolve Book' : 'Done'}
+
+ )
)
)}
diff --git a/renderer/src/hooks/useGrammartoPerf.js b/renderer/src/hooks/useGrammartoPerf.js
index 681e751dc..097acde51 100644
--- a/renderer/src/hooks/useGrammartoPerf.js
+++ b/renderer/src/hooks/useGrammartoPerf.js
@@ -1,15 +1,12 @@
-import React, { useEffect, useState } from 'react';
import { useProskomma, useImport, useCatalog } from 'proskomma-react-hooks';
import {
- useDeepCompareCallback,
useDeepCompareEffect,
useDeepCompareMemo,
} from 'use-deep-compare';
import EpiteleteHtml from 'epitelete-html';
-import usePerf from '../components/EditorPage/TextEditor/hooks/usePerf';
import htmlMap from '../components/EditorPage/TextEditor/hooks/htmlmap';
-export const useGrammartoPerf = (perfArr = [], selectedBook = '') => {
+export const useGrammartoPerf = (perfArr = [], selectedBook = '', setGeneratedPerfUSFM = () => {}) => {
let selectedDocument;
let refName;
@@ -29,7 +26,7 @@ export const useGrammartoPerf = (perfArr = [], selectedBook = '') => {
console.log({ done });
const { catalog } = useCatalog({ proskomma, stateId, verbose: false });
- const { id: docSetId, documents } = (done && catalog.docSets[0]) || {}; // why documents no getting -----------------------
+ const { id: docSetId, documents } = (done && catalog.docSets[0]) || {};
console.log(' ----------------- ------------ >', { catalog, docSetId, documents });
@@ -64,12 +61,14 @@ export const useGrammartoPerf = (perfArr = [], selectedBook = '') => {
console.log('Triggering useDeepCompareEffect ==========> ');
if (epiteleteHtml) {
console.log('Insde useDeepCompareEffect ......................', bookCode);
- const fs = window.require('fs');
+ // const fs = window.require('fs');
epiteleteHtml.readHtml(bookCode, { cloning: false }, htmlMap).then(async (_htmlPerf) => {
console.log('INSIDE READ HTML =============> ', _htmlPerf);
const usfmPerfString = await epiteleteHtml?.readUsfm(bookCode);
- await fs.writeFileSync('testedUSFMTIT.usfm', usfmPerfString);
- console.log(' ============> ', usfmPerfString);
+ // await fs.writeFileSync(`${bookCode}-TEST.usfm`, usfmPerfString);
+ console.log(' Conversion done for PER USFM ============> ', usfmPerfString);
+ setGeneratedPerfUSFM(usfmPerfString);
+
// remove htmlMap for default classes
});
}
diff --git a/renderer/src/layouts/projects/SideBar.js b/renderer/src/layouts/projects/SideBar.js
index 3a1ed33d6..d5a484e4f 100644
--- a/renderer/src/layouts/projects/SideBar.js
+++ b/renderer/src/layouts/projects/SideBar.js
@@ -8,66 +8,9 @@ import LogoIcon from '@/icons/logo.svg';
import ProjectsIcon from '@/icons/projects.svg';
import NewProjectIcon from '@/icons/new.svg';
import SyncIcon from '@/icons/sync.svg';
-import { useGrammartoPerf } from '@/hooks2/useGrammartoPerf';
import AboutModal from '../editor/AboutModal';
-const usfmGrammarString = `\\id TIT
- \\h TIT
- \\mt1 TIT
- \\c 1
- \\p
- \\v 1 .verse1..
- \\v 2 .verse2..
- \\v 3 .verse3..
- \\v 4 .verse4..
- \\v 5 ...
- \\v 6 ...
- \\v 7 ...
- \\v 8 ...
- \\v 9 ...
- \\v 10 ...
- \\v 11 ...
- \\v 12 ...
- \\v 13 ...
- \\v 14 ...
- \\v 15 ...
- \\v 16 ...
- \\c 2
- \\p
- \\v 1 ...
- \\v 2 ...
- \\v 3 ...
- \\v 4 ...
- \\v 5 ...
- \\v 6 ...
- \\v 7 ...
- \\v 8 ...
- \\v 9 ...
- \\v 10 ...
- \\v 11 ...
- \\v 12 ...
- \\v 13 ...
- \\v 14 ...
- \\v 15 ...
- \\c 3
- \\p
- \\v 1 ...
- \\v 2 ...
- \\v 3 ...
- \\v 4 ...
- \\v 5 ...
- \\v 6 ...
- \\v 7 ...
- \\v 8 ...
- \\v 9 ...
- \\v 10 ...
- \\v 11 ...
- \\v 12 ...
- \\v 13 ...
- \\v 14 ...
- \\v 15 ...`;
-
export default function SideBar() {
const [open, setOpen] = useState(false);
// const [appMode, setAppMode] = useState();
@@ -85,12 +28,6 @@ export default function SideBar() {
setOpen(isOpen);
}
- const [selected, setselectedBook] = useState('');
- const [perfArr, setPerfArr] = useState([]);
-
- // Testing HOOk for usfm to perf
- useGrammartoPerf(perfArr, selected);
-
return (
@@ -148,30 +85,6 @@ export default function SideBar() {
- {/* Testing link ----------------------------------------------------------================================================= */}
-
- {
- setPerfArr([{
- selectors: { org: 'unfoldingWord', lang: 'en', abbr: 'ult' },
- bookCode: 'tit',
- data: usfmGrammarString,
- }]); setselectedBook('TIT');
-}}
- className="flex flex-col items-center"
- >
-
- PERF
-
-
-
{/*
- removeSection(true)}
- >
-
-
-
-
{t('label-resolve-conflict')}
-
- {/* close btn section */}
-
removeSection(true)}
- >
-
-
-
- {/* contents section */}
-
-
-
-
-
-
-
- {loading ? (
) : (
-
- (usfmJsons.current && usfmJsons.imported && !existImportedBook.status) ? (
-
-
- )
- : (
-
- )
-
- )}
-
-
-
-
{error}
- {usfmJsons.current && usfmJsons.imported && (
- finishedConflict ? (
-
-
handleFinishedResolution()}
- className="px-4 py-1 rounded-md uppercase bg-success/75 cursor-pointer hover:bg-success text-white"
- >
- Finish
-
- ) : (
-
-
resolveAndMarkDoneChapter()}
- disabled={!chapterResolveDone}
- className={`px-4 py-1 rounded-md uppercase
- ${chapterResolveDone ? 'bg-success/75 cursor-pointer hover:bg-success text-white' : 'bg-gray-300 text-black cursor-not-allowed '}
- `}
- >
- Resolve
-
- )
- )}
-
-
-
-
-
-
-
- modalClose()}
- confirmMessage={model.confirmMessage}
- buttonName={model.buttonName}
- closeModal={() => handleOnAbortMerge(model.buttonName)}
- />
-
- );
-}
-
-export default TranslationMergeUI;
diff --git a/renderer/src/hooks/useGrammartoPerf.js b/renderer/src/hooks/useGrammartoPerf.js
index 097acde51..aa7c787f8 100644
--- a/renderer/src/hooks/useGrammartoPerf.js
+++ b/renderer/src/hooks/useGrammartoPerf.js
@@ -41,7 +41,8 @@ export const useGrammartoPerf = (perfArr = [], selectedBook = '', setGeneratedPe
console.log({ selectedDocument });
- const { bookCode, h: bookName } = selectedDocument || {};
+ // const { bookCode, h: bookName } = selectedDocument || {};
+ const { bookCode } = selectedDocument || {};
const ready = (docSetId && bookCode) || false;
console.log({ bookCode, ready });
diff --git a/renderer/src/layouts/projects/Layout.js b/renderer/src/layouts/projects/Layout.js
index b85d064a6..580a3695e 100644
--- a/renderer/src/layouts/projects/Layout.js
+++ b/renderer/src/layouts/projects/Layout.js
@@ -9,11 +9,11 @@ import {
} from '@heroicons/react/24/outline';
import { useTranslation } from 'react-i18next';
import { ProjectContext } from '@/components/context/ProjectContext';
+import TranslationMergeUI from '@/components/TextTranslationMerge/TranslationMergeUI.jsx';
import SideBar from './SideBar';
import TopMenuBar from './TopMenuBar';
import ImportProjectPopUp from './ImportProjectPopUp';
import ConflictResolverUI from './Import/ConflictResolverUI';
-import TranslationMergeUI from '@/components/TextTranslationMerge/TranslationMergeUI';
export default function ProjectsLayout(props) {
const {
From 8a4c72d0756a7120765ca82d66a614930a9b01b7 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Fri, 3 May 2024 10:20:29 +0530
Subject: [PATCH 45/50] folder and import data exit after close issue fixed
---
.../components/TextTranslationMerge/TranslationMergeUI.jsx | 1 +
renderer/src/layouts/projects/ImportProjectPopUp.js | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 587c0f995..8f6f139d0 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -434,6 +434,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
const sourceMeta = fs.readFileSync(path.join(sourceIngredientPath, 'metadata.json'));
const sourceMetaJson = JSON.parse(sourceMeta);
sourceMetaJson.ingredients[selectedBook].checksum.md5 = md5(generatedPerfUSFM);
+ console.log('Updated MD5 ================================> ', { selectedBook }, md5(generatedPerfUSFM));
sourceMetaJson.ingredients[selectedBook].size = stat.size;
fs.writeFileSync(path.join(sourceIngredientPath, 'metadata.json'), JSON.stringify(sourceMetaJson));
diff --git a/renderer/src/layouts/projects/ImportProjectPopUp.js b/renderer/src/layouts/projects/ImportProjectPopUp.js
index bea400db0..8e5e50782 100644
--- a/renderer/src/layouts/projects/ImportProjectPopUp.js
+++ b/renderer/src/layouts/projects/ImportProjectPopUp.js
@@ -83,7 +83,6 @@ export default function ImportProjectPopUp(props) {
}
const openFileDialogSettingData = async () => {
- setFolderPath()
logger.debug('ImportProjectPopUp.js', 'Inside openFileDialogSettingData');
// const options = { properties: ['openFile','openDirectory'] };
const options = importingIsZip ? { properties: ['openFile'], filters: [{name:'zip file', extensions:["zip"]}] } : { properties: ['openDirectory'] };
@@ -115,6 +114,7 @@ export default function ImportProjectPopUp(props) {
} else {
logger.debug('ImportProjectPopUp.js', 'Didn\'t select any project');
setSbData({});
+ setFolderPath()
close("else");
}
setFolderPath(selectedFolderPath);
@@ -172,6 +172,7 @@ export default function ImportProjectPopUp(props) {
if (status[0].type === 'success') {
setSbData({});
close("Success");
+ setFolderPath()
FetchProjects();
router.push('/projects');
}
@@ -350,7 +351,7 @@ export default function ImportProjectPopUp(props) {
{t('label-import-project')}
close('Backdrop')}
+ onClick={() => { setFolderPath(); setSbData({}); close('Backdrop') }}
type="button"
className="focus:outline-none"
>
@@ -455,7 +456,7 @@ export default function ImportProjectPopUp(props) {
close('cancel')}
+ onClick={() => {setFolderPath(); setSbData({}); close('cancel')}}
className="py-2 px-6 rounded shadow bg-error text-white uppercase text-xs tracking-widest font-semibold"
>
{t('btn-cancel')}
From d5d677833dee5180c8a7f2e807030fba0891ddca Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Fri, 3 May 2024 10:43:29 +0530
Subject: [PATCH 46/50] removed unused fucntion
---
.../TranslationMergeUI.jsx | 68 ++-----------------
1 file changed, 4 insertions(+), 64 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 8f6f139d0..0dbecce02 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -100,8 +100,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
return usfm;
}
- // console.log({ conflictedChapters, selectedBook, usfmJsons });
-
const checkForConflictInSelectedBook = async (selectedBook) => {
// parse imported
const fs = window.require('fs');
@@ -138,18 +136,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
setSelectedChapter(conflcitedChapters[0]);
}
setLoading(false);
-
- // old UI logic of import and parse already saved book
- // if (savedConflictsBooks.includes(`${importedJson.data.book.bookCode.toLowerCase()}.json`)) {
- // setExistImportedBook({ status: true, bookId: importedJson.data.book.bookCode.toLowerCase() });
- // console.log('existing book');
- // setModel({
- // openModel: true,
- // title: t('modal-title-abort-conflict-resolution'),
- // confirmMessage: t('msg-conflict-resolution-duplicate-book', { bookId: importedJson.data.book.bookCode.toUpperCase() }),
- // buttonName: t('label-startover'),
- // });
- // }
}
}
} else {
@@ -227,22 +213,9 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
};
const handleFinishedBookResolution = async () => {
- const fs = window.require('fs');
-
- // flushSync(() => {
- // setLoading(true);
- // // setFinishedConflict((prev) => ([...prev, currentBook]));
- // });
-
const resolvedBooks = { ...usfmJsons };
delete resolvedBooks.conflictMeta;
- const currentSourceMeta = usfmJsons?.conflictMeta?.currentMeta;
-
- // TODO : Disable all clicks when loading is true
-
- const sourceIngredientPath = path.join(usfmJsons.conflictMeta.sourceProjectPath);
-
// work on single book
const resolvedMergeJson = resolvedBooks[selectedBook]?.mergeJson;
const generatedUSFM = await parseJsonToUsfm(resolvedMergeJson);
@@ -257,39 +230,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
} else {
console.error('Can not generate usfm of current book : ', selectedBook);
}
-
- // // loop over the resolved books
- // // eslint-disable-next-line no-restricted-syntax
- // for (const bookName of Object.keys(resolvedBooks)) {
- // const resolvedMergeJson = resolvedBooks[bookName]?.mergeJson;
- // // eslint-disable-next-line no-await-in-loop
- // const generatedUSFM = await parseJsonToUsfm(resolvedMergeJson);
-
- // // TODO : convert here to PERF
-
- // const perfUSFM = '';
-
- // // overwrite the source file with new file
- // fs.writeFileSync(path.join(sourceIngredientPath, 'ingredients', `${resolvedMergeJson.book.bookCode}.usfm`), generatedUSFM);
-
- // // get and update the usfms ingredients
- // const stat = fs.statSync(path.join(sourceIngredientPath, 'ingredients', `${resolvedMergeJson.book.bookCode}.usfm`));
- // currentSourceMeta.ingredients[bookName].checksum.md5 = md5(generatedUSFM);
- // currentSourceMeta.ingredients[bookName].size = stat.size;
-
- // write updated metadata here
- // fs.writeFileSync(path.join(sourceIngredientPath, 'metadata.json'), JSON.stringify(currentSourceMeta));
-
- // // remove .merge/project
- // await fs.rmSync(usfmJsons.conflictMeta.projectMergePath, { recursive: true, force: true });
- // // commit all changes after merge finish
- // const commitAuthor = { name: 'scribeInternal', email: 'scribe@bridgeconn.com' };
- // const backupMessage = `Scribe Internal Commit After Text Merge Finish : ${usfmJsons.conflictMeta.projectFullName} : ${new Date()}`;
- // await commitChanges(fs, usfmJsons.conflictMeta.sourceProjectPath, commitAuthor, backupMessage, true);
-
- // setLoading(false);
- // triggerSnackBar('success', 'Conflict Resolved Successfully');
- // closeMergeWindow();
};
// Function to write back the current usfmJSON data as config in the .merge
@@ -352,9 +292,9 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
};
/**
- * existing project merge
- * read usfm json data from backend
- */
+ * existing project merge
+ * read usfm json data from backend
+ */
const getInprogressMergeProject = async (data) => {
console.log('Loading Existing Project ================= ..................', { data });
const fs = window.require('fs');
@@ -499,7 +439,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
}
})();
} else {
- // TODO : add a message loading is showing some other process is going on
+ // INFO : loading is showing : some other process is going on
}
}, [selectedBook, usfmJsons.conflictMeta]);
From 7cf4d544a38af3e890aed5853ce466b3687cb814 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Fri, 10 May 2024 11:20:56 +0530
Subject: [PATCH 47/50] cleanup
---
.../TranslationMergeUI.jsx | 27 +------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 0dbecce02..bcfb28c81 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -144,7 +144,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
setLoading(false);
};
- // Previous function to handle all books together ( JSON => usfm all together at the end )
+ // INFO : Previous function to handle all books together ( JSON => usfm all together at the end )
// const handleFinishedResolution = async () => {
// const fs = window.require('fs');
@@ -296,7 +296,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
* read usfm json data from backend
*/
const getInprogressMergeProject = async (data) => {
- console.log('Loading Existing Project ================= ..................', { data });
const fs = window.require('fs');
if (fs.existsSync(path.join(data.projectMergePath, 'usfmJsons.json'))) {
let usfmJsonsContent = fs.readFileSync(path.join(data.projectMergePath, 'usfmJsons.json'), 'utf8');
@@ -400,7 +399,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
// useEffect to trigger completed all conflict Resolution
useEffect(() => {
- console.log('finish check =============> ', resolvedBooks.length >= usfmJsons?.conflictMeta?.files?.length.length);
if (resolvedBooks.length >= usfmJsons?.conflictMeta?.files?.length) {
setFinishedConflict(true);
} else {
@@ -514,29 +512,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
/>
)
-
- // (usfmJsons.current && usfmJsons.imported && !existImportedBook.status) ? (
- //
- //
- // )
- // : (
- //
- // )
-
)}
From 5db0a77da8aea12973db0d6e51eab3adbe4330b4 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Tue, 9 Jul 2024 11:37:07 +0530
Subject: [PATCH 48/50] fixes for auto conflict
---
renderer/src/components/SnackBar/SnackBar.js | 4 +-
.../TranslationMergeUI.jsx | 100 ++++++++++--------
2 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/renderer/src/components/SnackBar/SnackBar.js b/renderer/src/components/SnackBar/SnackBar.js
index 28484b239..b31c43583 100644
--- a/renderer/src/components/SnackBar/SnackBar.js
+++ b/renderer/src/components/SnackBar/SnackBar.js
@@ -5,7 +5,9 @@ import { XMarkIcon } from '@heroicons/react/24/outline';
import { Popover, Transition } from '@headlessui/react';
import PropTypes from 'prop-types';
-const colors = { success: '#82E0AA', failure: '#F5B7B1', warning: '#F8C471' };
+const colors = {
+ success: '#82E0AA', failure: '#F5B7B1', warning: '#F8C471', info: '#17a2b8',
+};
const SnackBar = ({
openSnackBar,
snackText,
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index bcfb28c81..4b18eb101 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -100,50 +100,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
return usfm;
}
- const checkForConflictInSelectedBook = async (selectedBook) => {
- // parse imported
- const fs = window.require('fs');
- const IncomingUsfm = fs.readFileSync(path.join(usfmJsons.conflictMeta.incomingPath, selectedBook), 'utf8');
- if (IncomingUsfm) {
- const importedJson = await parseUsfm(IncomingUsfm);
- if (!importedJson.valid) {
- setError('Imported Usfm is invalid');
- } else {
- // Parse current project same book
- const importedBookCode = `${importedJson.data.book.bookCode.toLowerCase()}.usfm`;
-
- setError('');
-
- setUsfmJsons((prev) => ({ ...prev, [selectedBook]: { ...prev[selectedBook], imported: importedJson.data } }));
-
- // setSelectedBookId(importedJson.data.book.bookCode.toLowerCase());
- // const currentBookPath = Object.keys(usfmJsons.conflictMeta.currentMeta.ingredients).find((code) => code.toLowerCase().endsWith(importedBookCode));
- const { projectFullName } = usfmJsons.conflictMeta;
- const currentBookUsfm = await readUsfmFile(selectedBook, projectFullName);
- // console.log('FOUND ====> ', { currentBookPath, currentBookUsfm });
- if (currentBookUsfm) {
- const currentJson = await parseUsfm(currentBookUsfm);
- // generate the merge object with current , incoming , merge verses
- const processOutArr = await processAndIdentiyVerseChangeinUSFMJsons(currentJson.data, importedJson.data).catch((err) => {
- console.log('process usfm : ', err);
- });
- const mergeJson = processOutArr[0];
- const conflcitedChapters = processOutArr[1];
- console.log('processOutArr[1] : ', processOutArr[1]);
- currentJson && currentJson?.valid && setUsfmJsons((prev) => ({ ...prev, [selectedBook]: { ...prev[selectedBook], current: currentJson.data, mergeJson } }));
- setConflictedChapters((prev) => ({ ...prev, [selectedBook]: processOutArr[1] }));
- if (conflcitedChapters && conflcitedChapters?.length > 0) {
- setSelectedChapter(conflcitedChapters[0]);
- }
- setLoading(false);
- }
- }
- } else {
- setError('unable to read imported USFM');
- }
- setLoading(false);
- };
-
// INFO : Previous function to handle all books together ( JSON => usfm all together at the end )
// const handleFinishedResolution = async () => {
// const fs = window.require('fs');
@@ -291,6 +247,62 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
}
};
+ /**
+ *
+ * @param {*} selectedBook
+ * function checks the conflict in the book , indenitify the conflicted chapters, generate usfmJson
+ */
+ const checkForConflictInSelectedBook = async (selectedBook) => {
+ // parse imported
+ const fs = window.require('fs');
+ const IncomingUsfm = fs.readFileSync(path.join(usfmJsons.conflictMeta.incomingPath, selectedBook), 'utf8');
+ if (IncomingUsfm) {
+ const importedJson = await parseUsfm(IncomingUsfm);
+ if (!importedJson.valid) {
+ setError('Imported Usfm is invalid');
+ } else {
+ // Parse current project same book
+ const importedBookCode = `${importedJson.data.book.bookCode.toLowerCase()}.usfm`;
+
+ setError('');
+
+ setUsfmJsons((prev) => ({ ...prev, [selectedBook]: { ...prev[selectedBook], imported: importedJson.data } }));
+
+ // setSelectedBookId(importedJson.data.book.bookCode.toLowerCase());
+ // const currentBookPath = Object.keys(usfmJsons.conflictMeta.currentMeta.ingredients).find((code) => code.toLowerCase().endsWith(importedBookCode));
+ const { projectFullName } = usfmJsons.conflictMeta;
+ const currentBookUsfm = await readUsfmFile(selectedBook, projectFullName);
+ // console.log('FOUND ====> ', { currentBookPath, currentBookUsfm });
+ if (currentBookUsfm) {
+ const currentJson = await parseUsfm(currentBookUsfm);
+ // generate the merge object with current , incoming , merge verses
+ const processOutArr = await processAndIdentiyVerseChangeinUSFMJsons(currentJson.data, importedJson.data).catch((err) => {
+ console.log('process usfm : ', err);
+ });
+ const mergeJson = processOutArr[0];
+ const conflcitedChapters = processOutArr[1];
+ console.log('processOutArr[1] : ', processOutArr[1]);
+ currentJson && currentJson?.valid && setUsfmJsons((prev) => ({ ...prev, [selectedBook]: { ...prev[selectedBook], current: currentJson.data, mergeJson } }));
+ // if processOutArr leng = 0 ; there is not actual conflict on content. so do auto resolve for the book
+ if (conflcitedChapters?.length > 0) {
+ setConflictedChapters((prev) => ({ ...prev, [selectedBook]: processOutArr[1] }));
+ if (conflcitedChapters && conflcitedChapters?.length > 0) {
+ setSelectedChapter(conflcitedChapters[0]);
+ }
+ } else {
+ // resolve the book automatically ; the conflict in md5 only not on content
+ await resolveAndMarkDoneChapter();
+ triggerSnackBar('info', 'No conflict in verse level. The conflict may be because of extra tags.');
+ }
+ setLoading(false);
+ }
+ }
+ } else {
+ setError('unable to read imported USFM');
+ }
+ setLoading(false);
+ };
+
/**
* existing project merge
* read usfm json data from backend
From 527ac23b05aeeb44bf96164004063fd48207b5a3 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:35:22 +0530
Subject: [PATCH 49/50] auto check and mark done
---
.../TranslationMergeUI.jsx | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 4b18eb101..827ea07c1 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -171,7 +171,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
const handleFinishedBookResolution = async () => {
const resolvedBooks = { ...usfmJsons };
delete resolvedBooks.conflictMeta;
-
+ console.log('handle finish book resolution ===> ', resolvedBooks);
// work on single book
const resolvedMergeJson = resolvedBooks[selectedBook]?.mergeJson;
const generatedUSFM = await parseJsonToUsfm(resolvedMergeJson);
@@ -213,9 +213,12 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
setChapterResolveDone(false);
// remove current chapter from conflicted list
const restOfTheChapters = conflictedChapters[selectedBook]?.filter((chNo) => chNo !== selectedChapter);
- setConflictedChapters((prev) => ({ ...prev, [selectedBook]: restOfTheChapters }));
+ setConflictedChapters((prev) => ({ ...prev, [selectedBook]: restOfTheChapters || [] }));
let isBookResolved = false;
- if (restOfTheChapters?.length === 0) {
+ if (!restOfTheChapters) {
+ setResolvedBooks((prev) => [...prev, selectedBook]);
+ // isBookResolved = true;
+ } else if (restOfTheChapters?.length === 0) {
// completed conflicts for that particualr book
flushSync(() => {
setLoading(true);
@@ -262,7 +265,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
setError('Imported Usfm is invalid');
} else {
// Parse current project same book
- const importedBookCode = `${importedJson.data.book.bookCode.toLowerCase()}.usfm`;
+ // const importedBookCode = `${importedJson.data.book.bookCode.toLowerCase()}.usfm`;
setError('');
@@ -285,7 +288,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
currentJson && currentJson?.valid && setUsfmJsons((prev) => ({ ...prev, [selectedBook]: { ...prev[selectedBook], current: currentJson.data, mergeJson } }));
// if processOutArr leng = 0 ; there is not actual conflict on content. so do auto resolve for the book
if (conflcitedChapters?.length > 0) {
- setConflictedChapters((prev) => ({ ...prev, [selectedBook]: processOutArr[1] }));
+ setConflictedChapters((prev) => ({ ...prev, [selectedBook]: processOutArr[1] || [] }));
if (conflcitedChapters && conflcitedChapters?.length > 0) {
setSelectedChapter(conflcitedChapters[0]);
}
@@ -312,7 +315,6 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
if (fs.existsSync(path.join(data.projectMergePath, 'usfmJsons.json'))) {
let usfmJsonsContent = fs.readFileSync(path.join(data.projectMergePath, 'usfmJsons.json'), 'utf8');
usfmJsonsContent = JSON.parse(usfmJsonsContent);
- console.log({ usfmJsonsContent });
if (usfmJsonsContent) {
setUsfmJsons(usfmJsonsContent);
// check the books is already resolved or not => then select current book and unresolved chapters
@@ -332,7 +334,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
if (currentBook.isBookResolved) {
resolvedBooksArr.push(book);
}
- conflictedChsOfBooks[book] = currentBook.conflictedChapters;
+ conflictedChsOfBooks[book] = currentBook.conflictedChapters || [];
}
}
@@ -437,7 +439,7 @@ function TranslationMergeUI({ conflictData, closeMergeWindow, triggerSnackBar })
// if (!loading && usfmJsons?.conflictMeta && selectedBook) {
(async () => {
setLoading(true);
- if (conflictedChapters[selectedBook]) {
+ if (conflictedChapters[selectedBook]?.length > 0) {
// Auto Select first Chapter of the selected Book
if (conflictedChapters[selectedBook] && conflictedChapters[selectedBook].length > 0) {
setSelectedChapter(conflictedChapters[selectedBook][0]);
From f48c80316ebb42328a5b24c0f94b4a0c55bd7417 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:12:32 +0530
Subject: [PATCH 50/50] lint: fixed lint issue
---
.../components/TextTranslationMerge/TranslationMergNavBar.jsx | 4 ++--
.../components/TextTranslationMerge/TranslationMergeUI.jsx | 3 ++-
.../components/TextTranslationMerge/UsfmConflictEditor.jsx | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergNavBar.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergNavBar.jsx
index 827a9f121..68d541cca 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergNavBar.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergNavBar.jsx
@@ -1,10 +1,10 @@
// import { Cog8ToothIcon } from '@heroicons/react/24/outline';
-import { useTranslation } from 'react-i18next';
+// import { useTranslation } from 'react-i18next';
function TranslationMergNavBar({
conflictedBooks, selectedBook, setSelectedBook, resolvedBooks, disableSelection, conflictedChapters, selectedChapter, setSelectedChapter,
}) {
- const { t } = useTranslation();
+ // const { t } = useTranslation();
return (
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 827ea07c1..510f3f9b8 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -10,12 +10,13 @@ import { readUsfmFile } from '@/core/projects/userSettings';
import localforage from 'localforage';
import { flushSync } from 'react-dom';
import TranslationMergNavBar from './TranslationMergNavBar';
-import * as logger from '../../logger';
+// import * as logger from '../../logger';
import LoadingScreen from '../Loading/LoadingScreen';
import UsfmConflictEditor from './UsfmConflictEditor';
import { processAndIdentiyVerseChangeinUSFMJsons } from './processUsfmObjs';
import packageInfo from '../../../../package.json';
import { commitChanges } from '../Sync/Isomorphic/utils';
+/* eslint-disable import/no-unresolved , import/extensions */
import { useGrammartoPerf } from '@/hooks2/useGrammartoPerf';
const grammar = require('usfm-grammar');
diff --git a/renderer/src/components/TextTranslationMerge/UsfmConflictEditor.jsx b/renderer/src/components/TextTranslationMerge/UsfmConflictEditor.jsx
index 97120a278..d1ca1c3ff 100644
--- a/renderer/src/components/TextTranslationMerge/UsfmConflictEditor.jsx
+++ b/renderer/src/components/TextTranslationMerge/UsfmConflictEditor.jsx
@@ -2,9 +2,10 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import {
- ArrowSmallDownIcon, ArrowSmallUpIcon, ArrowsUpDownIcon, ArrowPathRoundedSquareIcon,
+ ArrowSmallDownIcon, ArrowSmallUpIcon, ArrowPathRoundedSquareIcon,
} from '@heroicons/react/20/solid';
+/* eslint-disable no-unused-vars */
function UsfmConflictEditor({
usfmJsons, currentProjectMeta, selectedChapter, setUsfmJsons, setChapterResolveDone, resolvedChapters, selectedBook, resolvedBooks, conflictedChapters,
}) {