Merge pull request #98 from topcoder-platform/dev

TCA-637 2.1 TCA Maintenance Release - 2022-11-08 -> prod

Author: brooketopcoder

.eslintignore

@@ -3,6 +3,6 @@ client/static/**
 client/public/**
 api-server/src/public/**
 api-server/lib/**
-config/i18n/all-langs.js
+config/i18n.js
 config/certification-settings.js
 web/**

.eslintrc.json

@@ -36,6 +36,7 @@
     "import/no-named-as-default": "off",
     "import/no-named-as-default-member": "off",
     "import/order": "error",
+    "import/no-cycle": [2, { "maxDepth": 2 }],
     "react/prop-types": "off",
     "no-only-tests/no-only-tests": "error"
   },

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,10 @@ Checklist:
 
 <!-- Please follow this checklist and put an x in each of the boxes, like this: [x]. It will ensure that our team takes your pull request seriously. -->
 
-- [ ] I have read [freeCodeCamp's contribution guidelines](https://contribute.freecodecamp.org).
-- [ ] My pull request has a descriptive title (not a vague title like `Update index.md`)
-- [ ] My pull request targets the `main` branch of freeCodeCamp.
-- [ ] I have tested these changes either locally on my machine, or GitPod.
+- [] I have read [freeCodeCamp's contribution guidelines](https://contribute.freecodecamp.org).
+- [] My pull request has a descriptive title (not a vague title like `Update index.md`)
+- [] My pull request targets the `main` branch of freeCodeCamp.
+- [] I have tested these changes either locally on my machine, or GitPod.
 
 <!--If your pull request closes a GitHub issue, replace the XXXXX below with the issue number.-->
 

.github/workflows/autoclose.yml

@@ -30,10 +30,10 @@ jobs:
         language: ['javascript']
     steps:
       - name: Checkout repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
       - name: Setup CodeQL
-        uses: github/codeql-action/init@83007bbc17d874e3f1654bfaf9367629f7fdcac7 # tag=v1
+        uses: github/codeql-action/init@2956c096220fb34b6bf430b4ec7dcff2e77c8084 # tag=v1
         with:
           languages: ${{ matrix.language }}
       - name: Perform Analysis
-        uses: github/codeql-action/analyze@83007bbc17d874e3f1654bfaf9367629f7fdcac7 # tag=v1
+        uses: github/codeql-action/analyze@2956c096220fb34b6bf430b4ec7dcff2e77c8084 # tag=v1

.github/workflows/codeql-analysis.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: checkout
         id: checkout
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.ref }}
@@ -30,7 +30,7 @@ jobs:
         uses: Codesee-io/codesee-detect-languages-action@latest
 
       - name: Configure JDK 16
-        uses: actions/setup-java@d854b6da19cdadd9a010605529e522c2393ebd38 # tag=v3
+        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
         if: ${{ fromJSON(steps.detect-languages.outputs.languages).java }}
         with:
           java-version: '16'
@@ -39,13 +39,13 @@ jobs:
       # CodeSee Maps Go support uses a static binary so there's no setup step required.
 
       - name: Configure Node.js 16
-        uses: actions/setup-node@2fddd8803e2f5c9604345a0b591c3020ee971a93 # tag=v3
+        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # tag=v3
         if: ${{ fromJSON(steps.detect-languages.outputs.languages).javascript }}
         with:
           node-version: '16'
 
       - name: Configure Python 3.x
-        uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5 # tag=v4
+        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # tag=v4
         if: ${{ fromJSON(steps.detect-languages.outputs.languages).python }}
         with:
           python-version: '3.x'

.github/workflows/codesee-diagram.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
         with:
           token: ${{ secrets.CROWDIN_CAMPERBOT_PAT }}
 
@@ -238,6 +238,38 @@ jobs:
           # Uncomment below to debug
           # dryrun_action: true
 
+      ##### Download Arabic #####
+      - name: Crowdin Download Arabic Translations
+        uses: crowdin/github-action@master
+        # options: https://github.com/crowdin/github-action/blob/master/action.yml
+        with:
+          # uploads
+          upload_sources: false
+          upload_translations: false
+          auto_approve_imported: false
+          import_eq_suggestions: false
+          # downloads
+          download_translations: true
+          download_language: ar
+          skip_untranslated_files: false
+          export_only_approved: true
+          push_translations: false
+          # pull-request
+          create_pull_request: false
+          # global options
+          config: './crowdin-config.yml'
+          base_url: ${{ secrets.CROWDIN_BASE_URL_FCC }}
+          # Uncomment below to debug
+          # dryrun_action: true
+
+      ###### Format JSON #####
+      # Crowdin gives the files read-only permissions, so we first have to allow
+      # writes.
+      - name: Format JSON
+        run: |
+          sudo chown -R $(whoami): client/i18n/locales
+          npx --yes prettier --write client/i18n/locales/**/*.json
+
       # Create Commit
       - name: Commit Changes
         uses: freecodecamp/crowdin-action@main

