From 90417778966fbd3fa716a068c39ce499ea7105a2 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Tue, 26 Jul 2022 20:41:49 +0300
Subject: [PATCH] Remove PLUS_SUGGESTIONS_PAGE constant

---
 app/routes/plus/suggestions.tsx                       | 3 ++-
 app/routes/plus/suggestions/comment.$tier.$userId.tsx | 8 ++++----
 app/routes/plus/suggestions/new.tsx                   | 6 +++---
 app/utils/urls.ts                                     | 5 +----
 cypress/e2e/plus.cy.ts                                | 8 ++++----
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/routes/plus/suggestions.tsx b/app/routes/plus/suggestions.tsx
index 94636855a..b645a6fd1 100644
--- a/app/routes/plus/suggestions.tsx
+++ b/app/routes/plus/suggestions.tsx
@@ -4,10 +4,11 @@ import type {
   MetaFunction,
 } from "@remix-run/node";
 import { json } from "@remix-run/node";
+import type {
+  ShouldReloadFunction} from "@remix-run/react";
 import {
   Link,
   Outlet,
-  ShouldReloadFunction,
   useLoaderData,
   useSearchParams,
 } from "@remix-run/react";
diff --git a/app/routes/plus/suggestions/comment.$tier.$userId.tsx b/app/routes/plus/suggestions/comment.$tier.$userId.tsx
index 01464be96..fbea18b55 100644
--- a/app/routes/plus/suggestions/comment.$tier.$userId.tsx
+++ b/app/routes/plus/suggestions/comment.$tier.$userId.tsx
@@ -15,7 +15,7 @@ import {
 } from "~/permissions";
 import { atOrError } from "~/utils/arrays";
 import { parseRequestFormData, validate } from "~/utils/remix";
-import { PLUS_SUGGESTIONS_PAGE } from "~/utils/urls";
+import { plusSuggestionPage } from "~/utils/urls";
 import { actualNumber } from "~/utils/zod";
 import type { PlusSuggestionsLoaderData } from "../suggestions";
 import { CommentTextarea } from "./new";
@@ -60,7 +60,7 @@ export const action: ActionFunction = async ({ request }) => {
     ...nextNonCompletedVoting(new Date()),
   });
 
-  return redirect(PLUS_SUGGESTIONS_PAGE);
+  return redirect(plusSuggestionPage());
 };
 
 export default function PlusCommentModalPage() {
@@ -86,7 +86,7 @@ export default function PlusCommentModalPage() {
       targetPlusTier: Number(tierSuggestedTo),
     })
   ) {
-    return <Redirect to={PLUS_SUGGESTIONS_PAGE} />;
+    return <Redirect to={plusSuggestionPage()} />;
   }
 
   return (
@@ -104,7 +104,7 @@ export default function PlusCommentModalPage() {
             Submit
           </Button>
           <LinkButton
-            to={PLUS_SUGGESTIONS_PAGE}
+            to={plusSuggestionPage()}
             variant="minimal-destructive"
             tiny
           >
diff --git a/app/routes/plus/suggestions/new.tsx b/app/routes/plus/suggestions/new.tsx
index 0581c93ae..0bbdda6e3 100644
--- a/app/routes/plus/suggestions/new.tsx
+++ b/app/routes/plus/suggestions/new.tsx
@@ -8,7 +8,7 @@ import {
   playerAlreadyMember,
   playerAlreadySuggested,
 } from "~/permissions";
-import { plusSuggestionPage, PLUS_SUGGESTIONS_PAGE } from "~/utils/urls";
+import { plusSuggestionPage } from "~/utils/urls";
 import type { PlusSuggestionsLoaderData } from "../suggestions";
 import * as React from "react";
 import { Label } from "~/components/Label";
@@ -111,7 +111,7 @@ export default function PlusNewSuggestionModalPage() {
     }) ||
     !targetPlusTier
   ) {
-    return <Redirect to={PLUS_SUGGESTIONS_PAGE} />;
+    return <Redirect to={plusSuggestionPage()} />;
   }
 
   const selectedUserErrorMessage = getSelectedUserErrorMessage({
@@ -160,7 +160,7 @@ export default function PlusNewSuggestionModalPage() {
             Submit
           </Button>
           <LinkButton
-            to={PLUS_SUGGESTIONS_PAGE}
+            to={plusSuggestionPage()}
             variant="minimal-destructive"
             tiny
           >
diff --git a/app/utils/urls.ts b/app/utils/urls.ts
index 52a2e3e2e..2f6cd0180 100644
--- a/app/utils/urls.ts
+++ b/app/utils/urls.ts
@@ -12,9 +12,6 @@ export const LEAN_TWITTER = "https://twitter.com/LeanYoshi";
 export const UBERU_TWITTER = "https://twitter.com/uberu5";
 export const LOG_IN_URL = "/auth";
 export const LOG_OUT_URL = "/auth/logout";
-
-// xxx: remove?
-export const PLUS_SUGGESTIONS_PAGE = "/plus/suggestions";
 export const ADMIN_PAGE = "/admin";
 export const FAQ_PAGE = "/faq";
 export const CONTRIBUTIONS_PAGE = "/contributions";
@@ -25,7 +22,7 @@ export const userPage = (discordId: string) => `/u/${discordId}`;
 export const impersonateUrl = (idToLogInAs: number) =>
   `/auth/impersonate?id=${idToLogInAs}`;
 export const badgePage = (badgeId: number) => `${BADGES_PAGE}/${badgeId}`;
-export const plusSuggestionPage = (tier: string | number) =>
+export const plusSuggestionPage = (tier?: string | number) =>
   `/plus/suggestions${tier ? `?tier=${tier}` : ""}`;
 
 export const badgeUrl = ({
diff --git a/cypress/e2e/plus.cy.ts b/cypress/e2e/plus.cy.ts
index 0990e54c6..f842eed5d 100644
--- a/cypress/e2e/plus.cy.ts
+++ b/cypress/e2e/plus.cy.ts
@@ -1,4 +1,4 @@
-import { PLUS_SUGGESTIONS_PAGE } from "~/utils/urls";
+import { plusSuggestionPage } from "~/utils/urls";
 
 export {};
 
@@ -9,13 +9,13 @@ describe("Plus suggestions page", () => {
 
   it("views suggestions status as non plus member", function () {
     cy.auth(151);
-    cy.visit(PLUS_SUGGESTIONS_PAGE);
+    cy.visit(plusSuggestionPage());
     cy.contains("You are suggested");
   });
 
   it("adds a comment and deletes one", () => {
     cy.auth();
-    cy.visit(PLUS_SUGGESTIONS_PAGE);
+    cy.visit(plusSuggestionPage());
 
     cy.getCy("suggested-user-name")
       .first()
@@ -45,7 +45,7 @@ describe("Plus suggestions page", () => {
   it("adds a new suggestion, validates suggested user and deletes it", () => {
     cy.clock(new Date(Date.UTC(2022, 5, 15))); // let's make sure voting is not happening
     cy.auth();
-    cy.visit(PLUS_SUGGESTIONS_PAGE);
+    cy.visit(plusSuggestionPage());
 
     cy.getCy("new-suggest-button").click();
     cy.getCy("tier-select").select("2");