Refactor: useExtensionData hook not to change value when colony updates

JoinColony · Oct 14, 2024 · 24c780c · 24c780c
1 parent 787acc6
commit 24c780c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/src/hooks/useExtensionData.ts b/src/hooks/useExtensionData.ts
@@ -11,7 +11,8 @@ import {
   type InstalledExtensionData,
   type AnyExtensionData,
 } from '~types/extensions.ts';
-import { type Colony } from '~types/graphql.ts';
+import { type ColonyRole } from '~types/graphql.ts';
+import { extractColonyRoles } from '~utils/colonyRoles.ts';
 import { getMappedExtensionData } from '~utils/extensions.ts';
 
 export enum ExtensionMethods {
@@ -42,6 +43,11 @@ interface UseExtensionDataReturn {
 const useExtensionData = (extensionId: string): UseExtensionDataReturn => {
   const { colony, refetchColony } = useColonyContext();
 
+  const colonyRoles = useMemo(
+    () => extractColonyRoles(colony.roles),
+    [colony.roles],
+  );
+
   const extensionHash = getExtensionHash(extensionId as Extension);
 
   const {
@@ -66,19 +72,20 @@ const useExtensionData = (extensionId: string): UseExtensionDataReturn => {
     });
   const { version } = versionData?.getCurrentVersionByKey?.items?.[0] || {};
 
-  const extensionConfig = supportedExtensionsConfig.find(
-    (e) => e.extensionId === extensionId,
+  const extensionConfig = useMemo(
+    () => supportedExtensionsConfig.find((e) => e.extensionId === extensionId),
+    [extensionId],
   );
 
   const extensionData = useMemo<AnyExtensionData | null>(
     () =>
       getMappedExtensionData({
-        colony,
+        colonyRoles,
         colonyExtension: rawExtensionData,
         version,
         extensionConfig,
       }),
-    [colony, rawExtensionData, version, extensionConfig],
+    [colonyRoles, rawExtensionData, version, extensionConfig],
   );
 
   const handleRefetch = useCallback(
@@ -88,16 +95,17 @@ const useExtensionData = (extensionId: string): UseExtensionDataReturn => {
         refetchResponse.data.getExtensionByColonyAndHash?.items[0];
 
       if (updatedColonyExtension) {
-        let updatedColony: Colony | null = null;
+        let updatedColonyRoles: ColonyRole[] | null = null;
         if (shouldRefetchPermissions) {
           const colonyRefetchResponse = await refetchColony();
-          updatedColony =
-            colonyRefetchResponse?.data.getColonyByName?.items?.[0] ?? null;
+          const updatedColony =
+            colonyRefetchResponse?.data.getColonyByName?.items?.[0];
+          updatedColonyRoles = extractColonyRoles(updatedColony?.roles);
         }
 
         // Extension is guaranteed to be installed if returned by the query
         return getMappedExtensionData({
-          colony: updatedColony ?? colony,
+          colonyRoles: updatedColonyRoles ?? colonyRoles,
           colonyExtension: updatedColonyExtension,
           version,
           extensionConfig,
@@ -106,7 +114,7 @@ const useExtensionData = (extensionId: string): UseExtensionDataReturn => {
 
       return null;
     },
-    [colony, extensionConfig, refetch, refetchColony, version],
+    [colonyRoles, extensionConfig, refetch, refetchColony, version],
   );
 
   return {

diff --git a/src/hooks/useExtensionsData.ts b/src/hooks/useExtensionsData.ts
@@ -12,6 +12,7 @@ import {
   type InstalledExtensionData,
 } from '~types/extensions.ts';
 import { notNull } from '~utils/arrays/index.ts';
+import { extractColonyRoles } from '~utils/colonyRoles.ts';
 import {
   mapToInstallableExtensionData,
   mapToInstalledExtensionData,
@@ -68,7 +69,7 @@ const useExtensionsData = (): UseExtensionsDataReturn => {
         }
 
         return mapToInstalledExtensionData({
-          colony,
+          colonyRoles: extractColonyRoles(colony.roles),
           extensionConfig,
           colonyExtension: extension,
           version,

diff --git a/src/utils/extensions.ts b/src/utils/extensions.ts
@@ -9,8 +9,7 @@ import {
   type InstalledExtensionData,
   type InstallableExtensionData,
 } from '~types/extensions.ts';
-import { type Colony, type ColonyExtension } from '~types/graphql.ts';
-import { extractColonyRoles } from '~utils/colonyRoles.ts';
+import { type ColonyRole, type ColonyExtension } from '~types/graphql.ts';
 
 import { userHasRole } from './checks/index.ts';
 
@@ -35,12 +34,12 @@ export const mapToInstallableExtensionData = (
 };
 
 export const mapToInstalledExtensionData = ({
-  colony,
+  colonyRoles,
   extensionConfig,
   colonyExtension,
   version,
 }: {
-  colony: Colony;
+  colonyRoles: ColonyRole[];
   extensionConfig: ExtensionConfig;
   colonyExtension: ColonyExtension;
   version: number;
@@ -51,7 +50,7 @@ export const mapToInstalledExtensionData = ({
   const isEnabled = isInitialized && !colonyExtension.isDeprecated;
 
   const extensionRoles = getUserRolesForDomain({
-    colonyRoles: extractColonyRoles(colony.roles),
+    colonyRoles,
     userAddress: colonyExtension.address,
     domainId: Id.RootDomain,
   });
@@ -72,12 +71,12 @@ export const mapToInstalledExtensionData = ({
 };
 
 export const getMappedExtensionData = ({
-  colony,
+  colonyRoles,
   colonyExtension,
   version,
   extensionConfig,
 }: {
-  colony: Colony;
+  colonyRoles: ColonyRole[];
   colonyExtension?: ColonyExtension | null;
   version?: number;
   extensionConfig?: ExtensionConfig;
@@ -88,7 +87,7 @@ export const getMappedExtensionData = ({
 
   if (colonyExtension) {
     return mapToInstalledExtensionData({
-      colony,
+      colonyRoles,
       extensionConfig,
       colonyExtension,
       version,