Feature/mandatory items

package.json

@@ -22,6 +22,7 @@
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^3.1.0",
     "dotenv-webpack": "^1.7.0",
+    "dropzone": "5.7.2",
     "file-loader": "^4.1.0",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
@@ -39,7 +40,7 @@
     "moment": "^2.22.2",
     "moment-timezone": "^0.5.21",
     "node-sass": "^4.11.0",
-    "openstack-uicore-foundation": "2.0.53",
+    "openstack-uicore-foundation": "2.1.2",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "postcss-loader": "^2.1.6",
     "react": "^16.6.3",

src/actions/auth-actions.js

@@ -14,16 +14,13 @@
 import {
     createAction,
     getRequest,
-    showMessage,
     startLoading,
     stopLoading,
     authErrorHandler,
-    initLogOut
+    initLogOut,
+    getUserInfo,
 } from "openstack-uicore-foundation/lib/methods";
 
-import {REQUEST_USER_INFO, RECEIVE_USER_INFO} from 'openstack-uicore-foundation/lib/actions';
-
-
 import history from '../history'
 import T from "i18n-react/dist/i18n-react";
 import Swal from "sweetalert2";
@@ -64,40 +61,17 @@ export const speakerErrorHandler = (err, res) => (dispatch, getState) => {
 
     if (code == 404) {
         // speaker not found
-        //try to get member
 
         Swal.fire({
             title: T.translate("landing.speaker_profile_required"),
             text: T.translate("landing.speaker_profile_required_text"),
             type: "warning",
         });
 
-        return getRequest(
-            createAction(REQUEST_USER_INFO),
-            createAction(RECEIVE_USER_INFO),
-            `${window.API_BASE_URL}/api/v1/members/me?expand=groups&access_token=${accessToken}`,
-            authErrorHandler
-        )({})(dispatch, getState).then(() => {
-            dispatch(stopLoading());
-
-            let { member } = getState().loggedUserState;
-            if( member == null || member == undefined){
-                let error_message = {
-                    title: 'ERROR',
-                    html: T.translate("errors.user_not_set"),
-                    type: 'error'
-                };
-
-                dispatch(showMessage( error_message, initLogOut ));
-                return;
-            }
-
-            const redirectUrl = baseState.summit ? `/app/${baseState.summit.slug}/profile` : '/app/profile';
-            history.push(redirectUrl);
-        });
-
+        const backUrl = baseState.summit ? `/app/${baseState.summit.slug}/profile` : '/app/profile';
+        //try to get member
+        return getUserInfo('groups', backUrl, history)(dispatch, getState);
     }
     dispatch(authErrorHandler(err, res));
-
 }
 

src/actions/base-actions.js

@@ -35,8 +35,10 @@ export const RECEIVE_SUMMIT                 = 'RECEIVE_SUMMIT';
 export const RECEIVE_SELECTION_PLAN         = 'RECEIVE_SELECTION_PLAN';
 export const RECEIVE_MARKETING_SETTINGS     = 'RECEIVE_MARKETING_SETTINGS';
 export const RECEIVE_AVAILABLE_SUMMITS      = 'RECEIVE_AVAILABLE_SUMMITS';
+export const SUMMIT_DOCS_RECEIVED           = 'SUMMIT_DOCS_RECEIVED';
 export const ERROR_RECEIVE_SUMMIT           = 'ERROR_RECEIVE_SUMMIT';
 export const CLEAR_SUMMIT                   = 'CLEAR_SUMMIT';
