Merge Latest RC changes to LHScorpius

AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml

@@ -138,6 +138,7 @@
             <div class="col-12">
                 <label for="Description">Description</label>
                 <textarea asp-for="Description" class="form-control"></textarea>
+                <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
                 <span asp-validation-for="Description"></span>
             </div>
         </div>

LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs

@@ -230,11 +230,6 @@ private async Task<bool> Commit(SCO scoObject)
             try
             {
                 var activeContent = this.userService.GetActiveContentAsync().Result;
-                ////if (activeContent.Count == 0)
-                ////{
-                ////    return false;
-                ////}
-
                 if (!activeContent.Any(ac => ac.ScormActivityId == scoObject.InstanceId))
                 {
                     throw new Exception($"User does not have ActiveContent for ScormActivityId={scoObject.InstanceId}");
@@ -265,10 +260,6 @@ private async Task<bool> Commit(SCO scoObject)
 
                 // Persist update.
                 await this.activityService.UpdateScormActivityAsync(scoObject);
-                ////if (scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Completed) || scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Passed))
-                ////{
-                ////    await this.activityService.CompleteScormActivity(scoObject);
-                ////}
 
                 return true;
             }

LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs

@@ -226,7 +226,7 @@ public static string GetActivityStatusText(this ActivityDetailedItemViewModel ac
         /// <returns>The <see cref="bool"/>.</returns>
         public static bool CanShowScore(this ActivityDetailedItemViewModel activityDetailedItemViewModel)
         {
-            if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Scorm && (activityDetailedItemViewModel.MasteryScore > 0 || activityDetailedItemViewModel.MasteryScore == null) && ((activityDetailedItemViewModel.ScorePercentage > 0 && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed) || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case) && activityDetailedItemViewModel.Complete))
+            if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Scorm && (activityDetailedItemViewModel.MasteryScore > 0 || activityDetailedItemViewModel.MasteryScore == null) && ((activityDetailedItemViewModel.ScorePercentage > 0 && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed) || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case && activityDetailedItemViewModel.Complete))
             {
                 return true;
             }
