Merge branch 'develop' into PM-2394

kkartunov · kkartunov · commit 9221f6066414 · 2026-01-20T13:08:58.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -48,45 +48,44 @@ build_docker_image: &build_docker_image
     ./build.sh
   no_output_timeout: 20m
 
-build_steps: &build_steps
-      # Initialization.
-      - checkout
-      - setup_remote_docker
-      - run: *install_dependency
-      - run: *install_deploysuite
-      # Restoration of node_modules from cache.
-      # - restore_cache: *restore_cache_settings_for_build
-      # Build of Docker image.
-      - run:
-          name: "configuring environment"
-          command: |
-            ./awsconfiguration.sh ${DEPLOY_ENV}
-            source awsenvconf
-            ./psvar-processor.sh -t appenv -p /config/${APPNAME}/buildvar
-            source buildvar_env
-            # ./buildenv.sh -e ${DEPLOY_ENV} -b dev_communityapp_buildvar,dev_communityapp_deployvar -l dev_communityapp_buildvar_ps
-      - run: *build_docker_image
-      # Caching node modules.
-      # - save_cache: *save_cache_settings
-      # Deployment.
-      - deploy:
-          name: Running MasterScript
-          command: |
-            source awsenvconf
-            # source buildenvvar
-            ./psvar-processor.sh -t appenv -p /config/${APPNAME}/deployvar
-            source deployvar_env
-            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -j /config/${APPNAME}/appvar -i ${APPNAME} -p FARGATE
-            # ./master_deploy.sh -d ECS -e DEV -t latest -s dev_communityapp_taskvar -i communityapp -p FARGATE
-            if [ "${DEPLOY_ENV}" = "PROD" ]; 
-            then
-                # Executing plan
-                curl --request POST \
-                --url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
-                --header "Circle-Token: ${CIRCLE_TOKEN}" \
-                --header 'content-type: application/json' \
-                --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
-            fi              
+build_steps: &build_steps # Initialization.
+  - checkout
+  - setup_remote_docker
+  - run: *install_dependency
+  - run: *install_deploysuite
+  # Restoration of node_modules from cache.
+  # - restore_cache: *restore_cache_settings_for_build
+  # Build of Docker image.
+  - run:
+      name: "configuring environment"
+      command: |
+        ./awsconfiguration.sh ${DEPLOY_ENV}
+        source awsenvconf
+        ./psvar-processor.sh -t appenv -p /config/${APPNAME}/buildvar
+        source buildvar_env
+        # ./buildenv.sh -e ${DEPLOY_ENV} -b dev_communityapp_buildvar,dev_communityapp_deployvar -l dev_communityapp_buildvar_ps
+  - run: *build_docker_image
+  # Caching node modules.
+  # - save_cache: *save_cache_settings
+  # Deployment.
+  - deploy:
+      name: Running MasterScript
+      command: |
+        source awsenvconf
+        # source buildenvvar
+        ./psvar-processor.sh -t appenv -p /config/${APPNAME}/deployvar
+        source deployvar_env
+        ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -j /config/${APPNAME}/appvar -i ${APPNAME} -p FARGATE
+        # ./master_deploy.sh -d ECS -e DEV -t latest -s dev_communityapp_taskvar -i communityapp -p FARGATE
+        if [ "${DEPLOY_ENV}" = "PROD" ]; 
+        then
+            # Executing plan
+            curl --request POST \
+            --url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
+            --header "Circle-Token: ${CIRCLE_TOKEN}" \
+            --header 'content-type: application/json' \
+            --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
+        fi
 
 jobs:
   # Build & Deploy against development backend
@@ -95,7 +94,7 @@ jobs:
     environment:
       DEPLOY_ENV: "DEV"
       LOGICAL_ENV: "dev"
-      APPNAME: "community-app"    
+      APPNAME: "community-app"
     steps: *build_steps
 
   # Build & Deploy against production backend
@@ -107,7 +106,6 @@ jobs:
       APPNAME: "community-app"
     steps: *build_steps
 
-
   # Test job for the cases when we do not need deployment. It just rapidly
   # installs (updates) app dependencies, and runs tests (ESLint, Stylelint,
   # Jest unit-tests).
