@finos/legend-application-data-cube 0.2.4 → 0.2.6

package/src/components/{query-builder/source-builder → builder/source}/LegendQueryDataCubeSourceBuilder.tsx

@@ -20,7 +20,7 @@ import {
   SORT_BY_OPTIONS,
   type QueryLoaderState,
 } from '@finos/legend-query-builder';
-import type { LegendQueryDataCubeSourceBuilderState } from '../../../stores/query-builder/source-builder/LegendQueryDataCubeSourceBuilderState.js';
+import type { LegendQueryDataCubeSourceBuilderState } from '../../../stores/builder/source/LegendQueryDataCubeSourceBuilderState.js';
 import { generateGAVCoordinates } from '@finos/legend-storage';
 import { cn, DataCubeIcon, useDropdownMenu } from '@finos/legend-art';
 import {
@@ -40,12 +40,12 @@ import {
   FormTextInput,
 } from '@finos/legend-data-cube';
 import { CODE_EDITOR_LANGUAGE } from '@finos/legend-code-editor';
-import { useLegendDataCubeQueryBuilderStore } from '../LegendDataCubeQueryBuilderStoreProvider.js';
+import { useLegendDataCubeBuilderStore } from '../LegendDataCubeBuilderStoreProvider.js';
 import { useApplicationStore } from '@finos/legend-application';
 
 const LegendQuerySearcher = observer((props: { state: QueryLoaderState }) => {
   const { state } = props;
-  const store = useLegendDataCubeQueryBuilderStore();
+  const store = useLegendDataCubeBuilderStore();
   const searchInputRef = useRef<HTMLInputElement>(null);
   const searchResults = state.queries;
 
@@ -54,7 +54,7 @@ const LegendQuerySearcher = observer((props: { state: QueryLoaderState }) => {
   }, [state]);
 
   // search text
-  const debouncedLoadQueries = useMemo(
+  const debouncedLoader = useMemo(
     () =>
       debounce((input: string) => {
         flowResult(state.searchQueries(input)).catch((error) =>
@@ -68,14 +68,14 @@ const LegendQuerySearcher = observer((props: { state: QueryLoaderState }) => {
   ) => {
     if (event.target.value !== state.searchText) {
       state.setSearchText(event.target.value);
-      debouncedLoadQueries.cancel();
-      debouncedLoadQueries(event.target.value);
+      debouncedLoader.cancel();
+      debouncedLoader(event.target.value);
     }
   };
   const clearSearches = () => {
     state.setSearchText('');
-    debouncedLoadQueries.cancel();
-    debouncedLoadQueries('');
+    debouncedLoader.cancel();
+    debouncedLoader('');
   };
 
   // filter and sort
@@ -83,8 +83,8 @@ const LegendQuerySearcher = observer((props: { state: QueryLoaderState }) => {
   const toggleShowCurrentUserQueriesOnly = () => {
     state.setShowCurrentUserQueriesOnly(!state.showCurrentUserQueriesOnly);
     setIsMineOnly(!isMineOnly);
-    debouncedLoadQueries.cancel();
-    debouncedLoadQueries(state.searchText);
+    debouncedLoader.cancel();
+    debouncedLoader(state.searchText);
   };
 
   const [
@@ -95,8 +95,8 @@ const LegendQuerySearcher = observer((props: { state: QueryLoaderState }) => {
   ] = useDropdownMenu();
   const applySort = (value: SORT_BY_OPTIONS) => {
     state.setSortBy(value);
-    debouncedLoadQueries.cancel();
-    debouncedLoadQueries(state.searchText);
+    debouncedLoader.cancel();
+    debouncedLoader(state.searchText);
   };
 
   useEffect(() => {
@@ -254,7 +254,7 @@ export const LegendQueryDataCubeSourceBuilder = observer(
   (props: { sourceBuilder: LegendQueryDataCubeSourceBuilderState }) => {
     const { sourceBuilder } = props;
     const application = useApplicationStore();
-    const store = useLegendDataCubeQueryBuilderStore();
+    const store = useLegendDataCubeBuilderStore();
     const query = sourceBuilder.query;
 
     if (!query) {
@@ -320,10 +320,11 @@ export const LegendQueryDataCubeSourceBuilder = observer(
           </div>
         )}
         <FormButton
-          className="mt-1.5"
+          className="mt-1.5 flex items-center pl-1"
           onClick={() => sourceBuilder.unsetQuery()}
         >
-          Select Another Query
+          <DataCubeIcon.ChevronLeft className="mr-0.5" />
+          Go Back
         </FormButton>
       </div>
     );

package/src/stores/LegendDataCubeCacheManager.ts

@@ -96,21 +96,15 @@ export class LegendDataCubeDataCubeCacheManager {
       let colType: string;
       switch (col.type as string) {
         case PRIMITIVE_TYPE.BOOLEAN: {
-          colType = 'BOOLEAN';
-          break;
-        }
-        case PRIMITIVE_TYPE.NUMBER: {
-          colType = 'DOUBLE';
+          colType = 'BIT';
           break;
         }
         case PRIMITIVE_TYPE.INTEGER: {
-          colType = 'FLOAT';
-          break;
-        }
-        case PRIMITIVE_TYPE.DECIMAL: {
-          colType = 'DECIMAL';
+          colType = 'INTEGER';
           break;
         }
+        case PRIMITIVE_TYPE.NUMBER:
+        case PRIMITIVE_TYPE.DECIMAL:
         case PRIMITIVE_TYPE.FLOAT: {
           colType = 'FLOAT';
           break;
@@ -119,7 +113,7 @@ export class LegendDataCubeDataCubeCacheManager {
         case PRIMITIVE_TYPE.STRICTDATE:
         case PRIMITIVE_TYPE.DATETIME:
         case PRIMITIVE_TYPE.DATE: {
-          colType = 'STRING';
+          colType = 'VARCHAR';
           break;
         }
         case PRIMITIVE_TYPE.STRING: {
@@ -170,7 +164,12 @@ export class LegendDataCubeDataCubeCacheManager {
     const rows = data.map((row) => {
       const tdsRow = new TDSRow();
       tdsRow.values = columnNames.map(
-        (column) => row[column] as string | number | boolean | null,
+        (column) =>
+          // NOTE: DuckDB WASM returns ArrayBuffer for numeric value, such as for count(*)
+          // so we need to convert it to number
+          (ArrayBuffer.isView(row[column])
+            ? row[column].valueOf()
+            : row[column]) as string | number | boolean | null,
       );
       return tdsRow;
     });

package/src/stores/LegendDataCubeDataCubeEngine.ts

@@ -53,7 +53,6 @@ import {
   V1_Column,
   V1_Database,
   V1_Date,
-  V1_Double,
   V1_DuckDBDatasourceSpecification,
   V1_EngineRuntime,
   V1_IdentifiedConnection,
@@ -69,7 +68,6 @@ import {
   V1_TestAuthenticationStrategy,
   V1_VarChar,
   V1_Bit,
-  V1_Decimal,
   V1_Float,
   PackageableElementPointerType,
   DatabaseType,
@@ -151,9 +149,7 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
 
   // ---------------------------------- IMPLEMENTATION ----------------------------------
 
-  override async processQuerySource(
-    value: PlainObject,
-  ): Promise<DataCubeSource> {
+  override async processSource(value: PlainObject): Promise<DataCubeSource> {
     switch (value._type) {
       case ADHOC_QUERY_DATA_CUBE_SOURCE_TYPE: {
         const rawSource =
@@ -543,20 +539,14 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
           column.type = new V1_Bit();
           break;
         }
-        case PRIMITIVE_TYPE.NUMBER: {
-          column.type = new V1_Double();
-          break;
-        }
         case PRIMITIVE_TYPE.INTEGER: {
           column.type = new V1_Integer();
           break;
         }
-        case PRIMITIVE_TYPE.FLOAT: {
-          column.type = new V1_Float();
-          break;
-        }
+        case PRIMITIVE_TYPE.NUMBER:
+        case PRIMITIVE_TYPE.FLOAT:
         case PRIMITIVE_TYPE.DECIMAL: {
-          column.type = new V1_Decimal();
+          column.type = new V1_Float();
           break;
         }
         case PRIMITIVE_TYPE.DATE: