Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openedx/frontend-app-publisher
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee8244d1ef08d9ce9694228ea4e92d1c89d003c4
Choose a base ref
..
head repository: openedx/frontend-app-publisher
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a31af678c01f8aa02acb5ad643dcc9054f00909a
Choose a head ref
Showing with 31 additions and 2 deletions.
  1. +2 −2 src/components/EditCoursePage/EditCourseForm.jsx
  2. +29 −0 src/components/EditCoursePage/EditCourseForm.test.jsx
4 changes: 2 additions & 2 deletions src/components/EditCoursePage/EditCourseForm.jsx
Original file line number Diff line number Diff line change
@@ -1007,7 +1007,7 @@ export class BaseEditCourseForm extends React.Component {
extraInput={{ onInvalid: this.openCollapsible }}
options={levelTypeOptions}
disabled={disabled}
required={isSubmittingForReview}
required={showMarketingFields && isSubmittingForReview}
/>
<Field
name="subjectPrimary"
@@ -1040,7 +1040,7 @@ export class BaseEditCourseForm extends React.Component {
extraInput={{ onInvalid: this.openCollapsible }}
options={subjectOptions}
disabled={disabled}
required={isSubmittingForReview}
required={showMarketingFields && isSubmittingForReview}
/>
<Field
name="subjectSecondary"
29 changes: 29 additions & 0 deletions src/components/EditCoursePage/EditCourseForm.test.jsx
Original file line number Diff line number Diff line change
@@ -494,4 +494,33 @@ describe('BaseEditCourseForm', () => {
/>);
expect(shallowToJson(component)).toMatchSnapshot();
});

it('does not add required prop for level_type and subjectPrimary fields when not submitting for review', () => {
const initialValuesWithMasters = {
...initialValuesFull,
type: '7b41992e-f268-4331-8ba9-72acb0880454',
};

const component = shallow(<BaseEditCourseForm
handleSubmit={() => null}
title="Test Course"
initialValues={{ title: initialValuesFull.title }}
currentFormValues={initialValuesWithMasters}
number="Test101x"
courseStatuses={[UNPUBLISHED]}
courseInfo={courseInfo}
courseOptions={courseOptions}
courseRunOptions={courseRunOptions}
uuid={initialValuesWithMasters.uuid}
type={initialValuesWithMasters.type}
isSubmittingForReview={false}
id="edit-course-form"
/>);

const levelTypeField = component.find(Field).filterWhere(n => n.prop('name') === 'level_type');
const subjectPrimaryField = component.find(Field).filterWhere(n => n.prop('name') === 'subjectPrimary');

expect(levelTypeField.prop('required')).toBe(false);
expect(subjectPrimaryField.prop('required')).toBe(false);
});
});