adapt-authoring-ui 1.2.3 → 1.4.0

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

@@ -80,17 +80,20 @@ define([
       }
       const callbacks = {
         success: data => this.onSaveSuccess(data),
-        error: (model, xhr) => {
-          if(typeof xhr === 'string') xhr = model;
-          this.onSaveError(xhr.responseJSON && xhr.responseJSON.message || xhr.statusText);
+        error: error => {
+          this.onSaveError(error.message);
         }
       };
-      if($('input[name="file"]').val()) { // handle file upload
-        this.form.$el.ajaxSubmit(Object.assign({
+      if(document.querySelector('input[name="file"]').value) { // handle file upload
+        const submitData = {
           method: this.model.isNew() ? 'POST' : 'PATCH',
-          url: `/api/assets/${this.model.get('_id') ? this.model.get('_id') : ''}`,
-          beforeSubmit: this.sanitiseData,
-        }, callbacks));
+          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();

package/app/modules/editor/contentObject/views/editorMenuItemView.js

@@ -121,7 +121,7 @@ define(function(require){
           Origin.trigger('editorView:itemDeleted', model);
           this.remove()
         }, this),
-        error: () => Origin.Notify.alert({ type: 'error', text: 'app.errordelete' })
+        error: (model, jqXhr) => Origin.Notify.alert({ type: 'error', text: jqXhr.responseJSON.message })
       });
     },
 

package/app/modules/editor/contentObject/views/editorMenuLayerView.js

@@ -107,10 +107,10 @@ define(function(require) {
           newMenuItemView.$el.removeClass('syncing');
           this.setHeight();
         }, this),
-        error: function(error) {
+        error: function(model, jqXhr) {
           // fade out menu item and alert
           newMenuItemView.$el.removeClass('syncing').addClass('not-synced');
-          Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errormenueditorbody') });
+          Origin.Notify.alert({ type: 'error', text: jqXhr.responseJSON.message });
           _.delay(newMenuItemView.remove, 3000);
         }
       });
@@ -135,11 +135,11 @@ define(function(require) {
         _parentId: model.get('_id'),
         _courseId: Origin.editor.data.course.get('_id')
       }, {
-        error: function() {
+        error: function(model, jqXhr) {
           newMenuItemView.$el.removeClass('syncing').addClass('not-synced');
           Origin.Notify.alert({
             type: 'error',
-            text: Origin.l10n.t('app.errormenueditorbody'),
+            text: jqXhr.responseJSON.message
           });
           _.delay(newMenuItemView.remove, 3000);
         },

package/app/modules/editor/contentObject/views/editorPageArticleView.js

@@ -122,7 +122,7 @@ define(function(require){
           this.addBlockView(model, true);
           Origin.trigger('editor:refreshData');
         },
-        error: () => Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.erroraddingblock') })
+        error: (model, jqXhr) => Origin.Notify.alert({ type: 'error', text: jqXhr.responseJSON.message })
       });
     },
 
@@ -149,7 +149,7 @@ define(function(require){
 
       this.model.destroy({
         success: () => this.remove(),
-        error: () => Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgeneric') })
+        error: (model, jqXhr) => Origin.Notify.alert({ type: 'error', text: jqXhr.responseJSON.message })
       });
     },
 

package/app/modules/editor/contentObject/views/editorPageBlockView.js

@@ -119,7 +119,7 @@ define(function(require){
     deleteBlock: function(event) {
       this.model.destroy({
         success: () => this.remove(),
-        error: () => Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgeneric') })
+        error: (model, jqXhr) => Origin.Notify.alert({ type: 'error', text: jqXhr.responseJSON.message })
       });
     },
 
@@ -267,7 +267,7 @@ define(function(require){
           this.children.push(model);
           this.render();
         }, this),
-        error: () => Origin.Notify.alert({ type: 'error', text: 'app.errorfetchingdata' })
+        error: (model, jqXhr) => Origin.Notify.alert({ type: 'error', text: jqXhr.responseJSON.message })
       });
     }
 

package/app/modules/editor/contentObject/views/editorPageView.js

@@ -114,7 +114,7 @@ define(function(require){
           articleView._skipRender = true; // prevent render of blocks in postRender
           articleView.addBlock();
         },
-        error: () => Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.erroraddingarticle') })
+        error: (model, jqXhr) => Origin.Notify.alert({ type: 'error', text: jqXhr.responseJSON.message })
       });
     },
 

package/app/modules/projects/index.js

@@ -67,6 +67,8 @@ define(function(require) {
       filter: { createdBy: isMine ? meId : { $ne: meId } }, 
       _type: 'course'
     });
+    collection.queryOptions.source = 'dashboard';
+    
     Origin.trigger('contentHeader:updateTitle', { 
       breadcrumbs: ['dashboard'], 
       title: Origin.l10n.t(`app.${isMine ? 'myprojects' : 'sharedprojects'}`) 

package/package.json

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