@@ -241,7 +241,7 @@ public static bool CanShowScore(this ActivityDetailedItemViewModel activityDetai
         /// <returns>The <see cref="bool"/>bool.</returns>
         public static bool CanViewPercentage(this ActivityDetailedItemViewModel activityDetailedItemViewModel)
         {
-            if (((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && activityDetailedItemViewModel.Complete == false))
+            if (((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress))
             {
                 return true;
             }

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue

@@ -30,7 +30,9 @@
                                                          :characterLimit="60"
                                                          :isH3="true"></EditSaveFieldWithCharacterCount>
                         <h3 class="my-0"
-                            v-else>{{ block.title }}</h3>
+                            v-else>
+                            {{ block.title }}
+                        </h3>
                         <Tick :complete="block.isReadyToPublish()"
                               class="pl-10"></Tick>
                     </div>
@@ -50,7 +52,8 @@
                                     ariaLabel="Move section down"
                                     class="contribute-block-component-button"></IconButton>
                     </div>
-                    <IconButton v-if="!canBeDuplicated" 
+                    <IconButton v-if="!canBeDuplicated && !contributeResourceAVFlag && block.blockType === BlockTypeEnum.Media"></IconButton>
+                    <IconButton v-else
                                 @click="duplicateBlock"
                                 iconClasses="fa-regular fa-clone"
                                 ariaLabel="Duplicate section"
@@ -131,6 +134,7 @@
     import ContributeImageCarouselBlock from "./ContributeImageCarouselBlock.vue";
     import { QuestionBlockModel } from "../models/contribute-resource/blocks/questionBlockModel";
     import { EventBus } from './contributeResourceEvents';
+    import { resourceData } from '../data/resource';
 
     export default Vue.extend({
         components: {
@@ -162,10 +166,12 @@
                 discardBlockModalOpen: false,
                 BlockTypeEnum: BlockTypeEnum,
                 isOpen: true,
+                contributeResourceAVFlag: true
             };
         },
         created() {
             this.isOpen = true;
+            this.getContributeResAVResourceFlag();
         },
         watch: {
             isOpen(newVal, oldVal) {
@@ -180,6 +186,11 @@
                 event.target.blur();
                 event.target.parentElement.blur();
                 this.$emit('duplicate');
+            },
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
             }
         }
     });

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue

@@ -2,17 +2,17 @@
     <div class="contribute-case-component lh-padding-fluid">
         <div class="lh-container-xl py-15">
             <div class="py-10 text-center placeholder-text"
-                 v-if="!hasContentOnPage">You have not added any content to this page yet
+                 v-if="!hasContentOnPage">
+                You have not added any content to this page yet
             </div>
             <template v-else>
-                <FilteredBlockCollectionView
-                    :resourceType="resourceType"
-                    :blockCollection="blockCollection"
-                    :selection="blockCollection => blockCollection.getBlocksByPage(page).filter(block => block.blockType !== BlockTypeEnum.Question)"
-                    :can-be-duplicated="duplicatingBlocks"
-                    :blocksToDuplicate="blocksToDuplicate"
-                    @annotateWholeSlideImage="showSlideWithAnnotations"
-                    @duplicateBlock="blockId => $emit('duplicateBlock', blockId)"/>
+                <FilteredBlockCollectionView :resourceType="resourceType"
+                                             :blockCollection="blockCollection"
+                                             :selection="blockCollection => blockCollection.getBlocksByPage(page).filter(block => block.blockType !== BlockTypeEnum.Question)"
+                                             :can-be-duplicated="duplicatingBlocks"
+                                             :blocksToDuplicate="blocksToDuplicate"
+                                             @annotateWholeSlideImage="showSlideWithAnnotations"
+                                             @duplicateBlock="blockId => $emit('duplicateBlock', blockId)" />
             </template>
 
             <ContributeAddContentBlock @add="choosingNewContentBlock = true"></ContributeAddContentBlock>
@@ -25,13 +25,19 @@
                    ref="addMediaInput"
                    multiple
                    @change="uploadNewMediaFiles"
-                   class="visually-hidden"/>
+                   class="visually-hidden" />
+
+            <Modal v-if="avUnavailableMessage">
+                <div v-html="audioVideoUnavailableView"></div>
+                <button type="button" class="nhsuk-button nhsuk-button--secondary mt-2 col-4 col-sm-3 col-md-2" @click="cancelAVUnavailModal">Cancel</button>
+            </Modal>   
         </div>
     </div>
 </template>
 
 <script lang="ts">
     import Vue, { PropOptions } from 'vue';
+    import { resourceData } from '../data/resource';
     import ContributeBlock from './ContributeBlock.vue';
     import ContributeAddContentBlock from './ContributeAddContentBlock.vue';
     import ContributeChooseContentBlockType from './ContributeChooseContentBlockType.vue';
@@ -40,11 +46,14 @@
     import {
         FileUploadType,
         getAllowedFileExtensionsInAcceptFormat,
-        startUploadsFromFileElement
+        startUploadsFromFileElement,
+        getMediaTypeFromFileExtension
     } from '../helpers/fileUpload';
     import FilteredBlockCollectionView from './components/questions/FilteredBlockCollectionView.vue';
     import { WholeSlideImageModel } from "../models/contribute-resource/blocks/wholeSlideImageModel";
     import { ResourceType } from "../constants";
+    import { MediaTypeEnum } from '../models/contribute-resource/blocks/mediaTypeEnum';
+    import Modal from '../globalcomponents/Modal.vue';
 
     export default Vue.extend({
         props: {
@@ -59,16 +68,25 @@
             ContributeAddContentBlock,
             ContributeChooseContentBlockType,
             FilteredBlockCollectionView,
+            Modal,
         },
         data() {
             return {
                 choosingNewContentBlock: false,
                 BlockTypeEnum,
+                contributeResourceAVFlag: true,
+                avUnavailableMessage: false
             };
         },
+        created() {
+            this.getContributeResAVResourceFlag();
+        },
         computed: {
             hasContentOnPage(): boolean {
                 return this.blockCollection?.getBlocksByPage(this.page)?.filter(block => block.blockType !== BlockTypeEnum.Question).length > 0;
+            },
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
             }
         },
         methods: {
@@ -90,14 +108,42 @@
                 }
             },
             async uploadNewMediaFiles(event: any): Promise<void> {
-                startUploadsFromFileElement(
-                    event.target as HTMLInputElement,
-                    (fileId, mediaType) => this.blockCollection.addMediaBlock(fileId, mediaType, this.page)
-                );
+                var targetItem = event.target as HTMLInputElement;
+                var startUpload = true;
+
+                if (targetItem.value !== '') {
+                    for (let i = 0; i < targetItem.files.length; i++) {
+                        const file = targetItem.files[i] as File;
+                        const fileExtension = file.name.split('.').pop();
+                        const mediaType = getMediaTypeFromFileExtension(`.${fileExtension}`);
+
+                        if (!this.contributeResourceAVFlag && (mediaType === MediaTypeEnum.Video)) {
+                            startUpload = false;
+                            this.avUnavailableMessage = true;
+                        }
+                        else { startUpload = true; }
+                    }
+                }
+
+                if (startUpload) {
+                    startUploadsFromFileElement(
+                        event.target as HTMLInputElement,
+                        (fileId, mediaType) => this.blockCollection.addMediaBlock(fileId, mediaType, this.page)
+                    );
+                }
+                targetItem.value = '';
             },
             showSlideWithAnnotations(wholeSlideImageToShow: WholeSlideImageModel) {
                 this.$emit('annotateWholeSlideImage', wholeSlideImageToShow, false);
             },
+            cancelAVUnavailModal() {
+                this.avUnavailableMessage = false;
+            },
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            }
         },
     });
 </script>

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue

