Skip to content

Commit 163da0b

Browse files
authored
Merge pull request #4469 from PrakashDurlabhji/issue_4466
Issue 4466 fix
2 parents debbf90 + ae278b1 commit 163da0b

File tree

5 files changed

+9
-3
lines changed
  • __tests__/shared/components/challenge-listing/ChallengeCard
  • src/shared/components
    • Dashboard/CurrentActivity/Challenges/ChallengeCard
    • challenge-detail/RecommendedActiveChallenges/ChallengesCard
    • challenge-listing/ChallengeCard

5 files changed

+9
-3
lines changed

__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
6666
"currentPhases": Array [
6767
"Registration",
6868
],
69+
"events": Array [],
6970
"id": "1",
7071
"legacy": Object {
7172
"track": "DATA_SCIENCE",
@@ -109,6 +110,7 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
109110
"currentPhases": Array [
110111
"Registration",
111112
],
113+
"events": Array [],
112114
"id": "long id",
113115
"legacy": Object {
114116
"track": "DATA_SCIENCE",

__tests__/shared/components/challenge-listing/ChallengeCard/index.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ const mockData2 = {
5656
id: '1',
5757
totalPrize: 1800,
5858
users: {},
59+
events: [],
5960
},
6061
};
6162

@@ -76,6 +77,7 @@ const mockData3 = {
7677
id: 'long id',
7778
totalPrize: 1800,
7879
users: {},
80+
events: [],
7981
},
8082
};
8183

@@ -96,6 +98,7 @@ const mockData4 = {
9698
id: 'long id',
9799
totalPrize: 1800,
98100
users: {},
101+
events: [],
99102
},
100103
};
101104

@@ -116,6 +119,7 @@ const mockData5 = {
116119
id: 'long id',
117120
totalPrize: 1800,
118121
users: {},
122+
events: [],
119123
},
120124
};
121125

src/shared/components/Dashboard/CurrentActivity/Challenges/ChallengeCard/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default function ChallengeCard({
7777
: `/?module=Category&categoryID=${legacy.forumId}`;
7878

7979
const isTco = challenge.events
80-
&& challenge.events.find(x => x.eventName.match(/tco\d{2}/));
80+
&& challenge.events.find(x => x.eventName && x.eventName.match(/tco\d{2}/));
8181

8282
const roles = _.get(userDetails, 'roles') || [];
8383

src/shared/components/challenge-detail/RecommendedActiveChallenges/ChallengesCard/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export default function ChallengesCard({
6565
<TrackIcon
6666
track={track}
6767
subTrack={challenge.subTrack}
68-
tcoEligible={challenge.events ? challenge.events[0].eventName : ''}
68+
tcoEligible={challenge.events && challenge.events.length > 0 ? challenge.events[0].eventName : ''}
6969
isDataScience={challenge.isDataScience}
7070
challengesUrl={challengesUrl}
7171
/>

src/shared/components/challenge-listing/ChallengeCard/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function ChallengeCard({
7171
<TrackIcon
7272
track={track}
7373
subTrack={subTrack}
74-
tcoEligible={challenge.events ? challenge.events[0].eventName : ''}
74+
tcoEligible={challenge.events && challenge.events.length > 0 ? challenge.events[0].eventName : ''}
7575
isDataScience={challenge.isDataScience}
7676
/>
7777
</span>

0 commit comments

Comments
 (0)