@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.0

package/src/View/Export/Wizard/NewReportWizard.js

@@ -1,35 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NewReportWizard = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const react_1 = require("react");
-const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const Helper_1 = require("../../../Utilities/Helpers/Helper");
-const rebass_1 = require("rebass");
-const ReportColumnsWizardSection_1 = require("./ReportColumnsWizardSection");
-const ReportRowsWizardSection_1 = require("./ReportRowsWizardSection");
-const ReportNameWizardSection_1 = require("./ReportNameWizardSection");
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
-const react_redux_1 = require("react-redux");
-const ExportRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ExportRedux"));
-const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
-const NewReportWizard = (props) => {
+import * as React from 'react';
+import { useState } from 'react';
+import { OnePageAdaptableWizard, OnePageWizardSummary } from '../../Wizard/OnePageAdaptableWizard';
+import { cloneObject } from '../../../Utilities/Helpers/Helper';
+import { Box } from 'rebass';
+import { renderReportColumnsSummary, ReportColumnsWizardSection, } from './ReportColumnsWizardSection';
+import { isValidReportRowsQuery, renderReportRowsSummary, ReportRowsWizardSection, } from './ReportRowsWizardSection';
+import { isValidReportName, renderReportNameSummary, ReportNameWizardSection, } from './ReportNameWizardSection';
+import ObjectFactory from '../../../Utilities/ObjectFactory';
+import { useDispatch, useSelector } from 'react-redux';
+import * as ExportRedux from '../../../Redux/ActionsReducers/ExportRedux';
+import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
+export const NewReportWizard = (props) => {
     var _a, _b;
     const isEdit = ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action)
         ? props.popupParams.action === 'Edit'
         : Boolean(props.data);
-    const currentReport = (0, react_redux_1.useSelector)((state) => {
+    const currentReport = useSelector((state) => {
         if (!isEdit) {
             return;
         }
         return state.Export.Reports.find((report) => report.Name === state.Export.CurrentReport);
     });
     const data = (_b = props.data) !== null && _b !== void 0 ? _b : currentReport;
-    const [report, setReport] = (0, react_1.useState)(() => {
-        return data ? (0, Helper_1.cloneObject)(data) : ObjectFactory_1.default.CreateEmptyReport();
+    const [report, setReport] = useState(() => {
+        return data ? cloneObject(data) : ObjectFactory.CreateEmptyReport();
     });
-    const dispatch = (0, react_redux_1.useDispatch)();
+    const dispatch = useDispatch();
     const handleFinish = () => {
         if (isEdit) {
             dispatch(ExportRedux.ReportEdit(report));
@@ -39,44 +35,43 @@ const NewReportWizard = (props) => {
         }
         props.onFinishWizard(report);
     };
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: report, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+    return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: report, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Columns',
                 details: 'Choose the Columns you want to include in the Report',
-                renderSummary: ReportColumnsWizardSection_1.renderReportColumnsSummary,
-                render: () => React.createElement(ReportColumnsWizardSection_1.ReportColumnsWizardSection, { onChange: setReport }),
+                renderSummary: renderReportColumnsSummary,
+                render: () => React.createElement(ReportColumnsWizardSection, { onChange: setReport }),
             },
             {
                 title: 'Rows',
                 details: 'Choose the Rows you want to include in the Report',
-                isValid: ReportRowsWizardSection_1.isValidReportRowsQuery,
-                renderSummary: ReportRowsWizardSection_1.renderReportRowsSummary,
-                render: () => React.createElement(ReportRowsWizardSection_1.ReportRowsWizardSection, { onChange: setReport }),
+                isValid: isValidReportRowsQuery,
+                renderSummary: renderReportRowsSummary,
+                render: () => React.createElement(ReportRowsWizardSection, { onChange: setReport }),
             },
             {
                 title: 'Name',
                 details: 'Enter the name of the Report',
-                isValid: ReportNameWizardSection_1.isValidReportName,
-                renderSummary: ReportNameWizardSection_1.renderReportNameSummary,
-                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
-                    React.createElement(ReportNameWizardSection_1.ReportNameWizardSection, { onChange: setReport }))),
+                isValid: isValidReportName,
+                renderSummary: renderReportNameSummary,
+                render: () => (React.createElement(Box, { padding: 2 },
+                    React.createElement(ReportNameWizardSection, { onChange: setReport }))),
             },
             {
                 details: 'Select Report Tags',
                 title: 'Tags',
                 isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
-                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
-                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setReport }))),
-                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+                render: () => (React.createElement(Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection, { onChange: setReport }))),
+                renderSummary: renderObjectTagsSummary,
             },
             '-',
             {
                 title: 'Summary',
                 render: () => {
-                    return (React.createElement(rebass_1.Box, { padding: 2 },
-                        React.createElement(OnePageAdaptableWizard_1.OnePageWizardSummary, null)));
+                    return (React.createElement(Box, { padding: 2 },
+                        React.createElement(OnePageWizardSummary, null)));
                 },
             },
         ] }));
 };
