From 4ff021ae338c243cad439e1f81271a4910a35ada Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Mon, 31 Jan 2022 09:54:40 +0200
Subject: [PATCH] Don't show buttons in looking if not captain

---
 app/components/play/GroupCard.tsx |  6 +++---
 app/routes/play/looking.tsx       | 33 +++++++++++++++++++------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/components/play/GroupCard.tsx b/app/components/play/GroupCard.tsx
index e32ac2713..04d6c2e54 100644
--- a/app/components/play/GroupCard.tsx
+++ b/app/components/play/GroupCard.tsx
@@ -8,11 +8,11 @@ import type {
 
 export function GroupCard({
   group,
-  isGroupAdmin = false,
+  isCaptain = false,
   type,
 }: {
   group: LookingLoaderDataGroup;
-  isGroupAdmin?: boolean;
+  isCaptain?: boolean;
   type?: "LIKES_GIVEN" | "NEUTRAL" | "LIKES_RECEIVED";
 }) {
   const buttonText = () => {
@@ -51,7 +51,7 @@ export function GroupCard({
             value={group.members?.length ?? -1}
           />
         )}
-        {isGroupAdmin && (
+        {isCaptain && (
           <Button
             type="submit"
             name="_action"
diff --git a/app/routes/play/looking.tsx b/app/routes/play/looking.tsx
index d3b5f6401..194596714 100644
--- a/app/routes/play/looking.tsx
+++ b/app/routes/play/looking.tsx
@@ -142,6 +142,7 @@ interface LookingLoaderData {
   likerGroups: LookingLoaderDataGroup[];
   ownGroup: LookingLoaderDataGroup;
   type: LfgGroupType;
+  userIsCaptain: boolean;
 }
 
 export const loader: LoaderFunction = async ({ context }) => {
@@ -175,6 +176,7 @@ export const loader: LoaderFunction = async ({ context }) => {
   return json<LookingLoaderData>({
     ownGroup: ownGroupForResponse,
     type: ownGroup.type,
+    userIsCaptain: isGroupAdmin({ group: ownGroup, user }),
     ...groups
       .filter((group) =>
         canUniteWithGroup({
@@ -194,7 +196,10 @@ export const loader: LoaderFunction = async ({ context }) => {
             : group.members.map((m) => m.user),
       }))
       .reduce(
-        (acc: Omit<LookingLoaderData, "ownGroup" | "type">, group) => {
+        (
+          acc: Omit<LookingLoaderData, "ownGroup" | "type" | "userIsCaptain">,
+          group
+        ) => {
           // likesReceived first so that if both received like and
           // given like then handle this edge case by just displaying the
           // group as waiting like back
@@ -227,15 +232,17 @@ export default function LookingPage() {
         </div>
         <div className="play-looking__waves-button">
           <Form method="post">
-            <Button
-              type="submit"
-              name="_action"
-              value="LOOK_AGAIN"
-              tiny
-              variant="outlined"
-            >
-              Look again
-            </Button>
+            {data.userIsCaptain && (
+              <Button
+                type="submit"
+                name="_action"
+                value="LOOK_AGAIN"
+                tiny
+                variant="outlined"
+              >
+                Look again
+              </Button>
+            )}
           </Form>
         </div>
       </div>
@@ -255,7 +262,7 @@ export default function LookingPage() {
                 <GroupCard
                   key={group.id}
                   group={group}
-                  isGroupAdmin
+                  isCaptain={data.userIsCaptain}
                   type="LIKES_GIVEN"
                 />
               );
@@ -270,7 +277,7 @@ export default function LookingPage() {
                 <GroupCard
                   key={group.id}
                   group={group}
-                  isGroupAdmin
+                  isCaptain={data.userIsCaptain}
                   type="NEUTRAL"
                 />
               );
@@ -285,7 +292,7 @@ export default function LookingPage() {
                 <GroupCard
                   key={group.id}
                   group={group}
-                  isGroupAdmin
+                  isCaptain={data.userIsCaptain}
                   type="LIKES_RECEIVED"
                 />
               );