Merge pull request #285 from TechnologyEnhancedLearning/Develop/Features/TD-3285-feature_flag_functionality_for_ams_contents

TD-3285, vue cache storing the feature flag inconsistently, update the way its populating now

Author: binon

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

@@ -5,7 +5,7 @@
         </div>
         <div class="mx-5">
             <h3 class="nhsuk-heading-l nhsuk-u-margin-bottom-2">{{title}}</h3>
-            <div>{{description}}</div>            
+            <div>{{description}}</div>
             <div v-if="!contributeResourceAVFlag && title === 'File' && !isSelected" class="align-self-center">
                 <div v-html="audioVideoUnavailableView"></div>
             </div>
@@ -39,7 +39,7 @@
         },
         data() {
             return {
-                contributeResourceAVFlag: false                
+                contributeResourceAVFlag: true
             };
         },
         created() {
@@ -57,18 +57,17 @@
             },
             isSelected(): boolean {
                 return this.resourceDetails.resourceType === this.resourceType;
-            },           
+            },
             audioVideoUnavailableView(): string {
-                var view = this.$store.state.getAVUnavailableView;
                 return this.$store.state.getAVUnavailableView;
             }
         },
         methods: {
             getContributeResAVResourceFlag() {
-                 resourceData.getContributeAVResourceFlag().then(response => {
-                 this.contributeResourceAVFlag = response;
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
                 });
-             },
+            },
             getResourceTypeDescription(resourceType: ResourceType): string {
                 switch (resourceType) {
                     case ResourceType.ARTICLE:

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentVideo.vue

@@ -105,6 +105,7 @@
                 uploadingFile: null as File,
                 uploadingTranscriptFile: null as File,
                 uploadingCaptionsFile: null as File,
+                contributeResourceAVFlag: true
             };
         },
         computed: {
@@ -120,15 +121,13 @@
             fileUpdated(): ResourceFileModel {
                 return this.$store.state.fileUpdated;
             },
-            contributeResourceAVFlag(): boolean {
-                return this.$store.state.contributeAVResourceFlag;
-            },
             audioVideoUnavailableView(): string {
                 return this.$store.state.getAVUnavailableView;
             },
         },
         created() {
             this.setInitialValues();
+            this.getContributeResAVResourceFlag();
             EventBus.$on('deleteFile', (fileTypeToBeDeleted: number) => {
                 this.processDeleteFile(fileTypeToBeDeleted);
             });
@@ -142,6 +141,11 @@
             changeFile() {
                 this.$emit('filechanged');
             },
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            },
             changeTranscriptFile() {
                 $('#transcriptFileUpload').val(null);
                 $('#transcriptFileUpload').click();

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/GenericFileUploader.vue

@@ -21,6 +21,7 @@
 
 <script lang="ts">
     import Vue, { PropOptions } from 'vue';
+    import { resourceData } from '../data/resource';
     import { ResourceType, UploadResourceType } from '../constants';
     import { ContributeSettingsModel } from '../models/contribute/contributeSettingsModel';
 
@@ -33,22 +34,30 @@
         data() {
             return {
                 uploadResourceType: UploadResourceType,
+                contributeResourceAVFlag: true
             }
         },
+        created() {
+            this.getContributeResAVResourceFlag();
+        },
         computed: {
             contributeSettings(): ContributeSettingsModel {
                 return this.$store.state.contributeSettings;
             },
             fileAccept(): string {
                 return this.$store.state.resourceDetail.resourceType == ResourceType.HTML ? '.zip,.rar,.7zip' : ''
             },
-            contributeResourceAVFlag(): boolean {
-                return this.$store.state.contributeAVResourceFlag;
-            },
             audioVideoUnavailableView(): string {
                 return this.$store.state.getAVUnavailableView;
             },
         },
+        methods: {
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            },
+        }
     });
 </script>