Merge pull request #4526 from topcoder-platform/issue-4380

Issue#4380 - Removed proxyApi and change isRegistered function

Author: sushilshinde

src/server/index.js

@@ -145,69 +145,6 @@ async function onExpressJsSetup(server) {
     tcCommunitiesDemoApi,
   );
 
-  // Get roleId by name
-  server.use(
-    '/community-app-assets/api/challenges/roleId',
-    async (req, res, next) => {
-      let tokenM2M = '';
-      try {
-        tokenM2M = await services.api.getTcM2mToken();
-      } catch (err) {
-        logger.error('proxyApi-roleId-getTcM2mToken : ', err);
-      }
-
-      const params = {
-        name: req.query.name,
-        isActive: true,
-      };
-      const url = `${config.API.V5}/resource-roles?${qs.stringify(params)}`;
-      try {
-        let data = await fetch(url, {
-          headers: { Authorization: `Bearer ${tokenM2M}` },
-        });
-        data = await data.text();
-        res.send(data);
-      } catch (err) {
-        next(err);
-      }
-    },
-  );
-
-  // Get registrants from challenge
-  server.use(
-    '/community-app-assets/api/challenges/:challengeId/registrants',
-    async (req, res, next) => {
-      let tokenM2M = '';
-      let roleId = '';
-      try {
-        tokenM2M = await services.api.getTcM2mToken();
-      } catch (err) {
-        logger.error('proxyApi-registrants-getTcM2mToken : ', err);
-      }
-
-      try {
-        roleId = await services.challenge.getService().getRoleId('Submitter');
-      } catch (err) {
-        logger.error('proxyApi-registrants-getRoleId : ', err);
-      }
-
-      const params = {
-        challengeId: req.params.challengeId,
-        roleId,
-      };
-      const url = `${config.API.V5}/resources?${qs.stringify(params)}`;
-      try {
-        let data = await fetch(url, {
-          headers: { Authorization: `Bearer ${tokenM2M}` },
-        });
-        data = await data.text();
-        res.send(data);
-      } catch (err) {
-        next(err);
-      }
-    },
-  );
-
   server.use(
     '/community-app-assets/api/edit-contentful-entry/:id',
     (req, res) => res.redirect(`${CMS_BASE_URL}/entries/${req.params.id}`),

src/shared/containers/SubmissionManagement/index.jsx

@@ -52,21 +52,18 @@ class SubmissionManagementPageContainer extends React.Component {
       deleting,
       loadingSubmissionsForChallengeId,
       submissionPhaseStartDate,
-      handle,
       isLoadingChallenge,
       mySubmissions,
       onCancelSubmissionDelete,
       onDownloadSubmission,
       onShowDetails,
       onSubmissionDelete,
       onSubmissionDeleteConfirmed,
-      registrants,
       showDetails,
       showModal,
       toBeDeletedId,
     } = this.props;
-    const isRegistered = registrants.find(r => _.toString(r.memberHandle) === _.toString(handle));
-    if (!isRegistered) return <AccessDenied redirectLink={`${challengesUrl}/${challenge.id}`} cause={ACCESS_DENIED_REASON.HAVE_NOT_SUBMITTED_TO_THE_CHALLENGE} />;
+    if (!challenge.isRegistered) return <AccessDenied redirectLink={`${challengesUrl}/${challenge.id}`} cause={ACCESS_DENIED_REASON.HAVE_NOT_SUBMITTED_TO_THE_CHALLENGE} />;
 
     const isEmpty = _.isEmpty(challenge);
     const smConfig = {
@@ -189,8 +186,6 @@ SubmissionManagementPageContainer.propTypes = {
   toBeDeletedId: PT.number,
   onSubmissionDeleteConfirmed: PT.func.isRequired,
   submissionPhaseStartDate: PT.string.isRequired,
-  registrants: PT.arrayOf(PT.object).isRequired,
-  handle: PT.string.isRequired,
 };
 
 function mapStateToProps(state, props) {

src/shared/containers/SubmissionPage.jsx

@@ -13,7 +13,6 @@ import { PrimaryButton } from 'topcoder-react-ui-kit';
 import shortId from 'shortid';
 import React from 'react';
 import PT from 'prop-types';
-import _ from 'lodash';
 import { connect } from 'react-redux';
 import SubmissionsPage from 'components/SubmissionPage';
 import AccessDenied, { CAUSE as ACCESS_DENIED_REASON } from 'components/tc-communities/AccessDenied';
@@ -52,9 +51,8 @@ class SubmissionsPageContainer extends React.Component {
   }
 
   render() {
-    const { registrants, handle, challengeId } = this.props;
-    const isRegistered = registrants.find(r => _.toString(r.memberHandle) === _.toString(handle));
-    if (!isRegistered) {
+    const { challenge, challengeId } = this.props;
+    if (!challenge.isRegistered) {
       return (
         <React.Fragment>
           <AccessDenied cause={ACCESS_DENIED_REASON.NOT_AUTHORIZED}>
@@ -134,9 +132,7 @@ SubmissionsPageContainer.propTypes = {
   updateNotesLength: PT.func.isRequired,
   setSubmissionFilestackData: PT.func.isRequired,
   submissionFilestackData: filestackDataProp.isRequired,
-  registrants: PT.arrayOf(PT.object).isRequired,
   winners: PT.arrayOf(PT.object).isRequired,
-  handle: PT.string.isRequired,
 };
 
 /**
@@ -174,9 +170,7 @@ const mapStateToProps = (state, ownProps) => {
     filePickers: submission.filePickers,
     notesLength: submission.notesLength,
     submissionFilestackData: submission.submissionFilestackData,
-    registrants: state.challenge.details.registrants,
     winners: state.challenge.details.winners,
-    handle: state.auth.user ? state.auth.user.handle : '',
   };
 };
 

src/shared/containers/challenge-detail/index.jsx

@@ -112,13 +112,6 @@ function getOgImage(challenge, challengeTypes) {
   }
 }
 
-function isRegistered(registrants, handle) {
-  if (_.find(registrants, r => _.toString(r.memberHandle) === _.toString(handle))) {
-    return true;
-  }
-  return false;
-}
-
 // The container component
 class ChallengeDetailPageContainer extends React.Component {
   constructor(props, context) {
@@ -394,11 +387,6 @@ class ChallengeDetailPageContainer extends React.Component {
     const isEmpty = _.isEmpty(challenge);
     const isLegacyMM = isMM(challenge) && Boolean(challenge.roundId);
 
-    const hasRegistered = isRegistered(
-      challenge.registrants,
-      (auth.user || {}).handle,
-    );
-
     if (isLoadingChallenge || isLoadingTerms) {
       return <LoadingPagePlaceholder />;
     }
@@ -475,12 +463,12 @@ class ChallengeDetailPageContainer extends React.Component {
               }
               unregistering={unregistering}
               checkpoints={checkpoints}
-              hasRegistered={hasRegistered}
+              hasRegistered={challenge.isRegistered}
               hasFirstPlacement={hasFirstPlacement}
               challengeSubtracksMap={challengeSubtracksMap}
               isMenuOpened={isMenuOpened}
               submissionEnded={submissionEnded}
-              mySubmissions={hasRegistered ? mySubmissions : []}
+              mySubmissions={challenge.isRegistered ? mySubmissions : []}
             />
             )
           }
@@ -494,7 +482,7 @@ class ChallengeDetailPageContainer extends React.Component {
                 description={challenge.name}
                 detailedRequirements={challenge.description}
                 terms={terms}
-                hasRegistered={hasRegistered}
+                hasRegistered={challenge.isRegistered}
                 savingChallenge={savingChallenge}
                 setSpecsTabState={setSpecsTabState}
                 specsTabState={specsTabState}
@@ -554,7 +542,7 @@ class ChallengeDetailPageContainer extends React.Component {
                   this.setState({ notFoundCountryFlagUrl });
                 }}
                 onSortChange={sort => this.setState({ submissionsSort: sort })}
-                hasRegistered={hasRegistered}
+                hasRegistered={challenge.isRegistered}
                 unregistering={unregistering}
                 isLegacyMM={isLegacyMM}
                 submissionEnded={submissionEnded}
@@ -568,14 +556,14 @@ class ChallengeDetailPageContainer extends React.Component {
               <MySubmissions
                 challengesUrl={challengesUrl}
                 challenge={challenge}
-                hasRegistered={hasRegistered}
+                hasRegistered={challenge.isRegistered}
                 unregistering={unregistering}
                 submissionEnded={submissionEnded}
                 isLegacyMM={isLegacyMM}
                 loadingMMSubmissionsForChallengeId={loadingMMSubmissionsForChallengeId}
                 auth={auth}
                 loadMMSubmissions={loadMMSubmissions}
-                mySubmissions={hasRegistered ? mySubmissions : []}
+                mySubmissions={challenge.isRegistered ? mySubmissions : []}
                 reviewTypes={reviewTypes}
                 submissionsSort={mySubmissionsSort}
                 onSortChange={sort => this.setState({ mySubmissionsSort: sort })}