From b7a89db56d0c66c47cb012d52c0677d5a977958d Mon Sep 17 00:00:00 2001
From: Robin Munn <rmunn@pobox.com>
Date: Wed, 29 May 2024 14:52:32 +0700
Subject: [PATCH] MembersList is now only for projects

Removed org roles, org-role select dropdowns, and so on from the
MembersList component, which is now only for projects again.
---
 .../src/lib/components/MembersList.svelte     | 12 ++---
 .../src/lib/forms/MemberRoleSelect.svelte     | 31 ------------
 .../project/[project_code]/+page.svelte       |  2 +-
 .../ChangeMemberRoleModal.svelte              | 50 +++++++------------
 4 files changed, 23 insertions(+), 72 deletions(-)
 delete mode 100644 frontend/src/lib/forms/MemberRoleSelect.svelte

diff --git a/frontend/src/lib/components/MembersList.svelte b/frontend/src/lib/components/MembersList.svelte
index bd2acbf8f..f97af8eed 100644
--- a/frontend/src/lib/components/MembersList.svelte
+++ b/frontend/src/lib/components/MembersList.svelte
@@ -2,7 +2,7 @@
   export type Member = {
     id: string
     user?: { id: string; name: string; email?: string | null } | null
-    role: ProjectRole | OrgRole
+    role: ProjectRole
   };
 </script>
 
@@ -13,7 +13,7 @@
   import AdminContent from '$lib/layout/AdminContent.svelte';
   import { Icon, TrashIcon } from '$lib/icons';
   import { Button } from '$lib/forms';
-  import type { OrgRole, ProjectRole } from '$lib/gql/types';
+  import type { ProjectRole } from '$lib/gql/types';
   import { createEventDispatcher } from 'svelte';
   import ChangeMemberRoleModal from '../../routes/(authenticated)/project/[project_code]/ChangeMemberRoleModal.svelte';
   import { DialogResponse } from './modals';
@@ -24,9 +24,7 @@
   export let members: Member[] = [];
   export let canManageMember: (member: Member) => boolean;
   export let canManageList: boolean;
-  type RoleType = 'project' | 'org'
-  export let roleType: RoleType;
-  export let projectOrOrgId: string;
+  export let projectId: string;
 
   let dispatch = createEventDispatcher();
 
