@adaptabletools/adaptable 22.0.0-canary.11 → 22.0.0-canary.13

package/src/View/QuickSearch/useQuickSearchDebounced.js

@@ -1,5 +1,5 @@
 import { useEffect, useState, useMemo } from 'react';
-import debounce from 'lodash/debounce';
+import debounce from '../../Utilities/utils/debounce';
 import { QUICK_SEARCH_DEBOUNCE_TIME } from '../../Utilities/Constants/GeneralConstants';
 export const useQuickSearchDebounced = (props) => {
     const [searchText, setSearchText] = useState(props.QuickSearchText ?? '');

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -1,4 +1,4 @@
-import chunk from 'lodash/chunk';
+import chunk from '../Utilities/utils/chunk';
 import * as React from 'react';
 import { CheckBox } from '../components/CheckBox';
 import FormLayout, { FormRow } from '../components/FormLayout';

package/src/View/StyledColumn/Wizard/StyledColumnBadgeRowsSection.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { StyledColumn } from '../../../types';
+type StyledColumnBadgeRowsSectionProps = {
+    onChange: (data: StyledColumn) => void;
+};
+export declare const renderStyledColumnBadgeRowsSummary: (data: StyledColumn) => React.JSX.Element;
+export declare const StyledColumnBadgeRowsSection: (props: StyledColumnBadgeRowsSectionProps) => React.JSX.Element;
+export {};

package/src/View/StyledColumn/Wizard/{StyledColumnWizardSettingsSection.js → StyledColumnBadgeRowsSection.js}

@@ -5,7 +5,7 @@ import { Tabs } from '../../../components/Tabs';
 import { Tag } from '../../../components/Tag';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Flex, Box } from '../../../components/Flex';
-export const renderStyledColumnWizardSettingsSummary = (data) => {
+export const renderStyledColumnBadgeRowsSummary = (data) => {
     const badgeStyle = data;
     return (React.createElement(Box, { className: "twa:p-2" },
         React.createElement(Box, { className: "twa:mt-3" },
@@ -22,80 +22,80 @@ export const renderStyledColumnWizardSettingsSummary = (data) => {
             "Total Rows ",
             React.createElement(Tag, null, badgeStyle.RowScope?.ExcludeTotalRows ? 'no' : 'yes'))));
 };
-export const StyledColumnWizardSettingsSection = (props) => {
+export const StyledColumnBadgeRowsSection = (props) => {
     const { data } = useOnePageAdaptableWizardContext();
-    const onExcludeDataRowsChanged = (ExcludeDataRows) => {
+    const onExcludeDataRowsChanged = (includeDataRows) => {
         props.onChange({
             ...data,
             BadgeStyle: {
                 ...data.BadgeStyle,
                 RowScope: {
                     ...data.BadgeStyle.RowScope,
-                    ExcludeDataRows,
+                    ExcludeDataRows: !includeDataRows,
                 },
             },
         });
     };
-    const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
+    const onExcludeGroupedRowsChanged = (includeGroupedRows) => {
         props.onChange({
             ...data,
             BadgeStyle: {
                 ...data.BadgeStyle,
                 RowScope: {
                     ...data.BadgeStyle.RowScope,
-                    ExcludeGroupRows: ExcludeGroupedRows,
+                    ExcludeGroupRows: !includeGroupedRows,
                 },
             },
         });
     };
-    const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
+    const onExcludeSummaryRowsChanged = (includeSummaryRows) => {
         props.onChange({
             ...data,
             BadgeStyle: {
                 ...data.BadgeStyle,
                 RowScope: {
                     ...data.BadgeStyle.RowScope,
-                    ExcludeSummaryRows,
+                    ExcludeSummaryRows: !includeSummaryRows,
                 },
             },
         });
     };
-    const onExcludeTotalRowsChanged = (ExcludeTotalRows) => {
+    const onExcludeTotalRowsChanged = (includeTotalRows) => {
         props.onChange({
             ...data,
             BadgeStyle: {
                 ...data.BadgeStyle,
                 RowScope: {
                     ...data.BadgeStyle.RowScope,
-                    ExcludeTotalRows,
+                    ExcludeTotalRows: !includeTotalRows,
                 },
             },
         });
     };
     return (React.createElement(Tabs, null,
-        React.createElement(Tabs.Tab, null, "Settings"),
+        React.createElement(Tabs.Tab, null, "Row Types"),
         React.createElement(Tabs.Content, null,
             React.createElement(Flex, { flexDirection: "row" },
                 React.createElement(FormLayout, null,
-                    React.createElement(FormRow, { label: "Exclude Data Rows:" },
+                    React.createElement(FormRow, { label: "Data (leaf) Rows:" },
                         React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
                             React.createElement(CheckBox, { "data-name": "exclude-data-rows-checkbox", className: "twa:mr-2", checked: 
                                 // @ts-ignore
-                                data.BadgeStyle.RowScope?.ExcludeDataRows, onChange: onExcludeDataRowsChanged }))),
-                    React.createElement(FormRow, { label: "Exclude Group Rows:" },
+                                !data.BadgeStyle.RowScope?.ExcludeDataRows, onChange: onExcludeDataRowsChanged }))),
+                    React.createElement(FormRow, { label: "Group Rows:" },
                         React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
                             React.createElement(CheckBox, { className: "twa:mr-2", "data-name": "exclude-grouped-rows-checkbox", checked: 
                                 // @ts-ignore
-                                data.BadgeStyle.RowScope?.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged }))),
-                    React.createElement(FormRow, { label: "Exclude Row Summaries:" },
+                                !data.BadgeStyle.RowScope?.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged }))),
+                    React.createElement(FormRow, { label: "Summary Rows:" },
                         React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
                             React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", className: "twa:mr-2", checked: 
                                 // @ts-ignore
-                                data.BadgeStyle.RowScope?.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged }))),
+                                !data.BadgeStyle.RowScope?.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged }))),
                     ' ',
