@oat-sa/tao-core-ui 3.20.0 → 3.21.1

package/dist/resourcemgr/fileBrowser.js

@@ -242,7 +242,7 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'lib/
 	        $selected.parent('li').addClass('active');
 
 	        //internal event to set the file-selector content
-	        updateSelectedClass(fullPath, subTree.total, $selected.data('children-limit'));
+	        updateSelectedClass(fullPath, content.total, content.childrenLimit);
 	        $container.trigger(`folderselect.${ns}`, [content.label, getPage(content.children), content.path, content]);
 	        renderPagination();
 	      }
@@ -267,9 +267,11 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'lib/
 	          // if not all, new file will be loaded with next page
 	          subTree.children.push(file);
 	        }
-	        subTree.total++;
-	        selectedClass.total++;
-	        $container.trigger(`folderselect.${ns}`, [subTree.label, getPage(subTree.children), path]);
+	        subTree.total = Number.isFinite(Number(subTree.total)) ? Number(subTree.total) + 1 : 1;
+	        if (selectedClass.path === path) {
+	          selectedClass.total = subTree.total;
+	        }
+	        $container.trigger(`folderselect.${ns}`, [subTree.label, getPage(subTree.children), path, subTree]);
 	        renderPagination();
 	      }
 	    }
@@ -328,7 +330,9 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'lib/
 	            return !!item.uri;
 	          });
 	          setToPath(tree, path, {
-	            children: loadedFiles
+	            children: loadedFiles,
+	            total: data.total,
+	            childrenLimit: data.childrenLimit
 	          });
 	          content = getByPath(tree, path);
 	          cb(content);
