@sisense/sdk-query-client 1.19.0 → 1.21.0

package/dist/jaql/get-jaql-query-payload.js

@@ -1,6 +1,6 @@
 import { v4 as uuid } from 'uuid';
 import merge from 'ts-deepmerge';
-import { isPivotAttribute, isPivotMeasure, DEFAULT_PIVOT_GRAND_TOTALS, isDataSourceInfo, } from '@sisense/sdk-data';
+import { isPivotAttribute, isPivotMeasure, DEFAULT_PIVOT_GRAND_TOTALS, convertJaqlDataSource, } from '@sisense/sdk-data';
 import { applyHighlightFilters, matchHighlightsWithAttributes } from './metadata/highlights.js';
 import { getPivotMetadataStats, normalizeLastRowSorting, preparePivotRowJaqlSortOptions, } from './pivot/pivot-query-utils.js';
 const JAQL_BY_CSDK = 'ComposeSDK';
@@ -56,7 +56,7 @@ function prepareQueryMetadata(metadataDescription, shouldSkipHighlightsWithoutAt
     return [...attributesMetadata, ...measuresMetadata, ...filtersMetadata];
 }
 export function prepareQueryOptions(dataSource, count, offset, includeUngroup) {
-    return Object.assign(Object.assign(Object.assign({ datasource: getJaqlDataSource(dataSource), by: JAQL_BY_CSDK, queryGuid: uuid() }, (includeUngroup ? { ungroup: true } : {})), (count ? { count } : {})), (offset ? { offset } : {}));
+    return Object.assign(Object.assign(Object.assign({ datasource: convertJaqlDataSource(dataSource), by: JAQL_BY_CSDK, queryGuid: uuid() }, (includeUngroup ? { ungroup: true } : {})), (count ? { count } : {})), (offset ? { offset } : {}));
 }
 /**
  * Converts a pivot query description to a JAQL query payload.
@@ -120,16 +120,5 @@ function preparePivotQueryMetadata(pivotMetadataDescription, shouldSkipHighlight
  * @param offset
  */
 function preparePivotQueryOptions(dataSource, grandTotals, count, offset) {
-    return Object.assign(Object.assign(Object.assign({ datasource: getJaqlDataSource(dataSource), by: JAQL_BY_CSDK, queryGuid: uuid(), dashboard: JAQL_BY_CSDK, widget: JAQL_BY_CSDK, format: 'pivot' }, (count ? { count } : {})), (offset ? { offset } : {})), { grandTotals: Object.assign(Object.assign({}, DEFAULT_PIVOT_GRAND_TOTALS), grandTotals) });
-}
-/**
- * Converts a DataSource to a description of data source used in JAQL.
- */
-function getJaqlDataSource(dataSource) {
-    return isDataSourceInfo(dataSource)
-        ? {
-            title: dataSource.title,
-            live: dataSource.type === 'live',
-        }
-        : dataSource;
+    return Object.assign(Object.assign(Object.assign({ datasource: convertJaqlDataSource(dataSource), by: JAQL_BY_CSDK, queryGuid: uuid(), dashboard: JAQL_BY_CSDK, widget: JAQL_BY_CSDK, format: 'pivot' }, (count ? { count } : {})), (offset ? { offset } : {})), { grandTotals: Object.assign(Object.assign({}, DEFAULT_PIVOT_GRAND_TOTALS), grandTotals) });
 }

package/dist/query-api-dispatcher/query-api-dispatcher.js

@@ -16,7 +16,7 @@ export class QueryApiDispatcher {
     }
     getDataSourceFields(dataSource, count = 9999, offset = 0) {
         const dataSourceName = getDataSourceName(dataSource);
-        const url = `${API_DATASOURCES_BASE_PATH}/${encodeURIComponent(dataSourceName)}/fields/search`;
+        const url = `${API_DATASOURCES_BASE_PATH}/${encodeURI(dataSourceName)}/fields/search`;
         // when error is encountered, API returns only status code 400 without informative error message
         // to remedy, catch error and throw a more informative error message
         return this.httpClient.post(url, { offset, count }).catch(() => {

package/dist/query-client.js

@@ -133,7 +133,8 @@ export function validateQueryDescription(queryDescription) {
     }
     attributes.forEach((attribute) => {
         if (!attribute.skipValidation && !MetadataTypes.isAttribute(attribute)) {
-            throw new TranslatableError('errors.invalidAttribute', { attributeName: attribute.name });
+            const { name: attributeName } = attribute;
+            throw new TranslatableError('errors.invalidAttribute', { attributeName });
         }
     });
     measures.forEach((measure) => {

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { Filter, Measure, Attribute, Cell, QueryResultData, DataSource, PivotAttribute, PivotMeasure, PivotQueryResultData, PivotGrandTotals, FilterRelationsJaql } from '@sisense/sdk-data';
+import { Filter, Measure, Attribute, Cell, QueryResultData, DataSource, PivotAttribute, PivotMeasure, PivotQueryResultData, PivotGrandTotals, FilterRelationsJaql, JaqlDataSource } from '@sisense/sdk-data';
 import { AnyObject } from './helpers/utility-types.js';
 /**
  * All the properties that fully describe a query you want to send.
@@ -41,13 +41,6 @@ export type QueryExecutionConfig = {
 export type QueryExecutionConfigInternal = QueryExecutionConfig & {
     shouldSkipHighlightsWithoutAttributes: boolean;
 };
-/**
- * Data source description used in JAQL.
- */
-export type JaqlDataSource = string | {
-    title: string;
-    live: boolean;
-};
 export type QueryOptions = {
     datasource: JaqlDataSource;
     by: string;
@@ -208,6 +201,7 @@ export type DataSourceSchema = {
 } & AnyObject;
 export type DataSourceMetadata = {
     title: string;
+    fullname: string;
     live: boolean;
 };
 export type AbortRequestFunction = (reason?: string) => void;

package/package.json

@@ -11,7 +11,7 @@
     "Sisense",
     "Compose SDK"
   ],
-  "version": "1.19.0",
+  "version": "1.21.0",
   "type": "module",
   "exports": "./dist/index.js",
   "main": "./dist/index.js",
@@ -20,10 +20,10 @@
   "author": "Sisense",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@sisense/sdk-common": "^1.19.0",
-    "@sisense/sdk-data": "^1.19.0",
-    "@sisense/sdk-pivot-client": "^1.19.0",
-    "@sisense/sdk-rest-client": "^1.19.0",
+    "@sisense/sdk-common": "^1.21.0",
+    "@sisense/sdk-data": "^1.21.0",
+    "@sisense/sdk-pivot-client": "^1.21.0",
+    "@sisense/sdk-rest-client": "^1.21.0",
     "@sisense/task-manager": "^0.1.0",
     "numeral": "^2.0.6",
     "ts-deepmerge": "6.0.2",