diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/CollapsibleFormWidget.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/CollapsibleFormWidget.jsx index 679c4530b..64ca5e2fa 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/CollapsibleFormWidget.jsx +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/CollapsibleFormWidget.jsx @@ -24,32 +24,32 @@ export const CollapsibleFormWidget = ({ intl, }) => (
{title}
- {subtitle ?
{subtitle}
: null} + {subtitle ?
{subtitle}
:
}
{isError && }
- +
{title}
- + {children} diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx index 7d248e370..f33ee83cc 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx @@ -31,16 +31,16 @@ export const LicenseDetails = ({ updateField, }) => ( level !== LicenseLevel.course && details && license !== 'select' ? ( -
+
- {license === LicenseTypes.allRightsReserved ? ( - +
+ +
) : null} - {license === LicenseTypes.creativeCommons ? ( diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseSelector.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseSelector.jsx index 632303531..0eab68191 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseSelector.jsx +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseSelector.jsx @@ -7,6 +7,7 @@ import { intlShape, } from '@edx/frontend-platform/i18n'; import { + ActionRow, Form, Icon, IconButtonWithTooltip, @@ -31,10 +32,11 @@ export const LicenseSelector = ({ const onLicenseChange = hooks.onSelectLicense({ dispatch: useDispatch() }); const ref = React.useRef(); return ( - - + <> + {level !== LicenseLevel.course ? ( - { - ref.current.value = courseLicenseType; - updateField({ licenseType: '', licenseDetails: {} }); - }} - tooltipPlacement="top" - tooltipContent={} - /> + <> + + { + ref.current.value = courseLicenseType; + updateField({ licenseType: '', licenseDetails: {} }); + }} + tooltipPlacement="top" + tooltipContent={} + /> + ) : null } - +
{levelDescription}
- {license === LicenseTypes.select ? null :
} - + {license === LicenseTypes.select ? null :
} + ); }; diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/__snapshots__/LicenseDetails.test.jsx.snap b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/__snapshots__/LicenseDetails.test.jsx.snap index 63083c1e8..1f3a92277 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/__snapshots__/LicenseDetails.test.jsx.snap +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/__snapshots__/LicenseDetails.test.jsx.snap @@ -4,7 +4,7 @@ exports[`LicenseDetails snapshots snapshots: renders as expected with default pr exports[`LicenseDetails snapshots snapshots: renders as expected with level set to block and license set to Creative Commons 1`] = `
- +
+ +
`; @@ -179,7 +183,7 @@ exports[`LicenseDetails snapshots snapshots: renders as expected with level set exports[`LicenseDetails snapshots snapshots: renders as expected with level set to library 1`] = `
- + + + - +
@@ -53,20 +51,17 @@ exports[`LicenseSelector snapshots snapshots: renders as expected with block lev />
- + `; exports[`LicenseSelector snapshots snapshots: renders as expected with default props 1`] = ` - - + + - +
@@ -99,20 +94,17 @@ exports[`LicenseSelector snapshots snapshots: renders as expected with default p />
- + `; exports[`LicenseSelector snapshots snapshots: renders as expected with library level 1`] = ` - - + + + - +
@@ -157,20 +150,17 @@ exports[`LicenseSelector snapshots snapshots: renders as expected with library l />
- + `; exports[`LicenseSelector snapshots snapshots: renders as expected with no license 1`] = ` - - + + - +
@@ -203,7 +193,7 @@ exports[`LicenseSelector snapshots snapshots: renders as expected with no licens />
- + `; diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/LanguageSelector.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/LanguageSelector.jsx index 7542f4605..acfe89e59 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/LanguageSelector.jsx +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/LanguageSelector.jsx @@ -55,9 +55,14 @@ export const LanguageSelector = ({ dispatch: useDispatch(), languageBeforeChange: localLang, setLocalLang, triggerupload: input.click, }); return ( -
- - onLanguageChange(e)}> +
+ + onLanguageChange(e)} + > {Object.entries(videoTranscriptLanguages).map(([lang, text]) => { if (language === lang) { return (); } if (lang === 'placeholder') { return (); } diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/Transcript.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/Transcript.jsx index e984c53a1..7c6474dd0 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/Transcript.jsx +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/Transcript.jsx @@ -4,8 +4,11 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { - Card, Button, IconButton, Row, + Card, + Button, + IconButton, Icon, + ActionRow, } from '@edx/paragon'; import { Delete } from '@edx/paragon/icons'; @@ -71,11 +74,12 @@ export const Transcript = ({ ) : ( - + + { language === '' ? ( )} - - + )} ); diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/__snapshots__/LanguageSelector.test.jsx.snap b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/__snapshots__/LanguageSelector.test.jsx.snap index 27dafc467..76243493c 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/__snapshots__/LanguageSelector.test.jsx.snap +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/__snapshots__/LanguageSelector.test.jsx.snap @@ -2,10 +2,10 @@ exports[`LanguageSelector snapshot transcript option 1`] = `
- + + - + `; exports[`Transcript Component component component snapshots: renders as expected with default props: dont show confirm delete, language is blank so delete is shown instead of action menu 1`] = ` - + + - + `; diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/__snapshots__/index.test.jsx.snap b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/__snapshots__/index.test.jsx.snap index 15b537b80..05b990032 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/__snapshots__/index.test.jsx.snap +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/__snapshots__/index.test.jsx.snap @@ -63,7 +63,7 @@ exports[`VideoSourceWidget snapshots snapshots: renders as expected with default />
{fallbackVideos.formValue.length > 0 ? fallbackVideos.formValue.map((videoUrl, index) => ( - +
SuBTItle
@@ -42,7 +42,6 @@ exports[`CollapsibleFormWidget render snapshots: renders as expected with defaul

Some test string @@ -73,12 +72,12 @@ exports[`CollapsibleFormWidget render snapshots: renders as expected with defaul exports[`CollapsibleFormWidget render snapshots: renders with open={true} when there is error 1`] = `

SuBTItle
@@ -117,7 +116,6 @@ exports[`CollapsibleFormWidget render snapshots: renders with open={true} when t

Some test string