[DO NOT MERGE] Add note's tags to history screen - Use action generator

lib/search/index.ts

@@ -382,7 +382,7 @@ export const middleware: S.Middleware = (store) => {
         return next(action);
       case 'IMPORT_NOTE_WITH_ID':
       case 'REMOTE_NOTE_UPDATE':
-      case 'APPLY_NOTE_REVISION':
+      case 'RESTORE_NOTE_REVISION':
         searchState.notes.set(action.noteId, toSearchNote(action.note ?? {}));
         indexNote(action.noteId);
         queueSearch();

lib/state/action-types.ts

@@ -219,14 +219,6 @@ export type ReorderTag = Action<
 export type RestoreNote = Action<'RESTORE_NOTE', { noteId: T.EntityId }>;
 export type RestoreNoteRevision = Action<
   'RESTORE_NOTE_REVISION',
-  {
-    noteId: T.EntityId;
-    version: number;
-    includeDeletedTags: boolean;
-  }
->;
-export type ApplyNoteRevision = Action<
-  'APPLY_NOTE_REVISION',
   {
     noteId: T.EntityId;
     note: T.Note;
@@ -349,7 +341,6 @@ export type ActionType =
   | AcknowledgePendingChange
   | AddCollaborator
   | AddNoteTag
-  | ApplyNoteRevision
   | ChangeConnectionStatus
   | CloseNote
   | CloseNoteActions

lib/state/data/actions.ts

@@ -1,5 +1,8 @@
 import * as A from '../action-types';
 import * as T from '../../types';
+import * as S from '..';
+import isEmailTag from '../../utils/is-email-tag';
+import { tagHashOf } from '../../utils/tag-hash';
 
 export const addCollaborator: A.ActionCreator<A.AddCollaborator> = (
   noteId: T.EntityId,
@@ -77,13 +80,33 @@ export const toggleAnalytics: A.ActionCreator<A.ToggleAnalytics> = () => ({
   type: 'TOGGLE_ANALYTICS',
 });
 
-export const restoreNoteRevision: A.ActionCreator<A.RestoreNoteRevision> = (
+export const restoreNoteRevision: S.ActionGenerator = (
   noteId: T.EntityId,
   version: number,
   includeDeletedTags: boolean
-) => ({
-  type: 'RESTORE_NOTE_REVISION',
-  noteId,
-  version,
-  includeDeletedTags,
-});
+) => (state) => {
+  const revision = state.data.noteRevisions.get(noteId)?.get(version);
+
+  if (!revision) {
+    return;
+  }
+
+  const note = state.data.notes.get(noteId);
+  const noteEmailTags =
+    note?.tags.filter((tagName) => isEmailTag(tagName)) ?? [];
+
+  const revisionCanonicalTags = revision.tags.filter((tagName) => {
+    const tagHash = tagHashOf(tagName);
+    const hasTag = state.data.tags.has(tagHash);
+    return !isEmailTag(tagName) && (hasTag || includeDeletedTags);
+  });
+
+  return {
+    type: 'RESTORE_NOTE_REVISION',
+    noteId,
+    note: {
+      ...revision,
+      tags: [...noteEmailTags, ...revisionCanonicalTags],
+    },
+  };
+};

lib/state/data/middleware.ts

@@ -78,35 +78,6 @@ export const middleware: S.Middleware = (store) => (
         note: action.note,
       });
 
-    case 'RESTORE_NOTE_REVISION': {
-      const revision = state.data.noteRevisions
-        .get(action.noteId)
-        ?.get(action.version);
-
-      if (!revision) {
-        return;
-      }
-
-      const note = state.data.notes.get(action.noteId);
-      const noteEmailTags =
-        note?.tags.filter((tagName) => isEmailTag(tagName)) ?? [];
-
-      const revisionCanonicalTags = revision.tags.filter((tagName) => {
-        const tagHash = tagHashOf(tagName);
-        const hasTag = state.data.tags.has(tagHash);
-        return !isEmailTag(tagName) && (hasTag || action.includeDeletedTags);
-      });
-
-      return next({
-        type: 'APPLY_NOTE_REVISION',
-        noteId: action.noteId,
-        note: {
-          ...revision,
-          tags: [...noteEmailTags, ...revisionCanonicalTags],
-        },
-      });
-    }
-
     case 'RESTORE_OPEN_NOTE':
       if (!state.ui.openedNote) {
         return;

lib/state/data/reducer.ts

@@ -108,7 +108,7 @@ export const notes: A.Reducer<Map<T.EntityId, T.Note>> = (
 
     case 'NOTE_BUCKET_UPDATE':
     case 'REMOTE_NOTE_UPDATE':
-    case 'APPLY_NOTE_REVISION':
+    case 'RESTORE_NOTE_REVISION':
       return new Map(state).set(action.noteId, action.note);
 
     case 'IMPORT_NOTE_WITH_ID': {
@@ -437,7 +437,7 @@ export const tags: A.Reducer<Map<T.TagHash, T.Tag>> = (
       return next;
     }
 
-    case 'APPLY_NOTE_REVISION': {
+    case 'RESTORE_NOTE_REVISION': {
       const next = new Map(state);
       action.note.tags.forEach((tagName) => {
         const tagHash = t(tagName);

lib/state/index.ts

@@ -50,6 +50,20 @@ export type State = {
 
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 
+const actionGeneratorMiddleware: Middleware = (store) => (
+  next: (action: A.ActionType) => A.ActionType
+) => (action: A.ActionType | ReturnType<ActionGenerator>) => {
+  const state = store.getState();
+  if (typeof action === 'function') {
+    const result = action(state);
+    if (!result || !result.type) {
+      return;
+    }
+    return next(result);
+  }
+  return next(action);
+};
+
 export const makeStore = (
   accountName: string | null,
   ...middlewares: Middleware[]
@@ -78,6 +92,7 @@ export const makeStore = (
             }),
           }),
           applyMiddleware(
+            actionGeneratorMiddleware,
             dataMiddleware,
             analyticsMiddleware,
             browserMiddleware,
@@ -115,7 +130,7 @@ export type MapDispatch<
   | {
       [P in keyof DispatchProps]: (
         ...args: Parameters<DispatchProps[P]>
-      ) => A.ActionType;
+      ) => A.ActionType | ReturnType<ActionGenerator>;
     };
 
 export type Dispatch = ReduxDispatch<A.ActionType>;
@@ -126,3 +141,7 @@ export type Middleware<Extension = {}> = ReduxMiddleware<
 >;
 
 export type Selector<T> = (state: State, ...args: any[]) => T;
+
+export type ActionGenerator = (
+  ...args: any[]
+) => (state: State) => A.ActionType | void;

lib/state/simperium/middleware.ts

@@ -351,7 +351,7 @@ export const initSimperium = (
         return result;
       }
 
-      case 'APPLY_NOTE_REVISION': {
+      case 'RESTORE_NOTE_REVISION': {
         action.note.tags.map(t).forEach((tagHash) => {
           if (!prevState.data.tags.has(tagHash)) {
             queueTagUpdate(tagHash, 10);

lib/state/ui/reducer.ts

@@ -251,7 +251,7 @@ const openedRevision: A.Reducer<[T.EntityId, number] | null> = (
 ) => {
   switch (action.type) {
     case 'CLOSE_REVISION':
-    case 'APPLY_NOTE_REVISION':
+    case 'RESTORE_NOTE_REVISION':
       return null;
 
     case 'OPEN_REVISION':
@@ -384,7 +384,7 @@ const showRevisions: A.Reducer<boolean> = (state = false, action) => {
     case 'OPEN_NOTE':
     case 'SELECT_NOTE':
     case 'CREATE_NOTE_WITH_ID':
-    case 'APPLY_NOTE_REVISION':
+    case 'RESTORE_NOTE_REVISION':
       return false;
     default:
       return state;