-                    React.createElement(FormRow, { label: "Exclude Total Rows:" },
+                    React.createElement(FormRow, { label: "Total Rows:" },
                         React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
                             React.createElement(CheckBox, { "data-name": "exclude-total-rows-checkbox", className: "twa:mr-2", checked: 
                                 // @ts-ignore
-                                data.BadgeStyle.RowScope?.ExcludeTotalRows, onChange: onExcludeTotalRowsChanged }))))))));
+                                !data.BadgeStyle.RowScope?.ExcludeTotalRows, onChange: onExcludeTotalRowsChanged }))))))));
 };

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -8,7 +8,7 @@ import { renderStyledColumnTypeSummary, StyledColumnWizardTypeSection, } from '.
 import { isValidStyledColumnColumn, renderStyledColumnColumnSummary, StyledColumnWizardColumnSection, } from './StyledColumnWizardColumnSection';
 import { renderStyledColumnStyleSummary, StyledColumnWizardStyleSection, } from './StyledColumnWizardStyleSection';
 import { cloneObject } from '../../../Utilities/Helpers/Helper';
-import { renderStyledColumnWizardSettingsSummary, StyledColumnWizardSettingsSection, } from './StyledColumnWizardSettingsSection';
+import { renderStyledColumnBadgeRowsSummary, StyledColumnBadgeRowsSection, } from './StyledColumnBadgeRowsSection';
 import { StyledColumnSparklineSettingsSection } from './StyledColumnSparklineSettingsSection';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
 import { renderBadgeSummary, StyledColumnBadgeSection } from './StyledColumnBadgeSection';
@@ -48,15 +48,6 @@ export const StyledColumnWizard = (props) => {
         }
         props.onFinishWizard(styledColumn);
     };
