Merge branch 'editor' into dev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "automa",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "description": "An extension for automating your browser by connecting blocks",
   "license": "MIT",
   "repository": {

src/components/block/BlockLoopBreakpoint.vue

@@ -29,7 +29,6 @@
 </template>
 <script setup>
 import { useI18n } from 'vue-i18n';
-import emitter from '@/lib/mitt';
 import { Handle, Position } from '@braks/vue-flow';
 import { useComponentId } from '@/composable/componentId';
 import { useEditorBlock } from '@/composable/editorBlock';
@@ -48,7 +47,7 @@ const props = defineProps({
     default: () => ({}),
   },
 });
-defineEmits(['delete']);
+const emit = defineEmits(['delete', 'update']);
 
 const { t } = useI18n();
 const block = useEditorBlock(props.label);
@@ -56,8 +55,6 @@ const componentId = useComponentId('block-delay');
 
 function handleInput({ target }) {
   const loopId = target.value.replace(/\s/g, '');
-
-  props.editor.updateNodeDataFromId(block.id, { loopId });
-  emitter.emit('editor:data-changed', block.id);
+  emit('update', { loopId });
 }
 </script>

src/components/newtab/workflow/edit/EditConditions.vue

@@ -14,13 +14,6 @@
         {{ t('workflow.blocks.conditions.add') }}
       </ui-button>
       <div class="flex-grow"></div>
-      <ui-button
-        v-tooltip:bottom="t('workflow.blocks.conditions.refresh')"
-        icon
-        @click="refreshConnections"
-      >
-        <v-remixicon name="riRefreshLine" />
-      </ui-button>
       <ui-button
         v-tooltip:bottom="t('common.settings')"
         icon
@@ -126,7 +119,6 @@ import { useI18n } from 'vue-i18n';
 import { nanoid } from 'nanoid';
 import Draggable from 'vuedraggable';
 import { sleep } from '@/utils/helper';
-import emitter from '@/lib/mitt';
 import SharedConditionBuilder from '@/components/newtab/shared/SharedConditionBuilder/index.vue';
 
 const props = defineProps({
@@ -170,10 +162,6 @@ function editCondition(index) {
 function addCondition() {
   if (conditions.value.length >= 20) return;
 
-  emitter.emit('conditions-block:add', {
-    id: props.blockId,
-  });
-
   conditions.value.push({
     id: nanoid(),
     name: `Path ${conditions.value.length + 1}`,
@@ -189,11 +177,6 @@ function deleteCondition(index, id) {
     );
   });
 }
-function refreshConnections() {
-  emitter.emit('conditions-block:refresh', {
-    id: props.blockId,
-  });
-}
 function updateData(value) {
   emit('update:data', { ...props.data, ...value });
 }

src/components/newtab/workflow/edit/EditJavascriptCode.vue

@@ -141,7 +141,7 @@ const availableFuncs = [
 const state = reactive({
   activeTab: 'code',
   code: `${props.data.code}`,
-  preloadScripts: [...(props.data.preloadScripts || [])],
+  preloadScripts: [...Object.values(props.data.preloadScripts || [])],
   showCodeModal: false,
 });
 

src/newtab/pages/workflows/[id].vue

@@ -713,7 +713,10 @@ function pasteCopiedElements(position) {
   editor.value.addNodes(nodes);
   editor.value.addEdges(edges);
 }
-function onKeydown({ ctrlKey, metaKey, key }) {
+function onKeydown({ ctrlKey, metaKey, key, target }) {
+  const els = ['INPUT', 'SELECT'];
+  if (els.includes(target.tagName)) return;
+
   const command = (keyName) => (ctrlKey || metaKey) && keyName === key;
 
   if (command('c')) {

src/popup/pages/Home.vue

@@ -193,7 +193,6 @@ function deleteWorkflow({ id, name }) {
   });
 }
 function openDashboard(url) {
-  console.log(url);
   sendMessage('open:dashboard', url, 'background');
 }
 async function initElementSelector() {

src/stores/workflow.js

@@ -114,7 +114,10 @@ export const useWorkflowStore = defineStore('workflow', {
         localWorkflows = firstWorkflows.map((workflow) =>
           defaultWorkflow(workflow)
         );
-        await browser.storage.local.set({ isFirstTime: false });
+        await browser.storage.local.set({
+          isFirstTime: false,
+          workflows: localWorkflows,
+        });
       }
 
       this.workflows = convertWorkflowsToObject(localWorkflows);
@@ -125,10 +128,6 @@ export const useWorkflowStore = defineStore('workflow', {
         ({ isDestroyed }) => !isDestroyed
       );
 
-      if (isFirstTime) {
-        await this.saveToStorage('workflows');
-      }
-
       this.retrieved = true;
     },
     async insert(data = {}, options = {}) {

src/utils/firstWorkflows.js

@@ -68,21 +68,7 @@ export default [
             waitTabLoaded: false,
             updatePrevTab: false,
             customUserAgent: false,
-            onError: {
-              0: 's',
-              1: 't',
-              2: 'a',
-              3: 't',
-              4: 'e',
-              5: '.',
-              6: 'o',
-              7: 'n',
-              8: 'E',
-              9: 'r',
-              10: 'r',
-              11: 'o',
-              12: 'r',
-            },
+            onError: {},
           },
           selected: false,
         },
@@ -198,7 +184,7 @@ export default [
           targetX: 0,
           targetY: 0,
           markerEnd: 'arrowclosed',
-          animated: true,
+          animated: false,
         },
         {
           id: 'edge-2',