From 66f454bab9bc02ce6cb2e8ee999ddb121b2028f6 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Mon, 18 Sep 2023 11:32:17 +1000 Subject: [PATCH 1/3] =?UTF-8?q?Testing=20in=20dev=20because=20my=20local?= =?UTF-8?q?=20env=20isn=E2=80=99t=20working?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 4 +--- config/default.js | 1 + src/shared/routes/Topcoder/Routes.jsx | 11 +++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b5d3d870..5ca419933 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -350,9 +350,7 @@ workflows: branches: only: - PROD-4183 - - MP-327 - - fix_country_setting_in_profile - - justin_redirects + - changelog # This is alternate dev env for parallel testing - "build-test": context : org-global diff --git a/config/default.js b/config/default.js index b54f9ff7e..d50de2aec 100644 --- a/config/default.js +++ b/config/default.js @@ -52,6 +52,7 @@ module.exports = { LOCAL_MODE: false, DEFAULT_SPACE_NAME: 'default', DEFAULT_ENVIRONMENT: 'master', + CHANGELOG_ID: '5ULnHeUIuYAyLhNO97zAqy', }, /** diff --git a/src/shared/routes/Topcoder/Routes.jsx b/src/shared/routes/Topcoder/Routes.jsx index 244f67030..b16ef808a 100644 --- a/src/shared/routes/Topcoder/Routes.jsx +++ b/src/shared/routes/Topcoder/Routes.jsx @@ -21,6 +21,7 @@ import { config, isomorphy } from 'topcoder-react-utils'; import ContentfulLoader from 'containers/ContentfulLoader'; import LoadingIndicator from 'components/LoadingIndicator'; import Article from 'components/Contentful/Article'; +import Viewport from 'components/Contentful/Viewport'; import EDUHome from '../EDUHome'; import EDUTracks from '../EDUTracks'; @@ -96,6 +97,16 @@ export default function Topcoder() { component={() => } path="/settings" /> + + )} + /> + {/* EDU Portal */} Date: Mon, 18 Sep 2023 15:30:21 +1000 Subject: [PATCH 2/3] =?UTF-8?q?We=E2=80=99ll=20try=20this.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/routes/Topcoder/Routes.jsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/shared/routes/Topcoder/Routes.jsx b/src/shared/routes/Topcoder/Routes.jsx index b16ef808a..3c579416a 100644 --- a/src/shared/routes/Topcoder/Routes.jsx +++ b/src/shared/routes/Topcoder/Routes.jsx @@ -99,12 +99,7 @@ export default function Topcoder() { /> - )} + component={() => } /> {/* EDU Portal */} From fd0550e2023136a9d0df6d8c991e0b5ae42c6de5 Mon Sep 17 00:00:00 2001 From: eisbilir Date: Mon, 18 Sep 2023 14:09:57 +0300 Subject: [PATCH 3/3] use v5 challenge id in submission review tab --- .../components/challenge-detail/Header/TabSelector/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-detail/Header/TabSelector/index.jsx b/src/shared/components/challenge-detail/Header/TabSelector/index.jsx index f7c9d104f..5ddadf7ba 100644 --- a/src/shared/components/challenge-detail/Header/TabSelector/index.jsx +++ b/src/shared/components/challenge-detail/Header/TabSelector/index.jsx @@ -249,7 +249,7 @@ export default function ChallengeViewSelector(props) { { (hasRegistered && mySubmissions.length > 0) && (