From 40394edd871c6238a1b6ff1ccfb57741a5635ba1 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Fri, 24 Jun 2022 15:07:50 +0300
Subject: [PATCH] Add deleting suggestion of themselves for members

---
 app/routes/plus/suggestions.tsx | 137 +++++++++++++++++---------------
 1 file changed, 72 insertions(+), 65 deletions(-)

diff --git a/app/routes/plus/suggestions.tsx b/app/routes/plus/suggestions.tsx
index 00bd658f6..f9794951e 100644
--- a/app/routes/plus/suggestions.tsx
+++ b/app/routes/plus/suggestions.tsx
@@ -153,67 +153,70 @@ export default function PlusSuggestionsPage() {
     <>
       <Outlet />
       <div className="plus__container">
-        <div className="stack lg">
-          <div
-            className={clsx("plus__top-container", {
-              "content-centered": !canSuggestNewUserFE({
-                user,
-                suggestions: data.suggestions,
-              }),
-            })}
-          >
-            <div className="plus__radios">
-              {Object.entries(data.suggestions)
-                .sort((a, b) => Number(a[0]) - Number(b[0]))
-                .map(([tier, suggestions]) => {
-                  const id = String(tier);
-                  return (
-                    <div key={id} className="plus__radio-container">
-                      <label htmlFor={id} className="plus__radio-label">
-                        +{tier}{" "}
-                        <span className="plus__users-count">
-                          ({suggestions.length})
-                        </span>
-                      </label>
-                      <input
-                        id={id}
-                        name="tier"
-                        type="radio"
-                        checked={tierVisible === tier}
-                        onChange={() => setTierVisible(tier)}
-                        data-cy={`plus${tier}-radio`}
-                      />
-                    </div>
-                  );
-                })}
-            </div>
-            {canSuggestNewUserFE({ user, suggestions: data.suggestions }) ? (
-              // TODO: resetScroll={false} https://twitter.com/ryanflorence/status/1527775882797907969
-              <LinkButton
-                to="new"
-                data-cy="new-suggest-button"
-                prefetch="render"
-              >
-                Suggest
-              </LinkButton>
-            ) : null}
-          </div>
+        <div className="stack md">
+          <SuggestedForInfo hideText />
           <div className="stack lg">
-            {visibleSuggestions.map((u) => {
-              invariant(tierVisible);
-              return (
-                <SuggestedUser
-                  key={`${u.suggestedUser.id}-${tierVisible}`}
-                  suggested={u}
-                  tier={tierVisible}
-                />
-              );
-            })}
-            {visibleSuggestions.length === 0 ? (
-              <div className="plus__suggested-info-text text-center">
-                No suggestions yet
+            <div
+              className={clsx("plus__top-container", {
+                "content-centered": !canSuggestNewUserFE({
+                  user,
+                  suggestions: data.suggestions,
+                }),
+              })}
+            >
+              <div className="plus__radios">
+                {Object.entries(data.suggestions)
+                  .sort((a, b) => Number(a[0]) - Number(b[0]))
+                  .map(([tier, suggestions]) => {
+                    const id = String(tier);
+                    return (
+                      <div key={id} className="plus__radio-container">
+                        <label htmlFor={id} className="plus__radio-label">
+                          +{tier}{" "}
+                          <span className="plus__users-count">
+                            ({suggestions.length})
+                          </span>
+                        </label>
+                        <input
+                          id={id}
+                          name="tier"
+                          type="radio"
+                          checked={tierVisible === tier}
+                          onChange={() => setTierVisible(tier)}
+                          data-cy={`plus${tier}-radio`}
+                        />
+                      </div>
+                    );
+                  })}
               </div>
-            ) : null}
+              {canSuggestNewUserFE({ user, suggestions: data.suggestions }) ? (
+                // TODO: resetScroll={false} https://twitter.com/ryanflorence/status/1527775882797907969
+                <LinkButton
+                  to="new"
+                  data-cy="new-suggest-button"
+                  prefetch="render"
+                >
+                  Suggest
+                </LinkButton>
+              ) : null}
+            </div>
+            <div className="stack lg">
+              {visibleSuggestions.map((u) => {
+                invariant(tierVisible);
+                return (
+                  <SuggestedUser
+                    key={`${u.suggestedUser.id}-${tierVisible}`}
+                    suggested={u}
+                    tier={tierVisible}
+                  />
+                );
+              })}
+              {visibleSuggestions.length === 0 ? (
+                <div className="plus__suggested-info-text text-center">
+                  No suggestions yet
+                </div>
+              ) : null}
+            </div>
           </div>
         </div>
       </div>
@@ -243,7 +246,7 @@ function useSetSelectedTierForFirstSuggestEffect({
   }, [data, tierVisible, setTierVisible]);
 }
 
-function SuggestedForInfo() {
+function SuggestedForInfo({ hideText = false }: { hideText?: boolean }) {
   const data = useLoaderData<PlusSuggestionsLoaderData>();
   const user = useUser();
 
@@ -253,6 +256,8 @@ function SuggestedForInfo() {
   }
 
   if (data.suggestedForTiers.length === 0) {
+    if (hideText) return null;
+
     return (
       <div className="plus__suggested-info-text">
         You are not suggested yet this month.
@@ -262,11 +267,13 @@ function SuggestedForInfo() {
 
   return (
     <div className="stack md">
-      <div className="plus__suggested-info-text">
-        You are suggested to{" "}
-        {data.suggestedForTiers.map((tier) => `+${tier}`).join(" and ")} this
-        month.
-      </div>
+      {!hideText ? (
+        <div className="plus__suggested-info-text">
+          You are suggested to{" "}
+          {data.suggestedForTiers.map((tier) => `+${tier}`).join(" and ")} this
+          month.
+        </div>
+      ) : null}
       {canDeleteSuggestionOfThemselves() ? (
         <div className="stack vertical md">
           {data.suggestedForTiers.map((tier) => (