WIP - Collection map type implementation

packages/libs/coreui/src/components/inputs/SelectList.tsx

@@ -42,9 +42,14 @@ export default function SelectList<T>({
   useEffect(() => {
     setSelected(value);
     setButtonDisplayContent(
-      value.length ? value.join(', ') : defaultButtonDisplayContent
+      value.length
+        ? items
+            .filter((item) => value.includes(item.value))
+            .map((item) => item.display)
+            .join(', ')
+        : defaultButtonDisplayContent
     );
-  }, [value, defaultButtonDisplayContent]);
+  }, [value, defaultButtonDisplayContent, items]);
 
   const buttonLabel = (
     <span

packages/libs/coreui/src/index.ts

@@ -20,6 +20,10 @@ export { Card, ExpandablePanel, Modal } from './components/containers';
 // Grids
 export { DataGrid, TabbedDisplay } from './components/grids';
 
+// Mesa table
+export { Mesa } from './components/Mesa';
+export * from './components/Mesa/types';
+
 // Forms
 export { FormField, MultilineTextField } from './components/forms';
 

packages/libs/eda/src/lib/core/api/DataClient/index.ts

@@ -34,6 +34,8 @@ import {
   ContinousVariableMetadataResponse,
   StandaloneMapBubblesLegendRequestParams,
   StandaloneMapBubblesLegendResponse,
+  StandaloneCollectionsMarkerDataRequest,
+  StandaloneCollectionsMarkerDataResponse,
 } from './types';
 import { NoDataError } from './NoDataError';
 
@@ -219,6 +221,18 @@ export default class DataClient extends FetchClientWithCredentials {
     );
   }
 
+  getStandaloneCollectionsMarkerData(
+    computationName: string,
+    params: StandaloneCollectionsMarkerDataRequest
+  ): Promise<StandaloneCollectionsMarkerDataResponse> {
+    return this.getVisualizationData(
+      computationName,
+      'map-markers/collections',
+      params,
+      StandaloneCollectionsMarkerDataResponse
+    );
+  }
+
   // filter-aware continuous overlay variable metadata
   getContinousVariableMetadata(
     params: ContinousVariableMetadataRequestParams

packages/libs/eda/src/lib/core/api/DataClient/types.ts

@@ -23,8 +23,13 @@ import {
   TimeUnit,
   NumberOrNull,
 } from '../../types/general';
-import { VariableDescriptor, StringVariableValue } from '../../types/variable';
+import {
+  VariableDescriptor,
+  StringVariableValue,
+  VariableCollectionDescriptor,
+} from '../../types/variable';
 import { ComputationAppOverview } from '../../types/visualization';
+import { DerivedVariable } from '../../types/analysis';
 
 export const AppsResponse = type({
   apps: array(ComputationAppOverview),
@@ -970,6 +975,63 @@ export const StandaloneMapBubblesLegendResponse = type({
   maxSizeValue: number,
 });
 
+export interface StandaloneCollectionsMarkerDataRequest {
+  studyId: string;
+  filters?: Filter[];
+  derivedVariables?: DerivedVariable[];
+  config: {
+    outputEntityId: string;
+    geoAggregateVariable: VariableDescriptor;
+    longitudeVariable: VariableDescriptor;
+    latitudeVariable: VariableDescriptor;
+    viewport: LatLonViewport;
+    collectionOverlay: {
+      collection: VariableCollectionDescriptor;
+      selectedMembers: string[];
+    };
+    aggregatorConfig:
+      | {
+          overlayType: 'continuous';
+          aggregator: 'mean' | 'median';
+        }
+      | {
+          overlayType: 'categorical';
+          numeratorValues: string[];
+          denominatorValues: string[];
+        };
+  };
+}
+
+export type StandaloneCollectionsMarkerDataResponse = TypeOf<
+  typeof StandaloneCollectionsMarkerDataResponse
+>;
+
+export const StandaloneCollectionsMarkerDataResponse = type({
+  markers: array(
+    type({
+      geoAggregateValue: string,
+      entityCount: number,
+      avgLat: number,
+      avgLon: number,
+      minLat: number,
+      minLon: number,
+      maxLat: number,
+      maxLon: number,
+      overlayValues: array(
+        type({
+          variableId: string,
+          value: union([number, string]),
+          confidenceInterval: type({
+            min: union([number, string]),
+            max: union([number, string]),
+          }),
+          n: number,
+        })
+      ),
+    })
+  ),
+});
+
 export interface ContinousVariableMetadataRequestParams {
   studyId: string;
   filters: Filter[];

packages/libs/eda/src/lib/core/types/study.ts

@@ -232,6 +232,7 @@ export const CollectionVariableTreeNode = t.intersection([
     distributionDefaults: NumberDistributionDefaults,
     member: t.string,
     memberPlural: t.string,
+    vocabulary: t.array(t.string),
   }),
 ]);
 

packages/libs/eda/src/lib/map/analysis/DraggableLegendPanel.tsx

@@ -1,7 +1,7 @@
 import DraggablePanel, {
   DraggablePanelCoordinatePair,
 } from '@veupathdb/coreui/lib/components/containers/DraggablePanel';
-import { PanelConfig } from './appState';
+import { PanelConfig } from './Types';
 
 export const DEFAULT_DRAGGABLE_LEGEND_POSITION = {
   x: window.innerWidth,

packages/libs/eda/src/lib/map/analysis/DraggableVisualization.tsx

@@ -12,17 +12,7 @@ import { Filter } from '../../core/types/filter';
 import { FilledButton } from '@veupathdb/coreui';
 import { DraggablePanel } from '@veupathdb/coreui/lib/components/containers';
 import { ComputationPlugin } from '../../core/components/computations/Types';
-import { PanelConfig } from './appState';
-
-export const DEFAULT_DRAGGABLE_VIZ_POSITION = {
-  x: 535,
-  y: 220,
-};
-
-export const DEFAULT_DRAGGABLE_VIZ_DIMENSIONS = {
-  width: 'auto',
-  height: 'auto',
-};
+import { PanelConfig } from './Types';
 
 interface Props {
   analysisState: AnalysisState;