Org page

backend/LexBoxApi/GraphQL/CustomTypes/OrgMembersGqlConfiguration.cs

@@ -0,0 +1,13 @@
+using LexCore.Entities;
+
+namespace LexBoxApi.GraphQL.CustomTypes;
+
+[ObjectType]
+public class OrgMembersGqlConfiguration : ObjectType<OrgMember>
+{
+    protected override void Configure(IObjectTypeDescriptor<OrgMember> descriptor)
+    {
+        descriptor.Field(f => f.User).Type<NonNullType<UserGqlConfiguration>>();
+        descriptor.Field(f => f.Organization).Type<NonNullType<ProjectGqlConfiguration>>();
+    }
+}

backend/LexBoxApi/GraphQL/OrgMutations.cs

@@ -1,4 +1,6 @@
 using LexBoxApi.Auth;
+using LexBoxApi.Auth.Attributes;
+using LexBoxApi.Models.Org;
 using LexCore.Entities;
 using LexCore.Exceptions;
 using LexCore.ServiceInterfaces;
@@ -36,6 +38,20 @@ public async Task<IQueryable<Organization>> CreateOrganization(string name,
         return dbContext.Orgs.Where(o => o.Id == orgId);
     }
 
+    [Error<DbError>]
+    [UseMutationConvention]
+    [AdminRequired]
+    public async Task<Organization> DeleteOrg(Guid orgId,
+        LexBoxDbContext dbContext)
+    {
+        var org = await dbContext.Orgs.Include(o => o.Members).FirstOrDefaultAsync(o => o.Id == orgId);
+        NotFoundException.ThrowIfNull(org);
+
+        dbContext.Remove(org);
+        await dbContext.SaveChangesAsync();
+        return org;
+    }
+
     /// <summary>
     /// set the role of a member in an organization, if the member does not exist it will be created
     /// </summary>
@@ -55,14 +71,39 @@ public async Task<IQueryable<Organization>> SetOrgMemberRole(
         Guid orgId,
         OrgRole? role,
         string emailOrUsername)
+    {
+        var user = await dbContext.Users.FindByEmailOrUsername(emailOrUsername);
+        NotFoundException.ThrowIfNull(user); // TODO: Implement inviting user
+        return await ChangeOrgMemberRole(dbContext, permissionService, orgId, user.Id, role);
+    }
+
+    /// <summary>
+    /// Change the role of an existing member in an organization
+    /// </summary>
+    /// <param name="dbContext"></param>
+    /// <param name="permissionService"></param>
+    /// <param name="orgId"></param>
+    /// <param name="userId">ID (GUID) of the user whose membership should be updated</param>
+    /// <param name="role">set to null to remove the member</param>
+    [Error<DbError>]
+    [Error<NotFoundException>]
+    [UseMutationConvention]
+    [UseFirstOrDefault]
+    [UseProjection]
+    public async Task<IQueryable<Organization>> ChangeOrgMemberRole(
+        LexBoxDbContext dbContext,
+        IPermissionService permissionService,
+        Guid orgId,
+        Guid userId,
+        OrgRole? role)
     {
         var org = await dbContext.Orgs.Include(o => o.Members).FirstOrDefaultAsync(o => o.Id == orgId);
         NotFoundException.ThrowIfNull(org);
-        var user = await dbContext.Users.FindByEmailOrUsername(emailOrUsername);
-        NotFoundException.ThrowIfNull(user);
 
         permissionService.AssertCanEditOrg(org);
-        await UpdateOrgMemberRole(dbContext, org, role, user.Id);
+        var user = await dbContext.Users.FindAsync(userId);
+        NotFoundException.ThrowIfNull(user);
+        await UpdateOrgMemberRole(dbContext, org, role, userId);
         return dbContext.Orgs.Where(o => o.Id == orgId);
     }
 
@@ -85,4 +126,26 @@ private async Task UpdateOrgMemberRole(LexBoxDbContext dbContext, Organization o
 
         await dbContext.SaveChangesAsync();
     }