@@ -6,23 +6,19 @@
         <div class="mx-5">
             <h3 class="nhsuk-heading-l nhsuk-u-margin-bottom-2">{{title}}</h3>
             <div>{{description}}</div>
-            <div v-if="!contributeResourceAVFlag && title === 'File' && !isSelected" class="align-self-center">
-                <div v-html="audioVideoUnavailableView"></div>
-            </div>
-        </div>
-        <div v-if="isSelected" class="align-self-center select_resource_type_component_tick_wrapper">
-            <Tick class="select_resource_type_component_tick" complete></Tick>
         </div>
         <div v-if="!isSelected" class="align-self-center">
             <Button v-on:click="onSelectClick">Select</Button>
         </div>
+        <div v-if="isSelected" class="align-self-center select_resource_type_component_tick_wrapper">
+            <Tick class="select_resource_type_component_tick" complete></Tick>
+        </div>
     </div>
 </template>
 
 <script lang="ts">
     import Vue, { PropOptions } from 'vue';
     import { commonlib } from '../common';
-    import { resourceData } from '../data/resource';
     import Button from '../globalcomponents/Button.vue';
     import Tick from '../globalcomponents/Tick.vue';
     import { ResourceType } from '../constants';
@@ -37,14 +33,6 @@
             resourceType: { type: Number } as PropOptions<ResourceType>,
             resourceDetails: { type: Object } as PropOptions<ContributeResourceDetailModel>,
         },
-        data() {
-            return {
-                contributeResourceAVFlag: true
-            };
-        },
-        created() {
-            this.getContributeResAVResourceFlag();
-        },
         computed: {
             title(): String {
                 return commonlib.getResourceTypeText(this.resourceType);
@@ -57,17 +45,9 @@
             },
             isSelected(): boolean {
                 return this.resourceDetails.resourceType === this.resourceType;
-            },
-            audioVideoUnavailableView(): string {
-                return this.$store.state.getAVUnavailableView;
             }
         },
         methods: {
-            getContributeResAVResourceFlag() {
-                resourceData.getContributeAVResourceFlag().then(response => {
-                    this.contributeResourceAVFlag = response;
-                });
-            },
             getResourceTypeDescription(resourceType: ResourceType): string {
                 switch (resourceType) {
                     case ResourceType.ARTICLE:

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue

@@ -2,6 +2,9 @@
     <div class="lh-padding-fluid">
         <div class="lh-container-xl">
             <h2 id="title-label" class="nhsuk-heading-l">Select a resource type</h2>
+            <div v-if="!contributeResourceAVFlag" class="align-self-center">
+                <div v-html="audioVideoUnavailableView"></div>
+            </div>
             <SelectResourceType :resourceType="resourceType.GENERICFILE" v-bind:resourceDetails="resourceDetails"></SelectResourceType>
             <SelectResourceType :resourceType="resourceType.WEBLINK" v-bind:resourceDetails="resourceDetails"></SelectResourceType>
             <SelectResourceType :resourceType="resourceType.ARTICLE" v-bind:resourceDetails="resourceDetails"></SelectResourceType>
@@ -18,6 +21,7 @@
     import SelectResourceType from './SelectResourceType.vue';
     import { ResourceType } from '../constants';
     import { ContributeResourceDetailModel } from '../models/contribute/contributeResourceModel';
+    import { resourceData } from '../data/resource';
 
     export default Vue.extend({
         props: {
@@ -28,8 +32,24 @@
         },
         data() {
             return {
-                resourceType: ResourceType
+                resourceType: ResourceType,
+                contributeResourceAVFlag: true
             }
+        },
+        created() {
+            this.getContributeResAVResourceFlag();
+        },
+        computed: {
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
+            }
+        },
+        methods: {
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            },
         }
     });
 </script>

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ChooseContentBlockOption.vue

@@ -1,18 +1,22 @@
 <template>
     <div class="contribute-add-content-block-component-option">
         <div class="contribute-add-content-block-component-option--icon">
-            <img v-bind:src="imgSrc" class="flexible-image"/>
+            <img v-bind:src="imgSrc" class="flexible-image" />
         </div>
         <div class="contribute-add-content-block-component-option--description">
             <h5>{{blockTypeName}}</h5>
             <p>{{blockDescription}}</p>
+            <div v-if="!contributeResourceAVFlag && blockTypeName === 'Media'">
+                <div v-html="audioVideoUnavailableView"></div>
+            </div>
         </div>
         <Button v-on:click="$emit('choose')">Select</Button>
     </div>
 </template>
 
 <script lang="ts">
     import Vue, { PropOptions } from 'vue';
+    import { resourceData } from '../../../data/resource';
 
     import Button from "../../../globalcomponents/Button.vue";
 
@@ -27,6 +31,26 @@
             blockTypeName: String,
             blockDescription: String,
         },
+        data() {
+            return {
+                contributeResourceAVFlag: true
+            }
+        },
+        created() {
+            this.getContributeResAVResourceFlag();
+        },
+        computed: {
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
+            },
+        },
+        methods: {
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            }
+        }
     })
 </script>