Merge branch 'feat/inspect-cluster' of github.com:commonknowledge/ts-mapped into feat/inspect-cluster

Author: joaquimds

src/app/map/[id]/components/inspector/ClusterMarkersList.tsx

@@ -1,14 +1,11 @@
-import { useDataSources } from "@/app/map/[id]/hooks/useDataSources";
 import { useInspector } from "@/app/map/[id]/hooks/useInspector";
 import { DataSourceRecordType } from "@/server/models/DataSource";
 import { MarkersList, MembersList } from "./MarkersLists";
 import type { MarkerFeature } from "@/types";
 
 export default function ClusterMarkersList() {
-  const { getDataSourceById } = useDataSources();
   const { selectedRecords, inspectorContent } = useInspector();
-  const dataSource = getDataSourceById(inspectorContent?.dataSource?.id);
-  const recordType = dataSource?.recordType;
+  const recordType = inspectorContent?.dataSource?.recordType;
   const markerFeatures = selectedRecords
     .map((r): MarkerFeature | null => {
       if (!r.dataSourceId || !r.geocodePoint) {
@@ -18,7 +15,8 @@ export default function ClusterMarkersList() {
       return {
         type: "Feature",
         geometry: {
-          coordinates: [r.geocodePoint.lng, r.geocodePoint.lat],
+          // [0, 0] should never happen because these records are in a cluster on the map
+          coordinates: [r.geocodePoint?.lng || 0, r.geocodePoint?.lat || 0],
           type: "Point",
         },
         properties: {
@@ -35,12 +33,15 @@ export default function ClusterMarkersList() {
     <div className="flex flex-col gap-6">
       {recordType === DataSourceRecordType.Members ? (
         <MembersList
-          dataSource={dataSource}
+          dataSource={inspectorContent?.dataSource}
           markers={markerFeatures}
           areaType="cluster"
         />
       ) : (
-        <MarkersList dataSource={dataSource} markers={markerFeatures} />
+        <MarkersList
+          dataSource={inspectorContent?.dataSource}
+          markers={markerFeatures}
+        />
       )}
     </div>
   );

src/app/map/[id]/components/inspector/MarkersLists.tsx

@@ -13,7 +13,7 @@ export const MembersList = ({
   areaType,
 }: {
   markers: MarkerFeature[];
-  dataSource: DataSource | null;
+  dataSource: DataSource | undefined | null;
   areaType: "area" | "boundary" | "cluster";
 }) => {
   const { setSelectedRecords } = useInspector();
@@ -68,7 +68,7 @@ export const MarkersList = ({
   dataSource,
 }: {
   markers: MarkerFeature[];
-  dataSource: DataSource | null;
+  dataSource: DataSource | undefined | null;
 }) => {
   const { setSelectedRecords } = useInspector();
   const total = markers.length;