From 55a20db146375c8155774bedab0d59d56b6cac4b Mon Sep 17 00:00:00 2001 From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> Date: Fri, 3 Sep 2021 12:41:16 -0700 Subject: [PATCH 1/2] Share Icon updated Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> --- portal-ui/src/icons/ShareIcon.tsx | 31 ++++++++++--------- .../Common/TableWrapper/TableActionButton.tsx | 3 +- .../TableActionIcons/DeleteIcon.tsx | 20 ------------ .../TableActionIcons/DownloadIcon.tsx | 24 -------------- .../TableActionIcons/PencilIcon.tsx | 24 -------------- .../TableActionIcons/ShareIcon.tsx | 26 ---------------- .../TableActionIcons/ViewIcon.tsx | 21 ------------- 7 files changed, 17 insertions(+), 132 deletions(-) delete mode 100644 portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DeleteIcon.tsx delete mode 100644 portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DownloadIcon.tsx delete mode 100644 portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/PencilIcon.tsx delete mode 100644 portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/ShareIcon.tsx delete mode 100644 portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/ViewIcon.tsx diff --git a/portal-ui/src/icons/ShareIcon.tsx b/portal-ui/src/icons/ShareIcon.tsx index ca726fc585..24a348cd2f 100644 --- a/portal-ui/src/icons/ShareIcon.tsx +++ b/portal-ui/src/icons/ShareIcon.tsx @@ -14,25 +14,26 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import SvgIcon from "@material-ui/core/SvgIcon"; +import * as React from "react"; +import { SvgIcon, SvgIconProps } from "@material-ui/core"; -interface IShareIcon { - width?: number; -} - -const ShareIcon = ({ width = 24 }: IShareIcon) => { +const ShareIcon = (props: SvgIconProps) => { return ( - - + + + data-name="Trazado 410" + d="M251.315 67.671L207.79 25.459c-14.279-13.851-35.342 7.862-21.063 21.716l12.959 12.567a156.689 156.689 0 00-82.95 23.182 156.774 156.774 0 00-71.051 97.677 15.547 15.547 0 0011.474 18.755 15.62 15.62 0 003.655.438 15.555 15.555 0 0015.1-11.909c14.6-60.586 70.74-100.461 130.9-96.758l-3.335 4.317-15.767 16.248c-13.849 14.285 7.867 35.345 21.719 21.063l42.214-43.518a15.131 15.131 0 00-.33-21.566z" + /> + data-name="Trazado 411" + d="M229.501 148.665a14.352 14.352 0 00-14.348 14.351v52.134H28.703V28.703h126.71a14.352 14.352 0 0014.351-14.351A14.353 14.353 0 00155.413.001h-130.1A25.34 25.34 0 00.002 25.314v193.228a25.339 25.339 0 0025.311 25.311h193.23a25.339 25.339 0 0025.311-25.311v-55.526a14.353 14.353 0 00-14.353-14.351z" + /> ); diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx index 936f461ebf..2bc413df0d 100644 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx +++ b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx @@ -18,14 +18,13 @@ import isString from "lodash/isString"; import { Link } from "react-router-dom"; import { createStyles, withStyles } from "@material-ui/core/styles"; import { IconButton } from "@material-ui/core"; -import ShareIcon from "./TableActionIcons/ShareIcon"; import CloudIcon from "./TableActionIcons/CloudIcon"; import ConsoleIcon from "./TableActionIcons/ConsoleIcon"; import DisableIcon from "./TableActionIcons/DisableIcon"; import FormatDriveIcon from "./TableActionIcons/FormatDriveIcon"; import EditIcon from "../../../../icons/EditIcon"; import TrashIcon from "../../../../icons/TrashIcon"; -import { IAMPoliciesIcon, PreviewIcon } from "../../../../icons"; +import { IAMPoliciesIcon, PreviewIcon, ShareIcon } from "../../../../icons"; import DownloadIcon from "../../../../icons/DownloadIcon"; const styles = () => diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DeleteIcon.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DeleteIcon.tsx deleted file mode 100644 index d3aab64968..0000000000 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DeleteIcon.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import React from "react"; -import { IIcon, selected, unSelected } from "./common"; - -const DeleteIcon = ({ active = false }: IIcon) => { - return ( - - - - ); -}; - -export default DeleteIcon; diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DownloadIcon.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DownloadIcon.tsx deleted file mode 100644 index e05e10cfe0..0000000000 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DownloadIcon.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import React from "react"; -import { IIcon, selected, unSelected } from "./common"; - -const DeleteIcon = ({ active = false }: IIcon) => { - return ( - - - - - ); -}; - -export default DeleteIcon; diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/PencilIcon.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/PencilIcon.tsx deleted file mode 100644 index f52db862f1..0000000000 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/PencilIcon.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import React from "react"; -import { IIcon, selected, unSelected } from "./common"; -import { SvgIcon } from "@material-ui/core"; - -const PencilIcon = ({ active = false }: IIcon) => { - return ( - - - - - - ); -}; - -export default PencilIcon; diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/ShareIcon.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/ShareIcon.tsx deleted file mode 100644 index 01417bdc97..0000000000 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/ShareIcon.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import React from "react"; -import { IIcon, selected, unSelected } from "./common"; - -const ShareIcon = ({ active = false }: IIcon) => { - return ( - - - - - ); -}; - -export default ShareIcon; diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/ViewIcon.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/ViewIcon.tsx deleted file mode 100644 index 6fa5179e16..0000000000 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/ViewIcon.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from "react"; -import { IIcon, selected, unSelected } from "./common"; - -const ViewIcon = ({ active = false }: IIcon) => { - return ( - - - - ); -}; - -export default ViewIcon; From 6b26caaf069540e613ee933fd47a4f0be4160a0d Mon Sep 17 00:00:00 2001 From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> Date: Tue, 7 Sep 2021 15:03:37 -0700 Subject: [PATCH 2/2] Address comments Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> --- .../Console/Common/TableWrapper/TableActionButton.tsx | 2 +- .../Console/Dashboard/BasicDashboard/DriveInfoCard.tsx | 3 +-- portal-ui/src/screens/Console/Users/UserDetails.tsx | 8 ++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx index 2bc413df0d..80066593ff 100644 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx +++ b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx @@ -64,7 +64,7 @@ const defineIcon = (type: string, selected: boolean) => { case "description": return ; case "share": - return ; + return ; case "cloud": return ; case "console": diff --git a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx index 4fba8cd610..a19dbe086b 100644 --- a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx +++ b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx @@ -94,8 +94,7 @@ const DriveInfoCard = ({ classes, drive }: ICardProps) => { return classes.redState; case "ok": return classes.greenState; - default: - return classes.greyState; + deefault: return classes.greyState; } }; diff --git a/portal-ui/src/screens/Console/Users/UserDetails.tsx b/portal-ui/src/screens/Console/Users/UserDetails.tsx index 3c094a96ce..2a0cdab2a9 100644 --- a/portal-ui/src/screens/Console/Users/UserDetails.tsx +++ b/portal-ui/src/screens/Console/Users/UserDetails.tsx @@ -189,7 +189,7 @@ const UserDetails = ({ classes, match }: IUserDetailsProps) => { } setCurrentPolicies(currentPolicies); setEnabled(res.status === "enabled"); - setHasPolicy(res.hasPolicy) + setHasPolicy(res.hasPolicy); setLoading(false); }) .catch((err: ErrorResponseHandler) => { @@ -384,7 +384,11 @@ const UserDetails = ({ classes, match }: IUserDetailsProps) => { /> - +