PATCH: Move impersonateRestore out of the redux store

neos · May 30, 2024 · 4c78c28 · 4c78c28
1 parent eac76c0
commit 4c78c28
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 8 deletions.
diff --git a/packages/neos-ui/src/Containers/Drawer/UserDropDown/RestoreButtonItem.tsx b/packages/neos-ui/src/Containers/Drawer/UserDropDown/RestoreButtonItem.tsx
@@ -14,6 +14,8 @@ import I18n from '@neos-project/neos-ui-i18n';
 import {I18nRegistry} from '@neos-project/neos-ts-interfaces';
 import backend from '@neos-project/neos-ui-backend-connector';
 
+import {routes} from '../../../System';
+
 import buttonTheme from './style.module.css';
 
 type ImpersonateAccount = {
@@ -31,8 +33,9 @@ export const RestoreButtonItem: React.FC<{
     originUser?: {
         fullName: string;
     };
-    onClick: () => void;
-    onError: (message: string) => void;
+    onLoadError: (message: string) => void;
+    onRestoreSuccess: (message: string) => void;
+    onRestoreError: (message: string) => void;
     i18n: I18nRegistry;
 }> = (props) => {
     const [impersonateStatus, setImpersonateStatus] = React.useState<null | ImpersonateStatus>(null);
@@ -43,6 +46,42 @@ export const RestoreButtonItem: React.FC<{
         'Neos.Neos',
         'Main'
     );
+    const errorMessage = props.i18n.translate(
+        'impersonate.error.restoreUser',
+        'Could not switch back to the original user.',
+        {},
+        'Neos.Neos',
+        'Main'
+    );
+    const handleClick = React.useCallback(
+        async function restoreOriginalUser() {
+            const {impersonateRestore} = backend.get().endpoints;
+            const feedback = await impersonateRestore();
+            const originUser = feedback?.origin?.accountIdentifier;
+            const user = feedback?.impersonate?.accountIdentifier;
+            const status = feedback?.status;
+
+            const restoreMessage = props.i18n.translate(
+                'impersonate.success.restoreUser',
+                'Switched back from {0} to the orginal user {1}.',
+                {
+                    0: user,
+                    1: originUser
+                },
+                'Neos.Neos',
+                'Main'
+            );
+
+            if (status) {
+                props.onRestoreSuccess(restoreMessage);
+            } else {
+                props.onRestoreError(errorMessage);
+            }
+
+            window.location.href = routes?.core?.modules?.defaultModule;
+        },
+        [props.i18n]
+    );
 
     React.useEffect(
         () => {
@@ -57,7 +96,7 @@ export const RestoreButtonItem: React.FC<{
                         setImpersonateStatus(impersonateStatus);
                     }
                 } catch (error) {
-                    props.onError((error as Error).message);
+                    props.onLoadError((error as Error).message);
                 }
             })();
         },
@@ -76,7 +115,7 @@ export const RestoreButtonItem: React.FC<{
         <li className={buttonTheme.dropDown__item}>
             <button
                 title={title}
-                onClick={props.onClick}
+                onClick={handleClick}
             >
                 <Icon
                     icon="random"

diff --git a/packages/neos-ui/src/Containers/Drawer/UserDropDown/UserDropDown.tsx b/packages/neos-ui/src/Containers/Drawer/UserDropDown/UserDropDown.tsx
@@ -28,7 +28,6 @@ import {user} from '../../../System';
 
 const withReduxState = connect(() => ({
 }), {
-    impersonateRestore: actions.User.Impersonate.restore,
     addFlashMessage: actions.UI.FlashMessages.add
 });
 
@@ -37,7 +36,6 @@ const withNeosGlobals = neos(globalRegistry => ({
 }));
 
 const UserDropDown: React.FC<{
-    impersonateRestore: () => void;
     addFlashMessage: typeof actions.UI.FlashMessages.add;
     i18nRegistry: I18nRegistry;
     neos: NeosContextInterface;
@@ -74,12 +72,21 @@ const UserDropDown: React.FC<{
                     </li>
                     <RestoreButtonItem
                         i18n={props.i18nRegistry}
-                        onClick={() => props.impersonateRestore()}
-                        onError={(message) => props.addFlashMessage(
+                        onLoadError={(message) => props.addFlashMessage(
                             'impersonateStatusError',
                             message,
                             'error'
                         )}
+                        onRestoreSuccess={(message) => props.addFlashMessage(
+                            'restoreUserImpersonateUser',
+                            message,
+                            'success'
+                        )}
+                        onRestoreError={(message) => props.addFlashMessage(
+                            'restoreUserImpersonateUser',
+                            message,
+                            'success'
+                        )}
                         />
                 </DropDown.Contents>
             </DropDown>