Skip to content

Sync milestone-20200917 with develop #4996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 63 commits into from
Sep 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2f734e3
#4294: Fix dropdown issue being hidden behind footer on profile setti…
gets0ul Sep 10, 2020
b46b000
Fix for #4347 - Open blog page in new, separate tab
gets0ul Sep 11, 2020
4be833a
Update index.jsx
rashmi73 Sep 11, 2020
a6a68d6
Update index.jsx
rashmi73 Sep 11, 2020
ea282e2
Update index.jsx.snap
rashmi73 Sep 11, 2020
7b542d6
Update index.jsx
Gauravseta Sep 12, 2020
6520f19
Update ChallengeTags.jsx
rashmi73 Sep 12, 2020
334596e
Update ChallengeTags.jsx
rashmi73 Sep 12, 2020
48d1bf5
Merge pull request #4900 from gets0ul/issue-4347
luizrrodrigues Sep 13, 2020
ff38813
fix: for #4745
luizrrodrigues Sep 14, 2020
1f09579
Merge pull request #4901 from Gauravseta/issue_4895
luizrrodrigues Sep 14, 2020
bdf5163
Merge pull request #4899 from rashmi73/issue_4687
luizrrodrigues Sep 14, 2020
e0ff94e
Merge remote-tracking branch 'remotes/upstream/milestone-20200924' in…
gets0ul Sep 14, 2020
f719dcd
Move out inline style to .scss file
gets0ul Sep 14, 2020
d307664
New scss for header
gets0ul Sep 14, 2020
980bbc4
Fix test snapshot.
gets0ul Sep 14, 2020
22a2677
Deploy milestone-20200924 to Dev and Stag
luizrrodrigues Sep 14, 2020
08fb3c3
Added validation before call phaseEndDate and phaseStartDate
luizrrodrigues Sep 14, 2020
2f14cfb
challenge submission
kkartunov Sep 14, 2020
ed0044a
Implements #4912
kkartunov Sep 14, 2020
8e8d071
Added !isEmpty check before call phaseStartDate and phaseEndDate
luizrrodrigues Sep 14, 2020
418fa85
Merge pull request #4915 from topcoder-platform/issue-4910
luizrrodrigues Sep 14, 2020
43786c4
ci: Deploy hot-fix-ad-code to Test env
luizrrodrigues Sep 15, 2020
4d453d8
Merge pull request #4918 from topcoder-platform/milestone-20200917
luizrrodrigues Sep 15, 2020
f3e8601
fix: smoke release
luizrrodrigues Sep 15, 2020
c7e17cf
Merge branch 'develop' into milestone-20200924
luizrrodrigues Sep 15, 2020
fc42d37
Merge pull request #4919 from topcoder-platform/milestone-20200924
luizrrodrigues Sep 15, 2020
c6fed95
fix: smoke release
luizrrodrigues Sep 15, 2020
20c22d4
Merge pull request #4914 from topcoder-platform/hot-fix-ad-code
luizrrodrigues Sep 15, 2020
e9476a9
GUI challenge fixes
kkartunov Sep 15, 2020
cc714c8
Merge branch 'gui-kit-397166' into gui-kit-components
kkartunov Sep 15, 2020
27118ee
release: v1.2.1
sushilshinde Sep 15, 2020
47b652f
GUIKit prod fixes and implement of #4890
kkartunov Sep 15, 2020
d21cfd1
Merge pull request #4924 from topcoder-platform/gui-kit-components
kkartunov Sep 15, 2020
a7a0567
Merge branch 'develop' into gui-kit-components
kkartunov Sep 15, 2020
d21a40a
Merge pull request #4925 from topcoder-platform/gui-kit-components
kkartunov Sep 15, 2020
94e068e
fix(profile-page): add spacing before wins count
cagdas001 Sep 15, 2020
bd2e804
f2f submissionidlegacyid
rashmi73 Sep 15, 2020
45a4d8f
Location dropdown final fixes
kkartunov Sep 16, 2020
5023f5e
Implement #4921
kkartunov Sep 16, 2020
f08c663
Merge pull request #4936 from topcoder-platform/gui-kit-components
kkartunov Sep 16, 2020
4b05251
Merge pull request #4933 from rashmi73/f2f-submissionlegacyid
luizrrodrigues Sep 16, 2020
7559bd1
ci: Deploy submissionId-hotfix to Dev an Stag
luizrrodrigues Sep 16, 2020
99f0aa3
Merge pull request #4892 from gets0ul/issue-4294
luizrrodrigues Sep 16, 2020
941984d
ci: Deploy milestone-20200924 to Dev and Stag
luizrrodrigues Sep 16, 2020
655d666
fixed cors on test
kkartunov Sep 16, 2020
83f7994
Merge pull request #4941 from topcoder-platform/gui-kit-components
kkartunov Sep 16, 2020
6ec87e2
Merge pull request #19 from topcoder-platform/submissionId-hotfix
rashmi73 Sep 16, 2020
88f6875
Update index.jsx
rashmi73 Sep 16, 2020
5c34df6
tests fix
rashmi73 Sep 16, 2020
7441f6d
Merge pull request #4942 from rashmi73/f2f-submissionlegacyid
luizrrodrigues Sep 16, 2020
ba22b45
test fix
rashmi73 Sep 16, 2020
3c2347a
test fix
rashmi73 Sep 16, 2020
031fc0d
Merge pull request #4902 from rashmi73/issue_4734
luizrrodrigues Sep 16, 2020
7cf8978
Merge pull request #4930 from cagdas001/milestone-20200924
luizrrodrigues Sep 17, 2020
c4df658
Merge branch 'develop' into submissionId-hotfix
luizrrodrigues Sep 17, 2020
b5c36b4
ci: remove submissionId-hotfix from Stag
luizrrodrigues Sep 17, 2020
ae3382e
ci: Remove milestone-20200924 form Stag and Dev
luizrrodrigues Sep 17, 2020
0076690
Merge pull request #4943 from topcoder-platform/milestone-20200924
luizrrodrigues Sep 17, 2020
f0d84ce
Merge pull request #4944 from topcoder-platform/submissionId-hotfix
luizrrodrigues Sep 17, 2020
2ab8b17
Merge pull request #4945 from topcoder-platform/feature-contentful
luizrrodrigues Sep 17, 2020
b3f613d
ci: Fix deploy develop to Dev env
luizrrodrigues Sep 17, 2020
1f47d91
ci: deploy on stage and qa
sushilshinde Sep 18, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,14 @@ workflows:
filters:
branches:
only:
- develop
- hot-fix
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
filters:
branches:
only:
- hot-fix-ad-code
- feature-contentful
# This is alternate dev env for parallel testing
- "build-qa":
Expand All @@ -245,6 +246,7 @@ workflows:
branches:
only:
- community-app-tests-poc
- develop
# This is beta env for production soft releases
- "build-prod-beta":
context : org-global
Expand Down
8 changes: 8 additions & 0 deletions __tests__/shared/__snapshots__/index.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ exports[`Snapshot match 1`] = `
href="/challenges/manifest.json"
rel="manifest"
/>
<script
async={true}
src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
/>
</HelmetWrapper>
<withRouter(Connect(Routes)) />
<Connect(ErrorMessageContainer) />
Expand Down Expand Up @@ -53,6 +57,10 @@ exports[`Snapshot match 2`] = `
href="/challenges/manifest.json"
rel="manifest"
/>
<script
async={true}
src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
/>
</HelmetWrapper>
<withRouter(Connect(Routes)) />
<Connect(ErrorMessageContainer) />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Default render 1`] = `
<label
className="src-shared-components-GUIKit-Checkbox-___style__container___2a1GZ src-shared-components-GUIKit-Checkbox-___style__smSize___3aux-"
>
<input
checked={false}
onChange={[Function]}
type="checkbox"
/>
<div
className="src-shared-components-GUIKit-Checkbox-___style__checkmark___1xdsj"
>
<IconCheckSolid
className="src-shared-components-GUIKit-Checkbox-___style__after___2rEBg"
height={13}
viewBox="0 0 18 15"
width={13}
xmlns="http://www.w3.org/2000/svg"
xmlnsXlink="http://www.w3.org/1999/xlink"
/>
</div>
</label>
`;
12 changes: 12 additions & 0 deletions __tests__/shared/components/GUIKit/Checkbox/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import Renderer from 'react-test-renderer/shallow';

import Checkbox from 'components/GUIKit/Checkbox';


const rnd = new Renderer();

it('Default render', () => {
rnd.render((<Checkbox />));
expect(rnd.getRenderOutput()).toMatchSnapshot();
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Default render 1`] = `
<div
className="datepickerContainer src-shared-components-GUIKit-Datepicker-___style__container___Sl58X"
>
<withStyles(SingleDatePicker)
anchorDirection="left"
appendToBody={false}
block={false}
calendarInfoPosition="bottom"
customCloseIcon={null}
customInputIcon={
<IconCalendar
height="16"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
/>
}
date={null}
daySize={53}
disableScroll={false}
disabled={false}
displayFormat="MMM DD, YYYY"
enableOutsideDays={true}
firstDayOfWeek={1}
focused={false}
hideKeyboardShortcutsPanel={true}
horizontalMargin={0}
horizontalMonthPadding={13}
id="null----false"
initialVisibleMonth={null}
inputIconPosition="after"
isDayBlocked={[Function]}
isDayHighlighted={[Function]}
isOutsideRange={[Function]}
isRTL={false}
keepFocusOnInput={false}
keepOpenOnDateSelect={false}
monthFormat="MMMM YYYY"
navNext={
<IconNext
height="16"
viewBox="0 0 10 16"
width="10"
xmlns="http://www.w3.org/2000/svg"
/>
}
navPrev={
<IconPrev
height="16"
viewBox="0 0 10 16"
width="10"
xmlns="http://www.w3.org/2000/svg"
/>
}
noBorder={false}
numberOfMonths={1}
onClose={[Function]}
onDateChange={[Function]}
onFocusChange={[Function]}
onNextMonthClick={[Function]}
onPrevMonthClick={[Function]}
openDirection="down"
orientation="horizontal"
phrases={
Object {
"calendarLabel": "Calendar",
"chooseAvailableDate": [Function],
"clearDate": "Clear Date",
"closeDatePicker": "Close",
"dateIsSelected": [Function],
"dateIsUnavailable": [Function],
"enterKey": "Enter key",
"escape": "Escape key",
"hideKeyboardShortcutsPanel": "Close the shortcuts panel.",
"homeEnd": "Home and end keys",
"jumpToNextMonth": "Move forward to switch to the next month.",
"jumpToPrevMonth": "Move backward to switch to the previous month.",
"keyboardNavigationInstructions": "Press the down arrow key to interact with the calendar and
select a date. Press the question mark key to get the keyboard shortcuts for changing dates.",
"keyboardShortcuts": "Keyboard Shortcuts",
"leftArrowRightArrow": "Right and left arrow keys",
"moveFocusByOneDay": "Move backward (left) and forward (right) by one day.",
"moveFocusByOneMonth": "Switch months.",
"moveFocusByOneWeek": "Move backward (up) and forward (down) by one week.",
"moveFocustoStartAndEndOfWeek": "Go to the first or last day of a week.",
"openThisPanel": "Open this panel.",
"pageUpPageDown": "page up and page down keys",
"questionMark": "Question mark",
"returnFocusToInput": "Return to the date input field.",
"selectFocusedDate": "Select the date in focus.",
"showKeyboardShortcutsPanel": "Open the keyboard shortcuts panel.",
"upArrowDownArrow": "up and down arrow keys",
}
}
placeholder=""
readOnly={false}
regular={false}
renderCalendarInfo={null}
renderDayContents={[Function]}
renderMonthElement={null}
renderMonthText={null}
reopenPickerOnClearDate={false}
required={false}
screenReaderInputMessage=""
showClearDate={false}
showDefaultInputIcon={false}
small={false}
verticalHeight={null}
verticalSpacing={22}
weekDayFormat="ddd"
withFullScreenPortal={false}
withPortal={false}
/>
</div>
`;
12 changes: 12 additions & 0 deletions __tests__/shared/components/GUIKit/Datepicker/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import Renderer from 'react-test-renderer/shallow';

