From f82a12ced00a049f5f829da45b1bd4025459023e Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Tue, 28 Sep 2021 15:37:11 -0400 Subject: [PATCH 01/45] working on verse span support --- package-lock.json | 81 +++++++++++++----------------- package.json | 4 +- src/js/helpers/ProjectAPI.js | 11 ++++ src/js/helpers/ResourcesHelpers.js | 3 +- src/js/helpers/groupDataHelpers.js | 67 +++++++++++++++++++----- 5 files changed, 104 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index 434c7658af..c2b87574d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "translationCore", - "version": "3.0.2", + "version": "3.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.0.2", + "version": "3.1.0", "license": "GPL-2.0", "dependencies": { "@craco/craco": "5.6.4", @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.3", + "tc-ui-toolkit": "github:unfoldingWord/tc-ui-toolkit#feature-mcleanb-7167", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -97,7 +97,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "^12.0.5-graphite", + "electronite": "github:unfoldingWord-dev/electronite-cli#feature-macosArmSupport", "electronite-packager": "15.0.0", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -158,6 +158,7 @@ "version": "7.8.7", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz", "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==", + "dev": true, "dependencies": { "@babel/code-frame": "^7.8.3", "@babel/generator": "^7.8.7", @@ -187,6 +188,7 @@ "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -8511,10 +8513,10 @@ }, "node_modules/electronite": { "version": "12.0.5-graphite", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-12.0.5-graphite.tgz", - "integrity": "sha512-9sSyz2eHFFZ/3yPAosmq05FpaCAwjNCzasoHlRjXi94JcDo386fsI3T9fW8jvNBsXQAfJxwk1l5jfwJqRBBwnw==", + "resolved": "git+ssh://git@github.com/unfoldingWord-dev/electronite-cli.git#8c23fb7edcb1fc50aa154b23e94493868d8adbbe", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@electron/get": "^1.0.1", "@types/node": "^14.6.2", @@ -10473,7 +10475,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz", "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", - "devOptional": true, + "dev": true, "dependencies": { "loader-utils": "^2.0.0", "schema-utils": "^2.6.5" @@ -10493,7 +10495,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "devOptional": true, + "dev": true, "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -23118,8 +23120,8 @@ }, "node_modules/tc-ui-toolkit": { "version": "5.3.3", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.3.tgz", - "integrity": "sha512-Op9iUXXqyd1gJIimgS80quXDEYa9SGxJDPJSGBmKKx3XahqPMDSZdgyuJM9Lvhi6B6bAeiT4iLED3JZY4fQZoQ==", + "resolved": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#f31b291266f390bea75d8314d2fda8c417f6e294", + "license": "MIT", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -23143,7 +23145,7 @@ "react-dom": "^16.3.0", "string-punctuation-tokenizer": "^2.0.0", "usfm-js": "^2.1.0", - "word-aligner": "^0.4.0" + "word-aligner": "^1.0.0" } }, "node_modules/tc-ui-toolkit/node_modules/deep-equal": { @@ -26997,6 +26999,7 @@ "version": "7.8.7", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz", "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==", + "dev": true, "requires": { "@babel/code-frame": "^7.8.3", "@babel/generator": "^7.8.7", @@ -27018,7 +27021,8 @@ "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, @@ -28237,8 +28241,7 @@ "@electron/remote": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-1.2.0.tgz", - "integrity": "sha512-C774t2DFVJsa+dxU9Gc2nYzylRZoJ79I0Sxrh8T9cN69fBkntfGbyBEQiD9UfZopqL0CYLzk1anY2Ywhql6h1w==", - "requires": {} + "integrity": "sha512-C774t2DFVJsa+dxU9Gc2nYzylRZoJ79I0Sxrh8T9cN69fBkntfGbyBEQiD9UfZopqL0CYLzk1anY2Ywhql6h1w==" }, "@emotion/hash": { "version": "0.8.0", @@ -28619,8 +28622,7 @@ "@material-ui/types": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz", - "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==", - "requires": {} + "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==" }, "@material-ui/utils": { "version": "4.11.2", @@ -29352,8 +29354,7 @@ "acorn-jsx": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", - "requires": {} + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==" }, "acorn-walk": { "version": "6.2.0", @@ -29476,14 +29477,12 @@ "ajv-errors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", - "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "requires": {} + "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==" }, "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "requires": {} + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "alphanum-sort": { "version": "1.0.2", @@ -30278,8 +30277,7 @@ "babel-plugin-named-asset-import": { "version": "0.3.7", "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz", - "integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==", - "requires": {} + "integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==" }, "babel-plugin-polyfill-corejs2": { "version": "0.2.2", @@ -33495,10 +33493,9 @@ "integrity": "sha512-Q50dJbfYYRtwK3G9mFP/EsJVzlgcYwKxFjbXmvVa1lDAbdviPcT9QOpFoufDApub4j0hBfDRL6v3lWNLEdEDXQ==" }, "electronite": { - "version": "12.0.5-graphite", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-12.0.5-graphite.tgz", - "integrity": "sha512-9sSyz2eHFFZ/3yPAosmq05FpaCAwjNCzasoHlRjXi94JcDo386fsI3T9fW8jvNBsXQAfJxwk1l5jfwJqRBBwnw==", + "version": "git+ssh://git@github.com/unfoldingWord-dev/electronite-cli.git#8c23fb7edcb1fc50aa154b23e94493868d8adbbe", "dev": true, + "from": "electronite@github:unfoldingWord-dev/electronite-cli#feature-macosArmSupport", "requires": { "@electron/get": "^1.0.1", "@types/node": "^14.6.2", @@ -34387,8 +34384,7 @@ "eslint-plugin-react-hooks": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz", - "integrity": "sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA==", - "requires": {} + "integrity": "sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA==" }, "eslint-scope": { "version": "5.1.1", @@ -35060,7 +35056,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz", "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", - "devOptional": true, + "dev": true, "requires": { "loader-utils": "^2.0.0", "schema-utils": "^2.6.5" @@ -35070,7 +35066,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "devOptional": true, + "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -37907,8 +37903,7 @@ "jest-pnp-resolver": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", - "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", - "requires": {} + "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==" }, "jest-regex-util": { "version": "24.9.0", @@ -39115,8 +39110,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz", "integrity": "sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==", - "dev": true, - "requires": {} + "dev": true }, "marked": { "version": "0.6.2", @@ -41917,8 +41911,7 @@ "version": "15.6.2", "resolved": "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz", "integrity": "sha1-wStu/cIkfBDae4dw0YUICnsEcVY=", - "dev": true, - "requires": {} + "dev": true }, "react-app-polyfill": { "version": "1.0.6", @@ -42654,8 +42647,7 @@ "reactable": { "version": "0.14.1", "resolved": "https://registry.npmjs.org/reactable/-/reactable-0.14.1.tgz", - "integrity": "sha1-KrmJXj322iSYYl3kbTaRWS0YyTs=", - "requires": {} + "integrity": "sha1-KrmJXj322iSYYl3kbTaRWS0YyTs=" }, "read-pkg": { "version": "3.0.0", @@ -42788,8 +42780,7 @@ "redux-batched-actions": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/redux-batched-actions/-/redux-batched-actions-0.4.1.tgz", - "integrity": "sha512-r6tLDyBP3U9cXNLEHs0n1mX5TQfmk6xE0Y9uinYZ5HOyAWDgIJxYqRRkU/bC6XrJ4nS7tasNbxaHJHVmf9UdkA==", - "requires": {} + "integrity": "sha512-r6tLDyBP3U9cXNLEHs0n1mX5TQfmk6xE0Y9uinYZ5HOyAWDgIJxYqRRkU/bC6XrJ4nS7tasNbxaHJHVmf9UdkA==" }, "redux-jest": { "version": "1.1.1", @@ -44560,8 +44551,7 @@ "version": "0.0.1-3", "resolved": "https://registry.npmjs.org/spec-xunit-file/-/spec-xunit-file-0.0.1-3.tgz", "integrity": "sha1-hVpmq4w4LrMWXfkoqB0HSQKdI4Y=", - "dev": true, - "requires": {} + "dev": true }, "split": { "version": "1.0.1", @@ -45258,9 +45248,8 @@ } }, "tc-ui-toolkit": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.3.tgz", - "integrity": "sha512-Op9iUXXqyd1gJIimgS80quXDEYa9SGxJDPJSGBmKKx3XahqPMDSZdgyuJM9Lvhi6B6bAeiT4iLED3JZY4fQZoQ==", + "version": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#f31b291266f390bea75d8314d2fda8c417f6e294", + "from": "tc-ui-toolkit@unfoldingWord/tc-ui-toolkit#feature-mcleanb-7167", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index 2b8047186f..abcf660e07 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "^12.0.5-graphite", + "electronite": "github:unfoldingWord-dev/electronite-cli#feature-macosArmSupport", "electronite-packager": "15.0.0", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -178,7 +178,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.3", + "tc-ui-toolkit": "github:unfoldingWord/tc-ui-toolkit#feature-mcleanb-7167", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", diff --git a/src/js/helpers/ProjectAPI.js b/src/js/helpers/ProjectAPI.js index d300eb6939..6d57541122 100644 --- a/src/js/helpers/ProjectAPI.js +++ b/src/js/helpers/ProjectAPI.js @@ -47,6 +47,7 @@ export default class ProjectAPI { this.isCategoryLoaded = this.isCategoryLoaded.bind(this); this.setCategoryLoaded = this.setCategoryLoaded.bind(this); this.getGroupsData = this.getGroupsData.bind(this); + this.getBookDataDir = this.getBookDataDir.bind(this); this.getGroupData = this.getGroupData.bind(this); this.setCategoryGroupIds = this.setCategoryGroupIds.bind(this); this.getAllCategoryMapping = this.getAllCategoryMapping.bind(this); @@ -83,6 +84,16 @@ export default class ProjectAPI { return path.join(this._dataPath, 'index', toolName, bookId); } + /** + * Returns the path to the book data directory. + * @return {string} + */ + getBookDataDir() { + // TODO: the book id is redundant to have in the project directory. + const bookId = this.getBookId(); + return path.join(this._projectPath, bookId); + } + /** * Returns a dictionary of all the group data loaded for a given tool. * This will silently fail if the groups data does not exist. diff --git a/src/js/helpers/ResourcesHelpers.js b/src/js/helpers/ResourcesHelpers.js index 594e0d7e4b..649a5a31b3 100644 --- a/src/js/helpers/ResourcesHelpers.js +++ b/src/js/helpers/ResourcesHelpers.js @@ -250,7 +250,8 @@ export function copyGroupDataToProject(gatewayLanguage, toolName, projectDir, di } else { // generate chapter-based group data const groupsDataDirectory = project.getCategoriesDir(toolName); - const data = generateChapterGroupData(project.getBookId(), toolName); + const bookDataDir = project.getBookDataDir(); + const data = generateChapterGroupData(project.getBookId(), toolName, bookDataDir); data.forEach(groupData => { const groupId = groupData[0].contextId.groupId; diff --git a/src/js/helpers/groupDataHelpers.js b/src/js/helpers/groupDataHelpers.js index b8e47e5e2e..b07e7d6332 100644 --- a/src/js/helpers/groupDataHelpers.js +++ b/src/js/helpers/groupDataHelpers.js @@ -5,19 +5,34 @@ import { STATIC_RESOURCES_PATH } from '../common/constants'; import { getTranslation } from './localizationHelpers'; import ResourceAPI from './ResourceAPI'; +function createGroupItem(bookId, chapter, verse, toolName) { + return { + 'contextId': { + 'reference': { + 'bookId': bookId, + 'chapter': chapter, + 'verse': verse, + }, + 'tool': toolName, + 'groupId': 'chapter_' + chapter, + }, + }; +} + /** * TODO: should this use the user's resources in the home dir instead of the static resources? * @description - Auto generate the chapter group data since more projects will use it * @param {String} bookId - id of the current book * @param {String} toolName - id of the current tool + * @param {String} bookDataDir - if given, use chapter data to identify verse spans */ -export const generateChapterGroupData = (bookId, toolName) => { +export const generateChapterGroupData = (bookId, toolName, bookDataDir) => { let groupsData = []; let ultPath = path.join(STATIC_RESOURCES_PATH, 'en', 'bibles', 'ult'); let versionPath = ResourceAPI.getLatestVersion(ultPath) || ultPath; const ultIndexPath = path.join(versionPath, 'index.json'); - if (fs.existsSync(ultIndexPath)) { // make sure it doens't crash if the path doesn't exist + if (fs.existsSync(ultIndexPath)) { // make sure it doesn't crash if the path doesn't exist const ultIndex = fs.readJsonSync(ultIndexPath); // the index of book/chapter/verses const bookData = ultIndex[bookId]; // get the data in the index for the current book @@ -26,19 +41,45 @@ export const generateChapterGroupData = (bookId, toolName) => { const verses = bookData[chapter]; // get the number of verses in the chapter return Array(verses).fill().map((_, i) => { // turn number of verses into array const verse = i + 1; // index is 0 based, so add one for verse number - return { - 'contextId': { - 'reference': { - 'bookId': bookId, - 'chapter': chapter, - 'verse': verse, - }, - 'tool': toolName, - 'groupId': 'chapter_' + chapter, - }, - }; + return createGroupItem(bookId, chapter, verse, toolName); }); }); + + if (bookDataDir) { + // look for verse spans in book data + for (let chapter = 1; chapter < bookData.chapters; chapter++) { + const chapterJson = fs.readJsonSync(path.join(bookDataDir, `${chapter}.json`)); + + if (chapterJson) { + const chapterData = groupsData[chapter-1]; + const verses = Object.keys(chapterJson); + + for (let verse of verses) { + if (verse.includes('-')) { + // found verse span + let [low, high] = verse.split('-'); + low = parseInt(low); + high = parseInt(high); + + for (let i = low; i <= high; i++) { + const idx = chapterData.findIndex(item => (item.contextId.reference.verse === i)); + + if (idx >= 0) { + if (i === low) { + // replace with verse span + chapterData[idx] = createGroupItem(bookId, chapter, verse, toolName); + } else { + // remove + chapterData.splice(idx, 1); + } + } + } + groupsData[chapter-1] = chapterData; + } + } + } + } + } } return groupsData; }; From bb95505172454e0d9109d6f26afb1bdab540cf73 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Wed, 29 Sep 2021 11:46:01 -0400 Subject: [PATCH 02/45] fix to keep wordAlignment index up to date. --- src/js/helpers/ResourcesHelpers.js | 39 ++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/src/js/helpers/ResourcesHelpers.js b/src/js/helpers/ResourcesHelpers.js index 649a5a31b3..fe2b36b240 100644 --- a/src/js/helpers/ResourcesHelpers.js +++ b/src/js/helpers/ResourcesHelpers.js @@ -255,15 +255,40 @@ export function copyGroupDataToProject(gatewayLanguage, toolName, projectDir, di data.forEach(groupData => { const groupId = groupData[0].contextId.groupId; - const dataPath = path.join(groupsDataDirectory, groupId + '.json'); + const fileName = groupId + '.json'; + ensureFileContentsJson(groupsDataDirectory, fileName, groupData); + }); + } +} + +/** + * make sure file contents have the latest data + * @param {String} folder + * @param {String} filename + * @param {object} data + */ +export function ensureFileContentsJson(folder, filename, data) { + const filePath = path.join(folder, filename); - if (!fs.existsSync(dataPath)) { - fs.outputJsonSync(dataPath, groupData, { - spaces: 2, - replace: null, - }); + try { + fs.ensureDirSync(folder); + let valid = fs.existsSync(filePath); + + if (valid) { + try { + const fileData = fs.readJsonSync(filePath); + valid = isEqual(data, fileData); + } catch (e) { + console.error(`ensureFileContentsJson() - error reading ${filePath}`, e); + valid = false; } - }); + } + + if (!valid) { + fs.outputJsonSync(filePath, data, { spaces: 2 }); + } + } catch (e) { + console.error(`ensureFileContentsJson() - error updating ${filePath}`, e); } } From 119d0fd9f85afc302f54867aaa95c4f94cf746d9 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Thu, 30 Sep 2021 17:22:43 -0400 Subject: [PATCH 03/45] fix to keep wordAlignment index up to date. --- package-lock.json | 17 ++++++++--------- package.json | 2 +- src/js/helpers/ProjectOverwriteHelpers.js | 3 +-- src/js/helpers/WordAlignmentHelpers.js | 2 +- src/tC_apps/wordAlignment | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2b87574d3..845690a69d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "6.0.1", + "checking-tool-wrapper": "github:unfoldingWord/checking-tool-wrapper#feature-mcleanb-7167", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.1.tgz", - "integrity": "sha512-sZgksUMXv10C2AXBSUbDoUZ5PrvzwVYu0DjBYM5RK+/yyj7CcGizuMZpbfrT0YUPEMm1XMlsdE9BkaG7/uvkJw==", + "version": "6.0.2-alpha", + "resolved": "git+ssh://git@github.com/unfoldingWord/checking-tool-wrapper.git#3a1a0f1d909247498ad3f5b7d9220ef061d09009", + "license": "MIT", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -23120,7 +23120,7 @@ }, "node_modules/tc-ui-toolkit": { "version": "5.3.3", - "resolved": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#f31b291266f390bea75d8314d2fda8c417f6e294", + "resolved": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#d7931962a00121849e30a370f5951edf67cc1d4d", "license": "MIT", "dependencies": { "@material-ui/core": "^4.10.2", @@ -31253,9 +31253,8 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.1.tgz", - "integrity": "sha512-sZgksUMXv10C2AXBSUbDoUZ5PrvzwVYu0DjBYM5RK+/yyj7CcGizuMZpbfrT0YUPEMm1XMlsdE9BkaG7/uvkJw==", + "version": "git+ssh://git@github.com/unfoldingWord/checking-tool-wrapper.git#3a1a0f1d909247498ad3f5b7d9220ef061d09009", + "from": "checking-tool-wrapper@github:unfoldingWord/checking-tool-wrapper#feature-mcleanb-7167", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -45248,7 +45247,7 @@ } }, "tc-ui-toolkit": { - "version": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#f31b291266f390bea75d8314d2fda8c417f6e294", + "version": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#d7931962a00121849e30a370f5951edf67cc1d4d", "from": "tc-ui-toolkit@unfoldingWord/tc-ui-toolkit#feature-mcleanb-7167", "requires": { "@material-ui/core": "^4.10.2", diff --git a/package.json b/package.json index abcf660e07..f568e02c5d 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "6.0.1", + "checking-tool-wrapper": "github:unfoldingWord/checking-tool-wrapper#feature-mcleanb-7167", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", diff --git a/src/js/helpers/ProjectOverwriteHelpers.js b/src/js/helpers/ProjectOverwriteHelpers.js index be2f4f29b3..68c0ddac42 100644 --- a/src/js/helpers/ProjectOverwriteHelpers.js +++ b/src/js/helpers/ProjectOverwriteHelpers.js @@ -155,7 +155,6 @@ export const createVerseEditsForAllChangedVerses = (oldProjectPath, newProjectPa Object.keys(newChapterVerses).forEach(verse => { let verseBefore = oldChapterVerses[verse]; let verseAfter = newChapterVerses[verse]; - verse = parseInt(verse); if (verseBefore !== verseAfter) { //An external edit happened @@ -179,7 +178,7 @@ export function validateSelectionsForTool(projectSaveLocation, chapter, verse, b reference: { bookId, chapter: parseInt(chapter), - verse: parseInt(verse), + verse, }, }; const groupsData = loadProjectGroupData(toolName, projectSaveLocation); diff --git a/src/js/helpers/WordAlignmentHelpers.js b/src/js/helpers/WordAlignmentHelpers.js index 905dac4cd3..ee292503da 100644 --- a/src/js/helpers/WordAlignmentHelpers.js +++ b/src/js/helpers/WordAlignmentHelpers.js @@ -236,7 +236,7 @@ export const convertAlignmentDataToUSFM = (wordAlignmentDataPath, projectTargetL if (e && e.type && e.type === 'InvalidatedAlignments') { //This is an expected error for invalidated alignments return reject({ - error: e, verse: parseInt(verseNumber), chapter: chapterNumber, + error: e, verse: verseNumber, chapter: chapterNumber, }); } } diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment index 56681c4143..60a16f83a9 160000 --- a/src/tC_apps/wordAlignment +++ b/src/tC_apps/wordAlignment @@ -1 +1 @@ -Subproject commit 56681c4143d27bfda3abeb97c1b5c6d4eece9f88 +Subproject commit 60a16f83a96a30d1be931d5e10a9dd4a6718f16b From e5eed42ef023a096d66e19a309f3ef970d5c043e Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Thu, 30 Sep 2021 17:35:09 -0400 Subject: [PATCH 04/45] bump minCompatibleVersion --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f568e02c5d..79cab8dce7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "translationCore", "productName": "translationCore", "version": "3.1.0", - "minCompatibleVersion": "3.0.2", + "minCompatibleVersion": "3.1.0", "manifestVersion": "7", "description": "A bridge between TS and TM", "main": "main.js", From 34f266a257aafe98c512d03c70920a34b7ceed53 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 08:52:08 -0400 Subject: [PATCH 05/45] update dependencies --- package-lock.json | 30 ++++++++++++++++-------------- package.json | 6 +++--- src/tC_apps/wordAlignment | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 845690a69d..f8accca0e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "github:unfoldingWord/checking-tool-wrapper#feature-mcleanb-7167", + "checking-tool-wrapper": "6.0.2-alpha.2", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "github:unfoldingWord/tc-ui-toolkit#feature-mcleanb-7167", + "tc-ui-toolkit": "5.3.4-alpha.2", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -97,7 +97,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "github:unfoldingWord-dev/electronite-cli#feature-macosArmSupport", + "electronite": "^12.0.5-graphite", "electronite-packager": "15.0.0", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "6.0.2-alpha", - "resolved": "git+ssh://git@github.com/unfoldingWord/checking-tool-wrapper.git#3a1a0f1d909247498ad3f5b7d9220ef061d09009", - "license": "MIT", + "version": "6.0.2-alpha.2", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.2.tgz", + "integrity": "sha512-hBzEOklEoRTtdJ4DFXCi3qDSv/t45Qr/wzOw4fg2pOvk7+8dmCfJJ7NSIr3y3kh17EIN/YJW0235YJDbu2nIJA==", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "5.3.3", - "resolved": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#d7931962a00121849e30a370f5951edf67cc1d4d", - "license": "MIT", + "version": "5.3.4-alpha.2", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.2.tgz", + "integrity": "sha512-E2PGNMOY0JFFoxZa+mXJg7XXk4b+0v59fFtFdzbmOn/5gTg3ZIuEWyOjF9K1GxpM2gvGxoF/yAxAoa8k0HiWww==", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -31253,8 +31253,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "git+ssh://git@github.com/unfoldingWord/checking-tool-wrapper.git#3a1a0f1d909247498ad3f5b7d9220ef061d09009", - "from": "checking-tool-wrapper@github:unfoldingWord/checking-tool-wrapper#feature-mcleanb-7167", + "version": "6.0.2-alpha.2", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.2.tgz", + "integrity": "sha512-hBzEOklEoRTtdJ4DFXCi3qDSv/t45Qr/wzOw4fg2pOvk7+8dmCfJJ7NSIr3y3kh17EIN/YJW0235YJDbu2nIJA==", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -33494,7 +33495,7 @@ "electronite": { "version": "git+ssh://git@github.com/unfoldingWord-dev/electronite-cli.git#8c23fb7edcb1fc50aa154b23e94493868d8adbbe", "dev": true, - "from": "electronite@github:unfoldingWord-dev/electronite-cli#feature-macosArmSupport", + "from": "electronite@^12.0.5-graphite", "requires": { "@electron/get": "^1.0.1", "@types/node": "^14.6.2", @@ -45247,8 +45248,9 @@ } }, "tc-ui-toolkit": { - "version": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#d7931962a00121849e30a370f5951edf67cc1d4d", - "from": "tc-ui-toolkit@unfoldingWord/tc-ui-toolkit#feature-mcleanb-7167", + "version": "5.3.4-alpha.2", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.2.tgz", + "integrity": "sha512-E2PGNMOY0JFFoxZa+mXJg7XXk4b+0v59fFtFdzbmOn/5gTg3ZIuEWyOjF9K1GxpM2gvGxoF/yAxAoa8k0HiWww==", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index 79cab8dce7..c91919572a 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "github:unfoldingWord-dev/electronite-cli#feature-macosArmSupport", + "electronite": "^12.0.5-graphite", "electronite-packager": "15.0.0", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -123,7 +123,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "github:unfoldingWord/checking-tool-wrapper#feature-mcleanb-7167", + "checking-tool-wrapper": "6.0.2-alpha.2", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -178,7 +178,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "github:unfoldingWord/tc-ui-toolkit#feature-mcleanb-7167", + "tc-ui-toolkit": "5.3.4-alpha.2", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment index 60a16f83a9..e1ccbebe05 160000 --- a/src/tC_apps/wordAlignment +++ b/src/tC_apps/wordAlignment @@ -1 +1 @@ -Subproject commit 60a16f83a96a30d1be931d5e10a9dd4a6718f16b +Subproject commit e1ccbebe056a53428825a516308a7f4477b337a5 From 2e94a0634a0e90defd8871a74968841cb5daffb8 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 09:05:46 -0400 Subject: [PATCH 06/45] fix unit test --- src/js/helpers/__mocks__/ProjectAPI.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/js/helpers/__mocks__/ProjectAPI.js b/src/js/helpers/__mocks__/ProjectAPI.js index 27de6f0011..6b19d4def9 100644 --- a/src/js/helpers/__mocks__/ProjectAPI.js +++ b/src/js/helpers/__mocks__/ProjectAPI.js @@ -1,4 +1,5 @@ export const mockGetCategoriesDir = jest.fn(); +export const mockGetBookDataDir = jest.fn(); export const mockIsCategoryLoaded = jest.fn(); export const mockSetCategoryLoaded = jest.fn(); export const mockSetCurrentCategories = jest.fn(); @@ -16,6 +17,7 @@ export const mockGetLoadedCategories = jest.fn(() => ('mockCategories')); const mock = jest.fn().mockImplementation(() => ({ setCategoryGroupIds: mockSetCategoryGroupIds, getCategoriesDir: mockGetCategoriesDir, + getBookDataDir: mockGetBookDataDir, isCategoryLoaded: mockIsCategoryLoaded, setCategoryLoaded: mockSetCategoryLoaded, setCurrentCategories: mockSetCurrentCategories, From 383ad57220a493e0c67daf3e85cf2a423b209f99 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 10:31:28 -0400 Subject: [PATCH 07/45] update node version for linux build --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc2cd30d77..ef2791cde0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: # run: echo "$GITHUB_CONTEXT" - uses: actions/setup-node@v1 with: - node-version: '16.4.0' + node-version: '16.4.2' - name: Node version run: | node --version From 53de070427bf14df7338f3d2455375cfd5b0a169 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 10:43:24 -0400 Subject: [PATCH 08/45] update unit tests github actions --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef2791cde0..168cf5f78e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,7 @@ jobs: submodules: recursive - name: npm install - run: npm ci + run: npm ci --legacy-peer-deps - name: npm test run: npm run ci-test From 7a649e389eeba1b284816ce6791e6b16d9507bac Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 11:05:16 -0400 Subject: [PATCH 09/45] hack to allow Linux builds with invalid certs. --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 168cf5f78e..196b7e3a4a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -119,7 +119,8 @@ jobs: - name: Download latest language names if: env.UPDATE_RESOURCES - run: curl https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json + # TODO: fix certs on uw website and remove this hack for curl crash on invalid certs by adding --insecure + run: curl --insecure https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - name: Update resources if: env.UPDATE_RESOURCES From f607dd32c42b7dc36859dafe24286049ff24f662 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 11:20:52 -0400 Subject: [PATCH 10/45] hack to allow Linux builds with invalid certs. --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 196b7e3a4a..08949c94b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -119,8 +119,9 @@ jobs: - name: Download latest language names if: env.UPDATE_RESOURCES - # TODO: fix certs on uw website and remove this hack for curl crash on invalid certs by adding --insecure - run: curl --insecure https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json + run: | + # TODO: fix certs on uw website and remove this hack for curl crash on invalid certs by adding --insecure + curl --insecure https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - name: Update resources if: env.UPDATE_RESOURCES From fc634f47127c414fc8b733ab912c109d7b90e4c5 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 11:35:06 -0400 Subject: [PATCH 11/45] fix for linux build --- .github/workflows/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08949c94b5..eeb8e448b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,12 +115,16 @@ jobs: echo "BUILD=$HASH" >> .env.tmp - name: npm install - run: npm ci + run: | + ls ./node_modules + # fix for build error dealing with cache + npm cache clean --force + npm ci - name: Download latest language names if: env.UPDATE_RESOURCES run: | - # TODO: fix certs on uw website and remove this hack for curl crash on invalid certs by adding --insecure + # TODO: fix certs on uw website and remove this hack for curl crash on invalid certs by removing --insecure param curl --insecure https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - name: Update resources From 2bd5afff1385205d1cdfa64dcbf2d1e78741e8bb Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 11:45:05 -0400 Subject: [PATCH 12/45] fix for linux build --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eeb8e448b0..4977f6999c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,11 @@ jobs: submodules: recursive - name: npm install - run: npm ci --legacy-peer-deps + run: | + ls ./node_modules + # fix for build error dealing with cache + npm cache clean --force + npm ci --legacy-peer-deps - name: npm test run: npm run ci-test @@ -115,11 +119,7 @@ jobs: echo "BUILD=$HASH" >> .env.tmp - name: npm install - run: | - ls ./node_modules - # fix for build error dealing with cache - npm cache clean --force - npm ci + run: npm ci - name: Download latest language names if: env.UPDATE_RESOURCES From a35caa9a0bec1d3c12f580aa112fd03085bbba56 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 11:47:40 -0400 Subject: [PATCH 13/45] fix for linux build --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4977f6999c..c6da964c00 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,6 @@ jobs: - name: npm install run: | - ls ./node_modules # fix for build error dealing with cache npm cache clean --force npm ci --legacy-peer-deps From 8956b41f7d02580b0266d81c7aa0373bf20d9820 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 11:59:23 -0400 Subject: [PATCH 14/45] fix for linux test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c6da964c00..a109b03da5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,8 +55,8 @@ jobs: - name: npm install run: | - # fix for build error dealing with cache - npm cache clean --force + # fix for npm install error dealing with npm cache + sudo chown -R 1001:121 "/github/home/.npm" npm ci --legacy-peer-deps - name: npm test From 1427475dc42e0422555c69f0271ae7dadde1e419 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 12:35:36 -0400 Subject: [PATCH 15/45] fix for linux test --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a109b03da5..8056252b9c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,6 +37,7 @@ jobs: node-version: '16.4.2' - name: Node version run: | + npm install -g npm@7.24.1 node --version npm --version @@ -54,10 +55,7 @@ jobs: submodules: recursive - name: npm install - run: | - # fix for npm install error dealing with npm cache - sudo chown -R 1001:121 "/github/home/.npm" - npm ci --legacy-peer-deps + run: npm ci --legacy-peer-deps - name: npm test run: npm run ci-test From 5352d121db9e829a9e44239381b404d7ad7d1d73 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 12:44:20 -0400 Subject: [PATCH 16/45] fix for linux test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8056252b9c..72105cc830 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,7 @@ jobs: submodules: recursive - name: npm install - run: npm ci --legacy-peer-deps + run: npm ci - name: npm test run: npm run ci-test From 38c2d70a6b47dc9223ebce447df8bee2fa40174b Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 12:50:59 -0400 Subject: [PATCH 17/45] fix for linux test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 72105cc830..8056252b9c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,7 @@ jobs: submodules: recursive - name: npm install - run: npm ci + run: npm ci --legacy-peer-deps - name: npm test run: npm run ci-test From 0e6e3dfc66080c16759a61a8a378e903751125f7 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 4 Oct 2021 13:51:29 -0400 Subject: [PATCH 18/45] fix for linux build --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8056252b9c..0cd133526d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -83,6 +83,7 @@ jobs: node-version: '16.4.2' - name: Node version run: | + npm install -g npm@7.24.1 node --version npm --version @@ -116,7 +117,7 @@ jobs: echo "BUILD=$HASH" >> .env.tmp - name: npm install - run: npm ci + run: npm ci --legacy-peer-deps - name: Download latest language names if: env.UPDATE_RESOURCES From 91440b208c7b5d32d593cc5d949bc1168db2dc4f Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Fri, 8 Oct 2021 06:24:56 -0400 Subject: [PATCH 19/45] fix verse markers --- package-lock.json | 14 +++++++------- package.json | 2 +- src/tC_apps/wordAlignment | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index f8accca0e4..097fe11ad9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.2", + "tc-ui-toolkit": "5.3.4-alpha.3", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "5.3.4-alpha.2", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.2.tgz", - "integrity": "sha512-E2PGNMOY0JFFoxZa+mXJg7XXk4b+0v59fFtFdzbmOn/5gTg3ZIuEWyOjF9K1GxpM2gvGxoF/yAxAoa8k0HiWww==", + "version": "5.3.4-alpha.3", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.3.tgz", + "integrity": "sha512-J9UGCMITPhuSPIJAV4ydbt8n/ZWeoMarmjKoE/kkTLXhWoeqF1o0/vB0dScEJhFjTRMLyWLGPeHdI3iP7o1y3w==", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -45248,9 +45248,9 @@ } }, "tc-ui-toolkit": { - "version": "5.3.4-alpha.2", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.2.tgz", - "integrity": "sha512-E2PGNMOY0JFFoxZa+mXJg7XXk4b+0v59fFtFdzbmOn/5gTg3ZIuEWyOjF9K1GxpM2gvGxoF/yAxAoa8k0HiWww==", + "version": "5.3.4-alpha.3", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.3.tgz", + "integrity": "sha512-J9UGCMITPhuSPIJAV4ydbt8n/ZWeoMarmjKoE/kkTLXhWoeqF1o0/vB0dScEJhFjTRMLyWLGPeHdI3iP7o1y3w==", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index c91919572a..db15375ba4 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.2", + "tc-ui-toolkit": "5.3.4-alpha.3", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment index e1ccbebe05..bf083db3fe 160000 --- a/src/tC_apps/wordAlignment +++ b/src/tC_apps/wordAlignment @@ -1 +1 @@ -Subproject commit e1ccbebe056a53428825a516308a7f4477b337a5 +Subproject commit bf083db3fe9931cfe2523dc19c6094cc131206ed From 5180cadf72296bbbb4a23336f95e53c8aac61b91 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Sat, 9 Oct 2021 07:31:46 -0400 Subject: [PATCH 20/45] fix intermittent build error - npm cache no permissions --- .github/workflows/main.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0cd133526d..d4902fb2d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,11 @@ jobs: submodules: recursive - name: npm install - run: npm ci --legacy-peer-deps + run: | + # fix in case of cached files, move cache to new temp directory + TMPDIR=$(mktemp -d) + echo "$TMPDIR" + npm ci --legacy-peer-deps --cache="$TMPDIR" - name: npm test run: npm run ci-test @@ -117,7 +121,11 @@ jobs: echo "BUILD=$HASH" >> .env.tmp - name: npm install - run: npm ci --legacy-peer-deps + run: | + # fix in case of cached files, move cache to new temp directory + TMPDIR=$(mktemp -d) + echo "$TMPDIR" + npm ci --legacy-peer-deps --cache="$TMPDIR" - name: Download latest language names if: env.UPDATE_RESOURCES From 649a95e8383d7f730adbfaf59326aa4a4f3db0ff Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Sat, 9 Oct 2021 07:38:38 -0400 Subject: [PATCH 21/45] remove npm upgrade --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d4902fb2d6..b0a0da06b7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,6 @@ jobs: node-version: '16.4.2' - name: Node version run: | - npm install -g npm@7.24.1 node --version npm --version @@ -56,7 +55,7 @@ jobs: - name: npm install run: | - # fix in case of cached files, move cache to new temp directory + # fix in case of cached files, move npm cache to new temp directory TMPDIR=$(mktemp -d) echo "$TMPDIR" npm ci --legacy-peer-deps --cache="$TMPDIR" @@ -87,7 +86,6 @@ jobs: node-version: '16.4.2' - name: Node version run: | - npm install -g npm@7.24.1 node --version npm --version @@ -122,7 +120,7 @@ jobs: - name: npm install run: | - # fix in case of cached files, move cache to new temp directory + # fix in case of cached files, move npm cache to new temp directory TMPDIR=$(mktemp -d) echo "$TMPDIR" npm ci --legacy-peer-deps --cache="$TMPDIR" From 5a7ceda780ffe1217d5a33571f9df956933bd2c6 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Sat, 9 Oct 2021 21:42:17 -0400 Subject: [PATCH 22/45] revert npm --legacy-peer-deps --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0a0da06b7..f32a6e3fde 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,10 +55,10 @@ jobs: - name: npm install run: | - # fix in case of cached files, move npm cache to new temp directory + # Fix: in case of cached files, move npm cache to new temp directory TMPDIR=$(mktemp -d) echo "$TMPDIR" - npm ci --legacy-peer-deps --cache="$TMPDIR" + npm ci --cache="$TMPDIR" - name: npm test run: npm run ci-test @@ -120,10 +120,10 @@ jobs: - name: npm install run: | - # fix in case of cached files, move npm cache to new temp directory + # Fix: in case of cached files, move npm cache to new temp directory TMPDIR=$(mktemp -d) echo "$TMPDIR" - npm ci --legacy-peer-deps --cache="$TMPDIR" + npm ci --cache="$TMPDIR" - name: Download latest language names if: env.UPDATE_RESOURCES From 6551c8a15d23af5a45f99be4c6e63371a9e914ae Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Sun, 10 Oct 2021 17:16:53 -0400 Subject: [PATCH 23/45] added automatic retry of download resources --- .github/workflows/main.yml | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f32a6e3fde..2e23ea6cbf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,7 @@ jobs: - name: npm install run: | - # Fix: in case of cached files, move npm cache to new temp directory + # Fix for problem of cached files from older npm versions, move npm cache to temp directory TMPDIR=$(mktemp -d) echo "$TMPDIR" npm ci --cache="$TMPDIR" @@ -120,7 +120,7 @@ jobs: - name: npm install run: | - # Fix: in case of cached files, move npm cache to new temp directory + # Fix for problem of cached files from older npm versions, move npm cache to temp directory TMPDIR=$(mktemp -d) echo "$TMPDIR" npm ci --cache="$TMPDIR" @@ -128,12 +128,18 @@ jobs: - name: Download latest language names if: env.UPDATE_RESOURCES run: | - # TODO: fix certs on uw website and remove this hack for curl crash on invalid certs by removing --insecure param + # TODO: remove this fix for expired certs on uw website - hack for curl crash on invalid certs, added --insecure param curl --insecure https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - name: Update resources if: env.UPDATE_RESOURCES - run: npm run update-resources + # add automatic retry + uses: nick-invision/retry@v2 + with: + timeout_minutes: 15 + max_attempts: 3 + retry_on: error + command: npm run update-resources - name: build linux id: build @@ -203,7 +209,13 @@ jobs: - name: Update resources if: env.UPDATE_RESOURCES - run: npm run update-resources + # add automatic retry + uses: nick-invision/retry@v2 + with: + timeout_minutes: 15 + max_attempts: 3 + retry_on: error + command: npm run update-resources - name: build windows run: | @@ -303,7 +315,13 @@ jobs: - name: Update resources if: env.UPDATE_RESOURCES - run: npm run update-resources + # add automatic retry + uses: nick-invision/retry@v2 + with: + timeout_minutes: 15 + max_attempts: 3 + retry_on: error + command: npm run update-resources - name: build macOS id: build From dfbf0a93c3c79d050a5baaf4c9aaa1a87643ea8e Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 11 Oct 2021 08:28:15 -0400 Subject: [PATCH 24/45] updated tc-ui-toolkit --- package-lock.json | 13 ++++++------- package.json | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 097fe11ad9..60107adb46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.3", + "tc-ui-toolkit": "5.3.4-alpha.4", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "5.3.4-alpha.3", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.3.tgz", - "integrity": "sha512-J9UGCMITPhuSPIJAV4ydbt8n/ZWeoMarmjKoE/kkTLXhWoeqF1o0/vB0dScEJhFjTRMLyWLGPeHdI3iP7o1y3w==", + "version": "5.3.4-alpha.4", + "resolved": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#f802c9307d19830c46640d21e563fd533979c141", + "license": "MIT", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -45248,9 +45248,8 @@ } }, "tc-ui-toolkit": { - "version": "5.3.4-alpha.3", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.3.tgz", - "integrity": "sha512-J9UGCMITPhuSPIJAV4ydbt8n/ZWeoMarmjKoE/kkTLXhWoeqF1o0/vB0dScEJhFjTRMLyWLGPeHdI3iP7o1y3w==", + "version": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#f802c9307d19830c46640d21e563fd533979c141", + "from": "tc-ui-toolkit@5.3.4-alpha.4", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index db15375ba4..aa51dbe975 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.3", + "tc-ui-toolkit": "5.3.4-alpha.4", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", From 85b5a25e927da4bfb23d1d296870a0457229ace3 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 11 Oct 2021 10:53:41 -0400 Subject: [PATCH 25/45] fix windows build to use bash for npm install --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e23ea6cbf..2c922d727a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -202,6 +202,7 @@ jobs: - name: npm install run: npm ci + shell: bash - name: Download latest language names if: env.UPDATE_RESOURCES From 1775a45d03b546f55d50ec456e95ec899f786b85 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 11 Oct 2021 11:24:54 -0400 Subject: [PATCH 26/45] fix windows build - npm install --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c922d727a..b23b69e2e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -201,7 +201,11 @@ jobs: echo "BUILD=${{ env.HASH }}" >> .env - name: npm install - run: npm ci + run: | + # Fix for problem of cached files from older npm versions, move npm cache to temp directory + TMPDIR=$(mktemp -d) + echo "$TMPDIR" + npm ci --cache="$TMPDIR" shell: bash - name: Download latest language names From c1d3ad104e4063eabcc1787b5d4e89c80de46537 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 11 Oct 2021 15:08:04 -0400 Subject: [PATCH 27/45] revert changes --- .github/workflows/main.yml | 7 +------ package-lock.json | 13 +++++++------ package.json | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b23b69e2e5..2e23ea6cbf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -201,12 +201,7 @@ jobs: echo "BUILD=${{ env.HASH }}" >> .env - name: npm install - run: | - # Fix for problem of cached files from older npm versions, move npm cache to temp directory - TMPDIR=$(mktemp -d) - echo "$TMPDIR" - npm ci --cache="$TMPDIR" - shell: bash + run: npm ci - name: Download latest language names if: env.UPDATE_RESOURCES diff --git a/package-lock.json b/package-lock.json index 60107adb46..097fe11ad9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.4", + "tc-ui-toolkit": "5.3.4-alpha.3", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "5.3.4-alpha.4", - "resolved": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#f802c9307d19830c46640d21e563fd533979c141", - "license": "MIT", + "version": "5.3.4-alpha.3", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.3.tgz", + "integrity": "sha512-J9UGCMITPhuSPIJAV4ydbt8n/ZWeoMarmjKoE/kkTLXhWoeqF1o0/vB0dScEJhFjTRMLyWLGPeHdI3iP7o1y3w==", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -45248,8 +45248,9 @@ } }, "tc-ui-toolkit": { - "version": "git+ssh://git@github.com/unfoldingWord/tc-ui-toolkit.git#f802c9307d19830c46640d21e563fd533979c141", - "from": "tc-ui-toolkit@5.3.4-alpha.4", + "version": "5.3.4-alpha.3", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.3.tgz", + "integrity": "sha512-J9UGCMITPhuSPIJAV4ydbt8n/ZWeoMarmjKoE/kkTLXhWoeqF1o0/vB0dScEJhFjTRMLyWLGPeHdI3iP7o1y3w==", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index aa51dbe975..db15375ba4 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.4", + "tc-ui-toolkit": "5.3.4-alpha.3", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", From 95874cf9cb0b62d5b2ce7cf4e743cf9ea248587d Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 11 Oct 2021 15:24:19 -0400 Subject: [PATCH 28/45] updated tc-ui-toolkit --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 097fe11ad9..39bead283f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.3", + "tc-ui-toolkit": "5.3.4-alpha.4", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "5.3.4-alpha.3", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.3.tgz", - "integrity": "sha512-J9UGCMITPhuSPIJAV4ydbt8n/ZWeoMarmjKoE/kkTLXhWoeqF1o0/vB0dScEJhFjTRMLyWLGPeHdI3iP7o1y3w==", + "version": "5.3.4-alpha.4", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.4.tgz", + "integrity": "sha512-h7CqHQctlYCqYR7mvItN6eji3YyJVBhU7Npb74J2PaWssXU5mPafcUTQ47my2xbqN6fuVfPhMGtyDGsdgb5Lpg==", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -45248,9 +45248,9 @@ } }, "tc-ui-toolkit": { - "version": "5.3.4-alpha.3", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.3.tgz", - "integrity": "sha512-J9UGCMITPhuSPIJAV4ydbt8n/ZWeoMarmjKoE/kkTLXhWoeqF1o0/vB0dScEJhFjTRMLyWLGPeHdI3iP7o1y3w==", + "version": "5.3.4-alpha.4", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.4.tgz", + "integrity": "sha512-h7CqHQctlYCqYR7mvItN6eji3YyJVBhU7Npb74J2PaWssXU5mPafcUTQ47my2xbqN6fuVfPhMGtyDGsdgb5Lpg==", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index db15375ba4..aa51dbe975 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.3", + "tc-ui-toolkit": "5.3.4-alpha.4", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", From 1224e3fe81d3b42faa05a438482d2a085af736c3 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 11 Oct 2021 16:46:16 -0400 Subject: [PATCH 29/45] fix before update resources retry, restore manifest --- .github/workflows/main.yml | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e23ea6cbf..2131131432 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,6 +131,9 @@ jobs: # TODO: remove this fix for expired certs on uw website - hack for curl crash on invalid certs, added --insecure param curl --insecure https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json + - name: Before Update resources + run: cp tcResources/source-content-updater-manifest.json source-content-updater-manifest.json.orig + - name: Update resources if: env.UPDATE_RESOURCES # add automatic retry @@ -140,6 +143,7 @@ jobs: max_attempts: 3 retry_on: error command: npm run update-resources + on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build linux id: build @@ -207,6 +211,10 @@ jobs: if: env.UPDATE_RESOURCES run: curl https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json + - name: Before Update resources + shell: bash + run: cp tcResources/source-content-updater-manifest.json source-content-updater-manifest.json.orig + - name: Update resources if: env.UPDATE_RESOURCES # add automatic retry @@ -215,7 +223,9 @@ jobs: timeout_minutes: 15 max_attempts: 3 retry_on: error + shell: bash command: npm run update-resources + on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build windows run: | @@ -313,15 +323,19 @@ jobs: if: env.UPDATE_RESOURCES run: curl https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - - name: Update resources - if: env.UPDATE_RESOURCES - # add automatic retry - uses: nick-invision/retry@v2 - with: - timeout_minutes: 15 - max_attempts: 3 - retry_on: error - command: npm run update-resources + - name: Before Update resources + run: cp tcResources/source-content-updater-manifest.json source-content-updater-manifest.json.orig + + - name: Update resources + if: env.UPDATE_RESOURCES + # add automatic retry + uses: nick-invision/retry@v2 + with: + timeout_minutes: 15 + max_attempts: 3 + retry_on: error + command: npm run update-resources + on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build macOS id: build From a6ae120802b95c731d3945a619e2b2997a61c83e Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Mon, 11 Oct 2021 16:47:46 -0400 Subject: [PATCH 30/45] fix before update resources retry, restore manifest --- .github/workflows/main.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2131131432..cf6b4c3857 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -323,19 +323,19 @@ jobs: if: env.UPDATE_RESOURCES run: curl https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - - name: Before Update resources - run: cp tcResources/source-content-updater-manifest.json source-content-updater-manifest.json.orig + - name: Before Update resources + run: cp tcResources/source-content-updater-manifest.json source-content-updater-manifest.json.orig - - name: Update resources - if: env.UPDATE_RESOURCES - # add automatic retry - uses: nick-invision/retry@v2 - with: - timeout_minutes: 15 - max_attempts: 3 - retry_on: error - command: npm run update-resources - on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json + - name: Update resources + if: env.UPDATE_RESOURCES + # add automatic retry + uses: nick-invision/retry@v2 + with: + timeout_minutes: 15 + max_attempts: 3 + retry_on: error + command: npm run update-resources + on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build macOS id: build From 2e6c389a623135594544fb1575ce9968d1ba0d93 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Tue, 12 Oct 2021 09:29:01 -0400 Subject: [PATCH 31/45] fix before update resources retry, restore manifest --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39bead283f..00d0e2800f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.4", + "tc-ui-toolkit": "5.3.4-alpha.5", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "5.3.4-alpha.4", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.4.tgz", - "integrity": "sha512-h7CqHQctlYCqYR7mvItN6eji3YyJVBhU7Npb74J2PaWssXU5mPafcUTQ47my2xbqN6fuVfPhMGtyDGsdgb5Lpg==", + "version": "5.3.4-alpha.5", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.5.tgz", + "integrity": "sha512-npNZppuwAznhkkD8LwgdQf8x5mOrGG1UJ0zDxNqjsWxxf/XXEe4n6+3gSrxN8MPFYPMgKtMPcrygXsgf8T68rg==", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -45248,9 +45248,9 @@ } }, "tc-ui-toolkit": { - "version": "5.3.4-alpha.4", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.4.tgz", - "integrity": "sha512-h7CqHQctlYCqYR7mvItN6eji3YyJVBhU7Npb74J2PaWssXU5mPafcUTQ47my2xbqN6fuVfPhMGtyDGsdgb5Lpg==", + "version": "5.3.4-alpha.5", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.5.tgz", + "integrity": "sha512-npNZppuwAznhkkD8LwgdQf8x5mOrGG1UJ0zDxNqjsWxxf/XXEe4n6+3gSrxN8MPFYPMgKtMPcrygXsgf8T68rg==", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index aa51dbe975..5d5e8f40cd 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.4", + "tc-ui-toolkit": "5.3.4-alpha.5", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", From 85e40fb02168b2d238fa3c6a0908f88345f6a9a0 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Tue, 12 Oct 2021 09:49:35 -0400 Subject: [PATCH 32/45] build comments --- .github/workflows/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf6b4c3857..7e8bde2d43 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,7 +131,7 @@ jobs: # TODO: remove this fix for expired certs on uw website - hack for curl crash on invalid certs, added --insecure param curl --insecure https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - - name: Before Update resources + - name: Before Update resources - save original manifest run: cp tcResources/source-content-updater-manifest.json source-content-updater-manifest.json.orig - name: Update resources @@ -143,6 +143,7 @@ jobs: max_attempts: 3 retry_on: error command: npm run update-resources + # restore manifest before retry on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build linux @@ -211,7 +212,7 @@ jobs: if: env.UPDATE_RESOURCES run: curl https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - - name: Before Update resources + - name: Before Update resources - save original manifest shell: bash run: cp tcResources/source-content-updater-manifest.json source-content-updater-manifest.json.orig @@ -225,6 +226,7 @@ jobs: retry_on: error shell: bash command: npm run update-resources + # restore manifest before retry on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build windows @@ -323,7 +325,7 @@ jobs: if: env.UPDATE_RESOURCES run: curl https://td.unfoldingword.org/exports/langnames.json > src/assets/langnames.json - - name: Before Update resources + - name: Before Update resources - save original manifest run: cp tcResources/source-content-updater-manifest.json source-content-updater-manifest.json.orig - name: Update resources @@ -335,6 +337,7 @@ jobs: max_attempts: 3 retry_on: error command: npm run update-resources + # restore manifest before retry on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build macOS From b28719488dafbe133121631f84d8a5a2c4211ec2 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Tue, 12 Oct 2021 09:50:46 -0400 Subject: [PATCH 33/45] build comments --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e8bde2d43..d933b956db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,7 @@ jobs: max_attempts: 3 retry_on: error command: npm run update-resources - # restore manifest before retry + # restore original manifest before retry on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build linux @@ -226,7 +226,7 @@ jobs: retry_on: error shell: bash command: npm run update-resources - # restore manifest before retry + # restore original manifest before retry on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build windows @@ -337,7 +337,7 @@ jobs: max_attempts: 3 retry_on: error command: npm run update-resources - # restore manifest before retry + # restore original manifest before retry on_retry_command: cp source-content-updater-manifest.json.orig tcResources/source-content-updater-manifest.json - name: build macOS From a24960dfab7162aa5d1bb15475b5f852e1e56352 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Tue, 12 Oct 2021 13:16:29 -0400 Subject: [PATCH 34/45] updated checking-tool-wrapper --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00d0e2800f..a952c8904c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "6.0.2-alpha.2", + "checking-tool-wrapper": "6.0.2-alpha.3", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "6.0.2-alpha.2", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.2.tgz", - "integrity": "sha512-hBzEOklEoRTtdJ4DFXCi3qDSv/t45Qr/wzOw4fg2pOvk7+8dmCfJJ7NSIr3y3kh17EIN/YJW0235YJDbu2nIJA==", + "version": "6.0.2-alpha.3", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.3.tgz", + "integrity": "sha512-ZhKpIm64jLqJXOude2kger0EVt2NDcC2X3AOY+zb9SKk6WceOGwC+rg6tJgiQwxmvQP4piSzTYf3yp7c6aACCQ==", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -31253,9 +31253,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "6.0.2-alpha.2", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.2.tgz", - "integrity": "sha512-hBzEOklEoRTtdJ4DFXCi3qDSv/t45Qr/wzOw4fg2pOvk7+8dmCfJJ7NSIr3y3kh17EIN/YJW0235YJDbu2nIJA==", + "version": "6.0.2-alpha.3", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.3.tgz", + "integrity": "sha512-ZhKpIm64jLqJXOude2kger0EVt2NDcC2X3AOY+zb9SKk6WceOGwC+rg6tJgiQwxmvQP4piSzTYf3yp7c6aACCQ==", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", diff --git a/package.json b/package.json index 5d5e8f40cd..3974a67670 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "6.0.2-alpha.2", + "checking-tool-wrapper": "6.0.2-alpha.3", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", From c839fbbc043b74dafc09210a2b5344a86442a426 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Tue, 12 Oct 2021 13:28:49 -0400 Subject: [PATCH 35/45] updated checking-tool-wrapper --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3974a67670..d85742642d 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "6.0.2-alpha.3", + "checking-tool-wrapper": "6.0.2-alpha.4", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", From 1eb40b05a1b3a8a46bc30940f756de32f7a40b0b Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Tue, 12 Oct 2021 13:49:23 -0400 Subject: [PATCH 36/45] updated checking-tool-wrapper --- package-lock.json | 28 ++++++++++++++-------------- package.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index a952c8904c..2ae8cf61e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "6.0.2-alpha.3", + "checking-tool-wrapper": "6.0.2-alpha.4", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.5", + "tc-ui-toolkit": "5.3.4-alpha.6", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "6.0.2-alpha.3", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.3.tgz", - "integrity": "sha512-ZhKpIm64jLqJXOude2kger0EVt2NDcC2X3AOY+zb9SKk6WceOGwC+rg6tJgiQwxmvQP4piSzTYf3yp7c6aACCQ==", + "version": "6.0.2-alpha.4", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.4.tgz", + "integrity": "sha512-/Vtx4PRpRm/sEHGSK7Xr4b3HQ9h9d5jcXdnP7O8yJSVFJX2FbKMFwrs/sohvRYXo7yr4fT1Zo04/vhSCeJbvzA==", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "5.3.4-alpha.5", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.5.tgz", - "integrity": "sha512-npNZppuwAznhkkD8LwgdQf8x5mOrGG1UJ0zDxNqjsWxxf/XXEe4n6+3gSrxN8MPFYPMgKtMPcrygXsgf8T68rg==", + "version": "5.3.4-alpha.6", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.6.tgz", + "integrity": "sha512-C4cMwsU1IpfstTWzc++pO8QlHGwaBY9wGFPa6vIIT+02nut9X6yxfRUouEdLeyThUU25E1eaHUVieU8CBbMtjQ==", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -31253,9 +31253,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "6.0.2-alpha.3", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.3.tgz", - "integrity": "sha512-ZhKpIm64jLqJXOude2kger0EVt2NDcC2X3AOY+zb9SKk6WceOGwC+rg6tJgiQwxmvQP4piSzTYf3yp7c6aACCQ==", + "version": "6.0.2-alpha.4", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.4.tgz", + "integrity": "sha512-/Vtx4PRpRm/sEHGSK7Xr4b3HQ9h9d5jcXdnP7O8yJSVFJX2FbKMFwrs/sohvRYXo7yr4fT1Zo04/vhSCeJbvzA==", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -45248,9 +45248,9 @@ } }, "tc-ui-toolkit": { - "version": "5.3.4-alpha.5", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.5.tgz", - "integrity": "sha512-npNZppuwAznhkkD8LwgdQf8x5mOrGG1UJ0zDxNqjsWxxf/XXEe4n6+3gSrxN8MPFYPMgKtMPcrygXsgf8T68rg==", + "version": "5.3.4-alpha.6", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.6.tgz", + "integrity": "sha512-C4cMwsU1IpfstTWzc++pO8QlHGwaBY9wGFPa6vIIT+02nut9X6yxfRUouEdLeyThUU25E1eaHUVieU8CBbMtjQ==", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index d85742642d..1a719c82a4 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.5", + "tc-ui-toolkit": "5.3.4-alpha.6", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", From 4d257db9e650a73e9ee2cde0b80c70fbd7dba96e Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Tue, 12 Oct 2021 18:08:19 -0400 Subject: [PATCH 37/45] update WordAlignment test --- package.json | 1 + src/tC_apps/wordAlignment | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1a719c82a4..f792f61a5a 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "locale-key-comparison": "node ./scripts/locale_key_comparison.js", "npm-clean-up": "rm -rf node_modules/ && rm -rf src/tC_apps/*/node_modules && rm package-lock.json && npm i", "release-content-update": "node scripts/releaseContentUpdate", + "clean-up-apps": "rm -rf src/tC_apps/*/node_modules", "load-apps": "git submodule update --init --recursive", "overwrite-resources": "rm -rf tcResources/en/bibles tcResources/en/translationHelps tcResources/el-x-koine tcResources/hi && npm run update-resources", "update-apps": "git submodule foreach --recursive git checkout develop && git submodule foreach --recursive git pull", diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment index bf083db3fe..a1459e6772 160000 --- a/src/tC_apps/wordAlignment +++ b/src/tC_apps/wordAlignment @@ -1 +1 @@ -Subproject commit bf083db3fe9931cfe2523dc19c6094cc131206ed +Subproject commit a1459e6772c5ae6ce00ce8c1bcc22268c6faf0f1 From 7b5d88ca93f31e1be33f8fe2138d927d3c13b5b5 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Wed, 13 Oct 2021 09:09:23 -0400 Subject: [PATCH 38/45] update WordAlignment --- src/tC_apps/wordAlignment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment index a1459e6772..46b25361b2 160000 --- a/src/tC_apps/wordAlignment +++ b/src/tC_apps/wordAlignment @@ -1 +1 @@ -Subproject commit a1459e6772c5ae6ce00ce8c1bcc22268c6faf0f1 +Subproject commit 46b25361b27a16bd96253e892acf6cab292bc436 From 729a4982aa768e12b579afcaa4e8a630b5b1fbbe Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Wed, 13 Oct 2021 17:00:02 -0400 Subject: [PATCH 39/45] update dependencies --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ae8cf61e2..a6bbe03960 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "6.0.2-alpha.4", + "checking-tool-wrapper": "7.0.0-alpha.2", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.6", + "tc-ui-toolkit": "6.0.0-alpha", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "6.0.2-alpha.4", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.4.tgz", - "integrity": "sha512-/Vtx4PRpRm/sEHGSK7Xr4b3HQ9h9d5jcXdnP7O8yJSVFJX2FbKMFwrs/sohvRYXo7yr4fT1Zo04/vhSCeJbvzA==", + "version": "7.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.2.tgz", + "integrity": "sha512-TMsGldTv3BUwG1rxn6PYiyN1U/6FKfWv1HAuyL9/e+eHo52n5+mAgdoVX6JH46sEGFQLy2VioHF2bBofDIqvfQ==", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "5.3.4-alpha.6", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.6.tgz", - "integrity": "sha512-C4cMwsU1IpfstTWzc++pO8QlHGwaBY9wGFPa6vIIT+02nut9X6yxfRUouEdLeyThUU25E1eaHUVieU8CBbMtjQ==", + "version": "6.0.0-alpha", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-6.0.0-alpha.tgz", + "integrity": "sha512-4l1i5GWY47iEQG0czQ9f+wmFbhFyRN8JNWdceOGMlNl6bo+Gy2ioPwngaArqkvHuBYfXQoRsqV1QqKEs/dYVsA==", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -31253,9 +31253,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "6.0.2-alpha.4", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-6.0.2-alpha.4.tgz", - "integrity": "sha512-/Vtx4PRpRm/sEHGSK7Xr4b3HQ9h9d5jcXdnP7O8yJSVFJX2FbKMFwrs/sohvRYXo7yr4fT1Zo04/vhSCeJbvzA==", + "version": "7.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.2.tgz", + "integrity": "sha512-TMsGldTv3BUwG1rxn6PYiyN1U/6FKfWv1HAuyL9/e+eHo52n5+mAgdoVX6JH46sEGFQLy2VioHF2bBofDIqvfQ==", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -45248,9 +45248,9 @@ } }, "tc-ui-toolkit": { - "version": "5.3.4-alpha.6", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-5.3.4-alpha.6.tgz", - "integrity": "sha512-C4cMwsU1IpfstTWzc++pO8QlHGwaBY9wGFPa6vIIT+02nut9X6yxfRUouEdLeyThUU25E1eaHUVieU8CBbMtjQ==", + "version": "6.0.0-alpha", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-6.0.0-alpha.tgz", + "integrity": "sha512-4l1i5GWY47iEQG0czQ9f+wmFbhFyRN8JNWdceOGMlNl6bo+Gy2ioPwngaArqkvHuBYfXQoRsqV1QqKEs/dYVsA==", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index f792f61a5a..f46156da5b 100644 --- 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": "6.0.2-alpha.4", + "checking-tool-wrapper": "7.0.0-alpha.2", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -179,7 +179,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "5.3.4-alpha.6", + "tc-ui-toolkit": "6.0.0-alpha", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", From b127083874b7179279f17e5e5bf976c151adb79c Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Thu, 14 Oct 2021 09:32:05 -0400 Subject: [PATCH 40/45] updated checking-tool-wrapper --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index a6bbe03960..b7b2e30f61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "7.0.0-alpha.2", + "checking-tool-wrapper": "v7.0.0-alpha.3", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "7.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.2.tgz", - "integrity": "sha512-TMsGldTv3BUwG1rxn6PYiyN1U/6FKfWv1HAuyL9/e+eHo52n5+mAgdoVX6JH46sEGFQLy2VioHF2bBofDIqvfQ==", + "version": "7.0.0-alpha.3", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.3.tgz", + "integrity": "sha512-LY6zXrq67l11vpJnGNQ+TBqy3ycMxWh2s6xgP+pAYK1g1uCHfaSqMaovyCKu1QGMJ5VbdLn5XXumDEVh5exihg==", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -31253,9 +31253,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "7.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.2.tgz", - "integrity": "sha512-TMsGldTv3BUwG1rxn6PYiyN1U/6FKfWv1HAuyL9/e+eHo52n5+mAgdoVX6JH46sEGFQLy2VioHF2bBofDIqvfQ==", + "version": "7.0.0-alpha.3", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.3.tgz", + "integrity": "sha512-LY6zXrq67l11vpJnGNQ+TBqy3ycMxWh2s6xgP+pAYK1g1uCHfaSqMaovyCKu1QGMJ5VbdLn5XXumDEVh5exihg==", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", diff --git a/package.json b/package.json index f46156da5b..cae0ff66c7 100644 --- 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.0-alpha.2", + "checking-tool-wrapper": "v7.0.0-alpha.3", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", From 694eb47fc9eb9a7f89ebfd6045744adad9d173e3 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Thu, 14 Oct 2021 09:52:36 -0400 Subject: [PATCH 41/45] update WordAlignment --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b7b2e30f61..2231e70026 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "v7.0.0-alpha.3", + "checking-tool-wrapper": "v7.0.0-alpha.4", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "7.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.3.tgz", - "integrity": "sha512-LY6zXrq67l11vpJnGNQ+TBqy3ycMxWh2s6xgP+pAYK1g1uCHfaSqMaovyCKu1QGMJ5VbdLn5XXumDEVh5exihg==", + "version": "7.0.0-alpha.4", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.4.tgz", + "integrity": "sha512-r/hj91wCKtoV+ElJzSgOtaX9e3O5pyF6fM4toE0F6MDj7Ipr1z5HmbRsPDrAn2GT61wHrYUnPT/tBWKgwmrzYA==", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -31253,9 +31253,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "7.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.3.tgz", - "integrity": "sha512-LY6zXrq67l11vpJnGNQ+TBqy3ycMxWh2s6xgP+pAYK1g1uCHfaSqMaovyCKu1QGMJ5VbdLn5XXumDEVh5exihg==", + "version": "7.0.0-alpha.4", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.4.tgz", + "integrity": "sha512-r/hj91wCKtoV+ElJzSgOtaX9e3O5pyF6fM4toE0F6MDj7Ipr1z5HmbRsPDrAn2GT61wHrYUnPT/tBWKgwmrzYA==", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", diff --git a/package.json b/package.json index cae0ff66c7..8a8ff78bc6 100644 --- 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": "v7.0.0-alpha.3", + "checking-tool-wrapper": "v7.0.0-alpha.4", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", From 235cec9a75102459b1d9172c5271de9f82a4b904 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Thu, 14 Oct 2021 11:27:50 -0400 Subject: [PATCH 42/45] update WordAlignment --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2231e70026..470751941c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "6.0.0-alpha", + "tc-ui-toolkit": "6.0.0", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", @@ -23119,9 +23119,9 @@ } }, "node_modules/tc-ui-toolkit": { - "version": "6.0.0-alpha", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-6.0.0-alpha.tgz", - "integrity": "sha512-4l1i5GWY47iEQG0czQ9f+wmFbhFyRN8JNWdceOGMlNl6bo+Gy2ioPwngaArqkvHuBYfXQoRsqV1QqKEs/dYVsA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-6.0.0.tgz", + "integrity": "sha512-5bOHzig1wM+wJvYo3asAbjdF2kYIVhROshkHHgVCd9LV118rMqyVdO4QcnkFXMCmfx4JOeXZPODYXZ+he9h8KA==", "dependencies": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", @@ -45248,9 +45248,9 @@ } }, "tc-ui-toolkit": { - "version": "6.0.0-alpha", - "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-6.0.0-alpha.tgz", - "integrity": "sha512-4l1i5GWY47iEQG0czQ9f+wmFbhFyRN8JNWdceOGMlNl6bo+Gy2ioPwngaArqkvHuBYfXQoRsqV1QqKEs/dYVsA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tc-ui-toolkit/-/tc-ui-toolkit-6.0.0.tgz", + "integrity": "sha512-5bOHzig1wM+wJvYo3asAbjdF2kYIVhROshkHHgVCd9LV118rMqyVdO4QcnkFXMCmfx4JOeXZPODYXZ+he9h8KA==", "requires": { "@material-ui/core": "^4.10.2", "@material-ui/icons": "^3.0.2", diff --git a/package.json b/package.json index 8a8ff78bc6..f2efc001e2 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "tc-source-content-updater": "^0.9.0", "tc-strings": "0.1.7", "tc-tool": "4.1.0", - "tc-ui-toolkit": "6.0.0-alpha", + "tc-ui-toolkit": "6.0.0", "truncate-utf8-bytes": "1.0.2", "tsv-groupdata-parser": "^0.10.0", "usfm-js": "2.1.0", From 2b031949ec69da2053940940d1084c700029e756 Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Thu, 14 Oct 2021 11:52:02 -0400 Subject: [PATCH 43/45] update WordAlignment --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 470751941c..718532215a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "v7.0.0-alpha.4", + "checking-tool-wrapper": "7.0.0-alpha.5", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "7.0.0-alpha.4", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.4.tgz", - "integrity": "sha512-r/hj91wCKtoV+ElJzSgOtaX9e3O5pyF6fM4toE0F6MDj7Ipr1z5HmbRsPDrAn2GT61wHrYUnPT/tBWKgwmrzYA==", + "version": "7.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.5.tgz", + "integrity": "sha512-AICsRh4Y3cz1er38vau6g4KK5V4W3VCb4B6xTNeHJgvGgOoaTlfoeqmVhLBOPiPJmiu5PcrBJSUGYBAueK0yUg==", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -31253,9 +31253,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "7.0.0-alpha.4", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.4.tgz", - "integrity": "sha512-r/hj91wCKtoV+ElJzSgOtaX9e3O5pyF6fM4toE0F6MDj7Ipr1z5HmbRsPDrAn2GT61wHrYUnPT/tBWKgwmrzYA==", + "version": "7.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.5.tgz", + "integrity": "sha512-AICsRh4Y3cz1er38vau6g4KK5V4W3VCb4B6xTNeHJgvGgOoaTlfoeqmVhLBOPiPJmiu5PcrBJSUGYBAueK0yUg==", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", diff --git a/package.json b/package.json index f2efc001e2..4905fac93d 100644 --- 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": "v7.0.0-alpha.4", + "checking-tool-wrapper": "7.0.0-alpha.5", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", From 03b591849a90e39d269ac724cb98b7815ffc8fdb Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Thu, 14 Oct 2021 18:11:49 -0400 Subject: [PATCH 44/45] update WordAlignment --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 718532215a..31b40c6dbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "archiver": "3.0.0", "axios": "0.19.1", "babel-polyfill": "6.26.0", - "checking-tool-wrapper": "7.0.0-alpha.5", + "checking-tool-wrapper": "7.0.0", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", @@ -5763,9 +5763,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/checking-tool-wrapper": { - "version": "7.0.0-alpha.5", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.5.tgz", - "integrity": "sha512-AICsRh4Y3cz1er38vau6g4KK5V4W3VCb4B6xTNeHJgvGgOoaTlfoeqmVhLBOPiPJmiu5PcrBJSUGYBAueK0yUg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0.tgz", + "integrity": "sha512-A//Il1ULScWm7Kp0rVcbbULKnXLe9EZz6bhhYZ7BtMjhurWpf0IQPUzo3iYL9xgEKUZ7OpNgN3AVbeBKv5kg0w==", "dependencies": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", @@ -31253,9 +31253,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "checking-tool-wrapper": { - "version": "7.0.0-alpha.5", - "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0-alpha.5.tgz", - "integrity": "sha512-AICsRh4Y3cz1er38vau6g4KK5V4W3VCb4B6xTNeHJgvGgOoaTlfoeqmVhLBOPiPJmiu5PcrBJSUGYBAueK0yUg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/checking-tool-wrapper/-/checking-tool-wrapper-7.0.0.tgz", + "integrity": "sha512-A//Il1ULScWm7Kp0rVcbbULKnXLe9EZz6bhhYZ7BtMjhurWpf0IQPUzo3iYL9xgEKUZ7OpNgN3AVbeBKv5kg0w==", "requires": { "@material-ui/icons": "3.0.2", "crypto-js": "3.1.9-1", diff --git a/package.json b/package.json index 4905fac93d..43dd36c6e3 100644 --- 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.0-alpha.5", + "checking-tool-wrapper": "7.0.0", "crypto-js": "3.1.8", "csv": "1.2.1", "deep-equal": "1.0.1", From 34865af33fbd5b1edb7eff329f53da2d8350e78b Mon Sep 17 00:00:00 2001 From: Bruce McLean Date: Fri, 15 Oct 2021 15:40:15 -0400 Subject: [PATCH 45/45] csv export fix --- src/js/helpers/csvHelpers.js | 3 ++- src/tC_apps/wordAlignment | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/js/helpers/csvHelpers.js b/src/js/helpers/csvHelpers.js index 3c399ec4c7..c6ef2eca6b 100644 --- a/src/js/helpers/csvHelpers.js +++ b/src/js/helpers/csvHelpers.js @@ -110,6 +110,7 @@ export const flattenContextId = (contextId, gatewayLanguageCode, gatewayLanguage gatewayLanguageQuote = gatewayLanguageQuote || getGLQuoteFromAlignedBible(contextId, gatewayLanguageCode) || 'N/A'; // if no occurrenceNote in contextId, 'N/A' const occurrenceNote = contextId.occurrenceNote || 'N/A'; + const verse_ = contextId.verseSpan || contextId.reference.verse; // use verse span if given return { tool: contextId.tool, type: groupCategoryTranslated(contextId, gatewayLanguageCode, translate), @@ -123,7 +124,7 @@ export const flattenContextId = (contextId, gatewayLanguageCode, gatewayLanguage checkId: contextId.checkId || '', bookId: contextId.reference.bookId, chapter: contextId.reference.chapter, - verse: contextId.reference.verse, + verse: verse_, }; }; diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment index 46b25361b2..8a8000990b 160000 --- a/src/tC_apps/wordAlignment +++ b/src/tC_apps/wordAlignment @@ -1 +1 @@ -Subproject commit 46b25361b27a16bd96253e892acf6cab292bc436 +Subproject commit 8a8000990bad9a64220160d1cd76265d31a39fa5