fix(ManageTokens): fixed freeze of the password window

ytsaurus · Jun 20, 2024 · c2e20ab · c2e20ab
1 parent 65e0b6a
commit c2e20ab
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 27 deletions.
diff --git a/...s/ui/src/ui/containers/ManageTokens/ManageTokensModalContent/ManageTokensModalContent.tsx b/...s/ui/src/ui/containers/ManageTokens/ManageTokensModalContent/ManageTokensModalContent.tsx
@@ -45,34 +45,38 @@ const AuthenticationGenerateTokenFormSection: FC<{onClose: () => void}> = ({onCl
 
         setError(undefined);
 
-        return getPassword().then((password_sha256) => {
-            return dispatch(
-                manageTokensCreateToken({
-                    description,
-                    credentials: {
-                        user,
-                        password_sha256,
-                    },
-                }),
-            )
-                .then((token) => {
-                    setToken(token);
-
-                    return dispatch(
-                        manageTokensGetList({
+        return getPassword()
+            .then((password_sha256) => {
+                return dispatch(
+                    manageTokensCreateToken({
+                        description,
+                        credentials: {
                             user,
                             password_sha256,
-                        }),
-                    )
-                        .then(() => undefined)
-                        .catch(() => undefined);
-                })
-                .catch((error) => {
-                    setError(error);
+                        },
+                    }),
+                )
+                    .then((token) => {
+                        setToken(token);
 
-                    return Promise.reject(error);
-                });
-        });
+                        return dispatch(
+                            manageTokensGetList({
+                                user,
+                                password_sha256,
+                            }),
+                        )
+                            .then(() => undefined)
+                            .catch(() => undefined);
+                    })
+                    .catch((error) => {
+                        setError(error);
+
+                        return Promise.reject(error);
+                    });
+            })
+            .catch((error) => {
+                throw error;
+            });
     };
 
     if (token) {
@@ -260,7 +264,7 @@ const AuthenticationTokensSection: FC<{
                 });
             });
         },
-        [getPassword, user, onSuccessRemove],
+        [getPassword, user, onSuccessRemove, tokens, manageTokensRevokeToken, dispatch],
     );
 
     return (

diff --git a/...ui/src/ui/containers/ManageTokens/ManageTokensPasswordModal/ManageTokensPasswordModal.tsx b/...ui/src/ui/containers/ManageTokens/ManageTokensPasswordModal/ManageTokensPasswordModal.tsx
@@ -125,7 +125,7 @@ export function ManageTokensPasswordModalContextProvider({children}: {children:
     const handleCancel = () => {
         setVisible(false);
 
-        p.current.reject();
+        p.current.reject(new Error('cancel password window'));
     };
 
     const handleConfirm = (hash: string) => {