Merge dev into master (#7545)

* update change log

* add jsdoc generation to github actions

* fix jsdocs generation

* fix jsdocs generation. fix some jsdocs

* fix jsdocs generation. fix some jsdocs.

* fix jsdocs folder name

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* adding git commit of jsdocs

* working on adding jsDocs to github pages

* README.md cleanup

* README.md cleanup

* remove the git version update code which does not succeed.

* fix github actions

* cleanup github actions

* fix git commit of jsdocs

* fix git commit of jsdocs

* updated container

* tweak logging

* back out fix the npm cache

* fix for committing jsdocs

* fix for build errors

* fix for build errors

* fix for build errors

* create output folder with permissions

* create output folder with permissions

* fix for test errors

* fix for test errors

* fix for test errors

* fix for test errors

* fix access errors for js docs

* fix access errors for js docs

* fix chapter justification for ltr languages.

* update to 3.5.1

* fix jsdocs generation - need permission to write to docs folder

* fix jsdocs generation - need permission to write to docs folder

* fix jsdocs generation - need permission to write to docs folder

* comments

* removed push of jsdocs changes back into branch

* fix access errors for js docs

* update change log

* update change log

* fix access errors for js docs

* updated docker container

* exclude test folder.

* fix for test failure

* fix for test failure

* fix for test failure

* fix for test failure

* fix for test failure

* Feature / update electronite to v25.3.2 (#7530)

* trying updated electronite

* testing

* trying updated electronite

* update to use electronite 25.3.2

* update to use electronite 23.3.10

---------

Co-authored-by: blm <bruce.mclean@unfoldingWord.org>

* feature / updated tc-source-content-updater to use the latest catalog URLs (#7531)

* updated tc-source-content-updater to use the latest catalog URLs

* bump version

---------

Co-authored-by: blm <bruce.mclean@unfoldingWord.org>

* Feature / fix URL for catalog (#7532)

* updated tc-source-content-updater to use the latest catalog URLs

* bump version

* bump version

* updated tc-source-content-updater to use the latest catalog URLs

* Revert "bump version"

This reverts commit 80fbb45.

* bump version

* bump version

* updated tc-source-content-updater to use the latest catalog URLs

* updated tc-source-content-updater to use the latest catalog URLs

* updated tc-source-content-updater to use the latest catalog URLs

* updated resources

---------

Co-authored-by: blm <bruce.mclean@unfoldingWord.org>

* Bugfix 7533/broken preview paragraph (#7534)

* fix charis definition

* fix print preview for case missing paragraph marker before

---------

Co-authored-by: PhotoNomad0 <bruce.mclean@unfoldingword.org>

* Feature 7536 / front matter alignment support (#7538)

* fixes for front matter alignment

* update resources

* fix to migrate original language bible on upgrade of version.
fix to export front matter alignments

* fix migration unit tests to match replacement of original language bibles parsed with older tC versions.

* fix migration to remove derived original language translationWords.

* Clean up highlight colors in log file.

* Clean up

* bump version

* updated dependencies

---------

Co-authored-by: PhotoNomad0 <bruce.mclean@unfoldingword.org>

* Feature 5885 / alignment enhancements (#7542)

* updated word alignment tool

* updated locales

* updated translation helps tools

* updated tools

* updated tools

* updated tools

---------

Co-authored-by: PhotoNomad0 <bruce.mclean@unfoldingword.org>

* updated CHANGELOG.md (#7544)

Co-authored-by: PhotoNomad0 <bruce.mclean@unfoldingword.org>

---------

Co-authored-by: blm <bruce.mclean@unfoldingWord.org>

.github/workflows/docker/Dockerfile

@@ -1,9 +1,10 @@
-# Build comands
-# docker build -t <user>/<image> .
-# docker tag <user>/<image> <dockerhub-user>/<image>:<version>
-# docker push <user>/<image>:<version>
+# Build commands
+# sudo docker login -u <dockerhub-user>
+# sudo docker build -t github_build .
+# sudo docker tag github_build <dockerhub-user>/github_build:latest
+# sudo docker push <dockerhub-user>/github_build:latest
 
-FROM node:10.18.0
+FROM node:16.4.2
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -12,6 +13,9 @@ RUN dpkg --add-architecture i386 && \
     apt-get update && \
     apt-get install -yq locales git zip unzip genisoimage wine wine32 wine64 libwine libwine:i386 innoextract software-properties-common
 
+# install npm
+RUN npm install -g npm@7.18.1
+
 # install inno setup
 RUN mkdir /tmp/inno && \
     cd /tmp/inno && \

.github/workflows/main.yml

@@ -23,23 +23,35 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
-    container: neutrinog/concourse-tasks:latest
+    container: photonomad/github_build:latest
+    # the Dockerfile used to create this image is here: ./.github/workflows/docker/Dockerfile
     env:
       CI: true
 
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository.
+      contents: write
+
     steps:
 #     - name: Dump GitHub context
 #       env:
 #         GITHUB_CONTEXT: ${{ toJson(github) }}
 #       run: echo "$GITHUB_CONTEXT"
+
     - uses: actions/setup-node@v1
       with:
         node-version: '16.14.2'
-    - name: Node version
+
+    - name: Get versions
       run: |
+        echo "node --version"
         node --version
+        echo "npm --version"
         npm --version
+        echo "git --version"
         git --version
+        echo "pwd"
+        pwd
 
 #    - uses: actions/checkout@v2
 #    - name: Checkout submodules
@@ -50,26 +62,63 @@ jobs:
 #        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 
     - name: Checkout codebase
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
       with:
         submodules: recursive
+        persist-credentials: true
 
     - name: npm install
+      run: npm ci
+
+    - name: List permissions
       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"
+        set -x
+        # create output folder with permission for tests to use for temp results
+        echo "mkdir ./src/__tests__/output"
+        mkdir ./src/__tests__/output
+        echo "chmod -R a+rwx ./src/__tests__/output"
+        chmod -R a+rwx ./src/__tests__/output
+        echo "remove git owner error"
+        git config --global --add safe.directory /__w/translationCore/translationCore
 
     - name: npm test
       run: npm run ci-test
 
-    - name: upload coverage
+    - name: Upload coverage
       run: ./node_modules/.bin/codecov -t ${{ secrets.CODECOV_TOKEN }}
 
-    - name: npm lint
+    - name: Run lint
       run: npm run lint
 
+    - name: Parsing jsdocs
+      run: |
+        set -x
+        # remove jsdocs folder so it can be recreated
+        echo "rm -rf ./docs/translationCore"
+        rm -rf ./docs/translationCore
+        # give permission for jsdocs to be recreated in docs folder
+        echo "chmod -R a+rwx ./docs"
+        chmod -R a+rwx ./docs
+        ls -als ./docs
+        # update jsdocs
+        npm run doc
+        echo "ls -als ./docs/translationCore"
+        ls -als ./docs/translationCore
+
+#    - name: Update jsdocs in branch
+#      uses: stefanzweifel/git-auto-commit-action@v4
+#      with:
+#        file_pattern: 'docs/*'
+#        commit_message: Apply jsdocs update
+#        skip_fetch: true
+#        skip_checkout: true
+
+    - uses: actions/upload-artifact@v1
+      name: Upload jsdocs
+      with:
+        name: jsdocs
+        path: ./docs/
+
   build-linux:
     name: Build Linux
     strategy:
@@ -125,12 +174,7 @@ jobs:
           echo "BUILD=$HASH" >> .env.tmp
 
       - 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"
-          npm run update-env
+        run: npm ci
 
       - name: Download latest language names
         if: env.UPDATE_RESOURCES

.gitignore

@@ -15,13 +15,15 @@ test/output
 /static/
 /vendor
 /release
-/docs/
+# /docs/
 /.env
 /.vs/
 
 # just in case people are lazy while writing tests
 __tests__/output
 output/
+src/__tests__/output
+src/output/
 # Needed for Webstorm
 .idea
 *.iml

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [v3.6.0](https://github.com/unfoldingWord/translationCore/tree/v3.5.0) (2023-11-1)
+
+**Implemented enhancements:**
+
+- In WordAlignment Tool - Add button to Clear/reset all the alignments [\#7543](https://github.com/unfoldingWord/translationCore/issues/7543)
+- In WordAlignment Tool - Add ability to Select multiple words at once in the word bank using shift-click on word [\#5885](https://github.com/unfoldingWord/translationCore/issues/5885)
+- In WordAlignment Tool - Add support for aligning chapter `headers` / `front matter` to tCore [\#7536](https://github.com/unfoldingWord/translationCore/issues/7536)
+
+
+## [v3.5.1](https://github.com/unfoldingWord/translationCore/tree/v3.5.1) (2023-8-14)
+
+**Fixed bugs:**
+
+- For print, fix position of chapter numbers for rtl languages by moving them to the left side [\#7523](https://github.com/unfoldingWord/translationCore/issues/7523)
+
 
 ## [v3.5.0](https://github.com/unfoldingWord/translationCore/tree/v3.5.0) (2023-7-31)
 

README.md

@@ -4,45 +4,50 @@
 
 ![](https://github.com/unfoldingWord/translationCore/workflows/Node%20CI/badge.svg?branch=develop)
 [![Releases](https://img.shields.io/github/downloads/unfoldingword/translationCore/total.svg)](https://github.com/unfoldingWord/translationCore/releases)
-[![Current Verison](https://img.shields.io/github/tag/unfoldingword/translationCore.svg)](https://github.com/unfoldingWord/translationCore/tags)
+[![Current Version](https://img.shields.io/github/tag/unfoldingword/translationCore.svg)](https://github.com/unfoldingWord/translationCore/tags)
 [![codecov](https://codecov.io/gh/unfoldingWord/translationCore/branch/develop/graph/badge.svg)](https://codecov.io/gh/unfoldingWord/translationCore)
 
-Purpose
----
+tools for translators
+
+
+## Purpose
+
 translationCore is an open source platform for checking and managing Bible translation projects. tC provides an extensible interface that enables, among other things, systematic and comprehensive checking of Bible translations against multiple sources and the original languages with just-in-time training modules that provide guidelines and instruction for translators.
 
-Usage
----
-Currently translationCore supports Bible Translation Projects started with [translationStudio](https://unfoldingword.org/ts/) and uploaded to [Door43](https://git.door43.org/), and with limited support for USFM projects created using other tools.
+## Usage
+
+Currently, translationCore supports Bible Translation Projects started with [translationStudio](https://unfoldingword.org/ts/) and uploaded to [Door43](https://git.door43.org/), and with limited support for USFM projects created using other tools.
 
 For more information see page for usage: [Usage](https://github.com/unfoldingWord/translationCore/wiki/Usage)
 
-Contributions
----
+## Contributions
+
 We warmly welcome contributions to both the translationCore repository and building of new checking modules that fit the needs of the Global Church and Church Networks actively translating the Bible.
 
 For more information see page for contributors: [Contributing](https://github.com/unfoldingWord/translationCore/wiki/Contributing)
 
-Localization
----
-This application is been localized into a number of languages.
+## Localization
+
+This application has been localized into a number of languages.
 You can view progress or help translate at [Crowdin](https://crowdin.com/project/translationcore).
 
-Code Documentation
----
+## Documentation
 
-You can read the documented code at [docs.tc.unfoldingword.surge.sh](http://docs.tc.unfoldingword.surge.sh/).
+### JS-Docs generated documentation:
+- last deployed on GitHub pages: [deployed JS-Docs](https://unfoldingword.github.io/translationCore/translationCore/index.html)
+- current local: [local JS-Docs](./docs/translationCore/index.html)
+
+
+## Debugging Main App
 
-Debugging Main App
----
 - first time do: `npm run load-apps`
 - launch app by: `npm i --legacy-peer-deps && npm run start` or in windows run `npm i --legacy-peer-deps; npm run start`
 - after you get to the "Get Started" Page you can launch Chromium debugger by:
-  - on Mac doing Command-Option-I
   - on Windows or Linux do Control-Shift-I
+  - on Mac doing Command-Option-I
+
+## Debugging App Startup Code
 
-Debugging App Startup Code
----
 - first time do: `npm run load-apps`
 - launch app by: `npm i --legacy-peer-deps && npm run start-debug`
 - open chrome to url `chrome://inspect/#devices`

docs/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Landing Page for translationCore Documentation</title>
+</head>
+<body>
+  <a href="./translationCore/index.html">Click Here to see JS-DOCS for translationCore</a>
+</body>
+</html>