Merge pull request #1411 from AutomaApp/dev

v1.28.14
AutomaApp · Oct 2, 2023 · 13b0c12 · 13b0c12
2 parents 3d02666 + e9be664
commit 13b0c12
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "automa",
-  "version": "1.28.13",
+  "version": "1.28.14",
   "description": "An extension for automating your browser by connecting blocks",
   "repository": {
     "type": "git",

diff --git a/src/newtab/pages/workflows/[id].vue b/src/newtab/pages/workflows/[id].vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="workflow" class="flex h-screen">
+  <div v-if="workflow" class="flex" style="height: calc(100vh - 40px)">
     <div
       v-if="state.showSidebar && haveEditAccess"
       :class="
@@ -167,7 +167,8 @@
             :data="editorData"
             :disabled="isTeamWorkflow && !haveEditAccess"
             :class="{ 'animate-blocks': state.animateBlocks }"
-            class="workflow-editor h-screen focus:outline-none"
+            class="workflow-editor focus:outline-none"
+            style="height: calc(100vh - 40px)"
             tabindex="0"
             @init="onEditorInit"
             @edit="initEditBlock"
@@ -295,8 +296,6 @@ import {
   computed,
   onMounted,
   shallowRef,
-  onActivated,
-  onDeactivated,
   onBeforeUnmount,
 } from 'vue';
 import cloneDeep from 'lodash.clonedeep';
@@ -1527,7 +1526,6 @@ function checkWorkflowUpdate() {
 }
 /* eslint-disable consistent-return */
 function onBeforeLeave() {
-  document.documentElement.classList.remove('scroll');
   updateHostedWorkflow();
 
   const dataNotChanged = !state.dataChanged || !haveEditAccess.value;
@@ -1574,20 +1572,12 @@ watch(
 );
 
 onBeforeRouteLeave(onBeforeLeave);
-onActivated(() => {
-  document.documentElement.classList.add('scroll');
-});
-onDeactivated(() => {
-  document.documentElement.classList.remove('scroll');
-});
 onMounted(() => {
   if (!workflow.value) {
     router.replace(isPackage ? '/packages' : '/');
     return null;
   }
 
-  document.documentElement.classList.add('scroll');
-
   const sidebarState =
     JSON.parse(localStorage.getItem('workflow:sidebar')) ?? true;
   state.showSidebar = sidebarState;
@@ -1616,8 +1606,6 @@ onMounted(() => {
   initAutocomplete();
 });
 onBeforeUnmount(() => {
-  document.documentElement.classList.remove('scroll');
-
   if (isPackage && workflow.value.isExternal) return;
   updateHostedWorkflow();
 });

diff --git a/src/newtab/pages/workflows/index.vue b/src/newtab/pages/workflows/index.vue
@@ -457,12 +457,17 @@ function updateActiveTab(data = {}) {
   Object.assign(state, data);
 }
 function addWorkflow() {
-  workflowStore.insert({
-    name: addWorkflowModal.name,
-    folderId: state.activeFolder,
-    description: addWorkflowModal.description,
-  });
-  clearAddWorkflowModal();
+  workflowStore
+    .insert({
+      name: addWorkflowModal.name,
+      folderId: state.activeFolder,
+      description: addWorkflowModal.description,
+    })
+    .then((workflows) => {
+      const workflowId = Object.keys(workflows)[0];
+      router.push(`/workflows/${workflowId}`);
+    })
+    .finally(clearAddWorkflowModal);
 }
 async function checkWorkflowPermissions(workflows) {
   let requiredPermissions = [];

diff --git a/src/workflowEngine/templating/mustacheReplacer.js b/src/workflowEngine/templating/mustacheReplacer.js
@@ -61,7 +61,10 @@ export function keyParser(key, data) {
   return { dataKey: 'table', path };
 }
 
-function replacer(str, { regex, tagLen, modifyPath, data }) {
+function replacer(
+  str,
+  { regex, tagLen, modifyPath, data, disableStringify = false }
+) {
   const replaceResult = {
     list: {},
     value: str,
@@ -113,7 +116,7 @@ function replacer(str, { regex, tagLen, modifyPath, data }) {
     }
 
     const finalResult =
-      typeof result === 'string' && !stringify
+      disableStringify || (typeof result === 'string' && !stringify)
         ? result
         : JSON.stringify(result);
 
@@ -125,7 +128,7 @@ function replacer(str, { regex, tagLen, modifyPath, data }) {
   return replaceResult;
 }
 
-export default function (str, refData) {
+export default function (str, refData, options = {}) {
   if (!str || typeof str !== 'string') return '';
 
   const data = { ...refData, functions: templatingFunctions };
@@ -140,11 +143,13 @@ export default function (str, refData) {
         data,
         tagLen: 1,
         regex: /\[(.*?)\]/g,
+        ...options,
       });
       Object.assign(replacedList, list);
 
       return value;
     },
+    ...options,
   });
 
   Object.assign(replacedStr.list, replacedList);

diff --git a/src/workflowEngine/templating/renderString.js b/src/workflowEngine/templating/renderString.js
@@ -5,7 +5,7 @@ import mustacheReplacer from './mustacheReplacer';
 const isFirefox = BROWSER_TYPE === 'firefox';
 const isMV2 = browser.runtime.getManifest().manifest_version === 2;
 
-export default async function (str, data, isPopup = true) {
+export default async function (str, data, isPopup = true, options = {}) {
   if (!str || typeof str !== 'string') return '';
 
   const hasMustacheTag = /\{\{(.*?)\}\}/.test(str);
@@ -32,7 +32,7 @@ export default async function (str, data, isPopup = true) {
     let copyStr = `${str}`;
     if (evaluateJS) copyStr = copyStr.slice(2);
 
-    renderedValue = mustacheReplacer(copyStr, data);
+    renderedValue = mustacheReplacer(copyStr, data, options);
   }
 
   return renderedValue;

diff --git a/src/workflowEngine/utils/testConditions.js b/src/workflowEngine/utils/testConditions.js
@@ -71,7 +71,7 @@ export default async function (conditionsArr, workflowData) {
         workflowData.isPopup
       );
 
-      copyData[key] = parseJSON(value, value);
+      copyData[key] = value ?? '';
       Object.assign(result.replacedValue, list);
     }