@adaptabletools/adaptable 12.1.4 → 12.1.7

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,36 +1,105 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatusBarModuleId = exports.SettingsPanelModuleId = exports.ToolPanelModuleId = exports.ThemeModuleId = exports.TeamSharingModuleId = exports.SystemStatusModuleId = exports.StateManagementModuleId = exports.SmartEditModuleId = exports.ShortcutModuleId = exports.ScheduleModuleId = exports.QuickSearchModuleId = exports.QueryModuleId = exports.PlusMinusModuleId = exports.OpenFinModuleId = exports.LayoutModuleId = exports.IPushPullModuleId = exports.GridInfoModuleId = exports.Glue42ModuleId = exports.FreeTextColumnModuleId = exports.FormatColumnModuleId = exports.FilterModuleId = exports.ExportModuleId = exports.DataSetModuleId = exports.DataChangeHistoryModuleId = exports.DashboardModuleId = exports.CustomSortModuleId = exports.ConditionalStyleModuleId = exports.ChartingModuleId = exports.CellSummaryModuleId = exports.CalculatedColumnModuleId = exports.BulkUpdateModuleId = exports.FlashingCellModuleId = exports.AlertModuleId = void 0;
+exports.ShortcutFriendlyName = exports.ShortcutModuleId = exports.ScheduleFriendlyName = exports.ScheduleModuleId = exports.QuickSearchFriendlyName = exports.QuickSearchModuleId = exports.QueryFriendlyName = exports.QueryModuleId = exports.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.GridInfoFriendlyName = exports.GridInfoModuleId = exports.Glue42FriendlyName = exports.Glue42ModuleId = exports.FreeTextColumnFriendlyName = exports.FreeTextColumnModuleId = exports.FormatColumnFriendlyName = exports.FormatColumnModuleId = exports.FilterFriendlyName = exports.FilterModuleId = exports.ExportFriendlyName = exports.ExportModuleId = exports.DataSetFriendlyName = exports.DataSetModuleId = exports.DataChangeHistoryFriendlyName = exports.DataChangeHistoryModuleId = exports.DashboardFriendlyName = exports.DashboardModuleId = exports.CustomSortFriendlyName = exports.CustomSortModuleId = exports.ConditionalStyleFriendlyName = exports.ConditionalStyleModuleId = exports.ChartingFriendlyName = exports.ChartingModuleId = exports.CellSummaryFriendlyName = exports.CellSummaryModuleId = exports.CalculatedColumnFriendlyName = exports.CalculatedColumnModuleId = exports.BulkUpdateFriendlyName = exports.BulkUpdateModuleId = exports.FlashingCellFriendlyName = exports.FlashingCellModuleId = exports.AlertModuleFriendlyName = exports.AlertModuleId = void 0;
+exports.ADAPTABLE_MODULE_MAP = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.SmartEditFriendlyName = exports.SmartEditModuleId = void 0;
 exports.AlertModuleId = 'Alert';
+exports.AlertModuleFriendlyName = 'Alert';
 exports.FlashingCellModuleId = 'FlashingCell';
+exports.FlashingCellFriendlyName = 'Flashing Cell';
 exports.BulkUpdateModuleId = 'BulkUpdate';
+exports.BulkUpdateFriendlyName = 'Bulk Update';
 exports.CalculatedColumnModuleId = 'CalculatedColumn';
+exports.CalculatedColumnFriendlyName = 'Calculated Column';
 exports.CellSummaryModuleId = 'CellSummary';
+exports.CellSummaryFriendlyName = 'Cell Summary';
 exports.ChartingModuleId = 'Charting';
+exports.ChartingFriendlyName = 'Charts';
 exports.ConditionalStyleModuleId = 'ConditionalStyle';
+exports.ConditionalStyleFriendlyName = 'Conditional Style';
 exports.CustomSortModuleId = 'CustomSort';
+exports.CustomSortFriendlyName = 'Custom Sort';
 exports.DashboardModuleId = 'Dashboard';
+exports.DashboardFriendlyName = 'Dashboard';
 exports.DataChangeHistoryModuleId = 'DataChangeHistory';
+exports.DataChangeHistoryFriendlyName = 'Data Changes';
 exports.DataSetModuleId = 'DataSet';
+exports.DataSetFriendlyName = 'Data Set';
 exports.ExportModuleId = 'Export';
