Merge branch 'release-12.3.0'

oat-sa · Feb 1, 2024 · 17d7a11 · 17d7a11
2 parents c48f25c + 2890156
commit 17d7a11
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 21 deletions.
diff --git a/views/js/component/results/areaBroker.js b/views/js/component/results/areaBroker.js
@@ -19,9 +19,8 @@
  * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
  */
 define([
-    'lodash',
     'ui/areaBroker'
-], function (_, areaBroker) {
+], function (areaBroker) {
     'use strict';
 
     var requireAreas = [
@@ -38,5 +37,5 @@ define([
      * @returns {broker} the broker
      * @throws {TypeError} without a valid container
      */
-    return _.partial(areaBroker, requireAreas);
+    return areaBroker.bind(null, requireAreas);
 });
diff --git a/views/js/component/results/list.js b/views/js/component/results/list.js
@@ -58,7 +58,7 @@ define([
             var execStack = [];
 
             _.forEach(plugins, function (plugin) {
-                if (_.isFunction(plugin[method])) {
+                if (typeof plugin[method] === 'function') {
                     execStack.push(plugin[method]());
                 }
             });
@@ -69,10 +69,10 @@ define([
         if (!_.isPlainObject(config)) {
             throw new TypeError('The configuration is required');
         }
-        if (!_.isString(config.classUri) || !config.classUri) {
+        if (typeof config.classUri !== 'string' || !config.classUri) {
             throw new TypeError('The class URI is required');
         }
-        if (!_.isString(config.dataUrl) || !config.dataUrl) {
+        if (typeof config.dataUrl !== 'string' || !config.dataUrl) {
             throw new TypeError('The service URL is required');
         }
         if (!_.isPlainObject(config.model) && !_.isArray(config.model)) {
@@ -117,7 +117,7 @@ define([
                     };
                 }
 
-                if (_.isFunction(action)) {
+                if (typeof action === 'function') {
                     descriptor.action = action;
                 }
                 if (!descriptor.label) {

diff --git a/views/js/controller/inspectResults.js b/views/js/controller/inspectResults.js
@@ -129,7 +129,7 @@ define([
             }).render($('#results-csv-export'));
 
             binder.register('export_csv', function remove(actionContext) {
-                const data = _.pick(actionContext, ['uri', 'classUri', 'id']);
+                const data = (({ uri, classUri, id }) => ({ uri, classUri, id }))(actionContext);
                 const uniqueValue = data.uri || data.classUri || '';
                 taskButton
                     .setTaskConfig({
@@ -148,7 +148,7 @@ define([
                 }).render($('#results-sql-export'));
 
                 binder.register('export_sql', function remove(actionContext) {
-                    const data = _.pick(actionContext, ['uri', 'classUri', 'id']);
+                    const data = (({ uri, classUri, id }) => ({ uri, classUri, id }))(actionContext);
                     const uniqueValue = data.uri || data.classUri || '';
                     taskButtonExportSQL
                         .setTaskConfig({
@@ -160,7 +160,7 @@ define([
             }
 
             binder.register('open_url', function (actionContext) {
-                const data = _.pick(actionContext, ['uri', 'classUri', 'id']);
+                const data = (({ uri, classUri, id }) => ({ uri, classUri, id }))(actionContext);
 
                 request(this.url, data, 'POST')
                     .then(response => {

diff --git a/views/js/controller/resultTable.js b/views/js/controller/resultTable.js
@@ -121,11 +121,7 @@ define([
                 }).done(function (response) {
                     if (response && response.columns) {
                         if (action === 'remove') {
-                            columns = _.reject(columns, function (col) {
-                                return _.find(response.columns, function (resCol) {
-                                    return _.isEqual(col, resCol);
-                                });
-                            });
+                            columns = columns.filter(col => !response.columns.some(resCol => _.isEqual(col, resCol)));
                         } else {
                             if (typeof response.first !== 'undefined' && response.first === true) {
                                 columns = response.columns.concat(columns);
@@ -134,7 +130,7 @@ define([
                             }
                         }
                     }
-                    if (_.isFunction(done)) {
+                    if (typeof done === 'function') {
                         done();
                     }
                 }).always(function () {
@@ -152,8 +148,8 @@ define([
                 //set up model from columns
                 _.forEach(columns, function (col) {
                     var colId = col.prop ? (col.prop + '_' + col.contextType) : (col.contextId + '_' + col.variableIdentifier);
-                    if(col.columnId){
-                        colId= col.columnId
+                    if (col.columnId) {
+                        colId = col.columnId;
                     }
                     model.push({
                         id: colId,
@@ -168,7 +164,7 @@ define([
                     .data('ui.datatable', null)
                     .off('load.datatable')
                     .on('load.datatable', function () {
-                        if (_.isFunction(done)) {
+                        if (typeof done === 'function') {
                             done();
                             done = '';
                         }

diff --git a/views/js/loader/taoOutcomeUi.min.js b/views/js/loader/taoOutcomeUi.min.js
diff --git a/views/js/loader/taoOutcomeUi.min.js.map b/views/js/loader/taoOutcomeUi.min.js.map