Revert "selection and preview"

This reverts commit 6e4eea3.

Author: kushagra0304

packages/app/src/app/api/projects/[projectId]/queries/[queryId]/data/route.ts

@@ -5,7 +5,6 @@ import { isDefined } from "@/utils/helpers";
 import { countDataForQuery, readDataForQuery } from "@/db/crud/data/query";
 import { readQuery } from "@/db/crud/query";
 import { readQueryZones } from "@/db/crud/zone";
-import { ComputedColumn } from "@common/db/schema/query";
 
 type RequestArgs = {
   params: {
@@ -100,29 +99,6 @@ export async function GET(request: NextRequest, { params }: RequestArgs) {
     zones.map((zone) => zone.zoneId),
   );
 
-  // Process computed columns if they exist
-  let processedRows = rows;
-  if (query.computedColumns && query.computedColumns.length > 0) {
-    processedRows = rows.map((row) => {
-      const newRow = { ...row };
-      
-      for (const computedCol of query.computedColumns) {
-        try {
-          // Create a safe evaluation environment for the computed column function
-          const computeFunction = new Function('row', computedCol.functionBody);
-          const computedValue = computeFunction(row);
-          newRow[computedCol.name] = computedValue;
-        } catch (error) {
-          // If computation fails, set to null and log error
-          console.error(`Error computing column ${computedCol.name}:`, error);
-          newRow[computedCol.name] = null;
-        }
-      }
-      
-      return newRow;
-    });
-  }
-
   const rowCount = await countDataForQuery(
     projectId,
     query.definition,
@@ -132,5 +108,5 @@ export async function GET(request: NextRequest, { params }: RequestArgs) {
     zones.map((zone) => zone.zoneId),
   );
 
-  return NextResponse.json({ rows: processedRows, rowCount });
+  return NextResponse.json({ rows, rowCount });
 }

packages/app/src/components/data/query/helpers.ts

@@ -23,7 +23,7 @@ export async function getQueryColumns(
     return [];
   }
 
-  const regularColumns = await Promise.all(
+  return await Promise.all(
     Object.entries(query.definition).flatMap(([tableName, def]) =>
       def.columns.map(async (col: string) => {
         const tableConfig = schemaConfig.find(
@@ -47,29 +47,4 @@ export async function getQueryColumns(
       }),
     ),
   );
-
-  // Add computed columns
-  const computedColumns = (query.computedColumns || []).map((computedCol) => ({
-    id: computedCol.name,
-    label: computedCol.name,
-    table: "Computed",
-    columnConfig: {
-      nameCamelCase: computedCol.name,
-      label: computedCol.name,
-      dbName: computedCol.name,
-      isAbbreviation: false,
-      isInherited: false,
-      isRequired: false,
-      isKey: false,
-      dataType: "computed",
-      units: null,
-      groupDbName: "computed",
-      groupLabel: "Computed Columns",
-      mapping: {},
-    } as ColumnConfig,
-    tableDbName: "computed" as TableName,
-    abbreviations: [],
-  }));
-
-  return [...regularColumns, ...computedColumns];
 }

packages/app/src/components/data/query/query-definition-explorer.tsx

@@ -9,8 +9,6 @@ import {
   canJoinAsSiblings,
   SiblingJoinConfig,
   getAncestorTables,
-  Query,
-  ComputedColumn,
 } from "@common/db/schema/query";
 import { TableName } from "@common/db/schema/data";
 import { TableCounts } from "@/components/data/helpers";
@@ -114,7 +112,6 @@ function transformSchemaToNodes(
   selectedTables: TableName[],
   tableCounts: TableCounts,
   showEmptyTables: boolean,
-  computedColumns: ComputedColumn[] = [],
 ): TableColumnNode[] {
   const parentToChildren = new Map<string, GroupConfig[]>();
   const rootGroups = groups.filter((group) => !group.parentTableDbName);
@@ -211,38 +208,9 @@ function transformSchemaToNodes(
     };
   }
 
-  const tableNodes = rootGroups
+  return rootGroups
     .map((group) => buildTableNode(group))
     .filter((node): node is TableColumnNode => node !== null);
-
-  // Add computed columns section if there are any
-  if (computedColumns.length > 0) {
-    const computedTableNode: TableColumnNode = {
-      id: "table-computed",
-      data: {
-        label: "Computed Columns",
-        type: "table" as const,
-        tableId: "computed",
-        isDisabled: false,
-        count: computedColumns.length,
-      },
-      children: computedColumns.map((computedCol) => ({
-        id: `column-computed-${computedCol.name}`,
-        data: {
-          label: computedCol.name,
-          type: "column" as const,
-          columnId: `computed.${computedCol.name}`,
-          tableId: "computed",
-          isDisabled: false,
-          isInherited: false,
-          groupDbName: "computed",
-        },
-      })),
-    };
-    tableNodes.push(computedTableNode);
-  }
-
-  return tableNodes;
 }
 
 // Helper to find table information by ID
@@ -325,15 +293,13 @@ type Props = {
   initialDefinition?: QueryDefinition | null;
   onDefinitionChange?: (_definition: QueryDefinition) => void;
   tableCounts: TableCounts;
-  query: Query;
 };
 
 export default function QueryDefinitionExplorer({
   schemaConfig,
   initialDefinition,
   onDefinitionChange,
   tableCounts,
-  query,
 }: Props) {
   const [definition, setDefinition] = useState<QueryDefinition>(
     initialDefinition || {},
@@ -350,7 +316,6 @@ export default function QueryDefinitionExplorer({
     selectedTables,
     tableCounts,
     showEmptyTables,
-    query.computedColumns || [],
   );
 
   // Get all potential sibling joins between selected tables
@@ -505,14 +470,6 @@ export default function QueryDefinitionExplorer({
   const handleColumnSelect = (columnId: string, checked: boolean) => {
     const [tableId, columnName] = columnId.split(".");
     const tableName = tableId as TableName;
-    
-    // Handle computed columns separately
-    if (tableName === "computed") {
-      // For computed columns, we don't modify the definition
-      // They are always included when they exist
-      return;
-    }
-    
     const newDefinition = { ...definition };
 
     // Get all tables that need to be updated
@@ -582,12 +539,9 @@ export default function QueryDefinitionExplorer({
       <TableColumnSelector
         nodes={nodes}
         selectedTableIds={Object.keys(definition)}
-        selectedColumnIds={[
-          ...Object.entries(definition).flatMap(([table, def]) =>
-            def.columns.map((col) => `${table}.${col}`),
-          ),
-          ...(query.computedColumns || []).map((col) => `computed.${col.name}`),
-        ]}
+        selectedColumnIds={Object.entries(definition).flatMap(([table, def]) =>
+          def.columns.map((col) => `${table}.${col}`),
+        )}
         onTableSelect={handleTableSelect}
         onColumnSelect={handleColumnSelect}
         onToggleColumns={handleToggleColumns}

packages/app/src/components/data/query/query-definition.tsx

@@ -57,7 +57,6 @@ export function QueryDefinition({
             initialDefinition={definition}
             onDefinitionChange={handleDefinitionChange}
             tableCounts={tableCounts}
-            query={query}
           />
         </div>
         <QueryDefinitionSummary

packages/app/src/components/data/query/query-glide.tsx

@@ -72,10 +72,9 @@ export function QueryGlide({
       id: col.id,
       label: col.label,
       group: col.columnConfig.groupLabel,
-      hasMenu: col.columnConfig.groupDbName === "computed" ? false : true,
+      hasMenu: true,
       menuIcon: "dots",
       menuFilterContent: (
-        col.columnConfig.groupDbName === "computed" ? null : (
         <DataGridFilter
           column={col.columnConfig}
           abbreviations={col.abbreviations}
@@ -104,12 +103,10 @@ export function QueryGlide({
             };
             handleUpdateDefinition(newDefinition);
           }}
-        />)
+        />
       ),
       sortDirection:
-        col.columnConfig.groupDbName === "computed"
-          ? null
-          : query.definition[col.tableDbName]?.sort?.columnNameCamelCase ===
+        query.definition[col.tableDbName]?.sort?.columnNameCamelCase ===
         col.columnConfig.nameCamelCase
           ? query.definition[col.tableDbName]?.sort?.order
           : null,
@@ -131,7 +128,6 @@ export function QueryGlide({
     (columnId: string, direction: "asc" | "desc" | null) => {
       const column = columns.find((col) => col.id === columnId);
       if (!column) return;
-      if (column.columnConfig.groupDbName === "computed") return;
 
       const newDefinition = { ...query.definition };
       const tableDefinition = newDefinition[column.tableDbName] || {

packages/app/src/components/data/query/table-column-selector.tsx

@@ -53,38 +53,33 @@ export function TableColumnSelector({
       );
     }
 
-    // Handle computed columns specially
-    const isComputedColumn = node.data.type === "column" && node.data.tableId === "computed";
-    const isSelected = isComputedColumn ? true : (
-      node.data.type === "table"
-        ? selectedTableIds.includes(node.data.tableId!)
-        : selectedColumnIds.includes(node.data.columnId!)
-    );
-    const isDisabled = isComputedColumn ? true : node.data.isDisabled;
-
     return (
       <div
         className={cn(
           "flex items-center gap-2 rounded-md px-2 py-1 transition-colors",
-          isDisabled && "opacity-50",
+          node.data.isDisabled && "opacity-50",
         )}
       >
         <Checkbox
           id={node.id}
-          checked={isSelected}
+          checked={
+            node.data.type === "table"
+              ? selectedTableIds.includes(node.data.tableId!)
+              : selectedColumnIds.includes(node.data.columnId!)
+          }
           onCheckedChange={(checked) => {
             if (node.data.type === "table") {
               onTableSelect(node.data.tableId!, checked as boolean);
-            } else if (!isComputedColumn) {
+            } else {
               onColumnSelect(node.data.columnId!, checked as boolean);
             }
           }}
-          disabled={isDisabled}
+          disabled={node.data.isDisabled}
         />
         <span
           className={cn(
             "flex-1 truncate text-xs",
-            isDisabled && "opacity-50",
+            node.data.isDisabled && "opacity-50",
           )}
           title={node.data.label}
         >