Skip to content

Issue#4582 : Fix mySubmission page #4605

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.

Sign up for GitHub

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 10 commits into from
Jul 1, 2020
Merged

Issue#4582 : Fix mySubmission page #4605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31999c3
Fix prop type of challengeId from Number to String
luizrrodrigues Jun 24, 2020
272f5f2
Updated getSubmissionsDone to get v3 token instead v2
luizrrodrigues Jun 24, 2020
625bbf9
Merge branch 'integration-v5-challenge-api' into issue-4582
luizrrodrigues Jun 25, 2020
93833a0
Updated propTypes of challengeId to string instead number
luizrrodrigues Jun 25, 2020
4a198c2
Updated submissions fields name
luizrrodrigues Jun 30, 2020
78676c6
My submissions list, fixed line height
luizrrodrigues Jun 30, 2020
39992fe
Updated propType id from Number to String
luizrrodrigues Jun 30, 2020
e1ebcb3
Updatesd tests
luizrrodrigues Jun 30, 2020
56c580b
Remove submissionPhaseId from POST submission
luizrrodrigues Jul 1, 2020
3ebb278
My Submissions - Always load when componentDidMount
luizrrodrigues Jul 1, 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
14 changes: 7 additions & 7 deletions __tests__/shared/components/SubmissionManagement/ScreeningStatus.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test('Snapshot match', () => {
screeningObject={{
status: 'failed',
}}
submissionId={12345}
submissionId="12345"
/>
));
expect(rnd.getRenderOutput()).toMatchSnapshot();
Expand All @@ -22,7 +22,7 @@ test('Snapshot match', () => {
status: 'failed',
warnings: [],
}}
submissionId={12345}
submissionId="12345"
/>
));
expect(rnd.getRenderOutput()).toMatchSnapshot();
Expand All @@ -32,7 +32,7 @@ test('Snapshot match', () => {
screeningObject={{
status: 'passed',
}}
submissionId={12345}
submissionId="12345"
/>
));
expect(rnd.getRenderOutput()).toMatchSnapshot();
Expand All @@ -43,7 +43,7 @@ test('Snapshot match', () => {
status: 'passed',
warnings: [],
}}
submissionId={12345}
submissionId="12345"
/>
));
expect(rnd.getRenderOutput()).toMatchSnapshot();
Expand All @@ -54,7 +54,7 @@ test('Snapshot match', () => {
status: 'pending',
warnings: [],
}}
submissionId={12345}
submissionId="12345"
/>
));
expect(rnd.getRenderOutput()).toMatchSnapshot();
Expand All @@ -65,7 +65,7 @@ test('Snapshot match', () => {
status: 'Screening Status',
warnings: ['warning', 'warning'],
}}
submissionId={12345}
submissionId="12345"
/>
));
expect(rnd.getRenderOutput()).toMatchSnapshot();
Expand All @@ -87,7 +87,7 @@ const instance = TU.renderIntoDocument((<Wrapper
status: 'pending',
warnings: [],
}}
submissionId={12345}
submissionId="12345"
/>));

