@adaptabletools/adaptable 12.0.0-canary.6 → 12.0.0-canary.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.0.0-canary.6",
+  "version": "12.0.0-canary.7",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1655383572755;
+declare const _default: 1655632388110;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/AdaptableFrameworkComponent.d.ts

@@ -29,6 +29,9 @@ export declare type AngularFrameworkComponent<T = unknown> = {
 export declare type ReactFrameworkComponent = ({ adaptableApi, }: {
     adaptableApi: AdaptableApi;
 }) => ReactElement;
+/**
+ * Context provided for any custom rendering
+ */
 export interface CustomRenderContext {
     visible: boolean;
     element: HTMLDivElement;

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -86,7 +86,7 @@ export interface FDC3Column {
     /**
      * Returns a custom icon to display in the Raise Intent Context Menu Item;
      */
-    getIconForIntent?: (intent: FDC3Intent | CustomFDC3Intent) => AdaptableIcon;
+    intentIcon?: (intent: FDC3Intent | CustomFDC3Intent) => AdaptableIcon;
 }
 /**
  * A Column which will be defined as an FDC3 Instrument

package/src/Api/FilterApi.d.ts

@@ -108,4 +108,11 @@ export interface FilterApi {
      * @param node Row Node to evaluate
      */
     evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
+    /**
+     * Checks if a filter is active or applied.
+     * It is applied when:
+     * - filter predicate does not have inputs
+     * - filter predicate has inputs with values
+     */
+    isFilterActive(columnFilter: ColumnFilter): boolean;
 }

package/src/Api/Implementation/FilterApiImpl.d.ts

@@ -28,4 +28,12 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
     columnFiltersToString(columnFilters: ColumnFilter[]): string;
     evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
     private getColumnFilterById;
+    /**
+     * Checks if a filter is applied. It is applied when:
+     * - has no inputs
+     * - has inputs and inputs have values
+     *
+     * @param filter
+     */
+    isFilterActive(filter: ColumnFilter): boolean;
 }

package/src/Api/Implementation/FilterApiImpl.js

@@ -7,6 +7,7 @@ const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/La
 const ApiBase_1 = require("./ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class FilterApiImpl extends ApiBase_1.ApiBase {
     getAllSystemFilterIds() {
         return this.getFilterOptions().systemFilters;
@@ -179,5 +180,29 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         var _a;
         return (_a = this.getColumnFilters()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
     }
+    /**
+     * Checks if a filter is applied. It is applied when:
+     * - has no inputs
+     * - has inputs and inputs have values
+     *
+     * @param filter
+     */
+    isFilterActive(filter) {
+        const predicateDef = this.adaptable.api.predicateApi.getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
+        if (ArrayExtensions_1.default.IsNull(predicateDef.inputs) &&
+            // values predicates have no inputs in the definition
+            !this.adaptable.api.predicateApi.hasPredicateValues(filter.Predicate)) {
+            return true;
+        }
+        const inputs = filter.Predicate.Inputs;
+        if (ArrayExtensions_1.default.IsEmpty(inputs)) {
+            return false;
+        }
+        // all values in the array need to be non-empty (e.g. between has two values, [min, max])
+        const allInputsHaveValues = inputs.every((value) => {
+            return value !== undefined && value !== null && value !== '';
+        });
+        return allInputsHaveValues;
+    }
 }
 exports.FilterApiImpl = FilterApiImpl;

package/src/Api/Implementation/PredicateApiImpl.d.ts

@@ -14,4 +14,5 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     isValidPredicate(predicate: AdaptablePredicate | undefined): boolean;
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
+    hasPredicateValues(predicate: AdaptablePredicate): boolean;
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -96,5 +96,8 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         }
         return predicateId;
     }
+    hasPredicateValues(predicate) {
+        return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';
+    }
 }
 exports.PredicateApiImpl = PredicateApiImpl;

package/src/Api/Implementation/TeamSharingApiImpl.d.ts

@@ -12,4 +12,8 @@ export declare class TeamSharingApiImpl extends ApiBase implements TeamSharingAp
     fireTeamSharingEntityChangedEvent(sharedEntity: SharedEntity): void;
     shareEntity(entity: AdaptableObject, module: AdaptableModule, sharedEntityConfig: SharedEntityConfig): void;
     unshareEntity(entityId: string): void;
+    importSharedEntry(sharedEntity: SharedEntity): void;
+    private getTeamSharingState;
+    getLoadedSharedEntities(): SharedEntity[];
+    triggerLoadingTeamSharingEntries(): void;
 }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -69,5 +69,17 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         }
         this.dispatchAction(TeamSharingRedux.TeamSharingRemoveItem(entityId));
     }
