Merge pull request #718 from freeCodeCamp/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

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

@@ -238,30 +238,6 @@ 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
-
       ##### Download Swahili #####
       - name: Crowdin Download Swahili Translations
         uses: crowdin/github-action@master

.github/workflows/curriculum-i18n-submodule.yml

@@ -25,7 +25,6 @@ jobs:
           - 'ukrainian'
           - 'japanese'
           - 'german'
-          - 'arabic'
           - 'swahili'
 
     steps:

api/src/app.ts

@@ -38,7 +38,7 @@ import {
   FCC_ENABLE_DEV_LOGIN_MODE,
   FCC_ENABLE_SWAGGER_UI,
   FCC_ENABLE_SHADOW_CAPTURE,
-  FREECODECAMP_NODE_ENV
+  FCC_ENABLE_EXAM_ENVIRONMENT
 } from './utils/env';
 import { isObjectID } from './utils/validation';
 import {
@@ -187,8 +187,7 @@ export const build = async (
     }
   });
 
-  // NOTE: Code behind the `FREECODECAMP_NODE_ENV` var is not ready to be deployed yet.
-  if (FREECODECAMP_NODE_ENV !== 'production') {
+  if (FCC_ENABLE_EXAM_ENVIRONMENT) {
     void fastify.register(function (fastify, _opts, done) {
       fastify.addHook('onRequest', fastify.authorizeExamEnvironmentToken);
 

api/src/exam-environment/routes/exam-environment.test.ts

@@ -12,6 +12,14 @@ import {
 import * as mock from '../../../__mocks__/env-exam';
 import { constructUserExam } from '../utils/exam';
 
+jest.mock('../../utils/env', () => {
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return {
+    ...jest.requireActual('../../utils/env'),
+    FCC_ENABLE_EXAM_ENVIRONMENT: 'true'
+  };
+});
+
 describe('/exam-environment/', () => {
   setupServer();
   describe('Authenticated user with exam environment authorization token', () => {

api/src/utils/env.ts

@@ -58,6 +58,11 @@ assert.ok(process.env.MONGOHQ_URL);
 assert.ok(process.env.COOKIE_SECRET);
 
 if (process.env.FREECODECAMP_NODE_ENV !== 'development') {
+  assert.notEqual(
+    process.env.FCC_ENABLE_EXAM_ENVIRONMENT,
+    'true',
+    'Exam environment is not ready for production.'
+  );
   assert.ok(process.env.SES_ID);
   assert.ok(process.env.SES_SECRET);
   assert.notEqual(
@@ -127,6 +132,8 @@ export const FCC_ENABLE_DEV_LOGIN_MODE =
   process.env.FCC_ENABLE_DEV_LOGIN_MODE === 'true';
 export const FCC_ENABLE_SHADOW_CAPTURE =
   process.env.FCC_ENABLE_SHADOW_CAPTURE === 'true';
+export const FCC_ENABLE_EXAM_ENVIRONMENT =
+  process.env.FCC_ENABLE_EXAM_ENVIRONMENT === 'true';
 export const SENTRY_DSN =
   process.env.SENTRY_DSN === 'dsn_from_sentry_dashboard'
     ? ''

client/config/growthbook-features-default.json

@@ -62,5 +62,37 @@
         "name": "stg show modal randomly"
       }
     ]
+  },
+  "show-benefits": {
+    "defaultValue": false,
+    "rules": [
+      {
+        "coverage": 1,
+        "hashAttribute": "id",
+        "seed": "show-benefits",
+        "hashVersion": 2,
+        "variations": [
+          false,
+          true
+        ],
+        "weights": [
+          0.5,
+          0.5
+        ],
+        "key": "show-benefits",
+        "meta": [
+          {
+            "key": "0",
+            "name": "Control"
+          },
+          {
+            "key": "1",
+            "name": "Variation 1"
+          }
+        ],
+        "phase": "0",
+        "name": "prod-show-benefits"
+      }
+    ]
   }
 }

client/gatsby-node.js

@@ -74,6 +74,7 @@ exports.createPages = async function createPages({
             challenge {
               block
               blockType
+              blockLayout
               certification
               challengeType
               dashedName
@@ -260,6 +261,7 @@ exports.createSchemaCustomization = ({ actions }) => {
     }
     type Challenge {
       blockType: String
+      blockLayout: String
       challengeFiles: [FileContents]
       explanation: String
       notes: String