Stop inline glossary terms needing to use exam board

Author: mlt47

src/app/components/elements/LaTeX.tsx

@@ -2,14 +2,7 @@ import React, {useContext} from "react";
 import {useSelector} from "react-redux";
 import {selectors} from "../../state/selectors";
 import {AppState} from "../../state/reducers";
-import {useUserContext} from "../../services/userContext";
-import {
-    BooleanNotation,
-    FigureNumberingContext,
-    FigureNumbersById,
-    PotentialUser
-} from "../../../IsaacAppTypes";
-import {EXAM_BOARD} from "../../services/constants";
+import {BooleanNotation, FigureNumberingContext, FigureNumbersById, PotentialUser} from "../../../IsaacAppTypes";
 import he from "he";
 import {SITE, SITE_SUBJECT} from "../../services/siteConstants";
 import katex from "katex";
@@ -230,7 +223,7 @@ const ENDREF = "==ENDREF==";
 const REF_REGEXP = new RegExp(REF + "(.*?)" + ENDREF, "g");
 const SR_REF_REGEXP = new RegExp("start text, " + REF_REGEXP.source + ", end text,", "g");
 
-export function katexify(html: string, user: PotentialUser | null, examBoard: EXAM_BOARD | null, booleanNotation : BooleanNotation | null,  screenReaderHoverText: boolean, figureNumbers: FigureNumbersById) {
+export function katexify(html: string, user: PotentialUser | null, booleanNotation : BooleanNotation | null,  screenReaderHoverText: boolean, figureNumbers: FigureNumbersById) {
     start.lastIndex = 0;
     let match: RegExpExecArray | null;
     let output = "";
@@ -333,11 +326,10 @@ export function LaTeX({markup}: {markup: string}) {
     const booleanNotation = useSelector((state: AppState) => state?.userPreferences?.BOOLEAN_NOTATION || null);
     const screenReaderHoverText = useSelector((state: AppState) => state && state.userPreferences &&
         state.userPreferences.BETA_FEATURE && state.userPreferences.BETA_FEATURE.SCREENREADER_HOVERTEXT || false);
-    const {examBoard} = useUserContext();
     const figureNumbers = useContext(FigureNumberingContext);
 
     const escapedMarkup = escapeHtml(markup);
-    const katexHtml = katexify(escapedMarkup, user, examBoard, booleanNotation, screenReaderHoverText, figureNumbers);
+    const katexHtml = katexify(escapedMarkup, user, booleanNotation, screenReaderHoverText, figureNumbers);
 
     return <span dangerouslySetInnerHTML={{__html: katexHtml}} />
 }

src/app/components/elements/TrustedHtml.tsx

@@ -3,7 +3,6 @@ import 'katex/dist/contrib/mhchem.js';
 import {FigureNumberingContext} from "../../../IsaacAppTypes";
 import {AppState} from "../../state/reducers";
 import {useSelector} from "react-redux";
-import {useUserContext} from "../../services/userContext";
 import {selectors} from "../../state/selectors";
 import {katexify} from "./LaTeX";
 
@@ -39,11 +38,10 @@ export const TrustedHtml = ({html, span}: {html: string; span?: boolean}) => {
     const booleanNotation = useSelector((state: AppState) => state?.userPreferences?.BOOLEAN_NOTATION || null);
     const screenReaderHoverText = useSelector((state: AppState) => state && state.userPreferences &&
         state.userPreferences.BETA_FEATURE && state.userPreferences.BETA_FEATURE.SCREENREADER_HOVERTEXT || false);
-    const {examBoard} = useUserContext();
 
     const figureNumbers = useContext(FigureNumberingContext);
 
-    html = manipulateHtml(katexify(html, user, examBoard, booleanNotation, screenReaderHoverText, figureNumbers));
+    html = manipulateHtml(katexify(html, user, booleanNotation, screenReaderHoverText, figureNumbers));
 
     const ElementType = span ? "span" : "div";
     return <ElementType dangerouslySetInnerHTML={{__html: html}} />;

src/app/components/elements/TrustedMarkdown.tsx

@@ -4,15 +4,14 @@ import {Provider, useSelector, useStore} from "react-redux";
 import * as RS from "reactstrap";
 import {Router} from "react-router-dom";
 import {AppState} from "../../state/reducers";
-import {EXAM_BOARD_NULL_OPTIONS, MARKDOWN_RENDERER} from "../../services/constants";
+import {MARKDOWN_RENDERER} from "../../services/constants";
 import {TrustedHtml} from "./TrustedHtml";
 import {IsaacGlossaryTerm} from "../content/IsaacGlossaryTerm";
 import {GlossaryTermDTO} from "../../../IsaacApiTypes";
 import {escapeHtml, replaceEntities} from "remarkable/lib/common/utils";
 import {Token} from "remarkable";
 import uuid from "uuid";
 import {history} from "../../services/history";
-import {useUserContext} from "../../services/userContext";
 import {SITE, SITE_SUBJECT} from "../../services/siteConstants";
 
 MARKDOWN_RENDERER.renderer.rules.link_open = function(tokens: Token[], idx/* options, env */) {
@@ -39,8 +38,6 @@ function getTermFromCandidateTerms(candidateTerms: GlossaryTermDTO[]) {
 
 export const TrustedMarkdown = ({markdown}: {markdown: string}) => {
     const store = useStore();
-    const {examBoard} = useUserContext();
-    const examBoardTag = !EXAM_BOARD_NULL_OPTIONS.has(examBoard) ? examBoard : "";
 
     const glossaryTerms = useSelector((state: AppState) => state && state.glossaryTerms);
     const [componentUuid, setComponentUuid] = useState(uuid.v4().slice(0, 8));
@@ -64,14 +61,12 @@ export const TrustedMarkdown = ({markdown}: {markdown: string}) => {
     ]));
 
     if (glossaryTerms && glossaryTerms.length > 0 && glossaryIdsInMarkdown.length > 0) {
-        const filteredTerms = glossaryTerms.filter(term => term.examBoard === "" || term.examBoard === examBoard);
-
         // Markdown can't cope with React components, so we pre-render our component to static HTML, which Markdown will then ignore.
         // This requires a bunch of stuff to be passed down along with the component.
         markdown = markdown.replace(glossaryBlockRegexp, (_match, id) => {
-            const term = getTermFromCandidateTerms(filteredTerms.filter(term => (term.id as string) === id || (term.id as string) === `${id}|${examBoardTag}`));
+            const term = getTermFromCandidateTerms(glossaryTerms.filter(term => (term.id as string) === id));
             if (term === null) {
-                console.error('No valid term for "' + id + '" found among the filtered terms: ', filteredTerms);
+                console.error('No valid term for "' + id + '" found among the filtered terms: ', glossaryTerms);
                 return "";
             }
 
@@ -88,9 +83,9 @@ export const TrustedMarkdown = ({markdown}: {markdown: string}) => {
         // The tooltip components can be rendered as regular react objects, so we just add them to an array,
         // and return them inside the JSX.Element that is returned as TrustedMarkdown.
         markdown = markdown.replace(glossaryInlineRegexp, (_match, id, text, offset) => {
-            const term = getTermFromCandidateTerms(filteredTerms.filter(term => (term.id as string) === id || (term.id as string) === `${id}|${examBoardTag}`));
+            const term = getTermFromCandidateTerms(glossaryTerms.filter(term => (term.id as string) === id));
             if (term === null) {
-                console.error('No valid term for "' + id + '" found among the filtered terms: ', filteredTerms);
+                console.error('No valid term for "' + id + '" found among the filtered terms: ', glossaryTerms);
                 return "";
             }
 

src/test/components/TrustedHtml.test.tsx

@@ -27,7 +27,7 @@ describe('TrustedHtml LaTeX locator', () => {
     it('can find basic delimiters', () => {
         delimiters.forEach(([open, displayMode, close]) => {
             const testcase = html[0] + wrapIn(open, math[0], close) + html[1];
-            const result = katexify(testcase, null, null, null, false, {});
+            const result = katexify(testcase, null, null, false, {});
 
             expect(result).toEqual(html[0] + LATEX + html[1]);
             // @ts-ignore
@@ -40,7 +40,7 @@ describe('TrustedHtml LaTeX locator', () => {
     it("unbalanced delimiters don't break everything but instead are just skipped", () => {
         delimiters.forEach(([open, , ]) => {
             const testcase = html[0] + wrapIn(open, math[0], "") + html[1];
-            const result = katexify(testcase, null, null, null, false, {});
+            const result = katexify(testcase, null, null, false, {});
 
             expect(result).toEqual(html[0] + open + math[0] + html[1]);
             expect(katex.renderToString).not.toHaveBeenCalled();
@@ -51,7 +51,7 @@ describe('TrustedHtml LaTeX locator', () => {
         nestedDollars.forEach((dollarMath) => {
             delimiters.forEach(([open, displayMode, close]) => {
                 const testcase = html[0] + wrapIn(open, dollarMath, close) + html[1];
-                const result = katexify(testcase, null, null, null, false, {});
+                const result = katexify(testcase, null, null, false, {});
 
                 expect(result).toEqual(html[0] + LATEX + html[1]);
                 // @ts-ignore
@@ -65,7 +65,7 @@ describe('TrustedHtml LaTeX locator', () => {
     it('can render environments', () => {
         const env = "\\begin{aligned}" + math[0] + "\\end{aligned}";
         const testcase = html[0] + env + html[1];
-        const result = katexify(testcase, null, null, null, false, {});
+        const result = katexify(testcase, null, null, false, {});
 
         expect(result).toEqual(html[0] + LATEX + html[1]);
         // @ts-ignore
@@ -77,7 +77,7 @@ describe('TrustedHtml LaTeX locator', () => {
     it('missing refs show an inline error', () => {
         const ref = "\\ref{foo[234o89tdgfiuno34£\"$%^Y}";
         const testcase = html[0] + ref + html[1];
-        const result = katexify(testcase, null, null, null, false, {});
+        const result = katexify(testcase, null, null, false, {});
 
         expect(result).toEqual(html[0] + "unknown reference " + ref + html[1]);
         expect(katex.renderToString).not.toHaveBeenCalled();
@@ -86,7 +86,7 @@ describe('TrustedHtml LaTeX locator', () => {
     it('found refs show their figure number', () => {
         const ref = "\\ref{foo}";
         const testcase = html[0] + ref + html[1];
-        const result = katexify(testcase, null, null, null, false, {foo: 42});
+        const result = katexify(testcase, null, null, false, {foo: 42});
 
         const expectedFigureRef = "Figure" + " " + "42";
         const expectedFigureRefWithFormatting = `<strong class="text-secondary figure-reference">${expectedFigureRef}</strong>`;
@@ -98,7 +98,7 @@ describe('TrustedHtml LaTeX locator', () => {
         const escapedDollar = "\\$";
         const unescapedDollar = "$";
         const testcase = html[0] + escapedDollar + html[1];
-        const result = katexify(testcase, null, null, null, false, {});
+        const result = katexify(testcase, null, null, false, {});
 
         expect(result).toEqual(html[0] + unescapedDollar + html[1]);
         expect(katex.renderToString).not.toHaveBeenCalled();