(
- level !== LicenseLevel.course && details && license !== 'select' ? (
+ level !== LicenseLevel.course && details && license !== 'select' && (
- {license === LicenseTypes.allRightsReserved ? (
+ {license === LicenseTypes.allRightsReserved && (
- ) : null}
+ )}
{license === LicenseTypes.creativeCommons
? (
@@ -55,7 +55,6 @@ const LicenseDetails = ({
@@ -80,7 +79,6 @@ const LicenseDetails = ({
noncommercial: e.target.checked,
},
})}
- aria-label="Checkbox"
/>
@@ -106,7 +104,6 @@ const LicenseDetails = ({
shareAlike: e.target.checked ? false : details.shareAlike,
},
})}
- aria-label="Checkbox"
/>
@@ -132,7 +129,6 @@ const LicenseDetails = ({
noDerivatives: e.target.checked ? false : details.noDerivatives,
},
})}
- aria-label="Checkbox"
/>
@@ -144,7 +140,7 @@ const LicenseDetails = ({
) : null}
- ) : null
+ )
);
LicenseDetails.propTypes = {
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 046cc017d3..9e608e8c68 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
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`LicenseDetails snapshots snapshots: renders as expected with default props 1`] = `null`;
+exports[`LicenseDetails snapshots snapshots: renders as expected with default props 1`] = `false`;
exports[`LicenseDetails snapshots snapshots: renders as expected with level set to block and license set to Creative Commons 1`] = `
@@ -71,7 +70,6 @@ exports[`LicenseDetails snapshots snapshots: renders as expected with level set
@@ -102,7 +100,6 @@ exports[`LicenseDetails snapshots snapshots: renders as expected with level set
@@ -131,7 +128,6 @@ exports[`LicenseDetails snapshots snapshots: renders as expected with level set
@@ -179,7 +175,7 @@ exports[`LicenseDetails snapshots snapshots: renders as expected with level set
`;
-exports[`LicenseDetails snapshots snapshots: renders as expected with level set to block and license set to select 1`] = `null`;
+exports[`LicenseDetails snapshots snapshots: renders as expected with level set to block and license set to select 1`] = `false`;
exports[`LicenseDetails snapshots snapshots: renders as expected with level set to library 1`] = `
{
await mockStore(RequestStatus.SUCCESSFUL);
axiosMock.onGet(`${getAssetsUrl(courseId)}?display_name=download.png&page_size=1`).reply(200, { assets: [] });
axiosMock.onPost(getAssetsUrl(courseId)).reply(200, generateNewAssetApiResponse());
- const addFilesButton = screen.getByLabelText('file-input');
+ const addFilesButton = screen.getByLabelText(messages.fileInputAriaLabel.defaultMessage);
userEvent.upload(addFilesButton, file);
await executeThunk(validateAssetFiles(courseId, [file]), store.dispatch);
await waitFor(() => {
@@ -221,7 +221,7 @@ describe('FilesAndUploads', () => {
axiosMock.onGet(
`${getAssetsUrl(courseId)}?display_name=mOckID6&page_size=1`,
).reply(200, { assets: [{ display_name: 'mOckID6' }] });
- const addFilesButton = screen.getByLabelText('file-input');
+ const addFilesButton = screen.getByLabelText(messages.fileInputAriaLabel.defaultMessage);
userEvent.upload(addFilesButton, file);
await executeThunk(validateAssetFiles(courseId, [file]), store.dispatch);
expect(screen.getByText(filesPageMessages.overwriteConfirmMessage.defaultMessage)).toBeVisible();
@@ -242,7 +242,7 @@ describe('FilesAndUploads', () => {
};
axiosMock.onPost(getAssetsUrl(courseId)).reply(200, responseData);
- const addFilesButton = screen.getByLabelText('file-input');
+ const addFilesButton = screen.getByLabelText(messages.fileInputAriaLabel.defaultMessage);
userEvent.upload(addFilesButton, file);
await executeThunk(validateAssetFiles(courseId, [file]), store.dispatch);
@@ -266,7 +266,7 @@ describe('FilesAndUploads', () => {
axiosMock.onGet(
`${getAssetsUrl(courseId)}?display_name=mOckID6&page_size=1`,
).reply(200, { assets: [{ display_name: 'mOckID6' }] });
- const addFilesButton = screen.getByLabelText('file-input');
+ const addFilesButton = screen.getByLabelText(messages.fileInputAriaLabel.defaultMessage);
userEvent.upload(addFilesButton, file);
await executeThunk(validateAssetFiles(courseId, [file]), store.dispatch);
@@ -558,7 +558,7 @@ describe('FilesAndUploads', () => {
await mockStore(RequestStatus.SUCCESSFUL);
axiosMock.onGet(`${getAssetsUrl(courseId)}?display_name=download.png&page_size=1`).reply(200, { assets: [] });
axiosMock.onPost(getAssetsUrl(courseId)).reply(413, { error: errorMessage });
- const addFilesButton = screen.getByLabelText('file-input');
+ const addFilesButton = screen.getByLabelText(messages.fileInputAriaLabel.defaultMessage);
userEvent.upload(addFilesButton, file);
await waitFor(() => {
const addStatus = store.getState().assets.addingStatus;
@@ -571,7 +571,7 @@ describe('FilesAndUploads', () => {
it('404 validation should show error', async () => {
await mockStore(RequestStatus.SUCCESSFUL);
axiosMock.onGet(`${getAssetsUrl(courseId)}?display_name=download.png&page_size=1`).reply(404);
- const addFilesButton = screen.getByLabelText('file-input');
+ const addFilesButton = screen.getByLabelText(messages.fileInputAriaLabel.defaultMessage);
userEvent.upload(addFilesButton, file);
await executeThunk(addAssetFile(courseId, file, 1), store.dispatch);
const addStatus = store.getState().assets.addingStatus;
@@ -584,7 +584,7 @@ describe('FilesAndUploads', () => {
await mockStore(RequestStatus.SUCCESSFUL);
axiosMock.onGet(`${getAssetsUrl(courseId)}?display_name=download.png&page_size=1`).reply(200, { assets: [] });
axiosMock.onPost(getAssetsUrl(courseId)).reply(404);
- const addFilesButton = screen.getByLabelText('file-input');
+ const addFilesButton = screen.getByLabelText(messages.fileInputAriaLabel.defaultMessage);
userEvent.upload(addFilesButton, file);
await executeThunk(addAssetFile(courseId, file, 1), store.dispatch);
const addStatus = store.getState().assets.addingStatus;
diff --git a/src/files-and-videos/generic/FileInput.jsx b/src/files-and-videos/generic/FileInput.jsx
index c953994d22..9e7de8a9d7 100644
--- a/src/files-and-videos/generic/FileInput.jsx
+++ b/src/files-and-videos/generic/FileInput.jsx
@@ -1,6 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
+import { useIntl } from '@edx/frontend-platform/i18n';
import { getSupportedFormats } from '../videos-page/data/utils';
+import messages from './messages';
export const useFileInput = ({
onAddFile,
@@ -23,17 +25,20 @@ export const useFileInput = ({
};
};
-const FileInput = ({ fileInput: hook, supportedFileFormats, allowMultiple }) => (
-
@@ -134,7 +134,7 @@ const OrderTranscriptForm = ({
diff --git a/src/files-and-videos/videos-page/transcript-settings/messages.js b/src/files-and-videos/videos-page/transcript-settings/messages.js
index 6585cd8d7b..12062056d7 100644
--- a/src/files-and-videos/videos-page/transcript-settings/messages.js
+++ b/src/files-and-videos/videos-page/transcript-settings/messages.js
@@ -28,16 +28,31 @@ const messages = defineMessages({
defaultMessage: 'None',
description: 'Label for order transcript None option',
},
+ noneAriaLabel: {
+ id: 'course-authoring.video-uploads.transcriptSettings.orderTranscripts.none.aria-label',
+ defaultMessage: 'none radio',
+ description: 'Accessible (screen reader) label for order transcript None option',
+ },
cieloLabel: {
id: 'course-authoring.video-uploads.transcriptSettings.orderTranscripts.cielo24.label',
defaultMessage: 'Cielo24',
description: 'Label for order transcript Cieol24 option',
},
+ cieloAriaLabel: {
+ id: 'course-authoring.video-uploads.transcriptSettings.orderTranscripts.cielo24.aria-label',
+ defaultMessage: 'Cielo24 radio',
+ description: 'Accessible (screen reader) label for order transcript Cieol24 option',
+ },
threePlayMediaLabel: {
id: 'course-authoring.video-uploads.transcriptSettings.orderTranscripts.3PlayMedia.label',
defaultMessage: '3Play Media',
description: 'Label for order transcript 3Play Media option',
},
+ threePlayMediaAriaLabel: {
+ id: 'course-authoring.video-uploads.transcriptSettings.orderTranscripts.3PlayMedia.aria-label',
+ defaultMessage: '3PlayMedia radio',
+ description: 'Accessible (screen reader) label for order transcript 3Play Media option',
+ },
updateSettingsLabel: {
id: 'course-authoring.video-uploads.transcriptSettings.orderTranscripts.updateSettings.label',
defaultMessage: 'Update settings',