adapt-authoring-ui 1.4.1 → 1.4.3

package/app/core/helpers.js

@@ -324,20 +324,35 @@ define(['handlebars', 'moment', 'core/origin'], function(Handlebars, Moment, Ori
 
     submitForm($form, options = {}) {
       return new Promise(async (resolve, reject) => {
+        if($form.$el) $form = $form.$el; // for Scaffold forms
+        const method = options.method || $form.attr('method');
+        const url = options.url || $form.attr('action');
+        if(!method || !url) {
+          console.error('Helpers#submitForm: method and URL must be specified either as form attributes or options');
+          return;
+        }
         const body = new FormData($form[0]);
-        if(options.extendedData) Object.entries(options.extendedData).forEach(([attr, val]) => body.append(attr, val));
-        const res = await fetch($form.attr('action'), { method: $form.attr('method'), body });
-        if(res.status === 204) {
-          return resolve();
+        if(options.data) {
+          Object.entries(options.data).forEach(d => body.append(...d));
+          delete options.data;
+        }
+        if(typeof options.beforeSubmit === 'function') {
+          options.beforeSubmit(body);
+          delete options.beforeSubmit;
         }
-        const data = await res.json();
-        if(res.status > 299) {
-          return reject(data);
+        const xhr = new XMLHttpRequest();
+        xhr.open(method, url, true);
+        xhr.onprogress = typeof options.onProgress === 'function' ? options.onProgress : () => {};
+        xhr.onreadystatechange = () => { 
+          if(xhr.readyState !== XMLHttpRequest.DONE) return;
+          let responseData = xhr.response;
+          try { responseData = JSON.parse(responseData); } catch(e) {}
+          xhr.status > 299 ? reject(responseData) : resolve(responseData);  
         }
-        resolve(data);
+        xhr.send(body);
       });
     },
-
+    
     parseLinksHeader(res) {
       const header = res.xhr.getResponseHeader('Link');
       const links = {};

package/app/modules/assetManagement/views/assetManagementEditAssetView.js

@@ -1,9 +1,10 @@
 // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
 define([
   'core/origin',
+  'core/helpers',
   'core/views/originView',
   'modules/scaffold/views/scaffoldFileView'
-], function(Origin, OriginView, ScaffoldFileView){
+], function(Origin, Helpers, OriginView, ScaffoldFileView){
   var AssetManagementEditAssetView = OriginView.extend({
     className: 'asset-management-edit-asset',
     events: {
@@ -47,75 +48,51 @@ define([
       return message;
     },
 
-    sanitiseData: function(dataArr) {
-      const isArray = Array.isArray(dataArr)
-      if(!isArray) {
-        dataArr = Object.entries(dataArr).map(([k,v]) => Object.create({ name: k, value: v }));
-      }
-      for (let i = 0; i < dataArr.length; i++) {
-        const d = dataArr[i];
-        if(d.name === "tags") {
-          if(!d.value.length) dataArr.splice(i--, 1);
-        } else if(d.name === "url" && d.value === "") {
-          dataArr.splice(i--, 1);
+    async save() {
+      this.form.commit();
+      const model = this.form.model;
+      const hasFile = !!$('input[name="file"]', this.form.$el).val();
+      const hasChanged = Object.keys(model.changedAttributes()).filter(a => a !== '_type').length > 0;
+      try {
+        if(model.isNew() && !hasFile) {
+          return Origin.Notify.toast({ type: 'error', text: Origin.l10n.t('app.pleaseaddfile') });
         }
-      }
-      if(isArray) return dataArr;
-      const data = dataArr.reduce((m, d) => Object.assign(m, { [d.name]: d.value }), {});
-      if(Object.keys(data).length) return data;
-    },
-
-    getAttributesToSave: function() {
-      if(this.model.isNew()) {
-        return this.model.attributes;
-      }
-      var changedAttributes = this.model.changedAttributes();
-      return Object.keys(changedAttributes).length ? changedAttributes : undefined;
-    },
-
-    save: function() {
-      const errors = this.form.validate();
-      if(errors) {
-        return this.onSaveError(`${Origin.l10n.t('app.validationfailedmessage')}<br/><br/>${this.buildErrorMessage(errors)}`);
-      }
-      const callbacks = {
-        success: data => this.onSaveSuccess(data),
-        error: error => {
-          this.onSaveError(error.message);
+        if(hasChanged) {
+          if(!hasFile) { // don't upload empty file
+            $('input[type="file"]', this.form.$el).remove();
+          }
+          const validationErrors = this.form.validate();
+          if(validationErrors) {
+            return Origin.Notify.toast({ 
+              type: 'error', 
+              title: Origin.l10n.t('app.validationfailed'),
+              text: Object.values(validationErrors).map(e => `${e.title} ${e.type}`).join('<br/>')
+            });
+          }
+          const newData = await Helpers.submitForm(this.form, {
+            method: model.isNew() ? 'POST' : 'PATCH', 
+            url: model.url(),
+            beforeSubmit: this.sanitiseData
+          });
+          const _id = newData && newData._id;
+
+          if(this.model.get('isModal')) {
+            if(_id) Origin.trigger('assetManagement:collection:refresh', null, true, _id);
+            Origin.trigger('assetManagement:modalEdit:remove');
+            return;
+          }
+          Origin.router.navigateTo('assetManagement');
         }
-      };
-      if(document.querySelector('input[name="file"]').value) { // handle file upload
-        const submitData = {
-          method: this.model.isNew() ? 'POST' : 'PATCH',
-          data: this.sanitiseData(new FormData(this.form)),
-        };
-        fetch(`/api/assets/${this.model.get('_id') ? this.model.get('_id') : ''}`,
-            submitData)
-            .then(res => res.json())
-            .then(callbacks.success)
-            .catch(callbacks.error);
-        return;
-      }
-      this.form.commit();
-      const data = this.sanitiseData(this.getAttributesToSave());
-      data ? this.model.save(data, Object.assign({ patch: true }, callbacks)) : this.onSaveSuccess();
-    },
-
-    onSaveSuccess: async function(data) {
-      const modelData = data ? Array.isArray(data) ? data[0] : data : undefined;
-      const _id = modelData && modelData._id;
-
-      if(this.model.get('isModal')) {
-        if(_id) Origin.trigger('assetManagement:collection:refresh', null, true, _id);
-        Origin.trigger('assetManagement:modalEdit:remove');
-        return;
+      } catch(e) {
+        Origin.trigger('sidebar:resetButtons');
+        Origin.Notify.alert({ type: 'error', text: e.message });
       }
-      Origin.router.navigateTo('assetManagement');
     },
 
-    onSaveError: function(errorMessage) {
-      Origin.trigger('sidebar:resetButtons');
-      Origin.Notify.alert({ type: 'error', text: errorMessage });
+    sanitiseData(formData) {
+      const tags = formData.get('tags');
+      tags.length ? formData.set('tags', JSON.stringify(tags.split(','))) : formData.delete('tags');
+      if(!formData.get('url')) formData.delete('url');
     }
 
   }, {

package/app/modules/assetManagement/views/assetManagementSidebarView.js

@@ -27,8 +27,8 @@ define(function(require) {
         },
 
         onFilterButtonClicked: function(event) {
-            $currentTarget = $(event.currentTarget);
-            var filterType = $currentTarget.attr('data-filter-type');
+            const $currentTarget = $(event.currentTarget);
+            const filterType = $currentTarget.attr('data-filter-type');
 
             // If this filter is already selected - remove filter
             // else add the filter

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-ui",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Front-end application for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-ui",
   "license": "GPL-3.0",