Merge branch 'staging_environment' into dev_environment

package.json

@@ -16,7 +16,7 @@
     "build:development": "VITE_CRISP_WEBSITE_ID={CRISP_WEBSITE_ID} VITE_AUTH0_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1 VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca VITE_APP_API_URL=https://bxt-dev.api.adaptiveagriculture.ca/v1 NODE_OPTIONS=--max_old_space_size=4096 VITE_APP_GOOGLE_API_KEY=${GOOGLE_API_KEY} VITE_APP_STRIPE_PUBLIC_KEY=${STRIPE_PUBLIC_KEY_DEVELOPMENT} VITE_MAPBOX_ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN} VITE_CNHI_CLIENT_ID=${CNHI_CLIENT_ID} VITE_CNHI_AUTHORIZE_URL=${CNHI_AUTHORIZE_URL} VITE_CNHI_REDIRECT_URI=${CNHI_REDIRECT_URI} VITE_CNHI_SCOPES=${CNHI_SCOPES} VITE_CNHI_CONNECTION=${CNHI_CONNECTION} VITE_CNHI_AUDIENCE=${CNHI_AUDIENCE} VITE_APP_IMAGE4IO_USERNAME=${IMAGE4IO_USERNAME} VITE_APP_IMAGE4IO_PASSWORD=${IMAGE4IO_PASSWORD} VITE_JD_CLIENT_ID=${JD_CLIENT_ID} VITE_JD_AUTHORIZE_URL=${JD_AUTHORIZE_URL} VITE_JD_REDIRECT_URI=${JD_REDIRECT_URI} VITE_JD_SCOPES=${JD_SCOPES} VITE_JD_STATE=${JD_STATE} VITE_OPEN_WEATHERMAP=${OPEN_WEATHERMAP} vite build",
     "build:production": "VITE_CRISP_WEBSITE_ID={CRISP_WEBSITE_ID} VITE_AUTH0_CLIENT_ID=5pUCkl2SfogkWmM244UDcLEUOp8EFdHd VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com VITE_AUTH0_AUDIENCE=api.brandxtech.ca VITE_APP_API_URL=https://api.brandxtech.ca/v1 NODE_OPTIONS=--max_old_space_size=4096 VITE_APP_GOOGLE_API_KEY=${GOOGLE_API_KEY} VITE_APP_STRIPE_PUBLIC_KEY=${STRIPE_PUBLIC_KEY_PRODUCTION} VITE_MAPBOX_ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN} VITE_CNHI_CLIENT_ID=${CNHI_CLIENT_ID} VITE_CNHI_AUTHORIZE_URL=${CNHI_AUTHORIZE_URL} VITE_CNHI_REDIRECT_URI=${CNHI_REDIRECT_URI} VITE_CNHI_SCOPES=${CNHI_SCOPES} VITE_CNHI_CONNECTION=${CNHI_CONNECTION} VITE_CNHI_AUDIENCE=${CNHI_AUDIENCE} VITE_APP_IMAGE4IO_USERNAME=${IMAGE4IO_USERNAME} VITE_APP_IMAGE4IO_PASSWORD=${IMAGE4IO_PASSWORD} VITE_JD_CLIENT_ID=${JD_CLIENT_ID} VITE_JD_AUTHORIZE_URL=${JD_AUTHORIZE_URL} VITE_JD_REDIRECT_URI=${JD_REDIRECT_URI} VITE_JD_SCOPES=${JD_SCOPES} VITE_JD_STATE=${JD_STATE} VITE_OPEN_WEATHERMAP=${OPEN_WEATHERMAP} vite build",
     "build:streamline": "VITE_CRISP_WEBSITE_ID={CRISP_WEBSITE_ID} VITE_AUTH0_CLIENT_ID=HwUV0hHNdVvU96zuMBTAU8i7nFdwwgIX VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com VITE_AUTH0_AUDIENCE=streamline.api.adaptiveagriculture.ca VITE_APP_API_URL=https://streamline.api.adaptiveagriculture.ca/v1 NODE_OPTIONS=--max_old_space_size=4096 VITE_APP_GOOGLE_API_KEY=${GOOGLE_API_KEY} VITE_APP_STRIPE_PUBLIC_KEY=${STRIPE_PUBLIC_KEY_PRODUCTION} VITE_MAPBOX_ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN} VITE_CNHI_CLIENT_ID=${CNHI_CLIENT_ID} VITE_CNHI_AUTHORIZE_URL=${CNHI_AUTHORIZE_URL} VITE_CNHI_REDIRECT_URI=${CNHI_REDIRECT_URI} VITE_CNHI_SCOPES=${CNHI_SCOPES} VITE_CNHI_CONNECTION=${CNHI_CONNECTION} VITE_CNHI_AUDIENCE=${CNHI_AUDIENCE} VITE_APP_IMAGE4IO_USERNAME=${IMAGE4IO_USERNAME} VITE_APP_IMAGE4IO_PASSWORD=${IMAGE4IO_PASSWORD} VITE_JD_CLIENT_ID=${JD_CLIENT_ID} VITE_JD_AUTHORIZE_URL=${JD_AUTHORIZE_URL} VITE_JD_REDIRECT_URI=${JD_REDIRECT_URI} VITE_JD_SCOPES=${JD_SCOPES} VITE_JD_STATE=${JD_STATE} VITE_OPEN_WEATHERMAP=${OPEN_WEATHERMAP} vite build",
