From 6b381e71579e7cc39897593dcbcfb6e7c09435a0 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 8 Feb 2024 13:44:51 -0800
Subject: [PATCH 1/4] Remove team access code functionality from cloud mode

---
 src/app/(main)/settings/teams/TeamsHeader.tsx                | 3 ++-
 src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/settings/teams/TeamsHeader.tsx b/src/app/(main)/settings/teams/TeamsHeader.tsx
index 4c040691..a656e500 100644
--- a/src/app/(main)/settings/teams/TeamsHeader.tsx
+++ b/src/app/(main)/settings/teams/TeamsHeader.tsx
@@ -8,11 +8,12 @@ import TeamsAddButton from './TeamsAddButton';
 export function TeamsHeader({ allowCreate = true }: { allowCreate?: boolean }) {
   const { formatMessage, labels } = useMessages();
   const { user } = useLogin();
+  const cloudMode = process.env.CLOUD_MODE;
 
   return (
     <PageHeader title={formatMessage(labels.teams)}>
       <Flexbox gap={10}>
-        <TeamsJoinButton />
+        {!cloudMode && <TeamsJoinButton />}
         {allowCreate && user.role !== ROLES.viewOnly && <TeamsAddButton />}
       </Flexbox>
     </PageHeader>
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx
index cee3c3f1..d81bd01e 100644
--- a/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx
@@ -26,6 +26,7 @@ export function TeamEditForm({ teamId, allowEdit }: { teamId: string; allowEdit?
   const ref = useRef(null);
   const [accessCode, setAccessCode] = useState(team.accessCode);
   const { showToast } = useToasts();
+  const cloudMode = process.env.CLOUD_MODE;
 
   const handleSubmit = async (data: any) => {
     mutate(data, {
@@ -58,7 +59,7 @@ export function TeamEditForm({ teamId, allowEdit }: { teamId: string; allowEdit?
         )}
         {!allowEdit && team.name}
       </FormRow>
-      {allowEdit && (
+      {!cloudMode && allowEdit && (
         <FormRow label={formatMessage(labels.accessCode)}>
           <Flexbox gap={10}>
             <TextField value={accessCode} readOnly allowCopy />

From e8d8a8a84a0b84518be8ca495d0a997ee1a2a77f Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 8 Feb 2024 14:05:35 -0800
Subject: [PATCH 2/4] Fix buttons / dropdown values

---
 src/app/(main)/reports/ReportDeleteButton.tsx             | 2 +-
 .../teams/[teamId]/members/TeamMemberEditButton.tsx       | 2 +-
 .../teams/[teamId]/members/TeamMemberEditForm.tsx         | 8 ++++----
 .../teams/[teamId]/members/TeamMemberRemoveButton.tsx     | 2 +-
 src/components/messages.ts                                | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/(main)/reports/ReportDeleteButton.tsx b/src/app/(main)/reports/ReportDeleteButton.tsx
index 7ad9c465..d51f7144 100644
--- a/src/app/(main)/reports/ReportDeleteButton.tsx
+++ b/src/app/(main)/reports/ReportDeleteButton.tsx
@@ -30,7 +30,7 @@ export function ReportDeleteButton({
 
   return (
     <ModalTrigger>
-      <Button variant="quiet">
+      <Button>
         <Icon>
           <Icons.Trash />
         </Icon>
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsx
index 31186055..9cc99869 100644
--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsx
@@ -25,7 +25,7 @@ export function TeamMemberEditButton({
 
   return (
     <ModalTrigger>
-      <Button variant="quiet">
+      <Button>
         <Icon>
           <Icons.Edit />
         </Icon>
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx
index b54757e7..0c22ac76 100644
--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx
@@ -11,7 +11,7 @@ import {
   SubmitButton,
 } from 'react-basics';
 
-export function UserAddForm({
+export function TeamMemberEditForm({
   teamId,
   userId,
   role,
@@ -41,7 +41,7 @@ export function UserAddForm({
 
   const renderValue = (value: string) => {
     if (value === ROLES.teamMember) {
-      return formatMessage(labels.teamMember);
+      return formatMessage(labels.member);
     }
     if (value === ROLES.teamViewOnly) {
       return formatMessage(labels.viewOnly);
@@ -58,7 +58,7 @@ export function UserAddForm({
               minWidth: '250px',
             }}
           >
-            <Item key={ROLES.teamMember}>{formatMessage(labels.teamMember)}</Item>
+            <Item key={ROLES.teamMember}>{formatMessage(labels.member)}</Item>
             <Item key={ROLES.teamViewOnly}>{formatMessage(labels.viewOnly)}</Item>
           </Dropdown>
         </FormInput>
@@ -75,4 +75,4 @@ export function UserAddForm({
   );
 }
 
-export default UserAddForm;
+export default TeamMemberEditForm;
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx
index f19d857b..3f024395 100644
--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx
@@ -35,7 +35,7 @@ export function TeamMemberRemoveButton({
 
   return (
     <ModalTrigger>
-      <Button variant="quiet">
+      <Button>
         <Icon>
           <Icons.Close />
         </Icon>
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 666680e2..b201c198 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -28,6 +28,7 @@ export const labels = defineMessages({
   created: { id: 'label.created', defaultMessage: 'Created' },
   edit: { id: 'label.edit', defaultMessage: 'Edit' },
   name: { id: 'label.name', defaultMessage: 'Name' },
+  member: { id: 'label.member', defaultMessage: 'Member' },
   members: { id: 'label.members', defaultMessage: 'Members' },
   accessCode: { id: 'label.access-code', defaultMessage: 'Access code' },
   teamId: { id: 'label.team-id', defaultMessage: 'Team ID' },

From 7c1cb7631d04fc2d5267e3e8e4193a6b784d3132 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 8 Feb 2024 15:11:42 -0800
Subject: [PATCH 3/4] fix cloud mode for teams

---
 src/app/(main)/settings/teams/TeamsHeader.tsx                | 2 +-
 src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/settings/teams/TeamsHeader.tsx b/src/app/(main)/settings/teams/TeamsHeader.tsx
index a656e500..8aa5e7a3 100644
--- a/src/app/(main)/settings/teams/TeamsHeader.tsx
+++ b/src/app/(main)/settings/teams/TeamsHeader.tsx
@@ -8,7 +8,7 @@ import TeamsAddButton from './TeamsAddButton';
 export function TeamsHeader({ allowCreate = true }: { allowCreate?: boolean }) {
   const { formatMessage, labels } = useMessages();
   const { user } = useLogin();
-  const cloudMode = process.env.CLOUD_MODE;
+  const cloudMode = !!process.env.cloudMode;
 
   return (
     <PageHeader title={formatMessage(labels.teams)}>
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx
index d81bd01e..fc192df1 100644
--- a/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx
@@ -26,7 +26,7 @@ export function TeamEditForm({ teamId, allowEdit }: { teamId: string; allowEdit?
   const ref = useRef(null);
   const [accessCode, setAccessCode] = useState(team.accessCode);
   const { showToast } = useToasts();
-  const cloudMode = process.env.CLOUD_MODE;
+  const cloudMode = !!process.env.cloudMode;
 
   const handleSubmit = async (data: any) => {
     mutate(data, {

From 5e5ab6c7c36b464fdb1bb47ca0df2dad48a08b6a Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 8 Feb 2024 15:17:03 -0800
Subject: [PATCH 4/4] fix teammember button conditions

---
 .../(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx
index 2f3f75c2..e72973b4 100644
--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx
@@ -36,7 +36,7 @@ export function TeamMembersTable({
           return (
             allowEdit &&
             row?.role !== ROLES.teamOwner &&
-            user?.id !== row?.id && (
+            user?.id !== row?.user?.id && (
               <>
                 <TeamMemberEditButton teamId={teamId} userId={row?.user?.id} role={row?.role} />
                 <TeamMemberRemoveButton