diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue index ed08da72b..226891170 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue @@ -47,7 +47,7 @@ FileUploadType, getAllowedFileExtensionsInAcceptFormat, startUploadsFromFileElement, - getMediaTypeFromFileExtensionContributeCaseOrAssessment + getMediaTypeFromFileExtension } from '../helpers/fileUpload'; import FilteredBlockCollectionView from './components/questions/FilteredBlockCollectionView.vue'; import { WholeSlideImageModel } from "../models/contribute-resource/blocks/wholeSlideImageModel"; @@ -115,9 +115,9 @@ for (let i = 0; i < targetItem.files.length; i++) { const file = targetItem.files[i] as File; const fileExtension = file.name.split('.').pop(); - const mediaType = getMediaTypeFromFileExtensionContributeCaseOrAssessment(`.${fileExtension}`); + const mediaType = getMediaTypeFromFileExtension(`.${fileExtension}`); - if (!this.contributeResourceAVFlag && (mediaType === MediaTypeEnum.Audio || mediaType === MediaTypeEnum.Video)) { + if (!this.contributeResourceAVFlag && (mediaType === MediaTypeEnum.Video)) { startUpload = false; this.avUnavailableMessage = true; } diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue index d43ed711a..4fb3f6621 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue @@ -6,23 +6,19 @@

{{title}}

{{description}}
-
-
-
-
-
-
+
+ +
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ContributeMediaBlock.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ContributeMediaBlock.vue index 77af841e4..dbc5bd9e4 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ContributeMediaBlock.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ContributeMediaBlock.vue @@ -11,7 +11,7 @@ v-on:updatePublishingStatus="updatePublishingStatus" v-bind:video="video" /> -
+
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/published-view/ContributeMediaBlockPublishedView.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/published-view/ContributeMediaBlockPublishedView.vue index 7e4650ae6..2a4e0751a 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/published-view/ContributeMediaBlockPublishedView.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/published-view/ContributeMediaBlockPublishedView.vue @@ -1,9 +1,14 @@ @@ -12,6 +17,7 @@ import Vue, { PropOptions } from 'vue'; import FileInfo from '../content-tab/FileInfo.vue'; + import { resourceData } from '../../../data/resource'; import AttachmentPublishedView from './AttachmentPublishedView.vue'; import ImagePublishedView from './ImagePublishedView.vue'; import VideoPlayerContainer from '../VideoPlayerContainer.vue'; @@ -37,12 +43,14 @@ return { FileStore: FileStore, MediaTypeEnum: MediaTypeEnum, + contributeResourceAVFlag: true } }, created() { // We poll for files (e.g. videos) that did not finish processing when the Resource was being created. // So, when the file processing succeeds/fails, this is can be reflected in the published view. this.FileStore.enablePolling(); + this.getContributeResAVResourceFlag(); }, computed: { mediaType(): MediaTypeEnum { @@ -56,7 +64,17 @@ }, video(): VideoMediaModel { return this.mediaBlock.video; + }, + audioVideoUnavailableView(): string { + return this.$store.state.getAVUnavailableView; } }, + methods: { + getContributeResAVResourceFlag() { + resourceData.getContributeAVResourceFlag().then(response => { + this.contributeResourceAVFlag = response; + }); + }, + } }) \ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue index 28b2e326b..cce5ff19b 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue @@ -5,7 +5,10 @@

Uploaded file

-
+
+
+
+
@@ -80,7 +83,8 @@ localAudioDetail: { resourceVersionId: 0 } as AudioResourceModel, additionalInformation: '' as string, uploadingFile: null as File, - uploadingTranscriptFile: null as File + uploadingTranscriptFile: null as File, + contributeResourceAVFlag: true }; }, computed: { @@ -95,10 +99,14 @@ }, fileUpdated(): ResourceFileModel { return this.$store.state.fileUpdated; + }, + audioVideoUnavailableView(): string { + return this.$store.state.getAVUnavailableView; } }, created() { this.setInitialValues(); + this.getContributeResAVResourceFlag(); EventBus.$on('deleteFile', (fileTypeToBeDeleted: number) => { this.processDeleteFile(fileTypeToBeDeleted); }); @@ -112,6 +120,11 @@ changeFile() { this.$emit('filechanged'); }, + getContributeResAVResourceFlag() { + resourceData.getContributeAVResourceFlag().then(response => { + this.contributeResourceAVFlag = response; + }); + }, changeTranscriptFile() { $('#transcriptFileUpload').val(null); $('#transcriptFileUpload').click(); diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/helpers/fileUpload.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/helpers/fileUpload.ts index a2b10ebe9..6973552c5 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/helpers/fileUpload.ts +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/helpers/fileUpload.ts @@ -324,17 +324,7 @@ export const getMediaTypeFromFileExtension = function (fileExtension: string): M return MediaTypeEnum.Attachment; } }; -export const getMediaTypeFromFileExtensionContributeCaseOrAssessment = function (fileExtension: string): MediaTypeEnum { - if (isIncludedInListIgnoringCase(IMAGE_FILE_EXTENSIONS, fileExtension)) { - return MediaTypeEnum.Image; - } else if (isIncludedInListIgnoringCase(VIDEO_FILE_EXTENSIONS, fileExtension)) { - return MediaTypeEnum.Video; - } else if (isIncludedInListIgnoringCase(AUDIO_FILE_EXTENSIONS, fileExtension)) { - return MediaTypeEnum.Audio; - } else { - return MediaTypeEnum.Attachment; - } -}; + export const getUploadTypeFromMediaType = function (mediaType: MediaTypeEnum): FileUploadType { switch (mediaType) { case MediaTypeEnum.Attachment: diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/models/contribute-resource/blocks/mediaTypeEnum.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/models/contribute-resource/blocks/mediaTypeEnum.ts index c567d05b4..663bd6e7e 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/models/contribute-resource/blocks/mediaTypeEnum.ts +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/models/contribute-resource/blocks/mediaTypeEnum.ts @@ -3,5 +3,4 @@ export enum MediaTypeEnum { Attachment = 0, Image = 1, Video = 2, - Audio = 3, } diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_AudioVideoUnavailable.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_AudioVideoUnavailable.cshtml index b8e71596e..e7aa7a412 100644 --- a/LearningHub.Nhs.WebUI/Views/Shared/_AudioVideoUnavailable.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Shared/_AudioVideoUnavailable.cshtml @@ -2,8 +2,8 @@

Important: - Video and audio unavailable + Media services unavailable

-

The video and audio upload and streaming services on the Learning Hub platform are temporarily unavailable. We are working to resolve this as quickly as possible.

+

The Learning Hub's media upload and streaming services are temporarily unavailable. This will affect most video and audio uploads and playback. We are working to resolve this as quickly as possible.