-    "build:local": "VITE_AUTH0_CLIENT_ID=local VITE_AUTH0_AUDIENCE=local VITE_AUTH0_CLIENT_DOMAIN=local VITE_APP_API_URL=http://172.16.1.20:50052/v1 VITE_APP_WS_URL=ws://172.16.1.20:50052/v1/live NODE_OPTIONS=--max_old_space_size=4096 vite build --mode localnet",
+    "build:local": "VITE_CRISP_WEBSITE_ID= VITE_AUTH0_CLIENT_ID=local VITE_AUTH0_AUDIENCE=local VITE_AUTH0_CLIENT_DOMAIN=local VITE_APP_API_URL=http://172.16.1.20:50052/v1 VITE_APP_WS_URL=ws://172.16.1.20:50052/v1/live NODE_OPTIONS=--max_old_space_size=4096 vite build --mode localnet",
     "build:offline": "npx env-cmd offline,whitelabel npm run build",
     "test": "vitest"
   },

src/app/LocalAuthPlaceholder.tsx

@@ -102,8 +102,8 @@ export default function LocalAuthPlaceholder(props: Props) {
                 />
               )}
               <TextField
-                label="Email"
+                label="Username or Email"
-                type="email"
+                type="text"
                 value={email}
                 onChange={e => setEmail(e.target.value)}
                 required

src/bin/BinVisualizerV2.tsx

@@ -1159,7 +1159,7 @@ export default function BinVisualizer(props: Props) {
                 <BindaptIcon />
               </Avatar>
               <Box textAlign="center" width={"85%"}>
-                <Link href="https://www.bindapt.com/bins/">View Smart Bin Devices</Link>
+                <Typography>No Plenums found</Typography>
               </Box>
             </Box>
           )}

src/device/DeviceActions.tsx

@@ -512,7 +512,7 @@ export default function DeviceActions(props: Props) {
   };
 
   const showSupport = () => {
-    return user.allowedTo("provision") && !location.pathname.includes("support")
+    return user.hasAdmin() && !location.pathname.includes("support")
   }
 
   const buttons = () => {
@@ -523,7 +523,7 @@ export default function DeviceActions(props: Props) {
             <Visibility />
           </IconButton>
         </Tooltip>}
-        {canWrite && user.allowedTo("provision") && <UpgradeDevice device={device} />}
+        {canWrite && user.hasAdmin() && <UpgradeDevice device={device} />}
         {/* {!isShareableLink(match.params.deviceID) && ( */}
           <NotificationButton
             notify={preferences.notify}

src/teams/ObjectTeams.tsx

@@ -113,7 +113,7 @@ export default function ObjectTeams(props: Props) {
   const theme = useTheme();
   const permissionAPI = usePermissionAPI();
   const [{ user, as }] = useGlobalState();
-  const canProvision = user.allowedTo("provision");
+  const isAdmin = user.hasAdmin();
   const teamAPI = useTeamAPI();
   const { error, success, warning } = useSnackbar();
   const {
@@ -513,7 +513,7 @@ export default function ObjectTeams(props: Props) {
         ) : (
           canManageUsers &&
           !isRemoved &&
-          (!permissions.includes(pond.Permission.PERMISSION_USERS) || canProvision) && (
+          (!permissions.includes(pond.Permission.PERMISSION_USERS) || isAdmin) && (
             <ListItemSecondaryAction>
               <Tooltip title="Revoke user's access">
                 <IconButton

src/user/ObjectUsers.tsx

@@ -116,7 +116,7 @@ export default function ObjectUsers(props: Props) {
   const theme = useTheme();
   const permissionAPI = usePermissionAPI();
   const [{ user, team }, dispatch] = useGlobalState();
-  const canProvision = user.allowedTo("provision");
+  const isAdmin = user.hasAdmin();
   const userAPI = useUserAPI();
   const { error, success, warning } = useSnackbar();
   const {
@@ -560,7 +560,7 @@ export default function ObjectUsers(props: Props) {
               </IconButton>
             </Tooltip>
           </ListItemSecondaryAction>
-        ) : (canManageUsers || canProvision) && !isRemoved && !cardMode ? (
+        ) : (canManageUsers || isAdmin) && !isRemoved && !cardMode ? (
           <ListItemSecondaryAction>
             <Tooltip title="Revoke user's access">
               <IconButton
@@ -572,7 +572,7 @@ export default function ObjectUsers(props: Props) {
             </Tooltip>
           </ListItemSecondaryAction>
         ) : (
-          (canManageUsers || canProvision) && (
+          (canManageUsers || isAdmin) && (
             <ListItemSecondaryAction>
               <Tooltip title="Edit user's permissions">
                 <IconButton

src/user/UserSettings.tsx

@@ -75,7 +75,7 @@ export default function UserSettings(props: Props) {
   const [sharing, setSharing] = useState(false)
   const userAPI = useUserAPI();
   const classes = useStyles()
-  const { success } = useSnackbar();
+  const { success, error } = useSnackbar();
 
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [user, setUser] = useState<User>(globalState.user);
@@ -113,7 +113,7 @@ export default function UserSettings(props: Props) {
         setDistanceUnit(user.settings.distanceUnit);
         setGrainUnit(user.settings.grainUnit);
       })
-      .catch((error: any) => {
+      .catch(() => {
         error("Error occurred while updating your profile");
       })
       .finally(() => {