test('click', () => {
Expand Down
4 changes: 2 additions & 2 deletions __tests__/shared/components/SubmissionManagement/Submission.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test('Snapshot match', () => {
onDelete={mockOnDelete}
onShowDetails={mockOnShowDetails}
submissionObject={{
submissionId: 12345,
id: '12345',
screening: {},
}}
type="design"
Expand Down Expand Up @@ -51,7 +51,7 @@ const page = TU.renderIntoDocument((
onDelete={mockOnDelete}
onShowDetails={mockOnShowDetails}
submissionObject={{
submissionId: 12345,
id: '12345',
screening: {},
}}
type="design"
Expand Down
2 changes: 1 addition & 1 deletion __tests__/shared/components/SubmissionManagement/SubmissionsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ test('Matches shallow shapshot', () => {
<SubmissionsTable
showDetails={{ 12345: true }}
submissionObjects={[{
submissionId: 12345,
id: '12345',
}]}
type="DESIGN"
/>
Expand Down
4 changes: 2 additions & 2 deletions __tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ exports[`Matches shallow shapshot 1`] = `
showScreeningDetails={true}
submissionObject={
Object {
"submissionId": 12345,
"id": "12345",
}
}
type="DESIGN"
Expand All @@ -52,7 +52,7 @@ exports[`Matches shallow shapshot 1`] = `
helpPageUrl=""
onlineReviewUrl=""
screeningObject={Object {}}
submissionId={12345}
submissionId="12345"
/>
</td>
</tr>
Expand Down
21 changes: 10 additions & 11 deletions src/shared/components/SubmissionManagement/Submission/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ export default function Submission(props) {
return (
<tr styleName="submission-row">
<td styleName="id-col">
{submissionObject.submissionId}
{submissionObject.id}
</td>
<td>
{submissionObject.submissionType}
{submissionObject.type}
</td>
<td styleName="date-col">
{formatDate(submissionObject.submissionDate)}
{formatDate(submissionObject.created)}
</td>
{
type === 'DESIGN' && (
Expand All @@ -56,7 +56,7 @@ export default function Submission(props) {
<ScreeningStatus
screeningObject={submissionObject.screening}
onShowDetails={onShowDetails}
submissionId={submissionObject.submissionId}
submissionId={submissionObject.id}
/>
)}
</td>
Expand All @@ -67,7 +67,7 @@ export default function Submission(props) {
<a
href={
type === 'DESIGN'
? `${config.URL.ONLINE_REVIEW}/review/actions/DownloadContestSubmission?uid=${submissionObject.submissionId}`
? `${config.URL.ONLINE_REVIEW}/review/actions/DownloadContestSubmission?uid=${submissionObject.id}`
: submissionObject.download
}
>
Expand All @@ -80,14 +80,14 @@ export default function Submission(props) {
downloads. Then we'll use this commented out code or
remove it for good.
<button
onClick={() => onDownload(submissionObject.submissionId)}
onClick={() => onDownload(submissionObject.id)}
><DownloadIcon /></button>
*/ }
{status !== 'COMPLETED'
&& (
<button
styleName="delete-icon"
onClick={() => onDelete(submissionObject.submissionId)}
onClick={() => onDelete(submissionObject.id)}
disabled={!allowDelete}
type="button"
>
Expand All @@ -97,7 +97,7 @@ export default function Submission(props) {
}
<button
styleName={`expand-icon ${(showScreeningDetails ? 'expanded' : '')}`}
onClick={() => onShowDetails(submissionObject.submissionId)}
onClick={() => onShowDetails(submissionObject.id)}
type="button"
>
<ExpandIcon />
Expand All @@ -116,15 +116,14 @@ Submission.defaultProps = {

Submission.propTypes = {
submissionObject: PT.shape({
submissionId: PT.number,
id: PT.string,
warpreviewnings: PT.string,
screening: PT.shape({
status: PT.string,
}),
submitted: PT.string,
type: PT.string,
submissionType: PT.any,
submissionDate: PT.any,
created: PT.any,
download: PT.any,
}),
showScreeningDetails: PT.bool,
Expand Down
1 change: 0 additions & 1 deletion src/shared/components/SubmissionManagement/Submission/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ $submission-space-50: $base-unit * 10;
padding: $submission-space-20;
background: $tc-white;
border-top: 1px solid $tc-gray-10;
line-height: 12px;

@include xs-to-lg {
padding: $submission-space-10;
Expand Down
3 changes: 2 additions & 1 deletion src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ SubmissionManagement.defaultProps = {
helpPageUrl: '',
loadingSubmissions: false,
challengeUrl: '',
submissions: [],
};

SubmissionManagement.propTypes = {
Expand All @@ -195,7 +196,7 @@ SubmissionManagement.propTypes = {
onDownload: PT.func,
onShowDetails: PT.func,
challenge: PT.shape().isRequired,
submissions: PT.arrayOf(PT.shape()).isRequired,
submissions: PT.arrayOf(PT.shape()),
loadingSubmissions: PT.bool,
challengeUrl: PT.string,
submissionPhaseStartDate: PT.string.isRequired,
Expand Down
8 changes: 4 additions & 4 deletions src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default function SubmissionsTable(props) {
const submission = (
<Submission
submissionObject={subObject}
showScreeningDetails={showDetails[subObject.submissionId]}
showScreeningDetails={showDetails[subObject.id]}
type={type}
onShowDetails={onShowDetails}
onDelete={onDelete}
Expand All @@ -69,15 +69,15 @@ export default function SubmissionsTable(props) {
submissionsWithDetails.push(submission);

const submissionDetail = (
<tr key={subObject.submissionId} styleName="submission-row">
{showDetails[subObject.submissionId]
<tr key={subObject.id} styleName="submission-row">
{showDetails[subObject.id]
&& (
<td colSpan="6" styleName="dev-details">
<ScreeningDetails
screeningObject={subObject.screening}
helpPageUrl={helpPageUrl}
onlineReviewUrl={onlineReviewUrl}
submissionId={subObject.submissionId}
submissionId={subObject.id}
/>
</td>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ FilestackFilePicker.defaultProps = {
FilestackFilePicker.propTypes = {
error: PT.string,
userId: PT.string.isRequired,
challengeId: PT.number.isRequired,
challengeId: PT.string.isRequired,
fileName: PT.string,
fileExtensions: PT.arrayOf(PT.string).isRequired,
title: PT.string.isRequired,
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/SubmissionPage/Header/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Header = ({
* Prop Validation
*/
Header.propTypes = {
challengeId: PT.number.isRequired,
challengeId: PT.string.isRequired,
challengesUrl: PT.string.isRequired,
title: PT.string.isRequired,
};
Expand Down
16 changes: 5 additions & 11 deletions src/shared/components/SubmissionPage/Submit/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,13 @@ class Submit extends React.Component {
userId,
} = this.props;

const { subType, subPhaseId } = this.getSubDetails();
const subType = this.getSubDetails();

const formData = new FormData();
formData.append('url', sub.fileUrl);
formData.append('type', subType);
formData.append('memberId', userId);
formData.append('challengeId', challengeId);
formData.append('submissionPhaseId', subPhaseId);
if (sub.fileType) {
formData.append('fileType', sub.fileType);
}
Expand All @@ -75,24 +74,19 @@ class Submit extends React.Component {
name: 'Final Fix',
});
let subType;
let subPhaseId;

// Submission type logic
if (checkpoint && checkpoint.isOpen) {
subType = 'Checkpoint Submission';
subPhaseId = checkpoint.id;
} else if (checkpoint && !checkpoint.isOpen && submission && submission.isOpen) {
subType = 'Contest Submission';
subPhaseId = submission.id;
} else if (finalFix && finalFix.isOpen) {
subType = 'Studio Final Fix Submission';
subPhaseId = finalFix.id;
} else {
subType = 'Contest Submission';
subPhaseId = submission.id;
}

return { subType, subPhaseId };
return subType;
}

reset() {
Expand Down Expand Up @@ -356,7 +350,7 @@ const filestackDataProp = PT.shape({
size: PT.number.isRequired,
key: PT.string.isRequired,
container: PT.string.isRequired,
challengeId: PT.number.isRequired,
challengeId: PT.string.isRequired,
fileUrl: PT.string.isRequired,
});

Expand All @@ -366,7 +360,7 @@ const filestackDataProp = PT.shape({
Submit.propTypes = {
phases: PT.arrayOf(PT.object).isRequired,
userId: PT.string.isRequired,
challengeId: PT.number.isRequired,
challengeId: PT.string.isRequired,
challengeName: PT.string.isRequired,
challengesUrl: PT.string.isRequired,
communitiesList: PT.shape({
Expand All @@ -377,7 +371,7 @@ Submit.propTypes = {
loadingUuid: PT.string.isRequired,
timestamp: PT.number.isRequired,
}).isRequired,
groups: PT.shape({}).isRequired,
groups: PT.arrayOf(PT.shape()).isRequired,
isSubmitting: PT.bool.isRequired,
submitDone: PT.bool.isRequired,
errorMsg: PT.string,
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/SubmissionPage/Uploading/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const Uploading = ({
* Prop Validation
*/
Uploading.propTypes = {
challengeId: PT.number.isRequired,
challengeId: PT.string.isRequired,
challengeName: PT.string.isRequired,
challengesUrl: PT.string.isRequired,
isSubmitting: PT.bool.isRequired,
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/SubmissionPage/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const filestackDataProp = PT.shape({
SubmissionsPage.propTypes = {
userId: PT.string.isRequired,
challengesUrl: PT.string.isRequired,
challengeId: PT.number.isRequired,
challengeId: PT.string.isRequired,
challengeName: PT.string.isRequired,
communitiesList: PT.shape({
data: PT.arrayOf(PT.shape({
Expand All @@ -85,7 +85,7 @@ SubmissionsPage.propTypes = {
loadingUuid: PT.string.isRequired,
timestamp: PT.number.isRequired,
}).isRequired,
groups: PT.shape({}).isRequired,
groups: PT.arrayOf(PT.shape()).isRequired,
track: PT.string.isRequired,
status: PT.string.isRequired,
submitForm: PT.func.isRequired,
Expand Down
10 changes: 5 additions & 5 deletions src/shared/components/challenge-detail/Submissions/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,25 +292,25 @@ class SubmissionsComponent extends React.Component {
item => item.member === memberOfModal);

const renderSubmission = s => (
<div styleName="submission" key={s.submissionId}>
<div styleName="submission" key={s.id}>
<a
href={`${config.URL.STUDIO}?module=DownloadSubmission&sbmid=${s.submissionId}`}
href={`${config.URL.STUDIO}?module=DownloadSubmission&sbmid=${s.id}`}
target="_blank"
rel="noopener noreferrer"
>
<img
alt=""
src={`${config.URL.STUDIO}/studio.jpg?module=DownloadSubmission&sbmid=${s.submissionId}&sbt=small&sfi=1`}
src={`${config.URL.STUDIO}/studio.jpg?module=DownloadSubmission&sbmid=${s.id}&sbt=small&sfi=1`}
/>
</a>
<div styleName="bottom-info">
<div styleName="links">
<a
href={`${config.URL.STUDIO}?module=DownloadSubmission&sbmid=${s.submissionId}`}
href={`${config.URL.STUDIO}?module=DownloadSubmission&sbmid=${s.id}`}
target="_blank"
rel="noopener noreferrer"
>
{`#${s.submissionId}`}
{`#${s.id}`}
</a>
<a
href={`${window.origin}/members/${s.createdBy}`}
Expand Down
Loading