fix sql data preview - remove sorting and formating as not implemented

Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
keplergl · Jan 27, 2025 · 8f0211b · 8f0211b
1 parent 7166c76
commit 8f0211b
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 27 deletions.
diff --git a/src/components/src/common/data-table/header-cell.tsx b/src/components/src/common/data-table/header-cell.tsx
@@ -128,7 +128,7 @@ const HeaderCellFactory = (FieldToken: React.FC<FieldTokenProps>) => {
     const onCopy = useCallback(() => copyTableColumn(column), [copyTableColumn, column]);
     const onSetDisplayFormat = useCallback(
       displayFormat => {
-        setColumnDisplayFormat({[column]: displayFormat.format});
+        setColumnDisplayFormat?.({[column]: displayFormat.format});
       },
       [column, setColumnDisplayFormat]
     );
@@ -195,10 +195,12 @@ const HeaderCellFactory = (FieldToken: React.FC<FieldTokenProps>) => {
                 column={column}
                 colMeta={colMeta}
                 toggleMoreOptions={toggleMoreOptions}
-                sortTableColumn={mode => sortTableColumn(column, mode)}
+                sortTableColumn={
+                  sortTableColumn ? mode => sortTableColumn(column, mode) : undefined
+                }
                 pinTableColumn={onPin}
                 copyTableColumn={onCopy}
-                setDisplayFormat={onSetDisplayFormat}
+                setDisplayFormat={setColumnDisplayFormat ? onSetDisplayFormat : undefined}
               />
             </section>
           </>

diff --git a/src/components/src/common/data-table/index.tsx b/src/components/src/common/data-table/index.tsx
@@ -389,7 +389,7 @@ export interface DataTableProps {
   sortColumn: SortColumn;
   sortTableColumn: (column: string, mode?: string) => void;
   pinTableColumn: (column: string) => void;
-  setColumnDisplayFormat: (formats: {[key: string]: string}) => void;
+  setColumnDisplayFormat?: (formats: {[key: string]: string}) => void;
   copyTableColumn: (column: string) => void;
   sortOrder?: number[] | null;
   showStats?: boolean;

diff --git a/src/components/src/common/data-table/option-dropdown.tsx b/src/components/src/common/data-table/option-dropdown.tsx
@@ -70,7 +70,7 @@ export type FormatterDropdownProps = {
   top: number;
   isOpened: boolean;
   displayFormat?: string;
-  setDisplayFormat: (displayFormat: TooltipFormat) => void;
+  setDisplayFormat?: (displayFormat: TooltipFormat) => void;
   onClose: () => void;
   formatLabels: TooltipFormat[];
 };
@@ -83,15 +83,17 @@ export const FormatterDropdown: React.FC<FormatterDropdownProps> = (
     top,
     isOpened,
     displayFormat = 'None',
-    setDisplayFormat,
+    setDisplayFormat = undefined,
     onClose,
     formatLabels
   } = props;
   const selectionIndex = formatLabels.findIndex(label => label.format === displayFormat);
 
   const onSelectDisplayFormat = useCallback(
     result => {
-      setDisplayFormat(result);
+      if (setDisplayFormat) {
+        setDisplayFormat(result);
+      }
       onClose();
     },
     [setDisplayFormat, onClose]
@@ -117,10 +119,10 @@ export interface OptionDropdownProps {
   column: string;
   colMeta: ColMeta;
   toggleMoreOptions: (column: string) => void;
-  sortTableColumn: (sort: string) => void;
+  sortTableColumn?: (sort: string) => void;
   pinTableColumn: () => void;
   copyTableColumn: () => void;
-  setDisplayFormat: (displayFormat: any) => void;
+  setDisplayFormat?: (displayFormat: any) => void;
   sortMode?: string;
   isSorted?: string;
   isPinned?: boolean;
@@ -142,13 +144,13 @@ const OptionDropdown = (props: OptionDropdownProps) => {
     ({value}) => {
       switch (value) {
         case TABLE_OPTION.SORT_ASC:
-          sortTableColumn(SORT_ORDER.ASCENDING);
+          sortTableColumn?.(SORT_ORDER.ASCENDING);
           break;
         case TABLE_OPTION.SORT_DES:
-          sortTableColumn(SORT_ORDER.DESCENDING);
+          sortTableColumn?.(SORT_ORDER.DESCENDING);
           break;
         case TABLE_OPTION.UNSORT:
-          sortTableColumn(SORT_ORDER.UNSORT);
+          sortTableColumn?.(SORT_ORDER.UNSORT);
           break;
         case TABLE_OPTION.PIN:
           pinTableColumn();

diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.ts
@@ -536,13 +536,13 @@ export const TABLE_OPTION_LIST: TableOption[] = [
     value: TABLE_OPTION.SORT_ASC,
     display: 'Sort Ascending',
     icon: 'ArrowUp',
-    condition: props => props.sortMode !== SORT_ORDER.ASCENDING
+    condition: props => props.sortTableColumn && props.sortMode !== SORT_ORDER.ASCENDING
   },
   {
     value: TABLE_OPTION.SORT_DES,
     display: 'Sort Descending',
     icon: 'ArrowDown',
-    condition: props => props.sortMode !== SORT_ORDER.DESCENDING
+    condition: props => props.sortTableColumn && props.sortMode !== SORT_ORDER.DESCENDING
   },
   {
     value: TABLE_OPTION.UNSORT,
@@ -563,7 +563,12 @@ export const TABLE_OPTION_LIST: TableOption[] = [
     condition: props => props.isPinned
   },
   {value: TABLE_OPTION.COPY, display: 'Copy Column', icon: 'Clipboard'},
-  {value: TABLE_OPTION.FORMAT_COLUMN, display: 'Format Column', icon: 'Hash'}
+  {
+    value: TABLE_OPTION.FORMAT_COLUMN,
+    display: 'Format Column',
+    icon: 'Hash',
+    condition: props => props.setDisplayFormat
+  }
 ];
 
 const YELLOW = '248, 194, 28';

diff --git a/src/duckdb/src/components/preview-data-panel.tsx b/src/duckdb/src/components/preview-data-panel.tsx
@@ -143,11 +143,8 @@ const PreviewDataPanelWOTheme: React.FC<PreviewDataPanelProps> = ({
       cellSizeCache={cellSizeCache}
       dataContainer={dataContainer}
       pinnedColumns={pinnedColumns}
-      //   sortColumn={sortColumnConfig}
       copyTableColumn={copyTableColumn}
       pinTableColumn={pinTableColumn}
-      //   sortTableColumn={setTableSortColumn}
-      setColumnDisplayFormat={setColumnDisplayFormat ?? (() => null)}
     />
   );
 };

diff --git a/src/layers/src/icon-layer/icon-layer.ts b/src/layers/src/icon-layer/icon-layer.ts
@@ -65,11 +65,12 @@ export const SVG_ICON_URL = `${KEPLER_UNFOLDED_BUCKET}/icons/svg-icons.json`;
 export const iconPosAccessor =
   ({lat, lng, altitude}: IconLayerColumnsConfig) =>
   (dc: DataContainerInterface) =>
-  d => [
-    dc.valueAt(d.index, lng.fieldIdx),
-    dc.valueAt(d.index, lat.fieldIdx),
-    altitude?.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0
-  ];
+  d =>
+    [
+      dc.valueAt(d.index, lng.fieldIdx),
+      dc.valueAt(d.index, lat.fieldIdx),
+      altitude?.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0
+    ];
 
 export const iconAccessor =
   ({icon}: IconLayerColumnsConfig) =>

diff --git a/src/utils/src/utils.ts b/src/utils/src/utils.ts
@@ -160,10 +160,10 @@ export function getError(
     return Object.prototype.hasOwnProperty.call(err, 'message')
       ? getError(err.message)
       : Object.prototype.hasOwnProperty.call(err, 'error')
-        ? getError(err.error)
-        : Object.prototype.hasOwnProperty.call(err, 'err')
-          ? getError(err.err)
-          : JSON.stringify(err);
+      ? getError(err.error)
+      : Object.prototype.hasOwnProperty.call(err, 'err')
+      ? getError(err.err)
+      : JSON.stringify(err);
   }
 
   return defaultMessage;