diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/CreateEditGroupModal.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/CreateEditGroupModal.svelte index d8f3a81e28..af1b009dee 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/_components/CreateEditGroupModal.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/_components/CreateEditGroupModal.svelte @@ -9,15 +9,23 @@ export let group export let saveGroup + + let nameError saveGroup(group)} + onConfirm={() => { + if (!group.name?.trim()) { + nameError = "Group name cannot be empty" + return false + } + saveGroup(group) + }} size="M" title={group?._rev ? "Edit group" : "Create group"} confirmText="Save" > - +
Icon diff --git a/packages/pro b/packages/pro index 79bc94b17b..124280d24f 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 79bc94b17baba885eb20e72f9abba3ac8b9c0eab +Subproject commit 124280d24ff60446c166a005e3cc09c986565bb3 diff --git a/packages/worker/src/api/routes/global/tests/groups.spec.ts b/packages/worker/src/api/routes/global/tests/groups.spec.ts index 9e136e58d9..2dbf6edf30 100644 --- a/packages/worker/src/api/routes/global/tests/groups.spec.ts +++ b/packages/worker/src/api/routes/global/tests/groups.spec.ts @@ -13,6 +13,7 @@ describe("/api/global/groups", () => { }) beforeEach(async () => { + jest.resetAllMocks() mocks.licenses.useGroups() }) @@ -24,6 +25,38 @@ describe("/api/global/groups", () => { expect(events.group.updated).not.toBeCalled() expect(events.group.permissionsEdited).not.toBeCalled() }) + + it("should not allow undefined names", async () => { + const group = { ...structures.groups.UserGroup(), name: undefined } as any + const response = await config.api.groups.saveGroup(group, { expect: 400 }) + expect(JSON.parse(response.text).message).toEqual( + 'Invalid body - "name" is required' + ) + }) + + it("should not allow empty names", async () => { + const group = { ...structures.groups.UserGroup(), name: "" } + const response = await config.api.groups.saveGroup(group, { expect: 400 }) + expect(JSON.parse(response.text).message).toEqual( + 'Invalid body - "name" is not allowed to be empty' + ) + }) + + it("should not allow whitespace names", async () => { + const group = { ...structures.groups.UserGroup(), name: " " } + const response = await config.api.groups.saveGroup(group, { expect: 400 }) + expect(JSON.parse(response.text).message).toEqual( + 'Invalid body - "name" is not allowed to be empty' + ) + }) + + it("should trim names", async () => { + const group = { ...structures.groups.UserGroup(), name: " group name " } + await config.api.groups.saveGroup(group) + expect(events.group.created).toBeCalledWith( + expect.objectContaining({ name: "group name" }) + ) + }) }) describe("update", () => { diff --git a/packages/worker/src/tests/api/groups.ts b/packages/worker/src/tests/api/groups.ts index 4522790d32..5524d2a811 100644 --- a/packages/worker/src/tests/api/groups.ts +++ b/packages/worker/src/tests/api/groups.ts @@ -7,13 +7,13 @@ export class GroupsAPI extends TestAPI { super(config) } - saveGroup = (group: UserGroup) => { + saveGroup = (group: UserGroup, { expect } = { expect: 200 }) => { return this.request .post(`/api/global/groups`) .send(group) .set(this.config.defaultHeaders()) .expect("Content-Type", /json/) - .expect(200) + .expect(expect) } deleteGroup = (id: string, rev: string) => {