Continued migration to typescript

Author: coder13

src/lib/api/localStorage.js

@@ -0,0 +1,10 @@
+import { WCA_OAUTH_CLIENT_ID } from './wca-env';
+
+export const localStorageKey = (key: string): string =>
+  `delegate-dashboard.${WCA_OAUTH_CLIENT_ID}.${key}`;
+export const getLocalStorage = (key: string): string | null =>
+  localStorage.getItem(localStorageKey(key));
+export const setLocalStorage = (key: string, value: string | null): void => {
+  if (value === null) return;
+  localStorage.setItem(localStorageKey(key), value);
+};

src/lib/api/localStorage.ts

@@ -0,0 +1,131 @@
+import { pick } from '../utils';
+import { getLocalStorage } from './localStorage';
+import { WCA_ORIGIN } from './wca-env';
+import { Competition } from '@wca/helpers';
+
+interface WcaUser {
+  id: number;
+  name: string;
+  wca_id?: string;
+  avatar: {
+    url: string;
+    thumb_url: string;
+  };
+  country_iso2: string;
+  email?: string;
+}
+
+interface WcaPerson {
+  id: number;
+  name: string;
+  wcaUserId?: number;
+  wcaId?: string;
+  countryIso2: string;
+}
+
+interface CompetitionSearchResult {
+  id: string;
+  name: string;
+  start_date: string;
+  end_date: string;
+  city: string;
+  country_iso2: string;
+}
+
+const wcaAccessToken = (): string | null => getLocalStorage('accessToken');
+
+export const getMe = (): Promise<{ me: WcaUser }> => {
+  console.log('Access Token:', wcaAccessToken());
+  return wcaApiFetch(`/me`);
+};
+
+/**
+ * @deprecated
+ */
+export const getManageableCompetitions = (): Promise<CompetitionSearchResult[]> => {
+  const params = new URLSearchParams({
+    managed_by_me: 'true',
+  });
+  return wcaApiFetch(`/competitions?${params.toString()}`);
+};
+
+export const getUpcomingManageableCompetitions = (): Promise<CompetitionSearchResult[]> => {
+  const oneWeekAgo = new Date(Date.now() - 2 * 7 * 24 * 60 * 60 * 1000);
+  const params = new URLSearchParams({
+    managed_by_me: 'true',
+    start: oneWeekAgo.toISOString(),
+    sort: 'start_date',
+  });
+  return wcaApiFetch(`/competitions?${params.toString()}`);
+};
+
+export const getPastManageableCompetitions = (): Promise<CompetitionSearchResult[]> => {
+  const oneWeekAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000);
+  const params = new URLSearchParams({
+    managed_by_me: 'true',
+    end: oneWeekAgo.toISOString(),
+  });
+  return wcaApiFetch(`/competitions?${params.toString()}`);
+};
+
+export const getWcif = (competitionId: string): Promise<Competition> =>
+  wcaApiFetch(`/competitions/${competitionId}/wcif`);
+
+export const patchWcif = (
+  competitionId: string,
+  wcif: Partial<Competition>
+): Promise<Competition> =>
+  wcaApiFetch(`/competitions/${competitionId}/wcif`, {
+    method: 'PATCH',
+    body: JSON.stringify(wcif),
+  });
+
+export const saveWcifChanges = (
+  previousWcif: Competition,
+  newWcif: Competition
+): Promise<Competition | void> => {
+  const keysDiff = Object.keys(newWcif).filter(
+    (key) => previousWcif[key as keyof Competition] !== newWcif[key as keyof Competition]
+  );
+  if (keysDiff.length === 0) return Promise.resolve();
+  return patchWcif(newWcif.id, pick(newWcif, keysDiff));
+};
+
+export const searchPersons = (query: string): Promise<WcaPerson[]> =>
+  wcaApiFetch(`/persons?q=${query}`);
+
+export const getPerson = (personId: number): Promise<WcaPerson> =>
+  wcaApiFetch(`/persons/${personId}`);
+
+export const searchUsers = (query: string): Promise<{ result: WcaUser[] }> =>
+  wcaApiFetch(`/search/users?q=${query}`);
+
+export const getUser = (userId: number): Promise<{ user: WcaUser }> =>
+  wcaApiFetch(`/users/${userId}`);
+
+export const wcaApiFetch = async <T = any>(
+  path: string,
+  fetchOptions: RequestInit = {}
+): Promise<T> => {
+  const baseApiUrl = `${WCA_ORIGIN}/api/v0`;
+
+  const res = await fetch(
+    `${baseApiUrl}${path}`,
+    Object.assign({}, fetchOptions, {
+      headers: new Headers({
+        Authorization: `Bearer ${wcaAccessToken()}`,
+        'Content-Type': 'application/json',
+      }),
+    })
+  );
+
+  if (!res.ok) {
+    if (res.statusText) {
+      throw new Error(`${res.status}: ${res.statusText}`);
+    } else {
+      throw new Error(`Something went wrong: Status code ${res.status}`);
+    }
+  }
+
+  return await res.json();
+};