+exports.ExportFriendlyName = 'Export';
 exports.FilterModuleId = 'Filter';
+exports.FilterFriendlyName = 'Filter';
 exports.FormatColumnModuleId = 'FormatColumn';
+exports.FormatColumnFriendlyName = 'Format Column';
 exports.FreeTextColumnModuleId = 'FreeTextColumn';
+exports.FreeTextColumnFriendlyName = 'Free Text Column';
 exports.Glue42ModuleId = 'Glue42';
+exports.Glue42FriendlyName = 'Glue42';
 exports.GridInfoModuleId = 'GridInfo';
+exports.GridInfoFriendlyName = 'Grid Info';
 exports.IPushPullModuleId = 'IPushPull';
+exports.IPushPullFriendlyName = 'IPushPull';
 exports.LayoutModuleId = 'Layout';
+exports.LayoutFriendlyName = 'Layout';
 exports.OpenFinModuleId = 'OpenFin';
+exports.OpenFinFriendlyName = 'OpenFin';
 exports.PlusMinusModuleId = 'PlusMinus';
+exports.PlusMinusFriendlyName = 'Plus Minus';
 exports.QueryModuleId = 'Query';
+exports.QueryFriendlyName = 'Query';
 exports.QuickSearchModuleId = 'QuickSearch';
+exports.QuickSearchFriendlyName = 'Quick Search';
 exports.ScheduleModuleId = 'Schedule';
+exports.ScheduleFriendlyName = 'Schedule';
 exports.ShortcutModuleId = 'Shortcut';
+exports.ShortcutFriendlyName = 'Shortcut';
 exports.SmartEditModuleId = 'SmartEdit';
+exports.SmartEditFriendlyName = 'Smart Edit';
 exports.StateManagementModuleId = 'StateManagement';
+exports.StateManagementFriendlyName = 'Manage State';
 exports.SystemStatusModuleId = 'SystemStatus';
+exports.SystemStatusFriendlyName = 'System Status';
 exports.TeamSharingModuleId = 'TeamSharing';
+exports.TeamSharingFriendlyName = 'Team Sharing';
 exports.ThemeModuleId = 'Theme';
+exports.ThemeFriendlyName = 'Theme';
 exports.ToolPanelModuleId = 'ToolPanel';
+exports.ToolPanelFriendlyName = 'Tool Panel';
 exports.SettingsPanelModuleId = 'SettingsPanel';
+exports.SettingsPanelFriendlyName = 'Settings Panel';
 exports.StatusBarModuleId = 'StatusBar';
