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

package/dist/searchModal/advancedSearch.js

@@ -1,8 +1,7 @@
-define(['jquery', 'lodash', 'context', '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, _, 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'] : _;
-  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;
@@ -339,6 +338,7 @@ define(['jquery', 'lodash', 'context', 'handlebars', 'i18n', '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}
    */
 
@@ -478,7 +478,7 @@ define(['jquery', 'lodash', 'context', 'handlebars', 'i18n', '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;
         }

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.3",
+    "version": "1.49.4",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {

package/src/searchModal/advancedSearch.js

@@ -18,7 +18,6 @@
 
 import $ from 'jquery';
 import _ from 'lodash';
-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';
@@ -38,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) {
@@ -171,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;
                 }

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());