Browse Source

fix: delete wrong day on specific day trigger (#620)

Ahmad Kholid 3 years ago
parent
commit
20ce6da1b8

+ 1 - 1
package.json

@@ -30,7 +30,7 @@
     "*.{js,ts,vue}": "eslint --fix"
     "*.{js,ts,vue}": "eslint --fix"
   },
   },
   "dependencies": {
   "dependencies": {
-    "@braks/vue-flow": "^0.4.25",
+    "@braks/vue-flow": "^0.4.27",
     "@codemirror/lang-javascript": "^6.0.0",
     "@codemirror/lang-javascript": "^6.0.0",
     "@codemirror/lang-json": "^6.0.0",
     "@codemirror/lang-json": "^6.0.0",
     "@codemirror/language": "^6.0.0",
     "@codemirror/language": "^6.0.0",

+ 5 - 2
src/assets/css/flow.css

@@ -34,8 +34,11 @@
 	}
 	}
 }
 }
 
 
-.vue-flow__edge.selected .vue-flow__edge-path {
-	stroke: theme('colors.green.300');
+.vue-flow__edge {
+	cursor: pointer;
+	&.selected .vue-flow__edge-path {
+		stroke: theme('colors.green.300');
+	}
 }
 }
 
 
 .vue-flow__edge-path {
 .vue-flow__edge-path {

+ 2 - 2
src/components/newtab/workflow/WorkflowEditor.vue

@@ -3,7 +3,7 @@
     :id="props.id"
     :id="props.id"
     :class="{ disabled: options.disabled }"
     :class="{ disabled: options.disabled }"
     :default-edge-options="{
     :default-edge-options="{
-      updateable: true,
+      updatable: true,
       selectable: true,
       selectable: true,
       type: settings.lineType,
       type: settings.lineType,
       markerEnd: settings.arrow ? MarkerType.ArrowClosed : '',
       markerEnd: settings.arrow ? MarkerType.ArrowClosed : '',
@@ -137,7 +137,7 @@ const editor = useVueFlow({
 });
 });
 editor.onConnect((params) => {
 editor.onConnect((params) => {
   params.class = `source-${params.sourceHandle} target-${params.targetHandle}`;
   params.class = `source-${params.sourceHandle} target-${params.targetHandle}`;
-  params.updateable = true;
+  params.updatable = true;
   editor.addEdges([params]);
   editor.addEdges([params]);
 });
 });
 editor.onEdgeUpdate(({ edge, connection }) => {
 editor.onEdgeUpdate(({ edge, connection }) => {

+ 1 - 1
src/components/newtab/workflow/edit/Trigger/TriggerSpecificDay.vue

@@ -70,7 +70,7 @@
             <v-remixicon
             <v-remixicon
               name="riDeleteBin7Line"
               name="riDeleteBin7Line"
               class="cursor-pointer"
               class="cursor-pointer"
-              @click="removeDayTime(index, timeIndex)"
+              @click.stop="removeDayTime(index, timeIndex)"
             />
             />
           </div>
           </div>
         </div>
         </div>

+ 1 - 1
src/components/popup/home/HomeSelectBlock.vue

@@ -51,7 +51,7 @@ const editorOptions = {
   disabled: true,
   disabled: true,
   fitViewOnInit: true,
   fitViewOnInit: true,
   nodesDraggable: false,
   nodesDraggable: false,
-  edgesUpdateable: false,
+  edgesUpdatable: false,
   nodesConnectable: false,
   nodesConnectable: false,
 };
 };
 
 

+ 1 - 1
src/newtab/pages/workflows/Host.vue

@@ -140,7 +140,7 @@ const editorOptions = {
   disabled: true,
   disabled: true,
   fitViewOnInit: true,
   fitViewOnInit: true,
   nodesDraggable: false,
   nodesDraggable: false,
-  edgesUpdateable: false,
+  edgesUpdatable: false,
   nodesConnectable: false,
   nodesConnectable: false,
   elementsSelectable: false,
   elementsSelectable: false,
 };
 };

+ 1 - 1
src/newtab/pages/workflows/Shared.vue

@@ -178,7 +178,7 @@ const editorOptions = {
   disabled: true,
   disabled: true,
   fitViewOnInit: true,
   fitViewOnInit: true,
   nodesDraggable: false,
   nodesDraggable: false,
-  edgesUpdateable: false,
+  edgesUpdatable: false,
   nodesConnectable: false,
   nodesConnectable: false,
   elementsSelectable: false,
   elementsSelectable: false,
 };
 };

+ 2 - 0
src/utils/convertWorkflowData.js

@@ -62,6 +62,8 @@ export default function (workflow) {
           targetHandle,
           targetHandle,
           source: block.id,
           source: block.id,
           target: outputId,
           target: outputId,
+          updatable: true,
+          selectable: true,
           id: `vueflow__edge-${sourceHandle}-${targetHandle}`,
           id: `vueflow__edge-${sourceHandle}-${targetHandle}`,
           class: `source-${sourceHandle} target-${targetHandle}`,
           class: `source-${sourceHandle} target-${targetHandle}`,
         });
         });

+ 4 - 4
yarn.lock

@@ -912,10 +912,10 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
     to-fast-properties "^2.0.0"
 
 
-"@braks/vue-flow@^0.4.25":
-  version "0.4.25"
-  resolved "https://registry.yarnpkg.com/@braks/vue-flow/-/vue-flow-0.4.25.tgz#3aa96d8ba102e48deceb4b082fa2b4b15c3904e5"
-  integrity sha512-kQYAOonPLBUVzbXz8nmp1PSXXQ1pq7k5L8RsiRJ6FM4hpqRWWI+KG1p6IDdcACpbwoZ07XhPq7roLFX4M8u59Q==
+"@braks/vue-flow@^0.4.27":
+  version "0.4.27"
+  resolved "https://registry.yarnpkg.com/@braks/vue-flow/-/vue-flow-0.4.27.tgz#4f3b6ad14c9f3c65dc593490a141bd2c5d048438"
+  integrity sha512-iM54qI6pX7tOV2XQuMXETKePankHOy99DYDLBo4lCM5V7msNqcRwdiQDGbGTVCHgm0vTGaUzHh3Rr2skZ+SZyg==
   dependencies:
   dependencies:
     "@vueuse/core" "^8.7.5"
     "@vueuse/core" "^8.7.5"
     d3-drag "^3.0.0"
     d3-drag "^3.0.0"