Fix dashboard access (#7360)

* Fix dashboard access * fixed scope * change polling interval * fix pr comment * renamed to useSpaceTemplate*s*ManagerQuery --------- Co-authored-by: Carlos Cano <carlos@alkem.io>
alkem-io · Dec 20, 2024 · 2b6a7d5 · 2b6a7d5
1 parent cb503b4
commit 2b6a7d5
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 60 deletions.
diff --git a/src/core/apollo/generated/apollo-hooks.ts b/src/core/apollo/generated/apollo-hooks.ts
@@ -2150,16 +2150,6 @@ export const SpaceInfoFragmentDoc = gql`
         myPrivileges
       }
     }
-    templatesManager {
-      id
-      templatesSet {
-        id
-        authorization {
-          id
-          myPrivileges
-        }
-      }
-    }
     visibility
   }
   ${SpaceDetailsFragmentDoc}
@@ -16362,6 +16352,76 @@ export function refetchSpaceUrlQuery(variables: SchemaTypes.SpaceUrlQueryVariabl
   return { query: SpaceUrlDocument, variables: variables };
 }
 
+export const SpaceTemplatesManagerDocument = gql`
+  query SpaceTemplatesManager($spaceNameId: UUID_NAMEID!) {
+    space(ID: $spaceNameId) {
+      id
+      templatesManager {
+        id
+        templatesSet {
+          id
+          authorization {
+            id
+            myPrivileges
+          }
+        }
+      }
+    }
+  }
+`;
+
+/**
+ * __useSpaceTemplatesManagerQuery__
+ *
+ * To run a query within a React component, call `useSpaceTemplatesManagerQuery` and pass it any options that fit your needs.
+ * When your component renders, `useSpaceTemplatesManagerQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useSpaceTemplatesManagerQuery({
+ *   variables: {
+ *      spaceNameId: // value for 'spaceNameId'
+ *   },
+ * });
+ */
+export function useSpaceTemplatesManagerQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    SchemaTypes.SpaceTemplatesManagerQuery,
+    SchemaTypes.SpaceTemplatesManagerQueryVariables
+  >
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<SchemaTypes.SpaceTemplatesManagerQuery, SchemaTypes.SpaceTemplatesManagerQueryVariables>(
+    SpaceTemplatesManagerDocument,
+    options
+  );
+}
+
+export function useSpaceTemplatesManagerLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    SchemaTypes.SpaceTemplatesManagerQuery,
+    SchemaTypes.SpaceTemplatesManagerQueryVariables
+  >
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<SchemaTypes.SpaceTemplatesManagerQuery, SchemaTypes.SpaceTemplatesManagerQueryVariables>(
+    SpaceTemplatesManagerDocument,
+    options
+  );
+}
+
+export type SpaceTemplatesManagerQueryHookResult = ReturnType<typeof useSpaceTemplatesManagerQuery>;
+export type SpaceTemplatesManagerLazyQueryHookResult = ReturnType<typeof useSpaceTemplatesManagerLazyQuery>;
+export type SpaceTemplatesManagerQueryResult = Apollo.QueryResult<
+  SchemaTypes.SpaceTemplatesManagerQuery,
+  SchemaTypes.SpaceTemplatesManagerQueryVariables
+>;
+export function refetchSpaceTemplatesManagerQuery(variables: SchemaTypes.SpaceTemplatesManagerQueryVariables) {
+  return { query: SpaceTemplatesManagerDocument, variables: variables };
+}
+
 export const SpaceHostDocument = gql`
   query SpaceHost($spaceNameId: UUID_NAMEID!) {
     space(ID: $spaceNameId) {

diff --git a/src/core/apollo/generated/graphql-schema.ts b/src/core/apollo/generated/graphql-schema.ts
@@ -21239,25 +21239,6 @@ export type SpaceProviderQuery = {
         | { __typename?: 'Authorization'; id: string; myPrivileges?: Array<AuthorizationPrivilege> | undefined }
         | undefined;
     };
-    templatesManager?:
-      | {
-          __typename?: 'TemplatesManager';
-          id: string;
-          templatesSet?:
-            | {
-                __typename?: 'TemplatesSet';
-                id: string;
-                authorization?:
-                  | {
-                      __typename?: 'Authorization';
-                      id: string;
-                      myPrivileges?: Array<AuthorizationPrivilege> | undefined;
-                    }
-                  | undefined;
-              }
-            | undefined;
-        }
-      | undefined;
     profile: {
       __typename?: 'Profile';
       id: string;
@@ -21320,6 +21301,37 @@ export type SpaceUrlQuery = {
   space: { __typename?: 'Space'; id: string; profile: { __typename?: 'Profile'; id: string; url: string } };
 };
 
+export type SpaceTemplatesManagerQueryVariables = Exact<{
+  spaceNameId: Scalars['UUID_NAMEID'];
+}>;
+
+export type SpaceTemplatesManagerQuery = {
+  __typename?: 'Query';
+  space: {
+    __typename?: 'Space';
+    id: string;
+    templatesManager?:
+      | {
+          __typename?: 'TemplatesManager';
+          id: string;
+          templatesSet?:
+            | {
+                __typename?: 'TemplatesSet';
+                id: string;
+                authorization?:
+                  | {
+                      __typename?: 'Authorization';
+                      id: string;
+                      myPrivileges?: Array<AuthorizationPrivilege> | undefined;
+                    }
+                  | undefined;
+              }
+            | undefined;
+        }
+      | undefined;
+  };
+};
+
 export type SpaceInfoFragment = {
   __typename?: 'Space';
   visibility: SpaceVisibility;
@@ -21358,21 +21370,6 @@ export type SpaceInfoFragment = {
       | { __typename?: 'Authorization'; id: string; myPrivileges?: Array<AuthorizationPrivilege> | undefined }
       | undefined;
   };
-  templatesManager?:
-    | {
-        __typename?: 'TemplatesManager';
-        id: string;
-        templatesSet?:
-          | {
-              __typename?: 'TemplatesSet';
-              id: string;
-              authorization?:
-                | { __typename?: 'Authorization'; id: string; myPrivileges?: Array<AuthorizationPrivilege> | undefined }
-                | undefined;
-            }
-          | undefined;
-      }
-    | undefined;
   profile: {
     __typename?: 'Profile';
     id: string;

diff --git a/src/domain/journey/space/SpaceContext/SpaceContext.tsx b/src/domain/journey/space/SpaceContext/SpaceContext.tsx
@@ -2,7 +2,7 @@ import { ApolloError } from '@apollo/client';
 import React, { FC, useMemo } from 'react';
 import { useUrlParams } from '@/core/routing/useUrlParams';
 import { useConfig } from '@/domain/platform/config/useConfig';
-import { useSpaceProviderQuery } from '@/core/apollo/generated/apollo-hooks';
+import { useSpaceProviderQuery, useSpaceTemplatesManagerQuery } from '@/core/apollo/generated/apollo-hooks';
 import {
   AuthorizationPrivilege,
   CommunityMembershipStatus,
@@ -111,11 +111,26 @@ const SpaceContextProvider: FC<SpaceProviderProps> = ({ children }) => {
 
   const canReadSubspaces = spacePrivileges.includes(AuthorizationPrivilege.Read);
   const canCreateSubspaces = spacePrivileges.includes(AuthorizationPrivilege.CreateSubspace);
-  const canCreateTemplates =
-    data?.space.templatesManager?.templatesSet?.authorization?.myPrivileges?.includes(AuthorizationPrivilege.Create) ??
-    false;
-  const canCreate = spacePrivileges.includes(AuthorizationPrivilege.Create);
 
+  // A member has READ and an Admin can also access it, this is more of a temporary solution
+  const canAccessTemplatesManager =
+    space?.community.roleSet.myMembershipStatus === CommunityMembershipStatus.Member ||
+    spacePrivileges.includes(AuthorizationPrivilege.Grant);
+  let canCreateTemplates = false;
+
+  const { data: templatesManagerData } = useSpaceTemplatesManagerQuery({
+    variables: { spaceNameId },
+    skip: !spaceNameId || !canAccessTemplatesManager,
+  });
+
+  if (canAccessTemplatesManager) {
+    canCreateTemplates =
+      templatesManagerData?.space.templatesManager?.templatesSet?.authorization?.myPrivileges?.includes(
+        AuthorizationPrivilege.Create
+      ) ?? false;
+  }
+
+  const canCreate = spacePrivileges.includes(AuthorizationPrivilege.Create);
   const communityPrivileges = space?.community?.authorization?.myPrivileges ?? NO_PRIVILEGES;
 
   const permissions = useMemo<SpacePermissions>(() => {

diff --git a/src/domain/journey/space/SpaceContext/spaceProvider.graphql b/src/domain/journey/space/SpaceContext/spaceProvider.graphql
@@ -14,6 +14,22 @@ query SpaceUrl($spaceNameId: UUID_NAMEID!) {
   }
 }
 
+query SpaceTemplatesManager($spaceNameId: UUID_NAMEID!) {
+  space(ID: $spaceNameId) {
+    id
+    templatesManager {
+      id
+      templatesSet {
+        id
+        authorization {
+          id
+          myPrivileges
+        }
+      }
+    }
+  }
+}
+
 fragment SpaceInfo on Space {
   ...SpaceDetails
   authorization {
@@ -46,16 +62,6 @@ fragment SpaceInfo on Space {
       myPrivileges
     }
   }
-  templatesManager {
-    id
-    templatesSet{
-      id
-      authorization {
-        id
-        myPrivileges
-      }
-    }
-  }
 
   visibility
 }

diff --git a/src/main/inAppNotifications/useInAppNotifications.ts b/src/main/inAppNotifications/useInAppNotifications.ts
@@ -15,7 +15,7 @@ import {
 import { useUserContext } from '@/domain/community/user';
 import { useInAppNotificationsContext } from './InAppNotificationsContext';
 
-const POLLING_INTERVAL = 5 * 1000; // 5 seconds
+const POLLING_INTERVAL = 15 * 1000; // 15 seconds
 
 export interface InAppNotificationProps {
   id: string;