@influenzanet/case-web-app-core 2.7.5-staging.6 → 2.7.5-staging.7

package/build/AppCore.d.ts

@@ -1,10 +1,10 @@
-import React from 'react';
-import { FooterConfig } from './types/footerConfig';
-import { AppConfig } from './types/appConfig';
-import { HeaderConfig } from './types/headerConfig';
-import { NavbarConfig } from './types/navbarConfig';
-import { PagesConfig } from './types/pagesConfig';
-import { CustomSurveyResponseComponent } from '@influenzanet/case-web-ui/build/components/survey/SurveySingleItemView/ResponseComponent/ResponseComponent';
+import React from "react";
+import { FooterConfig } from "./types/footerConfig";
+import { AppConfig } from "./types/appConfig";
+import { HeaderConfig } from "./types/headerConfig";
+import { NavbarConfig } from "./types/navbarConfig";
+import { PagesConfig } from "./types/pagesConfig";
+import { CustomSurveyResponseComponent } from "@influenzanet/case-web-ui/build/components/survey/SurveySingleItemView/ResponseComponent/ResponseComponent";
 export interface Extension {
     name: string;
     component: React.FunctionComponent<any>;

package/build/index.d.ts

@@ -6,6 +6,11 @@ import * as userAPI from "./api/userAPI";
 import { useAuthTokenCheck } from "./hooks/useAuthTokenCheck";
 import PreventAccidentalNavigationPrompt from "./components/misc/PreventAccidentalNavigationPrompt";
 import InternalNavigator from "./components/misc/InternalNavigator";
+import { AppConfig } from "./types/appConfig";
+import { HeaderConfig } from './types/headerConfig';
+import { FooterConfig } from './types/footerConfig';
+import { NavbarConfig } from './types/navbarConfig';
+import { PageConfig } from './types/pagesConfig';
 declare const coreReduxActions: {
     appActions: import("@reduxjs/toolkit").CaseReducerActions<{
         reset: (state: import("immer/dist/internal").WritableDraft<import("./store/appSlice").AppState>) => import("immer/dist/internal").WritableDraft<import("./store/appSlice").AppState>;
@@ -80,4 +85,4 @@ declare const coreReduxActions: {
 declare const coreReduxThunks: {
     enterStudyThunk: import("@reduxjs/toolkit").AsyncThunk<import("./store/actions/studiesActions").EnterStudyPayload, import("./store/thunks/studiesThunks").EnterStudyRequest, {}>;
 };
-export { AppCore, initI18n, store, reducersManager, localStorageManager, studyAPI, userAPI, coreReduxActions, coreReduxThunks, useAuthTokenCheck, PreventAccidentalNavigationPrompt, InternalNavigator, };
+export { AppCore, initI18n, store, reducersManager, localStorageManager, studyAPI, userAPI, coreReduxActions, coreReduxThunks, useAuthTokenCheck, PreventAccidentalNavigationPrompt, InternalNavigator, type AppConfig, type HeaderConfig, type FooterConfig, type NavbarConfig, type PageConfig };

package/build/index.es.js

@@ -21978,11 +21978,11 @@ var enterStudyThunk = createAsyncThunk("studies/enterStudy", function (_a, _b) {
                     })];
                 case 1:
                     _c.sent();
+                    payload = { profileId: profileId, studyKey: studyKey };
+                    dispatch(enterStudy(payload));
                     return [4 /*yield*/, dispatch(initializeActiveSurveysThunk())];
                 case 2:
                     _c.sent();
-                    payload = { profileId: profileId, studyKey: studyKey };
-                    dispatch(enterStudy(payload));
                     return [2 /*return*/, payload];
             }
         });
@@ -22053,7 +22053,6 @@ var EditProfile = function (props) {
                     return [4 /*yield*/, getUserReq()];
                 case 4:
                     user = (_a.sent()).data;
-                    dispatch(userActions.setUser(user));
                     // if the profile creation is successful, enter the default studies
                     if (defaultStudies.length > 0) {
                         defaultStudies.forEach(function (studyKey) {
@@ -22063,6 +22062,7 @@ var EditProfile = function (props) {
                             }));
                         });
                     }
+                    dispatch(userActions.setUser(user));
                     setLoading(false);
                     close();
                     return [3 /*break*/, 6];
