re-add the context to circuit queries (#1010)

Author: bilalesi

src/entity-configuration/domain/model/circuit.ts

@@ -1,4 +1,4 @@
-import { includes } from 'es-toolkit/compat';
+import { includes, without } from 'es-toolkit/compat';
 
 import { ExtendedEntitiesTypeDict } from '@/api/entitycore/types/extended-entity-type';
 import { DetailViewSectionsDict } from '@/entity-configuration/definitions/types';
@@ -25,8 +25,15 @@ export const Circuit: EntityCoreTypeConfig<ICircuit> = {
       list: (...params) => {
         return getCircuits({
           ...params,
+          context: params[0].context,
           withFacets: params[0].withFacets,
-          filters: { ...params[0].filters },
+          filters: {
+            ...params[0].filters,
+            scale__in: without(
+              Object.values(CircuitScaleDictionary),
+              CircuitScaleDictionary.Single
+            ),
+          },
         });
       },
       one: getCircuit,

src/entity-configuration/domain/model/me-model-with-synapses.ts

@@ -22,6 +22,7 @@ export const MEModelWithSynapsesCircuit: EntityCoreTypeConfig<ICircuit> = {
       list: (...params) => {
         return getCircuits({
           ...params,
+          context: params[0].context,
           withFacets: params[0].withFacets,
           filters: { ...params[0].filters, scale__in: [CircuitScaleDictionary.Single] },
         });

src/ui/segments/explore/circuit/index.tsx

@@ -64,6 +64,7 @@ type Props = {
   dataType: TExtendedEntitiesTypeDict;
   mainTableProps?: Partial<ComponentProps<typeof CircuitTable>>;
   miniViewProps?: Partial<ComponentProps<typeof MiniDetailView>>;
+  extraQueryParams?: Record<string, any>;
 };
 
 export function BrowseCircuit({
@@ -76,6 +77,7 @@ export function BrowseCircuit({
   scope: defaultScope,
   mainTableProps,
   miniViewProps,
+  extraQueryParams,
 }: Props) {
   const { virtualLabId, projectId } = useWorkspace();
   const { mdv, setMdv } = useMiniDetailView();
@@ -140,7 +142,7 @@ export function BrowseCircuit({
       const [{ workspace, queryParameters }] = queryKey;
       return await Circuit.api.query.list?.({
         withFacets: true,
-        filters: { ...queryParameters },
+        filters: { ...queryParameters, ...extraQueryParams },
         context: workspace,
       });
     },

src/ui/segments/explore/entity-link-count.tsx

@@ -1,21 +1,14 @@
-import { useQueries, useQuery } from '@tanstack/react-query';
+import { kebabCase, isNil, get } from 'es-toolkit/compat';
+import { useQueries } 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 'es-toolkit/compat/kebabCase';
-import isNil from 'es-toolkit/compat/isNil';
-import get from 'es-toolkit/compat/get';
-
 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 { BrowseLink } from '@/ui/segments/explore/browse-link';
-import { ROOT_ROUTE } from '@/config';
 import { useTabs } from '@/components/detail-view-tabs';
 import { useWorkspace } from '@/ui/hooks/use-workspace';
 import { keyBuilder } from '@/ui/use-query-keys/data';
@@ -32,6 +25,7 @@ import {
   getAllEntitiesCountScoped,
 } from '@/ui/segments/explore/helpers';
 import { cn } from '@/utils/css-class';
+import { ROOT_ROUTE } from '@/config';
 
 import { type TWorkspaceScope } from '@/constants';
 
@@ -66,7 +60,6 @@ export const tabsConfigItems: Array<{
 
 export function EntityLinkCount() {
   const breakpoint = useDefaultBreakpoint();
-  const session = useSession();
   const scope = (useSearchParams().get('scope') ?? WorkspaceScope.Public) as TWorkspaceScope;
 
   const { virtualLabId, projectId } = useWorkspace();
@@ -81,19 +74,11 @@ export function EntityLinkCount() {
     shallow: true,
   });
 
-  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 [
@@ -113,7 +98,7 @@ export function EntityLinkCount() {
           getSimulationsCount({
             ...params,
           }),
-        enabled: Boolean(selectedBrainRegion?.id) && Boolean(personId),
+        enabled: Boolean(selectedBrainRegion?.id),
       },
       {
         queryKey: keyBuilder.dataCount({ ...params, brainRegionId: brainRegionHierarchy?.root.id }),
@@ -168,9 +153,9 @@ export function EntityLinkCount() {
               type={value.extendedType}
               title={value.title}
               count={
-                <span>
+                <span className="flex items-center justify-center gap-1">
                   <span className="font-bold">{count}</span> <span className="font-light">of</span>
-                  <span className="font-bold"> {rootCount}</span>
+                  <span className="font-bold">{rootCount}</span>
                 </span>
               }
               isLoading={value.isLoading || isNil(count) || isNil(rootCount)}
@@ -193,7 +178,7 @@ export function EntityLinkCount() {
               type={value.extendedType}
               title={value.title}
               count={
-                <span>
+                <span className="flex items-center justify-center gap-1">
                   <span className="font-bold">{count}</span> <span className="font-light">of</span>
                   <span className="font-bold">{rootCount}</span>
                 </span>
@@ -217,7 +202,7 @@ export function EntityLinkCount() {
               href={link}
               type={value.extendedType}
               title={value.title}
-              count={count ? `${count}` : 0}
+              count={<span className="font-bold">{count}</span>}
               isLoading={value.isLoading || isNil(count)}
               isUploadable={value.isUploadable}
             />

src/ui/segments/explore/helpers.ts

@@ -113,6 +113,7 @@ export async function getAllEntitiesCountScoped({
             ...(scope === WorkspaceScope.Project
               ? {
                   authorized_project_id: projectId,
+                  authorized_public: false,
                 }
               : scope === WorkspaceScope.Public
                 ? {
@@ -135,11 +136,9 @@ export async function getSimulationsCount({
   virtualLabId,
   projectId,
   brainRegionId,
-  personId,
   scope,
 }: WorkspaceContext & {
   brainRegionId: string;
-  personId: string | undefined;
   scope: TWorkspaceScope;
 }) {
   const promises = Object.fromEntries(
@@ -161,7 +160,7 @@ export async function getSimulationsCount({
             ...(scope === WorkspaceScope.Project
               ? {
                   authorized_project_id: projectId,
-                  created_by__id: personId,
+                  authorized_public: false,
                 }
               : scope === WorkspaceScope.Public
                 ? {
@@ -189,11 +188,9 @@ export function getElectricalCellRecordingsCount({
   virtualLabId,
   projectId,
   brainRegionId,
-  personId,
   scope,
 }: WorkspaceContext & {
   brainRegionId: string;
-  personId: string | undefined;
   scope: TWorkspaceScope;
 }) {
   return getElectricalCellRecordings({
@@ -209,7 +206,7 @@ export function getElectricalCellRecordingsCount({
       ...(scope === WorkspaceScope.Project
         ? {
             authorized_project_id: projectId,
-            created_by__id: personId,
+            authorized_public: false,
           }
         : scope === WorkspaceScope.Public
           ? {