From 2ff853c917100ee696921c49ca509475ce0f9ae8 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 21 Jun 2022 00:02:22 +0100 Subject: [PATCH] Adding in main portal page automation error notification. --- .../bbui/src/Notification/Notification.svelte | 25 ++++++++++- .../Notification/NotificationDisplay.svelte | 4 +- packages/bbui/src/Stores/notifications.js | 30 ++++++++++--- .../builderStore/store/automation/index.js | 1 + .../overview/HistoryDetailsPanel.svelte | 21 ++++++--- .../portal/overview/HistoryTab.svelte | 2 +- .../pages/builder/portal/apps/index.svelte | 45 ++++++++++++++++++- .../overview/[application]/index.svelte | 4 ++ 8 files changed, 114 insertions(+), 18 deletions(-) diff --git a/packages/bbui/src/Notification/Notification.svelte b/packages/bbui/src/Notification/Notification.svelte index 1d21131553..53ab062701 100644 --- a/packages/bbui/src/Notification/Notification.svelte +++ b/packages/bbui/src/Notification/Notification.svelte @@ -1,15 +1,20 @@ -
+
{#if icon} {/if} -
+
{message || ""}
+ {#if action} + +
{actionMessage}
+ + {/if}
{#if dismissable}
@@ -46,4 +56,15 @@ .spectrum-Toast { pointer-events: all; } + + .wide { + width: 100%; + } + + .actionBody { + justify-content: space-between; + display: flex; + width: 100%; + align-items: center; + } diff --git a/packages/bbui/src/Notification/NotificationDisplay.svelte b/packages/bbui/src/Notification/NotificationDisplay.svelte index eb778f3aa0..0b846f06ce 100644 --- a/packages/bbui/src/Notification/NotificationDisplay.svelte +++ b/packages/bbui/src/Notification/NotificationDisplay.svelte @@ -8,13 +8,15 @@
- {#each $notifications as { type, icon, message, id, dismissable } (id)} + {#each $notifications as { type, icon, message, id, dismissable, action, wide } (id)}
notifications.dismiss(id)} />
diff --git a/packages/bbui/src/Stores/notifications.js b/packages/bbui/src/Stores/notifications.js index 74eed8628a..449d282f24 100644 --- a/packages/bbui/src/Stores/notifications.js +++ b/packages/bbui/src/Stores/notifications.js @@ -20,7 +20,16 @@ export const createNotificationStore = () => { setTimeout(() => (block = false), timeout) } - const send = (message, type = "default", icon = "", autoDismiss = true) => { + const send = ( + message, + { + type = "default", + icon = "", + autoDismiss = true, + action = null, + wide = false, + } + ) => { if (block) { return } @@ -28,7 +37,15 @@ export const createNotificationStore = () => { _notifications.update(state => { return [ ...state, - { id: _id, type, message, icon, dismissable: !autoDismiss }, + { + id: _id, + type, + message, + icon, + dismissable: !autoDismiss, + action, + wide, + }, ] }) if (autoDismiss) { @@ -50,10 +67,11 @@ export const createNotificationStore = () => { return { subscribe, send, - info: msg => send(msg, "info", "Info"), - error: msg => send(msg, "error", "Alert", false), - warning: msg => send(msg, "warning", "Alert"), - success: msg => send(msg, "success", "CheckmarkCircle"), + info: msg => send(msg, { type: "info", icon: "Info" }), + error: msg => + send(msg, { type: "error", icon: "Alert", autoDismiss: false }), + warning: msg => send(msg, { type: "warning", icon: "Alert" }), + success: msg => send(msg, { type: "success", icon: "CheckmarkCircle" }), blockNotifications, dismiss: dismissNotification, } diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/builderStore/store/automation/index.js index af47b6ec38..f7db448693 100644 --- a/packages/builder/src/builderStore/store/automation/index.js +++ b/packages/builder/src/builderStore/store/automation/index.js @@ -129,6 +129,7 @@ const automationActions = store => ({ page, }) }, + clearLogErrors: async () => {}, addTestDataToAutomation: data => { store.update(state => { state.selectedAutomation.addTestData(data) diff --git a/packages/builder/src/components/portal/overview/HistoryDetailsPanel.svelte b/packages/builder/src/components/portal/overview/HistoryDetailsPanel.svelte index cb384c8007..f540d587eb 100644 --- a/packages/builder/src/components/portal/overview/HistoryDetailsPanel.svelte +++ b/packages/builder/src/components/portal/overview/HistoryDetailsPanel.svelte @@ -4,10 +4,15 @@ import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte" import TestDisplay from "components/automation/AutomationBuilder/TestDisplay.svelte" import { goto } from "@roxi/routify" + import { automationStore } from "builderStore" export let history export let appId export let close + + $: exists = $automationStore.automations?.find( + auto => auto._id === history?.automationId + ) {#if history} @@ -28,13 +33,15 @@
{history.automationName}
- - $goto(`../../../app/${appId}/automate/${history.automationId}`)} - >Edit automation + {#if exists} + + $goto(`../../../app/${appId}/automate/${history.automationId}`)} + >Edit automation + {/if}
diff --git a/packages/builder/src/components/portal/overview/HistoryTab.svelte b/packages/builder/src/components/portal/overview/HistoryTab.svelte index a2b9879d54..a52b236697 100644 --- a/packages/builder/src/components/portal/overview/HistoryTab.svelte +++ b/packages/builder/src/components/portal/overview/HistoryTab.svelte @@ -126,7 +126,7 @@ />
- {#if runHistory} + {#if runHistory && runHistory.length} { const userWelcome = auth?.user?.firstName @@ -59,7 +61,8 @@ ) $: lockedApps = filteredApps.filter(app => app?.lockedYou || app?.lockedOther) - $: unlocked = lockedApps?.length == 0 + $: unlocked = lockedApps?.length === 0 + $: automationErrors = getAutomationErrors(enrichedApps) const enrichApps = (apps, user, sortBy) => { const enrichedApps = apps.map(app => ({ @@ -89,6 +92,33 @@ } } + const getAutomationErrors = apps => { + const automationErrors = {} + for (let app of apps) { + if (app.automationErrors) { + automationErrors[app.devId] = app.automationErrors + } + } + return automationErrors + } + + const goToAutomationError = appId => { + const params = new URLSearchParams({ tab: "Automation History" }) + $goto(`../overview/${appId}?${params.toString()}`) + } + + const errorCount = appId => { + return Object.values(automationErrors[appId]).reduce( + (prev, next) => prev + next, + 0 + ) + } + + const automationErrorMessage = appId => { + const app = enrichedApps.find(app => app.devId === appId) + return `${app.name} - Automation error (${errorCount(appId)})` + } + const initiateAppCreation = () => { if ($apps?.length) { $goto("/builder/portal/apps/create") @@ -208,6 +238,19 @@ {#if loaded} + {#if automationErrors} + {#each Object.keys(automationErrors) as appId} + goToAutomationError(appId)} + type="error" + icon="Alert" + actionMessage={errorCount(appId) > 1 ? "View errors" : "View error"} + message={automationErrorMessage(appId)} + /> + {/each} + {/if}
diff --git a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte index 38988af0dd..4ff67c21ef 100644 --- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte @@ -188,6 +188,10 @@ }) onMount(async () => { + const params = new URLSearchParams(window.location.search) + if (params.get("tab")) { + selectedTab = params.get("tab") + } try { if (!apps.length) { await apps.load()