@adaptabletools/adaptable 15.2.0-canary.6 → 15.2.0

package/src/agGrid/Adaptable.js

@@ -729,31 +729,35 @@ class Adaptable {
     }
     createAdaptableSideBarDef() {
         var _a;
-        if (
-        // no need to create the sidebar if it is not enabled
-        !this.gridOptions.sideBar) {
+        if (!this.gridOptions.sideBar) {
+            // no need to create the sidebar if it is not enabled
             return;
         }
+        const adaptableToolBarHidden = this.EntitlementService.isModuleHiddenEntitlement('ToolPanel');
         if (this.gridOptions.sideBar === true) {
             // create all tool panels with default settings
+            const toolPanels = [];
+            toolPanels.push(GeneralConstants.AGGRID_TOOLPANEL_FILTERS);
+            toolPanels.push(GeneralConstants.AGGRID_TOOLPANEL_COLUMNS);
+            if (!adaptableToolBarHidden) {
+                toolPanels.push(this.agGridHelper.buildAdaptableToolPanelDef());
+            }
             return {
-                toolPanels: [
-                    GeneralConstants.AGGRID_TOOLPANEL_FILTERS,
-                    GeneralConstants.AGGRID_TOOLPANEL_COLUMNS,
-                    this.agGridHelper.buildAdaptableToolPanelDef(),
-                ],
+                toolPanels: toolPanels,
             };
         }
         else if (typeof this.gridOptions.sideBar === 'string') {
             // there is only one tool panel, and it's the adaptable one => we have to handle it
             if (this.gridOptions.sideBar === GeneralConstants.ADAPTABLE_TOOLPANEL_ID) {
-                return {
-                    toolPanels: [this.agGridHelper.buildAdaptableToolPanelDef()],
-                };
+                if (!adaptableToolBarHidden)
+                    return {
+                        toolPanels: [this.agGridHelper.buildAdaptableToolPanelDef()],
+                    };
             }
         }
         else if (Array.isArray(this.gridOptions.sideBar)) {
-            if (!this.gridOptions.sideBar.includes(GeneralConstants.ADAPTABLE_TOOLPANEL_ID)) {
+            if (!this.gridOptions.sideBar.includes(GeneralConstants.ADAPTABLE_TOOLPANEL_ID) ||
+                adaptableToolBarHidden) {
                 return;
             }
             // if it's an array, process the tool panel definitions
@@ -763,7 +767,8 @@ class Adaptable {
         }
         else if (this.agGridHelper.isSideBarDefObject(this.gridOptions.sideBar)) {
             if ((_a = this.gridOptions.sideBar.toolPanels) === null || _a === void 0 ? void 0 : _a.some((toolpanelDef) => typeof toolpanelDef !== 'string' &&
-                toolpanelDef.id === GeneralConstants.ADAPTABLE_TOOLPANEL_ID)) {
+                toolpanelDef.id === GeneralConstants.ADAPTABLE_TOOLPANEL_ID &&
+                !adaptableToolBarHidden)) {
                 // return the boolean flag so that we know that we need the custom AdaptableToolPanel component
                 return true;
             }
@@ -1638,7 +1643,7 @@ class Adaptable {
     // This method returns selected cells ONLY (if selection mode is cells or multiple cells).
     // If the selection mode is row it will returns nothing - use the setSelectedRows() method
     setSelectedCells() {
-        if (!this.isGridSelectable()) {
+        if (!this.isGridRangeSelectable()) {
             return undefined;
         }
         const selected = this.gridOptions.api.getCellRanges();
@@ -4232,15 +4237,12 @@ class Adaptable {
             return indexFirstElement - indexSecondElement;
         };
     }
-    // do we want to do this each time or check once at startup and then set a flag?
     isGridSelectable() {
+        return (this.gridOptions.rowSelection === 'single' || this.gridOptions.rowSelection === 'multiple');
+    }
+    isGridRangeSelectable() {
         let isRangeSelectionModuleRegistered = this.isAgGridModulePresent(core_1.ModuleNames.RangeSelectionModule);
-        if (isRangeSelectionModuleRegistered &&
-            this.gridOptions.enableRangeSelection != null &&
-            this.gridOptions.enableRangeSelection) {
-            return true;
-        }
-        return false;
+        return isRangeSelectionModuleRegistered && this.gridOptions.enableRangeSelection === true;
     }
     isGridGroupable() {
         const isTreeLayout = this.api.internalApi.isGridInTreeMode();

package/src/metamodel/adaptable.metamodel.d.ts

@@ -2935,6 +2935,18 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    Glue42WebPluginOptions: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            defVal: string;
+        }[];
+    };
     GradientStyle: {
         name: string;
         kind: string;