feat(share homebrew): Updated homebrew sharing functions

scottbenton · Apr 26, 2024 · ef149a1 · ef149a1
1 parent 75d297d
commit ef149a1
Show file tree

Hide file tree

Showing 36 changed files with 512 additions and 381 deletions.
diff --git a/firestore.rules b/firestore.rules
@@ -111,8 +111,8 @@ service cloud.firestore {
       match /collections/{homebrewId} {
         allow read: if true;
         allow create: if request.auth.uid != null;
-        allow write: if request.auth.uid in resource.data.editors && !request.resource.data.diff(resource.data).affectedKeys().hasAny(["creator", "editors"]);
-
+        allow update: if (request.auth.uid in resource.data.editors && !request.resource.data.diff(resource.data).affectedKeys().hasAny(["creator", "editors"])) || (request.auth.uid != null && request.resource.data.diff(resource.data).affectedKeys().hasOnly(["viewers"]));
+				allow delete: if (request.auth.uid == resource.data.creator);
       }
 
       match /stats/{statId} {

diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -139,3 +139,22 @@ export const addCurrentUserAsHomebrewCampaignEditor = onCall<
 
   return true;
 });
+
+export const removeCurrentUserAsHomebrewCampaignEditor = onCall<
+  { homebrewCollectionId: string },
+  Promise<boolean>
+>(async (request) => {
+  const homebrewCollectionId = request.data.homebrewCollectionId;
+  const uid = request.auth?.uid;
+
+  if (!uid) {
+    logger.warn("User was not authenticated");
+    return false;
+  }
+
+  await getFirestore()
+    .doc(`/homebrew/homebrew/collections/${homebrewCollectionId}`)
+    .update({ editors: FieldValue.arrayRemove(uid) });
+
+  return true;
+});
diff --git a/src/Router.tsx b/src/Router.tsx
@@ -92,6 +92,10 @@ const router = createBrowserRouter(
               path={homebrewPaths[HOMEBREW_ROUTES.EDITOR]}
               lazy={() => import("pages/Homebrew/HomebrewEditorPage")}
             />
+            <Route
+              path={homebrewPaths[HOMEBREW_ROUTES.EDITOR_JOIN]}
+              lazy={() => import("pages/Homebrew/HomebrewEditorInvitationPage")}
+            />
           </Route>
         </Route>
         {/* Unauthenticated Pages */}

diff --git a/src/api-calls/homebrew/editorFunction/getHomebrewCollectionFromInviteUrl.ts b/src/api-calls/homebrew/editorFunction/getHomebrewCollectionFromInviteUrl.ts
@@ -1,20 +1,18 @@
 import { functions } from "config/firebase.config";
 import { httpsCallable } from "firebase/functions";
 
-export function getHomebrewCollectionFromInviteUrl(): Promise<string | null> {
+export function getHomebrewCollectionFromInviteUrl(
+  inviteKey: string
+): Promise<string | null> {
   return new Promise((resolve, reject) => {
-    const inviteKey = location.pathname.substring(
-      location.pathname.lastIndexOf("/") + 1
-    );
-
     const getHomebrewId = httpsCallable(
       functions,
       "getHomebrewIdFromInviteKey"
     );
 
     getHomebrewId({ inviteKey })
       .then((homebrewId) => {
-        return homebrewId.data;
+        resolve(homebrewId.data as string | null);
       })
       .catch((e) => {
         console.error(e);

diff --git a/src/api-calls/homebrew/editorFunction/removeSelfAsEditor.ts b/src/api-calls/homebrew/editorFunction/removeSelfAsEditor.ts
@@ -0,0 +1,22 @@
+import { functions } from "config/firebase.config";
+import { httpsCallable } from "firebase/functions";
+
+export function removeSelfAsEditor(
+  homebrewCollectionId: string
+): Promise<boolean> {
+  return new Promise((resolve, reject) => {
+    const removeEditor = httpsCallable(
+      functions,
+      "removeCurrentUserAsHomebrewCampaignEditor"
+    );
+
+    removeEditor({ homebrewCollectionId })
+      .then((wasSuccessful) => {
+        resolve(wasSuccessful.data as boolean);
+      })
+      .catch((e) => {
+        console.error(e);
+        reject(e);
+      });
+  });
+}
diff --git a/src/api-calls/homebrew/listenToHomebrewCollections.ts b/src/api-calls/homebrew/listenToHomebrewCollections.ts
@@ -1,4 +1,4 @@
-import { onSnapshot, query, where } from "firebase/firestore";
+import { onSnapshot, or, query, where } from "firebase/firestore";
 import { HomebrewCollectionDocument } from "types/homebrew/HomebrewCollection.type";
 import { getHomebrewCollection } from "./_getRef";
 
@@ -14,7 +14,10 @@ export function listenToHomebrewCollections(
 ) {
   const homebrewQuery = query(
     getHomebrewCollection(),
-    where("editors", "array-contains", uid)
+    or(
+      where("editors", "array-contains", uid),
+      where("viewers", "array-contains", uid)
+    )
   );
   return onSnapshot(
     homebrewQuery,

diff --git a/src/api-calls/homebrew/updateHomebrewExpansion.ts b/src/api-calls/homebrew/updateHomebrewExpansion.ts
@@ -1,10 +1,10 @@
-import { updateDoc } from "firebase/firestore";
+import { PartialWithFieldValue, updateDoc } from "firebase/firestore";
 import { getHomebrewCollectionDoc } from "./_getRef";
 import { ExpansionDocument } from "types/homebrew/HomebrewCollection.type";
 import { createApiFunction } from "api-calls/createApiFunction";
 
 export const updateHomebrewExpansion = createApiFunction<
-  { id: string; expansion: Partial<ExpansionDocument> },
+  { id: string; expansion: PartialWithFieldValue<ExpansionDocument> },
   void
 >((params) => {
   const { id, expansion } = params;

diff --git a/src/components/features/charactersAndCampaigns/ExpansionSelector/ExpansionSelector.tsx b/src/components/features/charactersAndCampaigns/ExpansionSelector/ExpansionSelector.tsx
@@ -33,17 +33,18 @@ export function ExpansionSelector(props: ExpansionSelectorProps) {
   const officialExpansions = useGameSystemValue(defaultExpansions);
 
   const homebrewExpansionMap = useStore((store) => store.homebrew.collections);
+  const sortedExpansionIds = useStore(
+    (store) => store.homebrew.sortedHomebrewCollectionIds
+  );
 
-  const expansionIds = Object.keys(homebrewExpansionMap)
-    .filter(
-      (expansionId) =>
-        homebrewExpansionMap[expansionId]?.base?.rulesetId === baseRuleset
-    )
-    .sort((k1, k2) =>
-      homebrewExpansionMap[k1]?.base?.title?.localeCompare(
-        homebrewExpansionMap[k2]?.base?.title
-      )
-    );
+  const expansionIds = sortedExpansionIds.filter(
+    (expansionId) =>
+      homebrewExpansionMap[expansionId]?.base?.rulesetId === baseRuleset
+  );
+
+  const notFoundExpansionIds = Object.keys(enabledExpansionMap).filter(
+    (key) => !expansionIds.includes(key)
+  );
 
   return (
     <Box>
@@ -88,6 +89,23 @@ export function ExpansionSelector(props: ExpansionSelectorProps) {
                 }
               />
             ))}
+            {notFoundExpansionIds.map((expansionId) => (
+              <FormControlLabel
+                key={expansionId}
+                control={
+                  <Switch
+                    checked={enabledExpansionMap[expansionId] ?? false}
+                    onChange={(evt, checked) =>
+                      toggleEnableExpansion(expansionId, checked)
+                    }
+                  />
+                }
+                label={
+                  homebrewExpansionMap[expansionId].base?.title ??
+                  "Deleted Homebrew Expansion"
+                }
+              />
+            ))}
           </FormGroup>
         ) : (
           <EmptyState leftAlign message={"No homebrew expansions found"} />

diff --git a/src/components/shared/Layout/Layout.tsx b/src/components/shared/Layout/Layout.tsx
@@ -12,8 +12,10 @@ import { BottomNav } from "./nav/BottomNav";
 import { NavRail } from "./nav/NavRail";
 import { TopNav } from "./nav/TopNav";
 import { LayoutPathListener } from "./LayoutPathListener";
-import { useNewCrewLinkTheme } from "hooks/featureFlags/useNewCrewLinkTheme";
 import { StarforgedStarBackground } from "./StarforgedStarBackground";
+import { useGameSystem } from "hooks/useGameSystem";
+import { GAME_SYSTEMS } from "types/GameSystems.type";
+import { useNewSunderedIslesTheme } from "hooks/featureFlags/useNewSunderedIslesTheme";
 
 export function Layout() {
   useSyncFeatureFlags();
@@ -25,7 +27,10 @@ export function Layout() {
     (store) => store.auth.closeUserNameDialog
   );
 
-  const showNewCrewLinkTheme = useNewCrewLinkTheme();
+  const { gameSystem } = useGameSystem();
+  const showNewSunderedIslesTheme = useNewSunderedIslesTheme();
+  const showStarforgedTheming =
+    gameSystem === GAME_SYSTEMS.STARFORGED && !showNewSunderedIslesTheme;
 
   if (state === AUTH_STATE.LOADING) {
     return <LinearProgress color={"primary"} />;
@@ -37,12 +42,12 @@ export function Layout() {
       display={"flex"}
       flexDirection={"column"}
       sx={(theme) => ({
-        backgroundColor: showNewCrewLinkTheme
+        backgroundColor: showStarforgedTheming
           ? undefined
           : theme.palette.background.default,
       })}
     >
-      {showNewCrewLinkTheme && <StarforgedStarBackground />}
+      {showStarforgedTheming && <StarforgedStarBackground />}
       <Box
         display={"flex"}
         flexDirection={{ xs: "column", sm: "row" }}

diff --git a/src/components/shared/Layout/PageHeader.tsx b/src/components/shared/Layout/PageHeader.tsx
@@ -1,6 +1,5 @@
 import { Box, Container, Stack, Typography, useTheme } from "@mui/material";
 import { getPublicAssetPath } from "functions/getPublicAssetPath";
-import { useNewCrewLinkTheme } from "hooks/featureFlags/useNewCrewLinkTheme";
 import { useNewSunderedIslesTheme } from "hooks/featureFlags/useNewSunderedIslesTheme";
 import { useGameSystemValue } from "hooks/useGameSystemValue";
 import React, { PropsWithChildren } from "react";
@@ -20,7 +19,6 @@ export function PageHeader(props: PageHeaderProps) {
   const isEmpty = !label && !subLabel && !actions && !children;
 
   const isLightTheme = useTheme().palette.mode === "light";
-  const showNewStarforgedTheme = useNewCrewLinkTheme();
   const showNewSunderedIslesTheme = useNewSunderedIslesTheme();
 
   const isIronsworn = useGameSystemValue({
@@ -43,7 +41,7 @@ export function PageHeader(props: PageHeaderProps) {
           mb: isEmpty ? -8 : -4,
           // width: "100vw",
           backgroundColor:
-            isLightTheme && !showNewStarforgedTheme
+            isLightTheme && (isIronsworn || showNewSunderedIslesTheme)
               ? theme.palette.darkGrey.main
               : undefined,
           position: "relative",
@@ -109,12 +107,13 @@ export function PageHeader(props: PageHeaderProps) {
           <Box
             sx={(theme) => ({
               backgroundImage:
-                isLightTheme && !showNewStarforgedTheme
+                isLightTheme && (isIronsworn || showNewSunderedIslesTheme)
                   ? `url("${borderUrl}")`
                   : undefined,
-              backgroundColor: showNewSunderedIslesTheme
-                ? "darkGrey.main"
-                : undefined,
+              backgroundColor:
+                showNewSunderedIslesTheme && theme.palette.mode === "light"
+                  ? "darkGrey.main"
+                  : undefined,
               height: theme.spacing(showNewSunderedIslesTheme ? 2 : 8),
               backgroundRepeat: "repeat-x",
               backgroundSize: "contain",

diff --git a/src/components/shared/Layout/nav/NavRailFlyouts/HomebrewMenu.tsx b/src/components/shared/Layout/nav/NavRailFlyouts/HomebrewMenu.tsx
@@ -6,10 +6,13 @@ import { FlyoutMenuList } from "./FlyoutMenuList";
 
 export function HomebrewMenu() {
   const homebrewCollections = useStore((store) => store.homebrew.collections);
+  const sortedHomebrewCollections = useStore(
+    (store) => store.homebrew.sortedHomebrewCollectionIds
+  );
   return (
     <FlyoutMenuList
       label={"Homebrew"}
-      itemIds={Object.keys(homebrewCollections)}
+      itemIds={sortedHomebrewCollections}
       renderListItem={(collectionId) => (
         <ListItem key={collectionId} disablePadding>
           <ListItemButton

diff --git a/src/hooks/featureFlags/activeFeatureFlags.ts b/src/hooks/featureFlags/activeFeatureFlags.ts
@@ -9,11 +9,6 @@ export const activeFeatureFlags: {
     testId: "custom-content-page",
     label: "Add new homebrew content management page",
   },
-  {
-    testId: "new-crew-link-theme",
-    label: "Show potential new theme for Starforged Crew Link",
-    gameSystems: [GAME_SYSTEMS.STARFORGED],
-  },
   {
     testId: "new-sundered-isles-theme",
     label: "Show potential theme for Sundered Isles Crew Link",

diff --git a/src/hooks/featureFlags/useNewCrewLinkTheme.ts b/src/hooks/featureFlags/useNewCrewLinkTheme.ts
diff --git a/src/pages/Campaign/CampaignGMScreenPage/CampaignGMScreenPage.tsx b/src/pages/Campaign/CampaignGMScreenPage/CampaignGMScreenPage.tsx
@@ -65,21 +65,26 @@ export function CampaignGMScreenPage() {
 
   if (!campaign || !campaignId) {
     return (
-      <EmptyState
-        title={"Campaign not Found"}
-        message={"Please try again from the campaign selection page"}
-        showImage
-        callToAction={
-          <Button
-            LinkComponent={LinkComponent}
-            href={constructCampaignPath(CAMPAIGN_ROUTES.SELECT)}
-            variant={"contained"}
-            size={"large"}
-          >
-            Select a Campaign
-          </Button>
-        }
-      />
+      <>
+        <PageHeader />
+        <PageContent isPaper>
+          <EmptyState
+            title={"Campaign not Found"}
+            message={"Please try again from the campaign selection page"}
+            showImage
+            callToAction={
+              <Button
+                LinkComponent={LinkComponent}
+                href={constructCampaignPath(CAMPAIGN_ROUTES.SELECT)}
+                variant={"contained"}
+                size={"large"}
+              >
+                Select a Campaign
+              </Button>
+            }
+          />
+        </PageContent>
+      </>
     );
   }
   if (!uid || !campaign.gmIds?.includes(uid)) {

diff --git a/src/pages/Campaign/CampaignSheetPage/CampaignSheetPage.tsx b/src/pages/Campaign/CampaignSheetPage/CampaignSheetPage.tsx
@@ -4,7 +4,7 @@ import { useSearchParams } from "react-router-dom";
 import { CampaignSheetHeader } from "./components/CampaignSheetHeader";
 import { CharacterSection } from "./components/CharacterSection";
 import { WorldSection } from "./components/WorldSection";
-import { PageContent } from "components/shared/Layout";
+import { PageContent, PageHeader } from "components/shared/Layout";
 import { BreakContainer } from "components/shared/BreakContainer";
 import { TracksSection } from "./components/TracksSection";
 import { StyledTabs, StyledTab } from "components/shared/StyledTabs";
@@ -68,21 +68,26 @@ export function CampaignSheetPage() {
 
   if (!campaignId || !campaign) {
     return (
-      <EmptyState
-        title={"Campaign not Found"}
-        message={"Please try again from the campaign selection page"}
-        showImage
-        callToAction={
-          <Button
-            LinkComponent={LinkComponent}
-            href={constructCampaignPath(CAMPAIGN_ROUTES.SELECT)}
-            variant={"contained"}
-            size={"large"}
-          >
-            Select a Campaign
-          </Button>
-        }
-      />
+      <>
+        <PageHeader />
+        <PageContent isPaper>
+          <EmptyState
+            title={"Campaign not Found"}
+            message={"Please try again from the campaign selection page"}
+            showImage
+            callToAction={
+              <Button
+                LinkComponent={LinkComponent}
+                href={constructCampaignPath(CAMPAIGN_ROUTES.SELECT)}
+                variant={"contained"}
+                size={"large"}
+              >
+                Select a Campaign
+              </Button>
+            }
+          />
+        </PageContent>
+      </>
     );
   }
 
@@ -98,7 +103,7 @@ export function CampaignSheetPage() {
           <StyledTabs
             value={selectedTab}
             onChange={(evt, value) => handleTabChange(value)}
-            indicatorColor='primary'
+            indicatorColor="primary"
             centered
             variant={"standard"}
             sx={(theme) => ({