+    importSharedEntry(sharedEntity) {
+        this.adaptable.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingImportItem(sharedEntity));
+    }
+    getTeamSharingState() {
+        return this.getAdaptableState().TeamSharing;
+    }
+    getLoadedSharedEntities() {
+        return this.getTeamSharingState().SharedEntities;
+    }
+    triggerLoadingTeamSharingEntries() {
+        this.adaptable.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingGet());
+    }
 }
 exports.TeamSharingApiImpl = TeamSharingApiImpl;

package/src/Api/PredicateApi.d.ts

@@ -59,4 +59,10 @@ export interface PredicateApi {
      * @param dataType DataType of Column
      */
     getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
+    /**
+     * Returns true if the predicate has a dropdown.
+     *
+     * @param predicate
+     */
+    hasPredicateValues(predicate: AdaptablePredicate): boolean;
 }

package/src/Api/TeamSharingApi.d.ts

@@ -54,4 +54,19 @@ export interface TeamSharingApi {
      * @param entityId the ID of the AdaptableObject to be removed from Team Share
      */
     unshareEntity(entityId: string): void;
+    /**
+     * Import shared entry.
+     *
+     * @param sharedEntity shared entry to import
+     */
+    importSharedEntry(sharedEntity: SharedEntity): void;
+    /**
+     * Retrieves already loaded shared entries.
+     */
+    getLoadedSharedEntities(): SharedEntity[];
+    /**
+     * Trigger loading of shared entries.
+     * By default shared entries are loaded when the Team Sharing popup is visible.
+     */
+    triggerLoadingTeamSharingEntries(): void;
 }

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -325,7 +325,7 @@ class QuickFilterFormComponent extends React.Component {
         this.props.api.filterApi.clearColumnFilterByColumn(filter.ColumnId);
     }
     hasValuesPredicate(predicate) {
-        return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';
+        return this.props.api.predicateApi.hasPredicateValues(predicate);
     }
 }
 function mapStateToProps(state, ownProps) {

package/src/View/StatusBar/StatusBarPopup.js

@@ -39,6 +39,6 @@ const StatusBarPopup = (props) => {
             dragAndDropTab: false,
             deleteTab: false,
             editTabName: false,
-        }, onTabsChange: handleTabChange, disabled: disabled, tabs: tabs, availableItems: availableItems, tabsTitle: 'Status Bar Panels', unusedPanelTitle: "Available Status Panels", dragItemText: "Drag into a Status Bar Panel below" })) : (React.createElement(EmptyContent_1.default, null, "To enable this feature add to Grid Options statusPanels the Adaptable Status Panel."))));
+        }, onTabsChange: handleTabChange, disabled: disabled, tabs: tabs, availableItems: availableItems, tabsTitle: 'AdapTable Status Bar Panels', unusedPanelTitle: "Available Module Status Panels", dragItemText: "Drag into a Status Bar Panel below" })) : (React.createElement(EmptyContent_1.default, null, "To enable this feature add to Grid Options statusPanels the Adaptable Status Panel."))));
 };
 exports.StatusBarPopup = StatusBarPopup;

package/src/agGrid/Adaptable.js

@@ -2935,12 +2935,14 @@ class Adaptable {
         this.prepareGrid();
     }
     updateColumnFilterActiveState() {
+        var _a;
         const columnFilters = this.api.filterApi.getColumnFilters();
-        const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(columnFilters);
+        const activeFilters = (_a = columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.filter) === null || _a === void 0 ? void 0 : _a.call(columnFilters, (columnFilter) => this.api.filterApi.isFilterActive(columnFilter));
+        const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(activeFilters);
         const columnsWithActiveFilters = {};
         if (isFilterActive) {
             // used in particular at init time to show the filter icon correctly
-            for (const colFilter of columnFilters) {
+            for (const colFilter of activeFilters) {
                 const agGridCol = this.gridOptions.columnApi.getColumn(colFilter.ColumnId);
                 if (agGridCol) {
                     columnsWithActiveFilters[agGridCol.getColId()] = true;

package/src/components/Dashboard/Dashboard.js

@@ -43,7 +43,7 @@ function Dashboard(props) {
             } }, child.props.title)))));
     const renderTabsDropdown = () => {
         var _a, _b, _c;
-        if (children && children.length === 0) {
+        if (children && children.length < 2) {
             return null;
         }
         const activeTabTitle = (_c = (_b = (_a = children === null || children === void 0 ? void 0 : children[activeTabIndex]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : 'Select Toolbar';
@@ -72,6 +72,7 @@ function Dashboard(props) {
     const renderHomeToolbar = () => (React.createElement(DashboardToolbar_1.DashboardToolbar, { onConfigure: onShowDashboardPopup, className: "ab-Dashboard__home-toolbar", title: title, tooltip: `Configure Dashboard`, showConfigure: true, showClose: false, accessLevel: 'Full' },
         left,
         right,
+        children && children.length > 1,
         renderTabsDropdown()));
     return (React.createElement("div", { 
         // @ts-ignore

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

@@ -1755,6 +1755,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    CustomRenderContext: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     CustomReport: {
         name: string;
         kind: string;