more fixes

Author: xyzqm

content/6_Advanced/Extend_Euclid.problems.json

@@ -6,7 +6,7 @@
       "name": "Modular Arithmetic",
       "url": "https://open.kattis.com/problems/modulararithmetic",
       "source": "Kattis",
-      "difficulty": null,
+      "difficulty": "N/A",
       "isStarred": false,
       "tags": [],
       "solutionMetadata": {
@@ -20,7 +20,7 @@
       "name": "Chinese Remainder",
       "url": "https://open.kattis.com/problems/chineseremainder",
       "source": "Kattis",
-      "difficulty": null,
+      "difficulty": "N/A",
       "isStarred": false,
       "tags": [],
       "solutionMetadata": {
@@ -32,7 +32,7 @@
       "name": "Chinese Remainder (non-relatively prime moduli)",
       "url": "https://open.kattis.com/problems/generalchineseremainder",
       "source": "Kattis",
-      "difficulty": null,
+      "difficulty": "N/A",
       "isStarred": false,
       "tags": [],
       "solutionMetadata": {

gatsby-node.ts

@@ -2,6 +2,7 @@ import { execSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import * as freshOrdering from './content/ordering';
+import { typeDefs } from './graphql-types';
 import div_to_probs from './src/components/markdown/ProblemsList/DivisionList/div_to_probs.json';
 import { createXdmNode } from './src/gatsby/create-xdm-node';
 import {
@@ -491,87 +492,6 @@ exports.createPages = async ({ graphql, actions, reporter }) => {
 
 exports.createSchemaCustomization = ({ actions }) => {
   const { createTypes } = actions;
-  const typeDefs = `
-    type Xdm implements Node {
-      body: String
-      fileAbsolutePath: String
-      frontmatter: XdmFrontmatter!
-      isIncomplete: Boolean
-      cppOc: Int
-      javaOc: Int
-      pyOc: Int
-      toc: TableOfContents
-      mdast: String
-    }
-
-    type XdmFrontmatter implements Node {
-      id: String
-      title: String!
-      author: String
-      contributors: String
-      description: String
-      prerequisites: [String]
-      redirects: [String]
-      frequency: Int
-    }
-
-    type Heading {
-      depth: Int
-      value: String
-      slug: String
-    }
-
-    type TableOfContents {
-      cpp: [Heading]
-      java: [Heading]
-      py: [Heading]
-    }
-
-    type ModuleProblemLists implements Node {
-      moduleId: String
-      problemLists: [ModuleProblemList]
-    }
-
-    type ModuleProblemList {
-      listId: String!
-      problems: [ModuleProblemInfo]
-    }
-
-    type ProblemInfo implements Node {
-      uniqueId: String!
-      name: String!
-      url: String!
-      source: String!
-      sourceDescription: String
-      isStarred: Boolean!
-      difficulty: String!
-      tags: [String!]!
-      solution: ProblemSolutionInfo!
-      inModule: Boolean!
-      module: Xdm @link(by: "frontmatter.id")
-    }
-
-    type ModuleProblemInfo {
-      uniqueId: String!
-      name: String!
-      url: String!
-      source: String!
-      sourceDescription: String
-      isStarred: Boolean!
-      difficulty: String!
-      tags: [String!]!
-      solution: ProblemSolutionInfo
-    }
-
-    type ProblemSolutionInfo {
-      kind: String!
-      label: String
-      labelTooltip: String
-      url: String
-      sketch: String
-      hasHints:Boolean
-    }
-  `;
   createTypes(typeDefs);
 };
 const FilterWarningsPlugin = require('webpack-filter-warnings-plugin');

graphql-types.ts

@@ -0,0 +1,81 @@
+export const typeDefs = `
+    type Xdm implements Node {
+      body: String
+      fileAbsolutePath: String
+      frontmatter: XdmFrontmatter!
+      isIncomplete: Boolean
+      cppOc: Int
+      javaOc: Int
+      pyOc: Int
+      toc: TableOfContents
+      mdast: String
+    }
+
+    type XdmFrontmatter implements Node {
+      id: String
+      title: String!
+      author: String
+      contributors: String
+      description: String
+      prerequisites: [String]
+      redirects: [String]
+      frequency: Int
+    }
+
+    type Heading {
+      depth: Int
+      value: String
+      slug: String
+    }
+
+    type TableOfContents {
+      cpp: [Heading]
+      java: [Heading]
+      py: [Heading]
+    }
+
+    type ModuleProblemLists implements Node {
+      moduleId: String
+      problemLists: [ModuleProblemList]
+    }
+
+    type ModuleProblemList {
+      listId: String!
+      problems: [ModuleProblemInfo]
+    }
+
+    type ProblemInfo implements Node {
+      uniqueId: String!
+      name: String!
+      url: String!
+      source: String!
+      sourceDescription: String
+      isStarred: Boolean!
+      difficulty: String
+      tags: [String!]!
+      solution: ProblemSolutionInfo
+      inModule: Boolean!
+      module: Xdm @link(by: "frontmatter.id")
+    }
+
+    type ModuleProblemInfo {
+      uniqueId: String!
+      name: String!
+      url: String!
+      source: String!
+      sourceDescription: String
+      isStarred: Boolean!
+      difficulty: String
+      tags: [String!]!
+      solution: ProblemSolutionInfo
+    }
+
+    type ProblemSolutionInfo {
+      kind: String!
+      label: String
+      labelTooltip: String
+      url: String
+      sketch: String
+      hasHints:Boolean
+    }
+  `;

src/atoms/editor.ts

@@ -48,11 +48,11 @@ const baseActiveFileAtom = atomWithStorage(
   null as string | null
 );
 export const branchAtom = atomWithStorage('guide:editor:branch', null);
-export const tokenAtom = atom(null);
+export const tokenAtom = atom<string | null>(null);
 export const octokitAtom = atom(get =>
   get(tokenAtom) === null ? null : new Octokit({ auth: get(tokenAtom) })
 );
-export const forkAtom = atom(undefined);
+export const forkAtom = atom<string | undefined>(undefined);
 export const baseTabAtom = atom('content');
 export const editingSolutionAtom = atom(get => {
   const activeFile = get(activeFileAtom);
@@ -257,7 +257,7 @@ export const closeFileAtom = atom(null, (get, set, filePath: string) => {
   filesFamily.remove(filePath);
 });
 
-const baseMonacoEditorInstanceAtom = atom({ monaco: null });
+const baseMonacoEditorInstanceAtom = atom({ monaco: null as any });
 export const monacoEditorInstanceAtom = atom(
   get => get(baseMonacoEditorInstanceAtom),
   (get, _set, val: any) => {

src/components/ContactUsSlideover/ContactUsSlideover.tsx

@@ -12,7 +12,13 @@ import SlideoverForm from './SlideoverForm';
 
 // Warning: this file is insanely messy. This should be rewritten soon :)
 
-const Field = ({ label, id, value, onChange, errorMsg = null }) => {
+const Field = ({
+  label,
+  id,
+  value,
+  onChange,
+  errorMsg = null as string | null,
+}) => {
   return (
     <div className="space-y-1">
       <label
@@ -113,10 +119,10 @@ export default function ContactUsSlideover({
   useEffect(() => {
     if (!firebaseUser) return;
     if (email === '') {
-      setEmail(firebaseUser.email);
+      setEmail(firebaseUser.email!);
     }
     if (name === '') {
-      setName(firebaseUser.displayName);
+      setName(firebaseUser.displayName!);
     }
   }, [firebaseUser]);
 

src/components/Dashboard/DashboardProgress.tsx

@@ -32,7 +32,7 @@ const FancyNumber = ({
   text,
   textColor,
   bgColor,
-  subTextColor = null,
+  subTextColor = null as string | null,
 }) => (
   <div className="text-center">
     <span
@@ -104,7 +104,13 @@ export default function DashboardProgress({
   );
 }
 
-const ProgressBarSmall = ({ className = null, text, green, yellow, blue }) => {
+const ProgressBarSmall = ({
+  className = undefined as string | undefined,
+  text,
+  green,
+  yellow,
+  blue,
+}) => {
   return (
     <div className={className}>
       <div className="inline-block">

src/components/Dashboard/ModuleLink.tsx

@@ -196,14 +196,14 @@ const ModuleLink = ({ link }: { link: ModuleLinkInfo }): JSX.Element => {
     darkDotColorStyle = tw`bg-gray-800`;
   }
   const userLang = useUserLangSetting();
-  const maxLangOc = Math.max(link.cppOc, link.javaOc, link.pyOc);
+  const maxLangOc = Math.max(link.cppOc ?? 0, link.javaOc ?? 0, link.pyOc ?? 0);
   const langToOc = {
     cpp: link.cppOc,
     java: link.javaOc,
     py: link.pyOc,
     showAll: maxLangOc,
   };
-  const isMissingLang = langToOc[userLang] < maxLangOc;
+  const isMissingLang = langToOc[userLang] ?? 0 < maxLangOc;
   return (
     <LinkWithProgress
       lineColorStyle={lineColorStyle}
@@ -253,16 +253,16 @@ const ModuleLink = ({ link }: { link: ModuleLinkInfo }): JSX.Element => {
                 totalCount={4}
                 color={
                   'transition text-gray-400 ' +
-                  FrequencyCircleColors[link.frequency]
+                  FrequencyCircleColors[link.frequency ?? 0]
                 }
               />
               <span
                 className={
                   `ml-1 transition text-gray-500 ` +
-                  FrequencyTextColors[link.frequency]
+                  FrequencyTextColors[link.frequency ?? 0]
                 }
               >
-                {FrequencyLabels[link.frequency]}
+                {FrequencyLabels[link.frequency ?? 0]}
               </span>
             </p>
           )}

src/components/Editor/AddFileModal.tsx

@@ -70,7 +70,7 @@ export default function AddFileModal(props) {
                 source: info.source,
                 division,
                 problemModules: [],
-              } as AlgoliaEditorSolutionFile);
+              } as unknown as AlgoliaEditorSolutionFile);
               setFileStatus('Create File');
             } catch (e) {
               setFileStatus('Create File');

src/components/Editor/EditorFileModalInterface.tsx

@@ -47,7 +47,7 @@ const FileSearch = ({
   onSelect,
   openAddFile,
 }: {
-  onSelect: (file: AlgoliaEditorFile) => void;
+  onSelect: (file: AlgoliaEditorFile | undefined) => void;
   openAddFile: () => void;
 }) => {
   const { query, refine: setQuery } = useSearchBox();

src/components/Editor/EditorOutput.tsx

@@ -21,13 +21,13 @@ export const EditorOutput = (): JSX.Element => {
   const activeFile = useAtomValue(activeFileAtom);
   const saveFile = useSetAtom(saveFileAtom);
 
-  const markdown: string | null = activeFile?.markdown;
-  const problems: string | null = activeFile?.problems;
+  const markdown: string = activeFile?.markdown ?? '';
+  const problems: string = activeFile?.problems ?? '';
 
   const [
     markdownProblemListsProviderValue,
     setMarkdownProblemListsProviderValue,
-  ] = useState([]);
+  ] = useState<{ listId: string; problems: any }[]>([]);
   React.useEffect(() => {
     try {
       const parsedProblems = JSON.parse(problems || '{}');
@@ -81,7 +81,7 @@ export const EditorOutput = (): JSX.Element => {
       plugins: [babelParser],
     });
     saveFile({
-      path: activeFile.path,
+      path: activeFile!.path,
       update: prev => ({
         ...prev,
         problems: formattedNewContent,

src/components/Editor/EditorSidebar/EditorSidebar.tsx

@@ -53,7 +53,8 @@ function GithubActions() {
       })
       .then(res =>
         setFork(
-          res.data.find(repo => repo.name === 'usaco-guide')?.html_url ?? null
+          res.data.find(repo => repo.name === 'usaco-guide')?.html_url ??
+            undefined
         )
       );
   }, [githubInfo, branch, octokit, setFork]);
@@ -158,7 +159,7 @@ function GithubActions() {
                   Fork detected!
                 </a>
               </p>
-              {branch ? (
+              {branch && githubInfo ? (
                 <p>
                   Current branch:{' '}
                   <a
@@ -183,7 +184,7 @@ function GithubActions() {
               >
                 {branchState}
               </button>
-              {branch && (
+              {branch && githubInfo && (
                 <a
                   className="btn mt-4"
                   href={`https://github.com/${githubInfo.login}/usaco-guide/pull/new/${branch}`}

src/components/Editor/MainEditorInterface.tsx

@@ -64,7 +64,7 @@ export const MainEditorInterface = ({ className }): JSX.Element => {
         path: activeFile.path,
         update: prev => ({
           ...prev,
-          problems: x(prev.problems),
+          problems: x(prev.problems!),
         }),
       });
     }