Merge branch 'master' into chris/FAL-3989-video-transcripts

openedx · Jan 29, 2025 · 729780e · 729780e
2 parents 73c4bda + b7241a1
commit 729780e
Show file tree

Hide file tree

Showing 21 changed files with 339 additions and 77 deletions.
diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -12,6 +12,7 @@ metadata:
       icon: "Web"
   annotations:
     openedx.org/arch-interest-groups: ""
+    openedx.org/release: "master"
 spec:
   owner: group:2u-tnl
   type: 'website'

diff --git a/openedx.yaml b/openedx.yaml
diff --git a/...ProblemEditor/components/EditProblemView/SettingsWidget/__snapshots__/index.test.jsx.snap b/...ProblemEditor/components/EditProblemView/SettingsWidget/__snapshots__/index.test.jsx.snap
@@ -1,5 +1,188 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`SettingsWidget isLibrary snapshot: renders Settings widget for Advanced Problem with correct widgets 1`] = `
+<div
+  className="settingsWidget ml-4"
+>
+  <div
+    className="mb-3"
+  >
+    <TypeCard
+      problemType="stringresponse"
+    />
+  </div>
+  <div
+    className="mt-3"
+  >
+    <HintsCard
+      images={{}}
+      isLibrary={true}
+      learningContextId="course+org+run"
+      problemType="stringresponse"
+    />
+  </div>
+  <Fragment />
+  <div>
+    <Advanced
+      open={false}
+    >
+      <Body
+        className="collapsible-body small"
+      >
+        <Button
+          className="my-3 px-0 text-info-500"
+          size="inline"
+          variant="link"
+        >
+          <FormattedMessage
+            defaultMessage="Show advanced settings"
+            description="Button text to show advanced settings"
+            id="authoring.problemeditor.settings.showAdvancedButton"
+          />
+        </Button>
+      </Body>
+    </Advanced>
+  </div>
+  <Advanced
+    open={true}
+  >
+    <Body
+      className="collapsible-body"
+    >
+      <div
+        className="my-3"
+      >
+        <SwitchToAdvancedEditorCard
+          problemType="stringresponse"
+        />
+      </div>
+    </Body>
+  </Advanced>
+</div>
+`;
+
+exports[`SettingsWidget isLibrary snapshot: renders Settings widget page 1`] = `
+<div
+  className="settingsWidget ml-4"
+>
+  <div
+    className="mb-3"
+  >
+    <TypeCard
+      problemType="stringresponse"
+    />
+  </div>
+  <div
+    className="mt-3"
+  >
+    <HintsCard
+      images={{}}
+      isLibrary={true}
+      learningContextId="course+org+run"
+      problemType="stringresponse"
+    />
+  </div>
+  <Fragment />
+  <div>
+    <Advanced
+      open={true}
+    >
+      <Body
+        className="collapsible-body small"
+      >
+        <Button
+          className="my-3 px-0 text-info-500"
+          size="inline"
+          variant="link"
+        >
+          <FormattedMessage
+            defaultMessage="Show advanced settings"
+            description="Button text to show advanced settings"
+            id="authoring.problemeditor.settings.showAdvancedButton"
+          />
+        </Button>
+      </Body>
+    </Advanced>
+  </div>
+  <Advanced
+    open={false}
+  >
+    <Body
+      className="collapsible-body"
+    >
+      <div
+        className="my-3"
+      >
+        <SwitchToAdvancedEditorCard
+          problemType="stringresponse"
+        />
+      </div>
+    </Body>
+  </Advanced>
+</div>
+`;
+
+exports[`SettingsWidget isLibrary snapshot: renders Settings widget page advanced settings visible 1`] = `
+<div
+  className="settingsWidget ml-4"
+>
+  <div
+    className="mb-3"
+  >
+    <TypeCard
+      problemType="stringresponse"
+    />
+  </div>
+  <div
+    className="mt-3"
+  >
+    <HintsCard
+      images={{}}
+      isLibrary={true}
+      learningContextId="course+org+run"
+      problemType="stringresponse"
+    />
+  </div>
+  <Fragment />
+  <div>
+    <Advanced
+      open={false}
+    >
+      <Body
+        className="collapsible-body small"
+      >
+        <Button
+          className="my-3 px-0 text-info-500"
+          size="inline"
+          variant="link"
+        >
+          <FormattedMessage
+            defaultMessage="Show advanced settings"
+            description="Button text to show advanced settings"
+            id="authoring.problemeditor.settings.showAdvancedButton"
+          />
+        </Button>
+      </Body>
+    </Advanced>
+  </div>
+  <Advanced
+    open={true}
+  >
+    <Body
+      className="collapsible-body"
+    >
+      <div
+        className="my-3"
+      >
+        <SwitchToAdvancedEditorCard
+          problemType="stringresponse"
+        />
+      </div>
+    </Body>
+  </Advanced>
+</div>
+`;
+
 exports[`SettingsWidget snapshot snapshot: renders Settings widget for Advanced Problem with correct widgets 1`] = `
 <div
   className="settingsWidget ml-4"

diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.jsx
@@ -80,13 +80,15 @@ const SettingsWidget = ({
             />
           </div>
           )}
-      <div className="my-3">
-        <ScoringCard
-          scoring={settings.scoring}
-          defaultValue={defaultSettings.maxAttempts}
-          updateSettings={updateSettings}
-        />
-      </div>
+      {!isLibrary && (
+        <div className="my-3">
+          <ScoringCard
+            scoring={settings.scoring}
+            defaultValue={defaultSettings.maxAttempts}
+            updateSettings={updateSettings}
+          />
+        </div>
+      )}
       <div className="mt-3">
         <HintsCard
           problemType={problemType}
@@ -114,23 +116,26 @@ const SettingsWidget = ({
           </Collapsible.Body>
         </Collapsible.Advanced>
       </div>
-
       <Collapsible.Advanced open={isAdvancedCardsVisible}>
         <Collapsible.Body className="collapsible-body">
-          <div className="my-3">
-            <ShowAnswerCard
-              showAnswer={settings.showAnswer}
-              defaultValue={defaultSettings.showanswer}
-              updateSettings={updateSettings}
-            />
-          </div>
-          <div className="my-3">
-            <ResetCard
-              showResetButton={settings.showResetButton}
-              defaultValue={defaultSettings.showResetButton}
-              updateSettings={updateSettings}
-            />
-          </div>
+          {!isLibrary && (
+            <div className="my-3">
+              <ShowAnswerCard
+                showAnswer={settings.showAnswer}
+                defaultValue={defaultSettings.showanswer}
+                updateSettings={updateSettings}
+              />
+            </div>
+          )}
+          {!isLibrary && (
+            <div className="my-3">
+              <ResetCard
+                showResetButton={settings.showResetButton}
+                defaultValue={defaultSettings.showResetButton}
+                updateSettings={updateSettings}
+              />
+            </div>
+          )}
           {
             problemType === ProblemTypeKeys.ADVANCED && (
             <div className="my-3">
@@ -142,9 +147,11 @@ const SettingsWidget = ({
             </div>
             )
           }
-          <div className="my-3">
-            <TimerCard timeBetween={settings.timeBetween} updateSettings={updateSettings} />
-          </div>
+          {!isLibrary && (
+            <div className="my-3">
+              <TimerCard timeBetween={settings.timeBetween} updateSettings={updateSettings} />
+            </div>
+          )}
           <div className="my-3">
             <SwitchToAdvancedEditorCard problemType={problemType} />
           </div>

diff --git a/...editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.test.jsx b/...editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.test.jsx
@@ -74,6 +74,39 @@ describe('SettingsWidget', () => {
     });
   });
 
+  describe('isLibrary', () => {
+    const libraryProps = {
+      ...props,
+      isLibrary: true,
+    };
+    test('snapshot: renders Settings widget page', () => {
+      const showAdvancedSettingsCardsProps = {
+        isAdvancedCardsVisible: false,
+        setResetTrue: jest.fn().mockName('showAdvancedSettingsCards.setResetTrue'),
+      };
+      showAdvancedSettingsCards.mockReturnValue(showAdvancedSettingsCardsProps);
+      expect(shallow(<SettingsWidget {...libraryProps} />).snapshot).toMatchSnapshot();
+    });
+    test('snapshot: renders Settings widget page advanced settings visible', () => {
+      const showAdvancedSettingsCardsProps = {
+        isAdvancedCardsVisible: true,
+        setResetTrue: jest.fn().mockName('showAdvancedSettingsCards.setResetTrue'),
+      };
+      showAdvancedSettingsCards.mockReturnValue(showAdvancedSettingsCardsProps);
+      expect(shallow(<SettingsWidget {...libraryProps} />).snapshot).toMatchSnapshot();
+    });
+    test('snapshot: renders Settings widget for Advanced Problem with correct widgets', () => {
+      const showAdvancedSettingsCardsProps = {
+        isAdvancedCardsVisible: true,
+        setResetTrue: jest.fn().mockName('showAdvancedSettingsCards.setResetTrue'),
+      };
+      showAdvancedSettingsCards.mockReturnValue(showAdvancedSettingsCardsProps);
+      expect(shallow(
+        <SettingsWidget problemType={ProblemTypeKeys.ADVANCED} {...libraryProps} />,
+      ).snapshot).toMatchSnapshot();
+    });
+  });
+
   describe('mapDispatchToProps', () => {
     test('setBlockTitle from actions.app.setBlockTitle', () => {
       expect(mapDispatchToProps.setBlockTitle).toEqual(actions.app.setBlockTitle);

diff --git a/src/grading-settings/grading-scale/GradingScale.scss b/src/grading-settings/grading-scale/GradingScale.scss
@@ -6,7 +6,7 @@
 
   .grading-scale-segments-and-ticks {
     display: inline-block;
-    height: 3.125rem;
+    height: 3.5rem;
     width: 100%;
     border: 1px solid $black;
     overflow: hidden;
@@ -70,13 +70,9 @@
       }
 
       .grading-scale-segment-btn-remove {
-        font: normal $font-weight-normal .6875rem/1 $font-family-base;
+        font-size: x-small;
         display: none;
-        position: absolute;
-        top: -1.5625rem;
-        right: -.375rem;
-        padding: .375rem;
-        text-decoration: none;
+        margin: -2px -4px 0 0;
       }
 
       .grading-scale-segment-content {

diff --git a/src/grading-settings/grading-scale/components/GradingScaleSegment.tsx b/src/grading-settings/grading-scale/components/GradingScaleSegment.tsx
@@ -66,19 +66,19 @@ const GradingScaleSegment = ({
         <span data-testid="grading-scale-segment-number" className="grading-scale-segment-content-number m-0">
           {gradingSegments[idx === 0 ? 0 : idx - 1]?.previous} - {value === 100 ? value : value - 1}
         </span>
+        {idx !== gradingSegments.length && idx - 1 !== 0 && (
+          <Button
+            variant="link"
+            size="inline"
+            className="grading-scale-segment-btn-remove"
+            data-testid="grading-scale-btn-remove"
+            type="button"
+            onClick={() => removeGradingSegment(idx)}
+          >
+            {intl.formatMessage(messages.removeSegmentButtonText)}
+          </Button>
+        )}
       </div>
-      {idx !== gradingSegments.length && idx - 1 !== 0 && (
-        <Button
-          variant="link"
-          size="inline"
-          className="grading-scale-segment-btn-remove"
-          data-testid="grading-scale-btn-remove"
-          type="button"
-          onClick={() => removeGradingSegment(idx)}
-        >
-          {intl.formatMessage(messages.removeSegmentButtonText)}
-        </Button>
-      )}
     </div>
   );
 };