Merge remote-tracking branch 'origin/master' into flip-card-block

bin/translations-add-new-ones-to-non-en

@@ -1,10 +1,8 @@
 #!/usr/bin/env python3
 
-BASEDIR="$(dirname "${BASH_SOURCE[0]}")"
-TRANSLATIONS_EN_PATH="$BASEDIR/../shared-module/packages/common/src/locales/en"
-TRANSLATIONS_EN_RELATIVE_PATH=$(realpath --relative-to="$(pwd)" "$TRANSLATIONS_EN_PATH")
-FOLDERS_PATH="$BASEDIR/../shared-module/packages/common/src/locales"
-FOLDERS_RELATIVE_PATH=$(realpath --relative-to="$(pwd)" "$FOLDERS_PATH")
+import os
+import glob
+import json
 
 BASEDIR = os.path.dirname(os.path.realpath(__file__))
 TRANSLATIONS_EN_PATH = os.path.join(BASEDIR, "../shared-module/packages/common/src/locales/en")
@@ -20,20 +18,26 @@ ensure_program_in_path('jq')
 ensure_program_in_path('sponge')
 
 EN_PATHS = glob.glob(f"{TRANSLATIONS_EN_RELATIVE_PATH}/*.json")
-FOLDERS_PATH = [name for name in glob.glob(f"{FOLDERS_RELATIVE_PATH}/*") if os.path.isdir(name) and not name.endswith('/en')]
+OTHER_LANGUAGE_FOLDERS = [name for name in glob.glob(f"{FOLDERS_RELATIVE_PATH}/*") if os.path.isdir(name) and not name.endswith('/en')]
 
 for original_file in EN_PATHS:
-  for target_folder in FOLDERS_PATH:
-    target_folder_language = os.path.basename(target_folder)
-    target_file = original_file.replace("/en/", f"/{target_folder_language}/")
-    print(f"Adding translations {original_file} > {target_file}")
-    with open(original_file) as f1, open(target_file) as f2:
-      data1 = json.load(f1)
-      data2 = json.load(f2)
-      missing_keys = [key for key in data1 if key not in data2]
-      for key in missing_keys:
-        data2[key] = data1[key]
-    with open(target_file, 'w') as f:
-      json.dump(data2, f, indent=2, ensure_ascii=False)
+    for target_folder in OTHER_LANGUAGE_FOLDERS:
+        target_folder_language = os.path.basename(target_folder)
+        target_file = original_file.replace("/en/", f"/{target_folder_language}/")
+        print(f"Adding translations {original_file} > {target_file}")
+
+        if os.path.exists(target_file):
+            with open(original_file) as f1, open(target_file) as f2:
+                data1 = json.load(f1)
+                data2 = json.load(f2)
+
+                missing_keys = [key for key in data1 if key not in data2]
+                for key in missing_keys:
+                    data2[key] = data1[key]
+
+            with open(target_file, 'w') as f:
+                json.dump(data2, f, indent=2, ensure_ascii=False)
+        else:
+            print(f"Target file {target_file} does not exist. Skipping.")
 
 print("\nImportant: remember to translate the new strings before adding them to version control")

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.76"
+channel = "1.80"
 profile = "default"

services/cms/src/blocks/CodeGiveaway/CodeGiveawayBlockEditor.tsx

