From 1041eeb4b090010861610b3eeb8dc816e0649835 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 10 Nov 2023 09:57:18 +0100 Subject: [PATCH] nit error/recovery handler initial load --- frontend/package-lock.json | 73 ------------------- .../components/ErrorOrRecoveryHandler.svelte | 12 ++- 2 files changed, 8 insertions(+), 77 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 47cb9ddc0a..83c1be3271 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -10,8 +10,6 @@ "license": "AGPL-3.0", "dependencies": { "@aws-crypto/sha256-js": "^4.0.0", - "@fortawesome/free-brands-svg-icons": "^6.2.1", - "@fortawesome/free-solid-svg-icons": "^6.2.1", "@leeoniya/ufuzzy": "^1.0.8", "@popperjs/core": "^2.11.6", "@redocly/json-to-json-schema": "^0.0.1", @@ -88,7 +86,6 @@ "style-to-object": "^0.4.1", "stylelint-config-recommended": "^13.0.0", "svelte": "^4.0.0", - "svelte-awesome": "^3.2.1", "svelte-awesome-color-picker": "^2.4.5", "svelte-check": "^3.4.3", "svelte-floating-ui": "^1.5.3", @@ -912,39 +909,6 @@ "@floating-ui/core": "^1.3.1" } }, - "node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", - "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==", - "hasInstallScript": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/free-brands-svg-icons": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.0.tgz", - "integrity": "sha512-qvxTCo0FQ5k2N+VCXb/PZQ+QMhqRVM4OORiO6MXdG6bKolIojGU/srQ1ptvKk0JTbRgaJOfL2qMqGvBEZG7Z6g==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", - "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", @@ -8935,15 +8899,6 @@ "autosize": "*" } }, - "node_modules/svelte-awesome": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/svelte-awesome/-/svelte-awesome-3.2.1.tgz", - "integrity": "sha512-4jckcBktldqgmHUWg1xvl3vCrZllt5YSSsPun4NW7dOp9VZx1mOqJ9ddkYCH7O3PJN4ntucJr5P9/6q2xvw/0A==", - "dev": true, - "peerDependencies": { - "svelte": "^3.43.1 || ^4.0.0" - } - }, "node_modules/svelte-awesome-color-picker": { "version": "2.4.5", "resolved": "https://registry.npmjs.org/svelte-awesome-color-picker/-/svelte-awesome-color-picker-2.4.5.tgz", @@ -10794,27 +10749,6 @@ "@floating-ui/core": "^1.3.1" } }, - "@fortawesome/fontawesome-common-types": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", - "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==" - }, - "@fortawesome/free-brands-svg-icons": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.0.tgz", - "integrity": "sha512-qvxTCo0FQ5k2N+VCXb/PZQ+QMhqRVM4OORiO6MXdG6bKolIojGU/srQ1ptvKk0JTbRgaJOfL2qMqGvBEZG7Z6g==", - "requires": { - "@fortawesome/fontawesome-common-types": "6.4.0" - } - }, - "@fortawesome/free-solid-svg-icons": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", - "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", - "requires": { - "@fortawesome/fontawesome-common-types": "6.4.0" - } - }, "@humanwhocodes/config-array": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", @@ -16492,13 +16426,6 @@ "autosize": "*" } }, - "svelte-awesome": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/svelte-awesome/-/svelte-awesome-3.2.1.tgz", - "integrity": "sha512-4jckcBktldqgmHUWg1xvl3vCrZllt5YSSsPun4NW7dOp9VZx1mOqJ9ddkYCH7O3PJN4ntucJr5P9/6q2xvw/0A==", - "dev": true, - "requires": {} - }, "svelte-awesome-color-picker": { "version": "2.4.5", "resolved": "https://registry.npmjs.org/svelte-awesome-color-picker/-/svelte-awesome-color-picker-2.4.5.tgz", diff --git a/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte b/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte index ba325ddc4f..209502cb87 100644 --- a/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte +++ b/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte @@ -9,7 +9,7 @@ import { JobService, Script, ScriptService, WorkspaceService } from '$lib/gen' import { inferArgs } from '$lib/infer' - import { CheckCircle2, RotateCw, XCircle } from 'lucide-svelte' + import { CheckCircle2, Loader2, RotateCw, XCircle } from 'lucide-svelte' const slackRecoveryHandler = 'hub/2430/slack/schedule-recovery-handler-slack' const slackHandlerScriptPath = 'hub/6512/workspace-or-schedule-error-handler-slack' @@ -30,7 +30,7 @@ let customHandlerSchema: Schema | undefined let slackHandlerSchema: Schema | undefined - let workspaceConnectedToSlack: boolean + let workspaceConnectedToSlack: boolean | undefined = undefined let slackConnectionTestJob: | { uuid: string; is_success: boolean; in_progress: boolean } | undefined @@ -39,6 +39,8 @@ const settings = await WorkspaceService.getSettings({ workspace: $workspaceStore! }) if (!emptyString(settings.slack_name) && !emptyString(settings.slack_team_id)) { workspaceConnectedToSlack = true + } else { + workspaceConnectedToSlack = false } } @@ -263,9 +265,11 @@ shouldHideNoInputs class="text-xs" /> + {:else if workspaceConnectedToSlack == undefined} + {/if} - {#if enterpriseLicense && isSlackHandler(handlerPath)} - {#if !workspaceConnectedToSlack} + {#if $enterpriseLicense && isSlackHandler(handlerPath)} + {#if workspaceConnectedToSlack == false}