@oat-sa/tao-core-ui 1.54.1 → 1.54.4

package/dist/resourcemgr/fileBrowser.js

@@ -303,7 +303,7 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'i18n
       if (content.permissions.read && !options.hasAlreadySelected) {
         $$1('.file-browser').find('li.active').removeClass('active');
         updateSelectedClass(content.path, content.total, content.childrenLimit);
-        $container.trigger("folderselect.".concat(ns), [content.label, getPage(content.children), content.path, content]);
+        $container.trigger('folderselect.'.concat(ns), [content.label, getPage(content.children), content.path, content]);
         renderPagination();
 
         if (root !== 'local') {
@@ -360,7 +360,13 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'i18n
           name: file.name
         })) {
           updatePermissions(file);
-          subTree.children.push(file);
+
+          if (subTree.children.length === subTree.total) {
+            // all children loaded new file can be pushed to the end of tree
+            // if not all, new file will be loaded with next page
+            subTree.children.push(file);
+          }
+
           subTree.total++;
           selectedClass.total++;
           $container.trigger("folderselect.".concat(ns), [subTree.label, getPage(subTree.children), path]);
@@ -486,10 +492,7 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'i18n
       if (tree) {
         if (tree.path === path) {
           tree.children = tree.children ? tree.children.concat(data.children) : data.children;
-
-          if (data.total) {
-            tree.total = data.total;
-          }
+          tree.total = data.total;
         } else if (tree.children) {
           _.forEach(tree.children, function (child) {
             done = setToPath(child, path, data);
@@ -577,7 +580,7 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'i18n
 
     function updateFolders(data, $parent, recurse) {
       if (recurse && data && data.path) {
-        if (data.relPath === undefined) {
+        if (typeof data.relPath === 'undefined') {
           data.relPath = data.path;
         }
 

package/dist/uploader.js

@@ -306,12 +306,11 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
      * @returns {jQueryElement} for chainingV
      */
     init: function init(options) {
-      var self = uploader; //get options using default
-
+      //get options using default
       options = _.defaults(options || {}, defaults);
       return this.each(function () {
-        var $elt = $$1(this),
-            $builtInForm;
+        var $elt = $$1(this);
+        var $builtInForm;
 
         if (!$elt.data(dataNs)) {
           $elt.html(uploaderTpl(options)); // form could be inside $elt ...
@@ -343,7 +342,7 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
           options.files = [];
           $elt.data(dataNs, options);
 
-          self._reset($elt);
+          uploader._reset($elt);
 
           var inputHandler = function inputHandler(e) {
             // _.values also get the length property of the FileList object,
@@ -354,7 +353,9 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
               finalFiles.push(file);
             });
 
-            self._selectFiles($elt, finalFiles);
+            uploader._selectFiles($elt, finalFiles);
+
+            options.$input.val('');
           };
 
           var dragOverHandler = function dragOverHandler(e) {
@@ -415,7 +416,7 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
                   append = false;
                 }
 
-                self._selectFiles($elt, files, append);
+                uploader._selectFiles($elt, files, append);
               }
 
               return false;
@@ -427,25 +428,25 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
 
           $elt.on('fileselect.' + ns, function () {
             if (options.files.length === 0) {
-              self._reset($elt);
+              uploader._reset($elt);
             }
 
             if (options.upload) {
               options.$uploadBtn.off('click').on('click', function (e) {
                 e.preventDefault();
 
-                self._upload($elt, options.files);
+                uploader._upload($elt, options.files);
               }).removeProp('disabled');
             }
 
             if (options.read) {
-              self._read($elt, options.files);
+              uploader._read($elt, options.files);
             }
 
             options.$resetBtn.off('click').on('click', function (e) {
               e.preventDefault();
 
-              self._reset($elt);
+              uploader._reset($elt);
             }).removeProp('disabled');
           });
           /**
@@ -548,7 +549,7 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
      * Get the selected files.
      *
      * Called the jQuery way once registered by the Pluginifier:
-     * @example var files = $('selector').uploader('files');
+     * @example const files = $('selector').uploader('files');
      *
      * @param {jQueryElement} $elt - plugin's element
      * @returns {Array<File>} the selected files
@@ -719,11 +720,7 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
 
       if (options && options.files.length) {
         _.forEach(options.files, function (file) {
-          // Show information about the processed file to the candidate.
-          var filename = file.name;
-          var filesize = file.size;
-          var filetype = file.type; // Let's read the file to get its base64 encoded content.
-
+          // Let's read the file to get its base64 encoded content.
           var reader = new FileReader();
 
           reader.onload = function (e) {
@@ -738,7 +735,7 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
             $elt.trigger('readend.' + ns, [file, e.target.result]);
           };
 
-          reader.onloadstart = function (e) {
+          reader.onloadstart = function () {
             options.$progressBar.progressbar('value', 0);
             /**
              * The reading starts

package/package.json

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

package/scss/inc/_base.scss

@@ -211,7 +211,6 @@ body {
     sub,
     sup {
         font-size: .75em;
-        line-height: 0;
         position: relative;
         vertical-align: baseline;
     }

package/scss/inc/_forms.scss

@@ -715,6 +715,10 @@ label {
                 @include simple-border();
             }
         }
+        & ~.form-error{
+            color: $error;
+            text-align: right;
+        }
 
         [dir="rtl"] & {
             padding: 0 0 0 10px;

package/src/resourcemgr/fileBrowser.js

@@ -21,7 +21,7 @@ import request from 'core/request';
 import paginationComponent from 'ui/pagination';
 import rootFolderTpl from 'ui/resourcemgr/tpl/rootFolder';
 import folderTpl from 'ui/resourcemgr/tpl/folder';
-import updatePermissions  from './util/updatePermissions';
+import updatePermissions from './util/updatePermissions';
 
 const ns = 'resourcemgr';
 
@@ -54,16 +54,21 @@ export default function (options) {
         }
         updateFolders(content, $innerList);
 
-      if (content.permissions.read && !options.hasAlreadySelected) {
-          $('.file-browser').find('li.active').removeClass('active');
-          updateSelectedClass(content.path, content.total, content.childrenLimit);
-          $container.trigger("folderselect.".concat(ns), [content.label, getPage(content.children), content.path, content]);
-          renderPagination();
+        if (content.permissions.read && !options.hasAlreadySelected) {
+            $('.file-browser').find('li.active').removeClass('active');
+            updateSelectedClass(content.path, content.total, content.childrenLimit);
+            $container.trigger('folderselect.'.concat(ns), [
+                content.label,
+                getPage(content.children),
+                content.path,
+                content
+            ]);
+            renderPagination();
 
-          if (root !== 'local') {
-            options.hasAlreadySelected = true;
-          }
-      }
+            if (root !== 'local') {
+                options.hasAlreadySelected = true;
+            }
+        }
     });
 
     // by clicking on the tree (using a live binding  because content is not complete yet)
@@ -99,7 +104,12 @@ export default function (options) {
 
                 //internal event to set the file-selector content
                 updateSelectedClass(fullPath, subTree.total, $selected.data('children-limit'));
-                $container.trigger(`folderselect.${ns}`, [content.label, getPage(content.children), content.path, content]);
+                $container.trigger(`folderselect.${ns}`, [
+                    content.label,
+                    getPage(content.children),
+                    content.path,
+                    content
+                ]);
                 renderPagination();
             }
         });
@@ -113,7 +123,11 @@ export default function (options) {
             }
             if (root !== 'local' || !_.find(subTree.children, { name: file.name })) {
                 updatePermissions(file);
-                subTree.children.push(file);
+                if (subTree.children.length === subTree.total) {
+                    // all children loaded new file can be pushed to the end of tree
+                    // 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]);
@@ -173,14 +187,12 @@ export default function (options) {
                 return !!item.uri;
             });
             // if files less then total and need toload this page
-            if ((files.length < selectedClass.total) &&
-                (files.length < selectedClass.page * selectedClass.childrenLimit)
-            ) {
+            if (files.length < selectedClass.total && files.length < selectedClass.page * selectedClass.childrenLimit) {
                 loadContent(path).then(function (data) {
                     const loadedFiles = _.filter(data.children, function (item) {
                         return !!item.uri;
                     });
-                    setToPath(tree, path, {children: loadedFiles});
+                    setToPath(tree, path, { children: loadedFiles });
                     content = getByPath(tree, path);
                     cb(content);
                 });
@@ -227,9 +239,7 @@ export default function (options) {
         if (tree) {
             if (tree.path === path) {
                 tree.children = tree.children ? tree.children.concat(data.children) : data.children;
-                if (data.total) {
-                    tree.total = data.total;
-                }
+                tree.total = data.total;
             } else if (tree.children) {
                 _.forEach(tree.children, function (child) {
                     done = setToPath(child, path, data);
@@ -280,18 +290,19 @@ export default function (options) {
             url: options.browseUrl,
             method: 'GET',
             dataType: 'json',
-            data: _.merge(parameters, options.params, { childrenOffset: (selectedClass.page - 1) * selectedClass.childrenLimit }),
-            noToken: true,
+            data: _.merge(parameters, options.params, {
+                childrenOffset: (selectedClass.page - 1) * selectedClass.childrenLimit
+            }),
+            noToken: true
         })
-        .then(response => response.data)
-        .then(response => {
-            response = updatePermissions(response);
-            if (response.children && response.children.length > 0) {
-                response.children.map(responseChildren => updatePermissions(responseChildren));
-            }
-            return response;
-        });
-
+            .then(response => response.data)
+            .then(response => {
+                response = updatePermissions(response);
+                if (response.children && response.children.length > 0) {
+                    response.children.map(responseChildren => updatePermissions(responseChildren));
+                }
+                return response;
+            });
     }
 
     /**
@@ -302,7 +313,7 @@ export default function (options) {
      */
     function updateFolders(data, $parent, recurse) {
         if (recurse && data && data.path) {
-            if (data.relPath === undefined) {
+            if (typeof data.relPath === 'undefined') {
                 data.relPath = data.path;
             }
             $parent.append(folderTpl(data));