@@ -60,7 +58,7 @@
     });
 
     if (response === DialogResponse.Submit) {
-      const notification = `${roleType}_page.notifications.role_change` as const;
+      const notification = `project_page.notifications.role_change` as const;
       const role = formState.role.currentValue;
       notifySuccess(
         $t(notification, {
@@ -130,5 +128,5 @@
     <slot />
 
   </BadgeList>
-  <ChangeMemberRoleModal {roleType} {projectOrOrgId} bind:this={changeMemberRoleModal} />
+  <ChangeMemberRoleModal {projectId} bind:this={changeMemberRoleModal} />
 </div>
diff --git a/frontend/src/lib/forms/MemberRoleSelect.svelte b/frontend/src/lib/forms/MemberRoleSelect.svelte
deleted file mode 100644
index 481491083..000000000
--- a/frontend/src/lib/forms/MemberRoleSelect.svelte
+++ /dev/null
@@ -1,31 +0,0 @@
-<script lang="ts">
-  import type { OrgRole, ProjectRole } from '$lib/gql/types';
-  import DevContent from '$lib/layout/DevContent.svelte';
-
-  import OrgRoleSelect from './OrgRoleSelect.svelte';
-  import ProjectRoleSelect from './ProjectRoleSelect.svelte';
-
-  export let id = 'role';
-  export let type: 'project' | 'org';
-  export let value: ProjectRole | OrgRole;
-  export let error: string[] | undefined;
-
-  function isProjectRole(value: ProjectRole | OrgRole): value is ProjectRole {
-    return type === 'project';
-  }
-
-  function isOrgRole(value: ProjectRole | OrgRole): value is OrgRole {
-    return type === 'org';
-  }
-</script>
-
-{#if isProjectRole(value)}
-<ProjectRoleSelect {id} bind:value {error} />
-{:else if isOrgRole(value)}
-<OrgRoleSelect {id} bind:value {error} />
-{:else}
-<!-- Should never happen, so warn in dev mode so we see it and adjust the code -->
-<DevContent>
-  <p class="text-error">Invalid MemberRoleSelect, should be either 'project' or 'org'</p>
-</DevContent>
-{/if}
diff --git a/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte b/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
index 59671648d..eaaa70623 100644
--- a/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
+++ b/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
@@ -345,7 +345,7 @@
 
       <MembersList
         roleType="project"
-        projectOrOrgId={project.id}
+        projectId={project.id}
         {members}
         canManageMember={(member) => canManage && (member.user?.id !== userId || user.isAdmin)}
         canManageList={canManage}
diff --git a/frontend/src/routes/(authenticated)/project/[project_code]/ChangeMemberRoleModal.svelte b/frontend/src/routes/(authenticated)/project/[project_code]/ChangeMemberRoleModal.svelte
index cf5e0e0d0..44be1bcfd 100644
--- a/frontend/src/routes/(authenticated)/project/[project_code]/ChangeMemberRoleModal.svelte
+++ b/frontend/src/routes/(authenticated)/project/[project_code]/ChangeMemberRoleModal.svelte
@@ -1,21 +1,16 @@
 <script lang="ts">
   import { FormModal, type FormModalResult } from '$lib/components/modals';
-  import { tryParse } from '$lib/forms';
-  import { OrgRole, ProjectRole } from '$lib/gql/types';
+  import { ProjectRoleSelect, tryParse } from '$lib/forms';
+  import { ProjectRole } from '$lib/gql/types';
   import t from '$lib/i18n';
   import { z } from 'zod';
   import { _changeProjectMemberRole } from './+page';
-  import { _changeOrgMemberRole } from '../../org/[org_id]/+page';
   import type { UUID } from 'crypto';
-  import MemberRoleSelect from '$lib/forms/MemberRoleSelect.svelte';
 
-  export let roleType: 'project' | 'org' = 'project';
-  export let projectOrOrgId: string;
+  export let projectId: string;
 
   $: schema = z.object({
-    role: roleType === 'project'
-      ? z.enum([ProjectRole.Editor, ProjectRole.Manager])
-      : z.enum([OrgRole.User, OrgRole.Admin]),
+    role: z.enum([ProjectRole.Editor, ProjectRole.Manager])
   });
   type Schema = typeof schema;
   let formModal: FormModal<Schema>;
@@ -23,38 +18,27 @@
 
   let name: string;
 
-  export async function open(member: { userId: UUID; name: string; role: ProjectRole | OrgRole }): Promise<FormModalResult<Schema>> {
+  export async function open(member: { userId: UUID; name: string; role: ProjectRole }): Promise<FormModalResult<Schema>> {
     name = member.name;
     return await formModal.open(tryParse(schema, member), async () => {
-      if (roleType === 'project') {
-        const result = await _changeProjectMemberRole({
-          projectId: projectOrOrgId,
-          userId: member.userId,
-          role: $form.role as ProjectRole,
-        });
-        if (result.error?.byType('ProjectMembersMustBeVerified')) {
-          return { role: [$t('project_page.add_user.user_must_be_verified')] };
-        }
-        if (result.error?.byType('ProjectMembersMustBeVerifiedForRole')) {
-          return { role: [$t('project_page.add_user.manager_must_be_verified')] };
-        }
-        return result.error?.message;
-      } else if (roleType === 'org') {
-        const result = await _changeOrgMemberRole(
-          projectOrOrgId as UUID,
-          member.userId,
-          $form.role as OrgRole
-        );
-        return result.error?.message;
+      const result = await _changeProjectMemberRole({
+        projectId: projectId,
+        userId: member.userId,
+        role: $form.role as ProjectRole,
+      });
+      if (result.error?.byType('ProjectMembersMustBeVerified')) {
+        return { role: [$t('project_page.add_user.user_must_be_verified')] };
       }
-
-      throw new Error(`Invalid role type: ${roleType as string}.`);
+      if (result.error?.byType('ProjectMembersMustBeVerifiedForRole')) {
+        return { role: [$t('project_page.add_user.manager_must_be_verified')] };
+      }
+      return result.error?.message;
     });
   }
 </script>
 
 <FormModal bind:this={formModal} {schema} let:errors>
   <span slot="title">{$t('project_page.change_role_modal.title', { name })}</span>
-  <MemberRoleSelect type={roleType} bind:value={$form.role} error={errors.role} />
+  <ProjectRoleSelect bind:value={$form.role} error={errors.role} />
   <span slot="submitText">{$t('project_page.change_role')}</span>
 </FormModal>