Remove dead code from browser queries (#2066)

packages/toolpad-app/src/appDom/index.ts

@@ -1081,13 +1081,7 @@ function createRenderTreeNode(node: AppDomNode): RenderTreeNode | null {
  }
 
  if (isQuery(node) || isMutation(node)) {
- // This is hacky, should we delegate this check to the datasources?
- const isBrowserSideRestQuery: boolean =
- (node.attributes.dataSource?.value === 'rest' ||
- node.attributes.dataSource?.value === 'function') &&
- !!(node.attributes.query.value as any).browser;
-
- if (node.attributes.query.value && !isBrowserSideRestQuery) {
+ if (node.attributes.query.value) {
  node = setNamespacedProp(node, 'attributes', 'query', null);
  }
  }

packages/toolpad-app/src/runtime/useDataQuery.ts

@@ -4,7 +4,6 @@ import { GridRowsProp } from '@mui/x-data-grid-pro';
 import * as React from 'react';
 import { useQuery, UseQueryOptions } from '@tanstack/react-query';
 import { CanvasHooksContext } from './CanvasHooksContext';
-import dataSources from '../toolpadDataSources/runtime';
 import * as appDom from '../appDom';
 
 interface ExecDataSourceQueryParams {
@@ -72,10 +71,6 @@ export function useDataQuery(
  const { savedNodes } = React.useContext(CanvasHooksContext);
  const queryName = node.name;
  const pageName = page.name;
- const query = node.attributes.query?.value;
- const dataSourceId = node.attributes.dataSource?.value;
-
- const dataSource = dataSourceId ? dataSources[dataSourceId] : null;
 
  // These are only used by the editor to invalidate caches whenever the query changes during editing
  const nodeHash: number | undefined = savedNodes ? savedNodes[node.id] : undefined;
@@ -89,15 +84,7 @@ export function useDataQuery(
  refetch,
  } = useQuery(
  [nodeHash, pageName, queryName, params],
- ({ signal }) => {
- const fetchFromServer = () => execDataSourceQuery({ signal, pageName, queryName, params });
-
- if (query && dataSource?.exec) {
- return dataSource?.exec(query, params, fetchFromServer);
- }
-
- return fetchFromServer();
- },
+ ({ signal }) => execDataSourceQuery({ signal, pageName, queryName, params }),
  {
  ...options,
  enabled: isNodeAvailableOnServer && enabled,

packages/toolpad-app/src/toolpadDataSources/rest/client.tsx

@@ -17,12 +17,7 @@ import { Controller, useForm } from 'react-hook-form';
 import { TabContext, TabList } from '@mui/lab';
 import { useBrowserJsRuntime } from '@mui/toolpad-core/jsBrowserRuntime';
 import { useServerJsRuntime } from '@mui/toolpad-core/jsServerRuntime';
-import {
- ClientDataSource,
- ConnectionEditorProps,
- ExecFetchFn,
- QueryEditorProps,
-} from '../../types';
+import { ClientDataSource, ConnectionEditorProps, QueryEditorProps } from '../../types';
 import {
  FetchPrivateQuery,
  FetchQuery,
@@ -56,7 +51,6 @@ import Devtools from '../../components/Devtools';
 import { createHarLog, mergeHar } from '../../utils/har';
 import QueryInputPanel from '../QueryInputPanel';
 import useFetchPrivate from '../useFetchPrivate';
-import { clientExec } from './runtime';
 import QueryPreview from '../QueryPreview';
 import { usePrivateQuery } from '../context';
 
@@ -384,15 +378,12 @@ function QueryEditor({
  const [activeTab, setActiveTab] = React.useState('urlQuery');
 
  const fetchPrivate = useFetchPrivate<FetchPrivateQuery, FetchResult>();
- const fetchServerPreview = React.useCallback(
+ const fetchPreview = React.useCallback(
  (query: FetchQuery, params: Record<string, string>) =>
  fetchPrivate({ kind: 'debugExec', query, params }),
  [fetchPrivate],
  );
 
- const fetchPreview: ExecFetchFn<FetchQuery, FetchResult> = (query, params) =>
- clientExec(query, params, fetchServerPreview);
-
  const [previewHar, setPreviewHar] = React.useState(() => createHarLog());
  const {
  preview,