src/lib/api/wcaAPI.js

@@ -1,11 +1,7 @@
 import { ActivityWithParent, findGroupActivitiesByRound, parseActivityCode } from '../domain';
-import {
-  hasStaffAssignment,
-  InProgressAssignmment,
-  isStaffAssignment,
-  missingCompetitorAssignments,
-} from '../domain';
+import { hasStaffAssignment, isStaffAssignment, missingCompetitorAssignments } from '../domain';
 import { personsShouldBeInRound } from '../domain';
+import { InProgressAssignmment } from '../types';
 import { createGroupAssignment, previousGroupForActivity } from '../wcif';
 import { Competition, Event, Person } from '@wca/helpers';
 

src/lib/api/wcaAPI.ts

@@ -1,10 +1,7 @@
 import { findGroupActivitiesByRound, parseActivityCode } from '../domain';
-import {
-  InProgressAssignmment,
-  isCompetitorAssignment,
-  missingCompetitorAssignments,
-} from '../domain';
+import { isCompetitorAssignment, missingCompetitorAssignments } from '../domain';
 import { byPROrResult, personsShouldBeInRound } from '../domain';
+import { InProgressAssignmment } from '../types';
 import { byName } from '../utils';
 import { createGroupAssignment } from '../wcif';
 import { Competition, Event } from '@wca/helpers';

src/lib/assignmentGenerators/generateCompetingAssignmentsForStaff.ts

@@ -1,6 +1,12 @@
-import { findRoundActivitiesById, parseActivityCode } from '../domain';
-import { InProgressAssignmment, missingCompetitorAssignments } from '../domain';
-import { byPROrResult, isOrganizerOrDelegate, personsShouldBeInRound } from '../domain';
+import {
+  byPROrResult,
+  findRoundActivitiesById,
+  isOrganizerOrDelegate,
+  missingCompetitorAssignments,
+  parseActivityCode,
+  personsShouldBeInRound,
+} from '../domain';
+import { InProgressAssignmment } from '../types';
 import { byName } from '../utils';
 import { createGroupAssignment } from '../wcif';
 import { Activity, Competition, Event } from '@wca/helpers';

src/lib/assignmentGenerators/generateCompetingGroupActitivitesForEveryone.ts

@@ -2,10 +2,10 @@ import { findGroupActivitiesByRound, parseActivityCode } from '../domain';
 import {
   findCompetingAssignment,
   hasCompetitorAssignment,
-  InProgressAssignmment,
   missingStaffAssignments,
 } from '../domain';
 import { isOrganizerOrDelegate, personsShouldBeInRound } from '../domain';
+import { InProgressAssignmment } from '../types';
 import { createGroupAssignment, nextGroupForActivity } from '../wcif';
 import { Competition, Event } from '@wca/helpers';
 

src/lib/assignmentGenerators/generateGroupAssignmentsForDelegatesAndOrganizers.ts

@@ -289,10 +289,7 @@ export const cumulativeGroupCount = (round) => {
 /**
  * Searches for an activity recursively and returns a new version of the activity
  */
-export const findAndReplaceActivity = (
-  where: Partial<Activity> & { id: string },
-  what: Partial<Activity>
-) => {
+export const findAndReplaceActivity = (where: Partial<Activity>, what: Partial<Activity>) => {
   return (activity: Activity): Activity => {
     if (activity.id === where.id) {
       return {

src/lib/assignmentGenerators/generateJudgeAssignmentsFromCompetingAssignments.ts

@@ -1,16 +1,12 @@
+import { InProgressAssignmment } from '../types';
 import { Assignment, Person } from '@wca/helpers';
 
-export interface InProgressAssignmment {
-  registrantId: number;
-  assignment: Assignment;
-}
-
 /**
  * So that I don't have to remember the data format
  */
 export const createGroupAssignment = (
   registrantId: number,
-  activityId: any,
+  activityId: number,
   assignmentCode: string,
   stationNumber: number | null = null
 ): InProgressAssignmment => ({