Browse Source

fix: validation

Ahmad Kholid 2 years ago
parent
commit
8c02f76afc
5 changed files with 10 additions and 12 deletions
  1. 2 2
      src/background/index.js
  2. 2 4
      src/content/index.js
  3. 2 2
      src/newtab/App.vue
  4. 2 2
      src/params/App.vue
  5. 2 2
      src/popup/pages/Home.vue

+ 2 - 2
src/background/index.js

@@ -7,7 +7,7 @@ import getFile from '@/utils/getFile';
 import decryptFlow, { getWorkflowPass } from '@/utils/decryptFlow';
 import convertWorkflowData from '@/utils/convertWorkflowData';
 import getBlockMessage from '@/utils/getBlockMessage';
-import * as automa from '@business';
+import automa from '@business';
 import {
   registerSpecificDay,
   registerContextMenu,
@@ -645,6 +645,6 @@ message.on('workflow:register', ({ triggerBlock, workflowId }) => {
   registerWorkflowTrigger(workflowId, triggerBlock);
 });
 
-if (automa?.validate) automa.validate(message);
+automa('background', message);
 
 browser.runtime.onMessage.addListener(message.listener());

+ 2 - 4
src/content/index.js

@@ -2,7 +2,7 @@ import browser from 'webextension-polyfill';
 import findSelector from '@/lib/findSelector';
 import { toCamelCase } from '@/utils/helper';
 import { nanoid } from 'nanoid';
-import * as automa from '@business';
+import automa from '@business';
 import handleSelector from './handleSelector';
 import blocksHandler from './blocksHandler';
 import showExecutedBlock from './showExecutedBlock';
@@ -151,9 +151,7 @@ function messageListener({ data, source }) {
     // window.addEventListener('load', elementObserver);
   }
 
-  if (automa?.validateWithinContent) {
-    automa.validateWithinContent();
-  }
+  automa('content');
 
   browser.runtime.onMessage.addListener((data) => {
     return new Promise((resolve, reject) => {

+ 2 - 2
src/newtab/App.vue

@@ -69,7 +69,7 @@ import { useHostedWorkflowStore } from '@/stores/hostedWorkflow';
 import { useSharedWorkflowStore } from '@/stores/sharedWorkflow';
 import { loadLocaleMessages, setI18nLanguage } from '@/lib/vueI18n';
 import { getUserWorkflows } from '@/utils/api';
-import * as automa from '@business';
+import automa from '@business';
 import dbLogs from '@/db/logs';
 import dayjs from '@/lib/dayjs';
 import AppSurvey from '@/components/newtab/app/AppSurvey.vue';
@@ -230,7 +230,7 @@ browser.runtime.onMessage.addListener(({ type, data }) => {
     await dataMigration();
     await userStore.loadUser({ useCache: false, ttl: 2 });
 
-    if (automa?.validateWithinApp) await automa.validateWithinApp();
+    await automa('app');
 
     retrieved.value = true;
 

+ 2 - 2
src/params/App.vue

@@ -92,7 +92,7 @@
 import { onMounted, ref, computed } from 'vue';
 import browser from 'webextension-polyfill';
 import workflowParameters from '@business/parameters';
-import * as automa from '@business';
+import automa from '@business';
 import { useTheme } from '@/composable/theme';
 import dayjs from '@/lib/dayjs';
 import ParameterInputValue from '@/components/newtab/workflow/edit/Parameter/ParameterInputValue.vue';
@@ -225,7 +225,7 @@ onMounted(async () => {
     const workflowId = query.get('workflowId');
 
     if (workflowId) addWorkflow(workflowId);
-    if (automa?.validateWithinContent) await automa.validateWithinContent();
+    await automa('content');
 
     Object.assign(paramsList, workflowParameters());
   } catch (error) {

+ 2 - 2
src/popup/pages/Home.vue

@@ -127,7 +127,7 @@ import { useWorkflowStore } from '@/stores/workflow';
 import { useGroupTooltip } from '@/composable/groupTooltip';
 import { useTeamWorkflowStore } from '@/stores/teamWorkflow';
 import { useHostedWorkflowStore } from '@/stores/hostedWorkflow';
-import * as automa from '@business';
+import automa from '@business';
 import HomeWorkflowCard from '@/components/popup/home/HomeWorkflowCard.vue';
 import HomeTeamWorkflows from '@/components/popup/home/HomeTeamWorkflows.vue';
 import HomeStartRecording from '@/components/popup/home/HomeStartRecording.vue';
@@ -302,7 +302,7 @@ onMounted(async () => {
 
   let activeTab = localStorage.getItem('popup-tab') || 'local';
 
-  if (automa?.validateWithinApp) await automa.validateWithinApp();
+  await automa('app');
 
   if (activeTab === 'team' && !userStore.user?.teams) activeTab = 'local';
   else if (activeTab === 'host' && hostedWorkflowStore.toArray.length < 0)