@adaptabletools/adaptable 17.0.0-canary.11 → 17.0.0-canary.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "17.0.0-canary.11",
+  "version": "17.0.0-canary.12",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1705344182192;
+declare const _default: 1705410895243;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1705344182192;
+exports.default = 1705410895243;

package/src/Redux/ActionsReducers/PlusMinusRedux.d.ts

@@ -33,6 +33,14 @@ export declare const PLUS_MINUS_RULE_SUSPEND_ALL = "PLUS_MINUS_RULE_SUSPEND_ALL"
  * @ReduxAction All Plus Minus Rules have been unsuspended
  */
 export declare const PLUS_MINUS_RULE_UNSUSPEND_ALL = "PLUS_MINUS_RULE_UNSUSPEND_ALL";
+/**
+ * @ReduxAction A Plus Minus Rule has been moved up
+ */
+export declare const PLUS_MINUS_RULE_MOVE_UP = "PLUS_MINUS_RULE_MOVE_UP";
+/**
+ * @ReduxAction A Plus Minus Rule has been moved down
+ */
+export declare const PLUS_MINUS_RULE_MOVE_DOWN = "PLUS_MINUS_RULE_MOVE_DOWN";
 /**
  * @ReduxAction PlusMinus Module is ready
  */
@@ -57,6 +65,12 @@ export interface PlusMinusNudgeSuspendAllAction extends Redux.Action {
 }
 export interface PlusMinusNudgeUnSuspendAllAction extends Redux.Action {
 }
+export interface PlusMinusMoveUpAction extends Redux.Action {
+    plusMinusNudge: PlusMinusNudge;
+}
+export interface PlusMinusMoveDownAction extends Redux.Action {
+    plusMinusNudge: PlusMinusNudge;
+}
 export interface PlusMinusReadyAction extends Redux.Action {
     plusMinusState: PlusMinusState;
 }
@@ -68,5 +82,7 @@ export declare const PlusMinusNudgeSuspend: (plusMinusNudge: PlusMinusNudge) =>
 export declare const PlusMinusNudgeUnSuspend: (plusMinusNudge: PlusMinusNudge) => PlusMinusNudgeUnSuspendAction;
 export declare const PlusMinusNudgeSuspendAll: () => PlusMinusNudgeSuspendAllAction;
 export declare const PlusMinusNudgeUnSuspendAll: () => PlusMinusNudgeUnSuspendAllAction;
+export declare const PlusMinusMoveUp: (plusMinusNudge: PlusMinusNudge) => PlusMinusMoveUpAction;
+export declare const PlusMinusMoveDown: (plusMinusNudge: PlusMinusNudge) => PlusMinusMoveDownAction;
 export declare const PlusMinusReady: (plusMinusState: PlusMinusState) => PlusMinusReadyAction;
 export declare const PlusMinusReducer: Redux.Reducer<PlusMinusState>;

package/src/Redux/ActionsReducers/PlusMinusRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlusMinusReducer = exports.PlusMinusReady = exports.PlusMinusNudgeUnSuspendAll = exports.PlusMinusNudgeSuspendAll = exports.PlusMinusNudgeUnSuspend = exports.PlusMinusNudgeSuspend = exports.PlusMinusNudgeDelete = exports.PlusMinusNudgeEdit = exports.PlusMinusNudgeAdd = exports.PlusMinusApply = exports.PLUS_MINUS_READY = exports.PLUS_MINUS_RULE_UNSUSPEND_ALL = exports.PLUS_MINUS_RULE_SUSPEND_ALL = exports.PLUS_MINUS_RULE_UNSUSPEND = exports.PLUS_MINUS_RULE_SUSPEND = exports.PLUS_MINUS_RULE_DELETE = exports.PLUS_MINUS_RULE_EDIT = exports.PLUS_MINUS_RULE_ADD = exports.PLUS_MINUS_APPLY = void 0;
+exports.PlusMinusReducer = exports.PlusMinusReady = exports.PlusMinusMoveDown = exports.PlusMinusMoveUp = exports.PlusMinusNudgeUnSuspendAll = exports.PlusMinusNudgeSuspendAll = exports.PlusMinusNudgeUnSuspend = exports.PlusMinusNudgeSuspend = exports.PlusMinusNudgeDelete = exports.PlusMinusNudgeEdit = exports.PlusMinusNudgeAdd = exports.PlusMinusApply = exports.PLUS_MINUS_READY = exports.PLUS_MINUS_RULE_MOVE_DOWN = exports.PLUS_MINUS_RULE_MOVE_UP = exports.PLUS_MINUS_RULE_UNSUSPEND_ALL = exports.PLUS_MINUS_RULE_SUSPEND_ALL = exports.PLUS_MINUS_RULE_UNSUSPEND = exports.PLUS_MINUS_RULE_SUSPEND = exports.PLUS_MINUS_RULE_DELETE = exports.PLUS_MINUS_RULE_EDIT = exports.PLUS_MINUS_RULE_ADD = exports.PLUS_MINUS_APPLY = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -37,6 +37,14 @@ exports.PLUS_MINUS_RULE_SUSPEND_ALL = 'PLUS_MINUS_RULE_SUSPEND_ALL';
  * @ReduxAction All Plus Minus Rules have been unsuspended
  */
 exports.PLUS_MINUS_RULE_UNSUSPEND_ALL = 'PLUS_MINUS_RULE_UNSUSPEND_ALL';