import Datepicker from 'components/GUIKit/Datepicker';


const rnd = new Renderer();

it('Default render', () => {
rnd.render((<Datepicker />));
expect(rnd.getRenderOutput()).toMatchSnapshot();
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Default render 1`] = `
<div
className="dropdownContainer src-shared-components-GUIKit-Dropdown-___style__container___1qhm8 src-shared-components-GUIKit-Dropdown-___style__lgSize___1fYu0 src-shared-components-GUIKit-Dropdown-___style__haveValue___1b1qb"
onBlurCapture={[Function]}
onFocusCapture={[Function]}
>
<div
className="src-shared-components-GUIKit-Dropdown-___style__relative___1Yq0F"
>
<Select
arrowRenderer={[Function]}
autoBlur={true}
autosize={false}
backspaceRemoves={true}
backspaceToRemoveMessage="Press backspace to remove {label}"
clearAllText="Clear all"
clearRenderer={[Function]}
clearValueText="Clear value"
clearable={false}
closeOnSelect={true}
deleteRemoves={true}
delimiter=","
disabled={false}
escapeClearsValue={true}
filterOptions={[Function]}
ignoreAccents={true}
ignoreCase={true}
inputProps={Object {}}
isLoading={false}
joinValues={false}
labelKey="label"
matchPos="any"
matchProp="any"
menuBuffer={0}
menuRenderer={[Function]}
multi={false}
noResultsText="No results found"
onBlurResetsInput={true}
onChange={[Function]}
onCloseResetsInput={true}
onSelectResetsInput={true}
openOnClick={true}
optionComponent={[Function]}
options={
Array [
Object {
"label": "dropdownLable",
"value": "dropdownLable",
},
]
}
pageSize={5}
placeholder=""
removeSelected={true}
required={false}
rtl={false}
scrollMenuIntoView={true}
searchable={true}
simpleValue={false}
tabSelectsValue={true}
trimFilter={true}
value="dropdownLable"
valueComponent={[Function]}
valueKey="value"
/>
<img
alt="dropdown-arraow-icon"
className="src-shared-components-GUIKit-Dropdown-___style__iconDropdown___2bPox"
height="9"
src="/community-app-assets/images/e740c51bb099110dff2900fa4fc94d72.png"
width="15"
/>
</div>
</div>
`;
12 changes: 12 additions & 0 deletions __tests__/shared/components/GUIKit/Dropdown/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import Renderer from 'react-test-renderer/shallow';

import Dropdown from 'components/GUIKit/Dropdown';


const rnd = new Renderer();

it('Default render', () => {
rnd.render((<Dropdown options={[{ label: 'dropdownLable', selected: true }]} />));
expect(rnd.getRenderOutput()).toMatchSnapshot();
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Default render 1`] = `
<div
className="dropdownContainer src-shared-components-GUIKit-DropdownTerms-___style__container___oBZ2m src-shared-components-GUIKit-DropdownTerms-___style__haveValue___1Ppjh src-shared-components-GUIKit-DropdownTerms-___style__isEmptySelectList___CWafx"
>
<div
className="src-shared-components-GUIKit-DropdownTerms-___style__relative___EOspV"
>
<CreatableSelect
autosize={false}
backspaceRemoves={false}
clearable={false}
filterOptions={[Function]}
isOptionUnique={[Function]}
isValidNewOption={[Function]}
menuRenderer={[Function]}
multi={true}
newOptionCreator={[Function]}
onChange={[Function]}
onClose={[Function]}
onInputKeyDown={[Function]}
onOpen={[Function]}
optionComponent={
Object {
"$$typeof": Symbol(react.forward_ref),
"defaultProps": Object {
"children": null,
"className": "",
"onSelect": [Function],
},
"propTypes": Object {
"children": [Function],
"className": [Function],
"onSelect": [Function],
"option": [Function],
},
"render": [Function],
}
}
options={
Array [
Object {
"label": "dropdownLabel",
"value": "dropdownLabel",
},
]
}
placeholder=""
promptTextCreator={[Function]}
shouldKeyDownEventCreateNewOption={[Function]}
showNewOptionAtTop={true}
value={
Array [
Object {
"label": "dropdownLabel",
"value": "dropdownLabel",
},
]
}
/>
<img
alt="dropdown-arrow-icon"
className="src-shared-components-GUIKit-DropdownTerms-___style__iconDropdown___25Wtg"
height="9"
src="/community-app-assets/images/e740c51bb099110dff2900fa4fc94d72.png"
width="15"
/>
</div>
</div>
`;
12 changes: 12 additions & 0 deletions __tests__/shared/components/GUIKit/DropdownTerms/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import Renderer from 'react-test-renderer/shallow';

import DropdownTerms from 'components/GUIKit/DropdownTerms';


const rnd = new Renderer();

it('Default render', () => {
rnd.render((<DropdownTerms terms={[{ label: 'dropdownLabel', selected: true }]} />));
expect(rnd.getRenderOutput()).toMatchSnapshot();
});
Loading