Master release for sprint ending 2021-05-10

.github/workflows/pythontest.yml

@@ -79,6 +79,6 @@ jobs:
         pip install pip-tools
         pip-sync requirements.txt requirements-dev.txt
     - name: Test pytest
-      run: pytest --cov-report=xml --cov=./
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      run: |
+        sh -c './contentcuration/manage.py makemigrations --check'
+        pytest

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Foundation for Learning Equality (internal apps)
+Copyright (c) 2021 Foundation for Learning Equality (internal apps)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

contentcuration/contentcuration/constants/feature_flags.py

@@ -0,0 +1,29 @@
+import json
+import os
+
+import jsonschema
+from django.core.exceptions import ValidationError
+
+
+def _schema():
+    """
+    Loads JSON schema file
+    """
+    file = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../static/feature_flags.json')
+    with open(file) as f:
+        data = json.load(f)
+    return data
+
+
+SCHEMA = _schema()
+
+
+def validate(data):
+    """
+    :param data: Dictionary of data to validate
+    :raises: ValidationError: When invalid
+    """
+    try:
+        jsonschema.validate(instance=data, schema=SCHEMA)
+    except jsonschema.ValidationError as e:
+        raise ValidationError("Invalid feature flags data") from e

contentcuration/contentcuration/db/models/functions.py

