From c61c99357230b57f5f4e1ba43a8a135ea5347129 Mon Sep 17 00:00:00 2001 From: canove Date: Wed, 13 Jan 2021 16:02:05 -0300 Subject: [PATCH] feat: strict "show all" option to admin only --- frontend/src/accessRules.js | 2 +- .../src/components/TicketsManager/index.js | 34 ++++++++++++------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/frontend/src/accessRules.js b/frontend/src/accessRules.js index 938dc32..e282def 100644 --- a/frontend/src/accessRules.js +++ b/frontend/src/accessRules.js @@ -4,7 +4,7 @@ const rules = { }, admin: { - static: ["drawer-admin-items:view"], + static: ["drawer-admin-items:view", "tickets-manager:showall"], }, }; diff --git a/frontend/src/components/TicketsManager/index.js b/frontend/src/components/TicketsManager/index.js index 75558af..1a24053 100644 --- a/frontend/src/components/TicketsManager/index.js +++ b/frontend/src/components/TicketsManager/index.js @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React, { useContext, useState } from "react"; import { makeStyles } from "@material-ui/core/styles"; import Paper from "@material-ui/core/Paper"; @@ -18,6 +18,8 @@ import TicketsList from "../TicketsList"; import TabPanel from "../TabPanel"; import { i18n } from "../../translate/i18n"; +import { AuthContext } from "../../context/Auth/AuthContext"; +import Can from "../Can"; const useStyles = makeStyles(theme => ({ ticketsWrapper: { @@ -88,6 +90,7 @@ const TicketsManager = () => { const [tab, setTab] = useState("open"); const [newTicketModalOpen, setNewTicketModalOpen] = useState(false); const [showAllTickets, setShowAllTickets] = useState(false); + const { user } = useContext(AuthContext); const handleSearchContact = e => { if (e.target.value === "") { @@ -149,19 +152,26 @@ const TicketsManager = () => { />
- setShowAllTickets(prevState => !prevState)} - name="showAllTickets" - color="primary" + ( + setShowAllTickets(prevState => !prevState)} + name="showAllTickets" + color="primary" + /> + } /> - } + )} /> +