@@ -0,0 +1,97 @@
+import styled from "@emotion/styled"
+import { useQuery } from "@tanstack/react-query"
+import { InnerBlocks, InspectorControls } from "@wordpress/block-editor"
+import { BlockEditProps } from "@wordpress/blocks"
+import React, { useContext, useMemo } from "react"
+import { useTranslation } from "react-i18next"
+
+import PageContext from "../../contexts/PageContext"
+import { fetchCourseInstances } from "../../services/backend/course-instances"
+import { fetchCourseModulesByCourseId } from "../../services/backend/courses"
+import BlockPlaceholderWrapper from "../BlockPlaceholderWrapper"
+
+import { ConditionAttributes } from "."
+
+import InnerBlocksWrapper from "@/components/blocks/InnerBlocksWrapper"
+import CourseContext from "@/contexts/CourseContext"
+import { fetchCodeGiveawaysByCourseId } from "@/services/backend/code-giveaways"
+import DropdownMenu from "@/shared-module/common/components/DropdownMenu"
+import SelectField from "@/shared-module/common/components/InputFields/SelectField"
+import { assertNotNullOrUndefined } from "@/shared-module/common/utils/nullability"
+
+const ALLOWED_NESTED_BLOCKS = [
+  "core/heading",
+  "core/buttons",
+  "core/button",
+  "core/paragraph",
+  "core/image",
+  "core/embed",
+]
+
+const Wrapper = styled.div`
+  margin-left: 1rem;
+  margin-right: 1rem;
+  height: auto;
+`
+
+const CodeGiveawayBlockEditor: React.FC<
+  React.PropsWithChildren<BlockEditProps<ConditionAttributes>>
+> = ({ attributes, clientId, setAttributes }) => {
+  const { t } = useTranslation()
+  const courseId = useContext(PageContext)?.page.course_id
+
+  const codeGivawayQuery = useQuery({
+    queryKey: [`/code-giveaways/by-course/${courseId}`],
+    queryFn: () => fetchCodeGiveawaysByCourseId(assertNotNullOrUndefined(courseId)),
+    enabled: !!courseId,
+  })
+
+  const title = useMemo(() => {
+    let title = t("code-giveaway")
+    if (codeGivawayQuery.data) {
+      const selected = codeGivawayQuery.data.find((o) => o.id === attributes.code_giveaway_id)
+      if (selected) {
+        title += ` (${selected.name})`
+      }
+    }
+    return title
+  }, [attributes.code_giveaway_id, codeGivawayQuery.data, t])
+
+  const dropdownOptions = useMemo(() => {
+    const res = [{ label: t("select-an-option"), value: "" }]
+    if (!codeGivawayQuery.data) {
+      return res
+    }
+    const additional = codeGivawayQuery.data.map((o) => ({
+      label: o.name,
+      value: o.id,
+    }))
+    return res.concat(additional)
+  }, [codeGivawayQuery.data, t])
+
+  return (
+    <BlockPlaceholderWrapper
+      id={clientId}
+      title={title}
+      explanation={t("code-giveaway-explanation")}
+    >
+      <InspectorControls>
+        {codeGivawayQuery.data && (
+          <Wrapper>
+            <SelectField
+              label={t("code-giveaway")}
+              options={dropdownOptions}
+              defaultValue={attributes.code_giveaway_id}
+              onChangeByValue={(value) => setAttributes({ code_giveaway_id: value })}
+            />
+          </Wrapper>
+        )}
+      </InspectorControls>
+      <InnerBlocksWrapper title={t("instructions")}>
+        <InnerBlocks allowedBlocks={ALLOWED_NESTED_BLOCKS} />
+      </InnerBlocksWrapper>
+    </BlockPlaceholderWrapper>
+  )
+}
+
+export default CodeGiveawayBlockEditor

services/cms/src/blocks/CodeGiveaway/CodeGiveawayBlockSave.tsx

@@ -0,0 +1,11 @@
+import { InnerBlocks } from "@wordpress/block-editor"
+
+const CodeGiveawayBlockSave: React.FC = () => {
+  return (
+    <div>
+      <InnerBlocks.Content />
+    </div>
+  )
+}
+
+export default CodeGiveawayBlockSave

services/cms/src/blocks/CodeGiveaway/index.tsx

@@ -0,0 +1,28 @@
+/* eslint-disable i18next/no-literal-string */
+import { BlockConfiguration } from "@wordpress/blocks"
+
+import { MOOCFI_CATEGORY_SLUG } from "../../utils/Gutenberg/modifyGutenbergCategories"
+
+import CodeGiveawayBlockEditor from "./CodeGiveawayBlockEditor"
+import CodeGiveawayBlockSave from "./CodeGiveawayBlockSave"
+
+export interface ConditionAttributes {
+  code_giveaway_id: string
+}
+
+const ConditionalBlockConfiguration: BlockConfiguration<ConditionAttributes> = {
+  title: "CodeGiveaway",
+  description:
+    "Used to place a code giveaway to a page. Make sure to have created a code giveaway in the manage page.",
+  category: MOOCFI_CATEGORY_SLUG,
+  attributes: {
+    code_giveaway_id: {
+      type: "string",
+      default: "",
+    },
+  },
+  edit: CodeGiveawayBlockEditor,
+  save: CodeGiveawayBlockSave,
+}
+
+export default ConditionalBlockConfiguration

services/cms/src/blocks/ConditionalBlock/ConditionalBlockEditor.tsx

@@ -12,6 +12,7 @@ import BlockPlaceholderWrapper from "../BlockPlaceholderWrapper"
 
 import { ConditionAttributes } from "."
 
+import InnerBlocksWrapper from "@/components/blocks/InnerBlocksWrapper"
 import CheckBox from "@/shared-module/common/components/InputFields/CheckBox"
 import { assertNotNullOrUndefined } from "@/shared-module/common/utils/nullability"
 
