diff --git a/src/Model/Chat/chatListModel.ts b/src/Model/Chat/chatListModel.ts index 5b067dcb..0d4c1787 100644 --- a/src/Model/Chat/chatListModel.ts +++ b/src/Model/Chat/chatListModel.ts @@ -15,7 +15,7 @@ export default class ChatListModel { connectionModel: ConnectionModel; // data - chatModels = new Set(); + chatModels: Set = new Set(); // handlers messageHandler = (data: Message): void => { diff --git a/src/Model/Chat/chatModel.ts b/src/Model/Chat/chatModel.ts index 9c2650aa..c67fffba 100644 --- a/src/Model/Chat/chatModel.ts +++ b/src/Model/Chat/chatModel.ts @@ -10,7 +10,6 @@ import { HandlerManager, createTimestamp, localeCompare, - parse, parseValidObject, stringify, } from "../Utility/utility"; diff --git a/src/Model/Files/boardsAndTasksModel.ts b/src/Model/Files/boardsAndTasksModel.ts index 473c34a1..01c9d5f1 100644 --- a/src/Model/Files/boardsAndTasksModel.ts +++ b/src/Model/Files/boardsAndTasksModel.ts @@ -23,9 +23,8 @@ export default class BoardsAndTasksModel { calendarModel: CalendarModel; // data - boardHandlerManager: HandlerManager = - new HandlerManager(); - taskHandlerManager: HandlerManager = new HandlerManager(); + boardHandlerManager = new HandlerManager(); + taskHandlerManager = new HandlerManager(); // paths getBasePath = (): string[] => { diff --git a/src/Model/Global/connectionModel.ts b/src/Model/Global/connectionModel.ts index acfa85af..b630b812 100644 --- a/src/Model/Global/connectionModel.ts +++ b/src/Model/Global/connectionModel.ts @@ -20,12 +20,10 @@ export default class ConnectionModel { return this.udn.ws?.url; } - connectionChangeHandlerManager: HandlerManager = new HandlerManager(); - messageHandlerManager: HandlerManager = new HandlerManager(); - messageSentHandlerManager: HandlerManager = - new HandlerManager(); - - channelsToSubscribe: Set = new Set(); + connectionChangeHandlerManager = new HandlerManager(); + messageHandlerManager = new HandlerManager(); + messageSentHandlerManager = new HandlerManager(); + channelsToSubscribe = new Set(); // handlers handleMessage = (data: Message): void => { diff --git a/src/Model/Global/fileTransferModel.ts b/src/Model/Global/fileTransferModel.ts index 57b1dc2d..ab57c02f 100644 --- a/src/Model/Global/fileTransferModel.ts +++ b/src/Model/Global/fileTransferModel.ts @@ -20,9 +20,9 @@ export default class FileTransferModel { static READY_MESSAGE = "ready"; // data - transferData: TransferData | undefined; - fileHandlerManager: HandlerManager = new HandlerManager(); - readyToSendHandlerManager: HandlerManager = new HandlerManager(); + transferData: TransferData | undefined = undefined; + fileHandlerManager = new HandlerManager(); + readyToSendHandlerManager = new HandlerManager(); direction: TransferDirections = TransferDirections.Send; // general diff --git a/src/Model/Global/settingsModel.ts b/src/Model/Global/settingsModel.ts index d14b0925..73998607 100644 --- a/src/Model/Global/settingsModel.ts +++ b/src/Model/Global/settingsModel.ts @@ -23,30 +23,30 @@ export default class SettingsModel { this.storageModel.write(path, value); } - setName(newValue: string): void { + setName = (newValue: string): void => { this.username = newValue; this.storeSetting("username", newValue); } - setFirstDayOfWeek(newValue: string): void { + setFirstDayOfWeek = (newValue: string): void => { this.firstDayOfWeek = newValue; this.storeSetting("firstDayOfWeek", newValue); } - setLanguage(newValue: string): void { + setLanguage = (newValue: string): void => { this.language = newValue; this.storeSetting("language", newValue); } - setTheme(newValue: string): void { + setTheme = (newValue: string): void => { this.theme = newValue; this.storeSetting("theme", newValue); } // load - private readSetting( + private readSetting = ( pathName: keyof typeof filePaths.settingsModel, - ): string { + ): string => { const path = StorageModel.getPath( StorageModelSubPaths.SettingsModel, filePaths.settingsModel[pathName], @@ -54,22 +54,22 @@ export default class SettingsModel { return this.storageModel.read(path); } - loadUsername(): void { + loadUsername = (): void => { const content = this.readSetting("username"); this.username = content ?? ""; } - loadFirstDayofWeek(): void { + loadFirstDayofWeek = (): void => { const content = this.readSetting("firstDayOfWeek"); this.firstDayOfWeek = content ?? "0"; } - loadLanguage(): void { + loadLanguage = (): void => { const content = this.readSetting("language"); this.language = content ?? SettingsModel.getSystemLanguage(); } - loadTheme(): void { + loadTheme = (): void => { const content = this.readSetting("theme"); this.theme = content ?? ThemeSettings.System; } diff --git a/src/Model/Utility/utility.ts b/src/Model/Utility/utility.ts index 08330dac..9fe41a33 100644 --- a/src/Model/Utility/utility.ts +++ b/src/Model/Utility/utility.ts @@ -173,7 +173,7 @@ export function checkDoesObjectMatchSearch( export type Handler = (item: T) => void; export class HandlerManager { - handlers: Set> = new Set(); + handlers = new Set>(); // manage addHandler = (handler: Handler): void => { diff --git a/src/ViewModel/Chat/chatListViewModel.ts b/src/ViewModel/Chat/chatListViewModel.ts index 9dd3aaba..56e23812 100644 --- a/src/ViewModel/Chat/chatListViewModel.ts +++ b/src/ViewModel/Chat/chatListViewModel.ts @@ -14,7 +14,7 @@ export default class ChatListViewModel { notificationViewModel: NotificationViewModel; // data - chatIndexManager: IndexManager = new IndexManager( + chatIndexManager = new IndexManager( (chatViewModel: ChatViewModel) => chatViewModel.settingsPageViewModel.primaryChannel.value, ); diff --git a/src/ViewModel/Global/fileTransferViewModel.ts b/src/ViewModel/Global/fileTransferViewModel.ts index 1c3eb49e..dd620fbc 100644 --- a/src/ViewModel/Global/fileTransferViewModel.ts +++ b/src/ViewModel/Global/fileTransferViewModel.ts @@ -13,7 +13,7 @@ import CoreViewModel, { Context } from "./coreViewModel"; import { CommonKeys } from "../../View/keystrokes"; export default class FileTransferViewModel extends Context { - contextDebugDescription = "transfer"; + contextDebugDescription: string = "transfer"; // state presentedModal: React.State = diff --git a/src/ViewModel/Global/settingsViewModel.ts b/src/ViewModel/Global/settingsViewModel.ts index b0f479ea..301c2dbd 100644 --- a/src/ViewModel/Global/settingsViewModel.ts +++ b/src/ViewModel/Global/settingsViewModel.ts @@ -5,7 +5,7 @@ import { Languages, ThemeSettings } from "../../Model/Global/settingsModel"; import { CommonKeys } from "../../View/keystrokes"; export default class SettingsViewModel extends Context { - contextDebugDescription = "settings"; + contextDebugDescription: string = "settings"; // state username: React.State = new React.State(""); diff --git a/src/ViewModel/Pages/boardViewModel.ts b/src/ViewModel/Pages/boardViewModel.ts index b027a7a7..f2fbf36b 100644 --- a/src/ViewModel/Pages/boardViewModel.ts +++ b/src/ViewModel/Pages/boardViewModel.ts @@ -16,7 +16,7 @@ import TaskViewModel from "./taskViewModel"; import { CommonKeys } from "../../View/keystrokes"; export default class BoardViewModel extends TaskContainingPageViewModel { - contextDebugDescription = "board"; + contextDebugDescription: string = "board"; // state name: React.State = new React.State(""); diff --git a/src/ViewModel/Pages/taskContainingPageViewModel.ts b/src/ViewModel/Pages/taskContainingPageViewModel.ts index a1f4e2f2..226a5d16 100644 --- a/src/ViewModel/Pages/taskContainingPageViewModel.ts +++ b/src/ViewModel/Pages/taskContainingPageViewModel.ts @@ -11,7 +11,7 @@ import TaskViewModel from "./taskViewModel"; export default class TaskContainingPageViewModel extends Context { // state - taskIndexManager: IndexManager = new IndexManager( + taskIndexManager = new IndexManager( (taskViewModel: TaskViewModel) => taskViewModel.sortingString, ); diff --git a/src/ViewModel/Pages/taskPageViewModel.ts b/src/ViewModel/Pages/taskPageViewModel.ts index 14b98c12..889348d3 100644 --- a/src/ViewModel/Pages/taskPageViewModel.ts +++ b/src/ViewModel/Pages/taskPageViewModel.ts @@ -11,10 +11,10 @@ import { IndexManager } from "../../Model/Utility/utility"; import { CommonKeys } from "../../View/keystrokes"; export default class TaskPageViewModel extends ContextHost { - contextDebugDescription = "task-page"; + contextDebugDescription: string = "task-page"; // data - boardIndexManager: IndexManager = new IndexManager( + boardIndexManager = new IndexManager( (boardViewModel: BoardViewModel) => boardViewModel.name.value, ); diff --git a/src/ViewModel/Utility/taskPropertyBulkChangeViewModel.ts b/src/ViewModel/Utility/taskPropertyBulkChangeViewModel.ts index 3729159c..07d1882f 100644 --- a/src/ViewModel/Utility/taskPropertyBulkChangeViewModel.ts +++ b/src/ViewModel/Utility/taskPropertyBulkChangeViewModel.ts @@ -19,7 +19,7 @@ export default class TaskPropertyBulkChangeViewModel { }); }; - setValue: (newValue: string, taskViewModel: TaskViewModel) => void; + setValue: (newValue: string, taskViewModel: TaskViewModel) => void = () => {}; // init constructor(