rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: pass sub controllers to controllers instead of passing global controller manager (#1061)

Browse Source
This commit is contained in:
Mo
2022-06-01 12:56:30 -05:00
committed by GitHub
parent 721cf8df35
commit a87e3b98e2
40 changed files with 672 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/assets/javascripts/Controllers/FilesController.ts
View File

@@ -1,3 +1,4 @@
import { FilePreviewModalController } from './FilePreviewModalController'
import {
PopoverFileItemAction,
PopoverFileItemActionType,
@@ -13,12 +14,13 @@ import {
ClassicFileSaver,
parseFileName,
} from '@standardnotes/filepicker'
import { ChallengeReason, ClientDisplayableError, ContentType, FileItem } from '@standardnotes/snjs'
import { ChallengeReason, ClientDisplayableError, ContentType, FileItem, InternalEventBus } from '@standardnotes/snjs'
import { addToast, dismissToast, ToastType, updateToast } from '@standardnotes/stylekit'
import { action, computed, makeObservable, observable, reaction } from 'mobx'
import { WebApplication } from '../Application/Application'
import { AbstractViewController } from './Abstract/AbstractViewController'
import { ViewControllerManager } from '../Services/ViewControllerManager/ViewControllerManager'
import { NotesController } from './NotesController'
import { SelectedItemsController } from './SelectedItemsController'
const UnprotectedFileActions = [PopoverFileItemActionType.ToggleFileProtection]
const NonMutatingFileActions = [PopoverFileItemActionType.DownloadFile, PopoverFileItemActionType.PreviewFile]
@@ -31,12 +33,21 @@ export class FilesController extends AbstractViewController {
showFileContextMenu = false
fileContextMenuLocation: FileContextMenuLocation = { x: 0, y: 0 }
override deinit(): void {
super.deinit()
;(this.notesController as unknown) = undefined
;(this.selectionController as unknown) = undefined
;(this.filePreviewModalController as unknown) = undefined
}
constructor(
application: WebApplication,
override viewControllerManager: ViewControllerManager,
appObservers: (() => void)[],
private notesController: NotesController,
private selectionController: SelectedItemsController,
private filePreviewModalController: FilePreviewModalController,
eventBus: InternalEventBus,
) {
super(application, viewControllerManager)
super(application, eventBus)
makeObservable(this, {
allFiles: observable,
@@ -52,13 +63,16 @@ export class FilesController extends AbstractViewController {
setFileContextMenuLocation: action,
})
appObservers.push(
this.disposers.push(
application.streamItems(ContentType.File, () => {
this.reloadAllFiles()
this.reloadAttachedFiles()
}),
)
this.disposers.push(
reaction(
() => viewControllerManager.notesController.selectedNotes,
() => notesController.selectedNotes,
() => {
this.reloadAttachedFiles()
},
@@ -67,7 +81,7 @@ export class FilesController extends AbstractViewController {
}
get selectedFiles(): FileItem[] {
return this.viewControllerManager.selectionController.getSelectedItems<FileItem>(ContentType.File)
return this.selectionController.getSelectedItems<FileItem>(ContentType.File)
}
setShowFileContextMenu = (enabled: boolean) => {
@@ -83,7 +97,7 @@ export class FilesController extends AbstractViewController {
}
reloadAttachedFiles = () => {
const note = this.viewControllerManager.notesController.firstSelectedNote
const note = this.notesController.firstSelectedNote
if (note) {
this.attachedFiles = this.application.items.getFilesForNote(note)
}
@@ -109,7 +123,7 @@ export class FilesController extends AbstractViewController {
}
attachFileToNote = async (file: FileItem) => {
const note = this.viewControllerManager.notesController.firstSelectedNote
const note = this.notesController.firstSelectedNote
if (!note) {
addToast({
type: ToastType.Error,
@@ -122,7 +136,7 @@ export class FilesController extends AbstractViewController {
}
detachFileFromNote = async (file: FileItem) => {
const note = this.viewControllerManager.notesController.firstSelectedNote
const note = this.notesController.firstSelectedNote
if (!note) {
addToast({
type: ToastType.Error,
@@ -197,7 +211,7 @@ export class FilesController extends AbstractViewController {
await this.renameFile(file, action.payload.name)
break
case PopoverFileItemActionType.PreviewFile:
this.viewControllerManager.filePreviewModalController.activate(
this.filePreviewModalController.activate(
file,
currentTab === PopoverTabs.AllFiles ? this.allFiles : this.attachedFiles,
)