@gooddata/js-utils
Advanced tools
Comparing version 3.10.7-alpha-khanh.le-kl-SD-978-2020-07-02T04-10-20-883Z to 3.10.7-alpha-khanh.le-kl-SD-978-2020-07-06T10-11-37-283Z
@@ -11,8 +11,10 @@ "use strict"; | ||
if (typings_1.EmbeddedGdc.isAbsoluteDateFilter(filterItem)) { | ||
var _a = filterItem.absoluteDateFilter, from = _a.from, to = _a.to; | ||
return lodash_1.isString(from) && lodash_1.isString(to) && DATE_FORMAT_REGEX.test(from) && DATE_FORMAT_REGEX.test(to); | ||
var _a = filterItem.absoluteDateFilter, from = _a.from, to = _a.to, dataSet = _a.dataSet; | ||
var _b = getObjectUriIdentifier(dataSet), uri = _b.uri, identifier = _b.identifier; | ||
return (lodash_1.isString(uri) || lodash_1.isString(identifier)) && lodash_1.isString(from) && lodash_1.isString(to) && DATE_FORMAT_REGEX.test(from) && DATE_FORMAT_REGEX.test(to); | ||
} | ||
else { | ||
var _b = filterItem.relativeDateFilter, from = _b.from, to = _b.to; | ||
return lodash_1.isNumber(from) && lodash_1.isNumber(to) && from <= to; | ||
var _c = filterItem.relativeDateFilter, from = _c.from, to = _c.to, dataSet = _c.dataSet; | ||
var _d = getObjectUriIdentifier(dataSet), uri = _d.uri, identifier = _d.identifier; | ||
return (lodash_1.isString(uri) || lodash_1.isString(identifier)) && lodash_1.isNumber(from) && lodash_1.isNumber(to) && from <= to; | ||
} | ||
@@ -19,0 +21,0 @@ } |
{ | ||
"name": "@gooddata/js-utils", | ||
"version": "3.10.7-alpha-khanh.le-kl-SD-978-2020-07-02T04-10-20-883Z", | ||
"version": "3.10.7-alpha-khanh.le-kl-SD-978-2020-07-06T10-11-37-283Z", | ||
"description": "Various utils shared on GoodData frontend", | ||
@@ -5,0 +5,0 @@ "repository": { |
@@ -35,10 +35,12 @@ // (C) 2020 GoodData Corporation | ||
const { | ||
absoluteDateFilter: { from, to } | ||
absoluteDateFilter: { from, to, dataSet }, | ||
} = filterItem; | ||
return isString(from) && isString(to) && DATE_FORMAT_REGEX.test(from) && DATE_FORMAT_REGEX.test(to); | ||
const { uri, identifier } = getObjectUriIdentifier(dataSet); | ||
return (isString(uri) || isString(identifier)) && isString(from) && isString(to) && DATE_FORMAT_REGEX.test(from) && DATE_FORMAT_REGEX.test(to); | ||
} else { | ||
const { | ||
relativeDateFilter: { from, to } | ||
relativeDateFilter: { from, to, dataSet }, | ||
} = filterItem; | ||
return isNumber(from) && isNumber(to) && from <= to; | ||
const { uri, identifier } = getObjectUriIdentifier(dataSet); | ||
return (isString(uri) || isString(identifier)) && isNumber(from) && isNumber(to) && from <= to; | ||
} | ||
@@ -45,0 +47,0 @@ } |
Sorry, the diff of this file is not supported yet
97566
1979