Merge pull request #78 from data-for-change/dev

Dev

Author: SejoB

src/components/organisms/RiskHotspotModel.tsx

@@ -32,7 +32,7 @@ const RiskHotspotModel = observer(() => {
 	if (userStore.isLoading) {
 		return <Loader />;
 	}
-	const hasPermission = userStore.isAuthenticated && userStore.hasEditPermission;
+	const hasPermission = userStore.isAuthenticated && userStore.isHotSpotGrants;
 
 	if (hasPermission) {
 		return (

src/components/templates/Header/Header.tsx

@@ -81,9 +81,10 @@ const Header: React.FC<IProps> = observer(({ title }) => {
 									>
 										{loginText}
 										{isAuthenticated && user?.oauth_provider_user_picture_url ? (
-											<img src={user?.oauth_provider_user_picture_url || ''} 
-											alt='user' 
-											style={{ width: 18, height: 18, borderRadius: '5%' }}
+											<img
+												src={user?.oauth_provider_user_picture_url || ''}
+												alt='user'
+												style={{ width: 18, height: 18, borderRadius: '50%' }}
 											/>
 										) : (
 											<UserIcon />

src/components/templates/TabsTemplate.tsx

@@ -8,6 +8,7 @@ import { useStore } from '../../stores/storeConfig';
 import { useDispatch, useSelector } from 'react-redux';
 import { AppDispatch, RootState } from '../../stores/store';
 import { setCurrentTab } from '../../stores';
+import { FeatureFlags, isFeatureEnabled } from '../../utils/featureFlags';
 
 // import MapPage from '../../pages/MapPage';
 interface IProps {
@@ -19,7 +20,7 @@ const GroupByTablesPanel = lazy(() => import('../groupTable/GroupByTablesPanel')
 const MapAccidents = lazy(() => import('../map/AccidentsMap'));
 const AccidentsTable = lazy(() => import('../detailsTable/AccidentsTable'));
 const MyImageGallery = lazy(() => import('../organisms/MyImageGallery'));
-//const RiskHotspotModel = lazy(() => import('../organisms/RiskHotspotModel'));
+const RiskHotspotModel = lazy(() => import('../organisms/RiskHotspotModel'));
 
 const styles = {
 	tab: { marginTop: '0.5rem' },
@@ -86,7 +87,7 @@ export const TabsTemplate: FunctionComponent<IProps> = observer(({ type }) => {
 					</Suspense>
 				</ErrorBoundary>
 			</Tab>
-			{/* {isFeatureEnabled(FeatureFlags.RISK_MODEL) && (
+			{isFeatureEnabled(FeatureFlags.RISK_MODEL) && (
 				<Tab style={styles.tab} eventKey='riskModel' title={t('RiskModel')}>
 					<ErrorBoundary>
 						<Suspense fallback={<Loader />}>
@@ -96,7 +97,7 @@ export const TabsTemplate: FunctionComponent<IProps> = observer(({ type }) => {
 						</Suspense>
 					</ErrorBoundary>
 				</Tab>
-			)} */}
+			)}
 		</Tabs>
 	);
 });

src/services/AuthService.ts

@@ -1,9 +1,9 @@
 import axios, { AxiosResponse } from 'axios';
-import { API_URL } from '../utils/globalEnvs';
+import { API_ANYWAY_URL } from '../utils/globalEnvs';
 import { IUserLoggedIn, IUser } from '../types/User';
 
 class AuthService {
-	apiUrl = API_URL;
+	apiUrl = API_ANYWAY_URL;
 
 	// Safety Data session-based endpoints
 	isLoggedIn = async (): Promise<AxiosResponse<IUserLoggedIn>> => {
@@ -23,8 +23,11 @@ class AuthService {
 	 * Redirect the user to the authorization endpoint:
 	 * GET /sd-authorize/google
 	 */
-	getAuthorizeUrl = (redirectUrl?: string) => {
-		const url = new URL(`${this.apiUrl}/sd-authorize/google?redirect_url=${redirectUrl}`);
+	getAuthorizeUrl = (redirectUrl: string) => {
+		const url = new URL(`${this.apiUrl}/sd-authorize/google`);
+		if (redirectUrl) {
+			url.searchParams.append('redirect_url', redirectUrl);
+		}
 		return url.toString();
 	};
 }

src/stores/user/UserStore.ts

@@ -2,7 +2,7 @@ import { makeAutoObservable, runInAction } from 'mobx';
 import RootStore from '../RootStore';
 import AuthService from '../../services/AuthService';
 import { isFeatureEnabled, FeatureFlags } from '../../utils/featureFlags';
-import { IUser } from '../../types/User';
+import { EUserGrants, IUser } from '../../types/User';
 
 export default class UserStore {
 	user: IUser | null = null;
@@ -151,11 +151,7 @@ export default class UserStore {
 		return this.user?.roles?.includes('admins') || this.user?.role === 'admin';
 	}
 
-	get isEditor() {
-		return this.user?.roles?.includes('editor') || this.user?.role === 'editor';
-	}
-
-	get hasEditPermission() {
-		return this.isAdmin || this.isEditor;
+	get isHotSpotGrants() {
+		return this.user?.grants?.includes(EUserGrants.hot_spots_tab_grant);
 	}
 }

src/types/User.ts

@@ -24,3 +24,7 @@ export interface IUser {
 	full_name: string | null;
 	role: string | null;
 }
+
+export enum EUserGrants {
+	hot_spots_tab_grant = 'hot_spots_tab_grant',
+}