From ff5abac913579b3294b291d482c422dabd54b5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mai=20G=C3=A1bor?= Date: Thu, 14 Nov 2024 20:58:44 +0100 Subject: [PATCH] add notifications to MGMT and remove console.log statements --- .../managementservice/groups/GroupRole.tsx | 8 +- .../managementservice/groups/GroupUser.tsx | 5 +- .../managementservice/groups/Groups.tsx | 68 +- .../permisssion/Permission.tsx | 54 +- .../managementservice/role/Role.tsx | 104 +-- .../managementservice/rooms/CurrentRoom.tsx | 20 +- .../managementservice/rooms/Room.tsx | 70 +- .../managementservice/rooms/RoomOwner.tsx | 5 +- .../managementservice/tenants/Tenant.tsx | 58 +- .../managementservice/tenants/TenantAdmin.tsx | 4 +- .../managementservice/tenants/TenantOAuth.tsx | 86 +-- .../managementservice/tenants/TenantOwner.tsx | 13 +- .../managementservice/tenants/TenatnFQDN.tsx | 65 +- .../managementservice/users/Users.tsx | 69 +- .../settingsdialog/ManagementSettings.tsx | 6 +- .../ManagementAdminLoginSettings.tsx | 4 - .../ManagementCurrentRoomSettings.tsx | 31 - .../ManagementGroupSettings.tsx | 31 - .../ManagementRoleSettings.tsx | 30 - .../ManagementRoomSettings.tsx | 31 - .../ManagementTenantSettings.tsx | 46 -- .../ManagementUserSettings.tsx | 31 - src/store/actions/managementActions.tsx | 679 ++---------------- src/store/actions/mgmtActions.tsx | 3 +- src/views/management/Management.tsx | 13 +- 25 files changed, 160 insertions(+), 1374 deletions(-) delete mode 100644 src/components/settingsdialog/managementsettings/ManagementCurrentRoomSettings.tsx delete mode 100644 src/components/settingsdialog/managementsettings/ManagementGroupSettings.tsx delete mode 100644 src/components/settingsdialog/managementsettings/ManagementRoleSettings.tsx delete mode 100644 src/components/settingsdialog/managementsettings/ManagementRoomSettings.tsx delete mode 100644 src/components/settingsdialog/managementsettings/ManagementTenantSettings.tsx delete mode 100644 src/components/settingsdialog/managementsettings/ManagementUserSettings.tsx diff --git a/src/components/managementservice/groups/GroupRole.tsx b/src/components/managementservice/groups/GroupRole.tsx index 6c26e0d1..25a6f091 100644 --- a/src/components/managementservice/groups/GroupRole.tsx +++ b/src/components/managementservice/groups/GroupRole.tsx @@ -1,5 +1,5 @@ +/* eslint-disable camelcase */ import { SyntheticEvent, useEffect, useMemo, useState } from 'react'; -// eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Autocomplete } from '@mui/material'; import React from 'react'; @@ -90,7 +90,6 @@ const GroupRoleTable = () => { }; // should be memoized or stable - // eslint-disable-next-line camelcase const columns = useMemo[]>( () => [ { @@ -239,10 +238,7 @@ const GroupRoleTable = () => { // add new data / mod data / error // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteData(id, 'roomGroupRoles')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'roomGroupRoles')).then(() => { fetchProduct(); setOpen(false); }); diff --git a/src/components/managementservice/groups/GroupUser.tsx b/src/components/managementservice/groups/GroupUser.tsx index d20f877e..4a70380e 100644 --- a/src/components/managementservice/groups/GroupUser.tsx +++ b/src/components/managementservice/groups/GroupUser.tsx @@ -165,10 +165,7 @@ const GroupUserTable = () => { // add new data / mod data / error // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteData(id, 'groupUsers')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'groupUsers')).then(() => { fetchProduct(); setOpen(false); }); diff --git a/src/components/managementservice/groups/Groups.tsx b/src/components/managementservice/groups/Groups.tsx index ca8e2c02..2bfd3425 100644 --- a/src/components/managementservice/groups/Groups.tsx +++ b/src/components/managementservice/groups/Groups.tsx @@ -2,23 +2,16 @@ import Autocomplete from '@mui/material/Autocomplete'; import { SyntheticEvent, useEffect, useMemo, useState } from 'react'; // eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; -import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Snackbar } from '@mui/material'; +import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions } from '@mui/material'; import React from 'react'; -import MuiAlert, { AlertColor, AlertProps } from '@mui/material/Alert'; import { Groups, Tenant } from '../../../utils/types'; import { useAppDispatch } from '../../../store/hooks'; -import { createData, deleteData, getData, getTenants, patchData } from '../../../store/actions/managementActions'; +import { createData, deleteData, getData, patchData } from '../../../store/actions/managementActions'; +import { notificationsActions } from '../../../store/slices/notificationsSlice'; const GroupTable = () => { const dispatch = useAppDispatch(); - const Alert = React.forwardRef(function Alert( - props, - ref, - ) { - return ; - }); - type TenantOptionTypes = Array const [ tenants, setTenants ] = useState([ { 'id': 0, 'name': '', 'description': '' } ]); @@ -67,18 +60,6 @@ const GroupTable = () => { const [ cantPatch ] = useState(false); const [ cantDelete ] = useState(false); const [ tenantId, setTenantId ] = useState(0); - - const [ alertOpen, setAlertOpen ] = React.useState(false); - const [ alertMessage, setAlertMessage ] = React.useState(''); - const [ alertSeverity, setAlertSeverity ] = React.useState('success'); - - const handleAlertClose = (event?: React.SyntheticEvent | Event, reason?: string) => { - if (reason === 'clickaway') { - return; - } - - setAlertOpen(false); - }; const [ tenantIdOption, setTenantIdOption ] = useState(); const [ descriptionDisabled, setDescriptionDisabled ] = useState(false); @@ -87,9 +68,7 @@ const GroupTable = () => { async function fetchProduct() { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenants()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(getData('tenants')).then((tdata: any) => { if (tdata != undefined) { setTenants(tdata.data); } @@ -99,8 +78,6 @@ const GroupTable = () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any dispatch(getData('groups')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Rooms data', tdata); if (tdata != undefined) { setData(tdata.data); } @@ -164,14 +141,9 @@ const GroupTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteData(id, 'groups')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'groups')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } }; @@ -182,16 +154,9 @@ const GroupTable = () => { if (name != '' && id === 0) { dispatch(createData({ name: name, - }, 'groups')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + }, 'groups')).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else if (name != '' && id != 0) { dispatch(patchData(id, @@ -199,21 +164,15 @@ const GroupTable = () => { name: name, description: description, tenantId: tenantId - }, 'groups')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + }, 'groups')).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else { - setAlertMessage('Name cannot be empty!'); - setAlertSeverity('warning'); - setAlertOpen(true); + dispatch(notificationsActions.enqueueNotification({ + message: 'Name cannot be empty!', + options: { variant: 'warning' } + })); } }; @@ -225,11 +184,6 @@ const GroupTable = () => { Add new
- - - {alertMessage} - - Add/Edit diff --git a/src/components/managementservice/permisssion/Permission.tsx b/src/components/managementservice/permisssion/Permission.tsx index 5058777b..0e336447 100644 --- a/src/components/managementservice/permisssion/Permission.tsx +++ b/src/components/managementservice/permisssion/Permission.tsx @@ -1,9 +1,8 @@ import { useEffect, useMemo, useState } from 'react'; // eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; -import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Snackbar } from '@mui/material'; +import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions } from '@mui/material'; import React from 'react'; -import MuiAlert, { AlertColor, AlertProps } from '@mui/material/Alert'; import { useAppDispatch } from '../../../store/hooks'; import { createData, deleteData, getData, patchData } from '../../../store/actions/managementActions'; import { Permissions } from '../../../utils/types'; @@ -11,17 +10,6 @@ import { Permissions } from '../../../utils/types'; const PermissionTable = () => { const dispatch = useAppDispatch(); - const Alert = React.forwardRef(function Alert( - props, - ref, - ) { - return ; - }); - - const [ alertOpen, setAlertOpen ] = React.useState(false); - const [ alertMessage, setAlertMessage ] = React.useState(''); - const [ alertSeverity, setAlertSeverity ] = React.useState('success'); - // should be memoized or stable // eslint-disable-next-line camelcase const columns = useMemo[]>( @@ -56,8 +44,6 @@ const PermissionTable = () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any dispatch(getData('permissions')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Rooms data', tdata); if (tdata != undefined) { setData(tdata.data); } @@ -103,14 +89,9 @@ const PermissionTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteData(id, 'permissions')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'permissions')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } }; @@ -122,45 +103,23 @@ const PermissionTable = () => { dispatch(createData({ name: name, description: description - }, 'permissions')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + }, 'permissions')).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else if (name != '' && id != 0) { dispatch(patchData(id, { name: name, description: description - }, 'permissions')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('Room data', tdata); - // TODO finish + }, 'permissions')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull modify!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } }; - const handleAlertClose = (event?: React.SyntheticEvent | Event, reason?: string) => { - if (reason === 'clickaway') { - return; - } - - setAlertOpen(false); - }; - return <>
- - - {alertMessage} - - Add/Edit diff --git a/src/components/managementservice/role/Role.tsx b/src/components/managementservice/role/Role.tsx index c26b91e2..31cea6b2 100644 --- a/src/components/managementservice/role/Role.tsx +++ b/src/components/managementservice/role/Role.tsx @@ -1,31 +1,19 @@ import { SyntheticEvent, useEffect, useMemo, useState } from 'react'; // eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; -import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Autocomplete, Snackbar, FormControlLabel, Checkbox, Box } from '@mui/material'; +import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Autocomplete, FormControlLabel, Checkbox, Box } from '@mui/material'; import React from 'react'; -import MuiAlert, { AlertColor, AlertProps } from '@mui/material/Alert'; import { Roles, Tenant, Permissions, RolePermissions } from '../../../utils/types'; import { useAppDispatch } from '../../../store/hooks'; -import { createData, deleteData, getData, getTenants, patchData } from '../../../store/actions/managementActions'; +import { createData, deleteData, getData, patchData } from '../../../store/actions/managementActions'; const RoleTable = () => { const dispatch = useAppDispatch(); - const Alert = React.forwardRef(function Alert( - props, - ref, - ) { - return ; - }); - type TenantOptionTypes = Array const [ tenants, setTenants ] = useState([ { 'id': 0, 'name': '', 'description': '' } ]); - const [ alertOpen, setAlertOpen ] = React.useState(false); - const [ alertMessage, setAlertMessage ] = React.useState(''); - const [ alertSeverity, setAlertSeverity ] = React.useState('success'); - const getTenantName = (id: string): string => { const t = tenants.find((type) => type.id === parseInt(id)); @@ -85,7 +73,7 @@ const RoleTable = () => { async function fetchProduct() { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenants()).then((tdata: any) => { + dispatch(getData('tenants')).then((tdata: any) => { if (tdata != undefined) { setTenants(tdata.data); } @@ -95,8 +83,6 @@ const RoleTable = () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any dispatch(getData('roles')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Rooms data', tdata); if (tdata != undefined) { setData(tdata.data); } @@ -110,8 +96,6 @@ const RoleTable = () => { async function getPermissions() { // eslint-disable-next-line @typescript-eslint/no-explicit-any dispatch(getData('permissions')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Rooms data', tdata); if (tdata != undefined) { setPermissions(tdata.data); setChecked(new Array(tdata.data.length).fill(true)); @@ -168,14 +152,9 @@ const RoleTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteData(id, 'roles')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'roles')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } }; @@ -184,44 +163,24 @@ const RoleTable = () => { // add new data / mod data / error if (name != '' && id === 0) { - try { - dispatch(createData({ - name: name, - description: description, - tenantId: tenantId - }, 'roles')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); - fetchProduct(); - setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - - }); - } catch (error) { - if (error instanceof Error) { - setAlertMessage(error.toString()); - setAlertSeverity('error'); - setAlertOpen(true); - } - } + dispatch(createData({ + name: name, + description: description, + tenantId: tenantId + }, 'roles')).then(() => { + fetchProduct(); + setOpen(false); + + }); } else if (name != '' && id != 0) { dispatch(patchData(id, { name: name, description: description, tenantId: tenantId - }, 'roles')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('Room data', tdata); - // TODO finish + }, 'roles')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull modify!'); - setAlertSeverity('success'); - setAlertOpen(true); }); @@ -229,41 +188,24 @@ const RoleTable = () => { dispatch(getData('rolePermissions')).then((rp: any) => { checked.forEach(async (element, index) => { - // eslint-disable-next-line no-console - console.log(element, index, id); - const c = rp.data.filter((x: RolePermissions) => x.permissionId == index+1); - + if ((c.length === 0) === element) { - // eslint-disable-next-line no-console - console.log('should update this'); if (element) { dispatch(createData({ roleId: id, permissionId: index+1 - }, 'rolePermissions')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + }, 'rolePermissions')).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else { // remove role - dispatch(deleteData(c[0].id, 'rolePermissions')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(c[0].id, 'rolePermissions')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } @@ -281,13 +223,6 @@ const RoleTable = () => { }; - const handleAlertClose = (event?: React.SyntheticEvent | Event, reason?: string) => { - if (reason === 'clickaway') { - return; - } - - setAlertOpen(false); - }; const [ permissions, setPermissions ] = React.useState(Array); const [ checked, setChecked ] = React.useState(new Array(0).fill(true)); @@ -326,11 +261,6 @@ const RoleTable = () => { Add new
- - - {alertMessage} - - Add/Edit diff --git a/src/components/managementservice/rooms/CurrentRoom.tsx b/src/components/managementservice/rooms/CurrentRoom.tsx index 9e59c5ad..6f085ce0 100644 --- a/src/components/managementservice/rooms/CurrentRoom.tsx +++ b/src/components/managementservice/rooms/CurrentRoom.tsx @@ -4,7 +4,7 @@ import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextFiel import React from 'react'; import { Roles, Room, Tenant } from '../../../utils/types'; import { useAppDispatch } from '../../../store/hooks'; -import { createRoom, getRoles, getRoomByName, getTenants, modifyRoom } from '../../../store/actions/managementActions'; +import { createRoom, getData, getRoomByName, patchData } from '../../../store/actions/managementActions'; const CurrentRoomModal = () => { const dispatch = useAppDispatch(); @@ -43,18 +43,14 @@ const CurrentRoomModal = () => { async function fetchProduct() { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenants()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(getData('tenants')).then((tdata: any) => { if (tdata != undefined) { setTenants(tdata.data); } }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getRoles()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Role data', tdata); + dispatch(getData('roles')).then((tdata: any) => { if (tdata != undefined) { setRoles(tdata.data); } @@ -63,8 +59,6 @@ const CurrentRoomModal = () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any dispatch(getRoomByName(window.location.pathname.substring(1))).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Rooms data', tdata); const r = tdata.data[0] as Room; const tid = r.id; @@ -258,9 +252,7 @@ const CurrentRoomModal = () => { if (defaultRoleId) { obj.defaultRoleId=defaultRoleId; } - dispatch(modifyRoom(id, obj)).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('Room data', tdata); + dispatch(patchData(id, obj, 'rooms')).then(() => { setOpen(false); }); @@ -377,9 +369,9 @@ const CurrentRoomModal = () => {
- +
- + ; }; diff --git a/src/components/managementservice/rooms/Room.tsx b/src/components/managementservice/rooms/Room.tsx index 766044aa..d04cd839 100644 --- a/src/components/managementservice/rooms/Room.tsx +++ b/src/components/managementservice/rooms/Room.tsx @@ -1,25 +1,17 @@ import { SyntheticEvent, useEffect, useMemo, useState } from 'react'; // eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; -import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, FormControlLabel, Checkbox, Autocomplete, Snackbar } from '@mui/material'; +import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, FormControlLabel, Checkbox, Autocomplete } from '@mui/material'; import React from 'react'; -import MuiAlert, { AlertColor, AlertProps } from '@mui/material/Alert'; import { GroupRoles, Roles, Room, RoomOwners, Tenant, User } from '../../../utils/types'; import { useAppDispatch } from '../../../store/hooks'; -import { createRoomWithParams, deleteRoom, getRoles, getRooms, getTenants, getUsers, modifyRoom } from '../../../store/actions/managementActions'; +import { createRoomWithParams, deleteData, getData, patchData } from '../../../store/actions/managementActions'; // nested data is ok, see accessorKeys in ColumnDef below const RoomTable = () => { const dispatch = useAppDispatch(); - const Alert = React.forwardRef(function Alert( - props, - ref, - ) { - return ; - }); - type TenantOptionTypes = Array const [ tenants, setTenants ] = useState([ { 'id': 0, 'name': '', 'description': '' } ]); @@ -28,10 +20,6 @@ const RoomTable = () => { const [ roles, setRoles ] = useState([ { 'description': 'Test', 'id': 1, 'name': 'Test', 'tenantId': 1, 'permissions': [] } ]); - const [ alertOpen, setAlertOpen ] = React.useState(false); - const [ alertMessage, setAlertMessage ] = React.useState(''); - const [ alertSeverity, setAlertSeverity ] = React.useState('success'); - const getTenantName = (id: string): string => { const t = tenants.find((type) => type.id === parseInt(id)); @@ -226,9 +214,7 @@ const RoomTable = () => { async function fetchProduct() { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getUsers()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(getData('users')).then((tdata: any) => { if (tdata != undefined) { setUsers(tdata.data); } @@ -237,9 +223,7 @@ const RoomTable = () => { }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenants()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(getData('tenants')).then((tdata: any) => { if (tdata != undefined) { setTenants(tdata.data); } @@ -248,9 +232,7 @@ const RoomTable = () => { }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getRoles()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Role data', tdata); + dispatch(getData('roles')).then((tdata: any) => { if (tdata != undefined) { setRoles(tdata.data); } @@ -259,9 +241,7 @@ const RoomTable = () => { }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getRooms()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Rooms data', tdata); + dispatch(getData('rooms')).then((tdata: any) => { if (tdata != undefined) { setData(tdata.data); } @@ -367,14 +347,9 @@ const RoomTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteRoom(id)).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'rooms')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } }; @@ -396,16 +371,9 @@ const RoomTable = () => { filesharingEnabled: filesharingEnabled, localRecordingEnabled: localRecordingEnabled, breakoutsEnabled: breakoutsEnabled - })).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + })).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else if (name != '' && id != 0) { @@ -425,41 +393,21 @@ const RoomTable = () => { if (defaultRoleId) { obj.defaultRoleId=defaultRoleId; } - dispatch(modifyRoom(id, obj)).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('Room data', tdata); - // TODO finish + dispatch(patchData(id, obj, 'rooms')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull modify!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } }; - const handleAlertClose = (event?: React.SyntheticEvent | Event, reason?: string) => { - if (reason === 'clickaway') { - return; - } - - setAlertOpen(false); - }; - return <>
- - - {alertMessage} - - Add/Edit diff --git a/src/components/managementservice/rooms/RoomOwner.tsx b/src/components/managementservice/rooms/RoomOwner.tsx index 849b32c5..1e19727d 100644 --- a/src/components/managementservice/rooms/RoomOwner.tsx +++ b/src/components/managementservice/rooms/RoomOwner.tsx @@ -190,10 +190,7 @@ const RoomOwnerTable = () => { // add new data / mod data / error // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteData(id, 'roomOwners')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'roomOwners')).then(() => { fetchProduct(); setOpen(false); }); diff --git a/src/components/managementservice/tenants/Tenant.tsx b/src/components/managementservice/tenants/Tenant.tsx index f864b20a..c9433c1c 100644 --- a/src/components/managementservice/tenants/Tenant.tsx +++ b/src/components/managementservice/tenants/Tenant.tsx @@ -1,28 +1,16 @@ import React from 'react'; -import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Snackbar } from '@mui/material'; +import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions } from '@mui/material'; import { useEffect, useMemo, useState } from 'react'; // eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; -import MuiAlert, { AlertColor, AlertProps } from '@mui/material/Alert'; import { Tenant } from '../../../utils/types'; -import { createTenant, deleteTenant, getTenants, modifyTenant } from '../../../store/actions/managementActions'; import { useAppDispatch } from '../../../store/hooks'; +import { createData, deleteData, getData, patchData } from '../../../store/actions/managementActions'; const TenantTable = () => { const dispatch = useAppDispatch(); - const Alert = React.forwardRef(function Alert( - props, - ref, - ) { - return ; - }); - - const [ alertOpen, setAlertOpen ] = React.useState(false); - const [ alertMessage, setAlertMessage ] = React.useState(''); - const [ alertSeverity, setAlertSeverity ] = React.useState('success'); - // eslint-disable-next-line camelcase const columns = useMemo[]>( () => [ @@ -53,9 +41,7 @@ const TenantTable = () => { setIsLoading(true); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenants()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(getData('tenants')).then((tdata: any) => { if (tdata != undefined) { setData(tdata.data); } @@ -98,14 +84,9 @@ const TenantTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteTenant(id)).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(deleteData(id, 'tenants')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } @@ -117,54 +98,27 @@ const TenantTable = () => { if (name != '' && id === 0) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(createTenant(name, description)).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(createData({ name, description }, 'tenants')).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add! (please reload page)'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else if (name != '' && id != 0) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(modifyTenant(id, { name: name, description: description })).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); - // TODO finish + dispatch(patchData(id, { name: name, description: description }, 'tenants')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull modify!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } }; - const handleAlertClose = (event?: React.SyntheticEvent | Event, reason?: string) => { - if (reason === 'clickaway') { - return; - } - - setAlertOpen(false); - }; - return <>
- - - {alertMessage} - - Add/Edit diff --git a/src/components/managementservice/tenants/TenantAdmin.tsx b/src/components/managementservice/tenants/TenantAdmin.tsx index 84cde228..ee936251 100644 --- a/src/components/managementservice/tenants/TenantAdmin.tsx +++ b/src/components/managementservice/tenants/TenantAdmin.tsx @@ -161,9 +161,7 @@ const TenantAdminTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteData(id, 'tenantAdmins')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'tenantAdmins')).then(() => { fetchProduct(); setOpen(false); }); diff --git a/src/components/managementservice/tenants/TenantOAuth.tsx b/src/components/managementservice/tenants/TenantOAuth.tsx index 8610c095..229af995 100644 --- a/src/components/managementservice/tenants/TenantOAuth.tsx +++ b/src/components/managementservice/tenants/TenantOAuth.tsx @@ -1,33 +1,20 @@ /* eslint-disable camelcase */ import { SyntheticEvent, useEffect, useMemo, useState } from 'react'; -// eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; -import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Autocomplete, Snackbar } from '@mui/material'; -import React from 'react'; -import MuiAlert, { AlertColor, AlertProps } from '@mui/material/Alert'; +import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Autocomplete } from '@mui/material'; import { Tenant, TenantOAuth } from '../../../utils/types'; import { useAppDispatch } from '../../../store/hooks'; -import { createTenantOAuth, deleteTenantOAuth, getTenantOAuths, getTenants, modifyTenantOAuth } from '../../../store/actions/managementActions'; +import { createData, deleteData, getData, patchData } from '../../../store/actions/managementActions'; +import { notificationsActions } from '../../../store/slices/notificationsSlice'; const TenantOAuthTable = () => { const dispatch = useAppDispatch(); - const Alert = React.forwardRef(function Alert( - props, - ref, - ) { - return ; - }); - type TenantOptionTypes = Array const [ tenants, setTenants ] = useState([ { 'id': 0, 'name': '', 'description': '' } ]); - const [ alertOpen, setAlertOpen ] = React.useState(false); - const [ alertMessage, setAlertMessage ] = React.useState(''); - const [ alertSeverity, setAlertSeverity ] = React.useState('success'); - const getTenantName = (id: string): string => { const t = tenants.find((type) => type.id === parseInt(id)); @@ -102,18 +89,14 @@ const TenantOAuthTable = () => { setIsLoading(true); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenants()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(getData('tenants')).then((tdata: any) => { if (tdata != undefined) { setTenants(tdata.data); } }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenantOAuths()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(getData('tenantOAuths')).then((tdata: any) => { if (tdata != undefined) { setData(tdata.data); } @@ -127,7 +110,7 @@ const TenantOAuthTable = () => { fetchProduct(); }, []); - const [ open, setOpen ] = React.useState(false); + const [ open, setOpen ] = useState(false); const handleClickOpen = () => { setId(0); @@ -176,9 +159,10 @@ const TenantOAuthTable = () => { method: 'GET', }).then(async (response) => { if (!response.ok) { - setAlertMessage(response.statusText.toString()); - setAlertSeverity('error'); - setAlertOpen(true); + dispatch(notificationsActions.enqueueNotification({ + message: response.statusText.toString(), + options: { variant: 'error' } + })); } else { const json = await response.json(); // assuming they return json @@ -190,12 +174,12 @@ const TenantOAuthTable = () => { setProfileUrl(json.userinfo_endpoint); } - }) .catch((error) => { - setAlertMessage(error.toString()); - setAlertSeverity('error'); - setAlertOpen(true); + dispatch(notificationsActions.enqueueNotification({ + message: error.toString(), + options: { variant: 'error' } + })); }); }; @@ -238,14 +222,9 @@ const TenantOAuthTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteTenantOAuth(id)).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(deleteData(id, 'tenantOAuths')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } }; @@ -255,7 +234,7 @@ const TenantOAuthTable = () => { // add new data / mod data / error if (id === 0) { - dispatch(createTenantOAuth({ + dispatch(createData({ 'key': key, 'secret': secret, 'tenantId': tenantId, @@ -265,60 +244,33 @@ const TenantOAuthTable = () => { 'redirect_uri': redirect, 'scope': scope, 'scope_delimiter': scopeDelimeter - })).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + }, 'tenantOAuths')).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else if (id != 0) { - dispatch(modifyTenantOAuth(id, { + dispatch(patchData(id, { 'tenantId': tenantId, 'access_url': accessUrl, 'authorize_url': authorizeUrl, 'profile_url': profileUrl, 'redirect_uri': redirect, 'scope': scope, - 'scope_delimiter': scopeDelimeter })).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); - // TODO finish + 'scope_delimiter': scopeDelimeter }, 'tenantOAuths')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull modify!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } }; - const handleAlertClose = (event?: React.SyntheticEvent | Event, reason?: string) => { - if (reason === 'clickaway') { - return; - } - - setAlertOpen(false); - }; - return <>
- - - {alertMessage} - - Add/Edit diff --git a/src/components/managementservice/tenants/TenantOwner.tsx b/src/components/managementservice/tenants/TenantOwner.tsx index 9d69b12d..5707368e 100644 --- a/src/components/managementservice/tenants/TenantOwner.tsx +++ b/src/components/managementservice/tenants/TenantOwner.tsx @@ -163,9 +163,7 @@ const TenantOwnerTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteData(id, 'tenantOwners')).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'tenantOwners')).then(() => { fetchProduct(); setOpen(false); }); @@ -180,9 +178,7 @@ const TenantOwnerTable = () => { dispatch(createData({ tenantId: tenantId, userId: userId - }, 'tenantOwners')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + }, 'tenantOwners')).then(() => { fetchProduct(); setOpen(false); @@ -192,10 +188,7 @@ const TenantOwnerTable = () => { dispatch(patchData(id, { tenantId: tenantId, userId: userId - }, 'tenantOwners')).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('Room data', tdata); - // TODO finish + }, 'tenantOwners')).then(() => { fetchProduct(); setOpen(false); }); diff --git a/src/components/managementservice/tenants/TenatnFQDN.tsx b/src/components/managementservice/tenants/TenatnFQDN.tsx index d80b8d49..a039b85c 100644 --- a/src/components/managementservice/tenants/TenatnFQDN.tsx +++ b/src/components/managementservice/tenants/TenatnFQDN.tsx @@ -1,32 +1,19 @@ import { SyntheticEvent, useEffect, useMemo, useState } from 'react'; // eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; -import MuiAlert, { AlertColor, AlertProps } from '@mui/material/Alert'; -import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Autocomplete, Snackbar } from '@mui/material'; -import React from 'react'; +import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Autocomplete } from '@mui/material'; import { Tenant, TenantFQDN } from '../../../utils/types'; import { useAppDispatch } from '../../../store/hooks'; -import { createTenantFQDN, deleteTenantFQDN, getTenantFQDNs, getTenants, modifyTenantFQDN } from '../../../store/actions/managementActions'; +import { createData, deleteData, getData, patchData } from '../../../store/actions/managementActions'; const TenantFQDNTable = () => { const dispatch = useAppDispatch(); - const Alert = React.forwardRef(function Alert( - props, - ref, - ) { - return ; - }); - type TenantOptionTypes = Array const [ tenants, setTenants ] = useState([ { 'id': 0, 'name': '', 'description': '' } ]); - const [ alertOpen, setAlertOpen ] = React.useState(false); - const [ alertMessage, setAlertMessage ] = React.useState(''); - const [ alertSeverity, setAlertSeverity ] = React.useState('success'); - const getTenantName = (id: string): string => { const t = tenants.find((type) => type.id === parseInt(id)); @@ -79,18 +66,14 @@ const TenantFQDNTable = () => { setIsLoading(true); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenants()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(getData('tenants')).then((tdata: any) => { if (tdata != undefined) { setTenants(tdata.data); } }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenantFQDNs()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('TenantFQDN data', tdata); + dispatch(getData('tenantFQDNs')).then((tdata: any) => { if (tdata != undefined) { setData(tdata.data); } @@ -103,7 +86,7 @@ const TenantFQDNTable = () => { fetchProduct(); }, []); - const [ open, setOpen ] = React.useState(false); + const [ open, setOpen ] = useState(false); const handleClickOpen = () => { setId(0); @@ -142,14 +125,9 @@ const TenantFQDNTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteTenantFQDN(id)).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(deleteData(id, 'tenantFQDNs')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } }; @@ -159,41 +137,19 @@ const TenantFQDNTable = () => { // add new data / mod data / error if (id === 0) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(createTenantFQDN({ tenantId: tenantId, description: description, fqdn: fqdn })).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(createData({ tenantId: tenantId, description: description, fqdn: fqdn }, 'tenantFQDNs')).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else if (id != 0) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(modifyTenantFQDN(id, { name: name, description: description })).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); - // TODO finish + dispatch(patchData(id, { name: name, description: description }, 'tenantFQDNs')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull modify!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } }; - - const handleAlertClose = (event?: React.SyntheticEvent | Event, reason?: string) => { - if (reason === 'clickaway') { - return; - } - - setAlertOpen(false); - }; return <>
@@ -201,11 +157,6 @@ const TenantFQDNTable = () => { Add new
- - - {alertMessage} - - Add/Edit diff --git a/src/components/managementservice/users/Users.tsx b/src/components/managementservice/users/Users.tsx index 92676d76..575e6c0b 100644 --- a/src/components/managementservice/users/Users.tsx +++ b/src/components/managementservice/users/Users.tsx @@ -1,31 +1,18 @@ import { SyntheticEvent, useEffect, useMemo, useState } from 'react'; // eslint-disable-next-line camelcase import { MaterialReactTable, type MRT_ColumnDef } from 'material-react-table'; -import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Checkbox, FormControlLabel, Autocomplete, Snackbar } from '@mui/material'; -import React from 'react'; -import MuiAlert, { AlertColor, AlertProps } from '@mui/material/Alert'; +import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Checkbox, FormControlLabel, Autocomplete } from '@mui/material'; import { Tenant, User } from '../../../utils/types'; import { useAppDispatch } from '../../../store/hooks'; -import { createUser, deleteUser, getTenants, getUsers, modifyUser } from '../../../store/actions/managementActions'; +import { createData, deleteData, getData, patchData } from '../../../store/actions/managementActions'; const UserTable = () => { const dispatch = useAppDispatch(); - const Alert = React.forwardRef(function Alert( - props, - ref, - ) { - return ; - }); - type TenantOptionTypes = Array const [ tenants, setTenants ] = useState([ { 'id': 0, 'name': '', 'description': '' } ]); - const [ alertOpen, setAlertOpen ] = React.useState(false); - const [ alertMessage, setAlertMessage ] = React.useState(''); - const [ alertSeverity, setAlertSeverity ] = React.useState('success'); - const getTenantName = (id: string): string => { const t = tenants.find((type) => type.id === parseInt(id)); @@ -105,9 +92,7 @@ const UserTable = () => { async function fetchProduct() { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getTenants()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); + dispatch(getData('tenants')).then((tdata: any) => { if (tdata != undefined) { setTenants(tdata.data); } @@ -116,9 +101,7 @@ const UserTable = () => { }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(getUsers()).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(getData('users')).then((tdata: any) => { if (tdata != undefined) { setData(tdata.data); } @@ -134,7 +117,7 @@ const UserTable = () => { fetchProduct(); }, []); - const [ open, setOpen ] = React.useState(false); + const [ open, setOpen ] = useState(false); const handleClickOpen = () => { setId(0); @@ -187,14 +170,9 @@ const UserTable = () => { // eslint-disable-next-line no-alert if (id != 0 && confirm('Are you sure?')) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(deleteUser(id)).then((tdata: any) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + dispatch(deleteData(id, 'users')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull delete!'); - setAlertSeverity('success'); - setAlertOpen(true); }); } }; @@ -204,65 +182,38 @@ const UserTable = () => { // add new data / mod data / error if (name != '' && id === 0) { - dispatch(createUser({ + dispatch(createData({ ssoId: ssoId, tenantId: tenantId, email: email, name: name, avatar: avatar - })).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('User data', tdata); + }, 'users')).then(() => { fetchProduct(); setOpen(false); - // TODO finish - setAlertMessage('Successfull add!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } else if (name != '' && id != 0) { // eslint-disable-next-line @typescript-eslint/no-explicit-any - dispatch(modifyUser(id, { + dispatch(patchData(id, { ssoId: ssoId, tenantId: tenantId, email: email, name: name, avatar: avatar - })).then((tdata: unknown) => { - // eslint-disable-next-line no-console - console.log('Tenant data', tdata); - // TODO finish + }, 'users')).then(() => { fetchProduct(); setOpen(false); - setAlertMessage('Successfull modify!'); - setAlertSeverity('success'); - setAlertOpen(true); - }); } }; - const handleAlertClose = (event?: React.SyntheticEvent | Event, reason?: string) => { - if (reason === 'clickaway') { - return; - } - - setAlertOpen(false); - }; - return <>
- - - {alertMessage} - - Add/Edit diff --git a/src/components/settingsdialog/ManagementSettings.tsx b/src/components/settingsdialog/ManagementSettings.tsx index b67287b0..d1352e52 100644 --- a/src/components/settingsdialog/ManagementSettings.tsx +++ b/src/components/settingsdialog/ManagementSettings.tsx @@ -14,11 +14,7 @@ const ManagementSettings = (): JSX.Element => { const dispatch = useAppDispatch(); useEffect(() => { - dispatch(getUserData()).then((data) => { - // eslint-disable-next-line no-console - console.log('data', data); - }); - + dispatch(getUserData()).then(() => {}); }, []); const loggedIn = useAppSelector((state) => state.permissions.loggedIn); diff --git a/src/components/settingsdialog/managementsettings/ManagementAdminLoginSettings.tsx b/src/components/settingsdialog/managementsettings/ManagementAdminLoginSettings.tsx index c45ff354..dacaa164 100644 --- a/src/components/settingsdialog/managementsettings/ManagementAdminLoginSettings.tsx +++ b/src/components/settingsdialog/managementsettings/ManagementAdminLoginSettings.tsx @@ -67,10 +67,6 @@ export default function SignIn() { id="password" autoComplete="current-password" /> - {/* } - label="Remember me" - /> */}