Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
"date-fns": "^4.1.0",
"deepdash-es": "^5.3.9",
"distinct-colors": "^3.0.0",
"elastic-builder": "^2.20.0",
"embla-carousel-react": "^8.6.0",
"embla-carousel-wheel-gestures": "^8.1.0",
"fast-csv": "^5.0.2",
Expand Down Expand Up @@ -111,6 +110,7 @@
"nextstepjs": "^2.1.1",
"nuqs": "^2.4.1",
"optics-ts": "^2.4.0",
"p-props": "^6.0.0",
"pako": "^2.1.0",
"performant-array-to-tree": "^1.11.0",
"plotly.js-dist-min": "^2.35.3",
Expand Down
70 changes: 17 additions & 53 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions src/api/entitycore/transformers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import map from 'lodash/map';
import sortBy from 'lodash/sortBy';
import isEmpty from 'lodash/isEmpty';
import sortBy from 'lodash/sortBy';
import omit from 'lodash/omit';
import map from 'lodash/map';

import type { Agent, IContributor } from '@/api/entitycore/types/shared/global';
import type { CoreFilter } from '@/entity-configuration/definitions/types';
Expand Down Expand Up @@ -157,3 +158,11 @@ function resolveAgentName(agent: Agent) {
return '';
}
}

export function discardBrainRegionQueryParams(filters?: Record<string, any>) {
return omit(filters, [
'within_brain_region_hierarchy_id',
'within_brain_region_brain_region_id',
'within_brain_region_ascendants',
]);
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ const AllowedEntities = [
ExtendedEntitiesTypeDict.Memodel,
ExtendedEntitiesTypeDict.Circuit,
ExtendedEntitiesTypeDict.Emodel,
ExtendedEntitiesTypeDict.SingleNeuronSynaptomeSimulation,
ExtendedEntitiesTypeDict.PairedNeuronCircuitSimulation,
ExtendedEntitiesTypeDict.SmallMicrocircuitSimulation,
ExtendedEntitiesTypeDict.SingleNeuronSimulation,
] as const;

export default async function Page({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import keyBy from 'lodash/keyBy';

import { getCircuitSimulationExecutions } from '@/api/entitycore/queries/simulation/circuit-simulation-execution';
import { getCircuitSimulations } from '@/api/entitycore/queries/simulation/circuit-simulation';
import { ExtendedEntitiesTypeDict } from '@/api/entitycore/types/extended-entity-type';
import { CircuitScaleDictionary } from '@/api/entitycore/types/entities/circuit';
import { discardBrainRegionQueryParams } from '@/api/entitycore/transformers';
import { getCircuits } from '@/api/entitycore/queries/model/circuit';
import { EntityTypeDict } from '@/api/entitycore/types/entity-type';
import { AssetLabel } from '@/api/entitycore/types/shared/global';
import { ExtendedEntitiesTypeDict } from '@/api/entitycore/types/extended-entity-type';
import { downloadAsset } from '@/api/entitycore/queries/assets';
import { EntitySlug } from '@/entity-configuration/domain/slug';
import { getAssetElement } from '@/api/entitycore/utils';
Expand Down Expand Up @@ -38,6 +39,9 @@ async function resolveSimulationCampaigns({
filters?: Partial<ICircuitSimulationCampaignFilter>;
circuitFilter?: Partial<ICircuitFilter>;
}) {
// eslint-disable-next-line no-param-reassign
filters = discardBrainRegionQueryParams(filters);

const source = await getCircuitSimulationCampaigns({
context,
withFacets,
Expand Down Expand Up @@ -128,7 +132,7 @@ export async function resolveSimulationByCampaignId({

export const PairedNeuronCircuitSimulation: EntityCoreTypeConfig<ICircuitSimulationCampaign> = {
group: EntityTypeGroup.Simulations,
title: 'Paired Neurons Simulation',
title: 'Paired neurons simulation',
extendedType: ExtendedEntitiesTypeDict.PairedNeuronCircuitSimulation,
type: EntityTypeDict.SimulationCampaign,
slug: EntitySlug.PairedNeuronCircuitSimulation,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import keyBy from 'lodash/keyBy';
import { getCircuitSimulationExecutions } from '@/api/entitycore/queries/simulation/circuit-simulation-execution';
import { getCircuitSimulations } from '@/api/entitycore/queries/simulation/circuit-simulation';
import { ExtendedEntitiesTypeDict } from '@/api/entitycore/types/extended-entity-type';
import { discardBrainRegionQueryParams } from '@/api/entitycore/transformers';
import { EntityTypeGroup } from '@/entity-configuration/domain/group';
import { getCircuits } from '@/api/entitycore/queries/model/circuit';
import { EntityTypeDict } from '@/api/entitycore/types/entity-type';
Expand Down Expand Up @@ -34,6 +35,9 @@ async function resolveSimulationCampaigns({
context: WorkspaceContext | undefined;
filters?: Partial<ICircuitSimulationCampaignFilter>;
}) {
// eslint-disable-next-line no-param-reassign
filters = discardBrainRegionQueryParams(filters);

const source = await getCircuitSimulationCampaigns({ context, withFacets, filters });
// extract all simulation IDs
const allSimIds = flatMap(
Expand Down Expand Up @@ -120,7 +124,7 @@ export async function resolveSimulationByCampaignId({

export const SimulationCampaign: EntityCoreTypeConfig<ICircuitSimulationCampaign> = {
group: EntityTypeGroup.Simulations,
title: 'Simulation Campaign',
title: 'Simulation campaign',
extendedType: ExtendedEntitiesTypeDict.SimulationCampaign,
type: EntityTypeDict.SimulationCampaign,
slug: EntitySlug.SimulationCampaign,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export async function resolveSingleNeuronSimulation(

export const SingleNeuronSimulation: EntityCoreTypeConfig<ISingleNeuronSimulation> = {
group: EntityTypeGroup.Simulations,
title: 'Single Neuron Simulation',
title: 'Single neuron simulation',
extendedType: ExtendedEntitiesTypeDict.SingleNeuronSimulation,
type: EntityTypeDict.SingleNeuronSimulation,
slug: EntitySlug.SingleNeuronSimulation,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export async function resolveSingleNeuronSynaptomeSimulation(
export const SingleNeuronSynaptomeSimulation: EntityCoreTypeConfig<ISingleNeuronSynaptomeSimulation> =
{
group: EntityTypeGroup.Simulations,
title: 'Single Neuron Synaptome Simulation',
title: 'Single neuron synaptome simulation',
extendedType: ExtendedEntitiesTypeDict.SingleNeuronSynaptomeSimulation,
type: EntityTypeDict.SingleNeuronSynaptomeSimulation,
slug: EntitySlug.SingleNeuronSynaptomeSimulation,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import type {
ICircuitSimulationCampaignFilter,
} from '@/api/entitycore/types/entities/circuit-simulation-campaign';
import type { WorkspaceContext } from '@/types/common';
import { discardBrainRegionQueryParams } from '@/api/entitycore/transformers';

// NOTE: this is due entitycore do not support yet the circuit inclusion
async function resolveSimulationCampaigns({
Expand All @@ -39,6 +40,8 @@ async function resolveSimulationCampaigns({
filters?: Partial<ICircuitSimulationCampaignFilter>;
circuitFilter?: Partial<ICircuitFilter>;
}) {
// eslint-disable-next-line no-param-reassign
filters = discardBrainRegionQueryParams(filters);
const source = await getCircuitSimulationCampaigns({
context,
withFacets,
Expand Down Expand Up @@ -129,7 +132,7 @@ export async function resolveSimulationByCampaignId({

export const SmallMicrocircuitSimulation: EntityCoreTypeConfig<ICircuitSimulationCampaign> = {
group: EntityTypeGroup.Simulations,
title: 'Small microcircuit Simulation',
title: 'Small microcircuit simulation',
extendedType: ExtendedEntitiesTypeDict.SmallMicrocircuitSimulation,
type: EntityTypeDict.SimulationCampaign,
slug: EntitySlug.SmallMicrocircuitSimulation,
Expand Down
18 changes: 14 additions & 4 deletions src/features/views/listing/browse-entity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import { useAtom, useAtomValue, useSetAtom } from 'jotai';
import { useState, type ComponentProps } from 'react';
import { WarningOutlined } from '@ant-design/icons';
import compact from 'lodash/compact';
import dynamic from 'next/dynamic';
import get from 'lodash/get';
Expand All @@ -13,6 +14,7 @@ import { useQueryExtendedEntityType } from '@/ui/hooks/use-query-extended-entity
import { getEntityByExtendedType } from '@/entity-configuration/domain/helpers';
import { DEFAULT_PAGE_NUMBER, WorkspaceSection } from '@/constants';
import { MiniDetailView } from '@/ui/segments/mini-detail-view';
import { GenericError } from '@/ui/molecules/generic-error';
import { useWorkspace } from '@/ui/hooks/use-workspace';
import {
coreActiveColumnsAtom,
Expand All @@ -24,6 +26,7 @@ import {
useSelectEntityClickEvent,
} from '@/ui/segments/mini-detail-view/event';
import { cn } from '@/utils/css-class';
import { log } from '@/utils/logger';

import type { TExtendedEntitiesTypeDict } from '@/api/entitycore/types/extended-entity-type';
import type { EntityCoreIdentifiableNamed } from '@/api/entitycore/types/shared/global';
Expand Down Expand Up @@ -118,12 +121,19 @@ export function BrowseEntityScope({
updateDisplayMiniView(event.detail.display);
});

if (error)
if (error) {
log('error', error);
return (
<div>
<pre>{JSON.stringify(error, null, 2)}</pre>
</div>
<GenericError
shouldContactSupport
text={`
An error occurred while fetching "${entity?.title ?? 'entities'}" data for this region.
We are sorry about the inconvenience. Please contact support
`}
icon={<WarningOutlined className="fill-current [font-size:inherit]" />}
/>
);
}

return (
<>
Expand Down
Loading