Skip to content

Issue#4562 : Updated terms to use V5 API #4588

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 1 commit into from
Jun 24, 2020
Merged

Issue#4562 : Updated terms to use V5 API #4588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/shared/actions/terms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const { getService } = services.terms;
* @return {Promise}
*/
function getTermsDone(entity, tokens, mockAgreed) {
const service = getService(tokens.tokenV2);
const service = getService(tokens.tokenV3);
let termsPromise;

// if mockAgreed=true passed, then we create an array of 10 true which we pass to the
Expand Down Expand Up @@ -68,11 +68,11 @@ function getTermDetailsInit(termId) {
* Payload creator for TERMS/GET_TERM_DETAILS_DONE action,
* which fetch details of the specified term.
* @param {Number|String} termId
* @param {String} tokenV2
* @param {String} tokenV3
* @return {Promise}
*/
function getTermDetailsDone(termId, tokenV2) {
const service = getService(tokenV2);
function getTermDetailsDone(termId, tokenV3) {
const service = getService(tokenV3);
return service.getTermDetails(termId).then(details => ({ termId, details }));
}

Expand All @@ -90,11 +90,11 @@ function getDocuSignUrlInit(templateId) {
* which generate the url of DoduSign term
* @param {Number|String} templateId id of document template to sign
* @param {String} returnUrl callback url after finishing singing
* @param {String} tokenV2 auth token
* @param {String} tokenV3 auth token
* @return {Promise} promise of request result
*/
function getDocuSignUrlDone(templateId, returnUrl, tokenV2) {
const service = getService(tokenV2);
function getDocuSignUrlDone(templateId, returnUrl, tokenV3) {
const service = getService(tokenV3);
return service.getDocuSignUrl(templateId, returnUrl)
.then(resp => ({ templateId, docuSignUrl: resp.recipientViewUrl }));
}
Expand All @@ -111,11 +111,11 @@ function agreeTermInit(termId) {
/**
* Payload creator for TERMS/AGREE_TERM_DONE
* @param {Number|String} termId id of term
* @param {String} tokenV2 auth token
* @param {String} tokenV3 auth token
* @return {Promise} promise of request result
*/
function agreeTermDone(termId, tokenV2) {
const service = getService(tokenV2);
function agreeTermDone(termId, tokenV3) {
const service = getService(tokenV3);
return service.agreeTerm(termId).then(resp => ({ termId, success: resp.success }));
}

Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/ReviewOpportunityDetailsPage/Sidebar/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ const Sidebar = ({ terms }) => (
</h4>
{
terms.map(term => (
<p key={term.termsOfUseId}>
<a href={`https://www.topcoder.com/challenges/terms/detail/${term.termsOfUseId}`} target="_blank" rel="noopener noreferrer">
<p key={term.id}>
<a href={`https://www.topcoder.com/challenges/terms/detail/${term.id}`} target="_blank" rel="noopener noreferrer">
{term.title}
</a>
</p>
Expand Down
22 changes: 11 additions & 11 deletions src/shared/components/Terms/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default class Terms extends React.Component {
componentDidMount() {
const { loadDetails, selectedTerm } = this.props;
if (selectedTerm) {
loadDetails(selectedTerm.termsOfUseId);
loadDetails(selectedTerm.id);
}
window.addEventListener('message', this.messageHandler, false);
window.addEventListener('resize', this.resizeHandler, false);
Expand All @@ -75,8 +75,8 @@ export default class Terms extends React.Component {
checkStatus, canRegister, onCancel, register,
} = this.props;
if (nextProps.selectedTerm && !_.isEqual(selectedTerm, nextProps.selectedTerm)
&& nextProps.loadingTermId !== _.toString(nextProps.selectedTerm.termsOfUseId)) {
loadDetails(nextProps.selectedTerm.termsOfUseId);
&& nextProps.loadingTermId !== _.toString(nextProps.selectedTerm.id)) {
loadDetails(nextProps.selectedTerm.id);
}
if (!_.every(terms, 'agreed') && _.every(nextProps.terms, 'agreed') && !nextProps.checkingStatus) {
checkStatus();
Expand Down Expand Up @@ -113,7 +113,7 @@ export default class Terms extends React.Component {
const { onCancel, selectedTerm, signDocu } = this.props;
if (event.data.type === 'DocuSign') {
if (event.data.event === 'signing_complete') {
signDocu(selectedTerm.termsOfUseId);
signDocu(selectedTerm.id);
} else {
onCancel();
}
Expand Down Expand Up @@ -159,7 +159,7 @@ export default class Terms extends React.Component {
};

return (
<div key={(selectedTerm || {}).termsOfUseId}>
<div key={(selectedTerm || {}).id}>
<FocusTrap>
<Modal
onCancel={onCancel}
Expand Down Expand Up @@ -199,7 +199,7 @@ export default class Terms extends React.Component {
{
terms.map((t, index) => (
<div
key={t.termsOfUseId}
key={t.id}
/* TODO: No need to use so much style names and
* related logic here. It can be simplified:
* "view-only" style should move to the root
Expand Down Expand Up @@ -259,11 +259,11 @@ export default class Terms extends React.Component {
)
}
{
loadingTermId === _.toString(selectedTerm.termsOfUseId)
loadingTermId === _.toString(selectedTerm.id)
&& <LoadingIndicator />
}
{
loadingTermId !== _.toString(selectedTerm.termsOfUseId) && details
loadingTermId !== _.toString(selectedTerm.id) && details
&& (
<TermDetails
details={details}
Expand All @@ -282,7 +282,7 @@ export default class Terms extends React.Component {
{
!isLoadingTerms && !checkingStatus && selectedTerm && details
&& !viewOnly
&& loadingTermId !== _.toString(selectedTerm.termsOfUseId)
&& loadingTermId !== _.toString(selectedTerm.id)
&& details.agreeabilityType === 'Electronically-agreeable' ? (
<div styleName="buttons">
{
Expand All @@ -303,9 +303,9 @@ export default class Terms extends React.Component {
: (
<div>
<PrimaryButton
disabled={agreeingTerm === details.termsOfUseId}
disabled={agreeingTerm === details.id}
onClick={() => {
agreeTerm(details.termsOfUseId);
agreeTerm(details.id);
if (this.vScrollArea) {
this.vScrollArea.scrollTop = 0;
}
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/challenge-detail/Specification/SideBar/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ export default function SideBar({
<div styleName="link-like-paragraph">
{
terms.map(t => (
<div styleName="term" key={t.termsOfUseId}>
<div styleName="term" key={t.id}>
<Link
to={`${challengesUrl}/terms/detail/${t.termsOfUseId}`}
to={`${challengesUrl}/terms/detail/${t.id}`}
>
{t.title}
</Link>
Expand Down
6 changes: 3 additions & 3 deletions src/shared/containers/Terms.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,15 @@ function mapDispatchToProps(dispatch) {
},
loadTermDetails: (tokens, termId) => {
dispatch(actions.terms.getTermDetailsInit(termId));
dispatch(actions.terms.getTermDetailsDone(termId, tokens.tokenV2));
dispatch(actions.terms.getTermDetailsDone(termId, tokens.tokenV3));
},
getDocuSignUrl: (tokens, templateId, returnUrl) => {
dispatch(actions.terms.getDocuSignUrlInit(templateId));
dispatch(actions.terms.getDocuSignUrlDone(templateId, returnUrl, tokens.tokenV2));
dispatch(actions.terms.getDocuSignUrlDone(templateId, returnUrl, tokens.tokenV3));
},
agreeTerm: (tokens, termId) => {
dispatch(actions.terms.agreeTermInit(termId));
dispatch(actions.terms.agreeTermDone(termId, tokens.tokenV2));
dispatch(actions.terms.agreeTermDone(termId, tokens.tokenV3));
},
signDocu: (id) => {
dispatch(termsActions.terms.signDocu(id));
Expand Down
2 changes: 1 addition & 1 deletion src/shared/containers/challenge-detail/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ class ChallengeDetailPageContainer extends React.Component {
{legacyId && (
<Terms
defaultTitle="Challenge Prerequisites"
entity={{ type: 'challenge', id: legacyId.toString() }}
entity={{ type: 'challenge', id: challengeId.toString(), terms: challenge.terms }}
instanceId={this.instanceId}
description="You are seeing these Terms & Conditions because you have registered to a challenge and you have to respect the terms below in order to be able to submit."
register={() => {
Expand Down
6 changes: 3 additions & 3 deletions src/shared/containers/terms-detail/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,15 @@ function mapDispatchToProps(dispatch) {
return {
loadTermDetails: (tokens, termId) => {
dispatch(actions.terms.getTermDetailsInit(termId));
dispatch(actions.terms.getTermDetailsDone(termId, tokens.tokenV2, false));
dispatch(actions.terms.getTermDetailsDone(termId, tokens.tokenV3, false));
},
getDocuSignUrl: (tokens, templateId, returnUrl) => {
dispatch(actions.terms.getDocuSignUrlInit(templateId));
dispatch(actions.terms.getDocuSignUrlDone(templateId, returnUrl, tokens.tokenV2));
dispatch(actions.terms.getDocuSignUrlDone(templateId, returnUrl, tokens.tokenV3));
},
agreeTerms: (tokens, termId) => {
dispatch(actions.terms.agreeTermInit(termId));
dispatch(actions.terms.agreeTermDone(termId, tokens.tokenV2));
dispatch(actions.terms.agreeTermDone(termId, tokens.tokenV3));
},
};
}
Expand Down
4 changes: 2 additions & 2 deletions src/shared/reducers/terms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function onAgreeTermDone(state, action) {
}
if (action.payload.success) {
const terms = _.cloneDeep(state.terms);
const term = _.find(terms, ['termsOfUseId', action.payload.termId]);
const term = _.find(terms, ['id', action.payload.termId]);
term.agreed = true;
const selectedTerm = _.find(terms, t => !t.agreed);
return {
Expand Down Expand Up @@ -216,7 +216,7 @@ function onCloseTermsModal(state, { payload }) {
*/
function onSignDocu(state, action) {
const terms = _.cloneDeep(state.terms);
const term = _.find(terms, ['termsOfUseId', action.payload]);
const term = _.find(terms, ['id', action.payload]);
term.agreed = true;
const selectedTerm = _.find(terms, t => !t.agreed);
return {
Expand Down