Feature 7194/Add support for other bibles in scripture pane (#7248)

* working on owner support for scripture pane * update dependencies * fix unit tests and loading resources
unfoldingWord · Feb 17, 2022 · 71ca242 · 71ca242
1 parent 3188958
commit 71ca242
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -124,7 +124,7 @@
     "archiver": "3.0.0",
     "axios": "0.19.1",
     "babel-polyfill": "6.26.0",
-    "checking-tool-wrapper": "7.0.3",
+    "checking-tool-wrapper": "7.0.4",
     "crypto-js": "3.1.8",
     "csv": "1.2.1",
     "deep-equal": "1.0.1",
@@ -179,7 +179,7 @@
     "tc-source-content-updater": "1.2.2",
     "tc-strings": "0.1.7",
     "tc-tool": "4.1.0",
-    "tc-ui-toolkit": "6.0.3",
+    "tc-ui-toolkit": "6.0.4",
     "truncate-utf8-bytes": "1.0.2",
     "tsv-groupdata-parser": "0.10.3",
     "usfm-js": "3.3.1",

diff --git a/src/__tests__/ResourcesActions.test.js b/src/__tests__/ResourcesActions.test.js
@@ -101,7 +101,7 @@ describe('ResourcesActions', () => {
 
     const ugnt = require('./fixtures/project/en_gal/bibleData.json');
 
-    const store = mockStore({
+    const mockStoreInit = {
       actions: {},
       toolsReducer: { selectedTool: WORD_ALIGNMENT },
       resourcesReducer: {
@@ -130,7 +130,10 @@ describe('ResourcesActions', () => {
           },
         },
       },
-    });
+    };
+    // add owner support
+    mockStoreInit.resourcesReducer.bibles['originalLanguage_Door43-Catalog'] = mockStoreInit.resourcesReducer.bibles.originalLanguage;
+    const store = mockStore(mockStoreInit);
     const contextId = {
       reference: {
         bookId: bookId,
@@ -264,6 +267,7 @@ function loadMockFsWithProjectAndResources() {
   const copyResourceFiles = [
     'en/bibles/ult',
     'en/bibles/ust',
+    'en/lexicons',
     'el-x-koine/bibles/ugnt',
     'en/translationHelps/translationWords',
     'en/translationHelps/translationAcademy',

diff --git a/src/js/actions/ResourcesActions.js b/src/js/actions/ResourcesActions.js
@@ -344,7 +344,7 @@ export const makeSureBiblesLoadedForTool = (contextId) => (dispatch, getState) =
   // load resources not in resources reducer
   if (Array.isArray(resources)) {
     removeBibleFromList(resources, TARGET_BIBLE, TARGET_LANGUAGE);
-    resources.forEach(paneSetting => dispatch(loadBibleBook(paneSetting.bibleId, bookId, paneSetting.languageId)));
+    resources.forEach(paneSetting => dispatch(loadBibleBook(paneSetting.bibleId, bookId, paneSetting.languageId, null, paneSetting.owner)));
   }
 };
 

diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment
+16,075 −17		package-lock.json
+1 −1		src/state/reducers/alignments/chapter.js
+2 −1		src/utils/alignmentValidation.js
+14 −0		src/utils/bibleHelpers.js
+12 −2		src/utils/panesSettingsHelper.js