Browse Source

fix: error when using keyboard shortcut as trigger

Ahmad Kholid 3 years ago
parent
commit
6862ab5b8e
2 changed files with 4 additions and 15 deletions
  1. 2 13
      src/content/services/shortcut-listener.js
  2. 2 2
      src/newtab/pages/workflows/[id].vue

+ 2 - 13
src/content/services/shortcut-listener.js

@@ -6,17 +6,6 @@ Mousetrap.prototype.stopCallback = function () {
   return false;
 };
 
-function getTriggerBlock(workflow) {
-  const drawflow = JSON.parse(workflow?.drawflow || '{}');
-
-  if (!drawflow?.drawflow?.Home?.data) return null;
-
-  const blocks = Object.values(drawflow.drawflow.Home.data);
-  const trigger = blocks.find(({ name }) => name === 'trigger');
-
-  return trigger;
-}
-
 (async () => {
   try {
     const { shortcuts, workflows } = await browser.storage.local.get([
@@ -28,12 +17,12 @@ function getTriggerBlock(workflow) {
     if (shortcutsArr.length === 0) return;
 
     const keyboardShortcuts = shortcutsArr.reduce((acc, [id, value]) => {
-      const workflow = [...workflows].find((item) => item.id === id);
+      const workflow = workflows.find((item) => item.id === id);
 
       (acc[value] = acc[value] || []).push({
         id,
         workflow,
-        activeInInput: getTriggerBlock(workflow)?.data?.activeInInput,
+        activeInInput: workflow.trigger?.activeInInput || false,
       });
 
       return acc;

+ 2 - 2
src/newtab/pages/workflows/[id].vue

@@ -408,8 +408,8 @@ async function saveWorkflow() {
     if (workflow.value.isProtected) {
       flow = AES.encrypt(flow, getWorkflowPass(workflow.value.pass)).toString();
     }
-    console.log(triggerBlock);
-    updateWorkflow({ drawflow: flow, trigger: triggerBlock }).then(() => {
+
+    updateWorkflow({ drawflow: flow, trigger: triggerBlock?.data }).then(() => {
       if (triggerBlock) {
         workflowTrigger.register(workflowId, triggerBlock);
       }