+exports.StatusBarFriendlyName = 'Status Bar';
+exports.ADAPTABLE_MODULE_MAP = {
+    [exports.AlertModuleId]: exports.AlertModuleFriendlyName,
+    [exports.FlashingCellModuleId]: exports.FlashingCellFriendlyName,
+    [exports.BulkUpdateModuleId]: exports.BulkUpdateFriendlyName,
+    [exports.CalculatedColumnModuleId]: exports.CalculatedColumnFriendlyName,
+    [exports.CellSummaryModuleId]: exports.CellSummaryFriendlyName,
+    [exports.ChartingModuleId]: exports.ChartingFriendlyName,
+    [exports.ConditionalStyleModuleId]: exports.ConditionalStyleFriendlyName,
+    [exports.CustomSortModuleId]: exports.CustomSortFriendlyName,
+    [exports.DashboardModuleId]: exports.DashboardFriendlyName,
+    [exports.DataChangeHistoryModuleId]: exports.DataChangeHistoryFriendlyName,
+    [exports.DataSetModuleId]: exports.DataSetFriendlyName,
+    [exports.ExportModuleId]: exports.ExportFriendlyName,
+    [exports.FilterModuleId]: exports.FilterFriendlyName,
+    [exports.FormatColumnModuleId]: exports.FormatColumnFriendlyName,
+    [exports.FreeTextColumnModuleId]: exports.FreeTextColumnFriendlyName,
+    [exports.Glue42ModuleId]: exports.Glue42FriendlyName,
+    [exports.GridInfoModuleId]: exports.GridInfoFriendlyName,
+    [exports.IPushPullModuleId]: exports.IPushPullFriendlyName,
+    [exports.LayoutModuleId]: exports.LayoutFriendlyName,
+    [exports.OpenFinModuleId]: exports.OpenFinFriendlyName,
+    [exports.PlusMinusModuleId]: exports.PlusMinusFriendlyName,
+    [exports.QueryModuleId]: exports.QueryFriendlyName,
+    [exports.QuickSearchModuleId]: exports.QuickSearchFriendlyName,
+    [exports.ScheduleModuleId]: exports.ScheduleFriendlyName,
+    [exports.ShortcutModuleId]: exports.ShortcutFriendlyName,
+    [exports.SmartEditModuleId]: exports.SmartEditFriendlyName,
+    [exports.StateManagementModuleId]: exports.StateManagementFriendlyName,
+    [exports.SystemStatusModuleId]: exports.SystemStatusFriendlyName,
+    [exports.TeamSharingModuleId]: exports.TeamSharingFriendlyName,
+    [exports.ThemeModuleId]: exports.ThemeFriendlyName,
+    [exports.ToolPanelModuleId]: exports.ToolPanelFriendlyName,
+    [exports.SettingsPanelModuleId]: exports.SettingsPanelFriendlyName,
+    [exports.StatusBarModuleId]: exports.StatusBarFriendlyName,
+};

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -12,6 +12,7 @@ const aggregatedBooleanExpressionFunctions_1 = require("../ExpressionFunctions/a
 const AdaptablePredicate_1 = require("../../PredefinedConfig/Common/AdaptablePredicate");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const aggregatedScalarExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedScalarExpressionFunctions");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 // change type to DeepRequired<AdaptableOptions> to check which properties have no default values defined
 exports.DefaultAdaptableOptions = {
     adaptableId: GeneralConstants.ADAPTABLE_ID,
@@ -204,6 +205,7 @@ exports.DefaultAdaptableOptions = {
         maxFilterValuesToDisplay: 2000,
         systemFilters: AdaptablePredicate_1.SystemFilterPredicateIds,
         showQuickFilter: true,
+        showDistinctFilteredValuesOnly: false,
     },
     searchOptions: {
         excludeColumnFromQuickSearch: undefined,
@@ -260,7 +262,7 @@ exports.DefaultAdaptableOptions = {
     },
     settingsPanelOptions: {
         popupType: 'window',
-        title: 'Settings Panel',
+        title: ModuleConstants.SettingsPanelFriendlyName,
         icon: 'ConfigurationIcon',
         navigation: {},
         alwaysShowInDashboard: false,

package/src/Utilities/Extensions/ArrayExtensions.js

@@ -109,6 +109,12 @@ function moveArray(array, from, to) {
 exports.moveArray = moveArray;
 //This deliberately only checks contents equality and not positional so [1, 2, 3]== [1, 3, 2]
 function areArraysEqual(arr1, arr2) {
+    if (IsNullOrEmpty(arr1) && IsNotNullOrEmpty(arr2)) {
+        return false;
+    }
+    if (IsNotNullOrEmpty(arr1) && IsNullOrEmpty(arr2)) {
+        return false;
+    }
     if (arr1.length !== arr2.length) {
         return false;
     }

package/src/Utilities/Helpers/CalendarHelper.js

@@ -298,7 +298,7 @@ function getNextWorkingDay(days = 1) {
     let counterDate = new Date();
     while (count < days) {
         counterDate.setDate(counterDate.getDate() + 1);
-        if (this.isNotWorkingDay(counterDate)) {
+        if (isNotWorkingDay(counterDate)) {
             count++;
         }
     }
@@ -310,7 +310,7 @@ function getPreviousWorkingDay(days = 1) {
     let counterDate = new Date();
     while (count < days) {
         counterDate.setDate(counterDate.getDate() - 1);
-        if (this.isNotWorkingDay(counterDate)) {
+        if (isNotWorkingDay(counterDate)) {
             count++;
         }
     }
@@ -319,14 +319,17 @@ function getPreviousWorkingDay(days = 1) {
 exports.getPreviousWorkingDay = getPreviousWorkingDay;
 // pretty sure this can be improved as pretty expensive - though rarely used to be honest
 function isNotWorkingDay(dateToCheck) {
-    let currentCalendar = this.getGeneralOptions().currentCalendar;
+    /*
+    // Removing lookups to current calendar until we decide what to do
+    let currentCalendar: string = this.getGeneralOptions().currentCalendar;
     let currentHoliday = getAvailableCalendars().find((c) => c.Name == currentCalendar);
     for (let holiday of currentHoliday.CalendarEntries) {
-        let holidayDate = new Date(holiday.HolidayDate);
-        if (holidayDate.setHours(0, 0, 0, 0) == dateToCheck.setHours(0, 0, 0, 0)) {
-            return false;
-        }
+      let holidayDate = new Date(holiday.HolidayDate);
+      if (holidayDate.setHours(0, 0, 0, 0) == dateToCheck.setHours(0, 0, 0, 0)) {
+        return false;
+      }
     }
+    */
     return dateToCheck.getDay() != 0 && dateToCheck.getDay() != 6;
 }
 exports.isNotWorkingDay = isNotWorkingDay;

package/src/Utilities/Helpers/DateHelper.d.ts

@@ -8,30 +8,4 @@ export declare const isValueValidDate: (data: any) => boolean;
 export declare const dateToISO: (date: Date | number | string) => string;
 export declare const parseToISO: (date: string | Date | number, dateFormat?: string) => string;
 export declare const parseDateValue: (dateValue: string | Date | number, dateFormat?: string) => Date | undefined;
-/**
- * Creates a date with the same day/month/year/hour with the current timezone.
- * '2022-06-01T17:00:00.000Z' => '2022-06-01T17:00:00.000+03:00' // RO time
- *
- * new Date() always creates the date using the current timezone.
- * To compare two dates, they need to be in the same timezone.
- *
- * @param date Date
- */
-export declare const utcDateToSameDateInLocale: (date: Date) => Date;
-/**
- * To make sure selected/input date is correct and in the current time-zone.
- 
- *
- * '2022-06-14' is considered to be '2022-06-13 00:00:00.
- * And when date object is created it uses the current timezone.
- *
- * '2022-06-14' => Mon Jun 13 2022 20:00:00 GMT-0400 (Eastern Daylight Time)
- *
- * @param stringDate date string
- */
 export declare const parseFilterInputDate: (stringDate: string) => Date;
-/**
- * Used to parse the date from rowDate inside date predicates.
- * The date is parsed in moved to local timezone.
- */
-export declare const parseFilterValueDate: (value: any) => Date;

package/src/Utilities/Helpers/DateHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFilterValueDate = exports.parseFilterInputDate = exports.utcDateToSameDateInLocale = exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
+exports.parseFilterInputDate = exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
 const tslib_1 = require("tslib");
 const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
 const parse_1 = tslib_1.__importDefault(require("date-fns/parse"));
@@ -63,35 +63,5 @@ const parseDateValue = (dateValue, dateFormat) => {
     return dateInstance;
 };
 exports.parseDateValue = parseDateValue;
-/**
- * Creates a date with the same day/month/year/hour with the current timezone.
- * '2022-06-01T17:00:00.000Z' => '2022-06-01T17:00:00.000+03:00' // RO time
- *
- * new Date() always creates the date using the current timezone.
- * To compare two dates, they need to be in the same timezone.
- *
- * @param date Date
- */
-const utcDateToSameDateInLocale = (date) => {
-    return new Date(date.getTime() + date.getTimezoneOffset() * 60 * 1000);
-};
-exports.utcDateToSameDateInLocale = utcDateToSameDateInLocale;
-/**
- * To make sure selected/input date is correct and in the current time-zone.
- 
- *
- * '2022-06-14' is considered to be '2022-06-13 00:00:00.
- * And when date object is created it uses the current timezone.
- *
- * '2022-06-14' => Mon Jun 13 2022 20:00:00 GMT-0400 (Eastern Daylight Time)
- *
- * @param stringDate date string
- */
-const parseFilterInputDate = (stringDate) => exports.utcDateToSameDateInLocale(new Date(stringDate));
+const parseFilterInputDate = (stringDate) => new Date(stringDate);
 exports.parseFilterInputDate = parseFilterInputDate;
-/**
- * Used to parse the date from rowDate inside date predicates.
- * The date is parsed in moved to local timezone.
- */
-const parseFilterValueDate = (value) => exports.utcDateToSameDateInLocale(exports.parseDateValue(value));
-exports.parseFilterValueDate = parseFilterValueDate;

package/src/Utilities/ObjectFactory.d.ts

@@ -29,7 +29,7 @@ import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableApi } from '../../types';
 import { ToastOptions } from '../components/Toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
-export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
+export declare function CreateEmptyCalculatedColumn(): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
 export declare function CreateGenericAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition): AdaptableGenericAlert;
@@ -55,7 +55,7 @@ export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
 export declare function CreateEmptyConditionalStyle(): ConditionalStyle;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
-export declare function CreateEmptyFreeTextColumn(isFilterable: boolean): FreeTextColumn;
+export declare function CreateEmptyFreeTextColumn(): FreeTextColumn;
 export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
     Name: string;
 }, adaptableColumns?: AdaptableColumn[]): Layout;

package/src/Utilities/ObjectFactory.js

@@ -9,7 +9,7 @@ function CreateEmptyCustomSort() {
     return { Uuid: Uuid_1.createUuid(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
 exports.CreateEmptyCustomSort = CreateEmptyCustomSort;
-function CreateEmptyCalculatedColumn(isFilterable) {
+function CreateEmptyCalculatedColumn() {
     return {
         Uuid: Uuid_1.createUuid(),
         ColumnId: GeneralConstants_1.EMPTY_STRING,
@@ -18,12 +18,12 @@ function CreateEmptyCalculatedColumn(isFilterable) {
         },
         // need to create some defaults - which we will change later
         CalculatedColumnSettings: {
-            Filterable: isFilterable,
-            Resizable: true,
-            Groupable: true,
-            Sortable: true,
-            Pivotable: true,
-            Aggregatable: true,
+            Filterable: false,
+            Resizable: false,
+            Groupable: false,
+            Sortable: false,
+            Pivotable: false,
+            Aggregatable: false,
             SuppressMenu: false,
             SuppressMovable: false,
         },
@@ -283,7 +283,7 @@ function CreateEmptyFormatColumn() {
     };
 }
 exports.CreateEmptyFormatColumn = CreateEmptyFormatColumn;
-function CreateEmptyFreeTextColumn(isFilterable) {
+function CreateEmptyFreeTextColumn() {
     return {
         Uuid: Uuid_1.createUuid(),
         ColumnId: GeneralConstants_1.EMPTY_STRING,
@@ -292,12 +292,12 @@ function CreateEmptyFreeTextColumn(isFilterable) {
         TextEditor: 'Inline',
         DataType: 'String',
         FreeTextColumnSettings: {
-            Filterable: isFilterable,
-            Resizable: true,
-            Groupable: true,
-            Sortable: true,
-            Pivotable: true,
-            Aggregatable: true,
+            Filterable: false,
+            Resizable: false,
+            Groupable: false,
+            Sortable: false,
+            Pivotable: false,
+            Aggregatable: false,
             SuppressMenu: false,
             SuppressMovable: false,
         },

package/src/Utilities/Services/Interface/IMetamodelService.d.ts

@@ -1,3 +1,5 @@
+import { AdaptableOptions } from '../../../../types';
+import { MetamodelItemPropertyKind } from '../../../metamodel/adaptable-metamodel-model';
 import { IAdaptableService } from './IAdaptableService';
 export declare type GridInfoOptions = Map<string, {
     containerLabel: string;
@@ -7,9 +9,12 @@ export interface GridInfoOption {
     name: string;
     value: any;
     description: string;
+    kind: MetamodelItemPropertyKind;
     defaultValue?: any;
 }
 export interface IMetamodelService extends IAdaptableService {
+    getAdaptableOptions: () => AdaptableOptions;
     getGridInfoOptions(): GridInfoOptions;
+    getGridInfoNoCodeOptions(): GridInfoOptions;
     validateAdaptableOptionsValues(): void;
 }

package/src/Utilities/Services/MetamodelService.d.ts

@@ -1,10 +1,11 @@
 import { GridInfoOptions, IMetamodelService } from './Interface/IMetamodelService';
-import { AdaptableApi } from '../../../types';
+import { AdaptableOptions } from '../../../types';
 export declare class MetamodelService implements IMetamodelService {
-    private adaptableApi;
     private gridInfoOptions;
-    constructor(adaptableApi: AdaptableApi);
+    getAdaptableOptions: () => AdaptableOptions;
+    constructor(getAdaptableOptions: () => AdaptableOptions);
     getGridInfoOptions(): GridInfoOptions;
+    getGridInfoNoCodeOptions(): GridInfoOptions;
     validateAdaptableOptionsValues(): void;
     private validateOptionsObject;
     private getExpectedOptionsValueType;
@@ -13,5 +14,4 @@ export declare class MetamodelService implements IMetamodelService {
     private getAdaptableOptionsDefaultValues;
     private getAdaptableMetamodel;
     private getAdaptableOptionsMetamodel;
-    private getAdaptableOptions;
 }

package/src/Utilities/Services/MetamodelService.js

@@ -14,15 +14,23 @@ const supportedMetamodelTypes = [
     'REFERENCE',
 ];
 class MetamodelService {
-    constructor(adaptableApi) {
-        this.adaptableApi = adaptableApi;
+    constructor(getAdaptableOptions) {
         this.gridInfoOptions = new Map();
-        this.adaptableApi = adaptableApi;
+        this.getAdaptableOptions = () => null;
+        this.getAdaptableOptions = getAdaptableOptions;
         this.gridInfoOptions = this.buildGridInfoOptions();
     }
     getGridInfoOptions() {
         return this.gridInfoOptions;
     }
+    getGridInfoNoCodeOptions() {
+        return this.buildGridInfoOptions({
+            filterItemProperty: (itemProperty) => {
+                return itemProperty.noCode === 'item';
+            },
+            filterEmptyAdaptableOptions: false,
+        });
+    }
     validateAdaptableOptionsValues() {
         var _a;
         LoggingHelper_1.LogAdaptableInfo('Validating Adaptable Options...');
@@ -79,7 +87,8 @@ class MetamodelService {
             return metamodelPropertyKind;
         }
     }
-    buildGridInfoOptions() {
+    buildGridInfoOptions(options) {
+        const { filterItemProperty, filterEmptyAdaptableOptions = true } = options || {};
         const gridInfoOptions = new Map();
         const adaptableMetamodel = this.getAdaptableMetamodel();
         const adaptableOptionsMetamodel = this.getAdaptableOptionsMetamodel();
@@ -107,12 +116,12 @@ class MetamodelService {
             // @ts-ignore
             const containerOptionsDefaultValues = adaptableOptionsDefaultValues[adaptableOptionsName];
             if (!containerOptionsMetamodel ||
-                !containerOptionsValues ||
+                (!containerOptionsValues && filterEmptyAdaptableOptions) ||
                 !containerOptionsDefaultValues) {
                 // should never happen
                 return;
             }
-            const optionItems = this.mapGridInfoContainerItems(containerOptionsMetamodel, containerOptionsValues, containerOptionsDefaultValues);
+            const optionItems = this.mapGridInfoContainerItems(containerOptionsMetamodel, containerOptionsValues, containerOptionsDefaultValues, filterItemProperty);
             gridInfoOptions.set(containerOptionItem.name, {
                 containerLabel: containerOptionItem.uiLabel,
                 items: optionItems,
@@ -120,13 +129,14 @@ class MetamodelService {
         });
         return gridInfoOptions;
     }
-    mapGridInfoContainerItems(optionItemContainer, adaptableOptionsValues, defaultAdaptableOptionsValues) {
+    mapGridInfoContainerItems(optionItemContainer, adaptableOptionsValues, defaultAdaptableOptionsValues, filter = (itemProperty) => itemProperty.gridInfo === 'item') {
         var _a;
-        return (_a = optionItemContainer.properties) === null || _a === void 0 ? void 0 : _a.filter((itemProperty) => itemProperty.gridInfo === 'item').map((itemProperty) => {
+        return (_a = optionItemContainer.properties) === null || _a === void 0 ? void 0 : _a.filter(filter).map((itemProperty) => {
             return {
                 name: itemProperty.name,
-                value: adaptableOptionsValues[itemProperty.name],
+                value: adaptableOptionsValues === null || adaptableOptionsValues === void 0 ? void 0 : adaptableOptionsValues[itemProperty.name],
                 defaultValue: defaultAdaptableOptionsValues[itemProperty.name],
+                kind: itemProperty.kind,
                 description: itemProperty.description,
             };
         });
@@ -140,8 +150,5 @@ class MetamodelService {
     getAdaptableOptionsMetamodel() {
         return this.getAdaptableMetamodel()['AdaptableOptions'];
     }
-    getAdaptableOptions() {
-        return this.adaptableApi.internalApi.getAdaptableOptions();
-    }
 }
 exports.MetamodelService = MetamodelService;