Merge hotfixes down into unstable

contentcuration/contentcuration/decorators.py

@@ -76,6 +76,10 @@ class DelayUserStorageCalculation(ContextDecorator):
     def is_active(self):
         return self.depth > 0
 
+    def add(self, user_id):
+        if user_id not in self.queue:
+            self.queue.append(user_id)
+
     def __enter__(self):
         self.depth += 1
 

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

@@ -705,10 +705,11 @@
           audioVideoFiles = this.nodeFiles.filter(file => this.allowedFileType(file));
           // return the last item in the array
           const file = audioVideoFiles[audioVideoFiles.length - 1];
-          return file.duration;
-        } else {
-          return null;
+          if (file) {
+            return file.duration;
+          }
         }
+        return null;
       },
       videoSelected() {
         return this.oneSelected && this.firstNode.kind === ContentKindsNames.VIDEO;

contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue

@@ -204,6 +204,8 @@
         data-test="deploy-dialog"
         :title="$tr('deployChannel')"
         :submitText="$tr('confirmDeployBtn')"
+        :submitDisabled="submitDisabled"
+        :cancelDisabled="submitDisabled"
         :cancelText="$tr('cancelDeployBtn')"
         @submit="onDeployChannelClick"
         @cancel="displayDeployDialog = false"
@@ -293,6 +295,7 @@
         displayDeployDialog: false,
         drawer: false,
         elevated: false,
+        submitDisabled: false,
       };
     },
     computed: {
@@ -504,7 +507,13 @@
         this.elevated = e.target.scrollTop > 0;
       },
       async onDeployChannelClick() {
-        await this.deployCurrentChannel();
+        this.submitDisabled = true;
+        try {
+          await this.deployCurrentChannel();
+        } catch (e) {
+          this.submitDisabled = false;
+          throw e;
+        }
         await this.loadChannel(this.currentChannel.id);
 
         this.$router.push(this.rootTreeRoute);

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

@@ -51,7 +51,12 @@ export function deployCurrentChannel(context) {
   let payload = {
     channel_id: context.state.currentChannelId,
   };
-  return client.post(window.Urls.activate_channel(), payload);
+  return client.post(window.Urls.activate_channel(), payload).catch(e => {
+    // If response is 'Bad request', channel must already be activated
+    if (e.response && e.response.status === 400) {
+      return Promise.resolve();
+    }
+  });
 }
 
 export function publishChannel(context, version_notes) {

contentcuration/contentcuration/frontend/shared/client.js

@@ -1,3 +1,4 @@
+import omit from 'lodash/omit';
 import axios from 'axios';
 import qs from 'qs';
 import * as Sentry from '@sentry/vue';
@@ -26,67 +27,64 @@ export function paramsSerializer(params) {
 const client = axios.create({
   xsrfCookieName: 'csrftoken',
   xsrfHeaderName: 'X-CSRFToken',
-  paramsSerializer,
+  paramsSerializer: {
+    serialize: paramsSerializer,
+  },
+});
+
+// Track when the browser was last offline for error reporting purposes
+let lastOffline = null;
+window.addEventListener('offline', () => {
+  lastOffline = Date.now();
 });
 
 client.interceptors.response.use(
   response => response,
   error => {
-    let message;
-    let url;
-    let config;
+    const url = error.config.url;
+    let message = error.message;
+    let status = 0;
     if (error.response) {
-      config = error.response.config;
-      url = config.url;
+      status = error.response.status;
       message = error.response.statusText;
       // Don't send a Sentry report for permissions errors
       // Many 404s are in fact also unauthorized requests so
       // we should silence those on the front end and try
       // to catch legitimate request issues in the backend.
       //
       // Allow 412 too as that's specific to out of storage checks
-      if (
-        error.response.status === 403 ||
-        error.response.status === 404 ||
-        error.response.status === 405 ||
-        error.response.status === 412
-      ) {
+      if (status === 403 || status === 404 || status === 405 || status === 412) {
         return Promise.reject(error);
       }
-
-      if (error.response.status === 0) {
-        message = 'Network Error: ' + url;
-      }
-
-      // Put the URL in the main message for timeouts
-      // so we can see which timeouts are most frequent.
-      if (error.response.status === 504) {
-        message = 'Request Timed Out: ' + url;
-      }
-    } else if (error.request && error.request.config) {
-      // Request was sent but no response received
-      config = error.request.config;
-      url = config.url;
-      message = 'Network Error: ' + url;
-    } else {
-      message = error.message;
     }
 
-    const extraData = {
-      url,
-      type: config ? config.responseType : null,
-      data: config ? config.data : null,
-      status: error.response ? error.response.status : null,
-      error: message,
-      response: error.response ? error.response.data : null,
-    };
+    message = message ? `${message}: ${url}` : `Network Error: ${url}`;
+
     if (process.env.NODE_ENV !== 'production') {
       // In dev build log warnings to console for developer use
       console.warn('AJAX Request Error: ' + message); // eslint-disable-line no-console
-      console.warn('Error data: ' + JSON.stringify(extraData)); // eslint-disable-line no-console
-    } else {
-      Sentry.captureMessage(message, {
-        extra: extraData,
+      console.warn('Error data: ', error); // eslint-disable-line no-console
+    } else if (error.code !== 'ECONNABORTED') {
+      Sentry.withScope(function(scope) {
+        scope.addAttachment({
+          filename: 'error.json',
+          // strip csrf token from headers
+          data: JSON.stringify(omit(error, ['config.headers.X-CSRFToken'])),
+          contentType: 'application/json',
+        });
+        Sentry.captureException(new Error(message), {
+          extra: {
+            Request: {
+              headers: error.config.headers,
+              method: error.config.method,
+              url,
+            },
+            Network: {
+              lastOffline: lastOffline ? `${Date.now() - lastOffline}ms ago` : 'never',
+              online: navigator.onLine,
+            },
+          },
+        });
       });
     }
     return Promise.reject(error);

contentcuration/contentcuration/frontend/shared/data/resources.js

@@ -264,65 +264,82 @@ class IndexedDBResource {
       CHANGES_TABLE,
       () => {
         // Get any relevant changes that would be overwritten by this bulkPut
-        return db[CHANGES_TABLE].where('[table+key]')
+        const changesPromise = db[CHANGES_TABLE].where('[table+key]')
           .anyOf(itemData.map(datum => [this.tableName, this.getIdValue(datum)]))
-          .sortBy('rev', changes => {
-            changes = mergeAllChanges(changes, true);
-            const collectedChanges = collectChanges(changes)[this.tableName] || {};
-            for (let changeType of Object.keys(collectedChanges)) {
-              const map = {};
-              for (let change of collectedChanges[changeType]) {
-                map[change.key] = change;
-              }
-              collectedChanges[changeType] = map;
+          .sortBy('rev');
+        const currentPromise = this.table
+          .where(this.idField)
+          .anyOf(itemData.map(datum => this.getIdValue(datum)))
+          .toArray();
+
+        return Promise.all([changesPromise, currentPromise]).then(([changes, currents]) => {
+          changes = mergeAllChanges(changes, true);
+          const collectedChanges = collectChanges(changes)[this.tableName] || {};
+          for (let changeType of Object.keys(collectedChanges)) {
+            const map = {};
+            for (let change of collectedChanges[changeType]) {
+              map[change.key] = change;
             }
-            const data = itemData
-              .map(datum => {
-                datum[LAST_FETCHED] = now;
-                const id = this.getIdValue(datum);
-                // If we have an updated change, apply the modifications here
-                if (
-                  collectedChanges[CHANGE_TYPES.UPDATED] &&
-                  collectedChanges[CHANGE_TYPES.UPDATED][id]
-                ) {
-                  applyMods(datum, collectedChanges[CHANGE_TYPES.UPDATED][id].mods);
+            collectedChanges[changeType] = map;
+          }
+          const currentMap = {};
+          for (let currentObj of currents) {
+            currentMap[this.getIdValue(currentObj)] = currentObj;
+          }
+          const data = itemData
+            .map(datum => {
+              const id = this.getIdValue(datum);
+              datum[LAST_FETCHED] = now;
+              // Persist TASK_ID and COPYING_FLAG attributes when directly fetching from the server
+              if (currentMap[id] && currentMap[id][TASK_ID]) {
+                datum[TASK_ID] = currentMap[id][TASK_ID];
+              }
+              if (currentMap[id] && currentMap[id][COPYING_FLAG]) {
+                datum[COPYING_FLAG] = currentMap[id][COPYING_FLAG];
+              }
+              // If we have an updated change, apply the modifications here
+              if (
+                collectedChanges[CHANGE_TYPES.UPDATED] &&
+                collectedChanges[CHANGE_TYPES.UPDATED][id]
+              ) {
+                applyMods(datum, collectedChanges[CHANGE_TYPES.UPDATED][id].mods);
+              }
+              return datum;
+              // If we have a deleted change, just filter out this object so we don't reput it
+            })
+            .filter(
+              datum =>
+                !collectedChanges[CHANGE_TYPES.DELETED] ||
+                !collectedChanges[CHANGE_TYPES.DELETED][this.getIdValue(datum)]
+            );
+          return this.table.bulkPut(data).then(() => {
+            // Move changes need to be reapplied on top of fetched data in case anything
+            // has happened on the backend.
+            return applyChanges(Object.values(collectedChanges[CHANGE_TYPES.MOVED] || {})).then(
+              results => {
+                if (!results || !results.length) {
+                  return data;
                 }
-                return datum;
-                // If we have a deleted change, just filter out this object so we don't reput it
-              })
-              .filter(
-                datum =>
-                  !collectedChanges[CHANGE_TYPES.DELETED] ||
-                  !collectedChanges[CHANGE_TYPES.DELETED][this.getIdValue(datum)]
-              );
-            return this.table.bulkPut(data).then(() => {
-              // Move changes need to be reapplied on top of fetched data in case anything
-              // has happened on the backend.
-              return applyChanges(Object.values(collectedChanges[CHANGE_TYPES.MOVED] || {})).then(
-                results => {
-                  if (!results || !results.length) {
-                    return data;
-                  }
-                  const resultsMap = {};
-                  for (let result of results) {
-                    const id = this.getIdValue(result);
-                    resultsMap[id] = result;
-                  }
-                  return data
-                    .map(datum => {
-                      const id = this.getIdValue(datum);
-                      if (resultsMap[id]) {
-                        applyMods(datum, resultsMap[id]);
-                      }
-                      return datum;
-                      // Concatenate any unsynced created objects onto
-                      // the end of the returned objects
-                    })
-                    .concat(Object.values(collectedChanges[CHANGE_TYPES.CREATED]).map(c => c.obj));
+                const resultsMap = {};
+                for (let result of results) {
+                  const id = this.getIdValue(result);
+                  resultsMap[id] = result;
                 }
-              );
-            });
+                return data
+                  .map(datum => {
+                    const id = this.getIdValue(datum);
+                    if (resultsMap[id]) {
+                      applyMods(datum, resultsMap[id]);
+                    }
+                    return datum;
+                    // Concatenate any unsynced created objects onto
+                    // the end of the returned objects
+                  })
+                  .concat(Object.values(collectedChanges[CHANGE_TYPES.CREATED]).map(c => c.obj));
+              }
+            );
           });
+        });
       }
     );
   }