fix url parameter organizer replacing first dropdown item

add organizer at the end instead of during filtering. Probably not the
optimal way to do this but works for now.

web/src/components/events/EventContainer.tsx

@@ -84,13 +84,22 @@ export const EventContainer = ({
       .filter((x) => typeof x === "string" && x !== "")
   );
   const filterableOrganizers = uniqueOrganizers
-    .map((slug) =>
+    .map((slug) => eventOrganizers.find((haystack) => haystack.slug === slug))
-      eventOrganizers.find(
-        (haystack) => haystack.slug === slug || haystack.slug == organizer
-      )
-    )
     .filter((x) => x !== undefined) as EventOrganizer[];
 
+  // If an organizer is selected that's not in the upcoming list, add it
+  if (
+    organizer &&
+    !filterableOrganizers.some((org) => org.slug === organizer)
+  ) {
+    const selectedOrganizer = eventOrganizers.find(
+      (org) => org.slug === organizer,
+    );
+    if (selectedOrganizer) {
+      filterableOrganizers.push(selectedOrganizer);
+    }
+  }
+
   /* Reset organizer if slug is invalid */
   useEffect(() => {
     if (!eventOrganizers.find((haystack) => haystack.slug === organizer)) {

web/src/components/layout/Header.tsx

@@ -87,8 +87,13 @@ export const Header = () => {
               </Link>
             </li>
             <li>
-              <Link href="/medlem" data-active={pathname === "/medlem"}>
+              <Link href="/frivillig" data-active={pathname === "/frivillig"}>
-                Bli medlem
+                Bli frivillig
+              </Link>
+            </li>
+            <li>
+              <Link href="/foreninger" data-active={pathname === "/foreninger"}>
+                Foreninger
               </Link>
             </li>
           </ul>
@@ -120,8 +125,16 @@ export const Header = () => {
                 </Link>
               </li>
               <li className={styles.menuItemLarge}>
-                <Link href="/medlem" data-active={pathname === "/medlem"}>
+                <Link href="/frivillig" data-active={pathname === "/frivillig"}>
-                  Bli medlem
+                  Bli frivillig
+                </Link>
+              </li>
+              <li className={styles.menuItemLarge}>
+                <Link
+                  href="/foreninger"
+                  data-active={pathname === "/foreninger"}
+                >
+                  Foreninger
                 </Link>
               </li>
               <li className={styles.divider}>
@@ -140,16 +153,8 @@ export const Header = () => {
                 </Link>
               </li>
               <li>
-                <Link href="/frivillig" data-active={pathname === "/frivillig"}>
+                <Link href="/medlem" data-active={pathname === "/medlem"}>
-                  Bli frivillig
+                  Bli medlem
-                </Link>
-              </li>
-              <li>
-                <Link
-                  href="/foreninger"
-                  data-active={pathname === "/foreninger"}
-                >
-                  Foreninger
                 </Link>
               </li>
               <li>
@@ -209,8 +214,16 @@ export const Header = () => {
                 </Link>
               </li>
               <li>
-                <Link href="/medlem" data-active={pathname === "/medlem"}>
+                <Link href="/frivillig" data-active={pathname === "/frivillig"}>
-                  Bli medlem
+                  Bli frivillig
+                </Link>
+              </li>
+              <li>
+                <Link
+                  href="/foreninger"
+                  data-active={pathname === "/foreninger"}
+                >
+                  Foreninger
                 </Link>
               </li>
             </ul>