@@ -123,7 +121,7 @@ jobs:
           command: git config --global url."https://git@".insteadOf git://
       - run:
           name: App npm install
-          command: npm install
+          command: npm ci
           no_output_timeout: 20m
       - save_cache:
           key: test-node-modules-{{ checksum "package-lock.json" }}
@@ -181,8 +179,6 @@ workflows:
             branches:
               only:
                 - develop
-                - v6
-                - PM-2479
 
       - "build-prod":
           context: org-global
diff --git a/Dockerfile b/Dockerfile
@@ -165,7 +165,7 @@ ENV TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS=$TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS
 
 RUN npm config set unsafe-perm true
 RUN git config --global url."https://git@".insteadOf git://
-RUN npm install
+RUN npm ci
 RUN npm test
 RUN npm run build
 
diff --git a/bin/www b/bin/www
@@ -10,5 +10,14 @@ require('babel-register')({
   ],
 });
 
+/* Provide TextEncoder/TextDecoder in older Node runtimes (e.g. Node 10). */
+const { TextDecoder, TextEncoder } = require('util');
+if (typeof global.TextEncoder === 'undefined') {
+  global.TextEncoder = TextEncoder;
+}
+if (typeof global.TextDecoder === 'undefined') {
+  global.TextDecoder = TextDecoder;
+}
+
 /* Runs the ExpressJS startup script. */
 require('../src/server');
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -162,9 +162,9 @@
     "showdown": "^1.8.6",
     "slick-carousel": "^1.8.1",
     "supertest": "^3.1.0",
-    "tc-core-library-js": "github:topcoder-platform/tc-core-library-js#v2.6.3.1",
+    "tc-core-library-js": "github:topcoder-platform/tc-core-library-js#master",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "github:topcoder-platform/topcoder-react-lib#auth0",
+    "topcoder-react-lib": "github:topcoder-platform/topcoder-react-lib#develop",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "github:topcoder-platform/topcoder-react-utils#v6",
     "turndown": "^4.0.2",
diff --git a/src/shared/components/challenge-detail/Header/index.jsx b/src/shared/components/challenge-detail/Header/index.jsx
@@ -114,12 +114,16 @@ export default function ChallengeHeader(props) {
     prizeSets,
     prizeSet => ((prizeSet && prizeSet.type) || '').toLowerCase() === 'checkpoint',
   );
+  const checkpointPrizeType = _.toUpper(_.get(checkpointPrizes, 'prizes[0].type', 'USD'));
   let numberOfCheckpointsPrizes = 0;
   let topCheckPointPrize = 0;
   if (!_.isEmpty(checkpointPrizes)) {
     numberOfCheckpointsPrizes = checkpointPrizes.prizes.length;
     topCheckPointPrize = checkpointPrizes.prizes[0].value;
   }
