Add gql id building functions

elan-ev · Nov 2, 2023 · a48be0d · a48be0d
1 parent aa618fb
commit a48be0d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/frontend/src/routes/Embed.tsx b/frontend/src/routes/Embed.tsx
@@ -4,7 +4,7 @@ import { Translation, useTranslation } from "react-i18next";
 import { graphql, PreloadedQuery, usePreloadedQuery } from "react-relay";
 import { unreachable } from "@opencast/appkit";
 
-import { isSynced } from "../util";
+import { eventId, isSynced } from "../util";
 import { GlobalErrorBoundary } from "../util/err";
 import { loadQuery } from "../relay";
 import { makeRoute } from "../rauta";
@@ -46,9 +46,8 @@ export const EmbedVideoRoute = makeRoute(url => {
         return null;
     }
     const videoId = decodeURIComponent(params[1]);
-    const eventId = `ev${videoId}`;
 
-    const queryRef = loadQuery<EmbedQuery>(query, { id: eventId });
+    const queryRef = loadQuery<EmbedQuery>(query, { id: eventId(videoId) });
 
     return {
         render: () => <ErrorBoundary>

diff --git a/frontend/src/routes/Series.tsx b/frontend/src/routes/Series.tsx
@@ -8,7 +8,7 @@ import { RootLoader } from "../layout/Root";
 import { Nav } from "../layout/Navigation";
 import { PageTitle } from "../layout/header/ui";
 import { WaitingPage } from "../ui/Waiting";
-import { isSynced } from "../util";
+import { isSynced, seriesId } from "../util";
 
 import { NotFound } from "./NotFound";
 import { SeriesByOpencastIdQuery } from "./__generated__/SeriesByOpencastIdQuery.graphql";
@@ -65,7 +65,7 @@ export const DirectSeriesRoute = makeRoute(url => {
             rootRealm { ... NavigationData }
         }
     `;
-    const queryRef = loadQuery<SeriesByIdQuery>(query, { id: `sr${id}` });
+    const queryRef = loadQuery<SeriesByIdQuery>(query, { id: seriesId(id) });
 
 
     return {

diff --git a/frontend/src/routes/Video.tsx b/frontend/src/routes/Video.tsx
@@ -31,6 +31,7 @@ import {
     translatedConfig,
     currentRef,
     secondsToTimeString,
+    eventId,
 } from "../util";
 import { BREAKPOINT_SMALL, BREAKPOINT_MEDIUM } from "../GlobalStyle";
 import { Button, LinkButton } from "../ui/Button";
@@ -102,8 +103,7 @@ export const VideoRoute = makeRoute(url => {
         }
     `;
     const realmPath = "/" + realmPathParts.join("/");
-    const eventId = `ev${videoId}`;
-    const queryRef = loadQuery<VideoPageInRealmQuery>(query, { id: eventId, realmPath });
+    const queryRef = loadQuery<VideoPageInRealmQuery>(query, { id: eventId(videoId), realmPath });
 
     return {
         render: () => <RootLoader
@@ -154,8 +154,7 @@ export const DirectVideoRoute = makeRoute(url => {
         }
     `;
     const videoId = decodeURIComponent(params[1]);
-    const eventId = `ev${videoId}`;
-    const queryRef = loadQuery<VideoPageDirectLinkQuery>(query, { id: eventId });
+    const queryRef = loadQuery<VideoPageDirectLinkQuery>(query, { id: eventId(videoId) });
 
     return matchedDirectRoute(query, queryRef);
 });

diff --git a/frontend/src/routes/manage/Video/Shared.tsx b/frontend/src/routes/manage/Video/Shared.tsx
@@ -13,7 +13,7 @@ import { b64regex } from "../../util";
 import { Thumbnail } from "../../../ui/Video";
 import { SharedVideoManageQuery } from "./__generated__/SharedVideoManageQuery.graphql";
 import { Link } from "../../../router";
-import { isExperimentalFlagSet, keyOfId } from "../../../util";
+import { eventId, isExperimentalFlagSet, keyOfId } from "../../../util";
 
 
 export const PAGE_WIDTH = 1100;
@@ -38,7 +38,7 @@ export const makeManageVideoRoute = (
         }
 
         const videoId = decodeURIComponent(params[1]);
-        const queryRef = loadQuery<SharedVideoManageQuery>(query, { id: `ev${videoId}` });
+        const queryRef = loadQuery<SharedVideoManageQuery>(query, { id: eventId(videoId) });
 
         return {
             render: () => <RootLoader

diff --git a/frontend/src/util/index.ts b/frontend/src/util/index.ts
@@ -12,6 +12,12 @@ export function keyOfId(id: string): string {
     return id.substring(2);
 }
 
+/** Constructs event ID for graphQL by adding the "ev" prefix. */
+export const eventId = (key: string) => `ev${key}`;
+
+/** Constructs series ID for graphQL by adding the "sr" prefix. */
+export const seriesId = (key: string) => `sr${key}`;
+
 /**
  * Create a comparison function for `Array.prototype.sort` comparing whatever
  * the given key function returns as numbers.