Wab post release minor bug fixes (baserow#4283)

* Fix missing early return when data source is missing

* Fix missing file_import job type in frontend registry

* Restore trigger waiting message

* Tweak the margin-bottom if the first alert. If there's an alert below it, the combination of bottom+top is too much.

---------

Co-authored-by: peter_baserow <peter@baserow.io>

Author: jrmi

web-frontend/modules/automation/components/form/SimulateDispatchNodeForm.vue

@@ -10,20 +10,34 @@
       {{ buttonLabel }}
     </Button>
 
-    <Alert v-if="cantBeTestedReason" type="info-neutral">
+    <Alert
+      v-if="cantBeTestedReason"
+      type="info-neutral"
+      class="margin-bottom-0"
+    >
       <p>{{ cantBeTestedReason }}</p>
     </Alert>
 
-    <Alert v-else-if="showTestNodeDescription" type="info-neutral">
-      <p>{{ $t('simulateDispatch.testNodeDescription') }}</p>
+    <Alert
+      v-if="isLoading"
+      :type="nodeType.isTrigger ? 'warning' : 'info-neutral'"
+    >
+      <p>
+        {{
+          nodeType.isTrigger
+            ? $t('simulateDispatch.triggerNodeAwaitingEvent')
+            : $t('simulateDispatch.simulationInProgress')
+        }}
+      </p>
     </Alert>
-
-    <Alert v-else-if="isLoading" type="info-neutral">
-      <p>{{ $t('simulateDispatch.triggerNodeAwaitingEvent') }}</p>
+    <Alert v-else-if="!hasSampleData" type="info-neutral">
+      <p>
+        {{ $t('simulateDispatch.testNodeDescription') }}
+      </p>
     </Alert>
 
     <div
-      v-if="hasSampleData && !isSimulating"
+      v-if="hasSampleData && !isLoading"
       :class="{
         'simulate-dispatch-node__sample-data--error': isErrorSample,
       }"
@@ -185,14 +199,6 @@ const buttonLabel = computed(() => {
     : app.i18n.t('simulateDispatch.buttonLabelTest')
 })
 
-const showTestNodeDescription = computed(() => {
-  if (Boolean(cantBeTestedReason.value) || hasSampleData.value) {
-    return false
-  }
-
-  return true
-})
-
 const simulateDispatchNode = async () => {
   queryInProgress.value = true
 

web-frontend/modules/automation/locales/en.json

@@ -183,6 +183,7 @@
   "simulateDispatch": {
     "sampleDataLabel": "Output",
     "triggerNodeAwaitingEvent": "The node is waiting. Please manually trigger the event to populate the payload and complete the test.",
+    "simulationInProgress": "Node test is in progress...",
     "errorNodeNotConfigured": "The node must be configured before it can be tested.",
     "errorPreviousNodeNotConfigured": "The previous node \"{node}\" must be configured.",
     "errorPreviousNodesNotTested": "The previous node \"{node}\" must be tested first.",

web-frontend/modules/builder/elementTypes.js

@@ -904,6 +904,10 @@ export class ElementType extends Registerable {
       element: mainElement,
     })
 
+    if (!mainDataSource) {
+      return null
+    }
+
     const mainDataSourceType = this.app.$registry.get(
       'service',
       mainDataSource.type

web-frontend/modules/database/jobTypes.js

@@ -70,3 +70,13 @@ export class SyncDataSyncTableJobType extends JobType {
     return 'syncDataSyncTable'
   }
 }
+
+export class FileImportJobType extends JobType {
+  static getType() {
+    return 'file_import'
+  }
+
+  getName() {
+    return 'fileImport'
+  }
+}

web-frontend/modules/database/plugin.js

@@ -2,6 +2,7 @@ import { DatabaseApplicationType } from '@baserow/modules/database/applicationTy
 import {
   DuplicateTableJobType,
   SyncDataSyncTableJobType,
+  FileImportJobType,
 } from '@baserow/modules/database/jobTypes'
 import {
   GridViewType,
@@ -411,6 +412,7 @@ export default (context) => {
 
   app.$registry.register('job', new DuplicateTableJobType(context))
   app.$registry.register('job', new SyncDataSyncTableJobType(context))
+  app.$registry.register('job', new FileImportJobType(context))
 
   app.$registry.register('view', new GridViewType(context))
   app.$registry.register('view', new GalleryViewType(context))