diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte index 1a7ab59818..15200e111e 100644 --- a/packages/bbui/src/Form/Core/DatePicker.svelte +++ b/packages/bbui/src/Form/Core/DatePicker.svelte @@ -17,7 +17,7 @@ export let timeOnly = false export let ignoreTimezones = false export let time24hr = false - + export let range = false const dispatch = createEventDispatcher() const flatpickrId = `${uuid()}-wrapper` let open = false @@ -41,6 +41,7 @@ time_24hr: time24hr || false, altFormat: timeOnly ? "H:i" : enableTime ? "F j Y, H:i" : "F j, Y", wrap: true, + mode: range ? "range" : null, appendTo, disableMobile: "true", onReady: () => { @@ -64,9 +65,8 @@ if (newValue) { newValue = newValue.toISOString() } - // If time only set date component to 2000-01-01 - if (timeOnly) { + else if (timeOnly) { // Classic flackpickr causing issues. // When selecting a value for the first time for a "time only" field, // the time is always offset by 1 hour for some reason (regardless of time @@ -95,7 +95,11 @@ .slice(0, -1) } - dispatch("change", newValue) + if (range) { + dispatch("change", event.detail) + } else { + dispatch("change", newValue) + } } const clearDateOnBackspace = event => { @@ -160,7 +164,7 @@ {#key redrawOptions} { - value = e.detail + if (range) { + // Flatpickr cant take two dates and work out what to display, needs to be provided a string. + // Like - "Date1 to Date2". Hence passing in that specifically from the array + value = e?.detail[1] + } else { + value = e.detail + } dispatch("change", e.detail) } @@ -34,6 +40,7 @@ {time24hr} {appendTo} {ignoreTimezones} + {range} on:change={onChange} /> diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte index 246323244a..5004401d91 100644 --- a/packages/bbui/src/Table/CellRenderer.svelte +++ b/packages/bbui/src/Table/CellRenderer.svelte @@ -56,6 +56,7 @@ {schema} value={cellValue} on:clickrelationship + on:buttonclick > diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte index 01a2ca4835..7745c3c407 100644 --- a/packages/bbui/src/Table/Table.svelte +++ b/packages/bbui/src/Table/Table.svelte @@ -387,6 +387,7 @@ schema={schema[field]} value={deepGet(row, field)} on:clickrelationship + on:buttonclick > diff --git a/packages/builder/assets/backups-default.png b/packages/builder/assets/backups-default.png new file mode 100644 index 0000000000..6e37cbb6c7 Binary files /dev/null and b/packages/builder/assets/backups-default.png differ diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte new file mode 100644 index 0000000000..b9ca38cf72 --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte @@ -0,0 +1,114 @@ + + +
+ +
+ +
+ + {#if row.type !== "restore"} + Restore + Delete + Download + {/if} + Update + +
+ + + onClickRestore(name)} /> + + + + Are you sure you wish to delete the backup + {row.name} + This action cannot be undone. + + + + {row.name || "Backup"} + {new Date(row.timestamp).toLocaleString()} + + + + + + + diff --git a/packages/builder/src/components/portal/overview/backups/AppSizeRenderer.svelte b/packages/builder/src/components/portal/overview/backups/AppSizeRenderer.svelte new file mode 100644 index 0000000000..c103399f5b --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/AppSizeRenderer.svelte @@ -0,0 +1,41 @@ + + +
+ {#if automations != null && screens != null && datasources != null} +
+ +
{datasources || 0}
+
+
+ +
{screens || 0}
+
+
+ +
{automations || 0}
+
+ {/if} +
+ + diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte new file mode 100644 index 0000000000..958ee995c7 --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte @@ -0,0 +1,336 @@ + + +
+ {#if !$licensing.backupsEnabled} + + +
+ Backups + + Pro plan + +
+
+ + Backup your apps and restore them to their previous state. + {#if !$auth.accountPortalAccess && !$licensing.groupsEnabled && $admin.cloud} + Contact your account holder to upgrade your plan. + {/if} + +
+ +
+ {#if $auth.accountPortalAccess} + + {/if} + + +
+ + + {:else if backupData?.length > 0} + +
+
+ + + diff --git a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte new file mode 100644 index 0000000000..4ffb105772 --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte @@ -0,0 +1,27 @@ + + + confirm(name)} + title="Backup your current version" + confirmText="Confirm Restore" + disabled={!name} +> + Create a backup of your current app to allow you to roll back after + restoring this backup + + + + diff --git a/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte new file mode 100644 index 0000000000..198339dae9 --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/DatasourceRenderer.svelte @@ -0,0 +1,21 @@ + + +
+ {#if value != null} + +
{value || 0}
+ {/if} +
+ + diff --git a/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte b/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte new file mode 100644 index 0000000000..ec58c9ea07 --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/DateRenderer.svelte @@ -0,0 +1,22 @@ + + +
+ {timeSince} - +
+ + diff --git a/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte new file mode 100644 index 0000000000..3b3cce731d --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/StatusRenderer.svelte @@ -0,0 +1,15 @@ + + + + {status} + diff --git a/packages/builder/src/components/portal/overview/backups/TypeRenderer.svelte b/packages/builder/src/components/portal/overview/backups/TypeRenderer.svelte new file mode 100644 index 0000000000..9057a2adee --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/TypeRenderer.svelte @@ -0,0 +1,20 @@ + + +
+ {trigger} + {type} +
+ + diff --git a/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte b/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte new file mode 100644 index 0000000000..abab314d05 --- /dev/null +++ b/packages/builder/src/components/portal/overview/backups/UserRenderer.svelte @@ -0,0 +1,24 @@ + + +
+ {#if value != null} +
{username}
+ {/if} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 5d25bba0fc..a854d09304 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -113,18 +113,23 @@ > Access - {#if isPublished} - - $goto( - `../../portal/overview/${application}?tab=${encodeURIComponent( - "Automation History" - )}` - )} - > - Automation history - - {/if} + + $goto( + `../../portal/overview/${application}?tab=${encodeURIComponent( + "Automation History" + )}` + )} + > + Automation history + + + $goto(`../../portal/overview/${application}?tab=Backups`)} + > + Backups + + $goto(`../../portal/overview/${application}?tab=Settings`)} 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 fe0e2443a2..cc31eec348 100644 --- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte @@ -33,6 +33,7 @@ import ExportAppModal from "components/start/ExportAppModal.svelte" import { checkIncomingDeploymentStatus } from "components/deploy/utils" import { onDestroy, onMount } from "svelte" + import BackupsTab from "components/portal/overview/backups/BackupsTab.svelte" export let application @@ -318,16 +319,12 @@ - {#if isPublished} - - - - {/if} - {#if false} - -
Backups contents
- - {/if} + + + + + + diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js new file mode 100644 index 0000000000..328a9d37cc --- /dev/null +++ b/packages/builder/src/stores/portal/backups.js @@ -0,0 +1,52 @@ +import { writable } from "svelte/store" +import { API } from "api" + +export function createBackupsStore() { + const store = writable({}) + + function selectBackup(backupId) { + store.update(state => { + state.selectedBackup = backupId + return state + }) + } + + async function searchBackups({ + appId, + trigger, + type, + page, + startDate, + endDate, + }) { + return API.searchBackups({ appId, trigger, type, page, startDate, endDate }) + } + + async function restoreBackup({ appId, backupId, name }) { + return API.restoreBackup({ appId, backupId, name }) + } + + async function deleteBackup({ appId, backupId }) { + return API.deleteBackup({ appId, backupId }) + } + + async function createManualBackup(appId, name) { + return API.createManualBackup(appId, name) + } + + async function updateBackup({ appId, backupId, name }) { + return API.updateBackup({ appId, backupId, name }) + } + + return { + createManualBackup, + searchBackups, + selectBackup, + deleteBackup, + restoreBackup, + updateBackup, + subscribe: store.subscribe, + } +} + +export const backups = createBackupsStore() diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js index fa7aa7e3cf..5406ddc3dc 100644 --- a/packages/builder/src/stores/portal/index.js +++ b/packages/builder/src/stores/portal/index.js @@ -9,3 +9,4 @@ export { templates } from "./templates" export { licensing } from "./licensing" export { groups } from "./groups" export { plugins } from "./plugins" +export { backups } from "./backups" diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index 179dac9689..59a1622c9f 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -14,6 +14,7 @@ export const createLicensingStore = () => { isFreePlan: true, // features groupsEnabled: false, + backupsEnabled: false, // the currently used quotas from the db quotaUsage: undefined, // derived quota metrics for percentages used @@ -56,12 +57,17 @@ export const createLicensingStore = () => { const groupsEnabled = license.features.includes( Constants.Features.USER_GROUPS ) + const backupsEnabled = license.features.includes( + Constants.Features.BACKUPS + ) + store.update(state => { return { ...state, license, isFreePlan, groupsEnabled, + backupsEnabled, } }) }, diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js new file mode 100644 index 0000000000..8658815b15 --- /dev/null +++ b/packages/frontend-core/src/api/backups.js @@ -0,0 +1,50 @@ +export const buildBackupsEndpoints = API => ({ + /** + * Gets a list of users in the current tenant. + */ + searchBackups: async ({ appId, trigger, type, page, startDate, endDate }) => { + const opts = {} + if (page) { + opts.page = page + } + if (trigger && type) { + opts.trigger = trigger.toLowerCase() + opts.type = type.toLowerCase() + } + if (startDate && endDate) { + opts.startDate = startDate + opts.endDate = endDate + } + return await API.post({ + url: `/api/apps/${appId}/backups/search`, + body: opts, + }) + }, + + createManualBackup: async ({ appId, name }) => { + return await API.post({ + url: `/api/apps/${appId}/backups`, + body: { name }, + }) + }, + + deleteBackup: async ({ appId, backupId }) => { + return await API.delete({ + url: `/api/apps/${appId}/backups/${backupId}`, + }) + }, + + updateBackup: async ({ appId, backupId, name }) => { + return await API.patch({ + url: `/api/apps/${appId}/backups/${backupId}`, + body: { name }, + }) + }, + + restoreBackup: async ({ appId, backupId, name }) => { + return await API.post({ + url: `/api/apps/${appId}/backups/${backupId}/import`, + body: { name }, + }) + }, +}) diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js index 3b9bb5b57e..9a40b21351 100644 --- a/packages/frontend-core/src/api/index.js +++ b/packages/frontend-core/src/api/index.js @@ -25,6 +25,7 @@ import { buildViewEndpoints } from "./views" import { buildLicensingEndpoints } from "./licensing" import { buildGroupsEndpoints } from "./groups" import { buildPluginEndpoints } from "./plugins" +import { buildBackupsEndpoints } from "./backups" const defaultAPIClientConfig = { /** @@ -245,5 +246,6 @@ export const createAPIClient = config => { ...buildLicensingEndpoints(API), ...buildGroupsEndpoints(API), ...buildPluginEndpoints(API), + ...buildBackupsEndpoints(API), } } diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 9a5acf8a9b..1eed492c25 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -113,6 +113,7 @@ export const ApiVersion = "1" export const Features = { USER_GROUPS: "userGroups", + BACKUPS: "appBackups", } // Role IDs