@@ -33313,7 +33313,7 @@ var DefaultStudiesManager = function () {
     var currentUserId = useSelector(function (state) { return state.user.currentUser.id; });
     useEffect(function () {
         var initialize = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var defaultStudies_1, _a, profilesStudiesMap_1, _b;
+            var defaultStudies_1, _a, profilesStudiesMap_1, _b, enterStudyReqs_1;
             return __generator$1(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -33322,7 +33322,7 @@ var DefaultStudiesManager = function () {
                         }
                         _d.label = 1;
                     case 1:
-                        _d.trys.push([1, 5, , 6]);
+                        _d.trys.push([1, 7, , 8]);
                         _a = unwrapResult;
                         return [4 /*yield*/, dispatch(initializeDefaultStudiesThunk())];
                     case 2:
@@ -33331,13 +33331,7 @@ var DefaultStudiesManager = function () {
                         return [4 /*yield*/, dispatch(initializeUserStudiesThunk())];
                     case 3:
                         profilesStudiesMap_1 = _b.apply(void 0, [_d.sent()]);
-                        /**
-                         * Backward compatibility with the functionality once present
-                         * in the SurveyList component
-                         *
-                         * We check whether all the default studies are assigned
-                         * to all profiles and if not, we try entering the study
-                         */
+                        enterStudyReqs_1 = [];
                         Object.keys(profilesStudiesMap_1).forEach(function (profileId) {
                             var profileStudies = profilesStudiesMap_1[profileId];
                             if (!profileStudies) {
@@ -33346,18 +33340,32 @@ var DefaultStudiesManager = function () {
                             var missingDefaultStudies = defaultStudies_1.filter(function (study) { return !profileStudies.includes(study); });
                             if (missingDefaultStudies.length > 0) {
                                 missingDefaultStudies.forEach(function (studyKey) {
-                                    dispatch(enterStudyThunk({ profileId: profileId, studyKey: studyKey }));
+                                    enterStudyReqs_1.push({ profileId: profileId, studyKey: studyKey });
                                 });
                             }
                         });
-                        return [4 /*yield*/, dispatch(initializeActiveSurveysThunk())];
+                        if (!(enterStudyReqs_1.length > 0)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, Promise.all(enterStudyReqs_1.map(function (req) { return __awaiter(void 0, void 0, void 0, function () {
+                                return __generator$1(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, dispatch(enterStudyThunk(req))];
+                                        case 1:
+                                            _a.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); }))];
                     case 4:
                         _d.sent();
-                        return [3 /*break*/, 6];
+                        return [4 /*yield*/, dispatch(initializeActiveSurveysThunk())];
                     case 5:
                         _d.sent();
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/];
+                        _d.label = 6;
+                    case 6: return [3 /*break*/, 8];
+                    case 7:
+                        _d.sent();
+                        return [3 /*break*/, 8];
+                    case 8: return [2 /*return*/];
                 }
             });
         }); };
@@ -33372,19 +33380,23 @@ var AppCore = function (props) {
     var i18n = useTranslation().i18n;
     var accessToken = useSelector(function (state) { var _a; return (_a = state.app.auth) === null || _a === void 0 ? void 0 : _a.accessToken; });
     /*
-    * In order to solve the issue https://github.com/coneno/case-web-app-core/issues/5, now Dialogs also need to know the application level default routes,
-    * but removing the defaultRoutes field from the PagesConfig interface and make it available at a higher level would be a breaking change for all the existing frontends.
-    *
-    * From now on, all components under AppCore that need to be aware of the application level default routes, can use a prop directly initialized with the const below.
-    *
-    * See how it is handled in the Pages and GlobalDialog components
-    */
-    var defaultRoutes = ((_a = props.pagesConfig) === null || _a === void 0 ? void 0 : _a.defaultRoutes) ? props.pagesConfig.defaultRoutes : BasicRoutes;
+     * In order to solve the issue https://github.com/coneno/case-web-app-core/issues/5, now Dialogs also need to know the application level default routes,
+     * but removing the defaultRoutes field from the PagesConfig interface and make it available at a higher level would be a breaking change for all the existing frontends.
+     *
+     * From now on, all components under AppCore that need to be aware of the application level default routes, can use a prop directly initialized with the const below.
+     *
+     * See how it is handled in the Pages and GlobalDialog components
+     */
+    var defaultRoutes = ((_a = props.pagesConfig) === null || _a === void 0 ? void 0 : _a.defaultRoutes)
+        ? props.pagesConfig.defaultRoutes
+        : BasicRoutes;
     if (accessToken) {
         setDefaultAccessTokenHeader(accessToken);
     }
     useEffect(function () {
-        var language = loadLastSelectedLanguage(process.env.REACT_APP_DEFAULT_LANGUAGE ? process.env.REACT_APP_DEFAULT_LANGUAGE : 'en');
+        var language = loadLastSelectedLanguage(process.env.REACT_APP_DEFAULT_LANGUAGE
+            ? process.env.REACT_APP_DEFAULT_LANGUAGE
+            : "en");
         i18n.changeLanguage(language);
     }, [i18n]);
     useEffect(function () {
@@ -33392,7 +33404,7 @@ var AppCore = function (props) {
     }, [i18n.language]);
     useEffect(function () {
         var _a, _b;
-        dispatch(appConfig.updateInstanceID(((_a = props.appConfig) === null || _a === void 0 ? void 0 : _a.instanceId) ? (_b = props.appConfig) === null || _b === void 0 ? void 0 : _b.instanceId : 'default'));
+        dispatch(appConfig.updateInstanceID(((_a = props.appConfig) === null || _a === void 0 ? void 0 : _a.instanceId) ? (_b = props.appConfig) === null || _b === void 0 ? void 0 : _b.instanceId : "default"));
     }, [dispatch, (_b = props.appConfig) === null || _b === void 0 ? void 0 : _b.instanceId]);
     useEffect(function () {
         if (props.appConfig) {
@@ -33404,7 +33416,9 @@ var AppCore = function (props) {
         console.log("Changing language to: ".concat(code));
         i18n.changeLanguage(code);
     };
-    return (jsxs(q, { children: [jsx(LocalStorage, {}, void 0), jsxs(BrowserRouter, __assign({ basename: process.env.NODE_ENV === 'production' ? process.env.PUBLIC_URL : undefined }, { children: [jsx(ScrollToTop, {}, void 0), jsx(DefaultStudiesManager, {}, void 0), props.customHeader ? props.customHeader : null, !props.hideDefaultHeader ? jsx(HeaderRenderer, { config: props.headerConfig, onChangeLanguage: handleLanguageChange, onOpenExternalPage: handleOpenExternalPage }, void 0) : null, jsx(Navbar, { loading: props.navbarConfig === undefined, content: props.navbarConfig, onOpenExternalPage: handleOpenExternalPage }, void 0), jsx(Pages, { config: props.pagesConfig, onOpenExternalPage: handleOpenExternalPage, extensions: props.extensions, customResponseComponents: props.customSurveyResponseComponents, dateLocales: props.dateLocales, defaultRoutes: defaultRoutes }, void 0), !props.hideDefaultFooter ? jsx(FooterRenderer, { footerConfig: props.footerConfig, onChangeLanguage: handleLanguageChange, onOpenExternalPage: handleOpenExternalPage }, void 0) : null, props.customFooter ? props.customFooter : null, jsx(GlobalDialogs, { defaultRoutes: defaultRoutes, onChangeLanguage: handleLanguageChange }, void 0)] }), void 0)] }, void 0));
+    return (jsxs(q, { children: [jsx(LocalStorage, {}, void 0), jsx(DefaultStudiesManager, {}, void 0), jsxs(BrowserRouter, __assign({ basename: process.env.NODE_ENV === "production"
+                    ? process.env.PUBLIC_URL
+                    : undefined }, { children: [jsx(ScrollToTop, {}, void 0), props.customHeader ? props.customHeader : null, !props.hideDefaultHeader ? (jsx(HeaderRenderer, { config: props.headerConfig, onChangeLanguage: handleLanguageChange, onOpenExternalPage: handleOpenExternalPage }, void 0)) : null, jsx(Navbar, { loading: props.navbarConfig === undefined, content: props.navbarConfig, onOpenExternalPage: handleOpenExternalPage }, void 0), jsx(Pages, { config: props.pagesConfig, onOpenExternalPage: handleOpenExternalPage, extensions: props.extensions, customResponseComponents: props.customSurveyResponseComponents, dateLocales: props.dateLocales, defaultRoutes: defaultRoutes }, void 0), !props.hideDefaultFooter ? (jsx(FooterRenderer, { footerConfig: props.footerConfig, onChangeLanguage: handleLanguageChange, onOpenExternalPage: handleOpenExternalPage }, void 0)) : null, props.customFooter ? props.customFooter : null, jsx(GlobalDialogs, { defaultRoutes: defaultRoutes, onChangeLanguage: handleLanguageChange }, void 0)] }), void 0)] }, void 0));
 };
 
 var InternalNavigator = function (props) {