Merge pull request #12452 from Budibase/pricing-prerelease

banner changes for new pricing, fix for onboarding to prevent flash o…
This commit is contained in:
Martin McKeaveney 2023-11-28 09:11:27 +00:00 committed by GitHub
commit 02c4a3153a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions

View File

@ -260,12 +260,12 @@ export async function listAllObjects(bucketName: string, path: string) {
}
/**
* Generate a presigned url with a default TTL of 1 hour
* Generate a presigned url with a default TTL of 36 hours
*/
export function getPresignedUrl(
bucketName: string,
key: string,
durationSeconds: number = 3600
durationSeconds: number = 129600
) {
const objectStore = ObjectStore(bucketName, { presigning: true })
const params = {

View File

@ -14,7 +14,7 @@
import PortalSideBar from "./_components/PortalSideBar.svelte"
// Don't block loading if we've already hydrated state
let loaded = $apps.length != null
let loaded = !!$apps?.length
onMount(async () => {
try {

View File

@ -1,5 +1,6 @@
<script>
import {
banner,
Heading,
Layout,
Button,
@ -10,6 +11,7 @@
Notification,
Body,
Search,
BANNER_TYPES,
} from "@budibase/bbui"
import Spinner from "components/common/Spinner.svelte"
import CreateAppModal from "components/start/CreateAppModal.svelte"
@ -198,6 +200,20 @@
if (usersLimitLockAction) {
usersLimitLockAction()
}
if (!$admin.isDev) {
await banner.show({
messages: [
{
message:
"We've updated our pricing - read the blog post to learn more.",
type: BANNER_TYPES.NEUTRAL,
extraButtonText: "Learn More",
extraButtonAction: () =>
window.open("https://budibase.com/pricing"),
},
],
})
}
} catch (error) {
notifications.error("Error getting init info")
}

@ -1 +1 @@
Subproject commit 618613f3575b01f74940d9f58fdb53a9a5b2dc1a
Subproject commit 1037b032d49244678204704d1bca779a29e395eb