@oat-sa/tao-core-ui 1.35.0 → 1.36.2

package/dist/datatable.js

@@ -1094,6 +1094,10 @@ define(['jquery', 'lodash', 'i18n', 'core/pluginifier', 'handlebars', 'lib/dompu
       }
 
       $$1.ajax(ajaxConfig).done(function (response) {
+        if ($elt && _typeof($elt.data(dataNs)) !== 'object') {
+          return $elt.trigger("error.".concat(ns), [new Error("Unable to load data attached to the element")]);
+        }
+
         self._render($elt, response);
       }).fail(function (response, option, err) {
         var requestErr = httpErrorParser.parse(response, option, err);
@@ -1121,6 +1125,10 @@ define(['jquery', 'lodash', 'i18n', 'core/pluginifier', 'handlebars', 'lib/dompu
 
       var options = _.cloneDeep($elt.data(dataNs));
 
+      if (typeof options === 'undefined') {
+        return $elt.trigger("error.".concat(ns), [new Error("Unable to load data attached to the element")]);
+      }
+
       var model = [];
       var $massActionBtns = $$1();
       /**

package/dist/highlighter.js

@@ -104,13 +104,15 @@ define(['lodash', 'jquery'], function (_, $) { 'use strict';
       return $(containerSelector).get(0);
     }
     /**
-     * Returns all highlighted nodes
+     * Returns all highlighted nodes, excluding any inside blacklisted elements
      * @returns {JQuery<HTMLElement>}
      */
 
 
     function getHighlightedNodes() {
-      return $(containerSelector).find(".".concat(highlightingClasses.join(',.')));
+      return $(containerSelector).find(".".concat(highlightingClasses.join(',.'))).filter(function (i, node) {
+        return !isBlacklisted(node);
+      });
     }
     /**
      * Attach data to wrapper node.
@@ -227,92 +229,100 @@ define(['lodash', 'jquery'], function (_, $) { 'use strict';
         }
 
         currentNode = childNodes[i];
-        var isCurrentNodeTextInsideOfAnotherHighlightingWrapper = isText(currentNode) && isWrappingNode(currentNode.parentNode) && currentNode.parentNode.className !== className;
-
-        if (isCurrentNodeTextInsideOfAnotherHighlightingWrapper) {
-          var internalRange = new Range();
-          internalRange.selectNodeContents(currentNode);
 
-          if (rangeInfos.startNode === currentNode) {
-            internalRange.setStart(currentNode, rangeInfos.startOffset);
+        if (isBlacklisted(currentNode)) {
+          if (isElement(currentNode)) {
+            //go deeper in case a descendant of the current blacklisted is whitelisted
+            wrapTextNodesInRange(currentNode, rangeInfos);
           }
+        } else {
+          var isCurrentNodeTextInsideOfAnotherHighlightingWrapper = isText(currentNode) && isWrappingNode(currentNode.parentNode) && currentNode.parentNode.className !== className;
 
-          if (rangeInfos.endNode === currentNode) {
-            internalRange.setEnd(currentNode, rangeInfos.endOffset);
-          }
+          if (isCurrentNodeTextInsideOfAnotherHighlightingWrapper) {
+            var internalRange = new Range();
+            internalRange.selectNodeContents(currentNode);
 
-          var isNodeInRange = rangeInfos.commonRange.isPointInRange(currentNode, internalRange.endOffset); // Apply new highlighting color only for selected nodes
+            if (rangeInfos.startNode === currentNode) {
+              internalRange.setStart(currentNode, rangeInfos.startOffset);
+            }
 
-          if (isNodeInRange) {
-            isWrapping = true;
-            highlightContainerNodes(currentNode, className, internalRange, currentGroupId);
-          }
-        } else {
-          // split current node in case the wrapping start/ends on a partially selected text node
-          if (currentNode.isSameNode(rangeInfos.startNode)) {
-            if (isText(rangeInfos.startNodeContainer) && rangeInfos.startOffset !== 0) {
-              // we defer the wrapping to the next iteration of the loop
-              //end of node should be highlighted
-              rangeInfos.startNode = currentNode.splitText(rangeInfos.startOffset);
-              rangeInfos.startOffset = 0;
-              splitDatas.push({
-                node: rangeInfos.startNode,
-                beforeWasSplit: true,
-                afterWasSplit: false
-              });
-            } else {
-              //whole node should be highlighted
-              isWrapping = true;
-              splitDatas.push({
-                node: currentNode,
-                beforeWasSplit: false,
-                afterWasSplit: false
-              });
+            if (rangeInfos.endNode === currentNode) {
+              internalRange.setEnd(currentNode, rangeInfos.endOffset);
             }
-          }
 
-          if (currentNode.isSameNode(rangeInfos.endNode) && isText(rangeInfos.endNodeContainer)) {
-            if (rangeInfos.endOffset !== 0) {
-              if (rangeInfos.endOffset < currentNode.textContent.length) {
-                //start of node should be highlighted
-                currentNode.splitText(rangeInfos.endOffset);
+            var isNodeInRange = rangeInfos.commonRange.isPointInRange(currentNode, internalRange.endOffset); // Apply new highlighting color only for selected nodes
+
+            if (isNodeInRange) {
+              isWrapping = true;
+              highlightContainerNodes(currentNode, className, internalRange, currentGroupId);
+            }
+          } else {
+            // split current node in case the wrapping start/ends on a partially selected text node
+            if (currentNode.isSameNode(rangeInfos.startNode)) {
+              if (isText(rangeInfos.startNodeContainer) && rangeInfos.startOffset !== 0) {
+                // we defer the wrapping to the next iteration of the loop
+                //end of node should be highlighted
+                rangeInfos.startNode = currentNode.splitText(rangeInfos.startOffset);
+                rangeInfos.startOffset = 0;
                 splitDatas.push({
-                  node: currentNode,
-                  beforeWasSplit: false,
-                  afterWasSplit: true
+                  node: rangeInfos.startNode,
+                  beforeWasSplit: true,
+                  afterWasSplit: false
                 });
               } else {
                 //whole node should be highlighted
+                isWrapping = true;
                 splitDatas.push({
                   node: currentNode,
                   beforeWasSplit: false,
                   afterWasSplit: false
                 });
               }
-            } else {
-              isWrapping = false;
             }
-          } // wrap the current node...
-
 
-          if (isText(currentNode)) {
-            if (!keepEmptyNodes) {
-              wrapTextNode(currentNode, currentGroupId);
-            } else if (willHighlightNotBeEmptyAfterMerge(currentNode)) {
-              var wrapperNode = wrapTextNode(currentNode, currentGroupId);
-
-              if (wrapperNode) {
-                var splitData = splitDatas.find(function (d) {
-                  return d.node === currentNode;
-                });
-                addSplitData(wrapperNode, splitData ? splitData.beforeWasSplit : false, splitData ? splitData.afterWasSplit : false);
+            if (currentNode.isSameNode(rangeInfos.endNode) && isText(rangeInfos.endNodeContainer)) {
+              if (rangeInfos.endOffset !== 0) {
+                if (rangeInfos.endOffset < currentNode.textContent.length) {
+                  //start of node should be highlighted
+                  currentNode.splitText(rangeInfos.endOffset);
+                  splitDatas.push({
+                    node: currentNode,
+                    beforeWasSplit: false,
+                    afterWasSplit: true
+                  });
+                } else {
+                  //whole node should be highlighted
+                  splitDatas.push({
+                    node: currentNode,
+                    beforeWasSplit: false,
+                    afterWasSplit: false
+                  });
+                }
+              } else {
+                isWrapping = false;
+              }
+            } // wrap the current node...
+
+
+            if (isText(currentNode)) {
+              if (!keepEmptyNodes) {
+                wrapTextNode(currentNode, currentGroupId);
+              } else if (willHighlightNotBeEmptyAfterMerge(currentNode)) {
+                var wrapperNode = wrapTextNode(currentNode, currentGroupId);
+
+                if (wrapperNode) {
+                  var splitData = splitDatas.find(function (d) {
+                    return d.node === currentNode;
+                  });
+                  addSplitData(wrapperNode, splitData ? splitData.beforeWasSplit : false, splitData ? splitData.afterWasSplit : false);
+                }
+              } // ... or continue deeper in the node tree
+
+            } else if (isElement(currentNode)) {
+              //some selections end at the very start of the next node, we should end wrapping when we reach such node
+              if (!currentNode.isSameNode(rangeInfos.endNode) || rangeInfos.endOffset > 0) {
+                wrapTextNodesInRange(currentNode, rangeInfos);
               }
-            } // ... or continue deeper in the node tree
-
-          } else if (isElement(currentNode)) {
-            //some selections end at the very start of the next node, we should end wrapping when we reach such node
-            if (!currentNode.isSameNode(rangeInfos.endNode) || rangeInfos.endOffset > 0) {
-              wrapTextNodesInRange(currentNode, rangeInfos);
             }
           }
         } // end wrapping ?
@@ -794,7 +804,7 @@ define(['lodash', 'jquery'], function (_, $) { 'use strict';
 
     /**
      * For `keepEmptyNodes` option, creates data model of highlights.
-     * Additionally returns array of hilghlight nodes. Traverses DOM tree.
+     * Additionally returns array of highlight nodes. Traverses DOM tree.
      * @param {Node} rootNode
      * @returns {BuildModelResultKeepEmpty|null} result
      */
@@ -805,7 +815,9 @@ define(['lodash', 'jquery'], function (_, $) { 'use strict';
       var wrapperNodesSelector = classNames.map(function (cls) {
         return containerSelector + ' .' + cls;
       }).join(', ');
-      var wrapperNodes = document.querySelectorAll(wrapperNodesSelector);
+      var wrapperNodes = Array.from(document.querySelectorAll(wrapperNodesSelector)).filter(function (node) {
+        return !isBlacklisted(node);
+      });
 
       if (!wrapperNodes.length) {
         return null;

package/dist/resourcemgr/fileBrowser.js

@@ -304,12 +304,18 @@ define(['jquery', 'lodash', 'core/request', 'ui/pagination', 'handlebars', 'i18n
         $rootNode.addClass('opened');
       }
 
-      updateFolders(content, $innerList); //internal event to set the file-selector content
+      updateFolders(content, $innerList);
 
-      $$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]);
-      renderPagination();
+      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]);
+        renderPagination();
+
+        if (root !== 'local') {
+          options.hasAlreadySelected = true;
+        }
+      }
     }); // by clicking on the tree (using a live binding  because content is not complete yet)
 
     $divContainer.off('click', '.folders a').on('click', '.folders a', function (e) {

package/package.json

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

package/scss/inc/_forms.scss

@@ -25,10 +25,6 @@ label, .form_desc {
     margin-bottom: 5px;
     padding-right: 10px;
 
-    [dir="rtl"] & {
-        padding-right: 0;
-        padding-left: 10px;
-    }
     abbr {
         color: $info;
         border-bottom: none;
@@ -219,18 +215,9 @@ label, .form_desc {
         margin: 0;
         left: 0;
 
-        [dir="rtl"] & {
-            left: auto;
-            right: 0;
-        }
         & + div {
             cursor: pointer;
             margin-left: 24px;
-
-            [dir="rtl"] & {
-                margin-left: 0;
-                margin-right: 24px;
-            }
         }
     }
     abbr {
@@ -416,17 +403,11 @@ label {
         }
         &:before {
             z-index: 3;
-            [dir="rtl"] & {
-                right: -1em;
-            }
         }
         &:after {
             position: relative;
             z-index: 2;
             left: -1em;
-            [dir="rtl"] & {
-                left: auto;
-            }
         }
     }
     input[type="radio"],
@@ -710,14 +691,11 @@ label {
         width: 35%;
         display:inline-block;
         padding: 0 10px 0 0;
+        vertical-align: top;
 
-        [dir="rtl"] & {
-            padding: 0 0 0 10px;
-        }
         &.hidden-input-label {
             width: auto;
         }
-        vertical-align: top;
 
         & ~ .form-elt-container {
             display: inline-block;

package/src/datatable.js

@@ -355,6 +355,9 @@ const dataTable = {
 
         $.ajax(ajaxConfig)
             .done(function (response) {
+                if($elt && typeof $elt.data(dataNs) !== 'object'){
+                    return $elt.trigger(`error.${ns}`, [new Error(`Unable to load data attached to the element`)]);
+                }
                 self._render($elt, response);
             })
             .fail(function (response, option, err) {
@@ -380,6 +383,10 @@ const dataTable = {
     _render($elt, dataset = {}) {
         const self = this;
         let options = _.cloneDeep($elt.data(dataNs));
+        if(typeof options === 'undefined') {
+            return $elt.trigger(`error.${ns}`, [new Error(`Unable to load data attached to the element`)]);
+        }
+
         const model = [];
         let $massActionBtns = $();
 

package/src/highlighter.js

@@ -106,11 +106,13 @@ export default function (options) {
     }
 
     /**
-     * Returns all highlighted nodes
+     * Returns all highlighted nodes, excluding any inside blacklisted elements
      * @returns {JQuery<HTMLElement>}
      */
     function getHighlightedNodes() {
-        return $(containerSelector).find(`.${highlightingClasses.join(',.')}`);
+        return $(containerSelector)
+            .find(`.${highlightingClasses.join(',.')}`)
+            .filter((i, node) => !isBlacklisted(node));
     }
 
     /**
@@ -242,80 +244,87 @@ export default function (options) {
             }
             currentNode = childNodes[i];
 
-            const isCurrentNodeTextInsideOfAnotherHighlightingWrapper =
-                isText(currentNode) &&
-                isWrappingNode(currentNode.parentNode) &&
-                currentNode.parentNode.className !== className;
+            if (isBlacklisted(currentNode)) {
+                if (isElement(currentNode)) {
+                    //go deeper in case a descendant of the current blacklisted is whitelisted
+                    wrapTextNodesInRange(currentNode, rangeInfos);
+                }
+            } else {
+                const isCurrentNodeTextInsideOfAnotherHighlightingWrapper =
+                    isText(currentNode) &&
+                    isWrappingNode(currentNode.parentNode) &&
+                    currentNode.parentNode.className !== className;
 
-            if (isCurrentNodeTextInsideOfAnotherHighlightingWrapper) {
-                const internalRange = new Range();
-                internalRange.selectNodeContents(currentNode);
+                if (isCurrentNodeTextInsideOfAnotherHighlightingWrapper) {
+                    const internalRange = new Range();
+                    internalRange.selectNodeContents(currentNode);
 
-                if (rangeInfos.startNode === currentNode) {
-                    internalRange.setStart(currentNode, rangeInfos.startOffset);
-                }
+                    if (rangeInfos.startNode === currentNode) {
+                        internalRange.setStart(currentNode, rangeInfos.startOffset);
+                    }
 
-                if (rangeInfos.endNode === currentNode) {
-                    internalRange.setEnd(currentNode, rangeInfos.endOffset);
-                }
+                    if (rangeInfos.endNode === currentNode) {
+                        internalRange.setEnd(currentNode, rangeInfos.endOffset);
+                    }
 
-                const isNodeInRange = rangeInfos.commonRange.isPointInRange(currentNode, internalRange.endOffset);
+                    const isNodeInRange = rangeInfos.commonRange.isPointInRange(currentNode, internalRange.endOffset);
 
-                // Apply new highlighting color only for selected nodes
-                if (isNodeInRange) {
-                    isWrapping = true;
-                    highlightContainerNodes(currentNode, className, internalRange, currentGroupId);
-                }
-            } else {
-                // split current node in case the wrapping start/ends on a partially selected text node
-                if (currentNode.isSameNode(rangeInfos.startNode)) {
-                    if (isText(rangeInfos.startNodeContainer) && rangeInfos.startOffset !== 0) {
-                        // we defer the wrapping to the next iteration of the loop
-                        //end of node should be highlighted
-                        rangeInfos.startNode = currentNode.splitText(rangeInfos.startOffset);
-                        rangeInfos.startOffset = 0;
-                        splitDatas.push({ node: rangeInfos.startNode, beforeWasSplit: true, afterWasSplit: false });
-                    } else {
-                        //whole node should be highlighted
+                    // Apply new highlighting color only for selected nodes
+                    if (isNodeInRange) {
                         isWrapping = true;
-                        splitDatas.push({ node: currentNode, beforeWasSplit: false, afterWasSplit: false });
+                        highlightContainerNodes(currentNode, className, internalRange, currentGroupId);
                     }
-                }
-
-                if (currentNode.isSameNode(rangeInfos.endNode) && isText(rangeInfos.endNodeContainer)) {
-                    if (rangeInfos.endOffset !== 0) {
-                        if (rangeInfos.endOffset < currentNode.textContent.length) {
-                            //start of node should be highlighted
-                            currentNode.splitText(rangeInfos.endOffset);
-                            splitDatas.push({ node: currentNode, beforeWasSplit: false, afterWasSplit: true });
+                } else {
+                    // split current node in case the wrapping start/ends on a partially selected text node
+                    if (currentNode.isSameNode(rangeInfos.startNode)) {
+                        if (isText(rangeInfos.startNodeContainer) && rangeInfos.startOffset !== 0) {
+                            // we defer the wrapping to the next iteration of the loop
+                            //end of node should be highlighted
+                            rangeInfos.startNode = currentNode.splitText(rangeInfos.startOffset);
+                            rangeInfos.startOffset = 0;
+                            splitDatas.push({ node: rangeInfos.startNode, beforeWasSplit: true, afterWasSplit: false });
                         } else {
                             //whole node should be highlighted
+                            isWrapping = true;
                             splitDatas.push({ node: currentNode, beforeWasSplit: false, afterWasSplit: false });
                         }
-                    } else {
-                        isWrapping = false;
                     }
-                }
 
-                // wrap the current node...
-                if (isText(currentNode)) {
-                    if (!keepEmptyNodes) {
-                        wrapTextNode(currentNode, currentGroupId);
-                    } else if (willHighlightNotBeEmptyAfterMerge(currentNode)) {
-                        const wrapperNode = wrapTextNode(currentNode, currentGroupId);
-                        if (wrapperNode) {
-                            const splitData = splitDatas.find(d => d.node === currentNode);
-                            addSplitData(wrapperNode,
-                                splitData ? splitData.beforeWasSplit : false,
-                                splitData ? splitData.afterWasSplit : false);
+                    if (currentNode.isSameNode(rangeInfos.endNode) && isText(rangeInfos.endNodeContainer)) {
+                        if (rangeInfos.endOffset !== 0) {
+                            if (rangeInfos.endOffset < currentNode.textContent.length) {
+                                //start of node should be highlighted
+                                currentNode.splitText(rangeInfos.endOffset);
+                                splitDatas.push({ node: currentNode, beforeWasSplit: false, afterWasSplit: true });
+                            } else {
+                                //whole node should be highlighted
+                                splitDatas.push({ node: currentNode, beforeWasSplit: false, afterWasSplit: false });
+                            }
+                        } else {
+                            isWrapping = false;
                         }
                     }
 
-                    // ... or continue deeper in the node tree
-                } else if (isElement(currentNode)) {
-                    //some selections end at the very start of the next node, we should end wrapping when we reach such node
-                    if (!currentNode.isSameNode(rangeInfos.endNode) || rangeInfos.endOffset > 0) {
-                        wrapTextNodesInRange(currentNode, rangeInfos);
+                    // wrap the current node...
+                    if (isText(currentNode)) {
+                        if (!keepEmptyNodes) {
+                            wrapTextNode(currentNode, currentGroupId);
+                        } else if (willHighlightNotBeEmptyAfterMerge(currentNode)) {
+                            const wrapperNode = wrapTextNode(currentNode, currentGroupId);
+                            if (wrapperNode) {
+                                const splitData = splitDatas.find(d => d.node === currentNode);
+                                addSplitData(wrapperNode,
+                                    splitData ? splitData.beforeWasSplit : false,
+                                    splitData ? splitData.afterWasSplit : false);
+                            }
+                        }
+
+                        // ... or continue deeper in the node tree
+                    } else if (isElement(currentNode)) {
+                        //some selections end at the very start of the next node, we should end wrapping when we reach such node
+                        if (!currentNode.isSameNode(rangeInfos.endNode) || rangeInfos.endOffset > 0) {
+                            wrapTextNodesInRange(currentNode, rangeInfos);
+                        }
                     }
                 }
             }
@@ -796,14 +805,15 @@ export default function (options) {
      */
     /**
      * For `keepEmptyNodes` option, creates data model of highlights.
-     * Additionally returns array of hilghlight nodes. Traverses DOM tree.
+     * Additionally returns array of highlight nodes. Traverses DOM tree.
      * @param {Node} rootNode
      * @returns {BuildModelResultKeepEmpty|null} result
      */
     function buildHighlightModelKeepEmpty(rootNode) {
         const classNames = options.colors ? Object.values(options.colors) : [className];
         const wrapperNodesSelector = classNames.map(cls => containerSelector + ' .' + cls).join(', ');
-        const wrapperNodes = document.querySelectorAll(wrapperNodesSelector);
+        const wrapperNodes = Array.from(document.querySelectorAll(wrapperNodesSelector))
+            .filter(node => !isBlacklisted(node));
 
         if (!wrapperNodes.length) {
             return null;

package/src/resourcemgr/fileBrowser.js

@@ -53,11 +53,17 @@ export default function (options) {
             $rootNode.addClass('opened');
         }
         updateFolders(content, $innerList);
-        //internal event to set the file-selector content
-        $('.file-browser').find('li.active').removeClass('active');
-        updateSelectedClass(content.path, content.total, content.childrenLimit);
-        $container.trigger(`folderselect.${ns}`, [content.label, getPage(content.children), content.path]);
-        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;
+          }
+      }
     });
 
     // by clicking on the tree (using a live binding  because content is not complete yet)