+  const topCheckPointPrizeDisplay = checkpointPrizeType === 'POINT'
+    ? `${topCheckPointPrize}${topCheckPointPrize === 1 ? 'pt' : 'pts'}`
+    : `$${topCheckPointPrize}`;
 
   const phases = {};
   if (allPhases) {
@@ -394,8 +398,7 @@ export default function ChallengeHeader(props) {
                               <span
                                 styleName={`bonus-highlight ${trackLower}-accent-color`}
                               >
-                                $
-                                {topCheckPointPrize}
+                                {topCheckPointPrizeDisplay}
                               </span>
                               &zwnj;
                               EACH
diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
@@ -57,6 +57,7 @@ import { getService } from 'services/contentful';
 import { getSubmissionArtifacts as getSubmissionArtifactsService } from 'services/submissions';
 import getReviewSummationsService from 'services/reviewSummations';
 import { buildMmSubmissionData, buildStatisticsData } from 'utils/mm-review-summations';
+import { appendUtmParamsToUrl } from 'utils/utm';
 // import {
 // getDisplayRecommendedChallenges,
 // getRecommendedTags,
@@ -349,7 +350,11 @@ class ChallengeDetailPageContainer extends React.Component {
     } = this.props;
     if (!auth.tokenV3) {
       const utmSource = communityId || 'community-app-main';
-      window.location.href = `${config.URL.AUTH}/member?retUrl=${encodeURIComponent(`${window.location.origin}${window.location.pathname}`)}&utm_source=${utmSource}&regSource=challenges`;
+      window.location.href = appendUtmParamsToUrl(
+        `${config.URL.AUTH}/member?retUrl=${encodeURIComponent(`${window.location.origin}${window.location.pathname}`)}&regSource=challenges`, {
+          utm_source: utmSource,
+        },
+      );
     } else {
       // Show security reminder to all registrants
       this.setState({
diff --git a/src/shared/services/reviewOpportunities.js b/src/shared/services/reviewOpportunities.js
@@ -1,4 +1,5 @@
 import { config } from 'topcoder-react-utils';
+import { withEstimatedReviewerPayments } from 'utils/reviewOpportunities';
 
 const v6ApiUrl = config.API.V6;
 
@@ -22,7 +23,10 @@ export default async function getReviewOpportunities(page, pageSize) {
     throw new Error(res.statusText);
   }
 
-  return res.json();
+  const data = await res.json();
+
+  const opportunities = Array.isArray(data) ? data : [];
+  return opportunities.map(opportunity => withEstimatedReviewerPayments(opportunity));
 }
 
 /**
@@ -51,7 +55,7 @@ export async function getDetails(challengeId, opportunityId) {
     const challengeData = await challengeRes.json();
 
     return {
-      ...opportunityData.result.content,
+      ...withEstimatedReviewerPayments(opportunityData.result.content),
       challenge: challengeData,
     };
   } catch (err) {
diff --git a/src/shared/utils/reviewOpportunities.js b/src/shared/utils/reviewOpportunities.js
@@ -5,6 +5,54 @@ import _ from 'lodash';
 import moment from 'moment';
 import { REVIEW_OPPORTUNITY_TYPES } from './tc';
 
+export const DEFAULT_ESTIMATED_SUBMISSIONS = 2;
+
+export const calculateEstimatedReviewerPayment = (
+  basePayment,
+  incrementalPayment,
+  estimatedSubmissions = DEFAULT_ESTIMATED_SUBMISSIONS,
+) => {
+  const base = _.toNumber(basePayment);
+  const incremental = _.toNumber(incrementalPayment);
+  const submissions = _.toNumber(estimatedSubmissions);
+
+  if (_.isNaN(base) || _.isNaN(submissions)) {
+    return null;
+  }
+
+  const incrementalValue = _.isNaN(incremental) ? 0 : incremental;
+  return base + (submissions * incrementalValue);
+};
+
+export const withEstimatedReviewerPayments = (
+  opportunity,
+  estimatedSubmissions = DEFAULT_ESTIMATED_SUBMISSIONS,
+) => {
+  if (!opportunity) return opportunity;
+
+  const estimatedPayment = calculateEstimatedReviewerPayment(
+    _.get(opportunity, 'basePayment', _.get(opportunity, 'payments[0].payment')),
+    _.get(opportunity, 'incrementalPayment', 0),
+    estimatedSubmissions,
+  );
+
+  if (!_.isNumber(estimatedPayment)) {
+    return opportunity;
+  }
+
+  const payments = Array.isArray(opportunity.payments)
+    ? opportunity.payments.map(payment => ({
+      ...payment,
+      payment: estimatedPayment,
+    }))
+    : opportunity.payments;
+
+  return {
+    ...opportunity,
+    payments,
+  };
+};
+
 /**
  * Infers open positions using review opportunity details and organizes them by role
  *
@@ -14,7 +62,10 @@ import { REVIEW_OPPORTUNITY_TYPES } from './tc';
 export const openPositionsByRole = (details) => {
   if (!details.payments) return [];
 
-  const roleCount = details.payments.length;
+  const detailsWithPayments = withEstimatedReviewerPayments(details);
+  const payments = detailsWithPayments.payments || [];
+
+  const roleCount = payments.length;
 
   let approved;
   if (details.applications && details.openPositions === 1 && roleCount === 2) {
@@ -28,7 +79,7 @@ export const openPositionsByRole = (details) => {
     return details.openPositions / roleCount;
   };
 
-  return details.payments.map(({ role, roleId, payment }) => ({
+  return payments.map(({ role, roleId, payment }) => ({
     role,
     roleId,
     payment,
diff --git a/src/shared/utils/utm.js b/src/shared/utils/utm.js
