Fixes 4422 (#1310)

* Disable ligatures in more places * Make instructions box easier to edit * Remove accessibility link from thinglink * Edit exam - fix related courses can be completed automatically checkbox
rage · Sep 9, 2024 · c7da267 · c7da267
1 parent 4fece9c
commit c7da267
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 19 deletions.
diff --git a/services/cms/src/blocks/InstructionBox/InstructionBoxEditor.tsx b/services/cms/src/blocks/InstructionBox/InstructionBoxEditor.tsx
@@ -23,8 +23,10 @@ const InstructionBoxEditor: React.FC<
         `}
       >
         <RichText
-          className="has-text-align-center wp-block-heading"
-          tagName="span"
+          className={css`
+            width: 100%;
+          `}
+          tagName="div"
           value={content}
           onChange={(value: string) => setAttributes({ content: value })}
           placeholder={"Write a text here"}

diff --git a/...urse-material/src/components/ContentRenderer/core/embeds/variants/ThingLinkEmbedBlock.tsx b/...urse-material/src/components/ContentRenderer/core/embeds/variants/ThingLinkEmbedBlock.tsx
@@ -1,5 +1,4 @@
 import { css } from "@emotion/css"
-import { useTranslation } from "react-i18next"
 
 import { EmbedAttributes } from "../../../../../../types/GutenbergBlockAttributes"
 import { sanitizeCourseMaterialHtml } from "../../../../../utils/sanitizeCourseMaterialHtml"
@@ -8,19 +7,10 @@ import BreakFromCentered from "@/shared-module/common/components/Centering/Break
 import { baseTheme } from "@/shared-module/common/styles/theme"
 
 const THINGLINK = "thinglink"
-const GET_NUMERIC_ID_FROM_STRING_REGEX = /\/(\d+)/g
 
 export const ThingLinkEmbedBlock: React.FC<
   React.PropsWithChildren<EmbedAttributes & { dontAllowBlockToBeWiderThanContainerWidth: boolean }>
 > = (props) => {
-  const { t } = useTranslation()
-  let id: string | null = null
-
-  if (props.url) {
-    const groups = props.url.matchAll(GET_NUMERIC_ID_FROM_STRING_REGEX)
-    id = groups.next()?.value[1]
-  }
-
   return (
     <BreakFromCentered sidebar={false} disabled={props.dontAllowBlockToBeWiderThanContainerWidth}>
       <figure
@@ -55,11 +45,6 @@ export const ThingLinkEmbedBlock: React.FC<
           {props.caption && (
             <div dangerouslySetInnerHTML={{ __html: sanitizeCourseMaterialHtml(props.caption) }} />
           )}
-          {id && (
-            <a href={`https://www.thinglink.com/view/scene/${id}/accessibility`}>
-              {t("link-text-open-accessible-view-of-this-content")}
-            </a>
-          )}
         </figcaption>
       </figure>
     </BreakFromCentered>

diff --git a/...l/src/components/ContentRenderer/core/formatting/CodeBlock/SyntaxHighlightedContainer.tsx b/...l/src/components/ContentRenderer/core/formatting/CodeBlock/SyntaxHighlightedContainer.tsx
@@ -32,6 +32,7 @@ const SyntaxHighlightedContainer: React.FC<SyntaxHighlightedContainerProps> = ({
         background-color: #1a2333;
         border-radius: 4px;
         font-variant-ligatures: none;
+        font-feature-settings: "liga" 0;
       `}
       ref={ref}
       dangerouslySetInnerHTML={{ __html: sanitizeCourseMaterialHtml(replacedContent) }}

diff --git a/services/main-frontend/src/components/forms/EditExamForm.tsx b/services/main-frontend/src/components/forms/EditExamForm.tsx
@@ -97,6 +97,7 @@ const EditExamForm: React.FC<React.PropsWithChildren<EditExamFormProps>> = ({
           {...register("manualGradingEnabled")}
         />
         <CheckBox
+          defaultChecked={initialData?.minimum_points_treshold !== 0}
           label={t("label-related-courses-can-be-completed-automatically")}
           {...register("automaticCompletionEnabled")}
         />

diff --git a/shared-module/packages/common/src/locales/en/course-material.json b/shared-module/packages/common/src/locales/en/course-material.json
@@ -114,7 +114,6 @@
   "label-message": "Message",
   "label-name": "Name",
   "language-language": "Language: {{language}}",
-  "link-text-open-accessible-view-of-this-content": "Open an accessible view of this content.",
   "loading": "Loading",
   "map-disclaimer": "*On the map, you'll find the breakdown of students per country. Other students will only see the total student count for your country.",
   "map-instruction": "To begin, please your country of residence. Once you've made your selection, a map will display the countries where fellow students are living.",

diff --git a/shared-module/packages/common/src/locales/fi/course-material.json b/shared-module/packages/common/src/locales/fi/course-material.json
@@ -116,7 +116,6 @@
   "label-message": "Viesti",
   "label-name": "Nimi",
   "language-language": "Kieli: {{language}}",
-  "link-text-open-accessible-view-of-this-content": "Avaa saavutettava näkymä tästä sisällöstä",
   "loading": "Lataa",
   "map-disclaimer": "*Kartalla näet opiskelijamäärät maakohtaisesti. Muut opiskelijat näkevät vain kuinka paljon maastasi on opiskelijoita yhteensä.",
   "map-instruction": "Valitse asuinmaasi aloittaaksesi. Kun olet tehnyt valintasi kartta näyttää maat, joissa muut opiskelijat asuvat.",

diff --git a/shared-module/packages/common/src/styles/GlobalStyles.tsx b/shared-module/packages/common/src/styles/GlobalStyles.tsx
@@ -64,6 +64,8 @@ const globalCss = css`
   kbd,
   tt {
     font-family: ${monospaceFont};
+    font-variant-ligatures: none;
+    font-feature-settings: "liga" 0;
   }
   .screen-reader-only {
     position: absolute;