diff --git a/src/containers/Submission/Submit/Uploading/index.jsx b/src/containers/Submission/Submit/Uploading/index.jsx
index 8c712dd..9f83d8d 100644
--- a/src/containers/Submission/Submit/Uploading/index.jsx
+++ b/src/containers/Submission/Submit/Uploading/index.jsx
@@ -1,6 +1,6 @@
-import React from "react";
+import React, { useEffect, useRef } from "react";
import PT from "prop-types";
-import { Link } from "@reach/router";
+import { Link, navigate } from "@reach/router";
import { PrimaryButton, DefaultButton as Button } from "components/Buttons";
import { COMPETITION_TRACKS, CHALLENGES_URL } from "../../../../constants";
import RobotHappy from "assets/icons/robot-happy.svg";
@@ -20,6 +20,22 @@ const Uploading = ({
uploadProgress,
back,
}) => {
+ const propsRef = useRef();
+ propsRef.current = { submitDone, challengeId };
+
+ useEffect(() => {
+ return () => {
+ if (propsRef.current.submitDone) {
+ const backUrl = window.location.pathname;
+ if (backUrl === `${CHALLENGES_URL}/${challengeId}`) {
+ navigate(
+ `${CHALLENGES_URL}/${propsRef.current.challengeId}?reload=true`
+ );
+ }
+ }
+ }; // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
return (
diff --git a/src/containers/challenge-detail/index.jsx b/src/containers/challenge-detail/index.jsx
index b2a17b1..f3f3cfc 100644
--- a/src/containers/challenge-detail/index.jsx
+++ b/src/containers/challenge-detail/index.jsx
@@ -221,6 +221,10 @@ class ChallengeDetailPageContainer extends React.Component {
challenge,
// loadingRecommendedChallengesUUID,
history,
+ loadChallengeDetails,
+ loadFullChallengeDetails,
+ isLoadingChallenge,
+ isLoadingTerms,
} = this.props;
if (
@@ -247,6 +251,19 @@ class ChallengeDetailPageContainer extends React.Component {
// getAllRecommendedChallenges(auth.tokenV3, recommendedTechnology);
// }
+ const query = new URLSearchParams(history.location.search);
+ const isReloading = isLoadingChallenge || isLoadingTerms;
+ if (query.get("reload") && !isReloading) {
+ history.replace(history.location.pathname, history.state);
+ loadChallengeDetails(
+ nextProps.auth,
+ challengeId,
+ loadFullChallengeDetails
+ );
+
+ return;
+ }
+
const { thriveArticles } = this.state;
const userId = _.get(this, "props.auth.user.userId");
const nextUserId = _.get(nextProps, "auth.user.userId");
@@ -961,8 +978,7 @@ const mapDispatchToProps = (dispatch) => {
}
dispatch(updateFilter(change));
dispatch(
- updateQuery({ ...stateProps.filter.challenge, ...change }),
- change
+ updateQuery({ ...stateProps.filter.challenge, ...change })
);
},
setSpecsTabState: (state) =>
diff --git a/src/reducers/challenges.js b/src/reducers/challenges.js
index dc8d54c..31ae15a 100644
--- a/src/reducers/challenges.js
+++ b/src/reducers/challenges.js
@@ -4,6 +4,7 @@ const defaultState = {
loadingChallenges: false,
loadingChallengesError: null,
challenges: [],
+ challengesMeta: {},
total: 0,
loadingRecommendedChallenges: false,
loadingRecommendedChallengesError: null,
@@ -16,7 +17,24 @@ function onGetChallengesInit(state) {
return { ...state, loadingChallenges: true, loadingChallengesError: null };
}
-function onGetChallengesDone(state, { payload }) {
+function onGetChallengesDone(state, { error, payload }) {
+ if (error) {
+ return onGetChallengesFailure(state, { payload });
+ }
+
+ return {
+ ...state,
+ loadingChallenges: false,
+ loadingChallengesError: null,
+ challenges: payload.challenges,
+ challengesMeta: payload.challenges?.meta,
+ total: payload.total,
+ openForRegistrationCount: payload.openForRegistrationCount,
+ initialized: true,
+ };
+}
+
+function onGetChallengesFailure(state, { payload }) {
const error = payload;
if (error.name === "AbortError") {
return {
@@ -29,40 +47,18 @@ function onGetChallengesDone(state, { payload }) {
return {
...state,
loadingChallenges: false,
- loadingChallengesError: null,
- challenges: payload.challenges,
- total: payload.total,
- openForRegistrationCount: payload.openForRegistrationCount,
+ loadingChallengesError: payload,
+ challenges: [],
+ total: 0,
+ openForRegistrationCount: 0,
initialized: true,
};
}
-// function onGetChallengesFailure(state, { payload }) {
-// const error = payload;
-// if (error.name === "AbortError") {
-// return {
-// ...state,
-// loadingChallenges: false,
-// loadingChallengesError: null,
-// };
-// }
-
-// return {
-// ...state,
-// loadingChallenges: false,
-// loadingChallengesError: payload,
-// challenges: [],
-// total: 0,
-// openForRegistrationCount: 0,
-// initialized: true,
-// };
-// }
-
export default handleActions(
{
GET_CHALLENGE_INIT: onGetChallengesInit,
GET_CHALLENGES_DONE: onGetChallengesDone,
- // GET_CHALLENGES_FAILURE: onGetChallengesFailure,
},
defaultState
);
diff --git a/src/routers/challenge-list/index.jsx b/src/routers/challenge-list/index.jsx
index 49bcaa2..6adcfb0 100644
--- a/src/routers/challenge-list/index.jsx
+++ b/src/routers/challenge-list/index.jsx
@@ -9,7 +9,7 @@ import { FeedbackButton, showMenu } from "@topcoder/micro-frontends-earn-app";
import actions from "../../actions";
import * as utils from "../../utils";
import store from "../../store";
-import { initialChallengeFilter } from "../..//reducers/filter";
+import { initialChallengeFilter } from "../../reducers/filter";
import _ from "lodash";
import "react-date-range/dist/theme/default.css";
@@ -29,14 +29,24 @@ const App = () => {
useEffect(() => {
if (!location.search) {
- store.dispatch(actions.challenges.getChallengesInit());
- store.dispatch(
- actions.challenges.getChallengesDone(initialChallengeFilter)
- );
+ const currentFilter = store.getState().filter.challenge;
+ const diff = !_.isEqual(initialChallengeFilter, currentFilter);
+
+ if (diff) {
+ const params = utils.challenge.createChallengeParams(currentFilter);
+ utils.url.updateQuery(params, true);
+ } else {
+ store.dispatch(actions.challenges.getChallengesInit());
+ store.dispatch(actions.challenges.getChallengesDone(currentFilter));
+ }
+
return;
}
- const params = utils.url.parseUrlQuery(location.search);
+ let search = location.href.split("?").length
+ ? "?" + location.href.split("?")[1]
+ : "";
+ const params = utils.url.parseUrlQuery(search);
const toUpdate = utils.challenge.createChallengeFilter(params);
if (!toUpdate.types) toUpdate.types = [];
diff --git a/src/services/challenges.js b/src/services/challenges.js
index 7e6728a..2ecbe5d 100644
--- a/src/services/challenges.js
+++ b/src/services/challenges.js
@@ -17,7 +17,7 @@ import { getService as getSubmissionsService } from "./submissions";
* @return {Array
+