@sisense/sdk-data 1.13.0 → 1.14.0

package/dist/cjs/dimensional-model/attributes.js

@@ -163,6 +163,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
      */
     translateGranularityToJaql() {
         const MINUTES_LEVEL = 'minutes';
+        const SECONDS_LEVEL = 'seconds';
         switch (this.granularity) {
             case types_js_1.DateLevels.Years:
             case types_js_1.DateLevels.Quarters:
@@ -185,6 +186,16 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
                     dateTimeLevel: MINUTES_LEVEL,
                     bucket: '15',
                 };
+            case types_js_1.DateLevels.Minutes:
+                return {
+                    dateTimeLevel: MINUTES_LEVEL,
+                    bucket: '1',
+                };
+            case types_js_1.DateLevels.Seconds:
+                return {
+                    dateTimeLevel: SECONDS_LEVEL,
+                    bucket: '0',
+                };
             case types_js_1.DateLevels.AggHours:
                 return {
                     level: MINUTES_LEVEL,
@@ -216,7 +227,7 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
             return lvl;
         };
         if (json.dateTimeLevel) {
-            if (json.dateTimeLevel !== 'minutes') {
+            if (json.dateTimeLevel !== 'minutes' && json.dateTimeLevel !== 'seconds') {
                 return returnUnsupported(json.dateTimeLevel);
             }
             switch (json.bucket) {
@@ -226,6 +237,10 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
                     return types_js_1.DateLevels.MinutesRoundTo30;
                 case '15':
                     return types_js_1.DateLevels.MinutesRoundTo15;
+                case '1':
+                    return types_js_1.DateLevels.Minutes;
+                case '0':
+                    return types_js_1.DateLevels.Seconds;
                 default:
                     return returnUnsupported(json.dateTimeLevel);
             }
@@ -277,6 +292,10 @@ class DimensionalLevelAttribute extends DimensionalAttribute {
                 return 'yyyy-MM-dd HH:mm';
             case types_js_1.DateLevels.MinutesRoundTo15:
                 return 'yyyy-MM-dd HH:mm';
+            case types_js_1.DateLevels.Minutes:
+                return 'yyyy-MM-dd HH:mm';
+            case types_js_1.DateLevels.Seconds:
+                return 'yyyy-MM-dd HH:mm:ss';
             case types_js_1.DateLevels.AggHours:
                 return 'HH:mm';
             case types_js_1.DateLevels.AggMinutesRoundTo30:

package/dist/cjs/dimensional-model/dimensions.d.ts

@@ -94,6 +94,14 @@ export declare class DimensionalDateDimension extends DimensionalDimension imple
      * Minutes (round to 15) level
      */
     readonly MinutesRoundTo15: LevelAttribute;
+    /**
+     * Minutes level (for Live Models)
+     */
+    readonly Minutes: LevelAttribute;
+    /**
+     * Seconds level (for Live Models)
+     */
+    readonly Seconds: LevelAttribute;
     /**
      * Aggregated Hours  level
      */

package/dist/cjs/dimensional-model/dimensions.js

@@ -164,6 +164,8 @@ class DimensionalDateDimension extends DimensionalDimension {
         this.Hours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Hours, expression, types_js_1.DateLevels.Hours, 'yyyy-MM-dd HH:mm');
         this.MinutesRoundTo30 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo30, expression, types_js_1.DateLevels.MinutesRoundTo30, 'yyyy-MM-dd HH:mm');
         this.MinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.MinutesRoundTo15, expression, types_js_1.DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm');
+        this.Minutes = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Minutes, expression, types_js_1.DateLevels.Minutes, 'yyyy-MM-dd HH:mm');
+        this.Seconds = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.Seconds, expression, types_js_1.DateLevels.Seconds, 'yyyy-MM-dd HH:mm:ss');
         this.AggHours = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggHours, expression, types_js_1.DateLevels.AggHours, 'HH:mm');
         this.AggMinutesRoundTo30 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo30, expression, types_js_1.DateLevels.AggMinutesRoundTo30, 'HH:mm');
         this.AggMinutesRoundTo15 = new attributes_js_1.DimensionalLevelAttribute(types_js_1.DateLevels.AggMinutesRoundTo15, expression, types_js_1.DateLevels.AggMinutesRoundTo15, 'HH:mm');
