@oat-sa/tao-core-ui 1.48.0 → 1.49.3

package/dist/uploader.js

@@ -12,17 +12,11 @@ define(['jquery', 'lodash', 'i18n', 'async', 'core/pluginifier', 'util/bytes', '
   function _typeof(obj) {
     "@babel/helpers - typeof";
 
-    if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-      _typeof = function (obj) {
-        return typeof obj;
-      };
-    } else {
-      _typeof = function (obj) {
-        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-      };
-    }
-
-    return _typeof(obj);
+    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+      return typeof obj;
+    } : function (obj) {
+      return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    }, _typeof(obj);
   }
 
   function Helpers0 (hb) {

package/dist/validator.js

@@ -8,17 +8,11 @@ define(['jquery', 'lodash', 'ui/validator/Report', 'ui/validator/Validator'], fu
   function _typeof(obj) {
     "@babel/helpers - typeof";
 
-    if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-      _typeof = function (obj) {
-        return typeof obj;
-      };
-    } else {
-      _typeof = function (obj) {
-        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-      };
-    }
-
-    return _typeof(obj);
+    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+      return typeof obj;
+    } : function (obj) {
+      return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    }, _typeof(obj);
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "1.48.0",
+    "version": "1.49.3",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {
@@ -51,7 +51,7 @@
         "@oat-sa/rollup-plugin-wildcard-external": "^0.1.0",
         "@oat-sa/tao-core-libs": "^0.4.4",
         "@oat-sa/tao-core-sdk": "^1.8.1",
-        "@oat-sa/tao-core-shared-libs": "1.0.0",
+        "@oat-sa/tao-core-shared-libs": "^1.0.5",
         "@oat-sa/tao-qunit-testrunner": "^1.0.3",
         "async": "^0.2.10",
         "autoprefixer": "^9.5.1",
@@ -61,7 +61,6 @@
         "dompurify": "^1.0.10",
         "eslint": "^7.32.0",
         "eslint-plugin-jsdoc": "^36.1.0",
-        "eve": "git+https://github.com/adobe-webplatform/eve.git#eef80ed",
         "flatpickr": "4.5.7",
         "fs-extra": "^8.0.1",
         "gamp": "^0.2.1",

package/src/ckeditor/ckConfigurator.js

@@ -13,7 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2015 (original work) Open Assessment Technologies SA ;
+ * Copyright (c) 2015-2022 (original work) Open Assessment Technologies SA ;
  */
 import $ from 'jquery';
 import _ from 'lodash';
@@ -23,23 +23,23 @@ import 'ckeditor';
 /**
  * Cache original config
  */
-var originalConfig = _.cloneDeep(window.CKEDITOR.config);
+const originalConfig = _.cloneDeep(window.CKEDITOR.config);
 
 function getUserLanguage() {
-    var documentLang = window.document.documentElement.getAttribute('lang');
-    var documentLocale = documentLang && documentLang.split('-')[0];
+    const documentLang = window.document.documentElement.getAttribute('lang');
+    const documentLocale = documentLang && documentLang.split('-')[0];
 
     return documentLocale;
 }
 
-var lang = getUserLanguage();
+const lang = getUserLanguage();
 
-var ckConfigurator = (function() {
+const ckConfigurator = (function () {
     /**
      * Toolbar presets that you normally never would need to change, they can however be overridden with options.toolbar.
      * The argument 'toolbarType' determines which toolbar to use
      */
-    var toolbarPresets = {
+    const toolbarPresets = {
         inline: [
             {
                 name: 'basicstyles',
@@ -166,13 +166,31 @@ var ckConfigurator = (function() {
                 name: 'insert',
                 items: ['Link', 'SpecialChar']
             }
+        ],
+        table: [
+            {
+                name: 'basicstyles',
+                items: ['Bold', 'Italic', 'Subscript', 'Superscript']
+            },
+            {
+                name: 'insert',
+                items: ['SpecialChar', 'TaoQtiTable', 'TaoTooltip']
+            },
+            {
+                name: 'links',
+                items: ['Link']
+            },
+            {
+                name: 'paragraph',
+                items: ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock']
+            }
         ]
     };
 
     /**
      * defaults for editor configuration
      */
-    var ckConfig = {
+    const ckConfigDefault = {
         disableAutoInline: true,
         entities: false,
         entities_processNumerical: true,
@@ -416,11 +434,11 @@ var ckConfigurator = (function() {
     /**
      * Insert positioned plugins at position specified in options.positionedPlugins
      *
-     * @param ckConfig
-     * @param positionedPlugins
+     * @param {Object} ckConfig
+     * @param {Object} positionedPlugins
      */
-    var _updatePlugins = function(ckConfig, positionedPlugins) {
-        var itCnt,
+    const _updatePlugins = function (ckConfig, positionedPlugins) {
+        let itCnt,
             tbCnt = ckConfig.toolbar.length,
             itLen,
             method,
@@ -435,9 +453,9 @@ var ckConfigurator = (function() {
         positionedPlugins = positionedPlugins || {};
 
         // add positioned plugins to extraPlugins and let CKEDITOR take care of their registration
-        ckConfig.extraPlugins = (function(positionedPluginArr, extraPlugins) {
-            var pluginIndex = positionedPluginArr.length;
-            var extraPluginArr = extraPlugins.split(',');
+        ckConfig.extraPlugins = (function (positionedPluginArr, extraPlugins) {
+            let pluginIndex = positionedPluginArr.length;
+            let extraPluginArr = extraPlugins.split(',');
 
             while (pluginIndex--) {
                 positionedPluginArr[pluginIndex] = positionedPluginArr[pluginIndex].toLowerCase();
@@ -460,8 +478,8 @@ var ckConfigurator = (function() {
 
         // add positioned plugins to toolbar
         for (plugin in positionedPlugins) {
-            method = (function(pluginProps) {
-                var propIndex = pluginProps.length;
+            method = (function (pluginProps) {
+                let propIndex = pluginProps.length;
                 while (propIndex--) {
                     if (pluginProps[propIndex].indexOf('insert') === 0 || pluginProps[propIndex] === 'replace') {
                         return pluginProps[propIndex];
@@ -511,7 +529,7 @@ var ckConfigurator = (function() {
         }
     };
 
-    var _switchDtd = function _switchDtd(dtdMode) {
+    const _switchDtd = function _switchDtd(dtdMode) {
         dtdHandler.setMode(dtdMode);
         window.CKEDITOR.dtd = dtdHandler.getDtd();
     };
@@ -536,13 +554,13 @@ var ckConfigurator = (function() {
      *
      * @see http://docs.ckeditor.com/#!/api/CKEDITOR.config
      */
-    var getConfig = function(editor, toolbarType, options) {
-        var toolbar, toolbars, config, dtdMode;
+    const getConfig = function (editor, toolbarType, options) {
+        let toolbar, toolbars, config, dtdMode;
 
         // This is different from CKEDITOR.config.extraPlugins since it also allows to position the button
         // Valid positioning keys are insertAfter | insertBefore | replace followed by the button name, e.g. 'Anchor'
         // separator bool, defaults to false
-        var positionedPlugins = {};
+        let positionedPlugins = {};
 
         if (toolbarType === 'reset') {
             return originalConfig;
@@ -555,6 +573,8 @@ var ckConfigurator = (function() {
         toolbars = _.clone(toolbarPresets, true);
         dtdMode = options.dtdMode || 'html';
 
+        const ckConfig = _.clone(ckConfigDefault, true);
+
         // modify DTD to either comply with QTI or XHTML
         if (dtdMode === 'qti' || toolbarType.indexOf('qti') === 0) {
             toolbarType = toolbarType.slice(3).toLowerCase();
@@ -597,7 +617,7 @@ var ckConfigurator = (function() {
 
         // add toolbars to config
         for (toolbar in toolbars) {
-            if (toolbars.hasOwnProperty(toolbar)) {
+            if (Object.prototype.hasOwnProperty.call(toolbars, toolbar)) {
                 ckConfig['toolbar_' + toolbar] = toolbars[toolbar];
             }
         }
@@ -640,7 +660,7 @@ var ckConfigurator = (function() {
 
         // toggle global DTD depending on the CK instance which is receiving the focus
         // I know that this is rather ugly <= don't worry, we'll keep this a secret ;)
-        editor.on('focus', function() {
+        editor.on('focus', function () {
             _switchDtd(dtdMode);
             // should be 1 on html, undefined on qti
             // console.log(CKEDITOR.dtd.pre.img)
@@ -648,13 +668,13 @@ var ckConfigurator = (function() {
 
         // remove title 'Rich Text Editor, instance n' that CKE sets by default
         // ref: http://tinyurl.com/keedruc
-        editor.on('instanceReady', function(e) {
+        editor.on('instanceReady', function (e) {
             $(e.editor.element.$).removeAttr('title');
         });
 
         // This fixes bug #2855. Unfortunately this can be done on the global object only, not on the instance
-        window.CKEDITOR.on('dialogDefinition', function(e) {
-            var linkTypes, wanted, linkIndex;
+        window.CKEDITOR.on('dialogDefinition', function (e) {
+            let linkTypes, wanted, linkIndex;
 
             if (e.data.name !== 'link') {
                 return;

package/src/image/ImgStateActive/initHelper.js

@@ -85,7 +85,7 @@ export const initUpload = function (widget) {
                         cancel = confirmBox.find('.cancel');
                         save = confirmBox.find('.save');
 
-                        $('.alt-text', confirmBox).html(`"${$alt.val()}"<br>with<br>"${alt}" ?`);
+                        $('.alt-text', confirmBox).html(`"${$alt.val()}"<br>${__('with')}<br>"${alt}" ?`);
 
                         confirmBox.modal({ width: 500 });
 

package/src/maths/calculator/core/labels.js

@@ -98,8 +98,8 @@ export default {
     ASINH: __('sinh') + '<sup>\u207B1</sup>',
     ACOSH: __('cosh') + '<sup>\u207B1</sup>',
     ATANH: __('tanh') + '<sup>\u207B1</sup>',
-    LN: __('ln'),
-    LOG: __('log') + '<sub>10</sub>',
+    LN: 'ln',
+    LOG: 'log<sub>10</sub>',
     ABS: __('abs'),
     RAND: __('random'),
 

package/src/searchModal/advancedSearch.js

@@ -18,7 +18,6 @@
 
 import $ from 'jquery';
 import _ from 'lodash';
-import __ from 'i18n';
 import context from 'context';
 import advancedSearchTpl from 'ui/searchModal/tpl/advanced-search';
 import textCriterionTpl from 'ui/searchModal/tpl/text-criterion';
@@ -99,7 +98,7 @@ export default function advancedSearchFactory(config) {
             $advancedCriteriaContainer.empty();
             _.forEach(criteriaState, criterion => {
                 criterion.rendered = false;
-                criterion.value = undefined;
+                criterion.value = null;
             });
         },
         /**
@@ -154,6 +153,17 @@ export default function advancedSearchFactory(config) {
         $advancedCriteriaContainer.on('scroll', _.throttle(animateScroll, 100));
     }
 
+    /**
+     * Lookup for characters in text to highlight
+     * @param {String} text - text to lookup
+     * @param {String} highlight - character(s) to be highlighted
+     * @param {regExp|String} match - match to be applied in the text
+     * @returns {String} - highlighted text
+     */
+    function highlightCharacter(text, highlight, match) {
+        return text.replace(match, `<b>${highlight}</b>`);
+    }
+
     /**
      * Inits select2 on criteria select and its UX logic
      */
@@ -174,8 +184,18 @@ export default function advancedSearchFactory(config) {
                     escapeMarkup: function(markup) {
                         return markup;
                     },
-                    formatResult: function formatResult(result, container, query, escapedMarkup) {
-                        return result.text;
+                    formatResult: function formatResult(result, container, query) {
+                        const label = result.element[0].getAttribute('label');
+                        const sublabel = result.element[0].getAttribute('sublabel');
+                        const match = new RegExp(query.term, 'ig');
+                        let template = highlightCharacter(label, query.term, match);
+
+                        // Add sublabel
+                        if(sublabel && sublabel.length) {
+                            template = template + `<span class="class-path"> / ${highlightCharacter(sublabel, query.term, match)}</span>`;
+                        }
+
+                        return template;
                     }
                 });
 
@@ -209,12 +229,12 @@ export default function advancedSearchFactory(config) {
     /**
      * inits criteriaState loading it from the store (if present) or empty object.
      * If there is a stored criteriaState, those criteria that were rendered
-     * but with undefined value are updated to not being rendered
+     * but with null value are updated to not being rendered
      */
     function initCriteriaState() {
         if (instance.config.advancedCriteria) {
             _.forEach(instance.config.advancedCriteria, criterion => {
-                if (criterion.rendered === true && criterion.value === undefined) {
+                if (criterion.rendered === true && criterion.value === null) {
                     criterion.rendered = false;
                 }
             });
@@ -304,7 +324,7 @@ export default function advancedSearchFactory(config) {
                         };
                     },
                     results: (response) => ({
-                          results: response.data.map(option => ({ id: valueMapping === 'uri' ? option.uri : option.label, text: option.label }))
+                        results: response.data.map(option => ({ id: valueMapping === 'uri' ? option.uri : option.label, text: option.label }))
                     })
                 },
                 initSelection: function (element, callback) {
@@ -341,14 +361,14 @@ export default function advancedSearchFactory(config) {
                 return criterion.value.map(v => ({
                     id: v,
                     text: (data.find(d => d.uri === v) || {}).label
-                }))
+                }));
             }
-            let c = (data.find(d => d.uri === criterion.value) || {})
+            let c = (data.find(d => d.uri === criterion.value) || {});
             return {
                 text: c.label,
                 id: criterion.value,
-            }
-        })
+            };
+        });
     }
 
     /**
@@ -363,7 +383,7 @@ export default function advancedSearchFactory(config) {
                 $('input', $criterionContainer).val(criterion.value);
                 // set event to bind input value to critariaState
                 $('input', $criterionContainer).on('change', function () {
-                    criterion.value = $(this).val() || undefined;
+                    criterion.value = $(this).val() || null;
                 });
             } else if (criterion.type === criteriaTypes.list && criterion.uri) {
                 // set initial value
@@ -409,7 +429,7 @@ export default function advancedSearchFactory(config) {
 
         // reset criterion values on criteriaState
         criteriaState[criterionKey].rendered = false;
-        criteriaState[criterionKey].value = undefined;
+        criteriaState[criterionKey].value = null;
 
         // check if advanced criteria container is no longer scrollable
         if ($advancedCriteriaContainer.get(0).scrollHeight <= $advancedCriteriaContainer.outerHeight()) {
@@ -520,7 +540,7 @@ export default function advancedSearchFactory(config) {
                 // if new criterion was not on criteriaState we add it
                 criteriaState[criteriaStateId] = criterion;
                 criteriaState[criteriaStateId].rendered = false;
-                criteriaState[criteriaStateId].value = undefined;
+                criteriaState[criteriaStateId].value = null;
             }
 
             // create new option element to criteria select
@@ -531,18 +551,33 @@ export default function advancedSearchFactory(config) {
     }
 
     /**
+     * Creates a new option element
+     * with attributes to use in select2 markup
      * @param {Object} criterion
-     * @returns Option
+     * @returns {HTMLOptionElement} Single option criteria
      */
     function createCriteriaOption(criterion) {
-        const infoText = criterion.isDuplicated ? ` <span class="class-path">/${criterion.class.label}</span>` : '';
+        let label = criterion.label;
+        let sublabel = '';
+        let option;
+        let optionText = label;
+
+        if(criterion.isDuplicated) {
+            sublabel = criterion.class.label;
+            optionText = `${label} / ${sublabel}`;
+        }
 
-        return new Option(
-            criterion.label + infoText,
+        option = new Option(
+            optionText,
             getCriterionStateId(criterion),
             false,
             false
         );
+
+        option.setAttribute('label', label);
+        option.setAttribute('sublabel', sublabel);
+
+        return option;
     }
 
     /**