- {isUserAllowed(profileRolesObject, profileIsAdmin, [`${slug.toUpperCase()}.*`])
+ {isUserAllowed(roles, is_admin, [`${slug.toUpperCase()}.*`])
? (
<>
- {isUserAllowed(profileRolesObject, profileIsAdmin, [`${slug.toUpperCase()}.*`])
+ {isUserAllowed(roles, is_admin, [`${slug.toUpperCase()}.*`])
?
: null
}
diff --git a/src/app-pages/project/index.jsx b/src/app-pages/project/index.jsx
index c58133f2..17533aea 100644
--- a/src/app-pages/project/index.jsx
+++ b/src/app-pages/project/index.jsx
@@ -21,20 +21,21 @@ import SecondaryNavBar from '../../app-components/navigation/secondaryNavBar';
import QaQc from './qa-qc';
import Uploader from './uploader';
import { isUserAllowed } from '../../app-components/role-filter';
+import { extractRolesObject, useGetMyProfile } from '../../app-services/collections/profiles.ts';
const Title = ({ text, icon }) => (
{icon} {text}
);
const Project = connect(
- 'selectProfileRolesObject',
- 'selectProfileIsAdmin',
'selectProjectsByRoute',
({
- profileRolesObject,
- profileIsAdmin,
projectsByRoute: project,
}) => {
+ const { data: profile } = useGetMyProfile({});
+ const { is_admin } = profile || {};
+ const roles = extractRolesObject(profile);
+
if (!project) {
return
Loading Project Details...
;
}
@@ -58,7 +59,7 @@ const Project = connect(
uri: '#all-instruments',
}],
// Active if User === Project Member
- ...isUserAllowed(profileRolesObject, profileIsAdmin, [`${project.slug.toUpperCase()}.*`]) ? [{
+ ...isUserAllowed(roles, is_admin, [`${project.slug.toUpperCase()}.*`]) ? [{
title:
} />,
content:
,
paddingSmall: true,
@@ -75,7 +76,7 @@ const Project = connect(
uri: '#qa-qc',
}] : [],
// Active if User === Project Admin
- ...isUserAllowed(profileRolesObject, profileIsAdmin, [`${project.slug.toUpperCase()}.ADMIN`]) ? [{
+ ...isUserAllowed(roles, is_admin, [`${project.slug.toUpperCase()}.ADMIN`]) ? [{
title:
} />,
content:
,
paddingSmall: true,
diff --git a/src/app-services/collections/profiles.ts b/src/app-services/collections/profiles.ts
new file mode 100644
index 00000000..8005c4c4
--- /dev/null
+++ b/src/app-services/collections/profiles.ts
@@ -0,0 +1,97 @@
+import { useQuery } from '@tanstack/react-query';
+import { toast } from 'react-toastify';
+
+import { apiGet } from '../fetch-helpers';
+import { getToken } from '../../userService';
+
+type Profile = {
+ id: string,
+ tokens: string[],
+ is_admin: boolean,
+ roles: string[],
+ username: string,
+ display_name: string,
+ email: string,
+}
+
+const handleResponse = (data: Promise
) => {
+ return data.then(
+ (value) => Promise.resolve(value),
+ (reason) => {
+ console.log('test reason:', reason);
+ toast.error(
+ `test error: ${reason}`,
+ {
+ autoClose: 7500,
+ closeOnClick: true,
+ draggable: true,
+ }
+ );
+ return Promise.reject(reason);
+ },
+ );
+};
+
+export const useGetMyProfile = ({ showToast }: { showToast?: boolean}, opts: ClientQueryOptions) => {
+ const uri = `/my_profile`;
+ const token = getToken();
+
+ return useQuery({
+ queryKey: [`my_profile`, token],
+ queryFn: () => {
+ const data = apiGet(uri);
+
+ if (showToast) {
+ return handleResponse(data);
+ } else {
+ return data;
+ }
+ },
+ // staleTime: (60*1000),
+ ...opts,
+ });
+};
+
+/* -- If a use case exists to manually create a profile, uncomment this: -- */
+// export const useCreateProfile = (toastId: string) => {
+// return useMutation({
+// mutationFn: () => {
+// const uri = `/profiles`;
+
+// return apiPost(uri);
+// },
+// onError: (err, __, _ctx) => {
+// toast.update(toastId, {
+// render: 'Failed to create MIDAS profile.',
+// type: 'error',
+// isLoading: false,
+// autoClose: 5000,
+// closeOnClick: true,
+// draggable: true,
+// });
+
+// return { error: 'Failed to Create MIDAS Profile', _raw: err };
+// },
+// onSuccess: (body, _, _ctx) => {
+// return body;
+// },
+// });
+// };
+
+/* -- Helper Functions -- */
+
+export const extractRolesObject = (profile: Profile) => {
+ const { roles } = profile || {};
+ if (!roles) return null;
+
+ return roles.reduce((accum, elem) => {
+ const groupRole = elem.split('.');
+ const group = groupRole[0];
+ const role = groupRole[1];
+
+ return {
+ ...accum,
+ [group]: (accum[group] || []).concat([role]),
+ };
+ }, {} as Record);
+};
diff --git a/src/app-services/fetch-helpers.ts b/src/app-services/fetch-helpers.ts
index a634393c..e8862e3e 100644
--- a/src/app-services/fetch-helpers.ts
+++ b/src/app-services/fetch-helpers.ts
@@ -32,7 +32,10 @@ export const commonFetch = async (root: string, path: string, options: OptsType)
const res = await fetch(`${root}${path}`, options);
if (res.status === 204) return {} as JSON;
- else if (!res.ok) throw new Error(res.statusText);
+ else if (!res.ok) {
+ console.log('test res.headers:', res);
+ throw new Error(res.headers.get('RequestID') || 'An Error Has Occured');
+ }
return (await res.json()) as JSON;
};