{children}
-
+
{selectedFiltersCount}
-
diff --git a/src/ui/segments/data-table/elements/pagination.tsx b/src/ui/segments/data-table/elements/pagination.tsx
index 83ff36020..b297b9df2 100644
--- a/src/ui/segments/data-table/elements/pagination.tsx
+++ b/src/ui/segments/data-table/elements/pagination.tsx
@@ -24,8 +24,8 @@ export function Pagination({ dataKey, size, resultPagination, className }: Props
return (
= {
};
dataScope?: TWorkspaceScope;
columns: ColumnProps[];
- controlsVisible: boolean;
dataType: TExtendedEntitiesTypeDict;
workspace?: WorkspaceContext;
cls?: {
@@ -51,7 +52,7 @@ export type Props = {
showLoadingState?: boolean;
isLoading?: boolean;
dataSource: Array;
- rowClassName?: ComponentProps<'td'>['className'];
+ rowClassName?: string | TableProps['rowClassName'];
tableStyle?: CSSProperties | undefined;
};
@@ -62,7 +63,6 @@ export function MainTable({
workspace,
cls,
facets,
- controlsVisible,
renderButton,
showLoadingState,
isLoading,
@@ -106,25 +106,26 @@ export function MainTable({
>
@@ -135,7 +136,6 @@ export function MainTable({
onCellClick={onCellClick}
renderButton={renderButton}
selectionType={selectionType}
- controlsVisible={controlsVisible}
onRowsSelected={onRowsSelected}
dataKey={dataKey}
rowClassName={rowClassName}
@@ -143,6 +143,11 @@ export function MainTable({
onRow={onRow}
sticky={sticky}
className={cls?.table}
+ controls={
+ ({
selectionType,
onRowsSelected,
scrollable = true,
- controlsVisible = true,
- autohideControls = false,
dataKey,
expandableConfig,
rowClassName,
@@ -228,18 +227,18 @@ export function WrapperTable({
onRow,
className,
dataType,
+ controls,
}: TableProps &
AdditionalTableProps & {
renderButton?: (props: RenderButtonProps) => ReactNode;
selectionType?: RowSelectionType;
scrollable?: boolean;
- controlsVisible?: boolean;
onRowsSelected?: (rows: Array) => void;
- autohideControls?: boolean;
dataKey: string;
expandableConfig?: ExpandableConfig;
tableStyle?: CSSProperties | undefined;
dataType: TExtendedEntitiesTypeDict;
+ controls?: ReactNode;
}) {
const { rowSelection, selectedRows, clearSelectedRows } = useRowSelection({
dataKey,
@@ -265,15 +264,17 @@ export function WrapperTable({
className={className}
onRow={onRow}
/>
- {(!autohideControls || (autohideControls && selectedRows.length > 0)) && (
-
+ {controls}
+
+ {/* {(!autohideControls || (autohideControls && selectedRows.length > 0)) && (
+ )} */}
);
}
diff --git a/src/ui/segments/explore/browse-link.tsx b/src/ui/segments/explore/browse-link.tsx
index 0748baab1..319c4f06b 100644
--- a/src/ui/segments/explore/browse-link.tsx
+++ b/src/ui/segments/explore/browse-link.tsx
@@ -3,6 +3,8 @@ import { usePathname, useSearchParams } from 'next/navigation';
import snakeCase from 'lodash/snakeCase';
import Link from 'next/link';
+import type { ReactNode } from 'react';
+
import { getEntityTypeFromUrlOnEntityScope } from '@/ui/segments/explore/helpers';
import { Button } from '@/ui/molecules/button';
import { cn } from '@/utils/css-class';
@@ -17,7 +19,7 @@ export function BrowseLink({
isLoading: boolean;
type: string;
title: string;
- count: number | null;
+ count: ReactNode;
href: string;
}) {
const searchParams = useSearchParams();
diff --git a/src/ui/segments/explore/entity-left-menu.tsx b/src/ui/segments/explore/entity-left-menu.tsx
index c42ea825a..fd3bfaca4 100644
--- a/src/ui/segments/explore/entity-left-menu.tsx
+++ b/src/ui/segments/explore/entity-left-menu.tsx
@@ -1,78 +1,29 @@
'use client';
import { AnimatePresence, motion } from 'motion/react';
-import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { useSession } from 'next-auth/react';
import { Suspense, useState } from 'react';
+import delay from 'lodash/delay';
import { TreeSkeleton } from '@/features/brain-region-hierarchy/brain-region-skeleton';
-import { getPersons } from '@/api/entitycore/queries/general/person-agent';
import { EntityLinkCount } from '@/ui/segments/explore/entity-link-count';
import { BrainRegionHierarchy } from '@/features/brain-region-hierarchy';
-import { keyBuilder as userKeyBuilder } from '@/ui/use-query-keys/user';
import {
ExploreLeftMenuContext,
RegionBanner,
} from '@/features/brain-region-hierarchy/region-banner';
-import {
- getAllEntitiesCount,
- getElectricalCellRecordingsCount,
- getSimulationsCount,
-} from '@/ui/segments/explore/helpers';
-import { useWorkspace } from '@/ui/hooks/use-workspace';
-import { keyBuilder } from '@/ui/use-query-keys/data';
import type { TExploreLeftMenuContext } from '@/features/brain-region-hierarchy/region-banner';
-import type { TTreeNode } from '@/components/tree/types';
type Props = { dataKey: string };
export function EntityLeftMenu({ dataKey }: Props) {
- const queryClient = useQueryClient();
- const { virtualLabId, projectId } = useWorkspace();
-
const [view, updateView] = useState(
ExploreLeftMenuContext.BrainRegionHierarchy
);
- const session = useSession();
- const { data: person } = useQuery({
- queryKey: userKeyBuilder.person({ userId: session.data?.user.id }),
- queryFn: () => getPersons({ filters: { sub_id: session.data?.user.id } }),
- enabled: Boolean(session.data?.user.id),
- });
-
- const personId = person?.data.at(0)?.id;
const onSwitchView = (_view: TExploreLeftMenuContext) => updateView(_view);
-
- const onClickBrainRegion = async (node: TTreeNode) => {
- const params = {
- virtualLabId,
- projectId,
- brainRegionId: node.id,
- };
-
- await queryClient.prefetchQuery({
- queryKey: keyBuilder.dataCount({ ...params }),
- queryFn: () => getAllEntitiesCount({ ...params }),
- });
-
- await queryClient.prefetchQuery({
- queryKey: keyBuilder.electricalCellRecordingsCount({ ...params }),
- queryFn: () =>
- getElectricalCellRecordingsCount({
- ...params,
- }),
- });
-
- await queryClient.prefetchQuery({
- queryKey: keyBuilder.userSimulationsCount({ ...params, personId }),
- queryFn: () =>
- getSimulationsCount({
- ...params,
- personId,
- }),
- });
+ const onClickBrainRegion = async () => {
+ delay(() => onSwitchView(ExploreLeftMenuContext.DataGroup), 100);
};
return (
diff --git a/src/ui/segments/explore/entity-link-count.tsx b/src/ui/segments/explore/entity-link-count.tsx
index e845df7b8..e55b3d0cc 100644
--- a/src/ui/segments/explore/entity-link-count.tsx
+++ b/src/ui/segments/explore/entity-link-count.tsx
@@ -1,5 +1,8 @@
import { useQueries, useQuery } from '@tanstack/react-query';
+import { useSearchParams } from 'next/navigation';
import { useSession } from 'next-auth/react';
+import { useAtomValue } from 'jotai';
+import { unwrap } from 'jotai/utils';
import { match } from 'ts-pattern';
import { useMemo } from 'react';
import kebabCase from 'lodash/kebabCase';
@@ -7,27 +10,30 @@ import get from 'lodash/get';
import { useFilteredCircuits } from '@/components/explore-section/Circuit/ListView/ExploreCircuitTable';
import { ExtendedEntitiesTypeDict } from '@/api/entitycore/types/extended-entity-type';
-import { useGetSelectedBrainRegion } from '@/features/brain-region-hierarchy/context';
+import {
+ brainRegionBasicCellGroupsRegionsHierarchyAtom,
+ useGetSelectedBrainRegion,
+} from '@/features/brain-region-hierarchy/context';
import { PillTabs, PillTabsList, PillTabsTrigger } from '@/ui/molecules/tabs';
import { getPersons } from '@/api/entitycore/queries/general/person-agent';
import { keyBuilder as userKeyBuilder } from '@/ui/use-query-keys/user';
import { useDefaultBreakpoint } from '@/ui/hooks/create-break-point';
-import { EntityTypeDict } from '@/api/entitycore/types/entity-type';
import { BrowseLink } from '@/ui/segments/explore/browse-link';
import { V2_MIGRATION_TEMPORARY_BASE_PATH } from '@/config';
import { useTabs } from '@/components/detail-view-tabs';
import { useWorkspace } from '@/ui/hooks/use-workspace';
import { keyBuilder } from '@/ui/use-query-keys/data';
import {
- getElectricalCellRecordingsCount,
ExperimentalEntitiesTileTypes,
ModelEntitiesTileTypes,
SimulationEntitiesTileTypes,
getSimulationsCount,
- getAllEntitiesCount,
+ getAllEntitiesCountScoped,
} from '@/ui/segments/explore/helpers';
import { cn } from '@/utils/css-class';
+import type { TWorkspaceScope } from '@/constants';
+
export const ExploreDataTypeTabs = {
Experimental: 'experimental',
Models: 'models',
@@ -64,9 +70,14 @@ type Props = {
export function EntityLinkCount({ dataKey }: Props) {
const breakpoint = useDefaultBreakpoint();
const session = useSession();
+ const scope = useSearchParams().get('scope') as TWorkspaceScope;
const { virtualLabId, projectId } = useWorkspace();
const { selectedBrainRegion } = useGetSelectedBrainRegion();
+ const brainRegionHierarchy = useAtomValue(
+ useMemo(() => unwrap(brainRegionBasicCellGroupsRegionsHierarchyAtom), [])
+ );
+
const { activeTab, onChangeTab } = useTabs({
tabsConfig: tabsConfigItems,
tabKey: 'group',
@@ -75,46 +86,45 @@ export function EntityLinkCount({ dataKey }: Props) {
const { filteredCircuits } = useFilteredCircuits({ dataKey });
+ const { data: personId } = useQuery({
+ queryKey: userKeyBuilder.person({ userId: session.data?.user.id }),
+ queryFn: () => getPersons({ filters: { sub_id: session.data?.user.id } }),
+ enabled: Boolean(session.data?.user.id),
+ select: (data) => data?.data.at(0)?.id,
+ });
+
const params = {
virtualLabId,
projectId,
brainRegionId: selectedBrainRegion?.id!,
+ scope,
+ personId,
};
- const { data: person } = useQuery({
- queryKey: userKeyBuilder.person({ userId: session.data?.user.id }),
- queryFn: () => getPersons({ filters: { sub_id: session.data?.user.id } }),
- enabled: Boolean(session.data?.user.id),
- });
- const personId = person?.data.at(0)?.id;
-
const [
{ isLoading: allLoading, data: allData },
- { isLoading: ephysLoading, data: ephysData },
{ isLoading: simsLoading, data: simsData },
+ { isLoading: rootLoading, data: rootData },
] = useQueries({
queries: [
{
queryKey: keyBuilder.dataCount({ ...params }),
- queryFn: () => getAllEntitiesCount({ ...params }),
+ queryFn: () => getAllEntitiesCountScoped({ ...params }),
enabled: Boolean(selectedBrainRegion?.id),
},
{
- queryKey: keyBuilder.electricalCellRecordingsCount({ ...params }),
+ queryKey: keyBuilder.userSimulationsCount({ ...params }),
queryFn: () =>
- getElectricalCellRecordingsCount({
+ getSimulationsCount({
...params,
}),
- enabled: Boolean(selectedBrainRegion?.id),
+ enabled: Boolean(selectedBrainRegion?.id) && Boolean(personId),
},
{
- queryKey: keyBuilder.userSimulationsCount({ ...params, personId }),
+ queryKey: keyBuilder.dataCount({ ...params, brainRegionId: brainRegionHierarchy?.root.id }),
queryFn: () =>
- getSimulationsCount({
- ...params,
- personId,
- }),
- enabled: Boolean(selectedBrainRegion?.id) && Boolean(personId),
+ getAllEntitiesCountScoped({ ...params, brainRegionId: brainRegionHierarchy?.root.id! }),
+ enabled: Boolean(brainRegionHierarchy?.root.id),
},
],
});
@@ -122,23 +132,20 @@ export function EntityLinkCount({ dataKey }: Props) {
const experimentalState = useMemo(
() => [
...Object.entries(ExperimentalEntitiesTileTypes).map(([, value]) => {
- if (value.type === EntityTypeDict.ElectricalCellRecording) {
- return { ...value, isLoading: ephysLoading };
- }
- return { ...value, isLoading: allLoading };
+ return { ...value, isLoading: allLoading || rootLoading };
}),
],
- [allLoading, ephysLoading]
+ [allLoading, rootLoading]
);
const modelState = useMemo(
() => [
...Object.entries(ModelEntitiesTileTypes).map(([, value]) => ({
...value,
- isLoading: allLoading,
+ isLoading: allLoading || rootLoading,
})),
],
- [allLoading]
+ [allLoading, rootLoading]
);
const simulationState = useMemo(
@@ -155,18 +162,22 @@ export function EntityLinkCount({ dataKey }: Props) {
.with(ExploreDataTypeTabs.Experimental, () => (
<>
{experimentalState.map((value) => {
- let count: number | null = get(allData, value.extendedType, null);
- if (value.type === EntityTypeDict.ElectricalCellRecording) {
- count = ephysData?.pagination.total_items ?? null;
- }
+ const count: number | null = get(allData, value.extendedType, null);
+ const rootCount: number | null = get(rootData, value.extendedType, null);
const link = `${V2_MIGRATION_TEMPORARY_BASE_PATH}/${virtualLabId}/${projectId}/explore/browse/entity/${kebabCase(value.extendedType)}`;
+
return (
+ {count} of
+ {rootCount}
+
+ }
isLoading={value.isLoading}
/>
);
@@ -177,6 +188,7 @@ export function EntityLinkCount({ dataKey }: Props) {
<>
{modelState.map((value) => {
const count = get(allData, value.extendedType, null);
+ const rootCount: number | null = get(rootData, value.extendedType, null);
const link = `${V2_MIGRATION_TEMPORARY_BASE_PATH}/${virtualLabId}/${projectId}/explore/browse/entity/${kebabCase(value.extendedType)}`;
return (
+ {count} of
+ {rootCount}
+
+ }
isLoading={value.isLoading}
/>
);
@@ -194,7 +211,7 @@ export function EntityLinkCount({ dataKey }: Props) {
href={`${V2_MIGRATION_TEMPORARY_BASE_PATH}/${virtualLabId}/${projectId}/explore/browse/entity/${kebabCase('circuit')}`}
type={ExtendedEntitiesTypeDict.Circuit}
title="Circuit"
- count={filteredCircuits.count}
+ count={`${filteredCircuits.count}`}
isLoading={false}
/>
@@ -211,7 +228,7 @@ export function EntityLinkCount({ dataKey }: Props) {
href={link}
type={value.extendedType}
title={value.title}
- count={count}
+ count={`${count}`}
isLoading={value.isLoading}
/>
);
diff --git a/src/ui/segments/explore/helpers.ts b/src/ui/segments/explore/helpers.ts
index ba75cfb18..e325f48e0 100644
--- a/src/ui/segments/explore/helpers.ts
+++ b/src/ui/segments/explore/helpers.ts
@@ -15,9 +15,11 @@ import { BoutonDensity } from '@/entity-configuration/domain/experimental/bouton
import { getEntitiesCount } from '@/api/entitycore/queries/general/entity';
import { MEmodel } from '@/entity-configuration/domain/model/me-model';
import { Emodel } from '@/entity-configuration/domain/model/e-model';
+import { WorkspaceScope } from '@/constants';
import { env } from '@/env';
import type { WorkspaceContext } from '@/types/common';
+import type { TWorkspaceScope } from '@/constants';
// import { Circuit } from '@/entity-configuration/domain/model/circuit';
@@ -30,9 +32,9 @@ export const ExperimentalEntitiesTileTypes = {
} as const;
export const ModelEntitiesTileTypes = {
+ SingleNeuronSynaptome,
Emodel,
MEmodel,
- SingleNeuronSynaptome,
} as const;
export const SimulationEntitiesTileTypes = {
@@ -71,6 +73,47 @@ export function getAllEntitiesCount({
});
}
+export async function getAllEntitiesCountScoped({
+ virtualLabId,
+ projectId,
+ brainRegionId,
+ scope,
+ personId,
+}: WorkspaceContext & {
+ brainRegionId: string;
+ personId: string | undefined;
+ scope: TWorkspaceScope;
+}) {
+ const items = { ...ExperimentalEntitiesTileTypes, ...ModelEntitiesTileTypes };
+ const promises = Object.fromEntries(
+ Object.entries(items).map(([, value]) => {
+ return [
+ value.extendedType,
+ value.api.query?.list?.({
+ withFacets: false,
+ context: {
+ virtualLabId,
+ projectId,
+ },
+ filters: {
+ page: 1,
+ page_size: 1,
+ within_brain_region_hierarchy_id: env.NEXT_PUBLIC_DEFAULT_BRAIN_REGION_HIERARCHY_ID,
+ within_brain_region_brain_region_id: brainRegionId ?? null,
+ within_brain_region_ascendants: false,
+ ...(scope === WorkspaceScope.Project ? { created_by__id: personId } : {}),
+ },
+ }),
+ ];
+ })
+ );
+ const result = await pProps(promises);
+
+ return Object.fromEntries(
+ Object.entries(result).map(([key, value]) => [key, value?.pagination.total_items ?? 0])
+ );
+}
+
export async function getSimulationsCount({
virtualLabId,
projectId,
@@ -90,19 +133,16 @@ export async function getSimulationsCount({
filters: {
page: 1,
page_size: 1,
- ...([
- SimulationEntitiesTileTypes.SingleNeuronSimulation.extendedType,
- SimulationEntitiesTileTypes.SingleNeuronSynaptomeSimulation.extendedType,
- ].includes(value.extendedType)
- ? {
- within_brain_region_hierarchy_id:
- env.NEXT_PUBLIC_DEFAULT_BRAIN_REGION_HIERARCHY_ID,
- within_brain_region_brain_region_id: brainRegionId ?? null,
- within_brain_region_ascendants: false,
- }
- : {}),
+ within_brain_region_hierarchy_id: env.NEXT_PUBLIC_DEFAULT_BRAIN_REGION_HIERARCHY_ID,
+ within_brain_region_brain_region_id: brainRegionId ?? null,
+ within_brain_region_ascendants: false,
created_by__id: personId,
},
+ circuitFilter: {
+ within_brain_region_hierarchy_id: env.NEXT_PUBLIC_DEFAULT_BRAIN_REGION_HIERARCHY_ID,
+ within_brain_region_brain_region_id: brainRegionId ?? null,
+ within_brain_region_ascendants: false,
+ },
}),
];
})
diff --git a/src/ui/segments/mini-detail-view/index.tsx b/src/ui/segments/mini-detail-view/index.tsx
index b6c224aad..489c1be3a 100644
--- a/src/ui/segments/mini-detail-view/index.tsx
+++ b/src/ui/segments/mini-detail-view/index.tsx
@@ -11,10 +11,7 @@ import Link from 'next/link';
import { SingleNeuronSynaptomePreview } from '@/ui/segments/mini-detail-view/previews/single-neuron-synaptome-preview';
import { getViewDefinitionByExtendedType } from '@/entity-configuration/definitions/view-defs';
import { MEModelPreview } from '@/ui/segments/mini-detail-view/previews/me-model-preview';
-import {
- ExtendedEntitiesTypeDict,
- TExtendedEntitiesTypeDict,
-} from '@/api/entitycore/types/extended-entity-type';
+import { ExtendedEntitiesTypeDict } from '@/api/entitycore/types/extended-entity-type';
import { bookmarkToProjectLibrary } from '@/api/virtual-lab-svc/queries/bookmark';
import { renderPreview } from '@/entity-configuration/definitions/renderer';
import { getFieldDefinition } from '@/entity-configuration/definitions';
@@ -23,10 +20,9 @@ import { ExpandableText } from '@/ui/molecules/more-less-text';
import { useCopyToClipboard } from '@/hooks/useCopyClipboard';
import { downloadArchive } from '@/services/entity-download';
import { V2_MIGRATION_TEMPORARY_BASE_PATH } from '@/config';
-import { useLocalStorage } from '@/hooks/use-local-storage';
import { useWorkspace } from '@/ui/hooks/use-workspace';
import { Card, CardTitle } from '@/ui/molecules/card';
-import { LAST_REGISTERED_WORKFLOW, WorkspaceSection } from '@/constants';
+import { WorkspaceSection } from '@/constants';
import { Button } from '@/ui/molecules/button';
import {
makeSelectEntityClickEvent,
@@ -137,6 +133,9 @@ export function MiniDetailView({
.with({ section: WorkspaceSection.SimulateWorkflow }, () => (
({ record }: { record: T
+
Filters
-
+ {/*
{activeColumnsLength ? (
<>
{activeColumnsLength} active{' '}
@@ -109,7 +88,7 @@ export function FilterControls({
) : (
-
-
+ {(dataScope === WorkspaceScope.BuildMeModelM ||
+ dataScope === WorkspaceScope.BuildSynaptomeModel) && (
+
+
+ }
/>
{displayControlPanel && filters && (
diff --git a/src/ui/segments/data-table/table.tsx b/src/ui/segments/data-table/table.tsx
index dbcd97fb9..d27f4490d 100644
--- a/src/ui/segments/data-table/table.tsx
+++ b/src/ui/segments/data-table/table.tsx
@@ -1,11 +1,12 @@
'use client';
-import { CSSProperties, ReactNode, useCallback, useRef, useState } from 'react';
import { VerticalAlignMiddleOutlined } from '@ant-design/icons';
import { ConfigProvider, Table, TableProps } from 'antd';
+import { useCallback, useRef, useState } from 'react';
import isString from 'lodash/isString';
import type { ExpandableConfig, RowSelectionType } from 'antd/es/table/interface';
+import type { CSSProperties, ReactNode } from 'react';
import type { TableRef } from 'antd/es/table';
import {
@@ -219,8 +220,6 @@ export function WrapperTable