-exports.NewReportWizard = NewReportWizard;

package/src/View/Export/Wizard/ReportColumnTypeWizard.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReportColumnTypeWizard = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const WizardPanel_1 = tslib_1.__importDefault(require("../../../components/WizardPanel"));
-const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
-const rebass_1 = require("rebass");
-const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
-class ReportColumnTypeWizard extends React.Component {
+import * as React from 'react';
+import WizardPanel from '../../../components/WizardPanel';
+import Radio from '../../../components/Radio';
+import { Flex } from 'rebass';
+import HelpBlock from '../../../components/HelpBlock';
+export class ReportColumnTypeWizard extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -16,16 +12,16 @@ class ReportColumnTypeWizard extends React.Component {
     }
     render() {
         return (React.createElement("div", { "data-name": 'report-select-columns' },
-            React.createElement(WizardPanel_1.default, null,
-                React.createElement(rebass_1.Flex, { flexDirection: "column", padding: 2 },
-                    React.createElement(HelpBlock_1.default, { marginBottom: 1 }, "All columns in the datasource will be included in the Report, whether visible or not at time of export"),
-                    React.createElement(Radio_1.default, { value: "All", checked: this.state.ReportColumnScope == 'AllColumns', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "All Columns"),
+            React.createElement(WizardPanel, null,
+                React.createElement(Flex, { flexDirection: "column", padding: 2 },
+                    React.createElement(HelpBlock, { marginBottom: 1 }, "All columns in the datasource will be included in the Report, whether visible or not at time of export"),
+                    React.createElement(Radio, { value: "All", checked: this.state.ReportColumnScope == 'AllColumns', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "All Columns"),
                     ' ',
-                    React.createElement(HelpBlock_1.default, { marginBottom: 1 }, "Only columns that are visible at the time the Report is exported will be included"),
-                    React.createElement(Radio_1.default, { value: "Visible", checked: this.state.ReportColumnScope == 'VisibleColumns', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "Visible Columns Only"),
+                    React.createElement(HelpBlock, { marginBottom: 1 }, "Only columns that are visible at the time the Report is exported will be included"),
+                    React.createElement(Radio, { value: "Visible", checked: this.state.ReportColumnScope == 'VisibleColumns', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "Visible Columns Only"),
                     ' ',
-                    React.createElement(HelpBlock_1.default, { marginBottom: 1 }, "Only selected columns (which you will choose in the next step) will be exported - whether visible or not"),
-                    React.createElement(Radio_1.default, { value: "Bespoke", marginRight: 3, checked: this.state.ReportColumnScope == 'ScopeColumns', onChange: (_, e) => this.onScopeSelectChanged(e) }, "Bespoke Columns"),
+                    React.createElement(HelpBlock, { marginBottom: 1 }, "Only selected columns (which you will choose in the next step) will be exported - whether visible or not"),
+                    React.createElement(Radio, { value: "Bespoke", marginRight: 3, checked: this.state.ReportColumnScope == 'ScopeColumns', onChange: (_, e) => this.onScopeSelectChanged(e) }, "Bespoke Columns"),
                     ' '))));
     }
     onScopeSelectChanged(event) {
@@ -70,4 +66,3 @@ class ReportColumnTypeWizard extends React.Component {
         return 1;
     }
 }
-exports.ReportColumnTypeWizard = ReportColumnTypeWizard;

package/src/View/Export/Wizard/ReportColumnsWizardSection.js

@@ -1,22 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReportColumnsWizardSection = exports.renderReportColumnsSummary = exports.isValidReportColumnsScope = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
-const Tabs_1 = require("../../../components/Tabs");
-const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
-const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const isValidReportColumnsScope = (report) => {
+import * as React from 'react';
+import { Box, Flex, Text } from 'rebass';
+import Radio from '../../../components/Radio';
+import { Tabs } from '../../../components/Tabs';
+import { NewScopeComponent, renderScopeSummary } from '../../Components/NewScopeComponent';
+import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
+export const isValidReportColumnsScope = (report) => {
     if (report.ReportColumnScope === 'ScopeColumns') {
         return report.Scope != null ? true : 'Column scope is not defined';
     }
     return true;
 };
-exports.isValidReportColumnsScope = isValidReportColumnsScope;
-const renderReportColumnsSummary = (report) => {
-    return (React.createElement(rebass_1.Box, { fontSize: 2 },
+export const renderReportColumnsSummary = (report) => {
+    return (React.createElement(Box, { fontSize: 2 },
         report.ReportColumnScope === 'AllColumns' ? (React.createElement(React.Fragment, null,
             "Include ",
             React.createElement("b", null, "all Columns"),
@@ -25,17 +20,16 @@ const renderReportColumnsSummary = (report) => {
             "Include ",
             React.createElement("b", null, "only visible Columns"),
             " in the Report")) : null,
-        report.ReportColumnScope === 'ScopeColumns' ? (React.createElement(React.Fragment, null, (0, NewScopeComponent_1.renderScopeSummary)(report.Scope, {
+        report.ReportColumnScope === 'ScopeColumns' ? (React.createElement(React.Fragment, null, renderScopeSummary(report.Scope, {
             scopeColumns: 'Report Columns',
             scopeWholeRow: 'not available',
             scopeDataTypes: 'Report will include columns with the following types',
         }))) : null));
 };
-exports.renderReportColumnsSummary = renderReportColumnsSummary;
-const ReportColumnsWizardSection = (props) => {
-    const { api, data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (React.createElement(rebass_1.Flex, { flexDirection: "column", style: { height: '100%' }, padding: 2 },
-        React.createElement(Tabs_1.Tabs, { m: 2, value: data.ReportColumnScope, onValueChange: (ReportColumnScope) => {
+export const ReportColumnsWizardSection = (props) => {
+    const { api, data } = useOnePageAdaptableWizardContext();
+    return (React.createElement(Flex, { flexDirection: "column", style: { height: '100%' }, padding: 2 },
+        React.createElement(Tabs, { m: 2, value: data.ReportColumnScope, onValueChange: (ReportColumnScope) => {
                 const report = Object.assign(Object.assign({}, data), { ReportColumnScope });
                 if (report.ReportColumnScope !== 'ScopeColumns') {
                     delete report.Scope;
@@ -49,20 +43,20 @@ const ReportColumnsWizardSection = (props) => {
                 }
                 props.onChange(report);
             } },
-            React.createElement(Tabs_1.Tabs.Tab, { value: "AllColumns" },
-                React.createElement(Radio_1.default, { margin: 0, checked: data.ReportColumnScope == 'AllColumns', tabIndex: -1 }, "All Columns")),
-            React.createElement(Tabs_1.Tabs.Tab, { value: "VisibleColumns" },
-                React.createElement(Radio_1.default, { margin: 0, checked: data.ReportColumnScope == 'VisibleColumns', tabIndex: -1 }, "Visible Columns")),
-            React.createElement(Tabs_1.Tabs.Tab, { value: "ScopeColumns" },
-                React.createElement(Radio_1.default, { margin: 0, checked: data.ReportColumnScope == 'ScopeColumns', tabIndex: -1 }, "Bespoke Columns")),
-            React.createElement(Tabs_1.Tabs.Content, { value: "AllColumns" },
-                React.createElement(rebass_1.Text, { fontSize: 2, padding: 2 }, "All Columns in the datasource will be included in the Report, whether visible or not at time of export")),
-            React.createElement(Tabs_1.Tabs.Content, { value: "VisibleColumns" },
-                React.createElement(rebass_1.Text, { fontSize: 2, padding: 2 }, "Only Columns that are visible at the time the Report is exported will be included")),
-            React.createElement(Tabs_1.Tabs.Content, { value: "BespokeColumns" },
-                React.createElement(rebass_1.Text, { fontSize: 2, padding: 2 }, "Only selected Columns (which you will choose in the next step) will be exported - whether visible or not"))),
-        data.ReportColumnScope === 'ScopeColumns' ? (React.createElement(rebass_1.Box, { padding: 2, flex: 1, style: { overflow: 'auto' } },
-            React.createElement(NewScopeComponent_1.NewScopeComponent, { hideWholeRow: true, isColumnAvailable: (column) => Boolean(column.exportable), descriptions: {
+            React.createElement(Tabs.Tab, { value: "AllColumns" },
+                React.createElement(Radio, { margin: 0, checked: data.ReportColumnScope == 'AllColumns', tabIndex: -1 }, "All Columns")),
+            React.createElement(Tabs.Tab, { value: "VisibleColumns" },
+                React.createElement(Radio, { margin: 0, checked: data.ReportColumnScope == 'VisibleColumns', tabIndex: -1 }, "Visible Columns")),
+            React.createElement(Tabs.Tab, { value: "ScopeColumns" },
+                React.createElement(Radio, { margin: 0, checked: data.ReportColumnScope == 'ScopeColumns', tabIndex: -1 }, "Bespoke Columns")),
+            React.createElement(Tabs.Content, { value: "AllColumns" },
+                React.createElement(Text, { fontSize: 2, padding: 2 }, "All Columns in the datasource will be included in the Report, whether visible or not at time of export")),
+            React.createElement(Tabs.Content, { value: "VisibleColumns" },
+                React.createElement(Text, { fontSize: 2, padding: 2 }, "Only Columns that are visible at the time the Report is exported will be included")),
+            React.createElement(Tabs.Content, { value: "BespokeColumns" },
+                React.createElement(Text, { fontSize: 2, padding: 2 }, "Only selected Columns (which you will choose in the next step) will be exported - whether visible or not"))),
+        data.ReportColumnScope === 'ScopeColumns' ? (React.createElement(Box, { padding: 2, flex: 1, style: { overflow: 'auto' } },
+            React.createElement(NewScopeComponent, { hideWholeRow: true, isColumnAvailable: (column) => Boolean(column.exportable), descriptions: {
                     rowScope: 'Apply Scope for: Row, or one or more Columns, or one or more Data Types',
                     columnScope: 'Selected columns will be included in the report',
                 }, scope: data.Scope, updateScope: (Scope) => {
@@ -70,4 +64,3 @@ const ReportColumnsWizardSection = (props) => {
                     props.onChange(report);
                 } }))) : null));
 };
-exports.ReportColumnsWizardSection = ReportColumnsWizardSection;

package/src/View/Export/Wizard/ReportNameWizardSection.js

@@ -1,22 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReportNameWizardSection = exports.isValidReportName = exports.renderReportNameSummary = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
-const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
-const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
-const Tag_1 = require("../../../components/Tag");
-const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const renderReportNameSummary = (report) => {
-    return (React.createElement(rebass_1.Box, { fontSize: 2 },
+import * as React from 'react';
+import { Box, Text } from 'rebass';
+import ErrorBox from '../../../components/ErrorBox';
+import FormLayout, { FormRow } from '../../../components/FormLayout';
+import Input from '../../../components/Input';
+import { Tag } from '../../../components/Tag';
+import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
+export const renderReportNameSummary = (report) => {
+    return (React.createElement(Box, { fontSize: 2 },
         ' ',
         "Report Name: ",
-        React.createElement(Tag_1.Tag, null, report.Name)));
+        React.createElement(Tag, null, report.Name)));
 };
-exports.renderReportNameSummary = renderReportNameSummary;
-const isValidReportName = (report, api) => {
+export const isValidReportName = (report, api) => {
     if (!report.Name) {
         return 'Report name cannot be empty';
     }
@@ -28,20 +23,18 @@ const isValidReportName = (report, api) => {
         : reportsWithSameNameCount > 0;
     return hasAlreadyExistingName ? 'A Report already exists with that name' : true;
 };
-exports.isValidReportName = isValidReportName;
-const ReportNameWizardSection = (props) => {
-    const { api, data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const validCheck = (0, exports.isValidReportName)(data, api);
+export const ReportNameWizardSection = (props) => {
+    const { api, data } = useOnePageAdaptableWizardContext();
+    const validCheck = isValidReportName(data, api);
     const ErrorMessage = validCheck === true ? null : validCheck;
-    return (React.createElement(rebass_1.Box, null,
-        React.createElement(FormLayout_1.default, { columns: [1, 2] },
-            React.createElement(FormLayout_1.FormRow, null,
-                React.createElement(rebass_1.Text, { marginRight: 2 }, "Name:"),
-                React.createElement(Input_1.default, { "data-name": "export-name", width: "100%", type: "text", autoFocus: true, placeholder: "Name", value: data.Name, onChange: (e) => {
+    return (React.createElement(Box, null,
+        React.createElement(FormLayout, { columns: [1, 2] },
+            React.createElement(FormRow, null,
+                React.createElement(Text, { marginRight: 2 }, "Name:"),
+                React.createElement(Input, { "data-name": "export-name", width: "100%", type: "text", autoFocus: true, placeholder: "Name", value: data.Name, onChange: (e) => {
                         props.onChange(Object.assign(Object.assign({}, data), { Name: e.target.value }));
                     } })),
-            React.createElement(FormLayout_1.FormRow, null,
+            React.createElement(FormRow, null,
                 React.createElement(React.Fragment, null),
-                ErrorMessage ? React.createElement(ErrorBox_1.default, null, ErrorMessage) : null))));
+                ErrorMessage ? React.createElement(ErrorBox, null, ErrorMessage) : null))));
 };
-exports.ReportNameWizardSection = ReportNameWizardSection;

package/src/View/Export/Wizard/ReportRowTypeWizard.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReportRowTypeWizard = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const WizardPanel_1 = tslib_1.__importDefault(require("../../../components/WizardPanel"));
-const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
-const rebass_1 = require("rebass");
-const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
-class ReportRowTypeWizard extends React.Component {
+import * as React from 'react';
+import WizardPanel from '../../../components/WizardPanel';
+import Radio from '../../../components/Radio';
+import { Flex } from 'rebass';
+import HelpBlock from '../../../components/HelpBlock';
+export class ReportRowTypeWizard extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -16,16 +12,16 @@ class ReportRowTypeWizard extends React.Component {
     }
     render() {
         return (React.createElement("div", { "data-name": 'report-select-rows' },
-            React.createElement(WizardPanel_1.default, null,
-                React.createElement(rebass_1.Flex, { flexDirection: "column", padding: 2 },
-                    React.createElement(HelpBlock_1.default, { marginBottom: 1 }, "All rows in the datasource will be included in the report, whether visible or not at time of export."),
-                    React.createElement(Radio_1.default, { value: "All", checked: this.state.ReportRowScope == 'AllRows', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "All Rows"),
+            React.createElement(WizardPanel, null,
+                React.createElement(Flex, { flexDirection: "column", padding: 2 },
+                    React.createElement(HelpBlock, { marginBottom: 1 }, "All rows in the datasource will be included in the report, whether visible or not at time of export."),
+                    React.createElement(Radio, { value: "All", checked: this.state.ReportRowScope == 'AllRows', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "All Rows"),
                     ' ',
-                    React.createElement(HelpBlock_1.default, { marginBottom: 1 }, "Only rows that are visible at the time the Report is exported will be included in the Export"),
-                    React.createElement(Radio_1.default, { value: "Visible", checked: this.state.ReportRowScope == 'VisibleRows', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "Visible Rows Only"),
+                    React.createElement(HelpBlock, { marginBottom: 1 }, "Only rows that are visible at the time the Report is exported will be included in the Export"),
+                    React.createElement(Radio, { value: "Visible", checked: this.state.ReportRowScope == 'VisibleRows', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "Visible Rows Only"),
                     ' ',
-                    React.createElement(HelpBlock_1.default, { marginBottom: 1 }, "Only the rows which match the Query (built in next step) will be exported - whether visible or not."),
-                    React.createElement(Radio_1.default, { value: "Expression", checked: this.state.ReportRowScope == 'ExpressionRows', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "By Query - built by you in next step"),
+                    React.createElement(HelpBlock, { marginBottom: 1 }, "Only the rows which match the Query (built in next step) will be exported - whether visible or not."),
+                    React.createElement(Radio, { value: "Expression", checked: this.state.ReportRowScope == 'ExpressionRows', onChange: (_, e) => this.onScopeSelectChanged(e), marginRight: 3 }, "By Query - built by you in next step"),
                     ' '))));
     }
     onScopeSelectChanged(event) {
@@ -70,4 +66,3 @@ class ReportRowTypeWizard extends React.Component {
         return this.props.data.ReportColumnScope == 'ScopeColumns' ? 1 : 2;
     }
 }
-exports.ReportRowTypeWizard = ReportRowTypeWizard;

package/src/View/Export/Wizard/ReportRowsWizardSection.js

@@ -1,26 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReportRowsWizardSection = exports.renderReportRowsSummary = exports.isValidReportRowsQuery = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const react_1 = require("react");
-const rebass_1 = require("rebass");
-const ExpressionEditor_1 = require("../../../components/ExpressionEditor");
-const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
-const Tabs_1 = require("../../../components/Tabs");
-const Tag_1 = require("../../../components/Tag");
-const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const isValidReportRowsQuery = (report) => {
+import * as React from 'react';
+import { useMemo } from 'react';
+import { Box, Text } from 'rebass';
+import { ExpressionEditor } from '../../../components/ExpressionEditor';
+import Radio from '../../../components/Radio';
+import { Tabs } from '../../../components/Tabs';
+import { Tag } from '../../../components/Tag';
+import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
+export const isValidReportRowsQuery = (report) => {
     var _a;
     if (report.ReportRowScope === 'ExpressionRows' && !((_a = report.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression)) {
         return 'Rows query cannot be empty';
     }
     return true;
 };
-exports.isValidReportRowsQuery = isValidReportRowsQuery;
-const renderReportRowsSummary = (report) => {
-    const { api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (React.createElement(rebass_1.Box, { fontSize: 2 },
+export const renderReportRowsSummary = (report) => {
+    const { api } = useOnePageAdaptableWizardContext();
+    return (React.createElement(Box, { fontSize: 2 },
         report.ReportRowScope === 'AllRows' ? (React.createElement(React.Fragment, null,
             "Include ",
             React.createElement("b", null, "all Rows"),
@@ -32,15 +27,14 @@ const renderReportRowsSummary = (report) => {
         report.ReportRowScope === 'ExpressionRows' ? (React.createElement(React.Fragment, null,
             "Include Rows matching the query:",
             ' ',
-            React.createElement(Tag_1.Tag, null, api.internalApi.getAdaptableQueryExpressionText(report.Query)))) : null));
+            React.createElement(Tag, null, api.internalApi.getAdaptableQueryExpressionText(report.Query)))) : null));
 };
-exports.renderReportRowsSummary = renderReportRowsSummary;
-const ReportRowsWizardSection = (props) => {
+export const ReportRowsWizardSection = (props) => {
     var _a, _b;
-    const { api, data, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const initialData = (0, react_1.useMemo)(() => api.internalApi.getQueryPreviewData(), []);
+    const { api, data, moduleInfo } = useOnePageAdaptableWizardContext();
+    const initialData = useMemo(() => api.internalApi.getQueryPreviewData(), []);
     return (React.createElement(React.Fragment, null,
-        React.createElement(Tabs_1.Tabs, { m: 2, value: data.ReportRowScope, onValueChange: (ReportRowScope) => {
+        React.createElement(Tabs, { m: 2, value: data.ReportRowScope, onValueChange: (ReportRowScope) => {
                 const report = Object.assign(Object.assign({}, data), { ReportRowScope });
                 if (report.ReportRowScope !== 'ExpressionRows') {
                     delete report.Query;
@@ -54,22 +48,21 @@ const ReportRowsWizardSection = (props) => {
                 }
                 props.onChange(report);
             } },
-            React.createElement(Tabs_1.Tabs.Tab, { value: "AllRows" },
-                React.createElement(Radio_1.default, { margin: 0, checked: data.ReportRowScope == 'AllRows', tabIndex: -1 }, "All Rows")),
-            React.createElement(Tabs_1.Tabs.Tab, { value: "VisibleRows" },
-                React.createElement(Radio_1.default, { margin: 0, checked: data.ReportRowScope == 'VisibleRows', tabIndex: -1 }, "Visible Rows")),
-            React.createElement(Tabs_1.Tabs.Tab, { value: "ExpressionRows" },
-                React.createElement(Radio_1.default, { margin: 0, checked: data.ReportRowScope == 'ExpressionRows', tabIndex: -1 }, "By Query")),
-            React.createElement(Tabs_1.Tabs.Content, { value: "AllRows" },
-                React.createElement(rebass_1.Text, { fontSize: 2, padding: 2 }, "All Rows in the datasource will be included in the report, whether visible or not at time of export.")),
-            React.createElement(Tabs_1.Tabs.Content, { value: "VisibleRows" },
-                React.createElement(rebass_1.Text, { fontSize: 2, padding: 2 }, "Only Rows that are visible at the time the Report is exported will be included in the Export")),
-            React.createElement(Tabs_1.Tabs.Content, { value: "ExpressionRows" },
-                React.createElement(rebass_1.Text, { fontSize: 2, padding: 2, pl: 0 }, "Only the Rows which match the Query will be exported - whether visible or not."),
-                React.createElement(ExpressionEditor_1.ExpressionEditor, { allowSaveNamedQuery: true, type: 'boolean', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: (_b = (_a = data.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression) !== null && _b !== void 0 ? _b : '', onChange: (BooleanExpression) => {
+            React.createElement(Tabs.Tab, { value: "AllRows" },
+                React.createElement(Radio, { margin: 0, checked: data.ReportRowScope == 'AllRows', tabIndex: -1 }, "All Rows")),
+            React.createElement(Tabs.Tab, { value: "VisibleRows" },
+                React.createElement(Radio, { margin: 0, checked: data.ReportRowScope == 'VisibleRows', tabIndex: -1 }, "Visible Rows")),
+            React.createElement(Tabs.Tab, { value: "ExpressionRows" },
+                React.createElement(Radio, { margin: 0, checked: data.ReportRowScope == 'ExpressionRows', tabIndex: -1 }, "By Query")),
+            React.createElement(Tabs.Content, { value: "AllRows" },
+                React.createElement(Text, { fontSize: 2, padding: 2 }, "All Rows in the datasource will be included in the report, whether visible or not at time of export.")),
+            React.createElement(Tabs.Content, { value: "VisibleRows" },
+                React.createElement(Text, { fontSize: 2, padding: 2 }, "Only Rows that are visible at the time the Report is exported will be included in the Export")),
+            React.createElement(Tabs.Content, { value: "ExpressionRows" },
+                React.createElement(Text, { fontSize: 2, padding: 2, pl: 0 }, "Only the Rows which match the Query will be exported - whether visible or not."),
+                React.createElement(ExpressionEditor, { allowSaveNamedQuery: true, type: 'boolean', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: (_b = (_a = data.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression) !== null && _b !== void 0 ? _b : '', onChange: (BooleanExpression) => {
                         props.onChange(Object.assign(Object.assign({}, data), { Query: {
                                 BooleanExpression,
                             } }));
-                    }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getNamedQueries(), api: api })))));
+                    }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api })))));
 };
-exports.ReportRowsWizardSection = ReportRowsWizardSection;

package/src/View/Export/Wizard/ReportScopeWizard.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReportScopeWizard = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const WizardPanel_1 = tslib_1.__importDefault(require("../../../components/WizardPanel"));
-const ScopeComponent_1 = require("../../Components/ScopeComponent");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/ArrayExtensions"));
-class ReportScopeWizard extends React.Component {
+import * as React from 'react';
+import WizardPanel from '../../../components/WizardPanel';
+import { ScopeComponent } from '../../Components/ScopeComponent';
+import ArrayExtensions from '../../../Utilities/Extensions/ArrayExtensions';
+export class ReportScopeWizard extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -14,8 +10,8 @@ class ReportScopeWizard extends React.Component {
         };
     }
     render() {
-        return (React.createElement(WizardPanel_1.default, { "data-name": "scope-container", bodyProps: { padding: 0 } },
-            React.createElement(ScopeComponent_1.ScopeComponent, { api: this.props.api, scope: this.state.scope, updateScope: (scope) => this.onUpdateScope(scope) }),
+        return (React.createElement(WizardPanel, { "data-name": "scope-container", bodyProps: { padding: 0 } },
+            React.createElement(ScopeComponent, { api: this.props.api, scope: this.state.scope, updateScope: (scope) => this.onUpdateScope(scope) }),
             ' '));
     }
     onUpdateScope(scope) {
@@ -26,11 +22,11 @@ class ReportScopeWizard extends React.Component {
             return false;
         }
         if ('ColumnIds' in this.state.scope &&
-            ArrayExtensions_1.default.IsNullOrEmpty(this.props.api.scopeApi.getColumnIdsInScope(this.state.scope))) {
+            ArrayExtensions.IsNullOrEmpty(this.props.api.scopeApi.getColumnIdsInScope(this.state.scope))) {
             return false;
         }
         if ('DataTypes' in this.state.scope &&
-            ArrayExtensions_1.default.IsNullOrEmpty(this.props.api.scopeApi.getDataTypesInScope(this.state.scope))) {
+            ArrayExtensions.IsNullOrEmpty(this.props.api.scopeApi.getDataTypesInScope(this.state.scope))) {
             return false;
         }
         return true;
@@ -49,4 +45,3 @@ class ReportScopeWizard extends React.Component {
         return 1;
     }
 }
-exports.ReportScopeWizard = ReportScopeWizard;

package/src/View/Export/Wizard/ReportSettingsWizard.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReportSettingsWizard = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
-const WizardPanel_1 = tslib_1.__importDefault(require("../../../components/WizardPanel"));
-const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
-const rebass_1 = require("rebass");
-const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
-const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
-class ReportSettingsWizard extends React.Component {
+import * as React from 'react';
+import { StringExtensions } from '../../../Utilities/Extensions/StringExtensions';
+import WizardPanel from '../../../components/WizardPanel';
+import Input from '../../../components/Input';
+import { Text } from 'rebass';
+import ErrorBox from '../../../components/ErrorBox';
+import FormLayout, { FormRow } from '../../../components/FormLayout';
+export class ReportSettingsWizard extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -18,18 +14,18 @@ class ReportSettingsWizard extends React.Component {
         };
     }
     render() {
-        let validationState = StringExtensions_1.StringExtensions.IsNullOrEmpty(this.state.ErrorMessage)
+        let validationState = StringExtensions.IsNullOrEmpty(this.state.ErrorMessage)
             ? null
             : 'error';
         return (React.createElement("div", { "data-name": 'report-settings' },
-            React.createElement(WizardPanel_1.default, null,
-                React.createElement(FormLayout_1.default, { columns: [1, 2] },
-                    React.createElement(FormLayout_1.FormRow, null,
-                        React.createElement(rebass_1.Text, { marginRight: 2 }, "Enter Report Name:"),
-                        React.createElement(Input_1.default, { width: "100%", type: "text", placeholder: "Name", value: this.state.ReportName, onChange: (e) => this.onReportNameChanged(e) })),
-                    React.createElement(FormLayout_1.FormRow, null,
+            React.createElement(WizardPanel, null,
+                React.createElement(FormLayout, { columns: [1, 2] },
+                    React.createElement(FormRow, null,
+                        React.createElement(Text, { marginRight: 2 }, "Enter Report Name:"),
+                        React.createElement(Input, { width: "100%", type: "text", placeholder: "Name", value: this.state.ReportName, onChange: (e) => this.onReportNameChanged(e) })),
+                    React.createElement(FormRow, null,
                         React.createElement(React.Fragment, null),
-                        this.state.ErrorMessage ? React.createElement(ErrorBox_1.default, null, this.state.ErrorMessage) : null)))));
+                        this.state.ErrorMessage ? React.createElement(ErrorBox, null, this.state.ErrorMessage) : null)))));
     }
     onReportNameChanged(event) {
         let e = event.target;
@@ -41,8 +37,8 @@ class ReportSettingsWizard extends React.Component {
         }, () => this.props.updateGoBackState());
     }
     canNext() {
-        return (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.state.ReportName) &&
-            StringExtensions_1.StringExtensions.IsNullOrEmpty(this.state.ErrorMessage));
+        return (StringExtensions.IsNotNullOrEmpty(this.state.ReportName) &&
+            StringExtensions.IsNullOrEmpty(this.state.ErrorMessage));
     }
     canBack() {
         return true;
@@ -58,4 +54,3 @@ class ReportSettingsWizard extends React.Component {
         return this.props.data.ReportRowScope == 'ExpressionRows' ? 1 : 2;
     }
 }
-exports.ReportSettingsWizard = ReportSettingsWizard;