@@ -392,7 +396,12 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'lib/
 	    if (tree) {
 	      if (tree.path === path) {
 	        tree.children = tree.children ? tree.children.concat(data.children) : data.children;
-	        tree.total = data.total;
+	        if (Object.prototype.hasOwnProperty.call(data, 'total')) {
+	          tree.total = data.total;
+	        }
+	        if (Object.prototype.hasOwnProperty.call(data, 'childrenLimit')) {
+	          tree.childrenLimit = data.childrenLimit;
+	        }
 	      } else if (tree.children) {
 	        _.forEach(tree.children, function (child) {
 	          done = setToPath(child, path, data);
@@ -483,10 +492,12 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'lib/
 	   * @param {Number} childrenLimit - page size
 	   */
 	  function updateSelectedClass(path, total, childrenLimit) {
+	    const normalizedTotal = Number(total);
+	    const normalizedChildrenLimit = Number(childrenLimit);
 	    selectedClass = {
 	      path,
-	      total,
-	      childrenLimit,
+	      total: Number.isFinite(normalizedTotal) && normalizedTotal >= 0 ? normalizedTotal : 0,
+	      childrenLimit: Number.isFinite(normalizedChildrenLimit) && normalizedChildrenLimit > 0 ? normalizedChildrenLimit : selectedClass.childrenLimit || 10,
 	      page: 1
 	    };
 	  }
@@ -495,9 +506,14 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'lib/
 	   */
 	  function renderPagination() {
 	    const $paginationContainer = $$1('.pagination-bottom', $container);
+	    const total = Number(selectedClass.total);
+	    const childrenLimit = Number(selectedClass.childrenLimit);
 	    $paginationContainer.empty();
-	    const totalPages = Math.ceil(selectedClass.total / selectedClass.childrenLimit);
-	    if (selectedClass.total && totalPages > 1) {
+	    if (!Number.isFinite(total) || !Number.isFinite(childrenLimit) || childrenLimit <= 0) {
+	      return;
+	    }
+	    const totalPages = Math.ceil(total / childrenLimit);
+	    if (total > 0 && totalPages > 1) {
 	      paginationComponent({
 	        mode: 'simple',
 	        activePage: selectedClass.page,

package/dist/resourcemgr/fileSelector.js

@@ -375,19 +375,16 @@ define(['jquery', 'lodash', 'async', 'i18n', 'core/mimetype', 'handlebars', 'lib
       function setUpUploader(currentPath) {
         let errors = [];
         let $switcher = $$1('.upload-switcher a', $fileSelector);
+        let isUploadMode = false;
         $uploader.on('upload.uploader', function (e, file, result) {
-          let path = $$1(`[data-display="${currentPath}"]`).data('path') || $$1(`[data-display="/${currentPath}"]`).data('path');
-          if (!path) {
-            path = currentPath;
-          }
-          $container.trigger(`filenew.${ns}`, [result, path]);
+          $container.trigger(`filenew.${ns}`, [result, currentPath]);
         });
         $uploader.on('fail.uploader', function (e, file, err) {
           errors.push(__('Unable to upload file %s : %s', file.name, err.message));
         });
         $uploader.on('end.uploader', function () {
           if (errors.length === 0) {
-            _.delay(switchUpload, 500);
+            setUploadMode(false);
           } else {
             feedback().error(`<ul><li>${errors.join('</li><li>')}</li></ul>`, {
               encodeHtml: false
@@ -461,8 +458,9 @@ define(['jquery', 'lodash', 'async', 'i18n', 'core/mimetype', 'handlebars', 'lib
             uploadUrl: `${options.uploadUrl}?${$$1.param(options.params)}&${options.pathParam}=${currentPath}&relPath=${currentPath}`
           });
         });
-        function switchUpload() {
-          if ($fileContainer.css('display') === 'none') {
+        function setUploadMode(enableUploadMode) {
+          if (!enableUploadMode) {
+            isUploadMode = false;
             $uploader.hide();
             $fileContainer.show();
             // Note: show() would display as inline, not inline-block!
@@ -472,6 +470,7 @@ define(['jquery', 'lodash', 'async', 'i18n', 'core/mimetype', 'handlebars', 'lib
             $switcher.filter('.listing').hide();
             $browserTitle.text(__('Browse folders:'));
           } else {
+            isUploadMode = true;
             $fileContainer.hide();
             $placeholder.hide();
             $uploader.show();
@@ -487,8 +486,13 @@ define(['jquery', 'lodash', 'async', 'i18n', 'core/mimetype', 'handlebars', 'lib
         //switch to upload mode
         $switcher.click(function (e) {
           e.preventDefault();
-          switchUpload();
+          if ($$1(this).hasClass('upload')) {
+            setUploadMode(true);
+          } else if ($$1(this).hasClass('listing')) {
+            setUploadMode(false);
+          }
         });
+        setUploadMode(isUploadMode);
       }
       function updateFiles(path, files) {
         $fileContainer.empty();

package/dist/taskQueueButton/taskable.js

@@ -87,9 +87,28 @@ define(['jquery', 'lodash', 'i18n', 'ui/report', 'ui/feedback', 'layout/loading-
         loadingBar.start();
         taskQueue.pollAllStop();
         taskQueue.create(requestUrl, requestData).then(function (result) {
-          var infoBox,
-            message,
+          var message,
             task = result.task;
+
+          /**
+           * Creates feedback box and notifies task queue listeners.
+           * @param {Object} taskData
+           * @param {String} feedbackMessage
+           * @param {String} feedbackType
+           * @returns {void}
+           */
+          var notifyTaskCreated = function notifyTaskCreated(taskData, feedbackMessage, feedbackType) {
+            var box = feedback(null, {
+              encodeHtml: false,
+              timeout: {
+                [feedbackType]: 8000
+              }
+            })[feedbackType](feedbackMessage);
+            taskQueue.trigger('taskcreated', {
+              task: taskData,
+              sourceDom: box.getElement()
+            });
+          };
           if (result.finished) {
             if (task.hasFile) {
               //download if its is a export-typed task
@@ -104,7 +123,8 @@ define(['jquery', 'lodash', 'i18n', 'ui/report', 'ui/feedback', 'layout/loading-
                 taskQueue.pollAll();
               });
             } else {
-              //immediately archive the finished task as there is no need to display this task in the queue list
+              message = __('<strong> %s </strong> has been completed.', _.escape(task.taskLabel));
+              notifyTaskCreated(task, message, 'success');
               taskQueue.archive(task.id).then(function () {
                 self.trigger('finished', result);
                 taskQueue.pollAll();
@@ -115,17 +135,8 @@ define(['jquery', 'lodash', 'i18n', 'ui/report', 'ui/feedback', 'layout/loading-
             }
           } else {
             //enqueuing process:
-            message = __('<strong> %s </strong> has been moved to the background.', task.taskLabel);
-            infoBox = feedback(null, {
-              encodeHtml: false,
-              timeout: {
-                info: 8000
-              }
-            }).info(message);
-            taskQueue.trigger('taskcreated', {
-              task: task,
-              sourceDom: infoBox.getElement()
-            });
+            message = __('<strong> %s </strong> has been moved to the background.', _.escape(task.taskLabel));
+            notifyTaskCreated(task, message, 'info');
             self.trigger('enqueued', result);
           }
           loadingBar.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "3.20.0",
+    "version": "3.21.1",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {

package/src/resourcemgr/fileBrowser.js

@@ -107,7 +107,7 @@ export default function (options) {
                 $selected.parent('li').addClass('active');
 
                 //internal event to set the file-selector content
-                updateSelectedClass(fullPath, subTree.total, $selected.data('children-limit'));
+                updateSelectedClass(fullPath, content.total, content.childrenLimit);
                 $container.trigger(`folderselect.${ns}`, [
                     content.label,
                     getPage(content.children),
@@ -137,9 +137,11 @@ export default function (options) {
                     // if not all, new file will be loaded with next page
                     subTree.children.push(file);
                 }
-                subTree.total++;
-                selectedClass.total++;
-                $container.trigger(`folderselect.${ns}`, [subTree.label, getPage(subTree.children), path]);
+                subTree.total = Number.isFinite(Number(subTree.total)) ? Number(subTree.total) + 1 : 1;
+                if (selectedClass.path === path) {
+                    selectedClass.total = subTree.total;
+                }
+                $container.trigger(`folderselect.${ns}`, [subTree.label, getPage(subTree.children), path, subTree]);
                 renderPagination();
             }
         }
@@ -201,7 +203,11 @@ export default function (options) {
                     const loadedFiles = _.filter(data.children, function (item) {
                         return !!item.uri;
                     });
-                    setToPath(tree, path, { children: loadedFiles });
+                    setToPath(tree, path, {
+                        children: loadedFiles,
+                        total: data.total,
+                        childrenLimit: data.childrenLimit
+                    });
                     content = getByPath(tree, path);
                     cb(content);
                 });
@@ -263,7 +269,12 @@ export default function (options) {
         if (tree) {
             if (tree.path === path) {
                 tree.children = tree.children ? tree.children.concat(data.children) : data.children;
-                tree.total = data.total;
+                if (Object.prototype.hasOwnProperty.call(data, 'total')) {
+                    tree.total = data.total;
+                }
+                if (Object.prototype.hasOwnProperty.call(data, 'childrenLimit')) {
+                    tree.childrenLimit = data.childrenLimit;
+                }
             } else if (tree.children) {
                 _.forEach(tree.children, function (child) {
                     done = setToPath(child, path, data);
@@ -356,10 +367,16 @@ export default function (options) {
      * @param {Number} childrenLimit - page size
      */
     function updateSelectedClass(path, total, childrenLimit) {
+        const normalizedTotal = Number(total);
+        const normalizedChildrenLimit = Number(childrenLimit);
+
         selectedClass = {
             path,
-            total,
-            childrenLimit,
+            total: Number.isFinite(normalizedTotal) && normalizedTotal >= 0 ? normalizedTotal : 0,
+            childrenLimit:
+                Number.isFinite(normalizedChildrenLimit) && normalizedChildrenLimit > 0
+                    ? normalizedChildrenLimit
+                    : selectedClass.childrenLimit || 10,
             page: 1
         };
     }
@@ -368,10 +385,18 @@ export default function (options) {
      */
     function renderPagination() {
         const $paginationContainer = $('.pagination-bottom', $container);
+        const total = Number(selectedClass.total);
+        const childrenLimit = Number(selectedClass.childrenLimit);
+
         $paginationContainer.empty();
-        const totalPages = Math.ceil(selectedClass.total / selectedClass.childrenLimit);
 
-        if (selectedClass.total && totalPages > 1) {
+        if (!Number.isFinite(total) || !Number.isFinite(childrenLimit) || childrenLimit <= 0) {
+            return;
+        }
+
+        const totalPages = Math.ceil(total / childrenLimit);
+
+        if (total > 0 && totalPages > 1) {
             paginationComponent({
                 mode: 'simple',
                 activePage: selectedClass.page,

package/src/resourcemgr/fileSelector.js

@@ -231,14 +231,10 @@ export default function (options) {
     function setUpUploader(currentPath) {
         let errors = [];
         let $switcher = $('.upload-switcher a', $fileSelector);
+        let isUploadMode = false;
 
         $uploader.on('upload.uploader', function (e, file, result) {
-            let path =
-                $(`[data-display="${currentPath}"]`).data('path') || $(`[data-display="/${currentPath}"]`).data('path');
-            if (!path) {
-                path = currentPath;
-            }
-            $container.trigger(`filenew.${ns}`, [result, path]);
+            $container.trigger(`filenew.${ns}`, [result, currentPath]);
         });
         $uploader.on('fail.uploader', function (e, file, err) {
             errors.push(__('Unable to upload file %s : %s', file.name, err.message));
@@ -246,7 +242,7 @@ export default function (options) {
 
         $uploader.on('end.uploader', function () {
             if (errors.length === 0) {
-                _.delay(switchUpload, 500);
+                setUploadMode(false);
             } else {
                 feedback().error(`<ul><li>${errors.join('</li><li>')}</li></ul>`, { encodeHtml: false });
             }
@@ -333,8 +329,9 @@ export default function (options) {
             });
         });
 
-        function switchUpload() {
-            if ($fileContainer.css('display') === 'none') {
+        function setUploadMode(enableUploadMode) {
+            if (!enableUploadMode) {
+                isUploadMode = false;
                 $uploader.hide();
                 $fileContainer.show();
                 // Note: show() would display as inline, not inline-block!
@@ -342,6 +339,7 @@ export default function (options) {
                 $switcher.filter('.listing').hide();
                 $browserTitle.text(__('Browse folders:'));
             } else {
+                isUploadMode = true;
                 $fileContainer.hide();
                 $placeholder.hide();
                 $uploader.show();
@@ -355,8 +353,14 @@ export default function (options) {
         //switch to upload mode
         $switcher.click(function (e) {
             e.preventDefault();
-            switchUpload();
+            if ($(this).hasClass('upload')) {
+                setUploadMode(true);
+            } else if ($(this).hasClass('listing')) {
+                setUploadMode(false);
+            }
         });
+
+        setUploadMode(isUploadMode);
     }
 
     function updateFiles(path, files) {

package/src/taskQueueButton/taskable.js

@@ -86,10 +86,25 @@ var taskableComponent = {
         taskQueue
             .create(requestUrl, requestData)
             .then(function(result) {
-                var infoBox,
-                    message,
+                var message,
                     task = result.task;
 
+                /**
+                 * Creates feedback box and notifies task queue listeners.
+                 * @param {Object} taskData
+                 * @param {String} feedbackMessage
+                 * @param {String} feedbackType
+                 * @returns {void}
+                 */
+                var notifyTaskCreated = function notifyTaskCreated(taskData, feedbackMessage, feedbackType) {
+                    var box = feedback(null, {
+                        encodeHtml: false,
+                        timeout: { [feedbackType]: 8000 }
+                    })[feedbackType](feedbackMessage);
+
+                    taskQueue.trigger('taskcreated', { task: taskData, sourceDom: box.getElement() });
+                };
+
                 if (result.finished) {
                     if (task.hasFile) {
                         //download if its is a export-typed task
@@ -108,7 +123,8 @@ var taskableComponent = {
                                 taskQueue.pollAll();
                             });
                     } else {
-                        //immediately archive the finished task as there is no need to display this task in the queue list
+                        message = __('<strong> %s </strong> has been completed.', _.escape(task.taskLabel));
+                        notifyTaskCreated(task, message, 'success');
                         taskQueue
                             .archive(task.id)
                             .then(function() {
@@ -122,13 +138,8 @@ var taskableComponent = {
                     }
                 } else {
                     //enqueuing process:
-                    message = __('<strong> %s </strong> has been moved to the background.', task.taskLabel);
-                    infoBox = feedback(null, {
-                        encodeHtml: false,
-                        timeout: { info: 8000 }
-                    }).info(message);
-
-                    taskQueue.trigger('taskcreated', { task: task, sourceDom: infoBox.getElement() });
+                    message = __('<strong> %s </strong> has been moved to the background.', _.escape(task.taskLabel));
+                    notifyTaskCreated(task, message, 'info');
                     self.trigger('enqueued', result);
                 }
                 loadingBar.stop();