MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR feedback and removed some comments

This commit is contained in:
Dean 2023-06-23 11:56:59 +01:00
parent 2bdf855217
commit fd8400bee5
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/builder/src/stores/portal/licensing.js
View File

@ -76,12 +76,9 @@ export const createLicensingStore = () => {
await actions.setQuotaUsage() await actions.setQuotaUsage()
}, },
setNavigation: () => { setNavigation: () => {
//"/builder/portal/account/upgrade"
const adminStore = get(admin) const adminStore = get(admin)
const authStore = get(auth) const authStore = get(auth)
//Add cloud check here too???
const upgradeUrl = authStore?.user?.accountPortalAccess const upgradeUrl = authStore?.user?.accountPortalAccess
? `${adminStore.accountPortalUrl}/portal/upgrade` ? `${adminStore.accountPortalUrl}/portal/upgrade`
: "/builder/portal/account/upgrade" : "/builder/portal/account/upgrade"

5
packages/client/src/components/ClientApp.svelte
View File

@ -90,8 +90,7 @@
builderStore.actions.notifyLoaded() builderStore.actions.notifyLoaded()
} else { } else {
builderStore.actions.analyticsPing({ builderStore.actions.analyticsPing({
source: "app", embedded: !!$appStore.embedded,
...{ embedded: $appStore.embedded || undefined },
}) })
} }
}) })
@ -169,7 +168,7 @@
<Layout justifyItems="center" gap="S"> <Layout justifyItems="center" gap="S">
{@html ErrorSVG} {@html ErrorSVG}
<Heading size="L"> <Heading size="L">
Your application could not be loaded This Budibase app is not publicly accessible
</Heading> </Heading>
</Layout> </Layout>
</div> </div>

4
packages/client/src/index.js
View File

@ -46,7 +46,9 @@ const loadBudibase = async () => {
appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"]) appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"])
// Set the flag used to determine if the app is being loaded via an iframe // Set the flag used to determine if the app is being loaded via an iframe
appStore.actions.setAppEmbedded(window["##BUDIBASE_APP_EMBEDDED##"] == "true") appStore.actions.setAppEmbedded(
window["##BUDIBASE_APP_EMBEDDED##"] === "true"
)
// Fetch environment info // Fetch environment info
if (!get(environmentStore)?.loaded) { if (!get(environmentStore)?.loaded) {

5
packages/server/src/api/controllers/static/index.ts
View File

@ -100,9 +100,8 @@ export const deleteObjects = async function (ctx: any) {
} }
export const serveApp = async function (ctx: any) { export const serveApp = async function (ctx: any) {
const bbHeaderEmbed = ctx.request.get("x-budibase-embed") const bbHeaderEmbed =
? ctx.get("x-budibase-embed").toLowerCase() == "true" ctx.request.get("x-budibase-embed")?.toLowerCase() === "true"
: false
//Public Settings //Public Settings
const { config } = await configs.getSettingsConfigDoc() const { config } = await configs.getSettingsConfigDoc()