Merge pull request #7347 from arafubeatbox/imprv/114265-114276-lead-to-questionnaire-settings-from-modal

Imprv/114265 114276 lead to questionnaire settings from modal

packages/app/src/components/Me/PersonalSettings.jsx

@@ -64,11 +64,15 @@ const PersonalSettings = () => {
     };
   }, [t]);
 
-  const onPasswordSettings = window.location.hash === '#password';
+  const getDefaultTabIndex = () => {
+    // e.g) '/me#password_settings' sets password settings tab as default
+    const tab = window.location.hash?.substring(1);
+    return navTabMapping[tab]?.index;
+  };
 
   return (
     <div data-testid="grw-personal-settings">
-      <CustomNavAndContents defaultTabIndex={onPasswordSettings && 2} navTabMapping={navTabMapping} navigationMode="both" tabContentClasses={['px-0']} />
+      <CustomNavAndContents defaultTabIndex={getDefaultTabIndex()} navTabMapping={navTabMapping} navigationMode="both" tabContentClasses={['px-0']} />
     </div>
   );
 

packages/app/src/components/Questionnaire/QuestionnaireModal.tsx

@@ -142,7 +142,7 @@ const QuestionnaireModal = ({ questionnaireOrder }: QuestionnaireModalProps): JS
             </a>
           )}
           {currentUser != null && (
-            <a href="/me">
+            <a href="/me#other_settings">
               <i className="material-icons" >settings</i>
             </a>
           )}

packages/app/src/server/routes/apiv3/user-activation.ts

@@ -169,9 +169,9 @@ export const completeRegistrationAction = (crowi) => {
             });
           }
 
-          // userData.password cann't be empty but, prepare redirect because password property in User Model is optional
+          // userData.password can't be empty but, prepare redirect because password property in User Model is optional
           // https://github.com/weseek/growi/pull/6670
-          const redirectTo = userData.password != null ? '/' : '/me#password';
+          const redirectTo = userData.password != null ? '/' : '/me#password_settings';
           return res.apiv3({ redirectTo });
         });
       });

packages/app/src/server/routes/login.js

@@ -66,9 +66,9 @@ module.exports = function(crowi, app) {
 
       let redirectTo;
       if (userData.password == null) {
-        // userData.password cann't be empty but, prepare redirect because password property in User Model is optional
+        // userData.password can't be empty but, prepare redirect because password property in User Model is optional
         // https://github.com/weseek/growi/pull/6670
-        redirectTo = '/me#password';
+        redirectTo = '/me#password_settings';
       }
       else if (req.session.redirectTo != null) {
         redirectTo = req.session.redirectTo;