Working changes

Author: james-isbister

.env.development

@@ -11,7 +11,8 @@ NEXT_PUBLIC_SMALL_SCALE_SIMULATOR_URL=https://staging.openbraininstitute.org/api
 NEXT_PUBLIC_CELL_SVC_BASE_URL=https://staging.openbraininstitute.org/api/circuit
 NEXT_PUBLIC_THUMBNAIL_GENERATION_BASE_URL=https://staging.openbraininstitute.org/api/thumbnail-generation
 NEXT_PUBLIC_VIRTUAL_LAB_API_URL=https://staging.openbraininstitute.org/api/virtual-lab-manager
-NEXT_PUBLIC_OBI_ONE_URL=https://staging.openbraininstitute.org/api/obi-one
+# NEXT_PUBLIC_OBI_ONE_URL=https://staging.openbraininstitute.org/api/obi-one
+NEXT_PUBLIC_OBI_ONE_URL=http://127.0.0.1:8100
 NEXT_PUBLIC_NOTEBOOK_SERVICE_BASE_URL=https://staging.openbraininstitute.org/api/notebook_service
 
 MAILCHIMP_API_KEY='dummy'

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

@@ -27,7 +27,7 @@ export function useObioneJsonSchema(
         const json = await res.json();
         const dereferenced = await $RefParser.dereference(json);
         const schemaName = match(modelEntityType)
-          .with(EntityTypeDict.Circuit, () => 'CircuitSimulationScanConfig')
+          .with(EntityTypeDict.Circuit, () => 'IonChannelFittingScanConfig')
           .with(EntityTypeDict.Memodel, () => 'MEModelSimulationScanConfig')
           .otherwise(() => {
             throw new Error(`Unsupported entity type: ${modelEntityType}`);
@@ -122,6 +122,7 @@ export function useObioneJsonSchema(
   return {
     schema,
     refLabels: schema?.default_block_reference_labels,
+    blockOrdering: schema?.block_block_group_order,
     referenceTypesToConfigKeys,
     referenceTypesToTitles,
   };

src/features/small-microcircuit/_components/utils.ts

@@ -24,26 +24,30 @@ export const ORDERING: Record<string, { order: number; category: string }> = {
     order: 1,
     category: 'Setup',
   },
-  stimuli: {
+  equations: {
     order: 2,
-    category: 'Stimuli & Recordings',
-  },
-  recordings: {
-    order: 3,
-    category: 'Stimuli & Recordings',
-  },
-  neuron_sets: {
-    order: 4,
-    category: 'Circuit components',
-  },
-  timestamps: {
-    order: 5,
-    category: 'Events',
-  },
-  synaptic_manipulations: {
-    order: 6,
-    category: 'Circuit components',
+    category: 'Equations',
   },
+  // stimuli: {
+  //   order: 3,
+  //   category: 'Stimuli & Recordings',
+  // },
+  // recordings: {
+  //   order: 4,
+  //   category: 'Stimuli & Recordings',
+  // },
+  // neuron_sets: {
+  //   order: 5,
+  //   category: 'Circuit components',
+  // },
+  // timestamps: {
+  //   order: 6,
+  //   category: 'Events',
+  // },
+  // synaptic_manipulations: {
+  //   order: 7,
+  //   category: 'Circuit components',
+  // },
 };
 
 export const CATEGORIES: string[] = uniq(Object.values(ORDERING).map((o) => o.category));

src/features/small-microcircuit/index.tsx

@@ -86,7 +86,7 @@ export default function SimulationCampaignConfiguration({
   const initialConfigValidated = useRef(false);
   const [atomsMap, setAtomsMap] = useState<AtomsMap>({});
 
-  const { schema, refLabels, referenceTypesToConfigKeys, referenceTypesToTitles } =
+  const { schema, refLabels, blockOrdering, referenceTypesToConfigKeys, referenceTypesToTitles } =
     useObioneJsonSchema(modelId, model.type, notification, setAtomsMap, initialConfig);
 
   const selectedCatSchema = schema?.properties?.[configTab]?.additionalProperties?.oneOf?.find(