Merge branch 'release/2021.2.0'

Author: PenghaiZhang

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
     steps:
       # Using v1 (rather than v2) through-out this workflow due to issue:
       # https://github.com/actions/checkout/issues/237
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: NPM Cache
         uses: actions/cache@v2
@@ -66,7 +66,7 @@ jobs:
           java-version: 8
 
       - name: Install node dependencies (core)
-        working-directory: Source/Plugins/Core/com.equella.core/js
+        working-directory: react-front-end
         run: |
           npm ci
 
@@ -84,12 +84,25 @@ jobs:
           npm run check
           ./sbt headerCheck checkJavaCodeStyle
 
+      # oeq-ts-rest-api has its own ESLint checks seeing the ultimate plan
+      # is that it's moved to its own stand-alone repo. But so here we need
+      # to explicitly run them.
+      - name: Run checks (oeq-ts-rest-api)
+        working-directory: oeq-ts-rest-api
+        run: |
+          npm run lint
+
       - name: Run unit tests (java/scala)
         run: |
           ./sbt test
 
       - name: Run unit tests (javascript)
-        working-directory: Source/Plugins/Core/com.equella.core/js
+        working-directory: react-front-end
+        run: |
+          npm cit
+
+      - name: Run unit tests (javascript - legacy)
+        working-directory: Source/Plugins/Core/com.equella.core/test/javascript
         run: |
           npm cit
 
@@ -106,7 +119,7 @@ jobs:
             target/*.zip
 
       - name: Save primary artefacts
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: Artefacts
           path: artefacts.tar
@@ -116,7 +129,7 @@ jobs:
     steps:
       # Using v1 (rather than v2) through-out this workflow due to issue:
       # https://github.com/actions/checkout/issues/237
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: NPM Cache
         uses: actions/cache@v2
@@ -136,30 +149,30 @@ jobs:
           node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
       - name: Install node dependencies (core)
-        working-directory: Source/Plugins/Core/com.equella.core/js
+        working-directory: react-front-end
         run: |
           npm ci
 
       - name: Generate Static Storybook instance
-        working-directory: Source/Plugins/Core/com.equella.core/js
+        working-directory: react-front-end
         run: |
           npm run build-storybook
 
       - name: Package Static Storybook instance
-        working-directory: Source/Plugins/Core/com.equella.core/js
+        working-directory: react-front-end
         run: |
           tar cvf storybook.tar storybook-static
 
       - name: Save Static Storybook instance
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: Storybook
-          path: Source/Plugins/Core/com.equella.core/js/storybook.tar
+          path: react-front-end/storybook.tar
 
   build_import_export_tool:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v2
@@ -173,15 +186,15 @@ jobs:
           ./gradlew build
 
       - name: Save primary artefacts
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: ImportExportTools
           path: import-export-tool/build/libs/
 
   functional_testing:
     needs: build_and_check
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     strategy:
       matrix:
@@ -231,11 +244,21 @@ jobs:
           distribution: adopt
           java-version: 8
 
-      - uses: actions/checkout@v1
+      - name: Read .nvmrc
+        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
+        id: nvm
+
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
-      - name: Download installer
-        uses: actions/download-artifact@v1
+      - uses: actions/checkout@v2
+
+      - name: Download Artefacts
+        uses: actions/download-artifact@v2
         with:
+          path: Artefacts
           name: Artefacts
 
       - name: Extract installer from build
@@ -261,7 +284,7 @@ jobs:
 
       - name: Save Scalacheck results
         if: matrix.newui && failure()
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: ScalacheckReports
           path: autotest/Tests/target/test-reports
@@ -273,21 +296,21 @@ jobs:
 
       - name: Save TestNG Reports
         if: failure()
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: TestNGReports-new-${{ matrix.newui }}
           path: autotest/OldTests/target/testng
 
       - name: Save oEQ Logs
         if: failure()
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: oEQLogs-new-${{ matrix.newui }}
           path: autotest/equella-install/logs
 
       - name: Save Screenshots
         if: failure()
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: Screenshots-new-${{ matrix.newui }}
           path: autotest/Tests/target/test-reports/screenshots
@@ -305,7 +328,7 @@ jobs:
           tar cvf coverage_report.tar autotest/target/coverage-report/
 
       - name: Save Coverage Report
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: CoverageReport-newui-${{ matrix.newui }}
           path: coverage_report.tar
@@ -335,7 +358,7 @@ jobs:
       AUTOTEST_CONFIG: autotest/github-actions.conf
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Install OS dependencies
         run: |
@@ -354,9 +377,19 @@ jobs:
           distribution: adopt
           java-version: 8
 
+      - name: Read .nvmrc
+        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
+        id: nvm
+
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: "${{ steps.nvm.outputs.NVMRC }}"
+
       - name: Download installer
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2
         with:
+          path: Artefacts
           name: Artefacts
 
       - name: Extract installer from build
@@ -373,15 +406,6 @@ jobs:
           ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
             installEquella startEquella configureInstall setupForTests
 
-      - name: Read .nvmrc
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-        id: nvm
-
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: "${{ steps.nvm.outputs.NVMRC }}"
-
       - name: Run tests
         working-directory: oeq-ts-rest-api
         run: |
@@ -395,7 +419,7 @@ jobs:
 
       - name: Save oEQ logs for REST Module
         if: failure()
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: oEQ-logs-rest-module
           path: autotest/equella-install/logs

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

.idea/misc.xml

@@ -1 +1 @@
-14.16.1
+16.13.1

.nvmrc

@@ -1,2 +1 @@
--mem 4096
-
+-J-Xmx4G