+
+    [Error<NotFoundException>]
+    [Error<DbError>]
+    [Error<RequiredException>]
+    [UseMutationConvention]
+    [UseFirstOrDefault]
+    [UseProjection]
+    public async Task<IQueryable<Organization>> ChangeOrgName(ChangeOrgNameInput input,
+        IPermissionService permissionService,
+        LexBoxDbContext dbContext)
+    {
+        if (string.IsNullOrEmpty(input.Name)) throw new RequiredException("Org name cannot be empty");
+
+        var org = await dbContext.Orgs.FindAsync(input.OrgId);
+        NotFoundException.ThrowIfNull(org);
+        permissionService.AssertCanEditOrg(org);
+
+        org.Name = input.Name;
+        org.UpdateUpdatedDate();
+        await dbContext.SaveChangesAsync();
+        return dbContext.Orgs.Where(o => o.Id == input.OrgId);
+    }
 }

backend/LexBoxApi/Models/Org/ChangeOrgInputs.cs

@@ -0,0 +1,3 @@
+namespace LexBoxApi.Models.Org;
+
+public record ChangeOrgNameInput(Guid OrgId, string Name);

frontend/package.json

@@ -38,7 +38,7 @@
 		"@iconify-json/mdi": "^1.1.66",
 		"@playwright/test": "^1.44.0",
 		"@sveltejs/adapter-node": "^4.0.1",
-		"@sveltejs/kit": "^2.5.8",
+		"@sveltejs/kit": "^2.5.10",
 		"@sveltejs/vite-plugin-svelte": "^3.1.0",
 		"@tailwindcss/typography": "^0.5.13",
 		"@types/mjml": "^4.7.4",

frontend/schema.graphql

@@ -32,6 +32,16 @@ type BulkAddProjectMembersResult {
   existingMembers: [UserProjectRole!]!
 }
 