+/**
+ * @ReduxAction A Plus Minus Rule has been moved up
+ */
+exports.PLUS_MINUS_RULE_MOVE_UP = 'PLUS_MINUS_RULE_MOVE_UP';
+/**
+ * @ReduxAction A Plus Minus Rule has been moved down
+ */
+exports.PLUS_MINUS_RULE_MOVE_DOWN = 'PLUS_MINUS_RULE_MOVE_DOWN';
 /**
  * @ReduxAction PlusMinus Module is ready
  */
@@ -79,6 +87,16 @@ const PlusMinusNudgeUnSuspendAll = () => ({
     type: exports.PLUS_MINUS_RULE_UNSUSPEND_ALL,
 });
 exports.PlusMinusNudgeUnSuspendAll = PlusMinusNudgeUnSuspendAll;
+const PlusMinusMoveUp = (plusMinusNudge) => ({
+    type: exports.PLUS_MINUS_RULE_MOVE_UP,
+    plusMinusNudge,
+});
+exports.PlusMinusMoveUp = PlusMinusMoveUp;
+const PlusMinusMoveDown = (plusMinusNudge) => ({
+    type: exports.PLUS_MINUS_RULE_MOVE_DOWN,
+    plusMinusNudge,
+});
+exports.PlusMinusMoveDown = PlusMinusMoveDown;
 const PlusMinusReady = (plusMinusState) => ({
     type: exports.PLUS_MINUS_READY,
     plusMinusState,
@@ -88,6 +106,7 @@ const initialState = {
     PlusMinusNudges: GeneralConstants_1.EMPTY_ARRAY,
 };
 const PlusMinusReducer = (state = initialState, action) => {
+    var _a, _b;
     let plusMinusNudges;
     switch (action.type) {
         case exports.PLUS_MINUS_APPLY:
@@ -120,6 +139,33 @@ const PlusMinusReducer = (state = initialState, action) => {
         case exports.PLUS_MINUS_RULE_UNSUSPEND: {
             return Object.assign(Object.assign({}, state), { PlusMinusNudges: (0, utils_1.changeIsSuspendInList)(action.plusMinusNudge, state.PlusMinusNudges, false) });
         }
+        case exports.PLUS_MINUS_RULE_MOVE_UP: {
+            const actionPlusMinusNudge = action.plusMinusNudge;
+            const plusMinusNudges = [...((_a = state.PlusMinusNudges) !== null && _a !== void 0 ? _a : [])];
+            const index = plusMinusNudges.findIndex((plusMinus) => plusMinus.Uuid === actionPlusMinusNudge.Uuid);
+            let swapIndex = index - 1;
+            if (swapIndex < 0) {
+                swapIndex = plusMinusNudges.length - 1;
+            }
+            const temp = plusMinusNudges[index];
+            plusMinusNudges[index] = plusMinusNudges[swapIndex];
+            plusMinusNudges[swapIndex] = temp;
+            return Object.assign(Object.assign({}, state), { PlusMinusNudges: plusMinusNudges });
+        }
+        case exports.PLUS_MINUS_RULE_MOVE_DOWN: {
+            const actionPlusMinusNudge = action
+                .plusMinusNudge;
+            const plusMinusNudges = [...((_b = state.PlusMinusNudges) !== null && _b !== void 0 ? _b : [])];
+            const index = plusMinusNudges.findIndex((plusMinus) => plusMinus.Uuid === actionPlusMinusNudge.Uuid);
+            let swapIndex = index + 1;
+            if (swapIndex >= plusMinusNudges.length) {
+                swapIndex = 0;
+            }
+            const temp = plusMinusNudges[index];
+            plusMinusNudges[index] = plusMinusNudges[swapIndex];
+            plusMinusNudges[swapIndex] = temp;
+            return Object.assign(Object.assign({}, state), { PlusMinusNudges: plusMinusNudges });
+        }
         default:
             return state;
     }

package/src/Strategy/PlusMinusModule.js

@@ -12,6 +12,7 @@ const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const PlusMinusWizard_1 = require("../View/PlusMinus/Wizard/PlusMinusWizard");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const MovePlusMinus_1 = require("../View/PlusMinus/MovePlusMinus");
 class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.PlusMinusModuleId, ModuleConstants.PlusMinusFriendlyName, 'add-circle', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
@@ -218,6 +219,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            actions: [MovePlusMinus_1.MovePlusMinus],
             getEditAction: PlusMinusRedux.PlusMinusNudgeEdit,
             getDeleteAction: PlusMinusRedux.PlusMinusNudgeDelete,
             getSuspendAction: PlusMinusRedux.PlusMinusNudgeSuspend,

package/src/View/PlusMinus/MovePlusMinus.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { AccessLevel, PlusMinusNudge } from '../../types';
+export declare const MovePlusMinus: React.FunctionComponent<{
+    data: PlusMinusNudge;
+    id?: string;
+    accessLevel: AccessLevel;
+}>;

package/src/View/PlusMinus/MovePlusMinus.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MovePlusMinus = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const PlusMinusRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PlusMinusRedux"));
+const react_redux_1 = require("react-redux");
+const AdaptableContext_1 = require("../AdaptableContext");
+const MovePlusMinus = (props) => {
+    const dispatch = (0, react_redux_1.useDispatch)();
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const plusMinusNudges = (0, react_redux_1.useSelector)((state) => state.PlusMinus.PlusMinusNudges);
+    const handleMoveUp = React.useCallback(() => {
+        dispatch(PlusMinusRedux.PlusMinusMoveUp(props.data));
+    }, []);
+    const handleMoveDown = React.useCallback(() => {
+        dispatch(PlusMinusRedux.PlusMinusMoveDown(props.data));
+    }, []);
+    if ((plusMinusNudges === null || plusMinusNudges === void 0 ? void 0 : plusMinusNudges.length) <= 1) {
+        return React.createElement(React.Fragment, null);
+    }
+    return (React.createElement(React.Fragment, null,
+        React.createElement(SimpleButton_1.default, { "data-id": "move-up", title: "move up", onClick: handleMoveUp, variant: "text", icon: "arrow-up" }),
+        React.createElement(SimpleButton_1.default, { "data-name": "move-down", title: "move down", onClick: handleMoveDown, variant: "text", icon: "arrow-down" })));
+};
+exports.MovePlusMinus = MovePlusMinus;

package/src/components/ExpressionEditor/index.js

@@ -32,6 +32,7 @@ function ExpressionEditor(props) {
     const { type, module } = props;
     const [data, setData] = (0, react_1.useState)(props.initialData);
     const [showColumnIds, setShowColumnIds] = (0, react_1.useState)(false);
+    const [inlineQuery, setInlineQuery] = (0, react_1.useState)(false);
     const [showNamedQueries, setShowNamedQueries] = (0, react_1.useState)(false);
     const baseClassName = `ab-ExpressionEditor`;
     const [selectedFunction, setSelectedFunction] = (0, react_1.useState)(null);
@@ -94,12 +95,8 @@ function ExpressionEditor(props) {
                 setData(updateColValue(data, column, new Date(e.target.value)));
             }, style: { width: '100%' }, disabled: column.readOnly })) : column.dataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-input", "data-value": column.columnId, checked: getColValue(column), onChange: (checked) => setData(updateColValue(data, column, checked)), disabled: column.readOnly })) : null))))));
     const namedQueries = (React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start", style: { marginTop: 2 } },
-        React.createElement(CheckBox_1.CheckBox, { checked: showColumnIds, onChange: (checked) => setShowColumnIds(checked), style: {
-                float: 'right',
-                margin: 0,
-                paddingTop: 'var(--ab-space-1)',
-                paddingBottom: 'var(--ab-space-1)',
-            } }, 'Show Column IDs'),
+        React.createElement(CheckBox_1.CheckBox, { checked: showColumnIds, onChange: (checked) => setShowColumnIds(checked) }, "Show Column IDs"),
+        React.createElement(CheckBox_1.CheckBox, { checked: inlineQuery, onChange: (checked) => setInlineQuery(checked) }, "Inline Query"),
         props.namedQueries.map((namedQuery) => (React.createElement(rebass_1.Flex, { key: namedQuery.Uuid, flexDirection: "column", alignItems: "start", style: {
                 padding: 3,
                 marginTop: 'var(--ab-space-2)',
@@ -110,7 +107,7 @@ function ExpressionEditor(props) {
             React.createElement(EditorButton_1.default, { width: "100%", height: "100%", style: {
                     background: 'var(--ab-color-primary)',
                     cursor: 'grab',
-                }, data: `QUERY("${namedQuery.Name}")`, "data-name": "column", icon: "drag" },
+                }, data: inlineQuery ? namedQuery.BooleanExpression : `QUERY("${namedQuery.Name}")`, "data-name": "column", icon: "drag" },
                 React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, namedQuery.Name)),
             React.createElement(rebass_1.Flex, { alignItems: "start", style: {
                     padding: 5,

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "17.0.0-canary.11";
+declare const _default: "17.0.0-canary.12";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '17.0.0-canary.11'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '17.0.0-canary.12'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version