Merge pull request #57 from jamiefdhurst/add-loaded-event

feat: add loaded event

Author: jamiefdhurst

package.json

@@ -20,9 +20,9 @@
   "author": "Jamie Hurst <jamie@jamiehurst.co.uk>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/jamiefdhurst/obsidian-inbox-organiser/issues"
+    "url": "https://github.com/jamiefdhurst/obsidian-auto-tasks/issues"
   },
-  "homepage": "https://github.com/jamiefdhurst/obsidian-inbox-organiser#readme",
+  "homepage": "https://github.com/jamiefdhurst/obsidian-auto-tasks#readme",
   "dependencies": {
     "obsidian-periodic-notes-provider": "^0.1.1"
   },

src/events.ts

@@ -1 +1,2 @@
+export const LOADED = 'auto-tasks:loaded';
 export const SETTINGS_UPDATED = 'auto-tasks:settings-updated';

src/index.ts

@@ -4,7 +4,7 @@ import {
   PERIODIC_NOTES_EVENT_SETTING_UPDATED,
   PeriodicNotesPluginAdapter,
 } from 'obsidian-periodic-notes-provider';
-import { SETTINGS_UPDATED } from './events';
+import { LOADED, SETTINGS_UPDATED } from './events';
 import { KanbanProvider } from './kanban/provider';
 import { KanbanPluginAdapter } from './plugins/kanban';
 import { TasksPluginAdapter } from './plugins/tasks';
@@ -13,6 +13,7 @@ import { AutoTasksSettingsTab } from './settings/tab';
 import { TasksProvider } from './tasks/provider';
 import type { ObsidianApp, ObsidianVault, ObsidianWorkspace } from './types';
 import { TaskFactory } from './tasks/factory';
+import debug from './log';
 
 export default class AutoTasks extends Plugin {
   private settings: ISettings = DEFAULT_SETTINGS;
@@ -50,10 +51,10 @@ export default class AutoTasks extends Plugin {
 
     await this.loadSettings();
 
-    this.app.workspace.onLayoutReady(this.onLayoutReady.bind(this));
+    this.app.workspace.onLayoutReady(await this.onLayoutReady.bind(this));
   }
 
-  onLayoutReady(): void {
+  async onLayoutReady(): Promise<void> {
     if (!this.periodicNotesPlugin.isEnabled()) {
       new Notice(
         'The Periodic Notes plugin must be installed and available for Auto Tasks to work.',
@@ -62,6 +63,8 @@ export default class AutoTasks extends Plugin {
       return;
     }
 
+    debug('Starting initial layout and load');
+
     this.settings.tasksAvailable = this.tasksPlugin.isEnabled();
 
     // Convert and setup settings from plugins
@@ -111,6 +114,9 @@ export default class AutoTasks extends Plugin {
 
     // Add the settings tab
     this.addSettingTab(new AutoTasksSettingsTab(this.app, this, this.kanbanPlugin, this.kanban));
+
+    this.app.workspace.trigger(LOADED);
+    debug('Initial layout and load complete');
   }
 
   getSettings(): ISettings {

src/log.ts

@@ -0,0 +1,3 @@
+export default function debug(msg: string): void {
+  console.debug(`[JH:AT] ${msg}`);
+}

src/plugins/tasks.ts

@@ -35,6 +35,9 @@ export class TasksPluginAdapter {
   }
 
   private async loadSettings(): Promise<ITasksPluginSettings> {
+    if (!this.getPlugin()) {
+      return { taskFormat: 'tasksEmojiFormat' };
+    }
     return this.getPlugin().loadData();
   }
 }

src/tasks/factory.ts

@@ -16,15 +16,11 @@ export class TaskFactory {
   }
 
   private async checkDataViewStatus() {
-    console.log('CHECKING DATAVIEW');
     this.dataView = await this.pluginAdapter.isDataViewFormat();
-    console.log('Dataview is ' + (this.dataView ? 'YES' : 'NO'));
   }
 
   newCollection(contents: string, addBoardHeaders?: boolean): TaskCollection {
-    console.log('About to check dataview...');
     this.checkDataViewStatus();
-    console.log('Checked dataview, returning collection');
     return this.dataView
       ? new DataViewTaskCollection(contents, addBoardHeaders)
       : new EmojiTaskCollection(contents, addBoardHeaders);