@malloy-publisher/sdk 0.0.41 → 0.0.42

package/src/components/Package/Config.tsx

@@ -7,36 +7,30 @@ import {
    ListItemText,
    Typography,
 } from "@mui/material";
-import { QueryClient, useQuery } from "@tanstack/react-query";
 import { Configuration, PackagesApi } from "../../client";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
 import { StyledCard, StyledCardContent } from "../styles";
 import { usePackage } from "./PackageProvider";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
 const packagesApi = new PackagesApi(new Configuration());
-const queryClient = new QueryClient();
 
 export default function Config() {
    const { server, projectName, packageName, versionId, accessToken } =
       usePackage();
 
-   const { data, isSuccess, isError, error } = useQuery(
-      {
-         queryKey: ["package", server, projectName, packageName, versionId],
-         queryFn: () =>
-            packagesApi.getPackage(projectName, packageName, versionId, false, {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+   const { data, isSuccess, isError, error } = useQueryWithApiError({
+      queryKey: ["package", server, projectName, packageName, versionId],
+      queryFn: () =>
+         packagesApi.getPackage(projectName, packageName, versionId, false, {
+            baseURL: server,
+            withCredentials: !accessToken,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
 
    return (
       <StyledCard variant="outlined" sx={{ padding: "10px", width: "100%" }}>
@@ -57,9 +51,9 @@ export default function Config() {
                      <ListItemText primary="Name" secondary={packageName} />
                   </ListItem>
                   {!isSuccess && !isError && (
-                     <Typography variant="body2" sx={{ p: "20px", m: "auto" }}>
+                     <ListItem>
                         <Loading text="Fetching Package Metadata..." />
-                     </Typography>
+                     </ListItem>
                   )}
                   {isSuccess &&
                      ((data.data && (
@@ -70,20 +64,20 @@ export default function Config() {
                            />
                         </ListItem>
                      )) || (
-                           <ListItem
-                              disablePadding={true}
-                              dense={true}
-                              sx={{ mt: "20px" }}
-                           >
-                              <ErrorIcon
-                                 sx={{
-                                    color: "grey.600",
-                                    mr: "10px",
-                                 }}
-                              />
-                              <ListItemText primary={"No package manifest"} />
-                           </ListItem>
-                        ))}
+                        <ListItem
+                           disablePadding={true}
+                           dense={true}
+                           sx={{ mt: "20px" }}
+                        >
+                           <ErrorIcon
+                              sx={{
+                                 color: "grey.600",
+                                 mr: "10px",
+                              }}
+                           />
+                           <ListItemText primary={"No package manifest"} />
+                        </ListItem>
+                     ))}
                   {isError && (
                      <ApiErrorDisplay
                         error={error}

package/src/components/Package/Connections.tsx

@@ -7,15 +7,14 @@ import {
    TableRow,
    Typography,
 } from "@mui/material";
-import { QueryClient, useQuery } from "@tanstack/react-query";
 import { Configuration, ConnectionsApi } from "../../client";
 import { Connection as ApiConnection } from "../../client/api";
 import { StyledCard, StyledCardContent } from "../styles";
 import { usePackage } from "./PackageProvider";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
 const connectionsApi = new ConnectionsApi(new Configuration());
-const queryClient = new QueryClient();
 
 // TODO(jjs) - Move this UI to the ConnectionExplorer component
 function Connection({ connection }: { connection: ApiConnection }) {
@@ -34,22 +33,17 @@ function Connection({ connection }: { connection: ApiConnection }) {
 export default function Connections() {
    const { server, projectName, accessToken } = usePackage();
 
-   const { data, isSuccess, isError, error } = useQuery(
-      {
-         queryKey: ["connections", server, projectName],
-         queryFn: () =>
-            connectionsApi.listConnections(projectName, {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+   const { data, isSuccess, isError, error } = useQueryWithApiError({
+      queryKey: ["connections", server, projectName],
+      queryFn: () =>
+         connectionsApi.listConnections(projectName, {
+            baseURL: server,
+            withCredentials: !accessToken,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
 
    return (
       <StyledCard variant="outlined" sx={{ padding: "10px", width: "100%" }}>

package/src/components/Package/Databases.tsx

@@ -12,16 +12,15 @@ import {
    TableRow,
    Typography,
 } from "@mui/material";
-import { QueryClient, useQuery } from "@tanstack/react-query";
 import React from "react";
 import { Configuration, Database, DatabasesApi } from "../../client";
 import { StyledCard, StyledCardContent } from "../styles";
 import { usePackage } from "./PackageProvider";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
 const databasesApi = new DatabasesApi(new Configuration());
-const queryClient = new QueryClient();
 
 export default function Databases() {
    const { server, projectName, packageName, versionId, accessToken } =
@@ -41,22 +40,17 @@ export default function Databases() {
       setSelectedDatabase(null);
    };
 
-   const { data, isError, error, isSuccess } = useQuery(
-      {
-         queryKey: ["databases", server, projectName, packageName, versionId],
-         queryFn: () =>
-            databasesApi.listDatabases(projectName, packageName, versionId, {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+   const { data, isError, error, isSuccess } = useQueryWithApiError({
+      queryKey: ["databases", server, projectName, packageName, versionId],
+      queryFn: () =>
+         databasesApi.listDatabases(projectName, packageName, versionId, {
+            baseURL: server,
+            withCredentials: !accessToken,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
    const formatRowSize = (size: number) => {
       if (size >= 1024 * 1024 * 1024 * 1024) {
          return `${(size / (1024 * 1024 * 1024)).toFixed(2)} T`;

package/src/components/Package/Models.tsx

@@ -1,16 +1,13 @@
 import { Box, Divider, Typography } from "@mui/material";
-import { QueryClient, useQuery } from "@tanstack/react-query";
-import axios from "axios";
 import { Configuration, ModelsApi } from "../../client";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
 import { StyledCard, StyledCardContent } from "../styles";
 import { FileTreeView } from "./FileTreeView";
 import { usePackage } from "./PackageProvider";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
-axios.defaults.baseURL = "http://localhost:4000";
 const modelsApi = new ModelsApi(new Configuration());
-const queryClient = new QueryClient();
 
 const DEFAULT_EXPANDED_FOLDERS = ["notebooks/", "models/"];
 
@@ -22,22 +19,17 @@ export default function Models({ navigate }: ModelsProps) {
    const { server, projectName, packageName, versionId, accessToken } =
       usePackage();
 
-   const { data, isError, error, isSuccess } = useQuery(
-      {
-         queryKey: ["models", server, projectName, packageName, versionId],
-         queryFn: () =>
-            modelsApi.listModels(projectName, packageName, versionId, {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         throwOnError: false,
-         retry: false,
-      },
-      queryClient,
-   );
+   const { data, isError, error, isSuccess } = useQueryWithApiError({
+      queryKey: ["models", server, projectName, packageName, versionId],
+      queryFn: () =>
+         modelsApi.listModels(projectName, packageName, versionId, {
+            baseURL: server,
+            withCredentials: !accessToken,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
 
    return (
       <StyledCard variant="outlined" sx={{ padding: "10px", width: "100%" }}>

package/src/components/Package/Notebooks.tsx

@@ -1,14 +1,13 @@
 import { Box, Divider, Typography } from "@mui/material";
-import { QueryClient, useQuery } from "@tanstack/react-query";
 import { Configuration, NotebooksApi } from "../../client";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
 import { StyledCard, StyledCardContent } from "../styles";
 import { FileTreeView } from "./FileTreeView";
 import { usePackage } from "./PackageProvider";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
 const notebooksApi = new NotebooksApi(new Configuration());
-const queryClient = new QueryClient();
 
 const DEFAULT_EXPANDED_FOLDERS = ["notebooks/"];
 
@@ -20,22 +19,24 @@ export default function Notebooks({ navigate }: NotebooksProps) {
    const { server, projectName, packageName, versionId, accessToken } =
       usePackage();
 
-   const { data, isError, error, isSuccess } = useQuery(
-      {
-         queryKey: ["notebooks", server, projectName, packageName, versionId],
-         queryFn: () =>
-            notebooksApi.listNotebooks(projectName, packageName, versionId, {
+   const { data, isError, error, isSuccess } = useQueryWithApiError({
+      queryKey: ["notebooks", server, projectName, packageName, versionId],
+      queryFn: async () => {
+         const response = await notebooksApi.listNotebooks(
+            projectName,
+            packageName,
+            versionId,
+            {
                baseURL: server,
                withCredentials: !accessToken,
                headers: {
                   Authorization: accessToken && `Bearer ${accessToken}`,
                },
-            }),
-         throwOnError: false,
-         retry: false,
+            },
+         );
+         return response;
       },
-      queryClient,
-   );
+   });
 
    return (
       <StyledCard variant="outlined" sx={{ padding: "10px", width: "100%" }}>

package/src/components/Package/Schedules.tsx

@@ -10,36 +10,30 @@ import {
    TableRow,
    Typography,
 } from "@mui/material";
-import { QueryClient, useQuery } from "@tanstack/react-query";
 import { Configuration, SchedulesApi } from "../../client";
 import { StyledCard, StyledCardContent } from "../styles";
 import { usePackage } from "./PackageProvider";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
 const schedulesApi = new SchedulesApi(new Configuration());
-const queryClient = new QueryClient();
 
 export default function Schedules() {
    const { server, projectName, packageName, versionId, accessToken } =
       usePackage();
 
-   const { data, isError, isLoading, error } = useQuery(
-      {
-         queryKey: ["schedules", server, projectName, packageName, versionId],
-         queryFn: () =>
-            schedulesApi.listSchedules(projectName, packageName, versionId, {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+   const { data, isError, isLoading, error } = useQueryWithApiError({
+      queryKey: ["schedules", server, projectName, packageName, versionId],
+      queryFn: () =>
+         schedulesApi.listSchedules(projectName, packageName, versionId, {
+            baseURL: server,
+            withCredentials: !accessToken,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
 
    if (isLoading) {
       return <Loading text="Fetching Schedules..." />;

package/src/components/Project/About.tsx

@@ -2,33 +2,27 @@ import { Divider, Typography } from "@mui/material";
 import { Configuration, ProjectsApi } from "../../client";
 import Markdown from "markdown-to-jsx";
 import { StyledCard, StyledCardContent, StyledCardMedia } from "../styles";
-import { QueryClient, useQuery } from "@tanstack/react-query";
 import { useProject } from "./Project";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
 const projectsApi = new ProjectsApi(new Configuration());
-const queryClient = new QueryClient();
 
 export default function About() {
    const { server, projectName, accessToken } = useProject();
 
-   const { data, isSuccess, isError, error } = useQuery(
-      {
-         queryKey: ["about", server, projectName],
-         queryFn: () =>
-            projectsApi.getProject(projectName, false, {
-               baseURL: server,
-               withCredentials: true,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+   const { data, isSuccess, isError, error } = useQueryWithApiError({
+      queryKey: ["about", server, projectName],
+      queryFn: () =>
+         projectsApi.getProject(projectName, false, {
+            baseURL: server,
+            withCredentials: true,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
 
    return (
       <>

package/src/components/Project/ConnectionExplorer.tsx

@@ -21,15 +21,14 @@ import {
    TableHead,
    TableRow,
 } from "@mui/material";
-import { QueryClient, useQuery } from "@tanstack/react-query";
 import { ConnectionsApi } from "../../client/api";
 import { Configuration } from "../../client/configuration";
 import { useProject } from "./Project";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
 const connectionsApi = new ConnectionsApi(new Configuration());
-const queryClient = new QueryClient();
 
 interface ConnectionExplorerProps {
    connectionName: string;
@@ -47,22 +46,17 @@ export default function ConnectionExplorer({
       null,
    );
    const [showHiddenSchemas, setShowHiddenSchemas] = React.useState(false);
-   const { data, isSuccess, isError, error, isLoading } = useQuery(
-      {
-         queryKey: ["tablePath", server, projectName, connectionName],
-         queryFn: () =>
-            connectionsApi.listSchemas(projectName, connectionName, {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+   const { data, isSuccess, isError, error, isLoading } = useQueryWithApiError({
+      queryKey: ["tablePath", server, projectName, connectionName],
+      queryFn: () =>
+         connectionsApi.listSchemas(projectName, connectionName, {
+            baseURL: server,
+            withCredentials: !accessToken,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
 
    return (
       <Grid container spacing={2}>
@@ -174,35 +168,30 @@ function TableViewer({
 }: TableViewerProps) {
    const { server, projectName, accessToken } = useProject();
 
-   const { data, isSuccess, isError, error, isLoading } = useQuery(
-      {
-         queryKey: [
-            "tablePathSchema",
-            server,
+   const { data, isSuccess, isError, error, isLoading } = useQueryWithApiError({
+      queryKey: [
+         "tablePathSchema",
+         server,
+         projectName,
+         connectionName,
+         schemaName,
+         tableName,
+      ],
+      queryFn: () =>
+         connectionsApi.getTablesource(
             projectName,
             connectionName,
-            schemaName,
             tableName,
-         ],
-         queryFn: () =>
-            connectionsApi.getTablesource(
-               projectName,
-               connectionName,
-               tableName,
-               `${schemaName}.${tableName}`,
-               {
-                  baseURL: server,
-                  withCredentials: !accessToken,
-                  headers: {
-                     Authorization: accessToken && `Bearer ${accessToken}`,
-                  },
+            `${schemaName}.${tableName}`,
+            {
+               baseURL: server,
+               withCredentials: !accessToken,
+               headers: {
+                  Authorization: accessToken && `Bearer ${accessToken}`,
                },
-            ),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+            },
+         ),
+   });
 
    if (isSuccess && data) {
       console.log(data);
@@ -289,28 +278,23 @@ function TablesInSchema({
 }: TablesInSchemaProps) {
    const { server, projectName, accessToken } = useProject();
 
-   const { data, isSuccess, isError, error, isLoading } = useQuery(
-      {
-         queryKey: [
-            "tablesInSchema",
-            server,
-            projectName,
-            connectionName,
-            schemaName,
-         ],
-         queryFn: () =>
-            connectionsApi.listTables(projectName, connectionName, schemaName, {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+   const { data, isSuccess, isError, error, isLoading } = useQueryWithApiError({
+      queryKey: [
+         "tablesInSchema",
+         server,
+         projectName,
+         connectionName,
+         schemaName,
+      ],
+      queryFn: () =>
+         connectionsApi.listTables(projectName, connectionName, schemaName, {
+            baseURL: server,
+            withCredentials: !accessToken,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
 
    return (
       <>

package/src/components/Project/Packages.tsx

@@ -1,13 +1,12 @@
 import { Box, Divider, Grid, Typography } from "@mui/material";
 import { Configuration, PackagesApi } from "../../client";
 import { StyledCard, StyledCardContent, StyledCardMedia } from "../styles";
-import { QueryClient, useQuery } from "@tanstack/react-query";
 import { useProject } from "./Project";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 
 const packagesApi = new PackagesApi(new Configuration());
-const queryClient = new QueryClient();
 
 interface PackagesProps {
    navigate: (to: string, event?: React.MouseEvent) => void;
@@ -16,22 +15,17 @@ interface PackagesProps {
 export default function Packages({ navigate }: PackagesProps) {
    const { server, projectName, accessToken } = useProject();
 
-   const { data, isSuccess, isError, error } = useQuery(
-      {
-         queryKey: ["packages", server, projectName],
-         queryFn: () =>
-            packagesApi.listPackages(projectName, {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            }),
-         retry: false,
-         throwOnError: false,
-      },
-      queryClient,
-   );
+   const { data, isSuccess, isError, error } = useQueryWithApiError({
+      queryKey: ["packages", server, projectName],
+      queryFn: () =>
+         packagesApi.listPackages(projectName, {
+            baseURL: server,
+            withCredentials: !accessToken,
+            headers: {
+               Authorization: accessToken && `Bearer ${accessToken}`,
+            },
+         }),
+   });
 
    return (
       <>