Add userPermissions query and replace isGuest logic

src/actions/RolesActions.js

@@ -1,5 +1,5 @@
 import { createThunk } from ".";
-import { getPolygons } from "./TiamatActions";
+import { getPolygons, getUserPermissions } from "./TiamatActions";
 import * as types from "./Types";
 
 const getAdministrativeZoneIds = (roles) => {
@@ -52,3 +52,7 @@ export const updateAllowNewStopsEverywhere =
 export const updateAuth = (auth) => (dispatch) => {
   dispatch(createThunk(types.UPDATED_AUTH, auth));
 };
+
+export const fetchUserPermissions = () => (dispatch, getState) => {
+  dispatch(getUserPermissions());
+};

src/actions/TiamatActions.js

@@ -55,6 +55,7 @@ import {
   topopGraphicalPlacesReportQuery,
   neighbourStopPlaceQuays,
   getLocationPermissions,
+  getUserPermissionsQuery,
 } from "../graphql/Tiamat/queries";
 import mapToMutationVariables from "../modelUtils/mapToQueryVariables";
 
@@ -633,3 +634,13 @@ export const getLocationPermissionsForCoordinates = (longitude, latitude) => {
     })(dispatch);
   };
 };
+
+export const getUserPermissions = () => {
+  return async (dispatch, getState) => {
+    return handleQuery(getTiamatClient(), {
+      fetchPolicy: "no-cache",
+      query: getUserPermissionsQuery,
+      context: await getContext(getState().roles.auth),
+    })(dispatch);
+  };
+};

src/components/MainPage/SearchBox.js

@@ -52,7 +52,6 @@ import {
   Popover,
 } from "@mui/material";
 import TextField from "@mui/material/TextField";
-import { isGuest } from "../../utils/roleUtils";
 
 class SearchBox extends React.Component {
   constructor(props) {
@@ -367,11 +366,11 @@ class SearchBox extends React.Component {
       topoiChips,
       topographicalPlaces,
       canEdit,
-      roleAssignments,
       lookupCoordinatesOpen,
       newStopIsMultiModal,
       dataSource,
       showFutureAndExpired,
+      isGuest,
     } = this.props;
     const { coordinatesDialogOpen, showMoreFilterOptions, loading } =
       this.state;
@@ -686,7 +685,7 @@ class SearchBox extends React.Component {
                 formatMessage={formatMessage}
               />
             ) : null}
-            {!isGuest(roleAssignments) && (
+            {!isGuest && (
               <div style={{ marginTop: 10 }}>
                 {isCreatingNewStop ? (
                   <NewStopPlace
@@ -787,10 +786,10 @@ const mapStateToProps = (state) => {
       ["allowanceInfoSearchResult", "canEdit"],
       false,
     ),
-    roleAssignments: state.roles.auth.roleAssignments,
     lookupCoordinatesOpen: state.user.lookupCoordinatesOpen,
     newStopIsMultiModal: state.user.newStopIsMultiModal,
     showFutureAndExpired: state.user.searchFilters.showFutureAndExpired,
+    isGuest: state.roles.isGuest,
   };
 };
 

src/containers/App.js

@@ -24,7 +24,11 @@ import { useDispatch } from "react-redux";
 import Header from "../components/Header";
 import { getTheme, getV0Theme } from "../config/themeConfig";
 import SnackbarWrapper from "../components/SnackbarWrapper";
-import { fetchPolygons, updateAuth } from "../actions/RolesActions";
+import {
+  fetchPolygons,
+  fetchUserPermissions,
+  updateAuth,
+} from "../actions/RolesActions";
 import { useAppSelector } from "../store/hooks";
 import configureLocalization from "../localization/localization";
 import { UserActions } from "../actions";
@@ -49,9 +53,11 @@ const App = ({ children }) => {
 
   useEffect(() => {
     dispatch(updateAuth(auth));
-
     if (auth.isAuthenticated) {
       dispatch(fetchPolygons());
+      dispatch(fetchUserPermissions());
+    } else if (!auth.isLoading) {
+      dispatch(fetchUserPermissions());
     }
   }, [auth]);
 

src/graphql/Tiamat/queries.js

@@ -835,3 +835,12 @@ export const getLocationPermissions = gql`
     }
   }
 `;
+
+export const getUserPermissionsQuery = gql`
+  query getUserPermissions {
+    userPermissions {
+      allowNewStopEverywhere
+      isGuest
+    }
+  }
+`;

src/reducers/rolesReducer.js

@@ -23,6 +23,7 @@ import {
 export const initialState = {
   auth: {},
   fetchedPolygons: null,
+  isGuest: true,
   allowNewStopEverywhere: false,
 };
 
@@ -47,6 +48,12 @@ const rolesReducer = (state = initialState, action) => {
             action.result.data.locationPermissions,
           ),
         });
+      } else if (action.operationName === "getUserPermissions") {
+        return Object.assign({}, state, {
+          isGuest: action.result.data.userPermissions.isGuest,
+          allowNewStopEverywhere:
+            action.result.data.userPermissions.allowNewStopEverywhere,
+        });
       } else {
         return state;
       }

src/utils/roleUtils.js

@@ -215,8 +215,19 @@ const doesRoleGrantAccessToStop = (
   return false;
 };
 
-export const isGuest = (roleAssignments) => {
-  return getEditStopRoles(roleAssignments).length === 0;
+const getRolesFromTokenByType = (roleAssignments, type) => {
+  if (!roleAssignments) return [];
+
+  let roles = [];
+
+  roleAssignments.forEach((roleString) => {
+    let roleJSON = JSON.parse(roleString);
+    if (roleJSON.r === type) {
+      roles.push(roleJSON);
+    }
+  });
+
+  return roles;
 };
 export const getStopPlacesForSubmodes = (legalSubmodes) => {
   let result = [];