@campxdev/shared 1.8.37 → 1.8.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.8.37",
+  "version": "1.8.39",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/Layout/Helmet.tsx

@@ -1,10 +1,31 @@
 import { ReactNode } from 'react'
 import { Helmet as ReactHelmet } from 'react-helmet'
 
-// type MetaProps = JSX.IntrinsicElements['meta']
-// type LinkProps = JSX.IntrinsicElements['link']
+const isLocalHost = process.env.NODE_ENV === 'development'
+
+const freshDeskInnerHtml = `
+          window.fwSettings = {
+            widget_id: 85000000149,
+         }
+          !(function () {
+            window.openFreshDeskWidget = function openFreshDeskWidget() {
+            FreshworksWidget('open', 'ticketForm')
+          }
+         if ('function' != typeof window.FreshworksWidget) {
+          var n = function () {
+            n.q.push(arguments)
+          }
+          ;(n.q = []), (window.FreshworksWidget = n)
+         }
+          FreshworksWidget('hide', 'launcher')
+        })()
+
+`
 
 const getInnerHtml = (user: any) => {
+  if (isLocalHost) {
+    return ''
+  }
   const fcWidgetMessengerConfig = {
     config: {
       headerProperty: {
@@ -29,13 +50,6 @@ const getInnerHtml = (user: any) => {
       
       `
 }
-// window.fcWidget.user.setPhone('${user?.mobile}')
-
-// window.fcWidget.user.clear().then(function() {
-//   console.log('User cleared');
-// }, function() {
-//   console.log("User Not cleared");
-// });
 
 interface IHelmetProps {
   appTitle: string
@@ -61,37 +75,24 @@ export default function Helmet({
       {extraMetaTags}
       <link rel="icon" href={favicon} />
       <link rel="apple-touch-icon" href={favicon} />
-      <script
-        type="text/javascript"
-        src="//in.fw-cdn.com/30814322/430238.js"
-        defer
-      />
+      {isLocalHost && (
+        <script
+          type="text/javascript"
+          src="//in.fw-cdn.com/30814322/430238.js"
+          defer
+        />
+      )}
       <script defer>{getInnerHtml(user)}</script>
-
       <script async defer>
-        {`
-          window.fwSettings = {
-            widget_id: 85000000149,
-         }
-          !(function () {
-            window.openFreshDeskWidget = function openFreshDeskWidget() {
-            FreshworksWidget('open', 'ticketForm')
-          }
-         if ('function' != typeof window.FreshworksWidget) {
-          var n = function () {
-            n.q.push(arguments)
-          }
-          ;(n.q = []), (window.FreshworksWidget = n)
-         }
-          FreshworksWidget('hide', 'launcher')
-        })()
-        `}
+        {freshDeskInnerHtml}
       </script>
-      <script
-        type="text/javascript"
-        src="https://ind-widget.freshworks.com/widgets/85000000149.js"
-        defer
-      ></script>
+      {isLocalHost && (
+        <script
+          type="text/javascript"
+          src="https://ind-widget.freshworks.com/widgets/85000000149.js"
+          defer
+        ></script>
+      )}
       <style type="text/css">
         {`
             #fc_frame {

package/src/hooks/useAuth.ts

@@ -33,6 +33,7 @@ const ApplicationObj = {
   payments: 'payments',
   exams: 'exams',
 }
+
 const checkIsAdmin = (user) => {
   let subDomain = window.location.host.split('.')?.slice(-3)[0]
   const localSubDomain = process.env.REACT_APP_SUBDOMAIN
@@ -43,7 +44,7 @@ const checkIsAdmin = (user) => {
     subDomain = localSubDomain
 
     if (!localSubDomain) {
-      toast.warn('Subdomain not added in .env file')
+      toast.warn('missing REACT_APP_SUBDOMAIN in .env')
     }
   }
 
@@ -55,7 +56,7 @@ const checkIsAdmin = (user) => {
     subDomain,
   )
 
-  const profile = user?.userProfile.find(
+  const profile = user?.profiles?.find(
     (item) => item.application == ApplicationObj[subDomain],
   )
   return profile ? (profile.isAdmin == true ? 1 : 0) : 0
@@ -94,6 +95,9 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
           s.user = res.data?.user
           s.roles = res.data?.roles
         })
+        const isAdmin = checkIsAdmin(res.data.user)
+        // eslint-disable-next-line no-console
+        console.log('Is Admin -> ', isAdmin)
 
         PermissionsStore.update((s) => {
           s.permissions = {
@@ -101,8 +105,8 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
             can_settings_view: 1,
             can_dashboard_view: 1,
             can_individual_pages_view: 1,
-            can_analatics_view: checkIsAdmin(res.data.user),
-            can_admin_view: checkIsAdmin(res.data.user),
+            can_analatics_view: isAdmin,
+            can_admin_view: isAdmin,
           } as any
           s.applications = res.data?.applications ?? []
         })