fix alterenate morho

fix profile in space switcher

Author: bilalesi

src/api/entitycore/types/entities/circuit.ts

@@ -132,6 +132,7 @@ export type SonataCircuitComponentConfig = {
   };
   synaptic_models_dir: string;
   templates_dir: string;
+  alternate_morphologies?: Record<string, string>;
 };
 
 export type ICircuitSonataConfiguration = {

src/ui/segments/explore/circuit/elements/download-panel/connectivity-matrices.tsx

@@ -1,7 +1,8 @@
-import { useEffect, useState } from 'react';
+import { useQuery } from '@tanstack/react-query';
 import { useParams } from 'next/navigation';
 import { match, P } from 'ts-pattern';
 import { useSetAtom } from 'jotai';
+import { useEffect } from 'react';
 
 import isString from 'lodash/isString';
 import flatMap from 'lodash/flatMap';
@@ -10,171 +11,161 @@ import map from 'lodash/map';
 import get from 'lodash/get';
 
 import { connectivityMetricsContentConfiguration } from '@/ui/segments/explore/circuit/elements/download-panel/content-configuration';
+import { NetworkConfigItem } from '@/ui/segments/explore/circuit/elements/download-panel/config-item';
+import { SkeletonItem } from '@/ui/segments/explore/circuit/elements/download-panel/skeleton';
+import { Error } from '@/ui/segments/explore/circuit/elements/download-panel/error';
 import {
   countConnectivityPaths,
   resolveCircuitConfigAndDirectory,
   updateFileCounterAtom,
 } from '@/ui/segments/explore/circuit/elements/download-panel/helpers';
-import { NetworkConfigItem } from '@/ui/segments/explore/circuit/elements/download-panel/config-item';
-import { SkeletonItem } from '@/ui/segments/explore/circuit/elements/download-panel/skeleton';
-import { Error } from '@/ui/segments/explore/circuit/elements/download-panel/error';
 import { AssetLabel } from '@/api/entitycore/types/shared/global';
 import { getAssetElement } from '@/api/entitycore/utils';
+import { keyBuilder } from '@/ui/use-query-keys/data';
 
 import type { ConfigItemProps } from '@/ui/segments/explore/circuit/elements/download-panel/config-item';
-import type { DirectoryListContent } from '@/api/entitycore/types/shared/global';
 import type { WorkspaceContext } from '@/types/common';
 import type {
-  ICircuit,
   CircuitConnectivityMatricesConfiguration,
+  ICircuit,
 } from '@/api/entitycore/types/entities/circuit';
 
 const AssetDefaultPath = 'matrix_config.json';
 
 export default function ConnectivityMatrices({ circuit }: { circuit: ICircuit }) {
   const { virtualLabId, projectId } = useParams<WorkspaceContext>();
-  const [connectivityMetrics, mutateConnectivityMetrics] = useState<{
-    directory: DirectoryListContent['files'] | null;
-    config: CircuitConnectivityMatricesConfiguration | null;
-    loading: boolean;
-    error?:
-      | {
-          directory: string | null;
-          config: string | null;
-        }
-      | string
-      | null;
-  }>({
-    directory: {},
-    config: {},
-    loading: false,
-    error: null,
-  });
+
   const updateFileCounter = useSetAtom(updateFileCounterAtom(circuit.id));
   const assets = circuit?.assets;
   const configAsset = getAssetElement({
     assets,
     filter: (asset) => asset.label === AssetLabel.circuit_connectivity_matrices,
   });
 
-  useEffect(() => {
-    const getConnectivityMetrics = async () => {
-      mutateConnectivityMetrics({
-        loading: true,
-        directory: null,
-        config: null,
-      });
-      if (circuit && configAsset?.id) {
-        const result =
-          await resolveCircuitConfigAndDirectory<CircuitConnectivityMatricesConfiguration>({
-            entityId: circuit.id,
-            assetId: configAsset.id,
-            assetPath: AssetDefaultPath,
-            context: { virtualLabId, projectId },
-          });
+  const connectivityMetrics = useQuery({
+    queryKey: keyBuilder.circuitConfigAndDirectory({
+      entityId: circuit.id,
+      assetId: configAsset!.id,
+      assetPath: AssetDefaultPath,
+      context: { virtualLabId, projectId },
+    }),
+    queryFn: () =>
+      resolveCircuitConfigAndDirectory<CircuitConnectivityMatricesConfiguration>({
+        entityId: circuit.id,
+        assetId: configAsset!.id,
+        assetPath: AssetDefaultPath,
+        context: { virtualLabId, projectId },
+      }),
+    enabled: !!circuit && !!configAsset!.id,
+    select: (result) => {
+      return {
+        directory: result.directory,
+        config: result.config,
+        connectivity_metrics: countConnectivityPaths(result.config),
+        error: result.error,
+      };
+    },
+  });
 
-        mutateConnectivityMetrics({
-          directory: result.directory,
-          config: result.config,
-          error: result.error,
-          loading: false,
-        });
-        updateFileCounter({ connectivity_metrics: countConnectivityPaths(result.config) });
-      } else {
-        mutateConnectivityMetrics({
-          directory: null,
-          config: null,
-          error: 'Could not find circuit connectivity matrices asset',
-          loading: false,
-        });
-      }
-    };
-    getConnectivityMetrics();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [circuit?.id, configAsset?.id, virtualLabId, projectId]);
+  useEffect(() => {
+    updateFileCounter({
+      connectivity_metrics: connectivityMetrics.data?.connectivity_metrics ?? 0,
+    });
+  }, [connectivityMetrics.data?.connectivity_metrics, updateFileCounter]);
 
   return match(connectivityMetrics)
-    .with({ loading: true }, () => <SkeletonItem />)
-    .with({ error: P.string.select() }, () => {
-      let err = '';
-      if (isString(connectivityMetrics.error)) err = connectivityMetrics.error;
-      else if (connectivityMetrics.error?.directory && connectivityMetrics.error?.config)
-        err = 'Failed to load connectivity matrices configuration and directory assets';
-      else if (connectivityMetrics.error?.directory) err = connectivityMetrics.error.directory;
-      else if (connectivityMetrics.error?.config) err = connectivityMetrics.error.config;
-      return (
-        <Error
-          icon={null}
-          title="Connectivity matrices"
-          description={err}
-          cls={{ container: 'text-white' }}
-        />
-      );
-    })
-    .with({ directory: P.nullish, config: P.nonNullable }, () => (
+    .with({ isLoading: true }, () => <SkeletonItem />)
+    .with(
+      { data: { error: P.string.select('error') }, error: P.select('catchError') },
+      ({ error }) => {
+        let err = '';
+        if (isString(connectivityMetrics.error)) err = connectivityMetrics.error;
+        else if (error?.directory && error?.config)
+          err = 'Failed to load connectivity matrices configuration and directory assets';
+        else if (error?.directory) err = error.directory;
+        else if (error?.config) err = error.config;
+        return (
+          <Error
+            icon={null}
+            title="Connectivity matrices"
+            description={err}
+            cls={{ container: 'text-white' }}
+          />
+        );
+      }
+    )
+    .with({ data: { directory: P.nullish, config: P.nonNullable } }, () => (
       <Error
         icon={null}
         title="Connectivity matrices"
         description="No assets directory was found"
         cls={{ container: 'text-white' }}
       />
     ))
-    .with({ directory: P.nonNullable, config: P.nullish }, () => (
+    .with({ data: { directory: P.nonNullable, config: P.nullish } }, () => (
       <Error
         icon={null}
         title="Connectivity matrices"
         description="No configuration asset was found"
         cls={{ container: 'text-white' }}
       />
     ))
-    .with({ directory: P.nonNullable, config: P.nonNullable }, ({ directory, config }) => {
-      const items = flatMap(config || {}, (group) =>
-        map(group, ({ path, description }) => {
-          const title = last(path.split('/'));
-          const mimeType = last(title?.split('.'));
-          const asset = {
-            ...get(directory, path, {
-              name: null,
-              size: null,
-              last_modified: null,
-            }),
-            path,
-          };
+    .with(
+      {
+        data: {
+          directory: P.nonNullable.select('directory'),
+          config: P.nonNullable.select('config'),
+        },
+      },
+      ({ directory, config }) => {
+        const items = flatMap(config || {}, (group) =>
+          map(group, ({ path, description }) => {
+            const title = last(path.split('/'));
+            const mimeType = last(title?.split('.'));
+            const asset = {
+              ...get(directory, path, {
+                name: null,
+                size: null,
+                last_modified: null,
+              }),
+              path,
+            };
 
-          return {
-            asset,
-            title,
-            mimeType,
-            description,
-            subItems: null,
-          };
-        })
-      );
-      const fullConfig = Object.assign(connectivityMetricsContentConfiguration, {
-        type: 'connectivity_metrics',
-        showType: 'connectivity matrices',
-        showPrefix: 'Local connectome',
-        count: items.length,
-        items,
-      }) as unknown as Omit<ConfigItemProps, 'className'>;
+            return {
+              asset,
+              title,
+              mimeType,
+              description,
+              subItems: null,
+            };
+          })
+        );
+        const fullConfig = Object.assign(connectivityMetricsContentConfiguration, {
+          type: 'connectivity_metrics',
+          showType: 'connectivity matrices',
+          showPrefix: 'Local connectome',
+          count: items.length,
+          items,
+        }) as unknown as Omit<ConfigItemProps, 'className'>;
 
-      return (
-        <NetworkConfigItem
-          key={fullConfig.key}
-          name={fullConfig.name}
-          description={fullConfig.description}
-          count={fullConfig.count}
-          mimeType={fullConfig.mimeType}
-          items={fullConfig.items}
-          showType={fullConfig.showType}
-          showPrefix={fullConfig.showPrefix}
-          downloadConfig={{
-            entityId: circuit?.id,
-            assetConfigId: configAsset?.id!,
-            context: { virtualLabId, projectId },
-          }}
-        />
-      );
-    })
+        return (
+          <NetworkConfigItem
+            key={fullConfig.key}
+            name={fullConfig.name}
+            description={fullConfig.description}
+            count={fullConfig.count}
+            mimeType={fullConfig.mimeType}
+            items={fullConfig.items}
+            showType={fullConfig.showType}
+            showPrefix={fullConfig.showPrefix}
+            downloadConfig={{
+              entityId: circuit?.id,
+              assetConfigId: configAsset?.id!,
+              context: { virtualLabId, projectId },
+            }}
+          />
+        );
+      }
+    )
     .otherwise(() => null);
 }

src/ui/segments/explore/circuit/elements/download-panel/helpers.ts

@@ -19,6 +19,7 @@ import type { TCircuitContentConfigurationKeys } from '@/features/entities/circu
 import type { DirectoryListContent } from '@/api/entitycore/types/shared/global';
 import type {
   CircuitConnectivityMatricesConfiguration,
+  SonataCircuitComponentConfig,
   SonataCircuitConfigNetworks,
   SonataCircuitNetworkEdgeConfigItem,
   SonataCircuitNetworkNodeConfigItem,
@@ -175,9 +176,10 @@ type PopulationWithMorphology = {
 };
 
 export const extractWithAlternateMorphologies = (
-  sections: Array<SonataCircuitNetworkNodeConfigItem>
+  sections: Array<SonataCircuitNetworkNodeConfigItem>,
+  components?: SonataCircuitComponentConfig | undefined
 ): Record<string, PopulationWithMorphology> => {
-  return sections
+  let alternateMorpho = sections
     .flatMap((section) =>
       map(section.populations, (popValue, popName) => ({
         name: popName,
@@ -192,6 +194,20 @@ export const extractWithAlternateMorphologies = (
       };
       return acc;
     }, {});
+
+  if (Object.keys(alternateMorpho ?? {}).length <= 0) {
+    alternateMorpho = Object.entries(components?.alternate_morphologies ?? {}).reduce(
+      (acc, [key, value]) => {
+        acc[key] = {
+          type: key,
+          alternate_morphologies: value,
+        };
+        return acc;
+      },
+      {} as Record<string, PopulationWithMorphology>
+    );
+  }
+  return alternateMorpho;
 };
 
 export async function resolveCircuitConfigAndDirectory<T>({