Change behavior: remove change addons on user icon menu and allow to …

…change it on UserPage
cosmo-workspace · Jul 21, 2024 · a6686d0 · a6686d0
1 parent e85c756
commit a6686d0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/web/dashboard-ui/src/App.tsx b/web/dashboard-ui/src/App.tsx
@@ -11,7 +11,6 @@ import { ProgressProvider } from "./components/ProgressProvider";
 import { AuthenticatorManageDialogContext } from "./views/organisms/AuthenticatorManageDialog";
 import { EventDetailDialogContext } from "./views/organisms/EventDetailDialog";
 import { PasswordChangeDialogContext } from "./views/organisms/PasswordChangeDialog";
-import { UserAddonChangeDialogContext } from "./views/organisms/UserAddonsChangeDialog";
 import { UserInfoDialogContext } from "./views/organisms/UserInfoDialog";
 import { UserContext } from "./views/organisms/UserModule";
 import { UserNameChangeDialogContext } from "./views/organisms/UserNameChangeDialog";
@@ -102,11 +101,9 @@ function App() {
                           <UserInfoDialogContext.Provider>
                             <AuthenticatorManageDialogContext.Provider>
                               <UserNameChangeDialogContext.Provider>
-                                <UserAddonChangeDialogContext.Provider>
-                                  <PasswordChangeDialogContext.Provider>
-                                    <SwitchApp />
-                                  </PasswordChangeDialogContext.Provider>
-                                </UserAddonChangeDialogContext.Provider>
+                                <PasswordChangeDialogContext.Provider>
+                                  <SwitchApp />
+                                </PasswordChangeDialogContext.Provider>
                               </UserNameChangeDialogContext.Provider>
                             </AuthenticatorManageDialogContext.Provider>
                           </UserInfoDialogContext.Provider>

diff --git a/web/dashboard-ui/src/views/pages/UserPage.tsx b/web/dashboard-ui/src/views/pages/UserPage.tsx
@@ -102,7 +102,6 @@ const UserMenu: React.VFC<{ user: User }> = ({ user: us }) => {
       <Box>
         <IconButton
           color="inherit"
-          disabled={loginUser?.name === us.name}
           onClick={(e) => setAnchorEl(e.currentTarget)}
         >
           <MoreVert fontSize="small" />

diff --git a/web/dashboard-ui/src/views/templates/PageTemplate.tsx b/web/dashboard-ui/src/views/templates/PageTemplate.tsx
@@ -9,7 +9,6 @@ import {
   Menu as MenuIcon,
   Notifications,
   ReportProblem,
-  Settings,
   SupervisorAccountTwoTone,
   VpnKey,
   Warning,
@@ -51,7 +50,6 @@ import { AuthenticatorManageDialogContext } from "../organisms/AuthenticatorMana
 import { EventDetailDialogContext } from "../organisms/EventDetailDialog";
 import { latestTime } from "../organisms/EventModule";
 import { PasswordChangeDialogContext } from "../organisms/PasswordChangeDialog";
-import { UserAddonChangeDialogContext } from "../organisms/UserAddonsChangeDialog";
 import { UserInfoDialogContext } from "../organisms/UserInfoDialog";
 import {
   isAdminRole,
@@ -101,8 +99,6 @@ export const PageTemplate: React.FC<
     AuthenticatorManageDialogContext.useDispatch();
   const passwordChangeDialogDispach = PasswordChangeDialogContext.useDispatch();
   const userNameChangeDialogDispach = UserNameChangeDialogContext.useDispatch();
-  const userAddonChangeDialogDispatch =
-    UserAddonChangeDialogContext.useDispatch();
   const userInfoDialogDispatch = UserInfoDialogContext.useDispatch();
   const isAdmin = isAdminUser(loginUser);
   const isSignIn = Boolean(loginUser);
@@ -132,12 +128,6 @@ export const PageTemplate: React.FC<
     setAnchorEl(null);
   };
 
-  const changeAddons = () => {
-    console.log("changeAddons");
-    userAddonChangeDialogDispatch(true, { user: loginUser! });
-    setAnchorEl(null);
-  };
-
   const openUserInfoDialog = () => {
     console.log("openUserInfoDialog");
     userInfoDialogDispatch(true, {
@@ -443,14 +433,6 @@ export const PageTemplate: React.FC<
                   <ListItemText>Change DisplayName...</ListItemText>
                 </MenuItem>
               )}
-              {isSignIn && isAdmin && (
-                <MenuItem onClick={() => changeAddons()}>
-                  <ListItemIcon>
-                    <Settings fontSize="small" />
-                  </ListItemIcon>
-                  <ListItemText>Change Addons...</ListItemText>
-                </MenuItem>
-              )}
               <Divider />
               {isSignIn && (
                 <MenuItem onClick={() => logout()}>