show quota errors when deployments fail
This commit is contained in:
parent
05135a346c
commit
a1c3cc6745
|
@ -2,7 +2,7 @@
|
||||||
import { onMount, onDestroy } from "svelte"
|
import { onMount, onDestroy } from "svelte"
|
||||||
import Spinner from "components/common/Spinner.svelte"
|
import Spinner from "components/common/Spinner.svelte"
|
||||||
import { slide } from "svelte/transition"
|
import { slide } from "svelte/transition"
|
||||||
import { Heading, Body, Button, Modal } from "@budibase/bbui"
|
import { Heading, Body, Button, Modal, ModalContent } from "@budibase/bbui"
|
||||||
import api from "builderStore/api"
|
import api from "builderStore/api"
|
||||||
import { notifier } from "builderStore/store/notifications"
|
import { notifier } from "builderStore/store/notifications"
|
||||||
import CreateWebhookDeploymentModal from "./CreateWebhookDeploymentModal.svelte"
|
import CreateWebhookDeploymentModal from "./CreateWebhookDeploymentModal.svelte"
|
||||||
|
@ -31,6 +31,8 @@
|
||||||
export let appId
|
export let appId
|
||||||
|
|
||||||
let modal
|
let modal
|
||||||
|
let errorReasonModal
|
||||||
|
let errorReason
|
||||||
let poll
|
let poll
|
||||||
let deployments = []
|
let deployments = []
|
||||||
let deploymentUrl = `https://${appId}.app.budi.live/${appId}`
|
let deploymentUrl = `https://${appId}.app.budi.live/${appId}`
|
||||||
|
@ -38,10 +40,35 @@
|
||||||
const formatDate = (date, format) =>
|
const formatDate = (date, format) =>
|
||||||
Intl.DateTimeFormat("en-GB", DATE_OPTIONS[format]).format(date)
|
Intl.DateTimeFormat("en-GB", DATE_OPTIONS[format]).format(date)
|
||||||
|
|
||||||
|
// Required to check any updated deployment statuses between polls
|
||||||
|
function checkIncomingDeploymentStatus(current, incoming) {
|
||||||
|
for (let incomingDeployment of incoming) {
|
||||||
|
if (incomingDeployment.status === DeploymentStatus.FAILURE) {
|
||||||
|
const currentDeployment = current.find(
|
||||||
|
deployment => deployment._id === incomingDeployment._id
|
||||||
|
)
|
||||||
|
|
||||||
|
// We have just been notified of an ongoing deployments failure
|
||||||
|
if (
|
||||||
|
!currentDeployment ||
|
||||||
|
currentDeployment.status === DeploymentStatus.PENDING
|
||||||
|
) {
|
||||||
|
showErrorReasonModal(incomingDeployment.err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function fetchDeployments() {
|
async function fetchDeployments() {
|
||||||
try {
|
try {
|
||||||
const response = await api.get(`/api/deployments`)
|
const response = await api.get(`/api/deployments`)
|
||||||
deployments = await response.json()
|
const json = await response.json()
|
||||||
|
|
||||||
|
if (deployments.length > 0) {
|
||||||
|
checkIncomingDeploymentStatus(deployments, json)
|
||||||
|
}
|
||||||
|
|
||||||
|
deployments = json
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
clearInterval(poll)
|
clearInterval(poll)
|
||||||
|
@ -49,6 +76,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function showErrorReasonModal(err) {
|
||||||
|
errorReason = err
|
||||||
|
errorReasonModal.show()
|
||||||
|
}
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
fetchDeployments()
|
fetchDeployments()
|
||||||
poll = setInterval(fetchDeployments, POLL_INTERVAL)
|
poll = setInterval(fetchDeployments, POLL_INTERVAL)
|
||||||
|
@ -86,11 +118,15 @@
|
||||||
<Spinner size="10" />
|
<Spinner size="10" />
|
||||||
{/if}
|
{/if}
|
||||||
<div class={`deployment-status ${deployment.status}`}>
|
<div class={`deployment-status ${deployment.status}`}>
|
||||||
{deployment.status}
|
<span>
|
||||||
|
{deployment.status}
|
||||||
|
{#if deployment.status === DeploymentStatus.FAILURE}
|
||||||
|
<i
|
||||||
|
class="ri-information-line"
|
||||||
|
on:click={() => showErrorReasonModal(deployment.err)} />
|
||||||
|
{/if}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{#if deployment.status === DeploymentStatus.FAILURE}
|
|
||||||
<span>{deployment.err}</span>
|
|
||||||
{/if}
|
|
||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
{/each}
|
{/each}
|
||||||
|
@ -100,6 +136,14 @@
|
||||||
<Modal bind:this={modal} width="30%">
|
<Modal bind:this={modal} width="30%">
|
||||||
<CreateWebhookDeploymentModal />
|
<CreateWebhookDeploymentModal />
|
||||||
</Modal>
|
</Modal>
|
||||||
|
<Modal bind:this={errorReasonModal} width="30%">
|
||||||
|
<ModalContent
|
||||||
|
title="Deployment Error"
|
||||||
|
confirmText="OK"
|
||||||
|
showCancelButton={false}>
|
||||||
|
{errorReason}
|
||||||
|
</ModalContent>
|
||||||
|
</Modal>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.deployment:nth-child(odd) {
|
.deployment:nth-child(odd) {
|
||||||
|
@ -198,5 +242,11 @@
|
||||||
.FAILURE {
|
.FAILURE {
|
||||||
color: var(--red);
|
color: var(--red);
|
||||||
background: var(--red-light);
|
background: var(--red-light);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
i {
|
||||||
|
position: relative;
|
||||||
|
top: 2px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script>
|
<script>
|
||||||
import { RichText } from '@budibase/bbui'
|
import { RichText } from "@budibase/bbui"
|
||||||
|
|
||||||
export let _bb
|
export let _bb
|
||||||
|
|
||||||
|
@ -16,29 +16,19 @@
|
||||||
// Need to determine what options we want to expose.
|
// Need to determine what options we want to expose.
|
||||||
|
|
||||||
let options = {
|
let options = {
|
||||||
"modules": {
|
modules: {
|
||||||
"toolbar": [
|
toolbar: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"header": [
|
header: [1, 2, 3, false],
|
||||||
1,
|
},
|
||||||
2,
|
|
||||||
3,
|
|
||||||
false
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
],
|
||||||
[
|
["bold", "italic", "underline", "strike"],
|
||||||
"bold",
|
],
|
||||||
"italic",
|
|
||||||
"underline",
|
|
||||||
"strike"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"placeholder": "Type something...",
|
placeholder: "Type something...",
|
||||||
"theme": "snow"
|
theme: "snow",
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<RichText bind:content {options} />
|
<RichText bind:content {options} />
|
||||||
|
|
Loading…
Reference in New Issue