@@ -177,6 +179,8 @@ class DimensionalDateDimension extends DimensionalDimension {
             this.Hours,
             this.MinutesRoundTo30,
             this.MinutesRoundTo15,
+            this.Minutes,
+            this.Seconds,
             this.AggHours,
             this.AggMinutesRoundTo30,
             this.AggMinutesRoundTo15,

package/dist/cjs/dimensional-model/dimensions.test.js

@@ -43,6 +43,36 @@ describe('Dimension jaql preparations', () => {
         const jaql = dimension.jaql();
         expect(jaql).toStrictEqual(result);
     });
+    it('must prepare jaql for date dimension with "seconds" level', () => {
+        const result = {
+            jaql: {
+                title: 'Seconds',
+                dim: '[Commerce.Date (Calendar)]',
+                bucket: '0',
+                dateTimeLevel: 'seconds',
+                datatype: 'datetime',
+            },
+            format: { mask: { seconds: 'yyyy-MM-dd HH:mm:ss' } },
+        };
+        const dimension = new dimensions_js_1.DimensionalDateDimension('Date', '[Commerce.Date (Calendar)]');
+        const jaql = dimension.Seconds.jaql();
+        expect(jaql).toStrictEqual(result);
+    });
+    it('must prepare jaql for date dimension with "minutes" level', () => {
+        const result = {
+            jaql: {
+                title: 'Minutes',
+                dim: '[Commerce.Date (Calendar)]',
+                bucket: '1',
+                dateTimeLevel: 'minutes',
+                datatype: 'datetime',
+            },
+            format: { mask: { minutes: 'yyyy-MM-dd HH:mm' } },
+        };
+        const dimension = new dimensions_js_1.DimensionalDateDimension('Date', '[Commerce.Date (Calendar)]');
+        const jaql = dimension.Minutes.jaql();
+        expect(jaql).toStrictEqual(result);
+    });
     it('must handle sort', () => {
         const dimensionAscSort = new dimensions_js_1.DimensionalDimension('Brand', '[Brand.Brand]', [new attributes_js_1.DimensionalAttribute('Brand', '[Brand.Brand]')], [], 'textdimension', '', types_js_1.Sort.Ascending);
         const dimensionDescSort = new dimensions_js_1.DimensionalDimension('Brand', '[Brand.Brand]', [new attributes_js_1.DimensionalAttribute('Brand', '[Brand.Brand]')], [], 'textdimension', '', types_js_1.Sort.Descending);

package/dist/cjs/dimensional-model/filters/factory.d.ts

@@ -377,7 +377,7 @@ export declare function numeric(attribute: Attribute, operatorA?: string, valueA
  * @param guid - Optional GUID for the filter
  * @returns A filter instance
  */
-export declare function members(attribute: Attribute, members: string[], _deactivatedMembers?: string[], guid?: string): Filter;
+export declare function members(attribute: Attribute, members: string[], _deactivatedMembers?: string[], guid?: string, backgroundFilter?: Filter): Filter;
 /**
  * Creates a filter to isolate date values starting from and including the given date and level.
  *

package/dist/cjs/dimensional-model/filters/factory.js

@@ -449,8 +449,8 @@ exports.numeric = numeric;
  * @param guid - Optional GUID for the filter
  * @returns A filter instance
  */
-function members(attribute, members, _deactivatedMembers, guid) {
-    return new filters_js_1.MembersFilter(attribute, members, _deactivatedMembers, guid);
+function members(attribute, members, _deactivatedMembers, guid, backgroundFilter) {
+    return new filters_js_1.MembersFilter(attribute, members, _deactivatedMembers, guid, backgroundFilter);
 }
 exports.members = members;
 // DATE FILTERS

package/dist/cjs/dimensional-model/filters/filters.d.ts

@@ -95,6 +95,7 @@ declare abstract class AbstractFilter extends DimensionalElement implements Filt
      */
     readonly guid: string;
     private _disabled;
+    private _locked;
     /**
      * Boolean flag whether the filter is disabled
      *
@@ -102,6 +103,13 @@ declare abstract class AbstractFilter extends DimensionalElement implements Filt
      */
     get disabled(): boolean;
     set disabled(value: boolean);
+    /**
+     * Boolean flag whether the filter is locked
+     *
+     * @internal
+     */
+    get locked(): boolean;
+    set locked(value: boolean);
     constructor(att: Attribute, filterType: string, guid?: string);
     get name(): string;
     /**
@@ -156,7 +164,9 @@ export declare class MembersFilter extends AbstractFilter {
     readonly members: any[];
     /** @internal */
     _deactivatedMembers: any[];
-    constructor(attribute: Attribute, members?: any[], _deactivatedMembers?: any[], guid?: string);
+    /** @internal */
+    backgroundFilter?: Filter;
+    constructor(attribute: Attribute, members?: any[], _deactivatedMembers?: any[], guid?: string, backgroundFilter?: Filter);
     /**
      * gets the element's ID
      */
@@ -182,6 +192,8 @@ export declare class CascadingFilter extends AbstractFilter {
     get id(): string;
     get disabled(): boolean;
     set disabled(value: boolean);
+    get locked(): boolean;
+    set locked(value: boolean);
     /**
      * Gets a serializable representation of the element
      */

package/dist/cjs/dimensional-model/filters/filters.js

@@ -108,6 +108,7 @@ class AbstractFilter extends base_js_1.DimensionalElement {
         this.attribute = att;
         this.guid = guid || (0, utils_js_1.guidFast)(13);
         this.disabled = false;
+        this.locked = false;
     }
     /**
      * Boolean flag whether the filter is disabled
@@ -120,6 +121,17 @@ class AbstractFilter extends base_js_1.DimensionalElement {
     set disabled(value) {
         this._disabled = value;
     }
+    /**
+     * Boolean flag whether the filter is locked
+     *
+     * @internal
+     */
+    get locked() {
+        return this._locked;
+    }
+    set locked(value) {
+        this._locked = value;
+    }
     get name() {
         return (0, object_hash_1.default)(this.jaql());
     }
@@ -161,7 +173,9 @@ class AbstractFilter extends base_js_1.DimensionalElement {
         const { granularity } = attribute;
         if (granularity === types_js_1.DateLevels.Hours ||
             granularity === types_js_1.DateLevels.MinutesRoundTo30 ||
-            granularity === types_js_1.DateLevels.MinutesRoundTo15) {
+            granularity === types_js_1.DateLevels.MinutesRoundTo15 ||
+            granularity === types_js_1.DateLevels.Minutes ||
+            granularity === types_js_1.DateLevels.Seconds) {
             throw new translatable_error_js_1.TranslatableError('errors.filter.unsupportedDatetimeLevel');
         }
     }
@@ -207,10 +221,11 @@ exports.LogicalAttributeFilter = LogicalAttributeFilter;
  * @internal
  */
 class MembersFilter extends AbstractFilter {
-    constructor(attribute, members, _deactivatedMembers, guid) {
+    constructor(attribute, members, _deactivatedMembers, guid, backgroundFilter) {
         super(attribute, exports.FilterTypes.members, guid);
         this.members = members !== null && members !== void 0 ? members : [];
         this._deactivatedMembers = _deactivatedMembers !== null && _deactivatedMembers !== void 0 ? _deactivatedMembers : [];
+        this.backgroundFilter = backgroundFilter;
         if (this.members.filter((m) => m === null || m === undefined).length > 0) {
             throw new translatable_error_js_1.TranslatableError('errors.filter.membersFilterNullMember', {
                 attributeId: attribute.id,
@@ -229,15 +244,24 @@ class MembersFilter extends AbstractFilter {
     serializable() {
         const result = super.serializable();
         result.members = this.members;
+        if (this.backgroundFilter) {
+            result.backgroundFilter = this.backgroundFilter.serializable();
+        }
         return result;
     }
     /**
      * Gets JAQL representing this Filter instance
      */
     filterJaql() {
-        return {
+        const filterJaql = {
             members: this.members.map((m) => m.toString()),
         };
+        if (this.backgroundFilter) {
+            return {
+                and: [filterJaql, this.backgroundFilter.filterJaql()],
+            };
+        }
+        return filterJaql;
     }
 }
 exports.MembersFilter = MembersFilter;
@@ -266,6 +290,17 @@ class CascadingFilter extends AbstractFilter {
             });
         }
     }
+    get locked() {
+        return super.locked;
+    }
+    set locked(value) {
+        super.locked = value;
+        if (this.filters) {
+            this.filters.forEach((filter) => {
+                filter.locked = value;
+            });
+        }
+    }
     /**
      * Gets a serializable representation of the element
      */

package/dist/cjs/dimensional-model/filters/filters.test.js

@@ -206,6 +206,22 @@ describe('Filters jaql preparations', () => {
         const jaql = filter.jaql();
         expect(jaql).toStrictEqual(result);
     });
+    it('must prepare members filter jaql with inner background filter', () => {
+        const result = {
+            jaql: {
+                title: 'CommerceGender',
+                dim: '[Commerce.Gender]',
+                datatype: 'text',
+                filter: { and: [{ members: ['Female'] }, { members: ['Female', 'Male'] }] },
+            },
+        };
+        const attribute = new attributes_js_1.DimensionalAttribute('[Commerce.Gender]', '[Commerce.Gender]');
+        const backgroundFilter = new filters_js_1.MembersFilter(attribute, ['Female', 'Male']);
+        const filter = new filters_js_1.MembersFilter(attribute, ['Female'], undefined, undefined, backgroundFilter);
+        expect(filter.backgroundFilter).toBe(backgroundFilter);
+        const jaql = filter.jaql();
+        expect(jaql).toStrictEqual(result);
+    });
 });
 describe('Disabled Filter', () => {
     it('must prepare empty jaql for attribute filter', () => {

package/dist/cjs/dimensional-model/interfaces.d.ts

@@ -249,6 +249,14 @@ export interface DateDimension extends Dimension {
      * Minutes (round to 15) level (for Live Models)
      */
     readonly MinutesRoundTo15: LevelAttribute;
+    /**
+     * Minutes level (for Live Models)
+     */
+    readonly Minutes: LevelAttribute;
+    /**
+     * Seconds level (for Live Models)
+     */
+    readonly Seconds: LevelAttribute;
     /**
      * Aggregated Hours level (for Live Models)
      */
@@ -346,6 +354,12 @@ export interface Filter extends Element {
      * @internal
      */
     disabled: boolean;
+    /**
+     * Boolean flag whether the filter is locked
+     *
+     * @internal
+     */
+    locked: boolean;
     /**
      * Gets JAQL representing this Filter instance
      *

package/dist/cjs/dimensional-model/types.d.ts

@@ -144,6 +144,8 @@ export declare const DateLevels: {
     Hours: string;
     MinutesRoundTo30: string;
     MinutesRoundTo15: string;
+    Minutes: string;
+    Seconds: string;
     AggHours: string;
     AggMinutesRoundTo30: string;
     AggMinutesRoundTo15: string;

package/dist/cjs/dimensional-model/types.js

@@ -261,6 +261,8 @@ exports.DateLevels = {
     Hours: 'Hours',
     MinutesRoundTo30: 'MinutesRoundTo30',
     MinutesRoundTo15: 'MinutesRoundTo15',
+    Minutes: 'Minutes',
+    Seconds: 'Seconds',
     AggHours: 'AggHours',
     AggMinutesRoundTo30: 'AggMinutesRoundTo30',
     AggMinutesRoundTo15: 'AggMinutesRoundTo15',
@@ -276,6 +278,8 @@ exports.DateLevels = {
             exports.DateLevels.Hours,
             exports.DateLevels.MinutesRoundTo30,
             exports.DateLevels.MinutesRoundTo15,
+            exports.DateLevels.Minutes,
+            exports.DateLevels.Seconds,
             exports.DateLevels.AggHours,
             exports.DateLevels.AggMinutesRoundTo30,
             exports.DateLevels.AggMinutesRoundTo15,

package/dist/cjs/interfaces.d.ts

@@ -288,7 +288,7 @@ export declare const EMPTY_PIVOT_QUERY_RESULT_DATA: PivotQueryResultData;
  * @param arg
  * @internal
  */
-export declare function isDataSource(arg: DataSource | Data | undefined): arg is DataSource;
+export declare function isDataSource(arg: DataSource | Data | undefined): arg is DataSource | undefined;
 /**
  * Trend formula options.
  */

package/dist/cjs/translation/resources/en.js

@@ -22,7 +22,7 @@ exports.translation = {
         },
         filter: {
             unsupportedType: 'Unsupported filter type: {{filterType}}',
-            unsupportedDatetimeLevel: 'Filters do not support the next "datetime" levels: Hours, MinutesRoundTo30, MinutesRoundTo15',
+            unsupportedDatetimeLevel: 'Filters do not support the next "datetime" levels: Hours, MinutesRoundTo30, MinutesRoundTo15, Minutes, Seconds',
             membersFilterNullMember: 'MembersFilter of {{attributeId}} - member cannot be null',
         },
         unsupportedDimensionalElement: 'Unsupported dimensional element type',

package/dist/cjs/translation/resources/uk.js

@@ -22,7 +22,7 @@ exports.translation = {
         },
         filter: {
             unsupportedType: 'Непідтримуваний тип фільтра: {{filterType}}',
-            unsupportedDatetimeLevel: 'Фільтри не підтримують наступні рівні "datetime": Hours, MinutesRoundTo30, MinutesRoundTo15',
+            unsupportedDatetimeLevel: 'Фільтри не підтримують наступні рівні "datetime": Hours, MinutesRoundTo30, MinutesRoundTo15, Minutes, Seconds',
             membersFilterNullMember: 'MembersFilter у {{attributeId}} - member не може бути нульовим',
         },
         unsupportedDimensionalElement: 'Непідтримуваний тип елемента',

package/dist/cjs/utils.js

@@ -99,7 +99,11 @@ exports.isDataSourceInfo = isDataSourceInfo;
 const createFilterFromJaql = (jaql, instanceid) => {
     // translation logic is based on FilterJaqlInternal type (from internal modern-analytics-filters)
     // TODO reconcile FilterJaql and FilterJaqlInternal
-    const jaqlInternal = jaql;
-    return (0, filter_from_jaql_util_js_1.createFilterFromJaqlInternal)(jaqlInternal, instanceid);
+    const hasBackgroundFilter = jaql.filter.filter && !('turnedOff' in jaql.filter.filter);
+    const filter = (0, filter_from_jaql_util_js_1.createFilterFromJaqlInternal)(jaql, instanceid);
+    if (hasBackgroundFilter) {
+        filter.backgroundFilter = (0, filter_from_jaql_util_js_1.createFilterFromJaqlInternal)(Object.assign(Object.assign({}, jaql), { filter: jaql.filter.filter }), `${instanceid}-bg`);
+    }
+    return filter;
 };
 exports.createFilterFromJaql = createFilterFromJaql;

package/dist/cjs/utils.test.js

@@ -154,5 +154,29 @@ const nestedFilterRelationsResult = {
             const expectedFilter = filterFactory.members(attribute, jaql.filter.members);
             expect(filter.jaql().jaql).toEqual(expectedFilter.jaql().jaql);
         });
+        test('should creact MembersFilter with inner background filter', () => {
+            const jaql = {
+                table: 'Category',
+                column: 'Category',
+                dim: '[Category.Category]',
+                datatype: 'text',
+                filter: {
+                    explicit: true,
+                    multiSelection: true,
+                    members: ['Cell Phones'],
+                    filter: {
+                        members: ['Cell Phones', 'GPS Devices'],
+                    },
+                },
+                title: 'Category',
+            };
+            const filter = (0, index_js_1.createFilterFromJaql)(jaql, instanceid);
+            const attribute = (0, attribute_measure_util_js_1.createAttributeFromFilterJaql)(jaql);
+            const backgroundFilter = filterFactory.members(attribute, jaql.filter.filter.members);
+            const expectedFilter = filterFactory.members(attribute, jaql.filter.members, undefined, undefined, backgroundFilter);
+            expect(filter.jaql().jaql).toEqual(expectedFilter.jaql().jaql);
+            expect(filter.backgroundFilter).toBeDefined();
+            expect(expectedFilter.backgroundFilter).toBeDefined();
+        });
     });
 });

package/dist/dimensional-model/attributes.js

@@ -158,6 +158,7 @@ export class DimensionalLevelAttribute extends DimensionalAttribute {
      */
     translateGranularityToJaql() {
         const MINUTES_LEVEL = 'minutes';
+        const SECONDS_LEVEL = 'seconds';
         switch (this.granularity) {
             case DateLevels.Years:
             case DateLevels.Quarters:
@@ -180,6 +181,16 @@ export class DimensionalLevelAttribute extends DimensionalAttribute {
                     dateTimeLevel: MINUTES_LEVEL,
                     bucket: '15',
                 };
+            case DateLevels.Minutes:
+                return {
+                    dateTimeLevel: MINUTES_LEVEL,
+                    bucket: '1',
+                };
+            case DateLevels.Seconds:
+                return {
+                    dateTimeLevel: SECONDS_LEVEL,
+                    bucket: '0',
+                };
             case DateLevels.AggHours:
                 return {
                     level: MINUTES_LEVEL,
@@ -211,7 +222,7 @@ export class DimensionalLevelAttribute extends DimensionalAttribute {
             return lvl;
         };
         if (json.dateTimeLevel) {
-            if (json.dateTimeLevel !== 'minutes') {
+            if (json.dateTimeLevel !== 'minutes' && json.dateTimeLevel !== 'seconds') {
                 return returnUnsupported(json.dateTimeLevel);
             }
             switch (json.bucket) {
@@ -221,6 +232,10 @@ export class DimensionalLevelAttribute extends DimensionalAttribute {
                     return DateLevels.MinutesRoundTo30;
                 case '15':
                     return DateLevels.MinutesRoundTo15;
+                case '1':
+                    return DateLevels.Minutes;
+                case '0':
+                    return DateLevels.Seconds;
                 default:
                     return returnUnsupported(json.dateTimeLevel);
             }
@@ -272,6 +287,10 @@ export class DimensionalLevelAttribute extends DimensionalAttribute {
                 return 'yyyy-MM-dd HH:mm';
             case DateLevels.MinutesRoundTo15:
                 return 'yyyy-MM-dd HH:mm';
+            case DateLevels.Minutes:
+                return 'yyyy-MM-dd HH:mm';
+            case DateLevels.Seconds:
+                return 'yyyy-MM-dd HH:mm:ss';
             case DateLevels.AggHours:
                 return 'HH:mm';
             case DateLevels.AggMinutesRoundTo30:

package/dist/dimensional-model/dimensions.d.ts

@@ -94,6 +94,14 @@ export declare class DimensionalDateDimension extends DimensionalDimension imple
      * Minutes (round to 15) level
      */
     readonly MinutesRoundTo15: LevelAttribute;
+    /**
+     * Minutes level (for Live Models)
+     */
+    readonly Minutes: LevelAttribute;
+    /**
+     * Seconds level (for Live Models)
+     */
+    readonly Seconds: LevelAttribute;
     /**
      * Aggregated Hours  level
      */

package/dist/dimensional-model/dimensions.js

@@ -160,6 +160,8 @@ export class DimensionalDateDimension extends DimensionalDimension {
         this.Hours = new DimensionalLevelAttribute(DateLevels.Hours, expression, DateLevels.Hours, 'yyyy-MM-dd HH:mm');
         this.MinutesRoundTo30 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo30, expression, DateLevels.MinutesRoundTo30, 'yyyy-MM-dd HH:mm');
         this.MinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.MinutesRoundTo15, expression, DateLevels.MinutesRoundTo15, 'yyyy-MM-dd HH:mm');
+        this.Minutes = new DimensionalLevelAttribute(DateLevels.Minutes, expression, DateLevels.Minutes, 'yyyy-MM-dd HH:mm');
+        this.Seconds = new DimensionalLevelAttribute(DateLevels.Seconds, expression, DateLevels.Seconds, 'yyyy-MM-dd HH:mm:ss');
         this.AggHours = new DimensionalLevelAttribute(DateLevels.AggHours, expression, DateLevels.AggHours, 'HH:mm');
         this.AggMinutesRoundTo30 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo30, expression, DateLevels.AggMinutesRoundTo30, 'HH:mm');
         this.AggMinutesRoundTo15 = new DimensionalLevelAttribute(DateLevels.AggMinutesRoundTo15, expression, DateLevels.AggMinutesRoundTo15, 'HH:mm');
@@ -173,6 +175,8 @@ export class DimensionalDateDimension extends DimensionalDimension {
             this.Hours,
             this.MinutesRoundTo30,
             this.MinutesRoundTo15,
+            this.Minutes,
+            this.Seconds,
             this.AggHours,
             this.AggMinutesRoundTo30,
             this.AggMinutesRoundTo15,

package/dist/dimensional-model/filters/factory.d.ts

@@ -377,7 +377,7 @@ export declare function numeric(attribute: Attribute, operatorA?: string, valueA
  * @param guid - Optional GUID for the filter
  * @returns A filter instance
  */
-export declare function members(attribute: Attribute, members: string[], _deactivatedMembers?: string[], guid?: string): Filter;
+export declare function members(attribute: Attribute, members: string[], _deactivatedMembers?: string[], guid?: string, backgroundFilter?: Filter): Filter;
 /**
  * Creates a filter to isolate date values starting from and including the given date and level.
  *

package/dist/dimensional-model/filters/factory.js

@@ -427,8 +427,8 @@ export function numeric(attribute, operatorA, valueA, operatorB, valueB, guid) {
  * @param guid - Optional GUID for the filter
  * @returns A filter instance
  */
-export function members(attribute, members, _deactivatedMembers, guid) {
-    return new MembersFilter(attribute, members, _deactivatedMembers, guid);
+export function members(attribute, members, _deactivatedMembers, guid, backgroundFilter) {
+    return new MembersFilter(attribute, members, _deactivatedMembers, guid, backgroundFilter);
 }
 // DATE FILTERS
 /**

package/dist/dimensional-model/filters/filters.d.ts

@@ -95,6 +95,7 @@ declare abstract class AbstractFilter extends DimensionalElement implements Filt
      */
     readonly guid: string;
     private _disabled;
+    private _locked;
     /**
      * Boolean flag whether the filter is disabled
      *
@@ -102,6 +103,13 @@ declare abstract class AbstractFilter extends DimensionalElement implements Filt
      */
     get disabled(): boolean;
     set disabled(value: boolean);
+    /**
+     * Boolean flag whether the filter is locked
+     *
+     * @internal
+     */
+    get locked(): boolean;
+    set locked(value: boolean);
     constructor(att: Attribute, filterType: string, guid?: string);
     get name(): string;
     /**
@@ -156,7 +164,9 @@ export declare class MembersFilter extends AbstractFilter {
     readonly members: any[];
     /** @internal */
     _deactivatedMembers: any[];
-    constructor(attribute: Attribute, members?: any[], _deactivatedMembers?: any[], guid?: string);
+    /** @internal */
+    backgroundFilter?: Filter;
+    constructor(attribute: Attribute, members?: any[], _deactivatedMembers?: any[], guid?: string, backgroundFilter?: Filter);
     /**
      * gets the element's ID
      */
@@ -182,6 +192,8 @@ export declare class CascadingFilter extends AbstractFilter {
     get id(): string;
     get disabled(): boolean;
     set disabled(value: boolean);
+    get locked(): boolean;
+    set locked(value: boolean);
     /**
      * Gets a serializable representation of the element
      */

package/dist/dimensional-model/filters/filters.js

@@ -102,6 +102,7 @@ class AbstractFilter extends DimensionalElement {
         this.attribute = att;
         this.guid = guid || guidFast(13);
         this.disabled = false;
+        this.locked = false;
     }
     /**
      * Boolean flag whether the filter is disabled
@@ -114,6 +115,17 @@ class AbstractFilter extends DimensionalElement {
     set disabled(value) {
         this._disabled = value;
     }
+    /**
+     * Boolean flag whether the filter is locked
+     *
+     * @internal
+     */
+    get locked() {
+        return this._locked;
+    }
+    set locked(value) {
+        this._locked = value;
+    }
     get name() {
         return hash(this.jaql());
     }
@@ -155,7 +167,9 @@ class AbstractFilter extends DimensionalElement {
         const { granularity } = attribute;
         if (granularity === DateLevels.Hours ||
             granularity === DateLevels.MinutesRoundTo30 ||
-            granularity === DateLevels.MinutesRoundTo15) {
+            granularity === DateLevels.MinutesRoundTo15 ||
+            granularity === DateLevels.Minutes ||
+            granularity === DateLevels.Seconds) {
             throw new TranslatableError('errors.filter.unsupportedDatetimeLevel');
         }
     }
@@ -200,10 +214,11 @@ export class LogicalAttributeFilter extends AbstractFilter {
  * @internal
  */
 export class MembersFilter extends AbstractFilter {
-    constructor(attribute, members, _deactivatedMembers, guid) {
+    constructor(attribute, members, _deactivatedMembers, guid, backgroundFilter) {
         super(attribute, FilterTypes.members, guid);
         this.members = members !== null && members !== void 0 ? members : [];
         this._deactivatedMembers = _deactivatedMembers !== null && _deactivatedMembers !== void 0 ? _deactivatedMembers : [];
+        this.backgroundFilter = backgroundFilter;
         if (this.members.filter((m) => m === null || m === undefined).length > 0) {
             throw new TranslatableError('errors.filter.membersFilterNullMember', {
                 attributeId: attribute.id,
@@ -222,15 +237,24 @@ export class MembersFilter extends AbstractFilter {
     serializable() {
         const result = super.serializable();
         result.members = this.members;
+        if (this.backgroundFilter) {
+            result.backgroundFilter = this.backgroundFilter.serializable();
+        }
         return result;
     }
     /**
      * Gets JAQL representing this Filter instance
      */
     filterJaql() {
-        return {
+        const filterJaql = {
             members: this.members.map((m) => m.toString()),
         };
+        if (this.backgroundFilter) {
+            return {
+                and: [filterJaql, this.backgroundFilter.filterJaql()],
+            };
+        }
+        return filterJaql;
     }
 }
 /**
@@ -258,6 +282,17 @@ export class CascadingFilter extends AbstractFilter {
             });
         }
     }
+    get locked() {
+        return super.locked;
+    }
+    set locked(value) {
+        super.locked = value;
+        if (this.filters) {
+            this.filters.forEach((filter) => {
+                filter.locked = value;
+            });
+        }
+    }
     /**
      * Gets a serializable representation of the element
      */

package/dist/dimensional-model/interfaces.d.ts

@@ -249,6 +249,14 @@ export interface DateDimension extends Dimension {
      * Minutes (round to 15) level (for Live Models)
      */
     readonly MinutesRoundTo15: LevelAttribute;
+    /**
+     * Minutes level (for Live Models)
+     */
+    readonly Minutes: LevelAttribute;
+    /**
+     * Seconds level (for Live Models)
+     */
+    readonly Seconds: LevelAttribute;
     /**
      * Aggregated Hours level (for Live Models)
      */
@@ -346,6 +354,12 @@ export interface Filter extends Element {
      * @internal
      */
     disabled: boolean;
+    /**
+     * Boolean flag whether the filter is locked
+     *
+     * @internal
+     */
+    locked: boolean;
     /**
      * Gets JAQL representing this Filter instance
      *

package/dist/dimensional-model/types.d.ts

@@ -144,6 +144,8 @@ export declare const DateLevels: {
     Hours: string;
     MinutesRoundTo30: string;
     MinutesRoundTo15: string;
+    Minutes: string;
+    Seconds: string;
     AggHours: string;
     AggMinutesRoundTo30: string;
     AggMinutesRoundTo15: string;

package/dist/dimensional-model/types.js

@@ -258,6 +258,8 @@ export const DateLevels = {
     Hours: 'Hours',
     MinutesRoundTo30: 'MinutesRoundTo30',
     MinutesRoundTo15: 'MinutesRoundTo15',
+    Minutes: 'Minutes',
+    Seconds: 'Seconds',
     AggHours: 'AggHours',
     AggMinutesRoundTo30: 'AggMinutesRoundTo30',
     AggMinutesRoundTo15: 'AggMinutesRoundTo15',
@@ -273,6 +275,8 @@ export const DateLevels = {
             DateLevels.Hours,
             DateLevels.MinutesRoundTo30,
             DateLevels.MinutesRoundTo15,
+            DateLevels.Minutes,
+            DateLevels.Seconds,
             DateLevels.AggHours,
             DateLevels.AggMinutesRoundTo30,
             DateLevels.AggMinutesRoundTo15,

package/dist/interfaces.d.ts

@@ -288,7 +288,7 @@ export declare const EMPTY_PIVOT_QUERY_RESULT_DATA: PivotQueryResultData;
  * @param arg
  * @internal
  */
-export declare function isDataSource(arg: DataSource | Data | undefined): arg is DataSource;
+export declare function isDataSource(arg: DataSource | Data | undefined): arg is DataSource | undefined;
 /**
  * Trend formula options.
  */

package/dist/translation/resources/en.js

@@ -19,7 +19,7 @@ export const translation = {
         },
         filter: {
             unsupportedType: 'Unsupported filter type: {{filterType}}',
-            unsupportedDatetimeLevel: 'Filters do not support the next "datetime" levels: Hours, MinutesRoundTo30, MinutesRoundTo15',
+            unsupportedDatetimeLevel: 'Filters do not support the next "datetime" levels: Hours, MinutesRoundTo30, MinutesRoundTo15, Minutes, Seconds',
             membersFilterNullMember: 'MembersFilter of {{attributeId}} - member cannot be null',
         },
         unsupportedDimensionalElement: 'Unsupported dimensional element type',

package/dist/translation/resources/uk.js

@@ -19,7 +19,7 @@ export const translation = {
         },
         filter: {
             unsupportedType: 'Непідтримуваний тип фільтра: {{filterType}}',
-            unsupportedDatetimeLevel: 'Фільтри не підтримують наступні рівні "datetime": Hours, MinutesRoundTo30, MinutesRoundTo15',
+            unsupportedDatetimeLevel: 'Фільтри не підтримують наступні рівні "datetime": Hours, MinutesRoundTo30, MinutesRoundTo15, Minutes, Seconds',
             membersFilterNullMember: 'MembersFilter у {{attributeId}} - member не може бути нульовим',
         },
         unsupportedDimensionalElement: 'Непідтримуваний тип елемента',

package/dist/utils.js

@@ -89,6 +89,10 @@ export function isDataSourceInfo(dataSource) {
 export const createFilterFromJaql = (jaql, instanceid) => {
     // translation logic is based on FilterJaqlInternal type (from internal modern-analytics-filters)
     // TODO reconcile FilterJaql and FilterJaqlInternal
-    const jaqlInternal = jaql;
-    return createFilterFromJaqlInternal(jaqlInternal, instanceid);
+    const hasBackgroundFilter = jaql.filter.filter && !('turnedOff' in jaql.filter.filter);
+    const filter = createFilterFromJaqlInternal(jaql, instanceid);
+    if (hasBackgroundFilter) {
+        filter.backgroundFilter = createFilterFromJaqlInternal(Object.assign(Object.assign({}, jaql), { filter: jaql.filter.filter }), `${instanceid}-bg`);
+    }
+    return filter;
 };

package/package.json

@@ -11,7 +11,7 @@
     "Sisense",
     "Compose SDK"
   ],
-  "version": "1.13.0",
+  "version": "1.14.0",
   "type": "module",
   "main": "./dist/cjs/index.js",
   "module": "./dist/index.js",
@@ -32,8 +32,8 @@
   "author": "Sisense",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@sisense/sdk-common": "^1.13.0",
-    "@sisense/sdk-rest-client": "^1.13.0",
+    "@sisense/sdk-common": "^1.14.0",
+    "@sisense/sdk-rest-client": "^1.14.0",
     "guid-typescript": "^1.0.9",
     "lodash": "^4.17.21",
     "numeral": "^2.0.6",