Explorar o código

Merge pull request #11633 from GordonSmith/HPCC-17566-ColumnReorder

HPCC-17566 Remove "Column Reorder"

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman %!s(int64=6) %!d(string=hai) anos
pai
achega
08bad0eb51

+ 1 - 2
esp/src/eclwatch/DynamicESDLQueryWidget.js

@@ -17,7 +17,6 @@ define([
 
     "dgrid/tree",
     "dgrid/selector",
-    "dgrid/extensions/ColumnHider",
 
     "hpcc/GridDetailsWidget",
     "src/WsTopology",
@@ -30,7 +29,7 @@ define([
     "hpcc/DelayLoadWidget",
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, dom, domClass, domConstruct,
     registry, Button, ToolbarSeparator, Dialog, TextBox,
-    tree, selector, ColumnHider,
+    tree, selector,
     GridDetailsWidget, WsTopology, WsESDLConfig, Utility, DelayLoadWidget, ESPUtil, DynamicESDLDefinitionQueryWidget, TargetSelectWidget, DelayLoadWidget) {
     return declare("DynamicESDLQueryWidget", [GridDetailsWidget, ESPUtil.FormHelper], {
         i18n: nlsHPCC,

+ 1 - 2
esp/src/eclwatch/LogVisualizationWidget.js

@@ -13,7 +13,6 @@ define([
     "dijit/ToolbarSeparator",
 
     "dgrid/tree",
-    "dgrid/extensions/ColumnHider",
 
     "src/WsELK",
     "src/ESPWorkunit",
@@ -26,7 +25,7 @@ define([
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, domClass, topic,
     registry, ToggleButton, ToolbarSeparator,
-    tree, ColumnHider,
+    tree,
     WsELK, ESPWorkunit, DelayLoadWidget, _TabContainerWidget, ESPUtil, Utility,
     template) {
         return declare("LogVisualizationWidget", [_TabContainerWidget], {

+ 1 - 2
esp/src/eclwatch/MonitoringWidget.js

@@ -13,7 +13,6 @@ define([
     "dijit/ToolbarSeparator",
 
     "dgrid/tree",
-    "dgrid/extensions/ColumnHider",
 
     "hpcc/GridDetailsWidget",
     "src/ws_machine",
@@ -24,7 +23,7 @@ define([
 
 ], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, domClass, topic,
     registry, ToggleButton, ToolbarSeparator,
-    tree, ColumnHider,
+    tree,
     GridDetailsWidget, WsMachine, ESPWorkunit, DelayLoadWidget, ESPUtil, Utility) {
         return declare("MonitoringWidget", [GridDetailsWidget], {
             i18n: nlsHPCC,

+ 2 - 3
esp/src/eclwatch/ResultWidget.js

@@ -15,7 +15,6 @@ define([
     "dgrid/Selection",
     "dgrid/selector",
     "dgrid/extensions/ColumnResizer",
-    "dgrid/extensions/ColumnHider",
     "dgrid/extensions/CompoundColumns",
     "dgrid/extensions/DijitRegistry",
     "src/Pagination",
@@ -36,7 +35,7 @@ define([
     "dijit/ToolbarSeparator"
 ], function (declare, lang, arrayUtil, i18n, nlsHPCC, ioQuery, dom,
     registry, TextBox,
-    Grid, Keyboard, Selection, selector, ColumnResizer, ColumnHider, CompoundColumns, DijitRegistry, PaginationModule,
+    Grid, Keyboard, Selection, selector, ColumnResizer, CompoundColumns, DijitRegistry, PaginationModule,
     _Widget, ESPBase, ESPWorkunit, ESPLogicalFile, FilterDropDownWidget, TableContainer,
     template) {
         return declare("ResultWidget", [_Widget], {
@@ -188,7 +187,7 @@ define([
                         });
                         context.filter.refreshState();
 
-                        context.grid = new declare([Grid, PaginationModule.Pagination, Keyboard, ColumnResizer, ColumnHider, CompoundColumns, DijitRegistry])({
+                        context.grid = new declare([Grid, PaginationModule.Pagination, Keyboard, ColumnResizer, CompoundColumns, DijitRegistry])({
                             columns: structure,
                             rowsPerPage: 50,
                             pagingLinks: 1,

+ 2 - 3
esp/src/src/ESPUtil.ts

@@ -20,7 +20,6 @@ import * as OnDemandGrid from "dgrid/OnDemandGrid";
 import * as Keyboard from "dgrid/Keyboard";
 import * as Selection from "dgrid/Selection";
 import * as ColumnResizer from "dgrid/extensions/ColumnResizer";
-import * as ColumnHider from "dgrid/extensions/ColumnHider";
 import * as DijitRegistry from "dgrid/extensions/DijitRegistry";
 
 import { select as d3Select } from "d3-selection";
@@ -315,7 +314,7 @@ export function Grid(pagination?, selection?, overrides?) {
     var baseClass = [];
     var params = {};
     if (pagination) {
-        baseClass = [DGrid, Pagination, ColumnResizer, ColumnHider, Keyboard, DijitRegistry];
+        baseClass = [DGrid, Pagination, ColumnResizer, Keyboard, DijitRegistry];
         lang.mixin(params, {
             rowsPerPage: 50,
             pagingLinks: 1,
@@ -324,7 +323,7 @@ export function Grid(pagination?, selection?, overrides?) {
             pageSizeOptions: [25, 50, 100, 1000]
         });
     } else {
-        baseClass = [OnDemandGrid, ColumnResizer, ColumnHider, Keyboard, DijitRegistry];
+        baseClass = [OnDemandGrid, ColumnResizer, Keyboard, DijitRegistry];
     }
     if (selection) {
         baseClass.push(Selection);