Kees van den Broek (423b2bac) at 17 Mar 14:22

Eduard (87e0684a) at 17 Mar 14:06

Kees van den Broek (119ea0f9) at 17 Mar 14:00

Summary

• support assigning multiple roles to app members
• add a dedicated migration for the new assigned-role model
• update Studio member role editing to select multiple roles
• cover the refactor with unit tests and Studio e2e tests

Testing

• npx vitest run --maxWorkers=1 --minWorkers=1 packages/server/controllers/common/apps/members/queryAppMembers.test.ts packages/react-components/useData.test.tsx
• npx vitest run --maxWorkers=1 --minWorkers=1 packages/server/controllers/main/apps/createApp.test.ts packages/server/controllers/common/apps/members/updateAppMemberRole.test.ts
• npm --workspace @appsemble/e2e run e2e -- --project=chromium tests/studio/member-roles.spec.ts tests/studio/individual-app.spec.ts

Context

This MR is the first step for confidential issue #2085 by introducing the core multi-role support needed for external Keycloak / Microsoft group-to-role synchronization.

Kees van den Broek (e3e0dde7) at 17 Mar 13:48

Can we make these locators stronger so we avoid needing to make changes like this? Something like expect(await page.getByText('Dag van geboorte')).toBeVisible() is stronger and a lot more readable

Merge main into staging and re-deploy staging environment

• Make sure to read the CONTRIBUTING.md for best practices and guidelines.
• Make sure to put the merge request on draft: if it's not ready.
• If this merge requests closes an issue, make sure the merge request description contains, closes #the-issue-number.
• If this merge request only relates to an issue, refer to the issue with refs #the-issue-number.
• If there is no related issue, consider adding a description and add labels accordingly.
• If this is a bug fix, consider adding regression tests.
• If this is blocked by another merge request, make sure to make it depend.

Prikshit Gautam (77a3c2d4) at 17 Mar 10:31

... and 90 more commits

Does seem like the usual Mailpit deployment we also have on staging but not sure what was the purpose or if it used by demo apps.

!3763 (merged)

Per above merge request it seems there were issues with sending emails from demo apps which is why it was implemented. If you want to remove it, Id test the demo app mentioned in the merge request/issue.

Merge main into staging and re-deploy staging environment

• Make sure to read the CONTRIBUTING.md for best practices and guidelines.
• Make sure to put the merge request on draft: if it's not ready.
• If this merge requests closes an issue, make sure the merge request description contains, closes #the-issue-number.
• If this merge request only relates to an issue, refer to the issue with refs #the-issue-number.
• If there is no related issue, consider adding a description and add labels accordingly.
• If this is a bug fix, consider adding regression tests.
• If this is blocked by another merge request, make sure to make it depend.

Forced by habit

no need to ask for review for these ones

Before assigning a reviewer go through the following checklist, and make sure to test your changes manually (if possible).

• Make sure to read the CONTRIBUTING.md for best practices and guidelines.
• Make sure to put the merge request on draft: if it's not ready.
• If this merge requests closes an issue, make sure the merge request description contains, closes #the-issue-number.
• If this merge request only relates to an issue, refer to the issue with refs #the-issue-number.
• If there is no related issue, consider adding a description and add labels accordingly.
• If this is a bug fix, consider adding regression tests.
• If this is blocked by another merge request, make sure to make it depend.

TIP: Use ~ in the checklist item (like this - [~]) to strike it out if it's not applicable.

Prikshit Gautam (ccd7ddaa) at 17 Mar 09:58

Prikshit Gautam (6abecb65) at 17 Mar 09:58

... and 1 more commit

This MR contains the following updates:

Package	Change	Age	Confidence
jest-image-snapshot	6.4.0 → 6.5.2

❗ Important

Release Notes retrieval for this MR were skipped because no github.com credentials were available. If you are self-hosted, please see this instruction.

---

Configuration

📅 Schedule: Branch creation - "every weekday" (UTC), Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻️ Rebasing: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this MR and you won't be reminded about this update again.

---

• If you want to rebase/retry this MR, check this box

---

This MR has been generated by Renovate Bot.

Merge main into staging and re-deploy staging environment

• Make sure to read the CONTRIBUTING.md for best practices and guidelines.
• Make sure to put the merge request on draft: if it's not ready.
• If this merge requests closes an issue, make sure the merge request description contains, closes #the-issue-number.
• If this merge request only relates to an issue, refer to the issue with refs #the-issue-number.
• If there is no related issue, consider adding a description and add labels accordingly.
• If this is a bug fix, consider adding regression tests.
• If this is blocked by another merge request, make sure to make it depend.

Needs testing