@oat-sa/tao-core-ui 1.49.0 → 1.49.4

package/dist/image/ImgStateActive/initHelper.js

@@ -254,7 +254,7 @@ define(['exports', 'jquery', 'lodash', 'i18n', 'core/mimetype', 'ui/mediaEditor/
                 confirmBox = $('.change-alt-modal-feedback', $form);
                 cancel = confirmBox.find('.cancel');
                 save = confirmBox.find('.save');
-                $('.alt-text', confirmBox).html("\"".concat($alt.val(), "\"<br>with<br>\"").concat(alt, "\" ?"));
+                $('.alt-text', confirmBox).html("\"".concat($alt.val(), "\"<br>").concat(__('with'), "<br>\"").concat(alt, "\" ?"));
                 confirmBox.modal({
                   width: 500
                 });

package/dist/image/ImgStateActive.js

@@ -255,7 +255,7 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'modul
                 confirmBox = $('.change-alt-modal-feedback', $form);
                 cancel = confirmBox.find('.cancel');
                 save = confirmBox.find('.save');
-                $('.alt-text', confirmBox).html("\"".concat($alt.val(), "\"<br>with<br>\"").concat(alt, "\" ?"));
+                $('.alt-text', confirmBox).html("\"".concat($alt.val(), "\"<br>").concat(__('with'), "<br>\"").concat(alt, "\" ?"));
                 confirmBox.modal({
                   width: 500
                 });

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

@@ -239,8 +239,8 @@ define(['i18n', 'handlebars', 'lodash', 'lib/dompurify/purify'], function (__, H
     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'),
     // Actions

package/dist/searchModal/advancedSearch.js

@@ -1,10 +1,9 @@
-define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/purify', 'css!ui/searchModal/css/advancedSearch.css', 'ui/component', 'ui/modal', 'ui/datatable', 'select2', 'util/url', 'core/dataProvider/request'], function ($$1, _, __, context, Handlebars, DOMPurify, advancedSearch_css, component, modal, datatable, select2, urlUtil, request) { 'use strict';
+define(['jquery', 'lodash', 'handlebars', 'i18n', 'lib/dompurify/purify', 'css!ui/searchModal/css/advancedSearch.css', 'ui/component', 'ui/modal', 'ui/datatable', 'select2', 'util/url', 'core/dataProvider/request'], function ($$1, _, Handlebars, __, DOMPurify, advancedSearch_css, component, modal, datatable, select2, urlUtil, request) { 'use strict';
 
   $$1 = $$1 && Object.prototype.hasOwnProperty.call($$1, 'default') ? $$1['default'] : $$1;
   _ = _ && Object.prototype.hasOwnProperty.call(_, 'default') ? _['default'] : _;
-  __ = __ && Object.prototype.hasOwnProperty.call(__, 'default') ? __['default'] : __;
-  context = context && Object.prototype.hasOwnProperty.call(context, 'default') ? context['default'] : context;
   Handlebars = Handlebars && Object.prototype.hasOwnProperty.call(Handlebars, 'default') ? Handlebars['default'] : Handlebars;
+  __ = __ && Object.prototype.hasOwnProperty.call(__, 'default') ? __['default'] : __;
   DOMPurify = DOMPurify && Object.prototype.hasOwnProperty.call(DOMPurify, 'default') ? DOMPurify['default'] : DOMPurify;
   component = component && Object.prototype.hasOwnProperty.call(component, 'default') ? component['default'] : component;
   urlUtil = urlUtil && Object.prototype.hasOwnProperty.call(urlUtil, 'default') ? urlUtil['default'] : urlUtil;
@@ -339,6 +338,7 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
    * @param {object} config
    * @param {object} config.renderTo - DOM element where component will be rendered to
    * @param {string} config.advancedCriteria - advanced criteria to be set on component creation
+   * @param {string} config.rootClassUri - rootClassUri to check for whitelist sections
    * @returns {advancedSearch}
    */
 
@@ -403,7 +403,7 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
 
         _.forEach(criteriaState, function (criterion) {
           criterion.rendered = false;
-          criterion.value = undefined;
+          criterion.value = null;
         });
       },
 
@@ -458,6 +458,18 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
       $advancedCriteriaContainer = $$1('.advanced-criteria-container', $container);
       $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>".concat(highlight, "</b>"));
+    }
     /**
      * Inits select2 on criteria select and its UX logic
      */
@@ -466,7 +478,7 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
     function initAddCriteriaSelector() {
       var route = urlUtil.route('status', 'AdvancedSearch', 'tao');
       return request(route).then(function (response) {
-        if (!response.enabled || context.shownStructure === 'results') {
+        if (!response.enabled || response.whitelist.includes(config.rootClassUri)) {
           isAdvancedSearchStatusEnabled = false;
           return;
         }
@@ -482,8 +494,17 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
           escapeMarkup: function escapeMarkup(markup) {
             return markup;
           },
-          formatResult: function formatResult(result, container, query, escapedMarkup) {
-            return result.text;
+          formatResult: function formatResult(result, container, query) {
+            var label = result.element[0].getAttribute('label');
+            var sublabel = result.element[0].getAttribute('sublabel');
+            var match = new RegExp(query.term, 'ig');
+            var template = highlightCharacter(label, query.term, match); // Add sublabel
+
+            if (sublabel && sublabel.length) {
+              template = template + "<span class=\"class-path\"> / ".concat(highlightCharacter(sublabel, query.term, match), "</span>");
+            }
+
+            return template;
           }
         }); // open dropdown when user clicks on add criteria input
 
@@ -510,14 +531,14 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
     /**
      * 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, function (criterion) {
-          if (criterion.rendered === true && criterion.value === undefined) {
+          if (criterion.rendered === true && criterion.value === null) {
             criterion.rendered = false;
           }
         });
@@ -693,7 +714,7 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
           $$1('input', $criterionContainer).val(criterion.value); // set event to bind input value to critariaState
 
           $$1('input', $criterionContainer).on('change', function () {
-            criterion.value = $$1(this).val() || undefined;
+            criterion.value = $$1(this).val() || null;
           });
         } else if (criterion.type === criteriaTypes.list && criterion.uri) {
           // set initial value
@@ -738,7 +759,7 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
       $criteriaSelect.append(newOption); // reset criterion values on criteriaState
 
       criteriaState[criterionKey].rendered = false;
-      criteriaState[criterionKey].value = undefined; // check if advanced criteria container is no longer scrollable
+      criteriaState[criterionKey].value = null; // check if advanced criteria container is no longer scrollable
 
       if ($advancedCriteriaContainer.get(0).scrollHeight <= $advancedCriteriaContainer.outerHeight()) {
         $advancedCriteriaContainer.removeClass('scrollable');
@@ -854,7 +875,7 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
           // 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
 
 
@@ -864,14 +885,28 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
       });
     }
     /**
+     * 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) {
-      var infoText = criterion.isDuplicated ? " <span class=\"class-path\">/".concat(criterion.class.label, "</span>") : '';
-      return new Option(criterion.label + infoText, getCriterionStateId(criterion), false, false);
+      var label = criterion.label;
+      var sublabel = '';
+      var option;
+      var optionText = label;
+
+      if (criterion.isDuplicated) {
+        sublabel = criterion.class.label;
+        optionText = "".concat(label, " / ").concat(sublabel);
+      }
+
+      option = new Option(optionText, getCriterionStateId(criterion), false, false);
+      option.setAttribute('label', label);
+      option.setAttribute('sublabel', sublabel);
+      return option;
     }
     /**
      * @param {Object} criterion

package/dist/searchModal.js

@@ -246,6 +246,7 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
     var rootClassUri = config.rootClassUri;
     /**
      * Creates search modal, inits template selectors, inits search store, and once is created triggers initial search
+     * rootClassUri is sent to advancedSearch factory for disabling in whitelisted sections
      */
 
     function renderModal() {
@@ -254,7 +255,8 @@ define(['jquery', 'lodash', 'i18n', 'context', 'handlebars', 'lib/dompurify/puri
       initUiSelectors();
       advancedSearch = advancedSearchFactory({
         renderTo: $$1('.filters-container', $container),
-        advancedCriteria: instance.config.criterias.advancedCriteria
+        advancedCriteria: instance.config.criterias.advancedCriteria,
+        rootClassUri: rootClassUri
       });
       promises.push(initClassFilter());
       promises.push(initSearchStore());

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "1.49.0",
+    "version": "1.49.4",
     "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.4",
+        "@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",

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,8 +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';
 import invalidCriteriaWarningTpl from 'ui/searchModal/tpl/invalid-criteria-warning';
@@ -39,6 +37,7 @@ import request from 'core/dataProvider/request';
  * @param {object} config
  * @param {object} config.renderTo - DOM element where component will be rendered to
  * @param {string} config.advancedCriteria - advanced criteria to be set on component creation
+ * @param {string} config.rootClassUri - rootClassUri to check for whitelist sections
  * @returns {advancedSearch}
  */
 export default function advancedSearchFactory(config) {
@@ -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
      */
@@ -161,7 +171,7 @@ export default function advancedSearchFactory(config) {
         const route = urlUtil.route('status', 'AdvancedSearch', 'tao');
         return request(route)
             .then(function (response) {
-                if (!response.enabled || context.shownStructure === 'results') {
+                if (!response.enabled || response.whitelist.includes(config.rootClassUri)) {
                     isAdvancedSearchStatusEnabled = false;
                     return;
                 }
@@ -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;
     }
 
     /**

package/src/searchModal.js

@@ -73,6 +73,7 @@ export default function searchModalFactory(config) {
 
     /**
      * Creates search modal, inits template selectors, inits search store, and once is created triggers initial search
+     * rootClassUri is sent to advancedSearch factory for disabling in whitelisted sections
      */
     function renderModal() {
         const promises = [];
@@ -80,7 +81,8 @@ export default function searchModalFactory(config) {
         initUiSelectors();
         advancedSearch = advancedSearchFactory({
             renderTo: $('.filters-container', $container),
-            advancedCriteria: instance.config.criterias.advancedCriteria
+            advancedCriteria: instance.config.criterias.advancedCriteria,
+            rootClassUri: rootClassUri
         });
         promises.push(initClassFilter());
         promises.push(initSearchStore());