@malloy-publisher/sdk 0.0.43 → 0.0.46

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/sdk",
    "description": "Malloy Publisher SDK",
-   "version": "0.0.43",
+   "version": "0.0.46",
    "type": "module",
    "main": "dist/index.cjs.js",
    "module": "dist/index.es.js",

package/src/components/Home/Home.tsx

@@ -7,22 +7,15 @@ import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 const projectsApi = new ProjectsApi(new Configuration());
 
 interface HomeProps {
-   server?: string;
    navigate?: (to: string, event?: React.MouseEvent) => void;
 }
 
-export default function Home({ server, navigate }: HomeProps) {
+export default function Home({ navigate }: HomeProps) {
    const { data, isSuccess, isError, error } = useQueryWithApiError({
-      queryKey: ["projects", server],
-      queryFn: () =>
-         projectsApi.listProjects({
-            baseURL: server,
-            withCredentials: true,
-         }),
+      queryKey: ["projects"],
+      queryFn: (config) => projectsApi.listProjects(config),
    });
 
-   console.log(JSON.stringify(data?.data, null, 2));
-
    if (isError) {
       return <ApiErrorDisplay error={error} context="Projects List" />;
    }

package/src/components/Model/Model.tsx

@@ -53,9 +53,8 @@ export default function Model({
       React.useState<string>();
    const [selectedTab, setSelectedTab] = React.useState(0);
 
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
-   const modelCodeSnippet = getModelCodeSnippet(server, packageName, modelPath);
+   const { projectName, packageName, versionId } = usePackage();
+   const modelCodeSnippet = getModelCodeSnippet(modelPath);
    useEffect(() => {
       highlight(modelCodeSnippet, "typescript").then((code) => {
          setHighlightedEmbedCode(code);
@@ -64,27 +63,14 @@ export default function Model({
 
    const { data, isError, isLoading, error } =
       useQueryWithApiError<CompiledModel>({
-         queryKey: [
-            "package",
-            server,
-            projectName,
-            packageName,
-            modelPath,
-            versionId,
-         ],
-         queryFn: async () => {
+         queryKey: ["package", projectName, packageName, modelPath, versionId],
+         queryFn: async (config) => {
             const response = await modelsApi.getModel(
                projectName,
                packageName,
                modelPath,
                versionId,
-               {
-                  baseURL: server,
-                  withCredentials: !accessToken,
-                  headers: {
-                     Authorization: accessToken && `Bearer ${accessToken}`,
-                  },
-               },
+               config,
             );
             return response.data;
          },
@@ -254,14 +240,8 @@ export default function Model({
    );
 }
 
-function getModelCodeSnippet(
-   server: string,
-   packageName: string,
-   modelPath: string,
-): string {
+function getModelCodeSnippet(modelPath: string): string {
    return `<Model
-   server="${server}"
-   packageName="${packageName}"
    modelPath="${modelPath}"
    accessToken={accessToken}
 />`;

package/src/components/Model/ModelCell.tsx

@@ -17,7 +17,6 @@ import LinkOutlinedIcon from "@mui/icons-material/LinkOutlined";
 import ContentCopyIcon from "@mui/icons-material/ContentCopy";
 import { useEffect } from "react";
 import { highlight } from "../highlighter";
-import { usePackage } from "../Package/PackageProvider";
 
 const StyledCard = styled(Card)({
    display: "flex",
@@ -56,13 +55,7 @@ export function ModelCell({
    const [highlightedAnnotations, setHighlightedAnnotations] =
       React.useState<string>();
 
-   const { server, projectName, packageName, versionId } = usePackage();
-
    const queryResultCodeSnippet = getQueryResultCodeSnippet(
-      server,
-      projectName,
-      packageName,
-      versionId,
       sourceName,
       queryName,
    );
@@ -219,19 +212,10 @@ export function ModelCell({
 }
 
 function getQueryResultCodeSnippet(
-   server: string,
-   projectName: string,
-   packageName: string,
-   versionId: string,
    sourceName: string,
    queryName: string,
 ): string {
    return `<QueryResult
-server="${server}"
-accessToken={accessToken}
-projectName="${projectName}"
-packageName="${packageName}"
-versionId="${versionId}"
 sourceName="${sourceName}"
 queryName="${queryName}"
 />`;

package/src/components/Model/NamedQueries.tsx

@@ -25,8 +25,7 @@ export default function NamedQueries({
    namedQueries,
    modelPath,
 }: NamedQueryProps) {
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
+   const { projectName, packageName, versionId } = usePackage();
    const [namedQueryResults, setNamedQueryResults] = React.useState<
       Record<string, string>
    >({});
@@ -35,7 +34,7 @@ export default function NamedQueries({
    >({});
 
    const mutation = useMutationWithApiError({
-      mutationFn: ({ query }: { query: Query }) => {
+      mutationFn: ({ query }: { query: Query }, config) => {
          const val = queryResultsApi.executeQuery(
             projectName,
             packageName,
@@ -44,13 +43,7 @@ export default function NamedQueries({
             undefined,
             query.name,
             versionId,
-            {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            },
+            config,
          );
          return val;
       },

package/src/components/Model/SourcesExplorer.tsx

@@ -171,10 +171,9 @@ export function SourceExplorerComponent({
          onChange(query);
       }
    }, [onChange, query]);
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
+   const { projectName, packageName, versionId } = usePackage();
    const mutation = useMutationWithApiError({
-      mutationFn: () => {
+      mutationFn: (_, config) => {
          const malloy = new QueryBuilder.ASTQuery({
             source: sourceAndPath.sourceInfo,
             query: query?.malloyQuery,
@@ -192,13 +191,7 @@ export function SourceExplorerComponent({
             // sourceInfo.name,
             undefined,
             versionId,
-            {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            },
+            config,
          );
       },
       onSuccess: (data) => {

package/src/components/MutableNotebook/ModelPicker.tsx

@@ -31,18 +31,11 @@ export function ModelPicker({
    initialSelectedModels,
    onModelChange,
 }: ModelPickerProps) {
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
+   const { projectName, packageName, versionId } = usePackage();
    const { data, isLoading, isSuccess, isError, error } = useQueryWithApiError({
-      queryKey: ["models", server, projectName, packageName, versionId],
-      queryFn: () =>
-         modelsApi.listModels(projectName, packageName, versionId, {
-            baseURL: server,
-            withCredentials: !accessToken,
-            headers: {
-               Authorization: accessToken && `Bearer ${accessToken}`,
-            },
-         }),
+      queryKey: ["models", projectName, packageName, versionId],
+      queryFn: (config) =>
+         modelsApi.listModels(projectName, packageName, versionId, config),
    });
    const [selectedModels, setSelectedModels] = React.useState<string[]>(
       initialSelectedModels || [],

package/src/components/MutableNotebook/MutableNotebook.tsx

@@ -22,6 +22,7 @@ import { useRouterClickHandler } from "../click_helper";
 import { SourceAndPath } from "../Model/SourcesExplorer";
 import { NotebookManager } from "../NotebookManager";
 import { usePackage } from "../Package";
+import { useServer } from "../ServerProvider";
 import { StyledCard, StyledCardContent, StyledCardMedia } from "../styles";
 import { MutableCell } from "./MutableCell";
 import { useNotebookStorage } from "./NotebookStorageProvider";
@@ -50,14 +51,14 @@ export default function MutableNotebook({
    hideEmbeddingIcons,
 }: MutableNotebookProps) {
    const navigate = useRouterClickHandler();
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
+   const { projectName, packageName, versionId } = usePackage();
+   const { server, accessToken } = useServer();
+   const { notebookStorage, userContext } = useNotebookStorage();
    if (!projectName || !packageName) {
       throw new Error(
          "Project and package must be provided via PubliserPackageProvider",
       );
    }
-   const { notebookStorage, userContext } = useNotebookStorage();
    if (!notebookStorage || !userContext) {
       throw new Error(
          "Notebook storage and user context must be provided via NotebookStorageProvider",

package/src/components/Notebook/Notebook.tsx

@@ -44,14 +44,8 @@ export default function Notebook({
       React.useState<boolean>(false);
    const [highlightedEmbedCode, setHighlightedEmbedCode] =
       React.useState<string>();
-   const { server, projectName, packageName, accessToken, versionId } =
-      usePackage();
-   const notebookCodeSnippet = getNotebookCodeSnippet(
-      server,
-      packageName,
-      notebookPath,
-      true,
-   );
+   const { projectName, packageName, versionId } = usePackage();
+   const notebookCodeSnippet = getNotebookCodeSnippet(notebookPath, true);
 
    useEffect(() => {
       highlight(notebookCodeSnippet, "typescript").then((code) => {
@@ -65,27 +59,14 @@ export default function Notebook({
       isError,
       error,
    } = useQueryWithApiError<CompiledNotebook>({
-      queryKey: [
-         "notebook",
-         server,
-         projectName,
-         packageName,
-         notebookPath,
-         versionId,
-      ],
-      queryFn: async () => {
+      queryKey: ["notebook", projectName, packageName, notebookPath, versionId],
+      queryFn: async (config) => {
          const response = await notebooksApi.getNotebook(
             projectName,
             packageName,
             notebookPath,
             versionId,
-            {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            },
+            config,
          );
          return response.data;
       },
@@ -177,9 +158,6 @@ export default function Notebook({
                         cell={cell}
                         notebookPath={notebookPath}
                         queryResultCodeSnippet={getQueryResultCodeSnippet(
-                           server,
-                           projectName,
-                           packageName,
                            notebookPath,
                            cell.text,
                         )}
@@ -209,18 +187,8 @@ export default function Notebook({
    );
 }
 
-function getQueryResultCodeSnippet(
-   server: string,
-   projectName: string,
-   packageName: string,
-   modelPath: string,
-   query: string,
-): string {
+function getQueryResultCodeSnippet(modelPath: string, query: string): string {
    return `<QueryResult
-   server="${server}"
-   accessToken={accessToken}
-   projectName="${projectName}"
-   packageName="${packageName}"
    modelPath="${modelPath}"
    query="
       ${query}
@@ -229,17 +197,11 @@ function getQueryResultCodeSnippet(
 }
 
 function getNotebookCodeSnippet(
-   server: string,
-   packageName: string,
    notebookPath: string,
    expandedCodeCells: boolean,
 ): string {
    return `<Notebook
-   server="${server}"
-   packageName="${packageName}"
    notebookPath="${notebookPath}"
-   versionId={versionId}
-   accessToken={accessToken}
    expandCodeCells={${expandedCodeCells}}
 />`;
 }

package/src/components/Package/Config.tsx

@@ -17,19 +17,18 @@ import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 const packagesApi = new PackagesApi(new Configuration());
 
 export default function Config() {
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
+   const { projectName, packageName, versionId } = usePackage();
 
    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}`,
-            },
-         }),
+      queryKey: ["package", projectName, packageName, versionId],
+      queryFn: (config) =>
+         packagesApi.getPackage(
+            projectName,
+            packageName,
+            versionId,
+            false,
+            config,
+         ),
    });
 
    return (

package/src/components/Package/Connections.tsx

@@ -31,18 +31,11 @@ function Connection({ connection }: { connection: ApiConnection }) {
 }
 
 export default function Connections() {
-   const { server, projectName, accessToken } = usePackage();
+   const { projectName } = usePackage();
 
    const { data, isSuccess, isError, error } = useQueryWithApiError({
-      queryKey: ["connections", server, projectName],
-      queryFn: () =>
-         connectionsApi.listConnections(projectName, {
-            baseURL: server,
-            withCredentials: !accessToken,
-            headers: {
-               Authorization: accessToken && `Bearer ${accessToken}`,
-            },
-         }),
+      queryKey: ["connections", projectName],
+      queryFn: (config) => connectionsApi.listConnections(projectName, config),
    });
 
    return (

package/src/components/Package/Databases.tsx

@@ -23,8 +23,7 @@ import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 const databasesApi = new DatabasesApi(new Configuration());
 
 export default function Databases() {
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
+   const { projectName, packageName, versionId } = usePackage();
 
    const [open, setOpen] = React.useState(false);
    const [selectedDatabase, setSelectedDatabase] =
@@ -41,15 +40,14 @@ export default function Databases() {
    };
 
    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}`,
-            },
-         }),
+      queryKey: ["databases", projectName, packageName, versionId],
+      queryFn: (config) =>
+         databasesApi.listDatabases(
+            projectName,
+            packageName,
+            versionId,
+            config,
+         ),
    });
    const formatRowSize = (size: number) => {
       if (size >= 1024 * 1024 * 1024 * 1024) {

package/src/components/Package/Models.tsx

@@ -16,19 +16,11 @@ interface ModelsProps {
 }
 
 export default function Models({ navigate }: ModelsProps) {
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
-
+   const { projectName, packageName, versionId } = usePackage();
    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}`,
-            },
-         }),
+      queryKey: ["models", projectName, packageName, versionId],
+      queryFn: (config) =>
+         modelsApi.listModels(projectName, packageName, versionId, config),
    });
 
    return (

package/src/components/Package/Notebooks.tsx

@@ -16,26 +16,17 @@ interface NotebooksProps {
 }
 
 export default function Notebooks({ navigate }: NotebooksProps) {
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
+   const { projectName, packageName, versionId } = usePackage();
 
    const { data, isError, error, isSuccess } = useQueryWithApiError({
-      queryKey: ["notebooks", server, projectName, packageName, versionId],
-      queryFn: async () => {
-         const response = await notebooksApi.listNotebooks(
+      queryKey: ["notebooks", projectName, packageName, versionId],
+      queryFn: (config) =>
+         notebooksApi.listNotebooks(
             projectName,
             packageName,
             versionId,
-            {
-               baseURL: server,
-               withCredentials: !accessToken,
-               headers: {
-                  Authorization: accessToken && `Bearer ${accessToken}`,
-               },
-            },
-         );
-         return response;
-      },
+            config,
+         ),
    });
 
    return (

package/src/components/Package/Package.tsx

@@ -48,7 +48,6 @@ export default function Package({ navigate }: PackageProps) {
          <Grid size={{ xs: 12, md: 12 }}>
             <Notebook
                notebookPath={README_NOTEBOOK}
-               expandCodeCells={false}
                hideEmbeddingIcons={true}
             />
          </Grid>

package/src/components/Package/PackageProvider.tsx

@@ -1,11 +1,9 @@
 import React, { createContext, useContext, ReactNode } from "react";
 
 export interface PackageContextProps {
-   server?: string;
    projectName: string;
    packageName: string;
    versionId?: string;
-   accessToken?: string;
 }
 
 const PackageContext = createContext<PackageContextProps | undefined>(
@@ -21,17 +19,13 @@ interface PackageProviderProps extends PackageContextProps {
 // that need it.
 // The package information is passed to the components via the usePackage hook.
 export const PackageProvider = ({
-   server,
    projectName,
    packageName,
    versionId,
-   accessToken,
    children,
 }: PackageProviderProps) => {
    return (
-      <PackageContext.Provider
-         value={{ server, projectName, packageName, versionId, accessToken }}
-      >
+      <PackageContext.Provider value={{ projectName, packageName, versionId }}>
          {children}
       </PackageContext.Provider>
    );

package/src/components/Package/Schedules.tsx

@@ -20,19 +20,17 @@ import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 const schedulesApi = new SchedulesApi(new Configuration());
 
 export default function Schedules() {
-   const { server, projectName, packageName, versionId, accessToken } =
-      usePackage();
+   const { projectName, packageName, versionId } = usePackage();
 
    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}`,
-            },
-         }),
+      queryKey: ["schedules", projectName, packageName, versionId],
+      queryFn: (config) =>
+         schedulesApi.listSchedules(
+            projectName,
+            packageName,
+            versionId,
+            config,
+         ),
    });
 
    if (isLoading) {

package/src/components/Project/About.tsx

@@ -10,18 +10,11 @@ import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
 const projectsApi = new ProjectsApi(new Configuration());
 
 export default function About() {
-   const { server, projectName, accessToken } = useProject();
+   const { projectName } = useProject();
 
    const { data, isSuccess, isError, error } = useQueryWithApiError({
-      queryKey: ["about", server, projectName],
-      queryFn: () =>
-         projectsApi.getProject(projectName, false, {
-            baseURL: server,
-            withCredentials: true,
-            headers: {
-               Authorization: accessToken && `Bearer ${accessToken}`,
-            },
-         }),
+      queryKey: ["about", projectName],
+      queryFn: (config) => projectsApi.getProject(projectName, false, config),
    });
 
    return (