diff --git a/.circleci/config.yml b/.circleci/config.yml index fa18367f07..085b343d1c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -252,6 +252,7 @@ workflows: filters: branches: only: + - integration-v5-challenge-api - develop - feature-contentful # This is stage env for production QA releases diff --git a/__tests__/shared/actions/challenge-listing/sidebar.js b/__tests__/shared/actions/challenge-listing/sidebar.js index 70f4ede157..58dab24e45 100644 --- a/__tests__/shared/actions/challenge-listing/sidebar.js +++ b/__tests__/shared/actions/challenge-listing/sidebar.js @@ -6,6 +6,23 @@ const mockFetch = (ok, resolvesTo) => jest.fn( () => Promise.resolve({ ok, json: () => resolvesTo }), ); +const createXHRmock = () => { + const open = jest.fn(); + // be aware we use *function* because we need to get *this* + // from *new XmlHttpRequest()* call + const send = jest.fn().mockImplementation(() => { + this.onload(); + }); + const xhrMockClass = { + open, + send, + setRequestHeader: jest.fn(), + getAllResponseHeaders: jest.fn(), + }; + + window.XMLHttpRequest = jest.fn().mockImplementation(xhrMockClass); +}; + let originalFetch; beforeAll(() => { @@ -32,6 +49,7 @@ describe('challengeListing.sidebar.changeFilterName', () => { describe('challengeListing.sidebar.deleteSavedFilter', () => { global.fetch = mockFetch(true, 'dummy'); + createXHRmock(); const a = actions.deleteSavedFilter('id', 'token'); diff --git a/__tests__/shared/components/ChallengeTile/__mocks__/design.json b/__tests__/shared/components/ChallengeTile/__mocks__/design.json index 17116a6387..9bf42f544c 100644 --- a/__tests__/shared/components/ChallengeTile/__mocks__/design.json +++ b/__tests__/shared/components/ChallengeTile/__mocks__/design.json @@ -14,14 +14,16 @@ "updatedBy": "22841596", "technologies": "", "status": "COMPLETED", - "track": "DESIGN", + "legacy": { + "track": "DESIGN", + "forumId": 599349 + }, "subTrack": "LOGO_DESIGN", "name": "Sunshot - MapMySolar - SunGiver - Brand Concept Logo Design Challenge", "reviewType": "INTERNAL", "id": 30051608, - "forumId": 599349, - "numSubmissions": 22, - "numRegistrants": 31, + "numOfSubmissions": 22, + "numOfRegistrants": 31, "registrationStartDate": "2015-10-01T22:21:07.491Z", "registrationEndDate": "2015-10-09T13:04:02.272Z", "checkpointSubmissionEndDate": "2015-10-05T13:05:56.398Z", @@ -317,14 +319,16 @@ "updatedBy": "22841596", "technologies": "", "status": "COMPLETED", - "track": "DESIGN", + "legacy": { + "track": "DESIGN", + "forumId": 598066 + }, "subTrack": "LOGO_DESIGN", "name": "2016 Topcoder Open Logo Design Challenge", "reviewType": "INTERNAL", "id": 30051059, - "forumId": 598066, - "numSubmissions": 57, - "numRegistrants": 111, + "numOfSubmissions": 57, + "numOfRegistrants": 111, "registrationStartDate": "2015-08-10T13:00:01.576Z", "registrationEndDate": "2015-08-24T13:17:15.335Z", "checkpointSubmissionEndDate": "2015-08-17T13:10:56.385Z", @@ -527,14 +531,16 @@ "updatedBy": "22841596", "technologies": "", "status": "COMPLETED", - "track": "DESIGN", + "legacy": { + "track": "DESIGN", + "forumId": 596557 + }, "subTrack": "LOGO_DESIGN", "name": "ACME Logos Design Challenge", "reviewType": "INTERNAL", "id": 30050375, - "forumId": 596557, - "numSubmissions": 15, - "numRegistrants": 55, + "numOfSubmissions": 15, + "numOfRegistrants": 55, "registrationStartDate": "2015-06-01T19:00:33.351Z", "registrationEndDate": "2015-06-09T13:00:37.186Z", "checkpointSubmissionEndDate": "2015-06-06T13:07:38.023Z", diff --git a/__tests__/shared/components/ChallengeTile/__mocks__/develop.json b/__tests__/shared/components/ChallengeTile/__mocks__/develop.json index 5153d74ce6..ec6b731307 100644 --- a/__tests__/shared/components/ChallengeTile/__mocks__/develop.json +++ b/__tests__/shared/components/ChallengeTile/__mocks__/develop.json @@ -21,14 +21,16 @@ "updatedBy": "22841596", "technologies": "CSS, HTML, JavaScript", "status": "COMPLETED", - "track": "DEVELOP", + "legacy": { + "track": "DEVELOP", + "forumId": 39153 + }, "subTrack": "FIRST_2_FINISH", "name": "$100 Eaton PX 2.0 Petting Zoo - MDC Web Enhancement F2F Challenge", "reviewType": "INTERNAL", "id": 30060905, - "forumId": 39153, - "numSubmissions": 3, - "numRegistrants": 8, + "numOfSubmissions": 3, + "numOfRegistrants": 8, "registrationStartDate": "2017-12-02T09:01:23.251Z", "registrationEndDate": "2017-12-12T20:01:00.000Z", "checkpointSubmissionEndDate": null, @@ -162,14 +164,16 @@ "updatedBy": "22841596", "technologies": "ReactJS", "status": "COMPLETED", - "track": "DEVELOP", + "legacy": { + "track": "DEVELOP", + "forumId": 39151 + }, "subTrack": "FIRST_2_FINISH", "name": "$100 Eaton PX 2.0 Petting Zoo - ReactJS Enhancement F2F Challenge", "reviewType": "INTERNAL", "id": 30060903, - "forumId": 39151, - "numSubmissions": 2, - "numRegistrants": 6, + "numOfSubmissions": 2, + "numOfRegistrants": 6, "registrationStartDate": "2017-12-02T09:01:21.329Z", "registrationEndDate": "2017-12-12T20:01:00.000Z", "checkpointSubmissionEndDate": null, @@ -318,14 +322,16 @@ "updatedBy": "22841596", "technologies": "Angular 2+, Express, JSON, Node.js", "status": "COMPLETED", - "track": "DEVELOP", + "legacy": { + "track": "DEVELOP", + "forumId": 38951 + }, "subTrack": "FIRST_2_FINISH", "name": "$500 BG800 Online Course Mock Rest API F2F Challenge", "reviewType": "INTERNAL", "id": 30060687, - "forumId": 38951, - "numSubmissions": 14, - "numRegistrants": 18, + "numOfSubmissions": 14, + "numOfRegistrants": 18, "registrationStartDate": "2017-11-24T13:27:44.751Z", "registrationEndDate": "2017-12-05T22:27:00.000Z", "checkpointSubmissionEndDate": null, @@ -624,14 +630,16 @@ "updatedBy": "22841596", "technologies": "JavaScript, ReactJS", "status": "COMPLETED", - "track": "DEVELOP", + "legacy": { + "track": "DEVELOP", + "forumId": 38702 + }, "subTrack": "FIRST_2_FINISH", "name": "John Hancock - Giving Tuesday - General image handling", "reviewType": "INTERNAL", "id": 30060425, - "forumId": 38702, - "numSubmissions": 3, - "numRegistrants": 17, + "numOfSubmissions": 3, + "numOfRegistrants": 17, "registrationStartDate": "2017-11-11T02:02:21.127Z", "registrationEndDate": "2017-11-21T02:02:00.000Z", "checkpointSubmissionEndDate": null, diff --git a/__tests__/shared/components/ChallengeTile/__mocks__/marathon.json b/__tests__/shared/components/ChallengeTile/__mocks__/marathon.json index 529221f76b..a6d183de7c 100644 --- a/__tests__/shared/components/ChallengeTile/__mocks__/marathon.json +++ b/__tests__/shared/components/ChallengeTile/__mocks__/marathon.json @@ -5,9 +5,11 @@ "status": "PAST", "startDate": "2018-05-02T23:58:00.000Z", "endDate": "2018-05-02T23:58:00.000Z", - "track": "DATA_SCIENCE", + "legacy": { + "track": "DATA_SCIENCE" + }, "subTrack": "MARATHON_MATCH", - "numRegistrants": null, + "numOfRegistrants": null, "userIds": [141650, 158782, 276230, 282718, 283329, 7213681, 7359397, 7394165, 7442498, 7461533, 7465964, 7502813, 8366961, 8436045, 10233638, 10233638, 10467320, 10544397, 10597114, 10600282, 11854576, 13274356, 13298470, 14773682, 14883513, 14927744, 14991227, 15050434, 15118607, 16017427, 19740398, 20283608, 20315020, 20539063, 20783604, 20994662, 21114351, 21159810, 21179827, 21239511, 21688563, 21918101, 22020968, 22263204, 22389733, 22401534, 22627322, 22628625, 22629065, 22630490, 22638533, 22651906, 22653042, 22653720, 22653739, 22654575, 22656451, 22657201, 22657314, 22658052, 22661247, 22663117, 22663117, 22663924, 22671296, 22671296, 22671337, 22672408, 22674904, 22678508, 22680214, 22682274, 22682865, 22686512, 22688672, 22689976, 22692969, 22694931, 22697551, 22697669, 22704094, 22707222, 22718833, 22718910, 22721705, 22724258, 22727735, 22729239, 22734926, 22739971, 22741614, 22743661, 22744169, 22744421, 22747080, 22748044, 22753197, 22754284, 22756524, 22763515, 22768223, 22769598, 22769901, 22774534, 22774825, 22776482, 22779022, 22781646, 22781940, 22786326, 22794555, 22821941, 22825384, 22825875, 22826091, 22826139, 22826853, 22827765, 22828541, 22828546, 22829913, 22833363, 22843425, 22846688, 22850782, 22856251, 22858981, 22860336, 22860886, 22864722, 22868771, 22871352, 22873934, 22876363, 22881459, 22881735, 22897216, 22898655, 22906337, 22906557, 22906664, 22907549, 22909326, 22912209, 22912366, 22914184, 22919719, 22921277, 22923054, 22923054, 22924522, 22926652, 22929867, 22931891, 22932516, 23007886, 23008568, 23009812, 23015069, 23016887, 23018971, 23022695, 23026506, 23027339, 23040369, 23042482, 23042826, 23043484, 23044638, 23057573, 23057753, 23057905, 23069397, 23069974, 23070173, 23073768, 23073805, 23078492, 23080863, 23088109, 23088634, 23091447, 23092404, 23098513, 23100980, 23104345, 23104569, 23104569, 23115876, 23122212, 23127980, 23128010, 23128049, 23128490, 23128776, 23134176, 23141252, 23145211, 23145682, 23147616, 23149662, 23158804, 23161183, 23169412, 23170396, 23171633, 23177471, 23193535, 23264897, 23264897, 23285007, 23285054, 23285989, 23286857, 23289980, 23289980, 23292260, 23305127, 23308488, 23309818, 23309825, 23310707, 23323058, 23332062, 40005002, 40007407, 40007407, 40007844, 40014801, 40020552, 40022736, 40022736, 40027160, 40036552, 40038456, 40040728, 40050596, 40066523, 40082862, 40086753, 40094143, 40099108, 40106381, 40114709, 40116774, 40120624, 40130436, 40133770, 40133915, 40136338, 40140108, 40185279, 40188699, 40191001, 40196465, 40197594, 40215674, 40220230, 40236037, 40246974, 40247232, 40257176, 40259383, 40260799, 40266935, 40270737, 40270737, 40274368, 40293157, 40303624, 40309917, 40315743, 40319654, 40333188, 40336669, 40339779, 40347577, 40348876, 40350250, 40358649, 40361537, 40372812, 40392652, 40393775, 40396340, 40401694, 40402465, 40412809, 40433686, 40435654, 40443608, 40444244, 40446059, 40468706, 40480823, 40490675, 40496834, 40496834, 40502666, 40503423, 40505498, 40511723, 40513494, 40521665, 40523623, 40533186, 40543286, 40551842, 40554284, 40558626, 40560077, 40560115, 40562017, 40564389, 40572694, 40576855, 40576855, 40584681, 40586177, 40589817, 40589976, 40590641, 40594497, 40596982, 40596988, 40599327, 40600453, 40600514, 40618250, 40620991, 40621505, 40622191, 40624308, 40624612, 40630337, 40634796, 40638118, 40640695, 40640709, 40645709, 40646798, 40648689, 40649399, 40650540, 40651481, 40651481, 40652591, 40653455, 40655289, 40661549, 40667067, 40668009, 40675162, 40677436, 40678596, 40683329, 40684088, 40685467, 40686365, 40687942, 40690174, 40694576, 40705298, 40708164, 40708275, 40712448, 40714074, 40714397, 40715005, 40716035, 40716035, 40721133, 40723831, 40725891, 40726067, 40727059, 40734958, 40734958, 40738694, 40741634, 40742742, 40743704, 40744195, 40744262, 40745265, 40746165, 40746480, 40747463, 40749658, 40749849, 40750013, 40750028, 40750524, 40750715, 40751274, 40751284, 40751286, 40751290, 40752373, 40752902, 40752954, 40753004, 40753014, 40753051, 40753238, 40753292, 40753317, 40753398, 40753443, 40753452, 40753455, 40753666, 40753750, 40753792, 40753803, 40753978, 40754052, 40754086, 40754732, 40754772, 40754801, 40754967], "handles": null, "rounds": [{ @@ -28,7 +30,7 @@ "rated": 1, "pointTotal": 996714.71, "ovarallRank": null, - "numSubmissions": 20 + "numOfSubmissions": 20 } }], "problemId": 14907, @@ -43,9 +45,11 @@ "status": "PAST", "startDate": "2017-04-12T16:36:00.000Z", "endDate": "2017-04-12T16:36:00.000Z", - "track": "DATA_SCIENCE", + "legacy": { + "track": "DATA_SCIENCE" + }, "subTrack": "MARATHON_MATCH", - "numRegistrants": null, + "numOfRegistrants": null, "userIds": [141650, 158782, 262598, 276230, 278425, 279876, 282718, 282718, 288302, 301395, 7213681, 7359397, 7390467, 7394165, 7442498, 7461533, 7465964, 7527926, 8366961, 8369898, 8400878, 8400878, 8436045, 8527113, 10278300, 10544397, 10597114, 10600282, 11789293, 13274356, 13274356, 13298470, 13365783, 14821847, 14881583, 14883513, 14927744, 14991227, 15580072, 15635590, 15781032, 15896190, 16017427, 19740398, 20315020, 20539063, 20799813, 20994662, 21114351, 21159810, 21162075, 21323186, 21500759, 21595895, 21688563, 21756423, 21990198, 22000198, 22020968, 22096856, 22255814, 22263204, 22628625, 22628772, 22629065, 22629850, 22644845, 22650894, 22651620, 22651906, 22652963, 22653042, 22653720, 22653739, 22654615, 22655052, 22657314, 22659807, 22661247, 22663924, 22671337, 22671446, 22672082, 22673613, 22674904, 22674904, 22675075, 22675075, 22680214, 22680376, 22682274, 22686050, 22686590, 22688641, 22688672, 22688964, 22689976, 22692760, 22692969, 22695559, 22696883, 22697551, 22697599, 22697669, 22697669, 22704094, 22705227, 22707497, 22708888, 22714779, 22718833, 22718910, 22718910, 22719721, 22727735, 22729239, 22730083, 22734926, 22736823, 22736823, 22738588, 22740367, 22740882, 22740882, 22741553, 22741614, 22743010, 22743661, 22744169, 22744390, 22744421, 22745629, 22745629, 22745897, 22748044, 22750409, 22751549, 22753458, 22758275, 22768223, 22768760, 22768760, 22774059, 22774534, 22776202, 22779022, 22780674, 22781250, 22781646, 22825496, 22826277, 22826721, 22827765, 22827765, 22827955, 22832123, 22832491, 22836242, 22836556, 22838816, 22846688, 22848598, 22850782, 22852089, 22852762, 22858920, 22859100, 22860336, 22861807, 22863733, 22864251, 22868476, 22868771, 22868771, 22871352, 22873934, 22875240, 22880808, 22881961, 22886772, 22888586, 22895368, 22897296, 22898655, 22901426, 22904503, 22905515, 22906337, 22906557, 22906664, 22910325, 22912209, 22912366, 22912545, 22914235, 22921568, 22923054, 22923054, 22923055, 22924522, 22926186, 22926652, 22929407, 22931372, 22931612, 22931891, 22933869, 23002583, 23004373, 23005191, 23012810, 23014542, 23016887, 23018456, 23019224, 23026219, 23026506, 23027186, 23029708, 23029708, 23037508, 23043110, 23044100, 23048122, 23051360, 23052698, 23056947, 23057753, 23059200, 23061160, 23062527, 23064972, 23065598, 23065598, 23069974, 23071944, 23074035, 23076476, 23077893, 23078492, 23078492, 23082644, 23087578, 23088109, 23088634, 23092404, 23095311, 23100980, 23102821, 23105624, 23108220, 23116990, 23117897, 23118372, 23120489, 23121131, 23122212, 23128049, 23128490, 23128776, 23129662, 23133942, 23142537, 23145682, 23148258, 23148258, 23149077, 23157421, 23157421, 23169412, 23170396, 23186180, 23187136, 23190917, 23264360, 23264360, 23279396, 23284922, 23285054, 23285191, 23285989, 23285989, 23286857, 23286857, 23287092, 23290002, 23290206, 23291387, 23301156, 23301803, 23303941, 23308488, 23308968, 23309238, 23309653, 23309737, 23310707, 23310707, 23311183, 23332062, 40004273, 40005002, 40005002, 40005810, 40005857, 40007407, 40007407, 40008578, 40014801, 40016240, 40020552, 40022736, 40030204, 40031019, 40039273, 40039273, 40040728, 40044069, 40048706, 40066523, 40074888, 40080274, 40082363, 40087353, 40088364, 40088512, 40090400, 40093243, 40096329, 40097147, 40099108, 40099108, 40100022, 40103831, 40104094, 40106381, 40108151, 40113338, 40114559, 40130436, 40136338, 40137723, 40140100, 40144256, 40144256, 40147753, 40171544, 40172243, 40173852, 40185846, 40188699, 40189205, 40191782, 40192433, 40192452, 40199959, 40201213, 40204737, 40214610, 40215672, 40217380, 40220230, 40231315, 40231776, 40239799, 40241602, 40243986, 40245042, 40246974, 40252925, 40254405, 40255803, 40257178, 40259147, 40259435, 40261585, 40264508, 40266935, 40270926, 40272078, 40275439, 40293157, 40293183, 40296160, 40303778, 40309917, 40316849, 40320986, 40331065, 40333188, 40339779, 40342537, 40345973, 40350250, 40351072, 40354938, 40361124, 40362732, 40366883, 40366883, 40373877, 40382136, 40382260, 40392599, 40392652, 40393970, 40394909, 40402465, 40404360, 40405082, 40405082, 40406885, 40406885, 40409422, 40414442, 40418294, 40418613, 40432427, 40437737, 40443608, 40443888, 40444105, 40446644, 40448699, 40450595, 40450871, 40452970, 40452970, 40455442, 40467832, 40473881, 40479115, 40479452, 40479596, 40480823, 40480823, 40487265, 40488102, 40488725, 40490272, 40493059, 40493088, 40496479, 40497851, 40501311, 40503324, 40506011, 40507460, 40511723, 40513494, 40513494, 40520883, 40525739, 40527738, 40530677, 40530816, 40531757, 40536959, 40536959, 40537603, 40537831, 40540709, 40544403, 40544737, 40547989, 40549529, 40550524, 40553143, 40557369, 40557524, 40558626, 40559053, 40561659, 40562821, 40563504, 40564382, 40564389, 40564512, 40564828, 40564849, 40564905, 40565143, 40565174, 40565291, 40565509, 40565520, 40565563, 40565772, 40566354, 40566596, 40566811, 40567495, 40567516, 40567778, 40567844, 40568010, 40568105, 40568543, 40569200, 40569232, 40569539, 40569914, 40570266, 40570276, 40570566, 40570878, 40570901, 40571240, 40571475, 40571488, 40572427, 40572538, 40572611, 40572694, 40572836, 40574472, 40576855, 40577502, 40577561, 40578508, 40578650, 40579199, 40579911, 40580124, 40580290, 40581210, 40581210, 40581302, 40581354, 40581423, 40581692, 40581807, 40582191, 40582397, 40586052, 40587327, 40587592, 40588362, 40589053, 40594541, 40594664, 40595586, 40598283, 40598746, 40598891, 40598926, 40599327, 40600255, 40600514, 40600610, 40604152, 40604326, 40605359, 40621653, 40624432, 40626413, 40626880, 40626970, 40627492], "handles": null, "rounds": [{ @@ -66,7 +70,7 @@ "rated": 1, "pointTotal": 925987.91, "ovarallRank": null, - "numSubmissions": 55 + "numOfSubmissions": 55 } }], "problemId": 14733, @@ -81,9 +85,11 @@ "status": "PAST", "startDate": "2016-07-01T19:36:00.000Z", "endDate": "2016-07-01T19:36:00.000Z", - "track": "DATA_SCIENCE", + "legacy": { + "track": "DATA_SCIENCE" + }, "subTrack": "MARATHON_MATCH", - "numRegistrants": null, + "numOfRegistrants": null, "userIds": [154140, 269874, 272273, 278182, 278995, 288224, 295533, 299658, 346860, 7213681, 7218883, 7442498, 7454975, 7456002, 7486189, 7524742, 8351376, 8368688, 8378182, 8447720, 8534923, 10223128, 10389461, 10407399, 10410959, 10597114, 10622349, 10622813, 10651584, 10697386, 11789293, 11943911, 11960667, 13298470, 13365783, 13386938, 14850928, 14883513, 15217330, 15580072, 15620282, 15700523, 15759076, 21050876, 21074047, 21245720, 21260340, 21348747, 21841130, 22653678, 22654637, 22657324, 22667224, 22668509, 22672939, 22673010, 22676578, 22678451, 22681556, 22685471, 22686050, 22686885, 22687885, 22691367, 22691875, 22704193, 22704223, 22709036, 22709401, 22710961, 22712353, 22714511, 22720311, 22724786, 22724890, 22729347, 22735770, 22740598, 22741497, 22741638, 22744390, 22746169, 22747887, 22748602, 22748809, 22753197, 22763515, 22771322, 22772927, 22773629, 22774059, 22774534, 22774543, 22774735, 22774947, 22776986, 22826877, 22827765, 22830782, 22830911, 22832535, 22835245, 22837526, 22845571, 22849993, 22851426, 22851534, 22851695, 22854301, 22856136, 22856405, 22857667, 22860727, 22866234, 22866292, 22875797, 22881290, 22885065, 22886024, 22887668, 22889926, 22891205, 22892489, 22893041, 22895494, 22902778, 22902990, 22903221, 22904497, 22904503, 22906600, 22908168, 22910325, 22912943, 22913151, 22914111, 22914334, 22919728, 22923197, 22924440, 22925924, 22927475, 22930463, 22936420, 22938207, 23002104, 23004444, 23005048, 23006918, 23007392, 23014542, 23017446, 23018445, 23019419, 23022099, 23022695, 23029708, 23032149, 23037218, 23038038, 23038899, 23039183, 23043893, 23046001, 23047213, 23048327, 23049553, 23060302, 23060949, 23061767, 23061953, 23070173, 23070641, 23070657, 23070734, 23072035, 23073943, 23075604, 23077395, 23079943, 23080596, 23083557, 23084510, 23087191, 23090167, 23093966, 23095394, 23097902, 23100339, 23100953, 23100980, 23101059, 23101081, 23101315, 23102361, 23102940, 23104345, 23105719, 23107697, 23108023, 23108439, 23108623, 23112493, 23116063, 23116075, 23117698, 23119181, 23119757, 23124403, 23125504, 23127980, 23128049, 23128986, 23132066, 23133685, 23134944, 23135019, 23135687, 23135828, 23138103, 23139753, 23140177, 23145576, 23148540, 23149729, 23151567, 23155371, 23155492, 23156903, 23156915, 23157098, 23160221, 23160794, 23184582, 23184834, 23195087, 23200855, 23202082, 23202937, 23274070, 23292810, 23293318, 23302899, 23307371, 23309814, 23309825, 23332647, 40001257, 40004159, 40005002, 40005810, 40007407, 40021371, 40033982, 40047615, 40048545, 40056331, 40057691, 40061486, 40062829, 40063560, 40064456, 40066329, 40067461, 40068262, 40068271, 40074153, 40074818, 40078304, 40078665, 40082879, 40087294, 40088364, 40088512, 40090400, 40090611, 40091871, 40094376, 40096710, 40098002, 40100067, 40100985, 40113361, 40114315, 40143464, 40144256, 40169606, 40171293, 40178963, 40179229, 40181241, 40181568, 40183109, 40188938, 40192587, 40192860, 40194929, 40199959, 40200221, 40202985, 40204368, 40205303, 40206067, 40207670, 40210548, 40210613, 40210665, 40213206, 40214489, 40215779, 40217185, 40219699, 40220714, 40220917, 40224034, 40224563, 40227481, 40233048, 40234303, 40234331, 40236485, 40237717, 40242737, 40243674, 40243869, 40244398, 40246318, 40247029, 40250420, 40250885, 40253929, 40254603, 40255353, 40256114, 40259287, 40259717, 40260287, 40263733, 40265124, 40267774, 40267805, 40272727, 40272788, 40275927, 40278661, 40278748, 40282544, 40283914, 40284020, 40285475, 40289457, 40295694, 40296802, 40305675, 40309798, 40312517, 40313123, 40314028, 40319457, 40321860, 40324216, 40325141, 40326063, 40327774, 40331705, 40332631, 40337197, 40338897, 40339564, 40341972, 40342537, 40342983, 40347683, 40351145, 40351980, 40352132, 40352345, 40352844, 40355569, 40356777, 40358242, 40358649, 40358790, 40361537, 40362263, 40362879, 40363213, 40363533, 40364699, 40369248, 40369400, 40369686, 40375460, 40377128, 40378058, 40380344, 40380865, 40380879, 40381328, 40381516, 40382590, 40386073, 40389458, 40390334, 40391430, 40391788, 40393144, 40394268, 40394701, 40395226, 40396292, 40396939, 40397138, 40419332, 40431793, 40445620, 40446698, 40448856, 40450235, 40453619, 40453872, 40454407, 40454568, 40456037, 40456117, 40456616, 40457254, 40457312, 40457501, 40457659, 40458164, 40458449, 40458819, 40459217, 40459388, 40459442, 40460262, 40460306, 40460587, 40461042, 40462020, 40462061, 40462750, 40464922, 40465528], "handles": null, "rounds": [{ @@ -104,7 +110,7 @@ "rated": 1, "pointTotal": 99.22, "ovarallRank": null, - "numSubmissions": 3 + "numOfSubmissions": 3 } }], "problemId": 14363, @@ -119,9 +125,11 @@ "status": "PAST", "startDate": "2016-05-06T13:11:00.000Z", "endDate": "2016-05-06T13:11:00.000Z", - "track": "DATA_SCIENCE", + "legacy": { + "track": "DATA_SCIENCE" + }, "subTrack": "MARATHON_MATCH", - "numRegistrants": null, + "numOfRegistrants": null, "userIds": [142908, 151743, 151743, 279175, 293608, 295809, 296689, 299068, 7213681, 7442498, 7481999, 7486189, 7488783, 8351376, 8415179, 8445979, 9916266, 10597114, 10664765, 11789293, 11793516, 11928645, 13274356, 13281173, 13365783, 14867032, 14883513, 15151937, 15180452, 15391415, 15580072, 15599488, 15722497, 15781032, 16017427, 16286638, 19938079, 20680885, 20765681, 21407357, 21411972, 21866691, 22412992, 22627064, 22627112, 22630158, 22630232, 22630497, 22635191, 22637267, 22640357, 22651906, 22652845, 22655287, 22658052, 22663924, 22667224, 22668870, 22671291, 22671608, 22680214, 22686050, 22686590, 22686885, 22688672, 22690116, 22690327, 22691355, 22698098, 22698830, 22700085, 22700843, 22704303, 22704672, 22704801, 22708072, 22711181, 22718910, 22723258, 22723321, 22735770, 22736823, 22739669, 22742639, 22745596, 22746398, 22746456, 22749362, 22750962, 22752626, 22753197, 22754202, 22759498, 22768416, 22769001, 22769513, 22772511, 22773629, 22774059, 22774534, 22775072, 22775328, 22776011, 22778882, 22779022, 22779022, 22788800, 22789553, 22792908, 22793803, 22794225, 22820771, 22821001, 22825438, 22827337, 22827765, 22828541, 22830782, 22831125, 22837733, 22839528, 22840269, 22842716, 22843062, 22845163, 22849993, 22850373, 22851067, 22854046, 22854046, 22854212, 22857866, 22862481, 22863278, 22869667, 22874592, 22875790, 22875864, 22880063, 22880988, 22881559, 22883575, 22885145, 22885430, 22886024, 22886772, 22886819, 22887668, 22887777, 22895494, 22897296, 22900997, 22902778, 22903595, 22908058, 22908168, 22908168, 22908615, 22910325, 22917960, 22918510, 22921130, 22921568, 22923054, 22923352, 22924902, 22927726, 22929867, 22934252, 22938617, 23007222, 23007392, 23014314, 23016457, 23017314, 23022695, 23023538, 23026150, 23028047, 23032874, 23036027, 23041060, 23044638, 23044783, 23046001, 23047804, 23052854, 23065483, 23065609, 23070656, 23072396, 23072596, 23073157, 23074259, 23076137, 23076347, 23077395, 23079284, 23080306, 23082619, 23086074, 23086763, 23092404, 23094828, 23098184, 23100414, 23100954, 23100980, 23101046, 23101424, 23102281, 23102542, 23102940, 23105260, 23106761, 23106916, 23108754, 23112987, 23114169, 23118563, 23120215, 23122214, 23122959, 23123632, 23123669, 23124115, 23125273, 23125504, 23126283, 23127404, 23127692, 23127980, 23127980, 23128049, 23128776, 23128883, 23129652, 23130114, 23132066, 23132066, 23133000, 23134944, 23139211, 23139220, 23140177, 23147327, 23150794, 23151567, 23152336, 23155371, 23159762, 23160532, 23162763, 23168056, 23176484, 23179943, 23184924, 23188776, 23192532, 23197396, 23198223, 23198757, 23202924, 23234803, 23278975, 23279396, 23283610, 23283906, 23288665, 23290206, 23297195, 23300447, 23300521, 23301671, 23304700, 23305574, 23306597, 23307774, 23309496, 23309546, 23320928, 23323428, 23330618, 40001257, 40005002, 40005810, 40007407, 40007407, 40009115, 40010714, 40020024, 40026260, 40029145, 40032295, 40032589, 40034358, 40037314, 40039485, 40040405, 40044770, 40056188, 40059065, 40061863, 40062829, 40063127, 40064981, 40065599, 40066065, 40066242, 40066625, 40067461, 40067461, 40069457, 40070692, 40072908, 40072930, 40073742, 40075054, 40075561, 40075671, 40080692, 40081537, 40081669, 40082394, 40084125, 40085239, 40086566, 40088180, 40088364, 40088512, 40088701, 40090611, 40091871, 40093687, 40096911, 40100111, 40102877, 40103984, 40107604, 40113361, 40124023, 40140100, 40141423, 40144256, 40144969, 40147646, 40149844, 40153583, 40167235, 40167842, 40183109, 40183109, 40186683, 40191031, 40191492, 40191778, 40191782, 40192860, 40193540, 40194435, 40194933, 40195993, 40196390, 40200221, 40202018, 40204737, 40207513, 40207670, 40212329, 40213206, 40214489, 40214903, 40218877, 40219415, 40220361, 40221271, 40222205, 40224106, 40224472, 40229150, 40231315, 40233706, 40234126, 40234399, 40234861, 40235957, 40237646, 40241602, 40244221, 40245250, 40246611, 40246639, 40247073, 40251078, 40254405, 40257255, 40258456, 40258608, 40259383, 40259530, 40259691, 40261342, 40262800, 40262973, 40263629, 40265406, 40265492, 40265905, 40267134, 40269829, 40274368, 40280039, 40282512, 40283567, 40285217, 40288654, 40292200, 40292943, 40293431, 40293928, 40296279, 40303778, 40303991, 40304139, 40304510, 40305468, 40306100, 40310003, 40313244, 40313677, 40314769, 40316574, 40316924, 40318475, 40320986, 40324321, 40324495, 40324629, 40325667, 40326039, 40326874, 40329558, 40329971, 40330223, 40331322, 40332666, 40334304, 40334968, 40338325, 40339970, 40340301, 40340435, 40340469, 40342754, 40347683, 40347857, 40352345, 40353605, 40355723, 40355761, 40356777, 40357095, 40357972, 40358124, 40359327, 40361361, 40361537, 40362767, 40363459, 40364310, 40364585, 40366499, 40367795, 40369248, 40369400, 40370272, 40372057, 40372223, 40372380, 40373244, 40373700, 40375460, 40378989, 40380802, 40380879, 40381462, 40382590, 40384005, 40384505, 40384803, 40385125, 40385394, 40385403, 40386451, 40387078, 40387351, 40388271, 40388603, 40390870, 40391430, 40391939, 40394555, 40396739, 40397420, 40397575, 40397639, 40397997, 40403127, 40414455, 40423451, 40426689, 40427723, 40431286, 40433248, 40436953, 40438898, 40441921, 40444049, 40444320, 40450235, 40450314, 40450918, 40452934, 40455903, 40457312, 40457633, 40460918, 40464919, 40469765, 40470531, 40473175, 40474803, 40476142, 40476158, 40476834, 40477287, 40477855, 40478009, 40478522, 40478650, 40478901, 40478913, 40479144, 40479330, 40479909, 40480417, 40480837, 40480933, 40481451, 40481769, 40482187, 40482585, 40482994, 40483072, 40483713, 40483756, 40483895, 40483949, 40484117, 40493705, 40504027, 40508627, 40513900, 40546706, 40572860, 40578481, 40582837, 40598280, 40599650, 40602371, 40606816, 40608419, 40618557, 40620604, 40623546, 40623721, 40623736, 40623755, 40623780, 40623843, 40623863, 40623880, 40624049, 40624183, 40624262, 40624322, 40624431, 40624470, 40625076, 40625201, 40625266, 40625395, 40625427, 40625451, 40625622, 40625810, 40626032, 40626643, 40627777, 40628756, 40630725], "handles": null, "rounds": [{ diff --git a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap b/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap index 8aefa3004f..e93e79feae 100644 --- a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap @@ -60,11 +60,6 @@ exports[`Matches shallow shapshot 1`] = `
- - View Past SRMS - diff --git a/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/GalleryModal/__mocks__/challenge.json b/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/GalleryModal/__mocks__/challenge.json index 2209a6c407..9721622011 100644 --- a/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/GalleryModal/__mocks__/challenge.json +++ b/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/GalleryModal/__mocks__/challenge.json @@ -83,9 +83,11 @@ "name": "2016 Topcoder Open Logo Design Challenge", "reviewType": "INTERNAL", "id": 30051059, - "forumId": 598066, - "numSubmissions": 57, - "numRegistrants": 111, + "legacy": { + "forumId": 598066 + }, + "numOfSubmissions": 57, + "numOfRegistrants": 111, "registrationStartDate": "2015-08-10T13:00:01.576Z", "registrationEndDate": "2015-08-24T13:17:15.335Z", "checkpointSubmissionEndDate": "2015-08-17T13:10:56.385Z", diff --git a/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__mocks__/develop.json b/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__mocks__/develop.json index efe6e65eea..bde784385f 100644 --- a/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__mocks__/develop.json +++ b/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__mocks__/develop.json @@ -35,9 +35,11 @@ "name": "$100 Eaton PX 2.0 Petting Zoo - MDC Web Enhancement F2F Challenge", "reviewType": "INTERNAL", "id": 30060905, - "forumId": 39153, - "numSubmissions": 3, - "numRegistrants": 8, + "legacy": { + "forumId": 39153 + }, + "numOfSubmissions": 3, + "numOfRegistrants": 8, "registrationStartDate": "2017-12-02T09:01:23.251Z", "registrationEndDate": "2017-12-12T20:01:00.000Z", "checkpointSubmissionEndDate": null, @@ -189,9 +191,11 @@ "name": "$100 Eaton PX 2.0 Petting Zoo - ReactJS Enhancement F2F Challenge", "reviewType": "INTERNAL", "id": 30060903, - "forumId": 39151, - "numSubmissions": 2, - "numRegistrants": 6, + "legacy": { + "forumId": 38951 + }, + "numOfSubmissions": 2, + "numOfRegistrants": 6, "registrationStartDate": "2017-12-02T09:01:21.329Z", "registrationEndDate": "2017-12-12T20:01:00.000Z", "checkpointSubmissionEndDate": null, @@ -385,9 +389,11 @@ "name": "$500 BG800 Online Course Mock Rest API F2F Challenge", "reviewType": "INTERNAL", "id": 30060687, - "forumId": 38951, - "numSubmissions": 14, - "numRegistrants": 18, + "legacy": { + "forumId": 38951 + }, + "numOfSubmissions": 14, + "numOfRegistrants": 18, "registrationStartDate": "2017-11-24T13:27:44.751Z", "registrationEndDate": "2017-12-05T22:27:00.000Z", "checkpointSubmissionEndDate": null, @@ -713,9 +719,11 @@ "name": "John Hancock - Giving Tuesday - General image handling", "reviewType": "INTERNAL", "id": 30060425, - "forumId": 38702, - "numSubmissions": 3, - "numRegistrants": 17, + "legacy": { + "forumId": 38702 + }, + "numOfSubmissions": 3, + "numOfRegistrants": 17, "registrationStartDate": "2017-11-11T02:02:21.127Z", "registrationEndDate": "2017-11-21T02:02:00.000Z", "checkpointSubmissionEndDate": null, diff --git a/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__snapshots__/index.jsx.snap b/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__snapshots__/index.jsx.snap index 682641267c..a753995d16 100644 --- a/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__snapshots__/index.jsx.snap @@ -107,15 +107,17 @@ exports[`SubtrackChallengeView matches shallow snapshot 1`] = ` "projectId": 30060905, }, ], - "forumId": 39153, "groupIds": null, "handle": "thomaskranitsas", "id": 30060905, "isPrivate": false, "isTask": false, + "legacy": Object { + "forumId": 39153, + }, "name": "$100 Eaton PX 2.0 Petting Zoo - MDC Web Enhancement F2F Challenge", - "numRegistrants": 8, - "numSubmissions": 3, + "numOfRegistrants": 8, + "numOfSubmissions": 3, "numberOfCheckpointPrizes": null, "platforms": "NodeJS", "pointPrizes": null, @@ -285,15 +287,17 @@ exports[`SubtrackChallengeView matches shallow snapshot 1`] = ` "projectId": 30060903, }, ], - "forumId": 39151, "groupIds": null, "handle": "thomaskranitsas", "id": 30060903, "isPrivate": false, "isTask": false, + "legacy": Object { + "forumId": 38951, + }, "name": "$100 Eaton PX 2.0 Petting Zoo - ReactJS Enhancement F2F Challenge", - "numRegistrants": 6, - "numSubmissions": 2, + "numOfRegistrants": 6, + "numOfSubmissions": 2, "numberOfCheckpointPrizes": null, "platforms": "NodeJS", "pointPrizes": null, @@ -633,15 +637,17 @@ exports[`SubtrackChallengeView matches shallow snapshot 1`] = ` "projectId": 30060687, }, ], - "forumId": 38951, "groupIds": null, "handle": "thomaskranitsas", "id": 30060687, "isPrivate": false, "isTask": false, + "legacy": Object { + "forumId": 38951, + }, "name": "$500 BG800 Online Course Mock Rest API F2F Challenge", - "numRegistrants": 18, - "numSubmissions": 14, + "numOfRegistrants": 18, + "numOfSubmissions": 14, "numberOfCheckpointPrizes": null, "platforms": "Heroku", "pointPrizes": null, @@ -867,15 +873,17 @@ exports[`SubtrackChallengeView matches shallow snapshot 1`] = ` "projectId": 30060425, }, ], - "forumId": 38702, "groupIds": null, "handle": "thomaskranitsas", "id": 30060425, "isPrivate": false, "isTask": false, + "legacy": Object { + "forumId": 38702, + }, "name": "John Hancock - Giving Tuesday - General image handling", - "numRegistrants": 17, - "numSubmissions": 3, + "numOfRegistrants": 17, + "numOfSubmissions": 3, "numberOfCheckpointPrizes": null, "platforms": "Other", "pointPrizes": null, diff --git a/__tests__/shared/components/SRMTile/__mocks__/srm.json b/__tests__/shared/components/SRMTile/__mocks__/srm.json index cf8d7a4557..a7da58fb9e 100644 --- a/__tests__/shared/components/SRMTile/__mocks__/srm.json +++ b/__tests__/shared/components/SRMTile/__mocks__/srm.json @@ -8,7 +8,7 @@ "endDate": "2016-12-22T15:50:00.000Z", "track": "DATA_SCIENCE", "subTrack": "SRM", - "numRegistrants": null, + "numOfRegistrants": null, "userIds": [266485, 301395, 7213681, 7235178, 7433858, 7465964, 7498652, 7509767, 8365685, 8382018, 8522467, 9946038, 10007399, 10428762, 10656309, 11948018, 13391735, 15391415, 15461293, 15493089, 15871976, 15906787, 15982182, 16122403, 20036655, 20463878, 20660311, 21159810, 21167875, 21245720, 21355006, 21494813, 21684580, 21792578, 22228040, 22263204, 22371875, 22376958, 22389733, 22639071, 22650894, 22652965, 22653720, 22653739, 22661109, 22668143, 22672205, 22672313, 22672395, 22673010, 22674919, 22678133, 22678179, 22680536, 22680722, 22681902, 22686512, 22691156, 22692190, 22695285, 22695775, 22703755, 22704094, 22705227, 22708497, 22708781, 22708888, 22711558, 22717415, 22725104, 22727305, 22729730, 22732328, 22742372, 22742745, 22742869, 22744229, 22744421, 22750076, 22750116, 22752170, 22752787, 22761052, 22762640, 22765775, 22768760, 22769838, 22770962, 22774457, 22775164, 22775236, 22776482, 22777715, 22779035, 22780336, 22781250, 22781763, 22825384, 22825496, 22825788, 22827452, 22827765, 22830668, 22831364, 22832482, 22832881, 22833170, 22834928, 22845163, 22847732, 22849803, 22853544, 22855656, 22858410, 22858920, 22859914, 22860847, 22868841, 22869302, 22873243, 22873911, 22874433, 22883353, 22884171, 22886772, 22890632, 22900820, 22902156, 22903001, 22905803, 22911856, 22913151, 22913270, 22913617, 22915046, 22917257, 22920820, 22922995, 22926972, 22931314, 22931612, 22933869, 22938252, 22938874, 23001310, 23004077, 23004373, 23005706, 23006104, 23006590, 23012335, 23012394, 23012630, 23014732, 23016887, 23017197, 23017229, 23019712, 23020366, 23021383, 23023058, 23027098, 23029875, 23037220, 23038640, 23039015, 23040837, 23041751, 23041966, 23043110, 23043241, 23043978, 23045559, 23046682, 23047783, 23048163, 23052405, 23053663, 23055874, 23056219, 23056329, 23057852, 23058599, 23060842, 23062614, 23063059, 23065319, 23066040, 23067244, 23068101, 23069947, 23069974, 23070455, 23071551, 23072305, 23073157, 23073673, 23077395, 23078844, 23079489, 23082681, 23083163, 23088219, 23091078, 23091447, 23093236, 23095834, 23107153, 23109226, 23116378, 23118419, 23120971, 23121158, 23123521, 23124930, 23125873, 23128666, 23134121, 23137532, 23138172, 23141587, 23144098, 23145641, 23145682, 23147895, 23154204, 23156914, 23159925, 23163420, 23163506, 23165472, 23169016, 23170396, 23173587, 23176456, 23177540, 23177901, 23178540, 23178732, 23179013, 23181754, 23182927, 23183316, 23183956, 23184967, 23188035, 23191835, 23193535, 23193893, 23194448, 23195123, 23195873, 23197496, 23198340, 23198796, 23198891, 23198984, 23199241, 23200491, 23264645, 23280672, 23280766, 23281853, 23282565, 23282621, 23282821, 23285209, 23286857, 23287405, 23290110, 23290653, 23290886, 23291303, 23292354, 23292543, 23295145, 23295550, 23300571, 23303446, 23303941, 23303988, 23307140, 23307169, 23308414, 23309737, 23309814, 23310075, 23310521, 23310881, 23319881, 23325916, 23326100, 23330595, 23330637, 23331383, 23331825, 23331977, 23332142, 23332550, 23332649, 23332759, 40000966, 40008634, 40011126, 40013653, 40014456, 40016057, 40016077, 40020549, 40021276, 40023674, 40031966, 40037123, 40042234, 40043567, 40044946, 40050596, 40050675, 40052238, 40053483, 40058615, 40062333, 40064851, 40065809, 40066523, 40068326, 40068670, 40072046, 40074735, 40075691, 40084025, 40086013, 40086608, 40092337, 40096420, 40096587, 40096705, 40096990, 40098836, 40100022, 40100532, 40111760, 40113645, 40121531, 40134593, 40142307, 40142346, 40143261, 40144256, 40147034, 40152826, 40152974, 40153899, 40160431, 40162728, 40168703, 40168712, 40169827, 40172809, 40175992, 40176228, 40176863, 40178551, 40184826, 40188138, 40188699, 40190121, 40191641, 40191948, 40193188, 40198422, 40199223, 40201270, 40208608, 40208780, 40208999, 40213809, 40214643, 40216306, 40216413, 40218088, 40220813, 40222663, 40222696, 40225109, 40225753, 40226871, 40227838, 40228580, 40232383, 40234235, 40235986, 40238397, 40239784, 40241352, 40243308, 40247232, 40248062, 40251903, 40251987, 40259418, 40260906, 40265767, 40269829, 40271000, 40271137, 40272916, 40274665, 40280632, 40284920, 40286679, 40289017, 40293262, 40303238, 40311909, 40312894, 40314269, 40315441, 40315816, 40320210, 40322007, 40323387, 40327489, 40329393, 40331964, 40332174, 40334703, 40335172, 40337760, 40340114, 40349766, 40355982, 40356402, 40356788, 40357518, 40358602, 40359593, 40364957, 40365350, 40365747, 40367337, 40367904, 40371027, 40371988, 40373803, 40378124, 40378363, 40378978, 40379086, 40379406, 40380304, 40380329, 40380397, 40384694, 40384860, 40387452, 40387620, 40388376, 40389017, 40391420, 40392652, 40394081, 40396035, 40396069, 40396615, 40400566, 40400579, 40402098, 40404036, 40405018, 40406885, 40411254, 40415665, 40416032, 40419928, 40432360, 40435643, 40436249, 40436368, 40440099, 40440905, 40442501, 40443509, 40443778, 40448003, 40448395, 40451450, 40451827, 40452315, 40452508, 40453194, 40453209, 40453430, 40453519, 40458659, 40460198, 40460695, 40463023, 40465850, 40466279, 40466681, 40479452, 40481989, 40482797, 40484379, 40485413, 40488524, 40490510, 40493147, 40493248, 40494556, 40494673, 40498299, 40504145, 40504430, 40504935, 40505113, 40507280, 40507665, 40508050, 40508832, 40508946, 40510298, 40512188, 40512706, 40513220, 40513429, 40514328, 40518710, 40518815, 40519189, 40519196, 40519205, 40520411, 40521001, 40521723, 40523384, 40523398, 40524659, 40524664, 40524675, 40524720, 40524855, 40525572, 40527476, 40527968, 40528235, 40529051, 40529054, 40529155, 40529288, 40529370, 40529504, 40529560, 40529630, 40529708, 40529752, 40529766, 40529769, 40529770, 40529773], "handles": null, "rounds": [{ @@ -43,7 +43,7 @@ "endDate": "2016-10-02T23:12:00.000Z", "track": "DATA_SCIENCE", "subTrack": "SRM", - "numRegistrants": null, + "numOfRegistrants": null, "userIds": [7433858, 7465964, 7509767, 7556252, 8368280, 9946038, 10241917, 10318424, 11948018, 13386609, 13391735, 14883513, 14893757, 15391415, 15726636, 15906787, 20036655, 20390888, 20394568, 20539063, 21198267, 21206857, 21355006, 21494813, 21550746, 21684580, 22006800, 22074760, 22263204, 22376958, 22629065, 22650492, 22653720, 22654637, 22656432, 22660647, 22669247, 22671912, 22671942, 22672313, 22673703, 22674371, 22676578, 22677219, 22682274, 22687201, 22688641, 22692048, 22692969, 22695310, 22697421, 22697551, 22697669, 22700926, 22701199, 22708497, 22708857, 22711558, 22711754, 22714541, 22716052, 22722444, 22724786, 22725462, 22732328, 22732653, 22733349, 22742408, 22743106, 22758647, 22759815, 22762715, 22765174, 22765382, 22767373, 22767514, 22768541, 22768895, 22769598, 22769838, 22771586, 22772844, 22774457, 22776482, 22776706, 22777037, 22777715, 22779035, 22780295, 22780336, 22781250, 22794555, 22821794, 22826091, 22827452, 22827765, 22829161, 22829908, 22830668, 22832482, 22834928, 22835542, 22836556, 22837156, 22846822, 22847732, 22849803, 22853544, 22855656, 22856286, 22856412, 22857354, 22858597, 22858920, 22859914, 22860847, 22862136, 22862541, 22864722, 22866092, 22866988, 22868771, 22871255, 22873934, 22874433, 22874858, 22876605, 22878263, 22879171, 22880305, 22880713, 22883014, 22886024, 22886772, 22887016, 22887412, 22887794, 22888943, 22891474, 22891945, 22893344, 22894004, 22894972, 22895602, 22895775, 22898655, 22899888, 22902156, 22902404, 22902943, 22903187, 22903407, 22904231, 22905074, 22905995, 22906600, 22908185, 22908380, 22908703, 22910064, 22910350, 22912484, 22913151, 22913270, 22916803, 22917664, 22919508, 22919573, 22920820, 22922995, 22925717, 22926197, 22928749, 22929581, 22931612, 22933869, 22934999, 22936500, 22938252, 22938874, 22939087, 22939096, 22939479, 23000964, 23002370, 23004077, 23004552, 23004671, 23005706, 23005758, 23006104, 23006590, 23008568, 23008895, 23010351, 23012552, 23012630, 23013040, 23014732, 23016887, 23017197, 23017229, 23018456, 23020366, 23020794, 23021261, 23024010, 23026107, 23027339, 23028519, 23029875, 23030926, 23033029, 23038709, 23039113, 23043110, 23044012, 23045182, 23045559, 23046682, 23047783, 23048163, 23048982, 23051763, 23052405, 23054352, 23055874, 23056219, 23056321, 23056329, 23057547, 23057753, 23058389, 23058599, 23059178, 23059200, 23059212, 23061009, 23063059, 23065319, 23067634, 23069277, 23069974, 23070403, 23070889, 23071189, 23071551, 23071944, 23074006, 23074064, 23075112, 23077395, 23077935, 23078227, 23079117, 23080021, 23080427, 23080673, 23081452, 23082681, 23082763, 23083560, 23083668, 23089515, 23089721, 23090167, 23091078, 23091339, 23091680, 23091729, 23091955, 23093404, 23097360, 23106702, 23107153, 23107936, 23110866, 23111587, 23111671, 23112949, 23113968, 23115770, 23117347, 23117874, 23118455, 23118844, 23120971, 23123521, 23124194, 23125873, 23127079, 23129662, 23134585, 23135669, 23136468, 23137068, 23137245, 23137532, 23138492, 23144973, 23145682, 23149222, 23152753, 23152984, 23153462, 23155906, 23159706, 23164552, 23167065, 23167772, 23169016, 23170698, 23171321, 23174063, 23174728, 23175292, 23176456, 23177540, 23177612, 23177664, 23177901, 23178517, 23178732, 23181754, 23184967, 23185082, 23185127, 23186910, 23187188, 23190539, 23190917, 23192667, 23192902, 23192950, 23193535, 23193893, 23194929, 23195123, 23195610, 23195825, 23195827, 23196001, 23196036, 23196528, 23196599, 23197270, 23197496, 23198037, 23198796, 23199430, 23201595, 23202082, 23202929, 23203299, 23264360, 23264458, 23264645, 23264835, 23264897, 23265219, 23265838, 23270226, 23271324, 23279106, 23280011, 23280672, 23281294, 23281981, 23282565, 23282615, 23282654, 23282665, 23282697, 23283168, 23283203, 23283318, 23284997, 23285007, 23285916, 23286857, 23287658, 23288531, 23288855, 23288917, 23288971, 23289844, 23290110, 23290653, 23290922, 23290947, 23291046, 23291249, 23291772, 23292354, 23292606, 23293877, 23295143, 23295145, 23300976, 23301361, 23302899, 23302950, 23303988, 23304045, 23304444, 23304700, 23304870, 23305191, 23305613, 23306751, 23307140, 23308778, 23309653, 23309737, 23309925, 23309991, 23310179, 23310390, 23311341, 23320327, 23323275, 23324888, 23324929, 23325562, 23327723, 23328251, 23328478, 23328732, 23330048, 23330187, 23330637, 23330770, 23331266, 23331450, 23331825, 23331829, 23332085, 23332368, 23332416, 23332489, 23332550, 23332606, 23332757, 23332759, 23332761, 40000743, 40002618, 40002886, 40005002, 40005028, 40006027, 40007621, 40010011, 40010339, 40011126, 40013074, 40014695, 40015063, 40015515, 40015964, 40017798, 40018801, 40020549, 40021199, 40021580, 40022227, 40024581, 40026477, 40028459, 40029156, 40031451, 40031712, 40031966, 40033675, 40034207, 40035953, 40036836, 40037235, 40038847, 40040114, 40042734, 40043567, 40043807, 40043862, 40044659, 40047611, 40048670, 40049326, 40050596, 40051804, 40052238, 40052831, 40054036, 40054352, 40054561, 40056709, 40062936, 40063963, 40064432, 40065078, 40068014, 40068212, 40068880, 40069835, 40071551, 40075691, 40075757, 40083550, 40083893, 40084271, 40085297, 40086013, 40086564, 40090239, 40090976, 40092337, 40092522, 40092818, 40093481, 40095342, 40095387, 40096979, 40096996, 40097047, 40097825, 40098495, 40098836, 40099089, 40099602, 40099699, 40100022, 40100622, 40102774, 40102958, 40105220, 40105242, 40105375, 40105804, 40112944, 40113904, 40117377, 40123074, 40125919, 40130436, 40132618, 40133486, 40133915, 40134657, 40135263, 40143224, 40143261, 40144195, 40147034, 40152826, 40153311, 40153899, 40157503, 40159546, 40160692, 40164137, 40164199, 40167277, 40168291, 40169827, 40171694, 40172727, 40176571, 40179542, 40184901, 40185543, 40186248, 40187940, 40188699, 40191948, 40192063, 40195531, 40195969, 40197613, 40198422, 40200371, 40200645, 40202111, 40202299, 40202612, 40203233, 40204284, 40204447, 40205966, 40208609, 40208780, 40211709, 40212745, 40215164, 40215248, 40218377, 40222696, 40224076, 40225366, 40231592, 40233295, 40234235, 40243308, 40246497, 40246821, 40251987, 40252648, 40255921, 40260799, 40263774, 40265485, 40267328, 40269829, 40270670, 40270737, 40272078, 40275401, 40275716, 40279335, 40279949, 40282948, 40284920, 40286323, 40286679, 40288983, 40289017, 40289055, 40289845, 40289998, 40295993, 40296100, 40298739, 40304079, 40304909, 40305153, 40307067, 40311650, 40312997, 40314269, 40316255, 40317744, 40318341, 40318348, 40318396, 40321505, 40322007, 40324126, 40326873, 40329393, 40330130, 40331964, 40332002, 40332105, 40332174, 40333188, 40337341, 40339127, 40339860, 40340114, 40341537, 40341905, 40342488, 40343189, 40348958, 40350820, 40351721, 40355982, 40356148, 40356800, 40358227, 40358803, 40364600, 40364633, 40366381, 40366883, 40367337, 40371988, 40372843, 40375339, 40375363, 40378124, 40379406, 40379814, 40380443, 40381281, 40382230, 40384860, 40385045, 40387452, 40387863, 40388976, 40389017, 40389137, 40389538, 40392072, 40395290, 40396315, 40396613, 40398609, 40401230, 40401871, 40402098, 40405018, 40406828, 40407595, 40408660, 40409210, 40409945, 40410558, 40410604, 40410641, 40413967, 40417498, 40418742, 40419679, 40424535, 40428334, 40432360, 40433262, 40433281, 40433285, 40433291, 40434257, 40434413, 40436368, 40436734, 40439863, 40441190, 40443509, 40446059, 40447295, 40448273, 40448699, 40449709, 40450818, 40451652, 40451712, 40453194, 40453267, 40455589, 40455611, 40455940, 40455949, 40457969, 40459552, 40459684, 40460258, 40460794, 40461170, 40461272, 40463006, 40465828, 40466021, 40466132, 40466277, 40466279, 40466373, 40466668, 40466677, 40466678, 40466681, 40466682, 40466683, 40466827, 40469488, 40469768, 40469781, 40474400, 40474551, 40476914, 40477940, 40479452, 40479988, 40480227, 40480474, 40481082, 40483365, 40483413, 40483726, 40484044, 40484544, 40485984, 40486190, 40486392, 40487209, 40488524, 40488624, 40489136, 40491086, 40491484, 40491637, 40491638, 40491639, 40491642, 40491645, 40491648, 40493248, 40493839, 40493871, 40494329, 40494530, 40494531, 40494560, 40494646, 40494668, 40494674, 40495385, 40497193, 40498474, 40498590, 40498806, 40498821, 40499538, 40500511, 40500771, 40501046, 40501164, 40501203, 40501218, 40501221, 40501225, 40501228, 40501231, 40501255, 40501260, 40501265, 40501268, 40501271, 40501276, 40501280, 40501283, 40501284], "handles": null, "rounds": [{ @@ -78,7 +78,7 @@ "endDate": "2016-08-27T16:28:00.000Z", "track": "DATA_SCIENCE", "subTrack": "SRM", - "numRegistrants": null, + "numOfRegistrants": null, "userIds": [267465, 7433858, 7505741, 8368280, 8447720, 8503625, 9946038, 10284391, 10318424, 10574855, 10575248, 11948018, 14883513, 14893757, 14946025, 14970299, 15026727, 15062676, 15391415, 15461293, 15906787, 15917952, 15982182, 20315020, 20390888, 20394568, 20539063, 20814026, 21050876, 21098789, 21206857, 21684580, 21758810, 21761868, 21792578, 21971539, 22006800, 22099200, 22263204, 22376958, 22383062, 22389733, 22511877, 22649374, 22650492, 22653715, 22653720, 22654637, 22655001, 22659399, 22660647, 22670870, 22671912, 22672313, 22672593, 22673760, 22674124, 22674919, 22675049, 22675075, 22676578, 22677219, 22677899, 22678133, 22678266, 22680649, 22682274, 22687201, 22690046, 22690147, 22691156, 22692740, 22695459, 22695775, 22696379, 22697669, 22700610, 22700926, 22702552, 22704094, 22704801, 22706183, 22707084, 22709993, 22710037, 22711053, 22711282, 22711558, 22711754, 22716052, 22718833, 22720155, 22725462, 22727735, 22727863, 22729136, 22729633, 22732328, 22734278, 22735731, 22743106, 22744169, 22744380, 22750422, 22750962, 22752177, 22756269, 22758011, 22761052, 22761404, 22765135, 22765174, 22767514, 22768416, 22769598, 22772169, 22772844, 22776482, 22776706, 22777715, 22779744, 22820027, 22821794, 22825384, 22825496, 22825736, 22826721, 22826853, 22827199, 22827443, 22827765, 22830668, 22831584, 22832123, 22833021, 22835809, 22843062, 22844098, 22845501, 22847157, 22849617, 22853544, 22856213, 22856375, 22857354, 22858410, 22858597, 22862779, 22864195, 22864722, 22864797, 22868771, 22868841, 22868892, 22874055, 22874433, 22876605, 22881628, 22883014, 22883353, 22884752, 22886024, 22886772, 22887016, 22890632, 22891546, 22895459, 22895775, 22899888, 22900820, 22902404, 22903476, 22903559, 22904231, 22904246, 22904757, 22905803, 22906585, 22906884, 22908185, 22908703, 22908863, 22909326, 22909953, 22910325, 22911524, 22911856, 22913151, 22916803, 22918502, 22920820, 22921292, 22922995, 22923067, 22924554, 22926197, 22926593, 22930307, 22931612, 22931891, 22932098, 22933869, 22935383, 22936362, 22936500, 22937224, 22938252, 23000964, 23001524, 23003375, 23006590, 23008895, 23010351, 23011870, 23012431, 23012630, 23013040, 23017197, 23018456, 23019007, 23020366, 23020980, 23031072, 23031155, 23031661, 23034101, 23036443, 23036542, 23036937, 23038709, 23041441, 23041966, 23043110, 23043513, 23043978, 23044100, 23044636, 23045182, 23045559, 23045863, 23046908, 23047783, 23048122, 23048163, 23051763, 23052405, 23052702, 23053467, 23053688, 23056219, 23056329, 23058003, 23058599, 23060652, 23060949, 23062614, 23063059, 23063688, 23067244, 23067634, 23067689, 23068402, 23069215, 23069277, 23069805, 23069974, 23069988, 23071189, 23071551, 23072000, 23072620, 23074006, 23075173, 23075271, 23075627, 23077117, 23077395, 23078492, 23079117, 23079341, 23080021, 23081311, 23081452, 23082681, 23082763, 23086940, 23088634, 23089721, 23091078, 23092638, 23093236, 23094829, 23095798, 23097360, 23098513, 23098903, 23103568, 23104709, 23106702, 23106786, 23106841, 23107936, 23109951, 23110286, 23111332, 23111671, 23114445, 23115251, 23117097, 23117347, 23118372, 23118455, 23120598, 23120971, 23121158, 23121652, 23122053, 23123521, 23124589, 23125873, 23127079, 23129662, 23131114, 23131742, 23133482, 23134121, 23134739, 23136468, 23136526, 23137068, 23138172, 23138492, 23139983, 23141191, 23141639, 23142956, 23143666, 23144098, 23145674, 23145682, 23146136, 23146902, 23147346, 23147390, 23148540, 23148817, 23150642, 23152041, 23152753, 23153462, 23154680, 23155906, 23157578, 23161371, 23163506, 23166284, 23168578, 23169016, 23170698, 23172985, 23175292, 23176456, 23177540, 23177664, 23177901, 23178166, 23178517, 23178732, 23179013, 23179575, 23179616, 23179991, 23181754, 23183381, 23183543, 23184967, 23185613, 23185634, 23186910, 23190539, 23190917, 23191835, 23192902, 23193535, 23194274, 23194929, 23195123, 23195374, 23195610, 23195827, 23196836, 23197288, 23197496, 23197675, 23197769, 23200743, 23201017, 23201823, 23202608, 23202929, 23222150, 23264198, 23264360, 23264458, 23264645, 23264811, 23264835, 23270226, 23271324, 23279055, 23279106, 23280011, 23280726, 23281422, 23282300, 23282565, 23283124, 23283271, 23283318, 23284626, 23284997, 23285007, 23285321, 23285872, 23285887, 23285989, 23287092, 23287195, 23287658, 23288917, 23288969, 23288971, 23289055, 23290886, 23290947, 23291046, 23291249, 23291387, 23294667, 23295143, 23295145, 23295252, 23296338, 23296418, 23296507, 23300280, 23301361, 23302899, 23303025, 23304700, 23305127, 23305191, 23308488, 23308778, 23309276, 23309770, 23309814, 23309899, 23309925, 23309991, 23310153, 23310179, 23311341, 23319881, 23324888, 23324929, 23327692, 23327735, 23327906, 23328478, 23329447, 23329903, 23330048, 23330505, 23330519, 23330637, 23331977, 23332489, 23332550, 23332833, 40000415, 40000743, 40000748, 40002886, 40004273, 40007621, 40008087, 40010011, 40010339, 40011118, 40011126, 40012477, 40012742, 40014695, 40016057, 40016077, 40020022, 40020549, 40023674, 40024654, 40025234, 40025448, 40025809, 40026547, 40026615, 40027479, 40028732, 40029021, 40029156, 40030826, 40031004, 40031896, 40031966, 40035306, 40035685, 40036043, 40036836, 40037123, 40037235, 40038847, 40040114, 40040340, 40043567, 40044659, 40045081, 40045562, 40050466, 40050596, 40050998, 40051918, 40052238, 40052831, 40053325, 40056367, 40056635, 40057785, 40061981, 40062333, 40062426, 40064503, 40065809, 40066257, 40066523, 40068014, 40068670, 40070864, 40071551, 40074033, 40075757, 40080274, 40081327, 40082328, 40082862, 40083550, 40083883, 40083893, 40085297, 40089362, 40090976, 40092522, 40092818, 40093481, 40095395, 40095489, 40096662, 40096979, 40096996, 40097047, 40098495, 40099108, 40099454, 40099602, 40100022, 40100608, 40100622, 40102706, 40103099, 40104121, 40104159, 40105242, 40105375, 40105860, 40112116, 40113470, 40113634, 40113910, 40114398, 40114458, 40116105, 40117117, 40117659, 40118378, 40118521, 40118635, 40119116, 40120538, 40122707, 40123074, 40123266, 40123381, 40125038, 40126299, 40126475, 40128282, 40128847, 40130436, 40132458, 40132618, 40133915, 40134657, 40141195, 40143261, 40143464, 40144005, 40147034, 40152826, 40152875, 40154288, 40154952, 40157042, 40160361, 40164199, 40168291, 40171145, 40171621, 40171950, 40174350, 40176863, 40177449, 40179038, 40179542, 40180766, 40181036, 40182444, 40184174, 40184365, 40185736, 40185846, 40186248, 40187091, 40187131, 40187146, 40188699, 40189076, 40189352, 40190545, 40191233, 40191492, 40191948, 40192072, 40192542, 40192586, 40192838, 40197267, 40197318, 40198422, 40198430, 40199458, 40200371, 40200420, 40201186, 40201270, 40202111, 40203233, 40204284, 40205801, 40206233, 40207373, 40208609, 40210368, 40210403, 40211594, 40212745, 40215248, 40217355, 40220409, 40220813, 40224605, 40225366, 40225753, 40227328, 40227838, 40228580, 40234235, 40236287, 40237023, 40238149, 40240412, 40241261, 40243829, 40243874, 40244636, 40247232, 40251776, 40251987, 40252672, 40252869, 40255334, 40255449, 40256564, 40257178, 40257484, 40257790, 40260013, 40261858, 40263127, 40263524, 40263733, 40264254, 40264425, 40265716, 40266186, 40267328, 40267361, 40269475, 40269521, 40269829, 40270670, 40270737, 40271000, 40271137, 40273655, 40276170, 40276443, 40279663, 40279673, 40279800, 40280244, 40282948, 40284408, 40285236, 40285575, 40286323, 40287981, 40288977, 40288983, 40289017, 40289845, 40292204, 40293157, 40295630, 40296100, 40296123, 40296791, 40298163, 40298739, 40301189, 40303074, 40309400, 40311650, 40313938, 40314269, 40316488, 40319953, 40321874, 40322007, 40322126, 40324126, 40325217, 40326873, 40328400, 40329393, 40330477, 40331761, 40331964, 40332174, 40333188, 40333248, 40333345, 40335255, 40336744, 40339127, 40340114, 40340879, 40341905, 40342488, 40343614, 40343863, 40345940, 40346628, 40347319, 40347841, 40349982, 40353345, 40353884, 40355003, 40355535, 40356424, 40356720, 40363221, 40364032, 40364052, 40364055, 40364561, 40364600, 40366381, 40366551, 40367506, 40367649, 40372843, 40372935, 40373305, 40373803, 40374520, 40376241, 40378363, 40379406, 40379814, 40380908, 40381448, 40382230, 40382260, 40383819, 40384626, 40384659, 40385917, 40387070, 40387229, 40387352, 40387452, 40388739, 40389025, 40389137, 40389852, 40391420, 40392652, 40393934, 40394081, 40394212, 40395957, 40396311, 40396335, 40396594, 40396613, 40397866, 40399208, 40399704, 40402098, 40402106, 40404771, 40405440, 40406828, 40406885, 40408983, 40409210, 40409395, 40409945, 40410602, 40411254, 40411945, 40412777, 40414064, 40415145, 40416659, 40417304, 40417498, 40417570, 40417617, 40420428, 40423456, 40423581, 40424126, 40429006, 40430925, 40431693, 40432360, 40432656, 40434413, 40434815, 40435223, 40435945, 40435999, 40436368, 40436734, 40436842, 40437262, 40438538, 40439899, 40442501, 40444188, 40446282, 40448699, 40450818, 40451683, 40451712, 40452315, 40453194, 40453209, 40453729, 40453938, 40454116, 40454911, 40458780, 40459471, 40459552, 40459994, 40460369, 40461272, 40462227, 40462287, 40464827, 40465850, 40467923, 40469525, 40469768, 40470340, 40472839, 40473063, 40474551, 40474681, 40477285, 40478361, 40479452, 40479988, 40480227, 40481023, 40481082, 40481989, 40482819, 40483258, 40483316, 40483365, 40483500, 40483714, 40483726, 40483754, 40483904, 40484501, 40484870, 40485194, 40485984, 40486155, 40486171, 40486577, 40486900, 40487150, 40487165, 40487207, 40487209, 40487230, 40487275, 40487289, 40487300, 40487312, 40487339, 40487341, 40487347, 40487354, 40487359, 40487360, 40487365, 40487369], "handles": null, "rounds": [{ diff --git a/__tests__/shared/components/SubmissionManagement/ScreeningStatus.jsx b/__tests__/shared/components/SubmissionManagement/ScreeningStatus.jsx index 42f80e2caa..a4e9ea8343 100644 --- a/__tests__/shared/components/SubmissionManagement/ScreeningStatus.jsx +++ b/__tests__/shared/components/SubmissionManagement/ScreeningStatus.jsx @@ -11,7 +11,7 @@ test('Snapshot match', () => { screeningObject={{ status: 'failed', }} - submissionId={12345} + submissionId="12345" /> )); expect(rnd.getRenderOutput()).toMatchSnapshot(); @@ -22,7 +22,7 @@ test('Snapshot match', () => { status: 'failed', warnings: [], }} - submissionId={12345} + submissionId="12345" /> )); expect(rnd.getRenderOutput()).toMatchSnapshot(); @@ -32,7 +32,7 @@ test('Snapshot match', () => { screeningObject={{ status: 'passed', }} - submissionId={12345} + submissionId="12345" /> )); expect(rnd.getRenderOutput()).toMatchSnapshot(); @@ -43,7 +43,7 @@ test('Snapshot match', () => { status: 'passed', warnings: [], }} - submissionId={12345} + submissionId="12345" /> )); expect(rnd.getRenderOutput()).toMatchSnapshot(); @@ -54,7 +54,7 @@ test('Snapshot match', () => { status: 'pending', warnings: [], }} - submissionId={12345} + submissionId="12345" /> )); expect(rnd.getRenderOutput()).toMatchSnapshot(); @@ -65,7 +65,7 @@ test('Snapshot match', () => { status: 'Screening Status', warnings: ['warning', 'warning'], }} - submissionId={12345} + submissionId="12345" /> )); expect(rnd.getRenderOutput()).toMatchSnapshot(); @@ -87,7 +87,7 @@ const instance = TU.renderIntoDocument(()); test('click', () => { diff --git a/__tests__/shared/components/SubmissionManagement/Submission.jsx b/__tests__/shared/components/SubmissionManagement/Submission.jsx index 9b604c8c2b..db738bc760 100644 --- a/__tests__/shared/components/SubmissionManagement/Submission.jsx +++ b/__tests__/shared/components/SubmissionManagement/Submission.jsx @@ -23,7 +23,7 @@ test('Snapshot match', () => { onDelete={mockOnDelete} onShowDetails={mockOnShowDetails} submissionObject={{ - submissionId: 12345, + id: '12345', screening: {}, }} type="design" @@ -51,7 +51,7 @@ const page = TU.renderIntoDocument(( onDelete={mockOnDelete} onShowDetails={mockOnShowDetails} submissionObject={{ - submissionId: 12345, + id: '12345', screening: {}, }} type="design" diff --git a/__tests__/shared/components/SubmissionManagement/SubmissionsTable.jsx b/__tests__/shared/components/SubmissionManagement/SubmissionsTable.jsx index 18477789d6..51a7ecdf36 100644 --- a/__tests__/shared/components/SubmissionManagement/SubmissionsTable.jsx +++ b/__tests__/shared/components/SubmissionManagement/SubmissionsTable.jsx @@ -8,9 +8,9 @@ test('Matches shallow shapshot', () => { )); expect(renderer.getRenderOutput()).toMatchSnapshot(); @@ -18,7 +18,7 @@ test('Matches shallow shapshot', () => { renderer.render(( )); expect(renderer.getRenderOutput()).toMatchSnapshot(); diff --git a/__tests__/shared/components/SubmissionManagement/__mocks__/design-submissions.json b/__tests__/shared/components/SubmissionManagement/__mocks__/design-submissions.json index d92f14ab0d..dbb133b188 100644 --- a/__tests__/shared/components/SubmissionManagement/__mocks__/design-submissions.json +++ b/__tests__/shared/components/SubmissionManagement/__mocks__/design-submissions.json @@ -11,9 +11,11 @@ "name": "Test Design Challenge for Submission Management Page", "reviewType": "INTERNAL", "id": 30050696, - "forumId": 595805, - "numSubmissions": 0, - "numRegistrants": 4, + "legacy": { + "forumId": 595805 + }, + "numOfSubmissions": 0, + "numOfRegistrants": 4, "registrationStartDate": "2017-03-27T20:38:52.000Z", "registrationEndDate": "2017-04-02T19:59:00.000Z", "checkpointSubmissionEndDate": "2017-03-30T20:34:48.085Z", diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap index 9b1c8f8866..144fc3df39 100644 --- a/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap +++ b/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap @@ -36,10 +36,10 @@ exports[`Matches shallow shapshot 1`] = ` showScreeningDetails={true} submissionObject={ Object { - "submissionId": 12345, + "id": "12345", } } - type="DESIGN" + track="Design" /> diff --git a/__tests__/shared/components/TrackIcon/__snapshots__/index.jsx.snap b/__tests__/shared/components/TrackIcon/__snapshots__/index.jsx.snap index 3b2750a7be..ffff9deca3 100644 --- a/__tests__/shared/components/TrackIcon/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/TrackIcon/__snapshots__/index.jsx.snap @@ -5,9 +5,9 @@ exports[`Matches shallow shapshot 1`] = ` className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l" >
- Cd + CH
- Cd + CH
TCO
@@ -47,15 +47,15 @@ exports[`Matches shallow shapshot 3`] = ` className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l" >
- Cd + CH
TCO
diff --git a/__tests__/shared/components/TrackIcon/index.jsx b/__tests__/shared/components/TrackIcon/index.jsx index 14dad327d6..368f5bafe4 100644 --- a/__tests__/shared/components/TrackIcon/index.jsx +++ b/__tests__/shared/components/TrackIcon/index.jsx @@ -5,18 +5,23 @@ import TrackIcon from 'components/TrackIcon'; test('Matches shallow shapshot', () => { const renderer = new Renderer(); + const type = { + name: 'Challenge', + abbreviation: 'CH', + }; + renderer.render(( - + )); expect(renderer.getRenderOutput()).toMatchSnapshot(); renderer.render(( - + )); expect(renderer.getRenderOutput()).toMatchSnapshot(); renderer.render(( - + )); expect(renderer.getRenderOutput()).toMatchSnapshot(); }); diff --git a/__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap b/__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap index f5fab8bff9..b595db39c0 100644 --- a/__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap @@ -18,7 +18,6 @@ exports[`Matches shallow shapshot shapshot 1 1`] = ` "eventName": "Submit", }, ], - "isDataScience": true, "prize": Array [ 1200, 600, @@ -28,23 +27,31 @@ exports[`Matches shallow shapshot shapshot 1 1`] = ` 600, ], "status": "ACTIVE", - "subTrack": "CODE", + "tags": Array [ + "Data Science", + ], "technologies": Array [ "Data Science", ], "totalPrize": 1800, - "track": "DEVELOP", + "track": "Data Science", + "type": "Challenge", "users": Object {}, } } + challengeType={ + Object { + "abbreviation": "CH", + "name": "Challenge", + } + } domRef={null} expandTag={null} expandedTags={Array []} newChallengeDetails={false} onTechTagClicked={[Function]} openChallengesInNewTabs={false} - prizeMode="money-usd" - userHandle="" + userId="" /> `; @@ -61,28 +68,37 @@ exports[`Matches shallow shapshot shapshot 2 1`] = ` "currentPhases": Array [ "Registration", ], + "events": Array [], "id": "1", "prizes": Array [ 1200, 600, ], - "subTrack": "CODE", + "tags": Array [ + "Go", + ], "technologies": Array [ "Go", ], "totalPrize": 1800, - "track": "DATA_SCIENCE", + "track": "Data Science", + "type": "Challenge", "users": Object {}, } } + challengeType={ + Object { + "abbreviation": "CH", + "name": "Challenge", + } + } domRef={null} expandTag={null} expandedTags={Array []} newChallengeDetails={false} onTechTagClicked={[Function]} openChallengesInNewTabs={false} - prizeMode="money-usd" - userHandle="" + userId="" /> `; @@ -99,25 +115,32 @@ exports[`Matches shallow shapshot shapshot 3 1`] = ` "currentPhases": Array [ "Registration", ], + "events": Array [], "id": "long id", "prizes": Array [ 1200, 600, ], - "subTrack": "CODE", + "tags": Array [], "technologies": Array [], "totalPrize": 1800, - "track": "DATA_SCIENCE", + "track": "Data Science", + "type": "Challenge", "users": Object {}, } } + challengeType={ + Object { + "abbreviation": "CH", + "name": "Challenge", + } + } domRef={null} expandTag={null} expandedTags={Array []} newChallengeDetails={false} onTechTagClicked={[Function]} openChallengesInNewTabs={false} - prizeMode="money-usd" - userHandle="" + userId="" /> `; diff --git a/__tests__/shared/components/challenge-listing/ChallengeCard/index.jsx b/__tests__/shared/components/challenge-listing/ChallengeCard/index.jsx index 25047b44af..53ebc52729 100644 --- a/__tests__/shared/components/challenge-listing/ChallengeCard/index.jsx +++ b/__tests__/shared/components/challenge-listing/ChallengeCard/index.jsx @@ -21,86 +21,115 @@ afterAll(() => { const mockData1 = { challenge: { technologies: ['Data Science'], + tags: ['Data Science'], allPhases: [{ phaseType: 'Registration', phaseStatus: 'Open', }], currentPhases: ['Registration'], prizes: [1200, 600], - track: 'DEVELOP', + track: 'Data Science', + type: 'Challenge', totalPrize: 1800, - subTrack: 'CODE', events: [{ eventName: 'Submit' }], status: 'ACTIVE', users: {}, }, + challengeType: { + name: 'Challenge', + abbreviation: 'CH', + }, }; const mockData2 = { challenge: { technologies: ['Go'], + tags: ['Go'], allPhases: [{ phaseType: 'Submit', phaseStatus: 'Open', }], currentPhases: ['Registration'], prizes: [1200, 600], - track: 'DATA_SCIENCE', - subTrack: 'CODE', + track: 'Data Science', + type: 'Challenge', id: '1', totalPrize: 1800, users: {}, + events: [], + }, + challengeType: { + name: 'Challenge', + abbreviation: 'CH', }, }; const mockData3 = { challenge: { technologies: [], + tags: [], allPhases: [{ phaseType: 'Registration', phaseStatus: 'Closed', }], currentPhases: ['Registration'], prizes: [1200, 600], - track: 'DATA_SCIENCE', - subTrack: 'CODE', + track: 'Data Science', + type: 'Challenge', id: 'long id', totalPrize: 1800, users: {}, + events: [], + }, + challengeType: { + name: 'Challenge', + abbreviation: 'CH', }, }; const mockData4 = { challenge: { technologies: ['more', 'technology', 'to', 'show'], + tags: ['more', 'technology', 'to', 'show'], allPhases: [{ phaseType: 'Registration', phaseStatus: 'Closed', }], currentPhases: ['Registration'], prizes: [1200, 600], - track: 'DATA_SCIENCE', - subTrack: 'CODE', + track: 'Data Science', + type: 'Challenge', id: 'long id', totalPrize: 1800, users: {}, + events: [], + }, + challengeType: { + name: 'Challenge', + abbreviation: 'CH', }, }; const mockData5 = { challenge: { technologies: ['+tag', 'more', 'technology', 'to', 'show'], + tags: ['+tag', 'more', 'technology', 'to', 'show'], allPhases: [{ phaseType: 'Registration', phaseStatus: 'Closed', }], currentPhases: ['Registration'], prizes: [1200, 600], - track: 'DATA_SCIENCE', - subTrack: 'CODE', + track: 'Data Science', + type: 'Challenge', id: 'long id', totalPrize: 1800, users: {}, + events: [], + }, + challengeType: { + name: 'Challenge', + abbreviation: 'CH', }, }; diff --git a/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx index f1d3b99750..2c42662b37 100644 --- a/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx +++ b/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx @@ -39,14 +39,14 @@ const mockDatas = [{ showTrackModal, trackModalShown: true, validKeywords: [''], - validSubtracks: [''], + validTypes: [''], }, { challengeGroupId: '1', communityFilters: [{ filter: {} }], communityName: 'name', expanded: false, filterState: { - tags: ['abc'], subtracks: ['CODE'], endDate: moment('2019-12-31T23:00:00.000Z'), startDate: moment('2019-12-31T23:00:00.000Z'), tracks: ['tracks'], + tags: ['abc'], types: ['927abff4-7af9-4145-8ba1-577c16e64e2e'], endDate: moment('2019-12-31T23:00:00.000Z'), startDate: moment('2019-12-31T23:00:00.000Z'), tracks: ['tracks'], }, isCardTypeSet: 'Challenges', saveFilter, @@ -59,7 +59,7 @@ const mockDatas = [{ showTrackModal, trackModalShown: true, validKeywords: [''], - validSubtracks: [''], + validTypes: [''], }]; describe('Matches shallow shapshot', () => { diff --git a/__tests__/shared/components/challenge-listing/Filters/DateRangePicker.jsx b/__tests__/shared/components/challenge-listing/Filters/DateRangePicker.jsx index 54e36e0b6d..89fd8e4387 100644 --- a/__tests__/shared/components/challenge-listing/Filters/DateRangePicker.jsx +++ b/__tests__/shared/components/challenge-listing/Filters/DateRangePicker.jsx @@ -4,6 +4,8 @@ import DateRangePicker from 'components/challenge-listing/Filters/DateRangePicke const onDatesChange = jest.fn(); +jest.mock('shortid', () => jest.fn()); + test('Matches shallow shapshot', () => { const renderer = new Renderer(); renderer.render(( diff --git a/__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx b/__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx index 82fd4e8cc8..126bf4a6b0 100644 --- a/__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx +++ b/__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx @@ -25,7 +25,7 @@ const mockDatas = [{ setFilterState, setSearchText, validKeywords: ['key', 'word'], - validSubtracks: [{ name: 'sub', subTrack: 'sub' }, { name: 'track', subTrack: 'track' }], + validTypes: [{ name: 'sub', subTrack: 'sub' }, { name: 'track', subTrack: 'track' }], onClose, }, { communityFilters: [ @@ -42,7 +42,7 @@ const mockDatas = [{ setFilterState, setSearchText, validKeywords: [], - validSubtracks: [], + validTypes: [], onClose, }]; diff --git a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap index 5a29b8846c..4fe80207f5 100644 --- a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap +++ b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap @@ -73,7 +73,7 @@ exports[`Matches shallow shapshot shapshot 1`] = ` "", ] } - validSubtracks={ + validTypes={ Array [ "", ] @@ -85,9 +85,11 @@ exports[`Matches shallow shapshot shapshot 1`] = ` devEnabled={true} onClose={[Function]} opened={true} + qaEnabled={true} switchDataScience={[Function]} switchDesign={[Function]} switchDev={[Function]} + switchQA={[Function]} />
`; @@ -159,6 +161,23 @@ exports[`Matches shallow shapshot shapshot 2`] = ` themePriority="adhoc-context-default" /> + + +