+type ChangeOrgMemberRolePayload {
+  organization: Organization
+  errors: [ChangeOrgMemberRoleError!]
+}
+
+type ChangeOrgNamePayload {
+  organization: Organization
+  errors: [ChangeOrgNameError!]
+}
+
 type ChangeProjectDescriptionPayload {
   project: Project
   errors: [ChangeProjectDescriptionError!]
@@ -107,6 +117,11 @@ type DeleteDraftProjectPayload {
   errors: [DeleteDraftProjectError!]
 }
 
+type DeleteOrgPayload {
+  organization: Organization
+  errors: [DeleteOrgError!]
+}
+
 type DeleteUserByAdminOrSelfPayload {
   user: User
   errors: [DeleteUserByAdminOrSelfError!]
@@ -176,7 +191,10 @@ type MeDto {
 
 type Mutation {
   createOrganization(input: CreateOrganizationInput!): CreateOrganizationPayload!
+  deleteOrg(input: DeleteOrgInput!): DeleteOrgPayload! @authorize(policy: "AdminRequiredPolicy")
   setOrgMemberRole(input: SetOrgMemberRoleInput!): SetOrgMemberRolePayload!
+  changeOrgMemberRole(input: ChangeOrgMemberRoleInput!): ChangeOrgMemberRolePayload!
+  changeOrgName(input: ChangeOrgNameInput!): ChangeOrgNamePayload!
   createProject(input: CreateProjectInput!): CreateProjectPayload! @authorize(policy: "VerifiedEmailRequiredPolicy")
   addProjectMember(input: AddProjectMemberInput!): AddProjectMemberPayload!
   bulkAddProjectMembers(input: BulkAddProjectMembersInput!): BulkAddProjectMembersPayload! @authorize(policy: "AdminRequiredPolicy")
@@ -201,11 +219,11 @@ type NotFoundError implements Error {
 }
 
 type OrgMember {
+  user: User!
+  organization: Project!
   userId: UUID!
   orgId: UUID!
   role: OrgRole!
-  user: User
-  organization: Organization
   id: UUID!
   createdDate: DateTime!
   updatedDate: DateTime!
@@ -360,6 +378,10 @@ union AddProjectMemberError = NotFoundError | DbError | ProjectMembersMustBeVeri
 
 union BulkAddProjectMembersError = NotFoundError | InvalidEmailError | DbError
 
+union ChangeOrgMemberRoleError = DbError | NotFoundError
+
+union ChangeOrgNameError = NotFoundError | DbError | RequiredError
+
 union ChangeProjectDescriptionError = NotFoundError | DbError
 
 union ChangeProjectMemberRoleError = NotFoundError | DbError | ProjectMembersMustBeVerified | ProjectMembersMustBeVerifiedForRole
@@ -378,6 +400,8 @@ union CreateProjectError = DbError | AlreadyExistsError | ProjectCreatorsMustHav
 
 union DeleteDraftProjectError = NotFoundError | DbError
 
+union DeleteOrgError = DbError
+
 union DeleteUserByAdminOrSelfError = NotFoundError | DbError
 
 union LeaveProjectError = NotFoundError | LastMemberCantLeaveError
@@ -408,6 +432,17 @@ input BulkAddProjectMembersInput {
   passwordHash: String!
 }
 
+input ChangeOrgMemberRoleInput {
+  orgId: UUID!
+  userId: UUID!
+  role: OrgRole
+}
+
+input ChangeOrgNameInput {
+  orgId: UUID!
+  name: String!
+}
+
 input ChangeProjectDescriptionInput {
   projectId: UUID!
   description: String!
@@ -481,6 +516,10 @@ input DeleteDraftProjectInput {
   draftProjectId: UUID!
 }
 
+input DeleteOrgInput {
+  orgId: UUID!
+}
+
 input DeleteUserByAdminOrSelfInput {
   userId: UUID!
 }

frontend/src/lib/app.postcss

@@ -192,3 +192,27 @@ img[src*="onestory-editor-logo"] {
     radial-gradient(ellipse 10px 70% at center right, oklch(var(--b3)) 0px, rgba(0, 0, 0, 0) 100%);
   background-attachment: local, local, scroll, scroll, local, local, scroll, scroll;
 }
+
+.tab {
+  /* https://daisyui.com/docs/themes/#-5 */
+  --tab-border: 0.1rem;
+  /* using a tab radius leads to tiny rendering issues at random screen sizes */
+  --tab-radius: 0;
+
+  /* https://daisyui.com/components/tab/#tabs-with-custom-color */
+  --tab-border-color: oklch(var(--bc));
+
+  &:not(.tab-active):not(.tab-divider) {
+    border: var(--tab-border) solid var(--tab-border-color);
+
+    &:hover {
+      @apply bg-base-200;
+    }
+  }
+
+  /* .tab-divider needs .tab so it can access the tab css-variables */
+  &.tab-divider {
+    @apply px-2;
+    border-bottom: var(--tab-border) solid var(--tab-border-color);
+  }
+}

frontend/src/lib/components/Badges/MemberBadge.svelte

@@ -1,14 +1,13 @@
 <script lang="ts">
   import { ProjectRole } from '$lib/gql/types';
-  import FormatUserProjectRole from '../FormatUserProjectRole.svelte';
+  import FormatUserProjectRole from '../Projects/FormatUserProjectRole.svelte';
   import ActionBadge from './ActionBadge.svelte';
   import Badge from './Badge.svelte';
   export let member: { name: string; role: ProjectRole };
   export let canManage = false;
 
   export let type: 'existing' | 'new' = 'existing';
   $: actionIcon = (type === 'existing' ? 'i-mdi-dots-vertical' as const : 'i-mdi-close' as const);
-
   $: variant = member.role === ProjectRole.Manager ? 'btn-primary' as const : 'btn-secondary' as const;
 </script>
 
@@ -21,6 +20,6 @@
   <span class="flex-grow" />
 
   <Badge>
-    <FormatUserProjectRole projectRole={member.role} />
+    <FormatUserProjectRole role={member.role} />
   </Badge>
 </ActionBadge>