.github/workflows/crowdin-download.client-ui.yml

@@ -15,10 +15,14 @@ jobs:
   i18n-download-curriculum-translations:
     name: Curriculum
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: [16.x]
+      fail-fast: true
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
         with:
           token: ${{ secrets.CROWDIN_CAMPERBOT_PAT }}
 
@@ -42,7 +46,8 @@ jobs:
           # downloads
           download_translations: true
           download_language: zh-CN
-          skip_untranslated_files: true
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
           export_only_approved: true
 
           push_translations: false
@@ -78,7 +83,8 @@ jobs:
           # downloads
           download_translations: true
           download_language: es-EM
-          skip_untranslated_files: true
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
           export_only_approved: true
 
           push_translations: false
@@ -107,7 +113,8 @@ jobs:
           # downloads
           download_translations: true
           download_language: it
-          skip_untranslated_files: true
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
           export_only_approved: true
 
           push_translations: false
@@ -136,7 +143,8 @@ jobs:
           # downloads
           download_translations: true
           download_language: pt-BR
-          skip_untranslated_files: true
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
           export_only_approved: true
 
           push_translations: false
@@ -165,7 +173,8 @@ jobs:
           # downloads
           download_translations: true
           download_language: uk
-          skip_untranslated_files: true
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
           export_only_approved: true
 
           push_translations: false
@@ -194,7 +203,8 @@ jobs:
           # downloads
           download_translations: true
           download_language: ja
-          skip_untranslated_files: true
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
           export_only_approved: true
 
           push_translations: false
@@ -223,7 +233,8 @@ jobs:
           # downloads
           download_translations: true
           download_language: de
-          skip_untranslated_files: true
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
           export_only_approved: true
 
           push_translations: false
@@ -238,6 +249,60 @@ jobs:
           # Uncomment below to debug
           # dryrun_action: true
 
+      ##### Download Arabic #####
+      - name: Crowdin Download Arabic Translations
+        uses: crowdin/github-action@master
+        # options: https://github.com/crowdin/github-action/blob/master/action.yml
+        with:
+          # uploads
+          upload_sources: false
+          upload_translations: false
+          auto_approve_imported: false
+          import_eq_suggestions: false
+          # downloads
+          download_translations: true
+          download_language: ar
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
+          export_only_approved: true
+          push_translations: false
+          # pull-request
+          create_pull_request: false
+          # global options
+          config: './crowdin-config.yml'
+          base_url: ${{ secrets.CROWDIN_BASE_URL_FCC }}
+          # Uncomment below to debug
+          # dryrun_action: true
+
+      # Validate the Download #
+      # All languages should go ABOVE this. #
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # tag=v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+
+      - name: Set Environment variables
+        run: |
+          cp sample.env .env
+          echo 'SHOW_NEW_CURRICULUM=true' >> .env
+          cat .env
+
+      - name: Build Source Files
+        run: |
+          echo npm version $(npm -v)
+          npm ci
+          npm run create:config
+          npm run build:curriculum
+          npm run build:server
+
+      - name: Lint and Format Files
+        run: |
+          npm run format:curriculum
+
+      # We do not need to run tests because they are run after the PR is created.
+
       # Create Commit
       - name: Commit Changes
         uses: freecodecamp/crowdin-action@main
@@ -248,9 +313,7 @@ jobs:
           GH_BRANCH: 'i18n-sync-curriculum'
           GH_MESSAGE: 'chore(i18n,learn): processed translations'
 
-      # Generate PR #
-      # All languages should go ABOVE this. #
-
+      # Create PR
       - name: Create PR
         uses: freecodecamp/crowdin-action@main
         env:

.github/workflows/crowdin-download.curriculum.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
         with:
           token: ${{ secrets.CROWDIN_CAMPERBOT_PAT }}
 

.github/workflows/crowdin-download.docs.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
 
       - name: Generate Crowdin Config
         uses: freecodecamp/crowdin-action@main

.github/workflows/crowdin-upload.client-ui.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
 
       - name: Generate Crowdin Config
         uses: freecodecamp/crowdin-action@main

.github/workflows/crowdin-upload.curriculum.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Source Files
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
 
       - name: Generate Crowdin Config
         uses: freecodecamp/crowdin-action@main