@@ -33,3 +33,23 @@ class ArrayRemove(Func):
     """
     function = "ARRAY_REMOVE"
     arity = 2
+
+
+class JSONObjectKeys(Func):
+    """
+    Returns result set of all JSON object keys for a JSONB field
+
+    Example:
+        .annotate(
+            my_field=JSONObjectKeys("some_jsonb_col_name")
+        )
+        .values("my_field")
+        .distinct()
+        =>  my_field
+            -------------
+            key1
+            other_key
+            ...
+    """
+    function = "JSONB_OBJECT_KEYS"
+    arity = 1

contentcuration/contentcuration/frontend/administration/pages/Users/UserDetails.vue

@@ -73,11 +73,42 @@
         </p>
         <UserStorage :value="user.disk_space" :userId="userId" />
 
+        <!-- Feature flags -->
+        <h2 class="mb-2 mt-5">
+          Feature flags
+        </h2>
+        <VDataTable
+          :headers="featureFlagHeaders"
+          :items="featureFlags"
+          class="user-table"
+          hide-actions
+        >
+          <template #items="{ item }">
+            <tr>
+              <td>{{ item.title }}</td>
+              <td>{{ item.description }}</td>
+              <td>
+                <KSwitch
+                  :value="featureFlagValue(item.key)"
+                  :disabled="loading"
+                  title="Toggle feature"
+                  @input="handleFeatureFlagChange(item.key, $event)"
+                />
+              </td>
+            </tr>
+          </template>
+        </VDataTable>
+
         <!-- Policies -->
         <h2 class="mb-2 mt-5">
           Policies accepted
         </h2>
-        <VDataTable :headers="policyHeaders" :items="policies" hide-actions>
+        <VDataTable
+          :headers="policyHeaders"
+          :items="policies"
+          class="user-table"
+          hide-actions
+        >
           <template #items="{ item }">
             <tr>
               <td>{{ item.name }}</td>
@@ -139,7 +170,12 @@
   import FullscreenModal from 'shared/views/FullscreenModal';
   import DetailsRow from 'shared/views/details/DetailsRow';
   import Banner from 'shared/views/Banner';
-  import { createPolicyKey, policyDates, requiredPolicies } from 'shared/constants';
+  import {
+    createPolicyKey,
+    policyDates,
+    requiredPolicies,
+    FeatureFlagsSchema,
+  } from 'shared/constants';
 
   function getPolicyDate(dateString) {
     const [date, time] = dateString.split(' ');
@@ -270,6 +306,29 @@
           { text: 'Signed on', align: 'left', sortable: false },
         ];
       },
+      featureFlags() {
+        return Object.entries(FeatureFlagsSchema.properties)
+          .map(([key, schema]) => ({
+            key,
+            ...schema,
+          }))
+          .filter(featureFlag => {
+            // Exclude those with `$env` flag that doesn't match current env
+            return !featureFlag['$env'] || featureFlag['$env'] === process.env.NODE_ENV;
+          });
+      },
+      featureFlagHeaders() {
+        return [
+          { text: 'Feature', align: 'left', sortable: false },
+          { text: 'Description', align: 'left', sortable: false },
+          { text: 'Visibility', align: 'left', sortable: false },
+        ];
+      },
+      featureFlagValue() {
+        return function(key) {
+          return this.loading ? false : this.details.feature_flags[key] || false;
+        };
+      },
     },
     beforeRouteEnter(to, from, next) {
       next(vm => {
@@ -283,7 +342,7 @@
       return this.load();
     },
     methods: {
-      ...mapActions('userAdmin', ['loadUser', 'loadUserDetails']),
+      ...mapActions('userAdmin', ['loadUser', 'loadUserDetails', 'updateUser']),
       channelUrl(channel) {
         return window.Urls.channel(channel.id);
       },
@@ -309,6 +368,31 @@
             this.$store.dispatch('errors/handleAxiosError', error);
           });
       },
+      handleFeatureFlagChange(key, value) {
+        // Don't try to update on server if it hasn't changed
+        if (Boolean(this.details.feature_flags[key]) === value) {
+          return;
+        }
+
+        // Merge current state
+        const update = { [key]: value };
+        this.details.feature_flags = {
+          ...(this.details.feature_flags || {}),
+          ...update,
+        };
+
+        // Only send updated values since it will require validation and lingering
+        // flags could exist in user's flags data
+        return this.updateUser({
+          id: this.userId,
+          feature_flags: update,
+        }).then(() => {
+          this.$store.dispatch(
+            'showSnackbarSimple',
+            value ? 'Feature enabled' : 'Feature disabled'
+          );
+        });
+      },
     },
   };
 
@@ -317,4 +401,8 @@
 
 <style lang="less" scoped>
 
+  .user-table {
+    max-width: 1024px;
+  }
+
 </style>

contentcuration/contentcuration/frontend/administration/vuex/userAdmin/__tests__/module.spec.js

@@ -102,7 +102,7 @@ describe('user admin actions', () => {
     });
     it('loadUserDetails should call client.get with get_user_details', () => {
       return store.dispatch('userAdmin/loadUserDetails', userId).then(() => {
-        expect(client.get).toHaveBeenCalledWith('get_user_details');
+        expect(client.get).toHaveBeenCalledWith('admin_users_metadata');
       });
     });
 

contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js

@@ -16,7 +16,7 @@ export function loadUser(context, id) {
 }
 
 export function loadUserDetails(context, id) {
-  return client.get(window.Urls.get_user_details(id)).then(response => {
+  return client.get(window.Urls.admin_users_metadata(id)).then(response => {
     return response.data;
   });
 }

contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue

@@ -104,6 +104,14 @@
             :label="$tr('randomizeQuestionLabel')"
             :indeterminate="!isUnique(randomizeOrder)"
           />
+
+          <!-- Feature flag: Channel quizzes -->
+          <Checkbox
+            v-if="allowChannelQuizzes"
+            v-model="channelQuiz"
+            :label="$tr('channelQuizzesLabel')"
+            :indeterminate="!oneSelected"
+          />
         </VFlex>
       </VLayout>
 
@@ -308,7 +316,7 @@
   import VisibilityDropdown from 'shared/views/VisibilityDropdown';
   import Checkbox from 'shared/views/form/Checkbox';
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
-  import { NEW_OBJECT } from 'shared/constants';
+  import { NEW_OBJECT, FeatureFlagKeys, ContentModalities } from 'shared/constants';
 
   // Define an object to act as the place holder for non unique values.
   const nonUniqueValue = {};
@@ -479,6 +487,16 @@
         },
       },
       thumbnailEncoding: generateGetterSetter('thumbnail_encoding'),
+      channelQuiz: {
+        get() {
+          const options = this.getExtraFieldsValueFromNodes('options') || {};
+          return options.modality === ContentModalities.QUIZ;
+        },
+        set(val) {
+          const options = { modality: val ? ContentModalities.QUIZ : null };
+          this.updateExtraFields({ options });
+        },
+      },
 
       /* COMPUTED PROPS */
       disableAuthEdits() {
@@ -521,6 +539,9 @@
       newContent() {
         return !this.nodes.some(n => n[NEW_OBJECT]);
       },
+      allowChannelQuizzes() {
+        return this.$store.getters.hasFeatureEnabled(FeatureFlagKeys.channel_quizzes);
+      },
     },
     watch: {
       nodes: {
@@ -656,6 +677,7 @@
       tagsLabel: 'Tags',
       noTagsFoundText: 'No results found for "{text}". Press \'Enter\' key to create a new tag',
       randomizeQuestionLabel: 'Randomize question order for learners',
+      channelQuizzesLabel: 'Allow as a channel quiz',
     },
   };
 

contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue

@@ -112,7 +112,7 @@
         );
       },
       isVideo() {
-        return this.file.file_format === 'mp4';
+        return this.file.file_format === 'mp4' || this.file.file_format === 'webm';
       },
       isAudio() {
         return this.file.file_format === 'mp3';

contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/filePreview.spec.js

@@ -39,6 +39,7 @@ describe('filePreview', () => {
       expect(wrapper.vm.isPreviewable).toBe(previewable);
     }
     test('mp4', true);
+    test('webm', true);
     test('pdf', true);
     test('mp3', true);
     test('epub', true);
@@ -55,5 +56,10 @@ describe('filePreview', () => {
     wrapper.setData({ fullscreen: true });
     wrapper.find('[data-test="closefullscreen"]').trigger('click');
     expect(wrapper.vm.fullscreen).toBe(false);
+
+    let wrapperWebm = makeWrapper({ file_format: 'webm' });
+    wrapperWebm.setData({ fullscreen: true });
+    wrapperWebm.find('[data-test="closefullscreen"]').trigger('click');
+    expect(wrapperWebm.vm.fullscreen).toBe(false);
   });
 });

contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/thumbnailGenerator.spec.js

@@ -23,6 +23,11 @@ describe('thumbnailGenerator', () => {
     videoWrapper.vm.generate();
     expect(generateVideoThumbnail).toHaveBeenCalled();
 
+    let videoWrapperWebm = makeWrapper('test.webm');
+    videoWrapperWebm.setMethods({ fileExists, generateVideoThumbnail });
+    videoWrapperWebm.vm.generate();
+    expect(generateVideoThumbnail).toHaveBeenCalled();
+
     let generateAudioThumbnail = jest.fn();
     let audioWrapper = makeWrapper('test.mp3');
     audioWrapper.setMethods({ generateAudioThumbnail });

contentcuration/contentcuration/frontend/channelEdit/views/files/thumbnails/ThumbnailGenerator.vue

@@ -63,7 +63,7 @@
         return this.width / ASPECT_RATIO;
       },
       isVideo() {
-        return this.filePath.endsWith('mp4');
+        return this.filePath.endsWith('mp4') || this.filePath.endsWith('webm');
       },
       isAudio() {
         return this.filePath.endsWith('mp3');

contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

@@ -258,6 +258,9 @@ function generateContentNodeData({
     if (extra_fields.randomize !== undefined) {
       contentNodeData.extra_fields.randomize = extra_fields.randomize;
     }
+    if (extra_fields.options) {
+      contentNodeData.extra_fields.options = extra_fields.options;
+    }
   }
   if (prerequisite !== NOVALUE) {
     contentNodeData.prerequisite = prerequisite;
@@ -282,11 +285,21 @@ export function updateContentNode(context, { id, ...payload } = {}) {
 
   // Don't overwrite existing extra_fields data
   if (contentNodeData.extra_fields) {
+    const extraFields = node.extra_fields || {};
+
+    // Don't overwrite existing options data
+    if (contentNodeData.extra_fields.options) {
+      contentNodeData.extra_fields.options = {
+        ...(extraFields.options || {}),
+        ...contentNodeData.extra_fields.options,
+      };
+    }
+
     contentNodeData = {
       ...contentNodeData,
       extra_fields: {
-        ...(node.extra_fields || {}),
-        ...(contentNodeData.extra_fields || {}),
+        ...extraFields,
+        ...contentNodeData.extra_fields,
       },
     };
   }

contentcuration/contentcuration/frontend/shared/constants.js

@@ -1,3 +1,5 @@
+import featureFlagsSchema from 'static/feature_flags.json';
+
 export const ContentDefaults = {
   author: 'author',
   provider: 'provider',
@@ -152,3 +154,17 @@ export const ValidationErrors = {
   NO_VALID_PRIMARY_FILES: 'NO_VALID_PRIMARY_FILES',
   ...fileErrors,
 };
+
+export const FeatureFlagsSchema = featureFlagsSchema;
+
+export const FeatureFlagKeys = Object.keys(FeatureFlagsSchema.properties).reduce(
+  (featureFlags, featureFlag) => {
+    featureFlags[featureFlag] = featureFlag;
+    return featureFlags;
+  },
+  {}
+);
+
+export const ContentModalities = {
+  QUIZ: 'QUIZ',
+};