-    const AdditionalSettingSection = {
-        details: 'Apply Additional Settings',
-        renderSummary: renderStyledColumnWizardSettingsSummary,
-        render: () => {
-            return (React.createElement(Box, { className: "twa:p-2" },
-                React.createElement(StyledColumnWizardSettingsSection, { onChange: setStyledColumn })));
-        },
-        title: 'Settings',
-    };
     const specificSteps = [];
     if (styledColumn.SparklineStyle) {
         specificSteps.push({
@@ -93,6 +84,15 @@ export const StyledColumnWizard = (props) => {
         );
     }
     else if (styledColumn.BadgeStyle) {
+        specificSteps.push({
+            details: 'Select the Rows where the Badge will be applied',
+            renderSummary: renderStyledColumnBadgeRowsSummary,
+            render: () => {
+                return (React.createElement(Box, { className: "twa:p-2" },
+                    React.createElement(StyledColumnBadgeRowsSection, { onChange: setStyledColumn })));
+            },
+            title: 'Rows',
+        });
         specificSteps.push({
             title: 'Badges',
             details: 'Create Badge Styles',
@@ -110,7 +110,6 @@ export const StyledColumnWizard = (props) => {
             render: () => (React.createElement(Box, { className: "twa:p-2" },
                 React.createElement(StyledColumnBadgeSection, { onChange: setStyledColumn }))),
         });
-        specificSteps.push(AdditionalSettingSection);
     }
     return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: styledColumn, onFinish: handleFinish, onHide: props.onCloseWizard, sections: [
             {

package/src/View/SystemStatus/SystemStatusViewPanel.d.ts

@@ -9,8 +9,8 @@ declare class SystemStatusViewPanelComponent extends React.Component<SystemStatu
     render(): React.JSX.Element;
 }
 export declare let SystemStatusViewPanel: import("react-redux").ConnectedComponent<typeof SystemStatusViewPanelComponent, {
-    ref?: React.Ref<SystemStatusViewPanelComponent>;
     key?: React.Key | null | undefined;
+    ref?: React.Ref<SystemStatusViewPanelComponent>;
     context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
     store?: import("redux").Store;
 }>;

package/src/View/Theme/ThemeEditor.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import FormLayout, { FormRow } from '../../components/FormLayout';
 import { useAdaptable } from '../AdaptableContext';
 import AdaptableInput from '../Components/AdaptableInput';
-import throttle from 'lodash/throttle';
+import throttle from '../../Utilities/utils/throttle';
 import SimpleButton from '../../components/SimpleButton';
 import Panel from '../../components/Panel';
 import { Field } from './ThemeField';

package/src/View/Theme/ThemeField.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import throttle from 'lodash/throttle';
+import throttle from '../../Utilities/utils/throttle';
 import { useAdaptable } from '../AdaptableContext';
 import { getVariableColor } from '../../Utilities/Helpers/StyleHelper';
 import { FormRow } from '../../components/FormLayout';

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -7,7 +7,7 @@ import { useAdaptable } from '../AdaptableContext';
 import { Tabs } from '../../components/Tabs';
 import { NamedQueryContext, } from '../../components/ExpressionEditor/NamedQueryContext';
 import { OnePageWizard, useOnePageWizardContext } from './OnePageWizards';
-import kebabCase from 'lodash/kebabCase';
+import kebabCase from '../../Utilities/utils/kebabCase';
 import { Box } from '../../components/Flex';
 import { twMerge } from '../../twMerge';
 export const SummaryTag = (props) => (React.createElement(Box, { ...props }));

package/src/agGrid/AdaptableAgGrid.js

@@ -1,5 +1,5 @@
-import throttle from 'lodash/throttle';
-import debounce from 'lodash/debounce';
+import throttle from '../Utilities/utils/throttle';
+import debounce from '../Utilities/utils/debounce';
 import { createGrid, LocalEventService, } from 'ag-grid-enterprise';
 import { AdaptableLogger } from './AdaptableLogger';
 import { PrimaryKeyDocsLink } from '../Utilities/Constants/DocumentationLinkConstants';

package/src/agGrid/AgGridAdapter.js

@@ -471,8 +471,8 @@ export class AgGridAdapter {
             ? 'number'
             : this.deriveAdaptableColumnDataType(agGridColumn, false);
         const isTreeColumn = this.isTreeColumn(isGeneratedRowGroupColumn);
-        const alwaysHidden = this.adaptableApi.columnApi.internalApi.isAlwaysHiddenColumn(colDef);
-        const visible = !alwaysHidden || agGridColumn.isVisible();
+        const isUIHiddenColumn = this.adaptableApi.columnApi.internalApi.isColumnUIHidden(colDef);
+        const visible = !isUIHiddenColumn || agGridColumn.isVisible();
         const isGenerated = isGeneratedRowGroupColumn || isGeneratedPivotResultColumn || isGeneratedSelectionColumn;
         const abColumn = {
             Uuid: createUuid(),
@@ -482,9 +482,9 @@ export class AgGridAdapter {
             resizable: colDef.resizable !== false,
             friendlyName: friendlyName,
             isPrimaryKey: ColumnId === pkColumn,
-            dataType: dataType,
+            dataType,
             visible,
-            alwaysHidden,
+            isUIHiddenColumn,
             readOnly: this.isColumnReadonly(colDef),
             columnGroup: ColumnGroup,
             fieldOnly: isGenerated ? false : this.isColumnFieldonly(colDef),

package/src/agGrid/AgGridColumnAdapter.js

@@ -1,5 +1,5 @@
-import kebabCase from 'lodash/kebabCase';
-import merge from 'lodash/merge';
+import kebabCase from '../Utilities/utils/kebabCase';
+import merge from '../Utilities/utils/merge';
 import { convertAdaptableStyleToCSS, getVariableColor, normalizeStyleForAgGrid, } from '../Utilities/Helpers/StyleHelper';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
 import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';

package/src/agGrid/cellRenderers/PercentBarRenderer.js

@@ -1,5 +1,5 @@
 import Helper from '../../Utilities/Helpers/Helper';
-import clamp from 'lodash/clamp';
+import clamp from '../../Utilities/utils/clamp';
 export const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
     if (!styledColumn.PercentBarStyle) {
         return;

package/src/components/ColorPicker/ColorPicker.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useCallback, useEffect } from 'react';
-import debounce from 'lodash/debounce';
+import debounce from '../../Utilities/utils/debounce';
 import Input from '../Input';
 import { getVariableColor } from '../../Utilities/Helpers/StyleHelper';
 import tinycolor from 'tinycolor2';

package/src/components/DropdownButton/renderItem.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import isPlainObject from 'lodash/isPlainObject';
+import isPlainObject from '../../Utilities/utils/isPlainObject';
 export default ({ domProps, item, onItemClick, index, columns, className, idProperty, style, }) => {
     const key = item[idProperty] || index;
     if (!isPlainObject(item)) {

package/src/components/FormLayout/index.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { createContext, useContext } from 'react';
-import merge from 'lodash/merge';
+import merge from '../../Utilities/utils/merge';
 import join from '../utils/join';
 import { Box } from '../Flex';
 const FormLayoutContext = createContext(null);

package/src/components/OverlayTrigger/index.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useRef, useEffect } from 'react';
-import debounce from 'lodash/debounce';
+import debounce from '../../Utilities/utils/debounce';
 import batchUpdate from '../utils/batchUpdate';
 import selectParent from '../utils/selectParent';
 import useProperty from '../utils/useProperty';

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1770996876134 || Date.now(),
-    VERSION: "22.0.0-canary.11" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1771243557027 || Date.now(),
+    VERSION: "22.0.0-canary.13" || '--current-version--',
 };

package/src/layout-manager/src/isLayoutEqual.js

@@ -1,4 +1,4 @@
-import isDeepEqual from 'lodash/isEqual';
+import isDeepEqual from '../../Utilities/utils/isEqual';
 import { debug as debugFactory } from '@infinite-table/infinite-react';
 import { isPivotLayoutModel } from './isPivotLayoutModel';
 import { normalizePivotLayoutModel, normalizeTableLayoutModel } from './normalizeLayoutModel';