feat: hide 2U specific fields #797
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| NODE_ENV='production' | ||
| IDENTIFIER_2U='2U' | ||
| BASE_URL=null | ||
| LMS_BASE_URL=null | ||
| STUDIO_BASE_URL=null | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -5,3 +5,4 @@ LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg | |||||
| LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg | ||||||
| FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico | ||||||
| SITE_NAME='edX' | ||||||
| IDENTIFIER_2U='2U' | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,6 +6,7 @@ import { | |||||
| import { Link } from 'react-router-dom'; | ||||||
| import { connect } from 'react-redux'; | ||||||
| import { compose } from 'redux'; | ||||||
| import { getConfig } from '@edx/frontend-platform'; | ||||||
| import { getAuthenticatedUser } from '@edx/frontend-platform/auth'; | ||||||
| import { Icon, Hyperlink, Chip } from '@edx/paragon'; | ||||||
| import { CloseSmall } from '@edx/paragon/icons'; | ||||||
|
|
@@ -226,6 +227,10 @@ export class BaseEditCourseForm extends React.Component { | |||||
| this.setCollapsible(true); | ||||||
| } | ||||||
|
|
||||||
| filterCourseTypes2U(courseType) { | ||||||
|
There was a problem hiding this comment. If we remove "2U" from the object and parameter names we can avoid confusion in the future, making this a truly generic feature.
Suggested change
|
||||||
| return courseType.label.includes(getConfig().IDENTIFIER_2U); | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
|
|
||||||
| render() { | ||||||
| const { | ||||||
| handleSubmit, | ||||||
|
|
@@ -306,6 +311,7 @@ export class BaseEditCourseForm extends React.Component { | |||||
| priceLabels, | ||||||
| runTypeModes, | ||||||
| } = parsedTypeOptions; | ||||||
| const courseTypes2U = courseTypeOptions.filter(this.filterCourseTypes2U); | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| const disabled = courseInReview || !editable; | ||||||
| const showMarketingFields = !currentFormValues.type || !courseTypes[currentFormValues.type] | ||||||
| || courseTypes[currentFormValues.type].course_run_types.some((crt) => crt.is_marketable); | ||||||
|
|
@@ -1046,34 +1052,38 @@ export class BaseEditCourseForm extends React.Component { | |||||
| className="course-skill" | ||||||
| /> | ||||||
| )} | ||||||
| {courseTypes2U?.length > 0 && ( | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| <> | ||||||
| <Field | ||||||
| name="organization_short_code_override" | ||||||
| component={RenderInputTextField} | ||||||
| label={ | ||||||
| <FieldLabel text="Organization Short Code Override" optional /> | ||||||
| } | ||||||
| extraInput={{ onInvalid: this.openCollapsible }} | ||||||
| disabled={disabled} | ||||||
| optional | ||||||
| /> | ||||||
| <Field | ||||||
| name="organization_logo_override_url" | ||||||
| component={ImageUpload} | ||||||
| label={( | ||||||
| <FieldLabel | ||||||
| id="organization_logo_override.label" | ||||||
| text="Organization Logo Override" | ||||||
| /> | ||||||
| )} | ||||||
| extraInput={{ onInvalid: this.openCollapsible }} | ||||||
| id="organization-logo-override" | ||||||
| className="course-image" | ||||||
| maxImageSizeKilo={256} | ||||||
| requiredWidth={110} | ||||||
| requiredHeight={110} | ||||||
| disabled={disabled} | ||||||
| optional | ||||||
| /> | ||||||
| </> | ||||||
| )} | ||||||
| {administrator && ( | ||||||
| <> | ||||||
| <FieldLabel text="Merchandising Location Restriction" className="mb-2" /> | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's rename this as well, and remove the "2U" default setting which does not make sense for all use cases.