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

Feedback changes. Permission change for app delete from GLOBAL_BUILDER to BUILDER. Minor updates to quota behaviour for apps.

This commit is contained in:
Dean 2024-03-05 16:23:39 +00:00
parent 3716054313
commit 320b443ca4
12 changed files with 144 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/builder/src/components/deploy/DeleteModal.svelte
View File

@ -56,9 +56,10 @@
disabled={deletionConfirmationAppName !== appName || deleting}
>
Are you sure you want to delete
<b class="app-name" role="button" tabindex={-1} on:click={copyName}>
<span class="app-name" role="button" tabindex={-1} on:click={copyName}>
{appName}
</b>?
</span>?
<br />
Please enter the app name below to confirm.
<br /><br />
@ -68,5 +69,7 @@
<style>
.app-name {
cursor: pointer;
font-weight: bold;
display: inline-block;
}
</style>

10
packages/builder/src/components/portal/licensing/AppLimitModal.svelte
View File

@ -31,17 +31,11 @@
: null}
>
<Body>
You are currently on our <span class="free-plan">Free plan</span>. Upgrade
to our Pro plan to get unlimited apps and additional features.
You have exceeded the app limit for your current plan. Upgrade to get
unlimited apps and additional features!
</Body>
{#if !$auth.user.accountPortalAccess}
<Body>Please contact the account holder to upgrade.</Body>
{/if}
</ModalContent>
</Modal>
<style>
.free-plan {
font-weight: 600;
}
</style>

23
packages/builder/src/components/start/AppRowContext.svelte
View File

@ -1,8 +1,10 @@
<script>
import { ActionMenu, MenuItem, Icon, Modal } from "@budibase/bbui"
import DeleteModal from "components/deploy/DeleteModal.svelte"
import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
import ExportAppModal from "./ExportAppModal.svelte"
import DuplicateAppModal from "./DuplicateAppModal.svelte"
import { auth, licensing } from "stores/portal"
export let app
export let align = "right"
@ -11,21 +13,32 @@
let exportModal
let duplicateModal
let exportPublishedVersion = false
let appLimitModal
</script>
<DeleteModal
bind:this={deleteModal}
appId={app.devId}
appName={app.name}
onDeleteSuccess={() => {}}
onDeleteSuccess={async () => {
await licensing.init()
}}
/>
<AppLimitModal bind:this={appLimitModal} />
<Modal bind:this={exportModal} padding={false}>
<ExportAppModal {app} published={exportPublishedVersion} />
</Modal>
<Modal bind:this={duplicateModal} padding={false}>
<DuplicateAppModal appId={app.devId} appName={app.name} />
<DuplicateAppModal
appId={app.devId}
appName={app.name}
onDuplicateSuccess={async () => {
await licensing.init()
}}
/>
</Modal>
<ActionMenu {align} on:open on:close>
@ -35,7 +48,11 @@
<MenuItem
icon="Copy"
on:click={() => {
duplicateModal.show()
if ($licensing?.usageMetrics?.apps < 100) {
duplicateModal.show()
} else {
appLimitModal.show()
}
}}
>
Duplicate

2
packages/builder/src/components/start/DuplicateAppModal.svelte
View File

@ -15,6 +15,7 @@
export let appId
export let appName
export let onDuplicateSuccess = () => {}
const validation = createValidationStore()
const values = writable({ name: appName + " copy", url: null })
@ -68,6 +69,7 @@
try {
await API.duplicateApp(data, appId)
apps.load()
onDuplicateSuccess()
notifications.success("App duplicated successfully")
} catch (err) {
notifications.error("Error duplicating app")

1
packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
View File

@ -4,6 +4,7 @@
import { url, isActive } from "@roxi/routify"
import DeleteModal from "components/deploy/DeleteModal.svelte"
import { isOnlyUser, appStore } from "stores/builder"
import { auth } from "stores/portal"
let deleteModal
</script>

25
packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
View File

@ -1,10 +1,11 @@
<script>
import { apps, sideBarCollapsed } from "stores/portal"
import { apps, sideBarCollapsed, auth } from "stores/portal"
import { params, goto } from "@roxi/routify"
import NavItem from "components/common/NavItem.svelte"
import NavHeader from "components/common/NavHeader.svelte"
import AppRowContext from "components/start/AppRowContext.svelte"
import { AppStatus } from "constants"
import { sdk } from "@budibase/shared-core"
let searchString
let opened
@ -54,16 +55,18 @@
highlighted={opened == app.appId}
on:click={() => $goto(`./${app.appId}`)}
>
<AppRowContext
{app}
align="left"
on:open={() => {
opened = app.appId
}}
on:close={() => {
opened = null
}}
/>
{#if sdk.users.isBuilder($auth.user, app?.devId)}
<AppRowContext
{app}
align="left"
on:open={() => {
opened = app.appId
}}
on:close={() => {
opened = null
}}
/>
{/if}
</NavItem>
{/each}
</div>

46
packages/server/src/api/controllers/application.ts
View File

@ -51,6 +51,8 @@ import {
CreateAppRequest,
FetchAppDefinitionResponse,
FetchAppPackageResponse,
DuplicateAppRequest,
DuplicateAppResponse,
} from "@budibase/types"
import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts"
import sdk from "../../sdk"
@ -378,7 +380,7 @@ async function creationEvents(request: any, app: App) {
creationFns.push(a => events.app.fileImported(a))
}
// from server file path
else if (request.body.file && request.duplicate) {
else if (request.body.file) {
// explicitly pass in the newly created app id
creationFns.push(a => events.app.duplicated(a, app.appId))
}
@ -407,7 +409,7 @@ async function appPostCreate(ctx: UserCtx, app: App) {
await creationEvents(ctx.request, app)
// app import & template creation
// app import, template creation and duplication
if (ctx.request.body.useTemplate === "true") {
const { rows } = await getUniqueRows([app.appId])
const rowCount = rows ? rows.length : 0
@ -436,7 +438,7 @@ async function appPostCreate(ctx: UserCtx, app: App) {
}
}
export async function create(ctx: UserCtx) {
export async function create(ctx: UserCtx<CreateAppRequest, App>) {
const newApplication = await quotas.addApp(() => performAppCreate(ctx))
await appPostCreate(ctx, newApplication)
await cache.bustCache(cache.CacheKey.CHECKLIST)
@ -645,7 +647,9 @@ export async function importToApp(ctx: UserCtx) {
* Create a copy of the latest dev application.
* Performs an export of the app, then imports from the export dir path
*/
export async function duplicateApp(ctx: UserCtx) {
export async function duplicateApp(
ctx: UserCtx<DuplicateAppRequest, DuplicateAppResponse>
) {
const { name: appName, url: possibleUrl } = ctx.request.body
const { appId: sourceAppId } = ctx.params
const [app] = await dbCore.getAppsByIDs([sourceAppId])
@ -665,24 +669,28 @@ export async function duplicateApp(ctx: UserCtx) {
tar: false,
})
// Build a create request that triggers an import from the export path above.
const createReq: any = {
request: {
body: {
name: appName,
url: possibleUrl,
useTemplate: "true",
file: {
path: tmpPath,
},
},
// Mark the create as a duplicate to kick off the correct event.
duplicate: true,
const createRequestBody: CreateAppRequest = {
name: appName,
url: possibleUrl,
useTemplate: "true",
// The app export path
file: {
path: tmpPath,
},
}
await create(createReq)
const { body: newApplication } = createReq
// Build a new request
const createRequest = {
roleId: ctx.roleId,
user: ctx.user,
request: {
body: createRequestBody,
},
} as UserCtx<CreateAppRequest, App>
// Build the new application
await create(createRequest)
const { body: newApplication } = createRequest
if (!newApplication) {
ctx.throw(500, "There was a problem duplicating the application")

4
packages/server/src/api/routes/application.ts
View File

@ -55,12 +55,12 @@ router
)
.delete(
"/api/applications/:appId",
authorized(permissions.GLOBAL_BUILDER),
authorized(permissions.BUILDER),
controller.destroy
)
.post(
"/api/applications/:appId/duplicate",
authorized(permissions.GLOBAL_BUILDER),
authorized(permissions.BUILDER),
controller.duplicateApp
)
.post(

124
packages/server/src/api/routes/tests/application.spec.ts
View File

@ -95,40 +95,13 @@ describe("/applications", () => {
})
it("should reject with a known name", async () => {
let createError
const app = config.getApp()
expect(app).toBeDefined()
try {
await config.createApp(app?.name!)
} catch (err: any) {
createError = err
// Must be reset back to its original value or it breaks all
// subsequent tests
config.appId = app?.appId!
}
expect(createError).toBeDefined()
expect(createError.message).toEqual(
"Error 400 - App name is already in use."
)
await config.api.application.create({ name: app.name }, { status: 400 })
})
it("should reject with a known url", async () => {
let createError
const app = config.getApp()
expect(app).toBeDefined()
try {
await config.createApp("made up", app?.url!)
} catch (err: any) {
createError = err
config.appId = app?.appId!
}
expect(createError).toBeDefined()
expect(createError.message).toEqual(
"Error 400 - App URL is already in use."
await config.api.application.create(
{ name: "made up", url: app?.url! },
{ status: 400 }
)
})
})
@ -268,73 +241,60 @@ describe("/applications", () => {
describe("POST /api/applications/:appId/duplicate", () => {
it("should duplicate an existing app", async () => {
await config.createApp("to-dupe")
const sourceAppId = config.getProdAppId()
const resp = await config.duplicateApp(sourceAppId, {
name: "to-dupe copy",
url: "/to-dupe-copy",
})
const resp = await config.api.application.duplicateApp(
app.appId,
{
name: "to-dupe copy",
url: "/to-dupe-copy",
},
{
status: 200,
}
)
expect(events.app.duplicated).toBeCalled()
expect(resp.duplicateAppId).toBeDefined()
expect(resp.sourceAppId).toEqual(sourceAppId)
expect(resp.duplicateAppId).not.toEqual(sourceAppId)
expect(resp.sourceAppId).toEqual(app.appId)
expect(resp.duplicateAppId).not.toEqual(app.appId)
})
it("should reject an unknown app id with a 404", async () => {
let dupeError
try {
await config.duplicateApp("app_fake", {
name: "to-dupe copy",
url: "/to-dupe-copy",
})
} catch (err: any) {
dupeError = err
}
expect(dupeError).toBeDefined()
expect(dupeError.message).toEqual("Error 404 - Source app not found")
await config.api.application.duplicateApp(
app.appId.slice(0, -1) + "a",
{
name: "to-dupe 123",
url: "/to-dupe-123",
},
{
status: 404,
}
)
})
it("should reject with a known name", async () => {
await config.createApp("known name")
const sourceAppId = config.getProdAppId()
let dupeError
try {
await config.duplicateApp(sourceAppId, {
name: "known name",
const resp = await config.api.application.duplicateApp(
app.appId,
{
name: app.name,
url: "/known-name",
})
} catch (err: any) {
dupeError = err
}
expect(dupeError).toBeDefined()
expect(dupeError.message).toEqual(
"Error 400 - App name is already in use."
},
{ status: 400 }
)
expect(resp.message).toEqual("App name is already in use.")
})
it("should reject with a known url", async () => {
await config.createApp("known-url")
const sourceAppId = config.getProdAppId()
let dupeError
try {
await config.duplicateApp(sourceAppId, {
const resp = await config.api.application.duplicateApp(
app.appId,
{
name: "this is fine",
url: "/known-url",
})
} catch (err: any) {
dupeError = err
}
expect(dupeError).toBeDefined()
expect(dupeError.message).toEqual(
"Error 400 - App URL is already in use."
url: app.url,
},
{ status: 400 }
)
expect(resp.message).toEqual("App URL is already in use.")
})
})

10
packages/server/src/tests/utilities/TestConfiguration.ts
View File

@ -590,16 +590,6 @@ export default class TestConfiguration {
})
}
async duplicateApp(appId: string, fields: object) {
return context.doInTenant(
this.tenantId!,
async () =>
await this._req(appController.duplicateApp, fields, {
appId,
})
)
}
async publish() {
await this._req(deployController.publishApp)
// @ts-ignore

17
packages/server/src/tests/utilities/api/application.ts
View File

@ -4,6 +4,7 @@ import {
type CreateAppRequest,
type FetchAppDefinitionResponse,
type FetchAppPackageResponse,
DuplicateAppResponse,
} from "@budibase/types"
import { Expectations, TestAPI } from "./base"
import { AppStatus } from "../../../db/utils"
@ -70,6 +71,22 @@ export class ApplicationAPI extends TestAPI {
})
}
duplicateApp = async (
appId: string,
fields: object,
expectations?: Expectations
): Promise<DuplicateAppResponse> => {
let headers = {
...this.config.defaultHeaders(),
[constants.Header.APP_ID]: appId,
}
return this._post(`/api/applications/${appId}/duplicate`, {
headers,
fields,
expectations,
})
}
getDefinition = async (
appId: string,
expectations?: Expectations

13
packages/types/src/api/web/application.ts
View File

@ -11,7 +11,18 @@ export interface CreateAppRequest {
includeSampleData?: boolean
encryptionPassword?: string
templateString?: string
file?: any
file?: { path: string }
}
export interface DuplicateAppRequest {
name: string
url?: string
}
export interface DuplicateAppResponse {
duplicateAppId: string
sourceAppId: string
message: string
}
export interface FetchAppDefinitionResponse {