adapt-authoring-ui 2.0.6 → 3.0.0

package/.github/workflows/releases.yml

@@ -1,32 +1,17 @@
 name: Release
+
 on:
   push:
     branches:
       - master
 
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  id-token: write
+  packages: write
+
 jobs:
   release:
-    name: Release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write # to be able to publish a GitHub release
-      issues: write # to be able to comment on released issues
-      pull-requests: write # to be able to comment on released pull requests
-      id-token: write # to enable use of OIDC for trusted publishing and npm provenance
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 'lts/*'
-      - name: Update npm
-        run: npm install -g npm@latest
-      - name: Install dependencies
-        run: npm install
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npx semantic-release
+    uses: adaptlearning/semantic-release-config/.github/workflows/release.yml@master

package/app/modules/editor/article/index.js

@@ -10,6 +10,7 @@ define(function(require) {
       return;
     }
     var model = Origin.editor.data.content.findWhere({ _id: data.id });
+    await model.fetch();
     var form = await Origin.scaffold.buildForm({ model });
     Helpers.setPageTitle(model);
     Origin.sidebar.addView(new EditorArticleEditSidebarView({ model, form }).$el);

package/app/modules/editor/block/index.js

@@ -10,6 +10,7 @@ define(function(require) {
       return;
     }
     var model = Origin.editor.data.content.findWhere({ _id: data.id });
+    await model.fetch();
     var form = await Origin.scaffold.buildForm({ model });
     Helpers.setPageTitle(model);
     Origin.sidebar.addView(new EditorBlockEditSidebarView({ model, form }).$el);

package/app/modules/editor/component/index.js

@@ -14,6 +14,7 @@ define(function(require) {
       });
     }
     const model = _id === 'new' ? Origin.editor.data.newcomponent : Origin.editor.data.content.findWhere({ _id });
+    if (_id !== 'new') await model.fetch();
     const form = await Origin.scaffold.buildForm({ model });
     Helpers.setPageTitle(model);
     Origin.sidebar.addView(new EditorComponentEditSidebarView({ model, form }).$el);

package/app/modules/editor/config/index.js

@@ -7,6 +7,7 @@ define(function(require) {
 
   Origin.on('editor:config', async function(data) {
     var model = Origin.editor.data.config;
+    await model.fetch();
     var form = await Origin.scaffold.buildForm({ model });
     Helpers.setPageTitle(model);
     Origin.sidebar.addView(new EditorConfigEditSidebarView({ form }).$el);

package/app/modules/editor/contentObject/index.js

@@ -30,6 +30,7 @@ define(function(require) {
   });
 
   async function renderContentObjectEdit(data) {
+    await data.model.fetch();
     Helpers.setPageTitle(data.model);
     var form = await Origin.scaffold.buildForm({ model: data.model });
     Origin.sidebar.addView(new EditorPageEditSidebarView({ form: form }).$el);

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

@@ -199,8 +199,19 @@ define(function(require){
       this.contentobjects.add(newModel);
     },
 
-    onItemDeleted: async function(oldModel) {
-      await this.updateContentObjects(true);
+    onItemDeleted: function(oldModel) {
+      var content = Origin.editor.data.content;
+      var removeDescendants = function(parentId) {
+        content.where({ _parentId: parentId }).forEach(function(child) {
+          removeDescendants(child.get('_id'));
+          content.remove(child);
+        });
+      };
+      removeDescendants(oldModel.get('_id'));
+      content.remove(oldModel);
+      this.contentobjects = new Backbone.Collection(content.filter(function(c) {
+        return c.get('_type') === 'menu' || c.get('_type') === 'page';
+      }));
       Origin.trigger('editorView:menuView:updateSelectedItem', this.contentobjects.findWhere({ _id: oldModel.get('_parentId') }));
     }
   }, {

package/app/modules/editor/course/index.js

@@ -10,6 +10,7 @@ define(function(require) {
   Origin.on('editor:course', renderCourseEdit);
 
   async function renderCourseEdit() {
+    await Origin.editor.data.course.fetch();
     EditorHelpers.setPageTitle(Origin.editor.data.course);
     var form = await Origin.scaffold.buildForm({ model: Origin.editor.data.course });
     Origin.contentPane.setView(EditorCourseEditView, { model: Origin.editor.data.course, form });

package/app/modules/editor/global/editorDataLoader.js

@@ -1,11 +1,13 @@
 // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
 define(function(require) {
   var _ = require('underscore');
-  var ContentCollection = require('core/collections/contentCollection');
+  var Backbone = require('backbone');
+  var ContentModel = require('core/models/contentModel');
   var ContentPluginCollection = require('core/collections/contentPluginCollection');
   var Origin = require('core/origin');
 
   var isLoaded;
+  var lastModified;
 
   var Preloader = {
     /**
@@ -21,35 +23,19 @@ define(function(require) {
 
       isLoaded = false;
 
-      if(await isOutdated()) {
-        try {
+      try {
+        var treeData = await isOutdated();
+        if(treeData) {
           await Promise.all([
-            new Promise (async (resolve) => {
-              const content = new ContentCollection(undefined, { _courseId: Origin.location.route1 });
-              content.queryOptions = { limit: 0 };
-              await content.fetch();
-              Origin.editor.data.content = content;
-              Origin.editor.data.course = content.findWhere({ _type: 'course' });
-              Origin.editor.data.config = content.findWhere({ _type: 'config' });
-              if(!Origin.editor.data.course || !Origin.editor.data.config) {
-                return handleError();
-              }
-              resolve()
-            }),
-            new Promise (async (resolve) => {
-              const componentTypes = new ContentPluginCollection(undefined, { type: 'component' });
-              await componentTypes.fetch();
-              Origin.editor.data.componentTypes = componentTypes;
-              resolve()
-            })
+            loadTree(treeData),
+            loadComponentTypes()
           ]);
-        } catch(e) {
-          return handleError();
         }
+      } catch(e) {
+        return handleError();
       }
       isLoaded = true;
 
-      Origin.editor.data.lastFetch = new Date().toISOString();
       if(_.isFunction(callback)) {
         callback();
       }
@@ -60,6 +46,7 @@ define(function(require) {
         Origin.editor.data.course = undefined;
         Origin.editor.data.config = undefined;
       }
+      lastModified = undefined;
     },
     /**
     * Makes sure all data has been loaded and calls callback
@@ -69,18 +56,74 @@ define(function(require) {
     }
   };
 
+  async function loadTree(treeData) {
+    var items, resLastModified;
+    if(treeData && treeData.items) {
+      items = treeData.items;
+      resLastModified = treeData.lastModified;
+    } else {
+      var courseId = Origin.location.route1;
+      await new Promise(function(resolve, reject) {
+        $.ajax({
+          url: '/api/content/tree/' + courseId,
+          success: function(data, textStatus, jqXHR) {
+            items = data;
+            resLastModified = jqXHR.getResponseHeader('Last-Modified');
+            resolve();
+          },
+          error: function() { reject(new Error('Failed to fetch content tree')); }
+        });
+      });
+    }
+    lastModified = resLastModified;
+    var content = new Backbone.Collection(items.map(function(item) {
+      return new ContentModel(item);
+    }), {
+      model: ContentModel,
+      comparator: '_sortOrder'
+    });
+    Origin.editor.data.content = content;
+    Origin.editor.data.course = content.findWhere({ _type: 'course' });
+    Origin.editor.data.config = content.findWhere({ _type: 'config' });
+    if(!Origin.editor.data.course || !Origin.editor.data.config) {
+      return handleError();
+    }
+  }
+
+  async function loadComponentTypes() {
+    var componentTypes = new ContentPluginCollection(undefined, { type: 'component' });
+    await componentTypes.fetch();
+    Origin.editor.data.componentTypes = componentTypes;
+  }
+
   async function isOutdated() {
     try {
       if(Origin.editor.data.course.get('_id') !== Origin.location.route1) {
-        Origin.editor.data.lastFetch = 0
+        lastModified = undefined;
         return true;
       }
     } catch(e) {
-      Origin.editor.data.lastFetch = 0
+      lastModified = undefined;
       return true;
     }
-    const [latestDoc] = await $.post('/api/content/query?sort={%22updatedAt%22:-1}&limit=1', {_courseId:Origin.editor.data.course.get('_id')});
-    return !latestDoc || new Date(Origin.editor.data.lastFetch) < new Date(latestDoc.updatedAt);
+    if(!lastModified) return true;
+    var courseId = Origin.editor.data.course.get('_id');
+    return new Promise(function(resolve, reject) {
+      $.ajax({
+        url: '/api/content/tree/' + courseId,
+        headers: { 'If-Modified-Since': lastModified },
+        complete: function(jqXHR) {
+          if(jqXHR.status === 304) return resolve(false);
+          if(jqXHR.status === 200) {
+            return resolve({
+              items: jqXHR.responseJSON,
+              lastModified: jqXHR.getResponseHeader('Last-Modified')
+            });
+          }
+          reject(new Error('Failed to check content staleness'));
+        }
+      });
+    });
   }
 
   function handleError() {

package/app/modules/editor/global/views/editorView.js

@@ -195,19 +195,12 @@ define(function(require) {
     },
 
     copyIdToClipboard: function(model) {
-      var id = model.get('_id');
-
-      if (helpers.copyStringToClipboard(id)) {
-        Origin.Notify.alert({
-          type: 'info',
-          text: Origin.l10n.t('app.copyidtoclipboardsuccess', { id: id })
-        });
-      } else {
-        Origin.Notify.alert({
-          type: 'warning',
-          text: Origin.l10n.t('app.copyidtoclipboarderror', { id: id })
-        });
-      }
+      const id = model.get('_friendlyId') || model.get('_id');
+      const isSuccess = helpers.copyStringToClipboard(id)
+      Origin.Notify.alert({
+        type: isSuccess ? 'info' : 'warning',
+        text: Origin.l10n.t(isSuccess ? 'app.copyidtoclipboardsuccess' : 'app.copyidtoclipboarderror', { id })
+      });
     },
 
     pasteFromClipboard: function(_parentId, _sortOrder, _layout) {

package/app/modules/editor/menuSettings/index.js

@@ -8,7 +8,6 @@ define(function(require) {
   Origin.on('editor:menusettings', function(data) {
     var route1 = Origin.location.route1;
     var model = Origin.editor.data.config;
-    
     Helpers.setPageTitle(model);
     
     var backButtonRoute = `#/editor/${route1}/menu`;

package/app/modules/editor/themeEditor/index.js

@@ -8,7 +8,11 @@ define(function(require) {
     Origin.router.navigate(`#/editor/${Origin.editor.data.course.get('_id')}/${ROUTE}`, { trigger: true });
   });
 
-  Origin.on('editor:selecttheme', () => {
+  Origin.on('editor:selecttheme', async () => {
+    await Promise.all([
+      Origin.editor.data.course.fetch(),
+      Origin.editor.data.config.fetch()
+    ]);
     Origin.sidebar.addView(new EditorThemingSidebarView().$el);
     Origin.contentPane.setView(EditorThemingView);
   });

package/app/modules/frameworkImport/views/frameworkImportView.js

@@ -76,7 +76,7 @@ define(function(require){
         this.$('#tags').val(this.model.get('tags').map(t => t.title));
       }
       const data = await Helpers.submitForm(this.$('form.frameworkImport'), { data: { dryRun } })
-      return Object.assign(data, { canImport: data.statusReport.error === undefined });
+      return Object.assign(data, { canImport: !data.statusReport.error?.length });
     },
 
     onAddTag: function (tag) {

package/lib/UiModule.js

@@ -1,6 +1,18 @@
 import { AbstractModule, Hook } from 'adapt-authoring-core'
 import path from 'path'
 import UiBuild from './UiBuild.js'
+
+const CSP_POLICY = [
+  "default-src 'self'",
+  "frame-ancestors 'self'",
+  "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com https://cdn.ckeditor.com",
+  "style-src 'self' 'unsafe-inline' https://cdnjs.cloudflare.com https://cdn.ckeditor.com",
+  "font-src 'self' data: https://cdnjs.cloudflare.com",
+  "img-src 'self' data: blob:",
+  "worker-src 'self' blob:",
+  "connect-src 'self' https://cdnjs.cloudflare.com https://cdn.ckeditor.com",
+  'upgrade-insecure-requests'
+].join('; ')
 /**
  * The main entry-point for the Adapt authoring tool web-app/front-end
  * @memberof ui
@@ -96,6 +108,7 @@ class UiModule extends AbstractModule {
   servePage (pageName) {
     return async (req, res, next) => {
       const framework = await this.app.waitForModule('adaptframework')
+      res.setHeader('Content-Security-Policy', CSP_POLICY)
       res.render(path.resolve(this.buildDir, pageName), {
         buildType: this.isProduction ? 'production' : 'development',
         versions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-ui",
-  "version": "2.0.6",
+  "version": "3.0.0",
   "description": "Front-end application for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-ui",
   "license": "GPL-3.0",
@@ -20,7 +20,7 @@
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^0.4.0",
+    "@rollup/plugin-terser": "^1.0.0",
     "adapt-authoring-core": "^2.0.0",
     "babel-plugin-transform-amd-to-es6": "^1.0.2",
     "cpy": "^13.0.0",
@@ -38,40 +38,16 @@
   },
   "peerDependencies": {
     "adapt-authoring-adaptframework": "^2.0.0",
+    "adapt-authoring-authored": "^1.4.0",
+    "adapt-authoring-content": "^3.0.0",
     "adapt-authoring-server": "^2.0.0"
   },
   "devDependencies": {
-    "@semantic-release/git": "^10.0.1",
-    "conventional-changelog-eslint": "^6.0.0",
-    "semantic-release": "^25.0.2",
+    "@adaptlearning/semantic-release-config": "^1.0.0",
     "standard": "^17.1.0"
   },
   "release": {
-    "plugins": [
-      [
-        "@semantic-release/commit-analyzer",
-        {
-          "preset": "eslint"
-        }
-      ],
-      [
-        "@semantic-release/release-notes-generator",
-        {
-          "preset": "eslint"
-        }
-      ],
-      "@semantic-release/npm",
-      "@semantic-release/github",
-      [
-        "@semantic-release/git",
-        {
-          "assets": [
-            "package.json"
-          ],
-          "message": "Chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-        }
-      ]
-    ]
+    "extends": "@adaptlearning/semantic-release-config"
   },
   "standard": {
     "ignore": [