refactor: rename states to view controllers (#1060)

2022-06-01 10:15:45 -05:00
parent 78f39ec85d
commit 54125cec21
177 changed files with 1518 additions and 1365 deletions
--- a/app/assets/javascripts/Components/NotesOptions/AddTagOption.tsx
+++ b/app/assets/javascripts/Components/NotesOptions/AddTagOption.tsx
@@ -1,4 +1,4 @@
-import { AppState } from '@/UIModels/AppState'
+import { ViewControllerManager } from '@/Services/ViewControllerManager'
 import { calculateSubmenuStyle, SubmenuStyle } from '@/Utils/CalculateSubmenuStyle'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure'
 import { observer } from 'mobx-react-lite'
@@ -7,10 +7,10 @@ import Icon from '@/Components/Icon/Icon'
 import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur'

 type Props = {
-  appState: AppState
+  viewControllerManager: ViewControllerManager
 }

-const AddTagOption: FunctionComponent<Props> = ({ appState }) => {
+const AddTagOption: FunctionComponent<Props> = ({ viewControllerManager }) => {
  const menuContainerRef = useRef<HTMLDivElement>(null)
  const menuRef = useRef<HTMLDivElement>(null)
  const menuButtonRef = useRef<HTMLButtonElement>(null)
@@ -84,22 +84,22 @@ const AddTagOption: FunctionComponent<Props> = ({ appState }) => {
          }}
          className="sn-dropdown min-w-80 flex flex-col py-2 max-h-120 max-w-xs fixed overflow-y-auto"
        >
-          {appState.tags.tags.map((tag) => (
+          {viewControllerManager.navigationController.tags.map((tag) => (
            <button
              key={tag.uuid}
              className="sn-dropdown-item sn-dropdown-item--no-icon max-w-80"
              onBlur={closeOnBlur}
              onClick={() => {
-                appState.notes.isTagInSelectedNotes(tag)
-                  ? appState.notes.removeTagFromSelectedNotes(tag).catch(console.error)
-                  : appState.notes.addTagToSelectedNotes(tag).catch(console.error)
+                viewControllerManager.notesController.isTagInSelectedNotes(tag)
+                  ? viewControllerManager.notesController.removeTagFromSelectedNotes(tag).catch(console.error)
+                  : viewControllerManager.notesController.addTagToSelectedNotes(tag).catch(console.error)
              }}
            >
              <span
                className={`whitespace-nowrap overflow-hidden overflow-ellipsis
-                      ${appState.notes.isTagInSelectedNotes(tag) ? 'font-bold' : ''}`}
+                      ${viewControllerManager.notesController.isTagInSelectedNotes(tag) ? 'font-bold' : ''}`}
              >
-                {appState.noteTags.getLongTitle(tag)}
+                {viewControllerManager.noteTagsController.getLongTitle(tag)}
              </span>
            </button>
          ))}
--- a/app/assets/javascripts/Components/NotesOptions/ChangeEditorOption.tsx
+++ b/app/assets/javascripts/Components/NotesOptions/ChangeEditorOption.tsx
@@ -1,6 +1,6 @@
 import { KeyboardKey } from '@/Services/IOService'
-import { WebApplication } from '@/UIModels/Application'
-import { AppState } from '@/UIModels/AppState'
+import { WebApplication } from '@/Application/Application'
+import { ViewControllerManager } from '@/Services/ViewControllerManager'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure'
 import { SNNote } from '@standardnotes/snjs'
 import { FunctionComponent, useCallback, useEffect, useRef, useState } from 'react'
@@ -10,7 +10,7 @@ import { calculateSubmenuStyle, SubmenuStyle } from '@/Utils/CalculateSubmenuSty
 import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur'

 type ChangeEditorOptionProps = {
-  appState: AppState
+  viewControllerManager: ViewControllerManager
  application: WebApplication
  note: SNNote
 }
--- a/app/assets/javascripts/Components/NotesOptions/ListedActionsOption.tsx
+++ b/app/assets/javascripts/Components/NotesOptions/ListedActionsOption.tsx
@@ -1,4 +1,4 @@
-import { WebApplication } from '@/UIModels/Application'
+import { WebApplication } from '@/Application/Application'
 import { calculateSubmenuStyle, SubmenuStyle } from '@/Utils/CalculateSubmenuStyle'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure'
 import { Action, ListedAccount, SNNote } from '@standardnotes/snjs'
--- a/app/assets/javascripts/Components/NotesOptions/NotesOptions.tsx
+++ b/app/assets/javascripts/Components/NotesOptions/NotesOptions.tsx
@@ -1,4 +1,4 @@
-import { AppState } from '@/UIModels/AppState'
+import { ViewControllerManager } from '@/Services/ViewControllerManager'
 import Icon from '@/Components/Icon/Icon'
 import Switch from '@/Components/Switch/Switch'
 import { observer } from 'mobx-react-lite'
@@ -121,15 +121,15 @@ const NoteAttributes: FunctionComponent<{
 }

 const SpellcheckOptions: FunctionComponent<{
-  appState: AppState
+  viewControllerManager: ViewControllerManager
  note: SNNote
-}> = ({ appState, note }) => {
-  const editor = appState.application.componentManager.editorForNote(note)
+}> = ({ viewControllerManager, note }) => {
+  const editor = viewControllerManager.application.componentManager.editorForNote(note)
  const spellcheckControllable = Boolean(!editor || editor.package_info.spellcheckControl)
  const noteSpellcheck = !spellcheckControllable
    ? true
    : note
-    ? appState.notes.getSpellcheckStateForNote(note)
+    ? viewControllerManager.notesController.getSpellcheckStateForNote(note)
    : undefined

  return (
@@ -137,7 +137,7 @@ const SpellcheckOptions: FunctionComponent<{
      <button
        className="sn-dropdown-item justify-between px-3 py-1"
        onClick={() => {
-          appState.notes.toggleGlobalSpellcheckForNote(note).catch(console.error)
+          viewControllerManager.notesController.toggleGlobalSpellcheckForNote(note).catch(console.error)
        }}
        disabled={!spellcheckControllable}
      >
@@ -169,7 +169,7 @@ const NoteSizeWarning: FunctionComponent<{
  ) : null
 }

-const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps) => {
+const NotesOptions = ({ application, viewControllerManager, closeOnBlur }: NotesOptionsProps) => {
  const [altKeyDown, setAltKeyDown] = useState(false)

  const toggleOn = (condition: (note: SNNote) => boolean) => {
@@ -178,7 +178,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
    return notesMatchingAttribute.length > notesNotMatchingAttribute.length
  }

-  const notes = appState.notes.selectedNotes
+  const notes = viewControllerManager.notesController.selectedNotes
  const hidePreviews = toggleOn((note) => note.hidePreview)
  const locked = toggleOn((note) => note.locked)
  const protect = toggleOn((note) => note.protected)
@@ -248,8 +248,8 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
  }, [application, notes])

  const openRevisionHistoryModal = useCallback(() => {
-    appState.notes.setShowRevisionHistoryModal(true)
-  }, [appState])
+    viewControllerManager.notesController.setShowRevisionHistoryModal(true)
+  }, [viewControllerManager])

  return (
    <>
@@ -265,7 +265,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
      <button
        className="sn-dropdown-item justify-between"
        onClick={() => {
-          appState.notes.setLockSelectedNotes(!locked)
+          viewControllerManager.notesController.setLockSelectedNotes(!locked)
        }}
        onBlur={closeOnBlur}
      >
@@ -278,7 +278,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
      <button
        className="sn-dropdown-item justify-between"
        onClick={() => {
-          appState.notes.setHideSelectedNotePreviews(!hidePreviews)
+          viewControllerManager.notesController.setHideSelectedNotePreviews(!hidePreviews)
        }}
        onBlur={closeOnBlur}
      >
@@ -291,7 +291,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
      <button
        className="sn-dropdown-item justify-between"
        onClick={() => {
-          appState.notes.setProtectSelectedNotes(!protect).catch(console.error)
+          viewControllerManager.notesController.setProtectSelectedNotes(!protect).catch(console.error)
        }}
        onBlur={closeOnBlur}
      >
@@ -304,17 +304,19 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
      {notes.length === 1 && (
        <>
          <div className="min-h-1px my-2 bg-border"></div>
-          <ChangeEditorOption appState={appState} application={application} note={notes[0]} />
+          <ChangeEditorOption viewControllerManager={viewControllerManager} application={application} note={notes[0]} />
        </>
      )}
      <div className="min-h-1px my-2 bg-border"></div>
-      {appState.tags.tagsCount > 0 && <AddTagOption appState={appState} />}
+      {viewControllerManager.navigationController.tagsCount > 0 && (
+        <AddTagOption viewControllerManager={viewControllerManager} />
+      )}
      {unpinned && (
        <button
          onBlur={closeOnBlur}
          className="sn-dropdown-item"
          onClick={() => {
-            appState.notes.setPinSelectedNotes(true)
+            viewControllerManager.notesController.setPinSelectedNotes(true)
          }}
        >
          <Icon type="pin" className={iconClass} />
@@ -326,7 +328,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
          onBlur={closeOnBlur}
          className="sn-dropdown-item"
          onClick={() => {
-            appState.notes.setPinSelectedNotes(false)
+            viewControllerManager.notesController.setPinSelectedNotes(false)
          }}
        >
          <Icon type="unpin" className={iconClass} />
@@ -346,7 +348,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
          onBlur={closeOnBlur}
          className="sn-dropdown-item"
          onClick={() => {
-            appState.notes.setArchiveSelectedNotes(true).catch(console.error)
+            viewControllerManager.notesController.setArchiveSelectedNotes(true).catch(console.error)
          }}
        >
          <Icon type="archive" className={iconClassWarning} />
@@ -358,7 +360,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
          onBlur={closeOnBlur}
          className="sn-dropdown-item"
          onClick={() => {
-            appState.notes.setArchiveSelectedNotes(false).catch(console.error)
+            viewControllerManager.notesController.setArchiveSelectedNotes(false).catch(console.error)
          }}
        >
          <Icon type="unarchive" className={iconClassWarning} />
@@ -370,7 +372,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
          <DeletePermanentlyButton
            closeOnBlur={closeOnBlur}
            onClick={async () => {
-              await appState.notes.deleteNotesPermanently()
+              await viewControllerManager.notesController.deleteNotesPermanently()
            }}
          />
        ) : (
@@ -378,7 +380,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
            onBlur={closeOnBlur}
            className="sn-dropdown-item"
            onClick={async () => {
-              await appState.notes.setTrashSelectedNotes(true)
+              await viewControllerManager.notesController.setTrashSelectedNotes(true)
            }}
          >
            <Icon type="trash" className={iconClassDanger} />
@@ -391,7 +393,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
            onBlur={closeOnBlur}
            className="sn-dropdown-item"
            onClick={async () => {
-              await appState.notes.setTrashSelectedNotes(false)
+              await viewControllerManager.notesController.setTrashSelectedNotes(false)
            }}
          >
            <Icon type="restore" className={iconClassSuccess} />
@@ -400,21 +402,21 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
          <DeletePermanentlyButton
            closeOnBlur={closeOnBlur}
            onClick={async () => {
-              await appState.notes.deleteNotesPermanently()
+              await viewControllerManager.notesController.deleteNotesPermanently()
            }}
          />
          <button
            onBlur={closeOnBlur}
            className="sn-dropdown-item"
            onClick={async () => {
-              await appState.notes.emptyTrash()
+              await viewControllerManager.notesController.emptyTrash()
            }}
          >
            <div className="flex items-start">
              <Icon type="trash-sweep" className="color-danger mr-2" />
              <div className="flex-row">
                <div className="color-danger">Empty Trash</div>
-                <div className="text-xs">{appState.notes.trashedNotesCount} notes in Trash</div>
+                <div className="text-xs">{viewControllerManager.notesController.trashedNotesCount} notes in Trash</div>
              </div>
            </div>
          </button>
@@ -425,7 +427,7 @@ const NotesOptions = ({ application, appState, closeOnBlur }: NotesOptionsProps)
          <div className="min-h-1px my-2 bg-border"></div>
          <ListedActionsOption application={application} note={notes[0]} />
          <div className="min-h-1px my-2 bg-border"></div>
-          <SpellcheckOptions appState={appState} note={notes[0]} />
+          <SpellcheckOptions viewControllerManager={viewControllerManager} note={notes[0]} />
          <div className="min-h-1px my-2 bg-border"></div>
          <NoteAttributes application={application} note={notes[0]} />
          <NoteSizeWarning note={notes[0]} />
--- a/app/assets/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx
+++ b/app/assets/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx
@@ -1,4 +1,4 @@
-import { AppState } from '@/UIModels/AppState'
+import { ViewControllerManager } from '@/Services/ViewControllerManager'
 import Icon from '@/Components/Icon/Icon'
 import VisuallyHidden from '@reach/visually-hidden'
 import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur'
@@ -6,16 +6,16 @@ import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure
 import { useRef, useState } from 'react'
 import { observer } from 'mobx-react-lite'
 import NotesOptions from './NotesOptions'
-import { WebApplication } from '@/UIModels/Application'
+import { WebApplication } from '@/Application/Application'
 import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants'

 type Props = {
  application: WebApplication
-  appState: AppState
+  viewControllerManager: ViewControllerManager
  onClickPreprocessing?: () => Promise<void>
 }

-const NotesOptionsPanel = ({ application, appState, onClickPreprocessing }: Props) => {
+const NotesOptionsPanel = ({ application, viewControllerManager, onClickPreprocessing }: Props) => {
  const [open, setOpen] = useState(false)
  const [position, setPosition] = useState({
    top: 0,
@@ -79,7 +79,13 @@ const NotesOptionsPanel = ({ application, appState, onClickPreprocessing }: Prop
        onBlur={closeOnBlur}
        tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
      >
-        {open && <NotesOptions application={application} appState={appState} closeOnBlur={closeOnBlur} />}
+        {open && (
+          <NotesOptions
+            application={application}
+            viewControllerManager={viewControllerManager}
+            closeOnBlur={closeOnBlur}
+          />
+        )}
      </DisclosurePanel>
    </Disclosure>
  )
--- a/app/assets/javascripts/Components/NotesOptions/NotesOptionsProps.ts
+++ b/app/assets/javascripts/Components/NotesOptions/NotesOptionsProps.ts
@@ -1,8 +1,8 @@
-import { WebApplication } from '@/UIModels/Application'
-import { AppState } from '@/UIModels/AppState'
+import { WebApplication } from '@/Application/Application'
+import { ViewControllerManager } from '@/Services/ViewControllerManager'

 export type NotesOptionsProps = {
  application: WebApplication
-  appState: AppState
+  viewControllerManager: ViewControllerManager
  closeOnBlur: (event: { relatedTarget: EventTarget | null }) => void
 }