adapt-authoring-ui 1.8.4 → 1.8.6

package/app/modules/projects/views/projectsView.js

@@ -1,6 +1,5 @@
 // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
 define(function(require){
-  var CourseModel = require('core/models/courseModel');
   var Origin = require('core/origin');
   var OriginView = require('core/views/originView');
   var ProjectView = require('./projectView');
@@ -90,23 +89,7 @@ define(function(require){
     },
 
     initPaging: function() {
-      if(this.resizeTimer) {
-        clearTimeout(this.resizeTimer);
-        this.resizeTimer = -1;
-      }
-      var $item = new ProjectView({ model: new CourseModel() }).$el;
-      $item.css({
-        visibility: 'hidden'
-      }).appendTo('.projects-list'); // Fixed: added missing class selector
-
-      var containerHeight = $(window).height()-this.$el.offset().top;
-      var itemHeight = $item.outerHeight(true);
-      var columns = Math.floor(this.$('.projects-inner').width()/$item.outerWidth(true));
-      var rows = Math.max(1, Math.ceil(containerHeight/itemHeight));
-      $item.remove();
-      // columns stack nicely, but need to add extra row if it's not a clean split
-      if((containerHeight % itemHeight) > 0) rows++;
-      this.collection.queryOptions.limit = columns*rows;
+      this.collection.queryOptions.limit = 20;
       this.resetCollection(this.setViewToReady);
     },
 
@@ -205,16 +188,16 @@ define(function(require){
     checkAndFillVisibleArea: function() {
       // Check if we need to load more items to fill the viewport
       if(this.shouldStopFetches || this.isCollectionFetching) return;
-      
+
       const $last = $('.project-list-item').last();
       if($last.length === 0) return;
-      
-      const contentPane = $('.contentPane');
-      if(contentPane.length === 0) return;
-      
-      const contentPaneBottom = contentPane.offset().top + contentPane.height();
-      const lastItemBottom = $last.offset().top + $last.height();
-      
+
+      const $contentPane = $('.contentPane');
+      if($contentPane.length === 0) return;
+
+      const contentPaneBottom = $contentPane.scrollTop() + $contentPane.height();
+      const lastItemBottom = $last.position().top + $last.outerHeight(true);
+
       // If the last item is visible (within the viewport), fetch more
       if(lastItemBottom <= contentPaneBottom) {
         this.fetchCollection();

package/lib/CacheManager.js

@@ -9,10 +9,11 @@ const ONE_HOUR = 60 * ONE_MINUTE
 const ONE_WEEK = 7 * 24 * ONE_HOUR
 
 export default class CacheManager {
-  constructor (maxAge = ONE_WEEK, logger = { log: (level, ...args) => console[level](...args) }) {
+  constructor ({ maxAge = ONE_WEEK, logger, tempDir } = {}) {
     this.maxAge = maxAge
-    this.logger = logger
-    fs.ensureDirSync(this.tempPath)
+    this.logger = logger ?? { log: (level, ...args) => console[level](...args) }
+    this.tempDir = tempDir ?? path.join(os.tmpdir(), 'adapt-authoring')
+    fs.ensureDirSync(this.tempDir)
   }
 
   static hash (path) {
@@ -22,19 +23,14 @@ export default class CacheManager {
       .digest('hex')
   }
 
-  get tempPath () {
-    const tempPath = path.join(os.tmpdir(), 'adapt-authoring')
-    return tempPath
-  }
-
   cachePath (basePath, outputFilePath = process.cwd()) {
     const projectHash = CacheManager.hash(path.join(basePath, outputFilePath))
-    const cachePath = path.join(this.tempPath, `${projectHash}.cache`)
+    const cachePath = path.join(this.tempDir, `${projectHash}.cache`)
     return cachePath
   }
 
   get checkFilePath () {
-    const checkFilePath = path.join(this.tempPath, 'last.touch')
+    const checkFilePath = path.join(this.tempDir, 'last.touch')
     return checkFilePath
   }
 
@@ -52,7 +48,7 @@ export default class CacheManager {
     await fs.writeFile(this.checkFilePath, String(Date.now()))
     this.logger.log('debug', 'Clearing compilation cache')
     // Fetch all cache files except checkFile
-    const files = await glob([`${this.tempPath}/**`, `!${this.checkFilePath}`], { nodir: true })
+    const files = await glob([`${this.tempDir}/**`, `!${this.checkFilePath}`], { nodir: true })
     // Fetch file ages
     const fileAges = []
     const now = Date.now()

package/lib/JavaScriptTask.js

@@ -12,7 +12,7 @@ import { deflate, unzip, constants } from 'zlib'
 import { globSync } from 'glob'
 
 export default class JavaScriptTask {
-  constructor (buildDir, logFunc, uiPlugins) {
+  constructor (buildDir, logFunc, uiPlugins, tempDir) {
     this.log = logFunc ?? ((level, ...args) => console.log(level.toUpperCase(), ...args))
     this.convertSlashes = /\\/g
     this.cwd = process.cwd().replace(this.convertSlashes, '/') + '/'
@@ -20,7 +20,7 @@ export default class JavaScriptTask {
     this.isFirstRun = true
     this.cache = null
     this.extensions = ['.js', '.jsx']
-    this.cacheManager = new CacheManager({ logger: { log: this.log } })
+    this.cacheManager = new CacheManager({ logger: { log: this.log }, tempDir })
     this.resolvedNodeModules = {}
     this.resolvedNodeModulesPaths = []
 

package/lib/UiBuild.js

@@ -60,7 +60,7 @@ class UiBuild {
     this.preBuildHook = new Hook()
     this.postBuildHook = new Hook()
 
-    this.jsTask = new JavaScriptTask(this.Paths.Output, this.log, this.uiPlugins)
+    this.jsTask = new JavaScriptTask(this.Paths.Output, this.log, this.uiPlugins, this.app.getConfig('tempDir'))
   }
 
   collate (collateAtFolderName, destFolder, srcFileName) {

package/package.json

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