Skip to content

Commit

Permalink
Merge pull request #12452 from Budibase/pricing-prerelease
Browse files Browse the repository at this point in the history
banner changes for new pricing, fix for onboarding to prevent flash o…
  • Loading branch information
shogunpurple authored Nov 28, 2023
2 parents bcaad6c + 3a0d409 commit 02c4a31
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/backend-core/src/objectStore/objectStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
16 changes: 16 additions & 0 deletions packages/builder/src/pages/builder/portal/apps/index.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script>
import {
banner,
Heading,
Layout,
Button,
Expand All @@ -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"
Expand Down Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion packages/pro
Submodule pro updated from 618613 to 1037b0

0 comments on commit 02c4a31

Please sign in to comment.