From 5f597b35f34b8ca30d54d8e909d23e5b14f162b6 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 8 May 2024 08:38:23 +1000 Subject: [PATCH 1/4] Remove On Demand hard-coded tag for self service / Phoenix challenges (TOP-1177) --- .../components/challenge-detail/Header/ChallengeTags.jsx | 9 --------- .../components/challenge-listing/ChallengeCard/index.jsx | 7 ------- 2 files changed, 16 deletions(-) diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx index 2c85a903a..8b1df244b 100644 --- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx +++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx @@ -105,15 +105,6 @@ export default function ChallengeTags(props) { )) } - { - isSelfService && ( -
- - On Demand - -
- ) - } { tags.map(tag => ( tag diff --git a/src/shared/components/challenge-listing/ChallengeCard/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/index.jsx index 934a6831f..ba7ed2102 100644 --- a/src/shared/components/challenge-listing/ChallengeCard/index.jsx +++ b/src/shared/components/challenge-listing/ChallengeCard/index.jsx @@ -107,13 +107,6 @@ function ChallengeCard({ /> ) } - { - _.get(challenge, 'legacy.selfService') && ( - - On Demand - - ) - } { !isRecommendedChallenge && (challenge.tags.length + skills.length) > 0 && ( From aa4b79358a842f9ab3c72f4579634be8c79a0947 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 8 May 2024 09:33:13 +1000 Subject: [PATCH 2/4] Test update --- .../SubmissionHistoryRow/__snapshots__/index.jsx.snap | 4 ++-- package-lock.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap b/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap index 59f37d833..b6f918a09 100644 --- a/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap @@ -52,9 +52,9 @@ exports[`Matches shallow shapshot shapshot 1 1`] = ` TIME
- 06 Nov 2017 + 07 Nov 2017 - 15:49:35 + 02:49:35
diff --git a/package-lock.json b/package-lock.json index eb8e5f277..3533c1a89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16760,8 +16760,8 @@ "dev": true }, "navigation-component": { - "version": "github:topcoder-platform/navigation-component#b44259da14c0452606cc5abe15f10eea7e31f0e5", - "from": "github:topcoder-platform/navigation-component#v1000.1.7", + "version": "github:topcoder-platform/navigation-component#27625999e94725fb31c226b8255a549849f1ebe4", + "from": "github:topcoder-platform/navigation-component#develop", "requires": { "classnames": "^2.2.6", "lodash": "^4.17.11", From 25faad5bec4bde5dc699c55e3d8cb1239695b32c Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Wed, 8 May 2024 09:40:42 +1000 Subject: [PATCH 3/4] Lint updates --- .../components/challenge-detail/Header/ChallengeTags.jsx | 4 ---- src/shared/components/challenge-detail/Header/index.jsx | 1 - .../components/challenge-listing/ChallengeCard/index.jsx | 1 - 3 files changed, 6 deletions(-) diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx index 8b1df244b..17afeac39 100644 --- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx +++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx @@ -13,7 +13,6 @@ import { config } from 'topcoder-react-utils'; import { Tag, - DevelopmentTrackTag, } from 'topcoder-react-ui-kit'; import VerifiedTag from 'components/challenge-listing/VerifiedTag'; @@ -23,7 +22,6 @@ import './style.scss'; export default function ChallengeTags(props) { const { - isSelfService, challengeId, challengesUrl, challengeType, @@ -149,11 +147,9 @@ ChallengeTags.defaultProps = { events: [], technPlatforms: [], skills: [], - isSelfService: false, }; ChallengeTags.propTypes = { - isSelfService: PT.bool, challengeId: PT.string.isRequired, challengesUrl: PT.string.isRequired, events: PT.arrayOf(PT.string), diff --git a/src/shared/components/challenge-detail/Header/index.jsx b/src/shared/components/challenge-detail/Header/index.jsx index 41c58b8dd..5a7bfa135 100644 --- a/src/shared/components/challenge-detail/Header/index.jsx +++ b/src/shared/components/challenge-detail/Header/index.jsx @@ -315,7 +315,6 @@ export default function ChallengeHeader(props) {
Date: Wed, 8 May 2024 10:07:03 +1000 Subject: [PATCH 4/4] Revert "Test update" This reverts commit aa4b79358a842f9ab3c72f4579634be8c79a0947. --- .../SubmissionHistoryRow/__snapshots__/index.jsx.snap | 4 ++-- package-lock.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap b/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap index b6f918a09..59f37d833 100644 --- a/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap @@ -52,9 +52,9 @@ exports[`Matches shallow shapshot shapshot 1 1`] = ` TIME
- 07 Nov 2017 + 06 Nov 2017 - 02:49:35 + 15:49:35
diff --git a/package-lock.json b/package-lock.json index 3533c1a89..eb8e5f277 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16760,8 +16760,8 @@ "dev": true }, "navigation-component": { - "version": "github:topcoder-platform/navigation-component#27625999e94725fb31c226b8255a549849f1ebe4", - "from": "github:topcoder-platform/navigation-component#develop", + "version": "github:topcoder-platform/navigation-component#b44259da14c0452606cc5abe15f10eea7e31f0e5", + "from": "github:topcoder-platform/navigation-component#v1000.1.7", "requires": { "classnames": "^2.2.6", "lodash": "^4.17.11",