diff --git a/web/src/components/ChangePasswordDialog.tsx b/web/src/components/ChangePasswordDialog.tsx index a9a9070..7e6aa43 100644 --- a/web/src/components/ChangePasswordDialog.tsx +++ b/web/src/components/ChangePasswordDialog.tsx @@ -66,7 +66,7 @@ const ChangePasswordDialog: React.FC = (props: Props) => { toastHelper.info("Password changed"); } catch (error: any) { console.error(error); - toastHelper.error(error.response.data.message); + toastHelper.error(JSON.stringify(error.response.data)); } requestState.setFinish(); }; diff --git a/web/src/components/CreateShortcutDialog.tsx b/web/src/components/CreateShortcutDialog.tsx index 7cf1fb3..ee1bfb1 100644 --- a/web/src/components/CreateShortcutDialog.tsx +++ b/web/src/components/CreateShortcutDialog.tsx @@ -100,7 +100,7 @@ const CreateShortcutDialog: React.FC = (props: Props) => { } } catch (error: any) { console.error(error); - toastHelper.error(error.response.data.error || error.response.data.message); + toastHelper.error(JSON.stringify(error.response.data)); } }; diff --git a/web/src/components/CreateWorkspaceDialog.tsx b/web/src/components/CreateWorkspaceDialog.tsx index b69c16f..d275674 100644 --- a/web/src/components/CreateWorkspaceDialog.tsx +++ b/web/src/components/CreateWorkspaceDialog.tsx @@ -86,7 +86,7 @@ const CreateWorkspaceDialog: React.FC = (props: Props) => { } } catch (error: any) { console.error(error); - toastHelper.error(error.response.data.error || error.response.data.message); + toastHelper.error(JSON.stringify(error.response.data)); } requestState.setFinish(); }; diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsx index 06d63bb..833d230 100644 --- a/web/src/components/Header.tsx +++ b/web/src/components/Header.tsx @@ -38,12 +38,12 @@ const Header: React.FC = () => {
- + Corgi {workspaceList.length > 0 && activedWorkspace !== undefined && ( <> - / + / diff --git a/web/src/components/ShortcutListView.tsx b/web/src/components/ShortcutListView.tsx index 77a95e3..4accdea 100644 --- a/web/src/components/ShortcutListView.tsx +++ b/web/src/components/ShortcutListView.tsx @@ -1,3 +1,4 @@ +import { Tooltip } from "@mui/joy"; import copy from "copy-to-clipboard"; import { useState } from "react"; import { shortcutService, workspaceService } from "../services"; @@ -59,17 +60,21 @@ const ShortcutListView: React.FC = (props: Props) => {
{shortcut.creator.name} - - - - + + + + + + + + diff --git a/web/src/components/UpsertWorkspaceUserDialog.tsx b/web/src/components/UpsertWorkspaceUserDialog.tsx index 484757f..65c3c37 100644 --- a/web/src/components/UpsertWorkspaceUserDialog.tsx +++ b/web/src/components/UpsertWorkspaceUserDialog.tsx @@ -69,7 +69,7 @@ const UpsertWorkspaceUserDialog: React.FC = (props: Props) => { } } catch (error: any) { console.error(error); - toastHelper.error(error.response.data.error || error.response.data.message); + toastHelper.error(JSON.stringify(error.response.data)); } requestState.setFinish(); }; diff --git a/web/src/components/WorkspaceSetting.tsx b/web/src/components/WorkspaceSetting.tsx index 0237f05..02d15d9 100644 --- a/web/src/components/WorkspaceSetting.tsx +++ b/web/src/components/WorkspaceSetting.tsx @@ -9,6 +9,7 @@ import { unknownWorkspace, unknownWorkspaceUser } from "../store/modules/workspa import { showCommonDialog } from "./Alert"; import toastHelper from "./Toast"; import CreateWorkspaceDialog from "./CreateWorkspaceDialog"; +import Icon from "./Icon"; interface Props { workspaceId: WorkspaceId; @@ -93,9 +94,11 @@ const WorkspaceSetting: React.FC = (props: Props) => { {workspaceUser.role === "ADMIN" ? ( <> diff --git a/web/src/pages/Auth.tsx b/web/src/pages/Auth.tsx index 5c2e1bc..30fcf38 100644 --- a/web/src/pages/Auth.tsx +++ b/web/src/pages/Auth.tsx @@ -76,7 +76,7 @@ const Auth: React.FC = () => { } } catch (error: any) { console.error(error); - toastHelper.error(error.response.data.message); + toastHelper.error(JSON.stringify(error.response.data)); } actionBtnLoadingState.setFinish(); }; @@ -111,7 +111,7 @@ const Auth: React.FC = () => { } } catch (error: any) { console.error(error); - toastHelper.error(error.response.data.message); + toastHelper.error(JSON.stringify(error.response.data)); } actionBtnLoadingState.setFinish(); }; diff --git a/web/src/pages/UserDetail.tsx b/web/src/pages/UserDetail.tsx index 5475852..ae06a43 100644 --- a/web/src/pages/UserDetail.tsx +++ b/web/src/pages/UserDetail.tsx @@ -1,4 +1,4 @@ -import { Button, Input } from "@mui/joy"; +import { Button, Input, Tooltip } from "@mui/joy"; import { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import { useAppSelector } from "../store"; @@ -69,22 +69,24 @@ const UserDetail: React.FC = () => { Email: {user?.email}

-

+

Password: -

-

+

+
OpenID: - + + + -

+
{state.showChangePasswordDialog && (