migrate events atoms to reatom3

.cursorignore

@@ -0,0 +1,25 @@
+# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+__fixtures__
+__mocks__
+__test__
+./**/*.fixture.tsx
+./**/fixture/*.*
+.github/workflows/run_e2e_tests.yml
+.helpers
+*.fixture.{ts,tsx}
+**/*.test.tsx
+appconfig.js
+configs/*
+cosmos**
+e2e/**
+jest.config.js
+jest.setup.js
+playwright**
+postcss.config.ts
+public
+scripts
+server
+template.config.js
+vite.config.ts
+vite.proxy.ts
+i18next-scanner.config.cjs

package.json

@@ -95,7 +95,8 @@
     "@reatom/core-v2": "^3.1.4",
     "@reatom/hooks": "^3.5.5",
     "@reatom/logger": "^3.8.4",
-    "@reatom/npm-react": "^3.8.10",
+    "@reatom/npm-react": "^3.9.0",
+    "@reatom/primitives": "^3.7.3",
     "@reatom/react-v2": "^3.1.2",
     "@sentry/react": "^8.18.0",
     "@slack/web-api": "^7.3.1",

src/core/api/events.ts

@@ -0,0 +1,25 @@
+import { configRepo } from '~core/config';
+import { apiClient } from '~core/apiClientInstance';
+import type { Event } from '~core/types';
+
+export interface EventListParams {
+  feed?: string;
+  bbox?: string;
+}
+
+export function getEventsList(params: EventListParams, abortController: AbortController) {
+  return apiClient
+    .get<Event[]>(
+      '/events',
+      {
+        appId: configRepo.get().id,
+        ...params,
+      },
+      true,
+      {
+        signal: abortController.signal,
+        errorsConfig: { hideErrors: true },
+      },
+    )
+    .then((response) => response ?? []); // Ensure we always return an array
+}

src/core/resources/bivariateStatisticsResource/index.ts

@@ -15,7 +15,7 @@ const bivariateStatisticsDependencyAtom = v3toV2(
   atom((ctx) => {
     const focusedGeometry = ctx.spy(focusedGeometryAtom.v3atom);
     return { focusedGeometry };
-  }),
+  }, 'bivariateStatisticsDependencyAtom'),
 );
 
 let worldStatsCache: Stat;

src/core/shared_state/currentEvent.ts

@@ -1,38 +1,63 @@
-import { createAtom, createBooleanAtom } from '~utils/atoms';
+import { atom, action } from '@reatom/core';
+import { v3toV2 } from '~utils/atoms/v3tov2';
 import { focusedGeometryAtom } from '../focused_geometry/model';
 
-// * CurrentEventAtomState *
-// null represents the initial state of event - we need that state for cases of autoselecting event
-// { id: null } represents event reset was caused by user actions
-export type CurrentEventAtomState = {
-  id: string | null;
-} | null;
-
-export const currentEventAtom = createAtom(
-  {
-    setCurrentEventId: (eventId: string | null) => eventId,
-    focusedGeometryAtom,
-  },
-  ({ onAction, onChange }, state: CurrentEventAtomState = null) => {
-    onChange('focusedGeometryAtom', (focusedGeometry) => {
-      const currentGeometrySource = focusedGeometry?.source;
-      if (
-        currentGeometrySource &&
-        currentGeometrySource.type !== 'event' &&
-        currentGeometrySource.type !== 'episode'
-      ) {
-        // if focused geometry is no longer represents event, user stopped work with events
-        // following state specifies that
-        state = { id: null };
+// reatom v2 imports mapped to reatom v3
+const __v3_imports = {
+  focusedGeometryAtom: focusedGeometryAtom.v3atom,
+};
+
+function __create_v3() {
+  const { focusedGeometryAtom } = __v3_imports;
+  // v3 definitions section
+
+  // * CurrentEventAtomState *
+  // null represents the initial state of event - we need that state for cases of autoselecting event
+  // { id: null } represents event reset was caused by user actions
+  type CurrentEventAtomState = { id: string | null } | null;
+
+  const currentEventAtom = atom<CurrentEventAtomState>(null, 'currentEventAtom');
+  const scheduledAutoSelect = atom(false, 'scheduledAutoSelect');
+  const scheduledAutoFocus = atom(false, 'scheduledAutoFocus');
+
+  const setCurrentEventId = action((ctx, eventId: string | null) => {
+    currentEventAtom(ctx, { id: eventId });
+  }, 'setCurrentEventId');
+
+  // Stateless computed atom that updates currentEventAtom based on focusedGeometryAtom
+  const computedCurrentEventAtom = atom((ctx) => {
+    const currentEvent = ctx.spy(currentEventAtom);
+    const focusedGeometry = ctx.spy(focusedGeometryAtom);
+    const currentGeometrySource = focusedGeometry?.source;
+
+    if (
+      currentGeometrySource &&
+      currentGeometrySource.type !== 'event' &&
+      currentGeometrySource.type !== 'episode'
+    ) {
+      if (currentEvent?.id !== null) {
+        currentEventAtom(ctx, { id: null });
       }
-    });
+    }
+  }, 'computedCurrentEventAtom');
 
-    onAction('setCurrentEventId', (eventId) => (state = { id: eventId }));
+  // v3 exports object
+  return {
+    currentEventAtom,
+    scheduledAutoSelect,
+    scheduledAutoFocus,
+    setCurrentEventId,
+    computedCurrentEventAtom,
+  };
+}
 
-    return state;
-  },
-  '[Shared state] currentEventAtom',
-);
+const v3 = __create_v3();
+// v3 exports as default
+export default v3;
 
-export const scheduledAutoSelect = createBooleanAtom(false, 'scheduledAutoSelect');
-export const scheduledAutoFocus = createBooleanAtom(false, 'scheduledAutoFocus');
+// v2 compatible exports keeping the same names
+export const currentEventAtom = v3toV2(v3.currentEventAtom, {
+  setCurrentEventId: v3.setCurrentEventId,
+});
+export const scheduledAutoSelect = v3toV2(v3.scheduledAutoSelect);
+export const scheduledAutoFocus = v3toV2(v3.scheduledAutoFocus);

src/core/shared_state/currentEventFeed.ts

@@ -1,55 +1,85 @@
-import { createAtom } from '~utils/atoms';
+import { atom, action, type Ctx } from '@reatom/core';
+import { v3toV2 } from '~utils/atoms/v3tov2';
 import { configRepo } from '~core/config';
 import { currentEventAtom, scheduledAutoSelect } from './currentEvent';
 import type { EventFeedConfig } from '~core/config/types';
 
-type CurrentEventFeedAtomState = {
-  id: string;
-} | null;
-
-export const currentEventFeedAtom = createAtom(
-  {
-    setCurrentFeed: (feedId: string) => feedId,
-    setFeedForExistingEvent: (feedId: string) => feedId,
-    resetCurrentFeed: () => null,
-    syncFeed: (eventFeeds) => eventFeeds,
-  },
-  (
-    { onAction, onChange, schedule, getUnlistedState },
-    state: CurrentEventFeedAtomState = { id: configRepo.get().defaultFeed },
-  ) => {
-    onAction('setCurrentFeed', (feedId) => {
-      if (state?.id !== feedId) {
-        state = { id: feedId };
-      }
-      schedule((dispatch) => dispatch(currentEventAtom.setCurrentEventId(null)));
-    });
+// reatom v2 imports mapped to reatom v3
+const __v3_imports = {
+  currentEventAtom: currentEventAtom.v3atom,
+  scheduledAutoSelect: scheduledAutoSelect.v3atom,
+};
 
-    onAction('resetCurrentFeed', () => {
-      if (state) {
-        state = null;
-      }
-    });
-
-    onAction('syncFeed', (eventFeeds) => {
-      if (eventFeeds && eventFeeds.data.length && !eventFeeds.loading) {
-        const newFeed = checkFeed(eventFeeds.data, state?.id);
-        if (newFeed !== undefined && newFeed !== state?.id) {
-          state = { id: newFeed };
-          const currentEvent = getUnlistedState(currentEventAtom);
-          if (currentEvent !== null)
-            schedule((dispatch) => dispatch(scheduledAutoSelect.setTrue()));
-        }
+function __create_v3() {
+  const { currentEventAtom, scheduledAutoSelect } = __v3_imports;
+  // v3 definitions section
+
+  type CurrentEventFeedAtomState = {
+    id: string;
+  } | null;
+
+  const currentEventFeedAtom = atom<CurrentEventFeedAtomState>(
+    { id: configRepo.get().defaultFeed },
+    'currentEventFeedAtom',
+  );
+
+  const setCurrentFeed = action((ctx, feedId: string) => {
+    updateFeed(ctx, feedId);
+  }, 'setCurrentFeed');
+
+  const setFeedForExistingEvent = action((ctx, feedId: string) => {
+    updateFeed(ctx, feedId);
+  }, 'setFeedForExistingEvent');
+
+  const resetCurrentFeed = action((ctx) => {
+    updateFeed(ctx, null);
+  }, 'resetCurrentFeed');
+
+  const syncFeed = action(
+    (ctx, eventFeeds: { data: EventFeedConfig[]; loading: boolean }) => {
+      if (eventFeeds?.data?.length && !eventFeeds.loading) {
+        const currentFeed = ctx.get(currentEventFeedAtom);
+        const newFeed = checkFeed(eventFeeds.data, currentFeed?.id);
+        updateFeed(ctx, newFeed);
       }
-    });
+    },
+    'syncFeed',
+  );
+
+  function updateFeed(ctx: Ctx, newFeedId: string | null) {
+    const currentFeed = ctx.get(currentEventFeedAtom);
+    if (currentFeed?.id !== newFeedId) {
+      currentEventFeedAtom(ctx, newFeedId ? { id: newFeedId } : null);
+      // deselect current event
+      currentEventAtom(ctx, { id: null });
+      scheduledAutoSelect(ctx, false);
+    }
+  }
 
-    return state;
-  },
-  '[Shared state] currentEventFeedAtom',
-);
+  function checkFeed(eventFeeds: EventFeedConfig[], feedId?: string) {
+    if (!feedId) return configRepo.get().defaultFeed;
+    const feed = eventFeeds?.find((fd) => fd.feed === feedId);
+    return feed ? feed.feed : configRepo.get().defaultFeed;
+  }
 
-function checkFeed(eventFeeds: EventFeedConfig[], feedId?: string) {
-  if (!feedId) return configRepo.get().defaultFeed;
-  const feed = eventFeeds?.find((fd) => fd.feed === feedId);
-  return feed ? feed.feed : configRepo.get().defaultFeed;
+  // v3 exports object
+  return {
+    currentEventFeedAtom,
+    setCurrentFeed,
+    setFeedForExistingEvent,
+    resetCurrentFeed,
+    syncFeed,
+  };
 }
+
+const v3 = __create_v3();
+// v3 exports as default
+export default v3;
+
+// v2 compatible exports keeping the same names
+export const currentEventFeedAtom = v3toV2(v3.currentEventFeedAtom, {
+  setCurrentFeed: v3.setCurrentFeed,
+  setFeedForExistingEvent: v3.setFeedForExistingEvent,
+  resetCurrentFeed: v3.resetCurrentFeed,
+  syncFeed: v3.syncFeed,
+});