From 07ca8ad688bc3e8d027a9064023548d783289344 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Wed, 24 Apr 2024 12:30:27 +0800
Subject: [PATCH] test

---
 src/auth/utils.js                             |  9 +++++++
 src/components/FiDataGrid.js                  | 26 +++++++++----------
 .../ListPanel/SearchPublicNoticeTable.js      |  6 ++---
 .../authentication/auth-forms/AuthLogin.js    |  8 +++++-
 src/routes/GLDUserRoutes.js                   |  5 ++--
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/auth/utils.js b/src/auth/utils.js
index 169fb3f..10c4acc 100644
--- a/src/auth/utils.js
+++ b/src/auth/utils.js
@@ -85,6 +85,15 @@ export const isUserLoggedIn = () => {
 
 export const getUserData = () => JSON.parse(localStorage.getItem('userData'));
 
+export const checkAuth = (auth) => {
+  const abilities= getUserData()?getUserData()["abilities"]:null;
+  if(abilities == null || abilities.length==0) return false;
+  for(let i= 0; i<abilities.length; i++){
+    if(auth == abilities[i]) return true;
+  }
+  return false;
+};
+
 /**
  * This function is used for demo purpose route navigation
  * In real app you won't need this function because your app will navigate to same route for each users regardless of ability
diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index e2eb70b..8fcf7e2 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -1,5 +1,5 @@
 // material-ui
-import * as React from 'react';
+import {useState, useEffect} from 'react';
 import {
     DataGrid, GridOverlay,
 } from "@mui/x-data-grid";
@@ -12,18 +12,18 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
                                hideFooterSelectedRowCount, rowModesModel, editMode,
                                pageSizeOptions, filterItems, customPageSize, ...props }) {
     const intl = useIntl();
-    const [_rows, set_rows] = React.useState([]);
-    const [_columns, set_columns] = React.useState([]);
-    const [_rowModesModel, set_rowModesModel] = React.useState({});
-    const [_editMode, set_editMode] = React.useState("row");
-    const [_pageSizeOptions, set_pageSizeOptions] = React.useState([10, 25, 50]);
-    const [_filterItems, set_filterItems] = React.useState([]);
+    const [_rows, set_rows] = useState([]);
+    const [_columns, set_columns] = useState([]);
+    const [_rowModesModel, set_rowModesModel] = useState({});
+    const [_editMode, set_editMode] = useState("row");
+    const [_pageSizeOptions, set_pageSizeOptions] = useState([10, 25, 50]);
+    const [_filterItems, set_filterItems] = useState([]);
 
-    const [page, setPage] = React.useState(0);
-    const [pageSize, setPageSize] = React.useState(10);
-    const [_autoHeight, set_autoHeight] = React.useState(true);
-    const [myHideFooterSelectedRowCount, setMyHideFooterSelectedRowCount] = React.useState(true);
-    const [_sx, set_sx] = React.useState({
+    const [page, setPage] = useState(0);
+    const [pageSize, setPageSize] = useState(10);
+    const [_autoHeight, set_autoHeight] = useState(true);
+    const [myHideFooterSelectedRowCount, setMyHideFooterSelectedRowCount] = useState(true);
+    const [_sx, set_sx] = useState({
         padding: "4 2 4 2",
         '& .MuiDataGrid-cell': {
             borderTop: 1,
@@ -36,7 +36,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
         },
     });
 
-    React.useEffect(() => {
+    useEffect(() => {
         if (sx) {
             set_sx(sx);
         }
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index ec86011..fd293c2 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -1,5 +1,5 @@
 // material-ui
-import * as React from 'react';
+import {useState, useEffect} from 'react';
 import {
     Button,
     Typography, useMediaQuery
@@ -16,7 +16,7 @@ import { FormattedMessage, useIntl } from "react-intl";
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function SearchPublicNoticeTable({ recordList }) {
-    const [rows, setRows] = React.useState([]);
+    const [rows, setRows] = useState([]);
     const navigate = useNavigate()
     const theme = useTheme();
     const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
@@ -26,7 +26,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         navigate('/publicNotice/' + params.id);
     };
 
-    React.useEffect(() => {
+    useEffect(() => {
         setRows(recordList);
     }, [recordList]);
 
diff --git a/src/pages/authentication/auth-forms/AuthLogin.js b/src/pages/authentication/auth-forms/AuthLogin.js
index c4fa3a1..f085261 100644
--- a/src/pages/authentication/auth-forms/AuthLogin.js
+++ b/src/pages/authentication/auth-forms/AuthLogin.js
@@ -74,6 +74,12 @@ const AuthLogin = () => {
           //setPosts("12354")
           console.log(response.data);
           setPosts(response.data);
+
+          let abilities = [];
+          for(let i=0; i<response.data.abilities?.length; i++){
+            abilities[i] = response.data.abilities[i].actionSubjectCombo;
+          }
+
           const userData = {
             id: response.data.id,
             fullenName: response.data.name,
@@ -81,7 +87,7 @@ const AuthLogin = () => {
             email: response.data.email,
             type: response.data.type,
             role: response.data.role,
-            abilities: response.data.abilities,
+            abilities: abilities,
             //avatar: require('src/assets/images/users/avatar-3.png').default,
           }
           // const abilities = response.data.abilities
diff --git a/src/routes/GLDUserRoutes.js b/src/routes/GLDUserRoutes.js
index 84d08ad..5422a89 100644
--- a/src/routes/GLDUserRoutes.js
+++ b/src/routes/GLDUserRoutes.js
@@ -4,6 +4,7 @@ import { lazy } from 'react';
 import Loadable from 'components/Loadable';
 // import MainLayout from 'layout/MainLayout';
 const MainLayout = Loadable(lazy(() => import('layout/MainLayout')));
+import {checkAuth} from "auth/utils";
 
 // render - dashboard
 const DashboardDefault = Loadable(lazy(() => import('pages/Dashboard/GLD')));
@@ -54,10 +55,10 @@ const GLDUserRoutes = {
           path: '/application/search',
           element: <ApplicationSearch/>
         },
-        {
+        checkAuth("VIEW_PROOF") || checkAuth("MAINTAIN_PROOF")?{
           path: '/proof/search',
           element: <ProofSearch/>
-        },
+        }:{},
         {
           path: '/proof/create/:id',
           element: <ProofCreate_FromApp/>