Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

freelancer cannot see tenantUser tab #33

Merged
merged 4 commits into from
Dec 13, 2023
Merged

freelancer cannot see tenantUser tab #33

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e354bf4
freelancer cannot see tenantUser tab
LWangllix Dec 5, 2023
759349d
x-profile fix
LWangllix Dec 5, 2023
9aa0160
use isfinite to check a number
LWangllix Dec 13, 2023
49c92d4
Merge branch 'main' into profile-fixes
LWangllix Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/utils/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Axios, { AxiosInstance, AxiosResponse } from 'axios';
import { isNaN } from 'lodash';
import { FishStocking, FishType, Tenant, TenantUser, User } from './types';

import { isEmpty } from 'lodash';
Expand Down Expand Up @@ -93,7 +92,8 @@ class Api {
config.url = this.proxy + config.url;
if (token) {
config.headers!.Authorization = 'Bearer ' + token;
if (!isNaN(profileId)) config.headers!['X-Profile'] = profileId;

if (profileId && !isNaN(profileId)) config.headers!['X-Profile'] = profileId;
LWangllix marked this conversation as resolved.
Show resolved Hide resolved
}

return config;
Expand Down
4 changes: 3 additions & 1 deletion src/utils/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ export const useFilteredRoutes = () => {

return routes.filter((route) => {
if (!route?.slug) return false;
if (route.tenantOwner && profile?.role) {
if (route.tenantOwner) {
if (!profile?.role) return false;

return [RolesTypes.USER_ADMIN, RolesTypes.OWNER].includes(profile?.role);
}

Expand Down
Loading