From 58efbbbf60eefc7567ad521730deded01e112aac Mon Sep 17 00:00:00 2001 From: Alex <33497058+bexsoft@users.noreply.github.com> Date: Thu, 24 Jun 2021 14:38:41 -0500 Subject: [PATCH] Fixed some warnings (#834) Co-authored-by: Benjamin Perez --- .../TenantDetails/ConfirmationDialog.tsx | 3 +-- .../Tenants/TenantDetails/PodsSummary.tsx | 3 --- .../Tenants/TenantDetails/TenantSecurity.tsx | 16 +++++--------- .../Console/Users/DeleteUserString.tsx | 2 +- .../src/screens/Console/Users/UserDetails.tsx | 22 ++----------------- 5 files changed, 9 insertions(+), 37 deletions(-) diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/ConfirmationDialog.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/ConfirmationDialog.tsx index 6a8fe5419..792530816 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/ConfirmationDialog.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/ConfirmationDialog.tsx @@ -1,4 +1,4 @@ -import { ITenant } from "../ListTenants/types"; +import React, { useState } from "react"; import { createStyles, Theme, withStyles } from "@material-ui/core/styles"; import { containerForHeader, @@ -13,7 +13,6 @@ import { DialogTitle, LinearProgress, } from "@material-ui/core"; -import React, { useState } from "react"; interface IConfirmationDialog { classes: any; diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx index 51bd36ecc..a86a6d171 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx @@ -29,9 +29,6 @@ import TableWrapper from "../../Common/TableWrapper/TableWrapper"; import { AppState } from "../../../../store"; import { setTenantDetailsLoad, - setTenantInfo, - setTenantName, - setTenantTab, } from "../actions"; interface IPodsSummary { diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx index 3e1cc039b..ba6a289ac 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx @@ -31,13 +31,7 @@ import { Button, CircularProgress, Divider, - LinearProgress, Typography, - Dialog, - DialogActions, - DialogContent, - DialogContentText, - DialogTitle, } from "@material-ui/core"; import { KeyPair } from "../ListTenants/utils"; import FileSelector from "../../Common/FormComponents/FileSelector/FileSelector"; @@ -296,11 +290,11 @@ const TenantSecurity = ({ // Update MinIO TLS certificate secrets const updatedMinIOTLSCertificateSecrets = minioTLSCertificateSecrets.filter( - (certificateSecret) => certificateSecret.name != certificateInfo.name + (certificateSecret) => certificateSecret.name !== certificateInfo.name ); const updatedMinIOTLSCaCertificateSecrets = minioTLSCaCertificateSecrets.filter( - (certificateSecret) => certificateSecret.name != certificateInfo.name + (certificateSecret) => certificateSecret.name !== certificateInfo.name ); setMinioTLSCertificateSecrets(updatedMinIOTLSCertificateSecrets); setMinioTLSCaCertificateSecrets(updatedMinIOTLSCaCertificateSecrets); @@ -308,11 +302,11 @@ const TenantSecurity = ({ // Update Console TLS certificate secrets const updatedConsoleTLSCertificateSecrets = consoleTLSCertificateSecrets.filter( - (certificateSecret) => certificateSecret.name != certificateInfo.name + (certificateSecret) => certificateSecret.name !== certificateInfo.name ); const updatedConsoleTLSCaCertificateSecrets = consoleTLSCaCertificateSecrets.filter( - (certificateSecret) => certificateSecret.name != certificateInfo.name + (certificateSecret) => certificateSecret.name !== certificateInfo.name ); setConsoleTLSCertificateSecrets(updatedConsoleTLSCertificateSecrets); setConsoleTLSCaCertificateSecrets(updatedConsoleTLSCaCertificateSecrets); @@ -921,7 +915,7 @@ const TenantSecurity = ({ type="submit" variant="contained" color="primary" - disabled={dialogOpen} + disabled={dialogOpen || isSending} onClick={() => setDialogOpen(true)} > Save diff --git a/portal-ui/src/screens/Console/Users/DeleteUserString.tsx b/portal-ui/src/screens/Console/Users/DeleteUserString.tsx index a505feef2..16c00a68b 100644 --- a/portal-ui/src/screens/Console/Users/DeleteUserString.tsx +++ b/portal-ui/src/screens/Console/Users/DeleteUserString.tsx @@ -28,7 +28,7 @@ import { import api from "../../../common/api"; import { setErrorSnackMessage } from "../../../actions"; import history from "../../../history"; -import { User, UsersList } from "./types"; +import { UsersList } from "./types"; interface IDeleteUserProps { closeDeleteModalAndRefresh: (refresh: boolean) => void; diff --git a/portal-ui/src/screens/Console/Users/UserDetails.tsx b/portal-ui/src/screens/Console/Users/UserDetails.tsx index 2f876f44d..1c56b3f29 100644 --- a/portal-ui/src/screens/Console/Users/UserDetails.tsx +++ b/portal-ui/src/screens/Console/Users/UserDetails.tsx @@ -29,7 +29,7 @@ import { containerForHeader, searchField, } from "../Common/FormComponents/common/styleLibrary"; -import { IPolicyItem, User, UsersList } from "./types"; +import { IPolicyItem, User } from "./types"; import Tabs from "@material-ui/core/Tabs"; import Tab from "@material-ui/core/Tab"; import { TabPanel } from "../../shared/tabs"; @@ -45,7 +45,6 @@ import UserServiceAccountsPanel from "./UserServiceAccountsPanel"; import MoreVertIcon from "@material-ui/icons/MoreVert"; import ChangeUserPasswordModal from "../Account/ChangeUserPasswordModal"; import DeleteUserString from "./DeleteUserString"; -import { usersSort } from "../../../utils/sortFunctions"; const styles = (theme: Theme) => createStyles({ @@ -139,7 +138,6 @@ const UserDetails = ({ classes, match }: IUserDetailsProps) => { const [addGroupOpen, setAddGroupOpen] = useState(false); const [policyOpen, setPolicyOpen] = useState(false); const [addLoading, setAddLoading] = useState(false); - const [records, setRecords] = useState([]); const [enabled, setEnabled] = useState(false); const [selectedGroups, setSelectedGroups] = useState([]); @@ -217,22 +215,6 @@ const UserDetails = ({ classes, match }: IUserDetailsProps) => { }); }; - const fetchRecords = useCallback(() => { - setLoading(true); - api - .invoke("GET", `/api/v1/users`) - .then((res: UsersList) => { - const users = res.users === null ? [] : res.users; - - setLoading(false); - setRecords(users.sort(usersSort)); - }) - .catch((err) => { - setLoading(false); - setErrorSnackMessage(err); - }); - }, [setLoading, setRecords, setErrorSnackMessage]); - const [anchorEl, setAnchorEl] = React.useState(null); const handleUserMenu = (event: any) => { @@ -248,7 +230,7 @@ const UserDetails = ({ classes, match }: IUserDetailsProps) => { const closeDeleteModalAndRefresh = (refresh: boolean) => { setDeleteOpen(false); if (refresh) { - fetchRecords(); + getUserInformation(); } };