+export const BASE_LOADED                    = 'BASE_LOADED';
 
 
 export const resetLoading = () => (dispatch, getState) => {
@@ -51,7 +53,7 @@ export const clearCurrentSummit = () => (dispatch, getState) => {
 export const getCurrentSelectionPlanPublic = (summit_id) => (dispatch, getState) => {
 
     let params = {
-        expand: 'summit,track_groups'
+        expand: 'summit,track_groups,extra_questions,extra_questions.values'
     };
 
     return getRequest(
@@ -65,38 +67,19 @@ export const getCurrentSelectionPlanPublic = (summit_id) => (dispatch, getState)
 
 export const getAllFromSummit = (summitSlug) => (dispatch, getState) => {
     dispatch(startLoading());
+    dispatch(createAction(BASE_LOADED)({loaded: false}));
     return getCurrentSummitPublic(summitSlug)(dispatch, getState)
         .then(({response}) => {
-            getMarketingSettings(response.id)(dispatch, getState);
-            return response.id;
-        })
-        .then((summitId) => getCurrentSelectionPlanPublic(summitId)(dispatch, getState))
-        .then(() => { dispatch(stopLoading()); });
-}
-
-const currentSummitErrorHandler = (err, res) => (dispatch, state) => {
-    let code = err.status;
-    let msg = '';
+            const marketing = getMarketingSettings(response.id)(dispatch, getState);
+            const summitDocs = getAllSummitDocs(response.id)(dispatch, getState);
+            const selPlan = getCurrentSelectionPlanPublic(response.id)(dispatch, getState)
 
-    dispatch(stopLoading());
-
-    switch (code) {
-        case 404:
-            msg = "";
-            if (err.response.body && err.response.body.message) msg = err.response.body.message;
-            else if (err.response.error && err.response.error.message) msg = err.response.error.message;
-            else msg = err.message;
-            // clear state
-            dispatch(createAction(ERROR_RECEIVE_SUMMIT)({}));
-            Swal.fire("Not Found", msg, "warning");
-            // back selection page
-            history.push('/');
-            break;
-        default:
-            Swal.fire("ERROR", T.translate("errors.server_error"), "error");
-            break
-    }
-}
+            return Promise.all([marketing, selPlan, summitDocs]).then(() => {
+                dispatch(createAction(BASE_LOADED)({loaded: true}));
+                dispatch(stopLoading());
+            });
+        });
+};
 
 export const getCurrentSummitPublic = (id) => (dispatch, getState) => {
 
@@ -120,7 +103,8 @@ export const getAvailableSummits = () => (dispatch, getState) => {
     const secondsSinceEpoch = Math.round(Date.now() / 1000);
 
     let filters = [
-        `start_date=>${secondsSinceEpoch}`,
+        `submission_begin_date<=${secondsSinceEpoch}`,
+        `submission_end_date>=${secondsSinceEpoch}`,
         'selection_plan_enabled==1'
     ];
 
@@ -185,7 +169,7 @@ export const loadEventCategory = () => (dispatch, getState) => {
     dispatch(startLoading());
 
     let params = {
-        expand       : "allowed_tags,extra_questions",
+        expand       : "allowed_tags",
         access_token : accessToken,
     };
 
@@ -216,6 +200,50 @@ export const getMarketingSettings = (summitId) => (dispatch, getState) => {
 };
 
 
+export const getAllSummitDocs = (summitId) => (dispatch, getState) => {
+
+
+    let { loggedUserState } = getState();
+    let { accessToken }     = loggedUserState;
+
+    if (!accessToken) return;
+
+    let params = {
+        access_token : accessToken,
+    };
+
+    return getRequest(
+        null,
+        createAction(SUMMIT_DOCS_RECEIVED),
+        `${window.API_BASE_URL}/api/v1/summits/${summitId}/summit-documents`,
+        authErrorHandler
+    )(params)(dispatch);
+};
+
+const currentSummitErrorHandler = (err, res) => (dispatch, state) => {
+    let code = err.status;
+    let msg = '';
+
+    dispatch(stopLoading());
+
+    switch (code) {
+        case 404:
+            msg = "";
+            if (err.response.body && err.response.body.message) msg = err.response.body.message;
+            else if (err.response.error && err.response.error.message) msg = err.response.error.message;
+            else msg = err.message;
+            // clear state
+            dispatch(createAction(ERROR_RECEIVE_SUMMIT)({}));
+            Swal.fire("Not Found", msg, "warning");
+            // back selection page
+            history.push('/');
+            break;
+        default:
+            Swal.fire("ERROR", T.translate("errors.server_error"), "error");
+            break
+    }
+};
+
 export const selectionPlanErrorHandler = (err, res) => (dispatch) => {
     let code = err.status;
     dispatch(stopLoading());
@@ -251,5 +279,5 @@ export const selectionPlanErrorHandler = (err, res) => (dispatch) => {
         default:
             Swal.fire("ERROR", T.translate("errors.server_error"), "error");
     }
-}
+};