rapidapi

Author: evandor

actionHandling/ActionHandlers.ts

@@ -30,6 +30,8 @@ export function useActionHandlers($q: QVueGlobals | undefined) {
   ) {
     const handler = args.actionHandler
 
+    //console.log('handleClick', args)
+
     if (args.actionContext?.clicked) {
       console.log('executing...')
       await args.actionContext.clicked.apply(null, [chromeTab, tabset, folder, { action: args.actionContext }])
@@ -38,7 +40,10 @@ export function useActionHandlers($q: QVueGlobals | undefined) {
 
     if (args.actionContext?.dialog) {
       console.log('executing dialog...', args.actionContext)
-      args.actionContext.dialog.apply(null, [args.actionContext.$q!])?.onOk((payload: any) => {
+
+      const r = await args.actionContext.dialog.apply(null, [args.actionContext.$q!])
+
+      r.onOk((payload: any) => {
         console.log('payload', payload)
         const onOkHandler: (payload: any) => ClickedHandler = args.actionContext!.ok!
         const h = onOkHandler.apply(null, [payload])

actionHandling/AddUrlToTabsetHandlers.ts

@@ -19,7 +19,7 @@ export class AddUrlToTabsetHandlers {
     // this.handlers.push(new DynamicUrlAddUrlToTabsetHandler(this.quasar))
     this.handlers.push(new ExcalidrawAddUrlToTabsetHandler(this.quasar))
     this.handlers.push(new ObsidianApiAddUrlToTabsetHandler())
-    this.handlers.push(new RapidApiAddUrlToTabsetHandler())
+    this.handlers.push(new RapidApiAddUrlToTabsetHandler(this.quasar!))
     this.handlers.push(new MarkdownFileAddUrlToTabsetHandler(this.quasar!))
     this.handlers.push(new ImportFromChromeBookmarksManagerAddUrlToTabsetHandler(this.quasar!))
     this.handlers.push(new RssUrlAddUrlToTabsetHandler(this.quasar!))

actionHandling/SpecialUrlAddToTabsetComponent.vue

@@ -40,6 +40,7 @@
       "
       class="q-ma-none q-px-none q-py-none"
       size="sm"
+      :dense="handler.defaultAction()!.label.length > 10"
       split
       outline>
       <q-list dense style="min-width: 200px">

actionHandling/handler/DefaultAddUrlToTabsetHandler.ts

@@ -1,12 +1,15 @@
 import { QVueGlobals, uid } from 'quasar'
+import { FeatureIdent } from 'src/app/models/FeatureIdent'
 import { useContentStore } from 'src/content/stores/contentStore'
 import { ExecutionResult } from 'src/core/domain/ExecutionResult'
 import { useCommandExecutor } from 'src/core/services/CommandExecutor'
+import { useFeaturesStore } from 'src/features/stores/featuresStore'
 import {
   AddUrlToTabsetHandler,
   AddUrlToTabsetHandlerAdditionalData,
 } from 'src/tabsets/actionHandling/AddUrlToTabsetHandler'
 import { ActionContext } from 'src/tabsets/actionHandling/model/ActionContext'
+import CreateNoteAction from 'src/tabsets/actions/CreateNoteAction.vue'
 import CreateSubfolderAction from 'src/tabsets/actions/CreateSubfolderAction.vue'
 import DeleteTabsetAction from 'src/tabsets/actions/DeleteTabsetAction.vue'
 import EditTabsetAction from 'src/tabsets/actions/EditTabsetAction.vue'
@@ -20,6 +23,7 @@ import { Component } from 'vue'
 
 export class DefaultAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
   constructor(public $q: QVueGlobals) {}
+
   urlMatcher(): RegExp {
     return /.*/
   }
@@ -35,7 +39,12 @@ export class DefaultAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
   actions(currentTabsetId: string | undefined): Component[] {
     const url = useContentStore().getCurrentTabUrl
     // const currentTabsetId = await useTabsetsStore().getCurrentTabsetId()
-    const actions = [EditTabsetAction, CreateSubfolderAction, OpenAllInMenuAction, DeleteTabsetAction]
+
+    const actions = [EditTabsetAction, CreateSubfolderAction]
+    if (useFeaturesStore().hasFeature(FeatureIdent.NOTES)) {
+      actions.push(CreateNoteAction)
+    }
+    actions.push(OpenAllInMenuAction, DeleteTabsetAction)
 
     if (url) {
       // TODO folders?

actionHandling/handler/ExcalidrawAddUrlToTabsetHandler.ts

@@ -1,4 +1,4 @@
-import { QVueGlobals, uid } from 'quasar'
+import { DialogChainObject, QVueGlobals, uid } from 'quasar'
 import { ExecutionResult } from 'src/core/domain/ExecutionResult'
 import { useCommandExecutor } from 'src/core/services/CommandExecutor'
 import {
@@ -7,10 +7,15 @@ import {
 } from 'src/tabsets/actionHandling/AddUrlToTabsetHandler'
 import { ActionContext } from 'src/tabsets/actionHandling/model/ActionContext'
 import { ExcalidrawStorage } from 'src/tabsets/actionHandling/model/ExcalidrawStorage'
+import CreateSubfolderAction from 'src/tabsets/actions/CreateSubfolderAction.vue'
+import DeleteTabsetAction from 'src/tabsets/actions/DeleteTabsetAction.vue'
+import EditTabsetAction from 'src/tabsets/actions/EditTabsetAction.vue'
+import OpenAllInMenuAction from 'src/tabsets/actions/OpenAllInMenuAction.vue'
 import { AddTabToTabsetCommand } from 'src/tabsets/commands/AddTabToTabsetCommand'
 import { Tab } from 'src/tabsets/models/Tab'
 import { Tabset } from 'src/tabsets/models/Tabset'
 import { useTabsetsStore } from 'src/tabsets/stores/tabsetsStore'
+import { Component } from 'vue'
 
 export class ExcalidrawAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
   constructor(public $q: QVueGlobals | undefined) {}
@@ -45,10 +50,10 @@ export class ExcalidrawAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
     return undefined
   }
 
-  actions(): ActionContext[] {
+  actions(): Component[] {
     const tabset: Tabset | undefined = useTabsetsStore().getCurrentTabset
     if (tabset) {
-      var actions = (tabset.tabs as Tab[])
+      const actions: Component[] = (tabset.tabs as Tab[])
         .filter((t: Tab) => t.url !== undefined)
         .filter((t: Tab) => t.url!.match(this.urlMatcher()))
         .map((t: Tab) => {
@@ -59,8 +64,9 @@ export class ExcalidrawAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
             .concat([new ActionContext('Save as new file').withDialog(this.newFileDialog, this.$q!).onOk(this.onOk)])
             .concat([new ActionContext('Clear canvas')])
         : actions.concat([new ActionContext('Add Excalidraw').withDialog(this.newFileDialog, this.$q!).onOk(this.onOk)])
+    } else {
+      return [EditTabsetAction, CreateSubfolderAction, OpenAllInMenuAction, DeleteTabsetAction]
     }
-    return []
   }
 
   async clicked(
@@ -83,7 +89,7 @@ export class ExcalidrawAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
         newTab.title = filename
 
         const firstFrameReturned = returned.at(0)
-        console.log('hier', firstFrameReturned)
+        // console.log('hier', firstFrameReturned)
         if (firstFrameReturned && firstFrameReturned.result) {
           newTab.storage = new ExcalidrawStorage(
             JSON.stringify(JSON.parse(firstFrameReturned.result['excalidraw' as keyof object])),
@@ -189,7 +195,7 @@ export class ExcalidrawAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
     })
   }
 
-  newFileDialog($q: QVueGlobals, filename: string = '') {
+  async newFileDialog($q: QVueGlobals, filename: string = ''): Promise<DialogChainObject> {
     return $q!.dialog({
       title: 'Save as Excalidraw File',
       message: 'Please Provide a name (min 3 characters)',

actionHandling/handler/ImportFromChromeBookmarksManagerAddUrlToTabsetHandler.ts

@@ -1,4 +1,4 @@
-import { QVueGlobals } from 'quasar'
+import { DialogChainObject, QVueGlobals } from 'quasar'
 import { ExecutionResult } from 'src/core/domain/ExecutionResult'
 import { useCommandExecutor } from 'src/core/services/CommandExecutor'
 import {
@@ -99,7 +99,7 @@ export class ImportFromChromeBookmarksManagerAddUrlToTabsetHandler implements Ad
 
   handleOpenedTab(browserTab: chrome.tabs.Tab, tab: Tab) {}
 
-  importChromeBookmarksDialog($q: QVueGlobals) {
+  async importChromeBookmarksDialog($q: QVueGlobals): Promise<DialogChainObject> {
     return $q.dialog({
       title: 'Import Bookmarks',
       message: 'Click "OK" to import the  selected bookmarks folder to the current tabset',

actionHandling/handler/MarkdownFileAddUrlToTabsetHandler.ts

@@ -7,10 +7,15 @@ import {
   ClickedHandler,
 } from 'src/tabsets/actionHandling/AddUrlToTabsetHandler'
 import { ActionContext } from 'src/tabsets/actionHandling/model/ActionContext'
+import CreateSubfolderAction from 'src/tabsets/actions/CreateSubfolderAction.vue'
+import DeleteTabsetAction from 'src/tabsets/actions/DeleteTabsetAction.vue'
+import EditTabsetAction from 'src/tabsets/actions/EditTabsetAction.vue'
+import OpenAllInMenuAction from 'src/tabsets/actions/OpenAllInMenuAction.vue'
 import { AddTabToTabsetCommand } from 'src/tabsets/commands/AddTabToTabsetCommand'
 import { LoadDynamicTabsCommand } from 'src/tabsets/commands/LoadDynamicTabsCommand'
 import { Tab } from 'src/tabsets/models/Tab'
 import { Tabset } from 'src/tabsets/models/Tabset'
+import { Component } from 'vue'
 
 export class MarkdownFileAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
   constructor(public $q: QVueGlobals) {}
@@ -24,11 +29,12 @@ export class MarkdownFileAddUrlToTabsetHandler implements AddUrlToTabsetHandler
   }
 
   defaultAction(): ActionContext {
-    return null as unknown as ActionContext
+    return new ActionContext('Add Markdown').withDialog(this.analyseMarkdownDialog, this.$q).onOk(this.onOk)
   }
 
-  actions(): ActionContext[] {
-    return [new ActionContext('Add Markdown Page').withDialog(this.analyseMarkdownDialog, this.$q).onOk(this.onOk)]
+  actions(): Component[] {
+    // return [new ActionContext('Add Markdown Page').withDialog(this.analyseMarkdownDialog, this.$q).onOk(this.onOk)]
+    return [EditTabsetAction, CreateSubfolderAction, OpenAllInMenuAction, DeleteTabsetAction]
   }
 
   withDialog(): DialogChainObject | undefined {
@@ -67,24 +73,20 @@ export class MarkdownFileAddUrlToTabsetHandler implements AddUrlToTabsetHandler
 
   handleOpenedTab(browserTab: chrome.tabs.Tab, tab: Tab) {}
 
-  analyseMarkdownDialog($q: QVueGlobals, filename: string = '') {
-    return $q.dialog({
-      title: 'Save Markdown File',
-      message: "The file's content can be analysed and dynamically extracted.",
-      options: {
-        type: 'checkbox',
-        model: [],
-        items: [{ label: 'Use for links', value: 'useForLinks', color: 'secondary' }],
-      },
-      cancel: true,
-      persistent: true,
-    })
-    // ?.onOk((data: string[]) => {
-    //   console.log('data', data)
-    //   this.clicked(chromeTab, tabset, undefined, {
-    //     data: { useForLinks: data.indexOf('useForLinks') >= 0 },
-    //   })
-    // })
+  async analyseMarkdownDialog($q: QVueGlobals, filename: string = '') {
+    return Promise.resolve(
+      $q.dialog({
+        title: 'Save Markdown File',
+        message: "The file's content can be analysed and dynamically extracted.",
+        options: {
+          type: 'checkbox',
+          model: [],
+          items: [{ label: 'Use for links', value: 'useForLinks', color: 'secondary' }],
+        },
+        cancel: true,
+        persistent: true,
+      }),
+    )
   }
 
   onOk = (data: string[]): ClickedHandler => {

actionHandling/handler/ObsidianApiAddUrlToTabsetHandler.ts

@@ -5,9 +5,14 @@ import {
   AddUrlToTabsetHandlerAdditionalData,
 } from 'src/tabsets/actionHandling/AddUrlToTabsetHandler'
 import { ActionContext } from 'src/tabsets/actionHandling/model/ActionContext'
+import CreateSubfolderAction from 'src/tabsets/actions/CreateSubfolderAction.vue'
+import DeleteTabsetAction from 'src/tabsets/actions/DeleteTabsetAction.vue'
+import EditTabsetAction from 'src/tabsets/actions/EditTabsetAction.vue'
+import OpenAllInMenuAction from 'src/tabsets/actions/OpenAllInMenuAction.vue'
 import { Tab } from 'src/tabsets/models/Tab'
 import { Tabset } from 'src/tabsets/models/Tabset'
 import { useTabsetsStore } from 'src/tabsets/stores/tabsetsStore'
+import { Component } from 'vue'
 
 export class ObsidianApiAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
   urlMatcher(): RegExp {
@@ -19,47 +24,43 @@ export class ObsidianApiAddUrlToTabsetHandler implements AddUrlToTabsetHandler {
   }
 
   defaultAction(): ActionContext {
-    return null as unknown as ActionContext
+    return new ActionContext('Add Obsidian vault').onClicked(this.clicked)
   }
 
-  actions(): ActionContext[] {
-    return [new ActionContext('Add Obsidian vault')]
+  actions(): Component[] {
+    return [EditTabsetAction, CreateSubfolderAction, OpenAllInMenuAction, DeleteTabsetAction]
   }
 
-  clicked(
+  async clicked(
     browserTab: chrome.tabs.Tab,
     ts: Tabset,
     folder: Tabset | undefined,
     additionalData: AddUrlToTabsetHandlerAdditionalData | undefined,
   ): Promise<ExecutionResult<any>> {
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
-    console.log(`clicked ${ts}`)
-    return Promise.reject('undefined')
+    //console.log(`handleOpenedTab ${browserTab}, ${ts as Tabset}, ${additionalData}`)
+
+    const api = RestApiDefinitions.getApi('OBSIDIAN')
+    if (api) {
+      const tabset = await api.fetchTabset({})
+      // tabset.folders.push(...folders)
+      console.log('saving', tabset)
+      await useTabsetsStore().saveTabset(tabset)
+      return new ExecutionResult('done', 'done')
+    }
+    return Promise.reject('could not find API')
   }
 
   handleOpenedTab(browserTab: chrome.tabs.Tab, tab: Tab): void {
     // eslint-disable-next-line @typescript-eslint/no-base-to-string
     console.log(`handleOpenedTab ${browserTab}`)
   }
 
-  // TODO wrong method !?!
   async updateInTabset(
     browserTab: chrome.tabs.Tab,
     ts: Tabset,
     folder?: Tabset,
     additionalData?: AddUrlToTabsetHandlerAdditionalData,
   ): Promise<ExecutionResult<any>> {
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
-    console.log(`handleOpenedTab ${browserTab}, ${ts as Tabset}, ${additionalData}`)
-
-    const api = RestApiDefinitions.getApi('OBSIDIAN')
-    if (api) {
-      const tabset = await api.fetchTabset({})
-      // tabset.folders.push(...folders)
-      console.log('saving', tabset)
-      await useTabsetsStore().saveTabset(tabset)
-      return new ExecutionResult('done', 'done')
-    }
-    return Promise.reject('could not find API')
+    return Promise.reject('not implemented')
   }
 }