Ahmad Kholid 2 ani în urmă
părinte
comite
646096edb7

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "automa",
-  "version": "1.21.2",
+  "version": "1.21.3",
   "description": "An extension for automating your browser by connecting blocks",
   "repository": {
     "type": "git",

+ 9 - 5
src/background/index.js

@@ -438,15 +438,19 @@ const contextMenu =
   BROWSER_TYPE === 'firefox' ? browser.menus : browser.contextMenus;
 if (contextMenu && contextMenu.onClicked) {
   contextMenu.onClicked.addListener(
-    async ({ parentMenuItemId, menuItemId }, tab) => {
+    async ({ parentMenuItemId, menuItemId, frameId }, tab) => {
       try {
         if (parentMenuItemId !== 'automaContextMenu') return;
 
-        const message = await browser.tabs.sendMessage(tab.id, {
-          frameId: 0,
-          type: 'context-element',
-        });
+        const message = await browser.tabs.sendMessage(
+          tab.id,
+          {
+            type: 'context-element',
+          },
+          { frameId }
+        );
         let workflowId = menuItemId;
+
         if (menuItemId.startsWith('trigger')) {
           const { 1: triggerWorkflowId } = menuItemId.split(':');
           workflowId = triggerWorkflowId;

+ 1 - 1
src/background/workflowEngine/blocksHandler/handlerRepeatTask.js

@@ -2,7 +2,7 @@ function repeatTask({ data, id }) {
   return new Promise((resolve) => {
     const repeat = Number.isNaN(+data.repeatFor) ? 0 : +data.repeatFor;
 
-    if (this.repeatedTasks[id] > repeat) {
+    if (this.repeatedTasks[id] > repeat || !this.getBlockConnections(id, 2)) {
       delete this.repeatedTasks[id];
 
       resolve({

+ 22 - 6
src/components/block/BlockGroup.vue

@@ -4,7 +4,9 @@
     <div class="p-4">
       <div class="flex items-center mb-2">
         <div
-          :class="block.category.color"
+          :class="
+            data.disableBlock ? 'bg-box-transparent' : block.category.color
+          "
           class="inline-flex items-center text-sm mr-4 p-2 rounded-lg dark:text-black"
         >
           <v-remixicon
@@ -15,11 +17,25 @@
           <span>{{ t('workflow.blocks.blocks-group.name') }}</span>
         </div>
         <div class="flex-grow"></div>
-        <v-remixicon
-          name="riDeleteBin7Line"
-          class="cursor-pointer"
-          @click.stop="emit('delete', id)"
-        />
+        <ui-popover>
+          <template #trigger>
+            <v-remixicon name="riMoreLine" class="cursor-pointer" />
+          </template>
+          <ui-list class="w-36 space-y-1">
+            <ui-list-item
+              class="cursor-pointer"
+              @click.stop="emit('update', { disableBlock: !data.disableBlock })"
+            >
+              {{ t(`common.${data.disableBlock ? 'enable' : 'disable'}`) }}
+            </ui-list-item>
+            <ui-list-item
+              class="text-red-400 dark:text-red-500 cursor-pointer"
+              @click.stop="emit('delete', id)"
+            >
+              {{ t('common.delete') }}
+            </ui-list-item>
+          </ui-list>
+        </ui-popover>
       </div>
       <input
         :value="data.name"