Merge branch 'main' into platform_part_2

sspenst · Dec 17, 2023 · db22817 · db22817
2 parents a1c1e3d + 388c757
commit db22817
Show file tree

Hide file tree

Showing 15 changed files with 289 additions and 295 deletions.
diff --git a/components/cards/levelSelect.tsx b/components/cards/levelSelect.tsx
@@ -27,7 +27,6 @@ export default function LevelSelect({ levels }: LevelSelectProps) {
         id: level._id.toString(),
         level: level,
         stats: new SelectOptionStats(level.leastMoves, level.userMoves),
-        searchLabel: level.name,
         text: level.name,
       } as SelectOption;
     })} />

diff --git a/components/collection/collectionScrollList.tsx b/components/collection/collectionScrollList.tsx
@@ -196,9 +196,8 @@ export default function CollectionScrollList({ collection, id, isHidden, onLoadi
               href: href,
               id: `${id}-${levelInCollection._id.toString()}`,
               level: levelInCollection,
-              text: levelInCollection.name,
-              searchLabel: levelInCollection.name,
               stats: new SelectOptionStats(levelInCollection.leastMoves, (levelInCollection as EnrichedLevel)?.userMoves),
+              text: levelInCollection.name,
               width: 216,
             }} />
           </div>

diff --git a/components/header/notifications.tsx b/components/header/notifications.tsx
@@ -6,7 +6,7 @@ import { AppContext } from '../../contexts/appContext';
 import NotificationList from '../notification/notificationList';
 
 export default function Notifications() {
-  const { user, notifications, setNotifications } = useContext(AppContext);
+  const { notifications, setNotifications, user } = useContext(AppContext);
 
   useEffect(() => {
     if (user) {
@@ -20,8 +20,7 @@ export default function Notifications() {
 
   return (
     <Menu>
-      <Menu.Button onClickCapture={() => {
-      }} aria-label='notifications'>
+      <Menu.Button aria-label='notifications'>
         <div className='flex items-start hover:opacity-70' id='notificationsBtn'>
           <svg xmlns='http://www.w3.org/2000/svg' fill='currentColor' className='bi bi-bell h-6 w-5' viewBox='0 0 17 17'>
             <path d='M8 16a2 2 0 0 0 2-2H6a2 2 0 0 0 2 2zM8 1.918l-.797.161A4.002 4.002 0 0 0 4 6c0 .628-.134 2.197-.459 3.742-.16.767-.376 1.566-.663 2.258h10.244c-.287-.692-.502-1.49-.663-2.258C12.134 8.197 12 6.628 12 6a4.002 4.002 0 0 0-3.203-3.92L8 1.917zM14.22 12c.223.447.481.801.78 1H1c.299-.199.557-.553.78-1C2.68 10.2 3 6.88 3 6c0-2.42 1.72-4.44 4.005-4.901a1 1 0 1 1 1.99 0A5.002 5.002 0 0 1 13 6c0 .88.32 4.2 1.22 6z' />

diff --git a/components/profile/playHistory.tsx b/components/profile/playHistory.tsx
@@ -198,7 +198,6 @@ export default function PlayHistory() {
                       href: `/level/${level.slug}`,
                       id: playAttempt.levelId._id.toString() + '-' + playAttempt._id.toString(),
                       level: level,
-                      searchLabel: level.name,
                       stats: new SelectOptionStats(level.leastMoves, level.userMoves),
                       text: level.name,
                     }} />

diff --git a/contexts/appContext.ts b/contexts/appContext.ts
@@ -14,10 +14,10 @@ interface AppContextInterface {
   forceUpdate: () => void;
   game: Game;
   host: string | undefined;
-  notifications: Notification[];
   multiplayerSocket: MultiplayerSocket;
   mutatePlayLater: () => void;
   mutateUser: KeyedMutator<ReqUser>;
+  notifications: Notification[];
   playLater?: { [key: string]: boolean };
   protocol: string | undefined;
   setNotifications: React.Dispatch<React.SetStateAction<Notification[]>>;

diff --git a/helpers/filterSelectOptions.ts b/helpers/filterSelectOptions.ts
@@ -15,7 +15,7 @@ export default function filterSelectOptions(
   }
 
   if (filterText.length > 0) {
-    options = options.filter((option: SelectOption) => (option.searchLabel)?.toLowerCase().includes(filterText.toLowerCase()));
+    options = options.filter((option: SelectOption) => (option.searchLabel ?? option.text?.toString())?.toLowerCase().includes(filterText.toLowerCase()));
   }
 
   return options;

diff --git a/helpers/notificationHelper.ts b/helpers/notificationHelper.ts
@@ -54,7 +54,6 @@ export async function createNewWallPostNotification(gameId: GameId, type: Notifi
       userId: userId,
     }]),
     queuePushNotification(id),
-
   ]);
 
   await requestBroadcastNotifications(gameId, new Types.ObjectId(userId)); // needs to happen after creating the notif
@@ -231,7 +230,6 @@ export async function createNewLevelAddedToCollectionNotification(gameId: GameId
   const [nm,] = await Promise.all([
     await NotificationModel.create(createRecords),
     ...ids.map(id => queuePushNotification(id)),
-
   ]);
 
   await requestBroadcastNotifications(gameId, new Types.ObjectId(level.userId)); // needs to happen after creating the notif
@@ -301,7 +299,6 @@ export async function createNewRecordOnALevelYouSolvedNotifications(gameId: Game
   const [nm, ] = await Promise.all([
     NotificationModel.create(createRecords, options),
     ...ids.map(id => queuePushNotification(id)),
-
   ]);
 
   await Promise.all(userIds.map(userId => requestBroadcastNotifications(gameId, new Types.ObjectId(userId)))); // needs to happen after creating the notif

diff --git a/models/selectOption.ts b/models/selectOption.ts
@@ -11,8 +11,8 @@ interface SelectOption {
   id: string;
   level?: EnrichedLevel | undefined;
   onClick?: () => void;
+  searchLabel?: string; // text to search on, since text field is a react node (default is text?.toString())
   stats?: SelectOptionStats | undefined;
-  searchLabel?: string; // text to search on, since text field is a react node with private/public lock stuff
   text: React.ReactNode;
   width?: number;
 }