@@ -66,7 +67,7 @@ const ConditionalBlockEditor: React.FC<
               return (
                 <CheckBox
                   key={mod.id}
-                  label={mod.name ?? t("default")}
+                  label={mod.name ?? t("label-default")}
                   value={mod.id}
                   onChange={() => {
                     const previuoslyChecked = requiredModules.some((modId) => modId == mod.id)
@@ -90,7 +91,7 @@ const ConditionalBlockEditor: React.FC<
               return (
                 <CheckBox
                   key={inst.id}
-                  label={inst.name ?? t("default")}
+                  label={inst.name ?? t("label-default")}
                   value={inst.id}
                   onChange={() => {
                     const previuoslyChecked = requiredInstanceEnrollment.some(
@@ -112,7 +113,9 @@ const ConditionalBlockEditor: React.FC<
           </Wrapper>
         )}
       </InspectorControls>
-      <InnerBlocks allowedBlocks={ALLOWED_NESTED_BLOCKS} />
+      <InnerBlocksWrapper title={t("conditionally-shown-content")}>
+        <InnerBlocks allowedBlocks={ALLOWED_NESTED_BLOCKS} />
+      </InnerBlocksWrapper>
     </BlockPlaceholderWrapper>
   )
 }

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"}

services/cms/src/blocks/index.tsx

@@ -5,6 +5,7 @@ import Aside from "./Aside"
 import Author from "./Author"
 import AuthorInnerBlock from "./AuthorInnerBlock"
 import ChapterProgress from "./ChapterProgress"
+import CodeGiveaway from "./CodeGiveaway"
 import ConditionalBlock from "./ConditionalBlock"
 import Congratulations from "./Congratulations"
 import CourseChapterGrid from "./CourseChapterGrid"
@@ -72,7 +73,7 @@ export const blockTypeMapForPages = [
   ["moocfi/top-level-pages", TopLevelPage],
   ["moocfi/flip-card", FlipCard],
   ["moocfi/inner-card", InnerCard],
-
+  ["moocfi/code-giveaway", CodeGiveaway],
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ] as Array<[string, BlockConfiguration<Record<string, any>>]>
 
@@ -92,6 +93,7 @@ export const blockTypeMapForFrontPages = [
   ["moocfi/map", Map],
   ["moocfi/conditional-block", ConditionalBlock],
   ["moocfi/exercise-custom-view-block", ExerciseCustomView],
+  ["moocfi/code-giveaway", CodeGiveaway],
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ] as Array<[string, BlockConfiguration<Record<string, any>>]>
 

services/cms/src/components/blocks/InnerBlocksWrapper.tsx

@@ -0,0 +1,21 @@
+import { css } from "@emotion/css"
+
+const InnerBlocksWrapper: React.FC<React.PropsWithChildren<{ title: string }>> = ({
+  title,
+  children,
+}) => {
+  return (
+    <div
+      className={css`
+        width: 100%;
+        border: 1px solid #e2e2e2;
+        padding: 1rem;
+      `}
+    >
+      <h4>{title}</h4>
+      {children}
+    </div>
+  )
+}
+
+export default InnerBlocksWrapper

services/cms/src/services/backend/code-giveaways.ts

@@ -0,0 +1,8 @@
+import { cmsClient } from "./cmsClient"
+
+import { validateResponse } from "@/shared-module/common/utils/fetching"
+
+export const fetchCodeGiveawaysByCourseId = async (courseId: string) => {
+  const response = await cmsClient.get(`/code-giveaways/by-course/${courseId}`)
+  return validateResponse(response, Array.isArray)
+}

services/cms/src/utils/documentSchemaProcessor.tsx

@@ -246,11 +246,13 @@ export function denormalizeDocument(input: CmsPageUpdate): UnnormalizedDocument
         needs_peer_review: exercise.needs_peer_review,
         needs_self_review: exercise.needs_self_review,
         peer_or_self_review_config:
-          exercise.needs_peer_review && !exercise.use_course_default_peer_or_self_review_config
+          (exercise.needs_peer_review || exercise.needs_self_review) &&
+          !exercise.use_course_default_peer_or_self_review_config
             ? JSON.stringify(exercise.peer_or_self_review_config)
             : "null",
         peer_or_self_review_questions_config:
-          exercise.needs_peer_review && !exercise.use_course_default_peer_or_self_review_config
+          (exercise.needs_peer_review || exercise.needs_self_review) &&
+          !exercise.use_course_default_peer_or_self_review_config
             ? JSON.stringify(exercise.peer_or_self_review_questions)
             : "null",
         use_course_default_peer_review: exercise.use_course_default_peer_or_self_review_config,

services/course-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>

services/course-material/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) }}

services/course-material/src/components/ContentRenderer/index.tsx

@@ -37,6 +37,7 @@ import AudioPlayer from "./moocfi/AudioPlayer/index"
 import AuthorBlock from "./moocfi/AuthorBlock"
 import AuthorInnerBlock from "./moocfi/AuthorInnerBlock"
 import ChapterProgressBlock from "./moocfi/ChapterProgressBlock"
+import CodeGiveawayBlock from "./moocfi/CodeGiveAway"
 import ConditionalBlock from "./moocfi/ConditionalBlock"
 import CongratulationsBlock from "./moocfi/CongratulationsBlock"
 import CourseChapterGridBlock from "./moocfi/CourseChapterGridBlock"
@@ -163,6 +164,7 @@ export const blockToRendererMap: { [blockName: string]: any } = {
   "moocfi/exercise-custom-view-block": ExerciseCustomViewBlock,
   "moocfi/flip-card": FlipCardBlock,
   "moocfi/inner-card": InnerCardBlock,
+  "moocfi/code-giveaway": CodeGiveawayBlock,
 }
 
 const highlightedBlockStyles = css`