Working changes

Author: james-isbister

src/api/entitycore/types/extended-entity-type.ts

@@ -9,6 +9,7 @@ export const ExtendedEntitiesTypeDict = {
   MEModelCircuitSimulation: 'me_model_circuit_simulation',
   PairedNeuronCircuitSimulation: 'paired_neuron_circuit_simulation',
   SmallMicrocircuitSimulation: 'small_microcircuit_simulation',
+  IonChannelFitting: 'ion_channel_fitting',
   MicrocircuitSimulation: 'micro_circuit_simulation',
   NGVCircuit: 'ngv_circuit', // this is temporary
   BrainRegion: 'brain_region', // this is temporary

src/app/app/virtual-lab/[virtualLabId]/[projectId]/workflows/simulate/configure/ion-channel-recording/[id]/page.tsx

@@ -0,0 +1,76 @@
+'use client';
+
+import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
+import { notFound } from 'next/navigation';
+import { use } from 'react';
+
+import { getCircuit } from '@/api/entitycore/queries/model/circuit';
+import { resolveSimulationByCampaignId } from '@/entity-configuration/domain/simulation/small-microcircuit-simulation';
+import SimulationConfig from '@/features/small-microcircuit';
+import { keyBuilder } from '@/ui/use-query-keys/data';
+
+import type { ServerSideComponentProp, WorkspaceContext } from '@/types/common';
+import type { WorkflowSimulatePanelKeys } from '@/ui/segments/workflows/simulate/single-neuron/shared/constant';
+import type { ExperimentStepKeys } from '@/ui/segments/workflows/simulate/single-neuron/shared/elements/menu';
+
+export default function Page({
+  searchParams,
+  params: pathParams,
+}: ServerSideComponentProp<
+  WorkspaceContext & { id: string },
+  {
+    step: ExperimentStepKeys;
+    sessionId: string;
+    panel: WorkflowSimulatePanelKeys;
+    initialCampaignId: string;
+  }
+>) {
+  const queryParams = use(searchParams);
+  const { initialCampaignId } = queryParams;
+  const { virtualLabId, projectId, id: modelId } = use(pathParams);
+
+  let sessionId = queryParams?.sessionId;
+  if (!sessionId) sessionId = crypto.randomUUID();
+
+  const { data: entity } = useSuspenseQuery({
+    queryKey: [modelId],
+    queryFn: () =>
+      modelId ? getCircuit({ id: "cbeba583-c905-47c6-96b7-b7923d4fcefd", context: { virtualLabId, projectId } }) : null,
+  });
+
+  const {
+    data: campaignData,
+    error,
+    isLoading,
+  } = useQuery({
+    queryKey: keyBuilder.simCampaign({ entityId: initialCampaignId }),
+    queryFn: async () => {
+      if (!initialCampaignId) return null;
+      return await resolveSimulationByCampaignId({
+        id: initialCampaignId,
+        context: { virtualLabId, projectId },
+      });
+    },
+  });
+
+  if (error || !entity) {
+    return notFound();
+  }
+
+  if (
+    !initialCampaignId ||
+    (initialCampaignId && !isLoading && campaignData && campaignData.config.form)
+  ) {
+    return (
+      <div className="border-neutral-2 ml-2 h-full rounded-2xl border pt-3">
+        <SimulationConfig
+          modelId={entity.id}
+          virtualLabId={virtualLabId}
+          projectId={projectId}
+          initialConfig={campaignData?.config.form}
+          className="px-10 pt-2"
+        />
+      </div>
+    );
+  }
+}

src/features/small-microcircuit/_components/hooks/schema.ts

@@ -27,8 +27,9 @@ export function useObioneJsonSchema(
         const json = await res.json();
         const dereferenced = await $RefParser.dereference(json);
         const schemaName = match(modelEntityType)
-          .with(EntityTypeDict.Circuit, () => 'IonChannelFittingScanConfig')
+          .with(EntityTypeDict.Circuit, () => 'CircuitSimulationGenerationScanConfig')
           .with(EntityTypeDict.Memodel, () => 'MEModelSimulationScanConfig')
+          .with(EntityTypeDict.IonChannelRecording, () => 'IonChannelFittingScanConfig')
           .otherwise(() => {
             throw new Error(`Unsupported entity type: ${modelEntityType}`);
           });
@@ -80,6 +81,7 @@ export function useObioneJsonSchema(
               const formCircuitType = match(modelEntityType)
                 .with(EntityTypeDict.Circuit, () => 'CircuitFromID')
                 .with(EntityTypeDict.Memodel, () => 'MEModelFromID')
+                .with(EntityTypeDict.IonChannelRecording, () => 'CircuitFromID')
                 .otherwise(() => {
                   throw new Error(`Unsupported entity type: ${modelEntityType}`);
                 });

src/features/small-microcircuit/index.tsx

@@ -132,6 +132,7 @@ export default function SimulationCampaignConfiguration({
   const apiPath = match(model.type)
     .with(EntityTypeDict.Circuit, () => 'circuit-simulation-scan-config-generate-grid')
     .with(EntityTypeDict.Memodel, () => 'me-model-simulation-scan-config-generate-grid')
+    .with(EntityTypeDict.IonChannelModel, () => 'ion-channel-model-simulation-scan-config-generate-grid')
     .otherwise(() => {
       throw new Error(`Unsupported model type ${model.type}`);
     });

src/ui/segments/detail-view/overview/index.tsx

@@ -85,7 +85,7 @@ export default async function Overview({
   if (
     extendedType === ExtendedEntitiesTypeDict.SmallMicrocircuitSimulation ||
     extendedType === ExtendedEntitiesTypeDict.PairedNeuronCircuitSimulation ||
-    extendedType === ExtendedEntitiesTypeDict.MEModelCircuitSimulation
+    extendedType === ExtendedEntitiesTypeDict.MEModelCircuitSimulation ||
   ) {
     let config: AwaitedType<ReturnType<typeof resolveSimulationByCampaignId>>;
 

src/ui/segments/project/activities/elements/helpers.tsx

@@ -104,6 +104,12 @@ export const Scales: Partial<
     simulate: ExtendedEntitiesTypeDict.PairedNeuronCircuitSimulation,
     link: 'workflows',
   },
+  [ExtendedEntitiesTypeDict.IonChannelModel]: {
+    title: 'Ion channel models',
+    build: null,
+    simulate: ExtendedEntitiesTypeDict.IonChannelFitting,
+    link: 'explore',
+  },
 };
 
 // here the function should return the available activities for the scale as build , simulate

src/ui/segments/workflows/elements/helpers.tsx

@@ -59,17 +59,17 @@ export const EntityWorkflowConfiguration: Partial<
     }
   >
 > = {
-  [ExtendedEntitiesTypeDict.IonChannelModel]: {
+  [ExtendedEntitiesTypeDict.IonChannelRecording]: {
     group: EntityScopeDict.Subcellular,
     label: 'Ion channel',
     properties: {
       build: {
         disabled: true,
-        type: ExtendedEntitiesTypeDict.IonChannelModel,
+        type: ExtendedEntitiesTypeDict.IonChannelRecording,
       },
       simulate: {
-        disabled: true,
-        type: ExtendedEntitiesTypeDict.IonChannelModel,
+        disabled: false,
+        type: ExtendedEntitiesTypeDict.IonChannelFitting,
       },
     },
   },