page restricted based on roles

Amruth-Vamshi · Feb 25, 2020 · 308e341 · 308e341
1 parent 627425e
commit 308e341
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 53 deletions.
diff --git a/src/walkin-core/src/routes/CoreLanding/index.tsx b/src/walkin-core/src/routes/CoreLanding/index.tsx
@@ -173,9 +173,18 @@ class CoreLandingPage extends React.Component<
             console.log('CoreLandingPage userData API', res.data.user);
             await localStorage.setItem('role', res.data.user.roles[0].name);
             this.setState({ spin: false });
+            let activeRoute = '/rewardx/customer_search';
+            switch (res.data.user.roles[0].name) {
+              case 'Finance':
+                activeRoute = '/rewardx/reports';
+                break;
+              case 'Customer_Care':
+                activeRoute = '/rewardx/customer_search';
+                break;
+            }
             setTimeout(() => {
               this.props.history.push({
-                pathname: '/rewardx/customer_search',
+                pathname: activeRoute,
               });
               // push url
             }, 2000);

diff --git a/src/walkin-rewardx/src/containers/BusinessRules/index.tsx b/src/walkin-rewardx/src/containers/BusinessRules/index.tsx
@@ -67,12 +67,7 @@ class BusinessRules extends React.Component<
   componentWillMount() {
     const roles: any = localStorage.getItem('role');
     console.log('CustomerSearch roles', roles);
-    if (roles && roles !== 'ADMIN') {
-      message.warn('You do not have access to this page');
-      this.props.history.push({
-        pathname: '/rewardx/customer_search',
-      });
-    } else {
+    if (['ADMIN'].includes(roles)) {
       const jwtToken: any = localStorage.getItem('jwt');
       const { org_id }: any = jwt.decode(jwtToken);
 
@@ -123,6 +118,11 @@ class BusinessRules extends React.Component<
       //       loading: false
       //     });
       //   });
+    } else {
+      message.warn('You do not have access to this page');
+      this.props.history.push({
+        pathname: '/rewardx/customer_search',
+      });
     }
   }
 

diff --git a/src/walkin-rewardx/src/containers/CustomerCare/CustomerCare/index.tsx b/src/walkin-rewardx/src/containers/CustomerCare/CustomerCare/index.tsx
@@ -91,8 +91,6 @@ class CustomerCare extends React.Component<
 
   // hide everything from customer search except phone number
   componentDidMount() {
-    console.log('CustomerCare cdm record', this.props.location.state.record);
-
     if (
       this.props.location.state.record.phoneNumber &&
       this.props.location.state.loyaltyTransactionsData &&

diff --git a/src/walkin-rewardx/src/containers/CustomerCare/CustomerSearch/index.tsx b/src/walkin-rewardx/src/containers/CustomerCare/CustomerSearch/index.tsx
@@ -58,7 +58,7 @@ class CustomerSearch extends React.Component<
         this.props.client.cache['data']['data']['$ROOT_QUERY.auth']
           .organizationId,
       customer: null,
-      loading: true,
+      loading: false,
       loadingTable: false,
       phoneNumber: null,
       customerId: null,
@@ -67,8 +67,14 @@ class CustomerSearch extends React.Component<
     };
   }
 
-  componentDidMount() {
-    this.setState({ loading: false });
+  UNSAFE_componentWillMount() {
+    const roles: any = localStorage.getItem('role');
+    if (!['ADMIN', 'Customer_Care'].includes(roles)) {
+      message.warn('You do not have access to this page');
+      this.props.history.push({
+        pathname: '/rewardx/reports',
+      });
+    }
   }
 
   getCustomerDetails() {

diff --git a/src/walkin-rewardx/src/containers/Reports/index.tsx b/src/walkin-rewardx/src/containers/Reports/index.tsx
@@ -45,18 +45,26 @@ class Reports extends React.Component<ReportsProps, ReportsState> {
 
   UNSAFE_componentWillMount() {
     const jwtToken: any = localStorage.getItem('jwt');
-    const { org_id }: any = jwt.decode(jwtToken);
-    this.getReports(org_id, reportsResponse => {
-      this.setState({
-        initLoading: false,
-        organizationId: org_id,
-        reports: reportsResponse.data.reportConfigs,
-        // totalPages:
-        //   reportsResponse.data.reportConfigs.paginationInfo.totalPages,
-        // totalItems:
-        //   reportsResponse.data.reportConfigs.paginationInfo.totalItems,
+    const roles: any = localStorage.getItem('role');
+    if (['ADMIN', 'Finance'].includes(roles)) {
+      const { org_id }: any = jwt.decode(jwtToken);
+      this.getReports(org_id, reportsResponse => {
+        this.setState({
+          initLoading: false,
+          organizationId: org_id,
+          reports: reportsResponse.data.reportConfigs,
+          // totalPages:
+          //   reportsResponse.data.reportConfigs.paginationInfo.totalPages,
+          // totalItems:
+          //   reportsResponse.data.reportConfigs.paginationInfo.totalItems,
+        });
       });
-    });
+    } else {
+      message.warn('You do not have access to this page');
+      this.props.history.push({
+        pathname: '/rewardx/customer_search',
+      });
+    }
   }
 
   getReports = (organizationId: string, callback) => {

diff --git a/src/walkin-rewardx/src/containers/SidebarContent/index.tsx b/src/walkin-rewardx/src/containers/SidebarContent/index.tsx
@@ -53,25 +53,8 @@ class SidebarContent extends React.Component<
     return '';
   };
 
-  renderBusinessRules(roles: any) {
-    if (roles && roles === 'ADMIN') {
-      return (
-        <Menu.Item>
-          <Link to="/rewardx/business_rules">
-            <Icon type="profile" />
-            <span>Business Rules</span>
-          </Link>
-        </Menu.Item>
-      );
-    }
-
-    return null;
-  }
-
   render() {
     const roles: any = localStorage.getItem('role');
-    console.log('CustomerSearch roles', roles);
-
     const { themeType, navStyle, pathname, match } = this.props;
     const selectedKeys = pathname.substr(1);
     const defaultOpenKeys = selectedKeys.split('/')[1];
@@ -105,19 +88,31 @@ class SidebarContent extends React.Component<
             </Menu.Item> 
             */}
 
-            <Menu.Item>
-              <Link to="/rewardx/customer_search">
-                <Icon type="profile" />
-                <span>Customer Care</span>
-              </Link>
-            </Menu.Item>
-            <Menu.Item key="reports">
-              <Link to="/rewardx/reports">
-                <Icon type="profile" />
-                <span>Reports</span>
-              </Link>
-            </Menu.Item>
-            {this.renderBusinessRules(roles)}
+            {['ADMIN', 'Customer_Care'].includes(roles) ? (
+              <Menu.Item key="customer_search">
+                <Link to="/rewardx/customer_search">
+                  <Icon type="profile" />
+                  <span>Customer Care</span>
+                </Link>
+              </Menu.Item>
+            ) : null}
+
+            {['ADMIN'].includes(roles) ? (
+              <Menu.Item>
+                <Link to="/rewardx/business_rules">
+                  <Icon type="profile" />
+                  <span>Business Rules</span>
+                </Link>
+              </Menu.Item>
+            ) : null}
+            {['ADMIN', 'Finance'].includes(roles) ? (
+              <Menu.Item key="reports">
+                <Link to="/rewardx/reports">
+                  <Icon type="profile" />
+                  <span>Reports</span>
+                </Link>
+              </Menu.Item>
+            ) : null}
           </Menu>
         </div>
       </Auxiliary>