@malloy-publisher/sdk 0.0.198-dev → 0.0.198

package/dist/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-Xo_ADux9.cjs.js"),o=require("./ServerProvider-IhQ4aYBm.cjs.js");exports.AnalyzePackageButton=e.AnalyzePackageButton;exports.BrowserWorkbookStorage=e.BrowserWorkbookStorage;exports.ConnectionExplorer=e.ConnectionExplorer;exports.DimensionFilter=e.DimensionFilter;exports.EmbeddedQueryResult=e.EmbeddedQueryResult;exports.Environment=e.Environment;exports.Home=e.Home;exports.Loading=e.Loading;exports.Model=e.Model;exports.ModelExplorer=e.ModelExplorer;exports.ModelExplorerDialog=e.ModelExplorerDialog;exports.Models=e.Models;exports.Notebook=e.Notebook;exports.Package=e.Package;exports.Packages=e.Packages;exports.QueryResult=e.QueryResult;exports.RenderedResult=e.RenderedResult;exports.ResultContainer=e.ResultContainer;exports.SourceExplorerComponent=e.SourceExplorerComponent;exports.SourcesExplorer=e.SourcesExplorer;exports.Workbook=e.Workbook;exports.WorkbookList=e.WorkbookList;exports.WorkbookManager=e.WorkbookManager;exports.WorkbookStorageProvider=e.WorkbookStorageProvider;exports.createEmbeddedQueryResult=e.createEmbeddedQueryResult;exports.encodeResourceUri=e.encodeResourceUri;exports.extractDimensionSpecs=e.extractDimensionSpecs;exports.extractSourceFromQuery=e.extractSourceFromQuery;exports.generateFilterClause=e.generateFilterClause;exports.getDimensionKey=e.getDimensionKey;exports.getJoinedSources=e.getJoinedSources;exports.injectWhereClause=e.injectWhereClause;exports.makeDimensionKey=e.makeDimensionKey;exports.parseAllSourceInfos=e.parseAllSourceInfos;exports.parseDimensionFilterAnnotation=e.parseDimensionFilterAnnotation;exports.parseNotebookFilterAnnotation=e.parseNotebookFilterAnnotation;exports.parseResourceUri=e.parseResourceUri;exports.useDimensionFilters=e.useDimensionFilters;exports.useDimensionFiltersFromSpec=e.useDimensionFiltersFromSpec;exports.useDimensionFiltersQuery=e.useDimensionFiltersQuery;exports.useDimensionalFilterRangeData=e.useDimensionalFilterRangeData;exports.useModelData=e.useModelData;exports.useRawQueryData=e.useRawQueryData;exports.useRouterClickHandler=e.useRouterClickHandler;exports.ServerProvider=o.ServerProvider;exports.useServer=o.useServer;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-BZ3efB1x.cjs.js"),o=require("./ServerProvider-IhQ4aYBm.cjs.js");exports.AnalyzePackageButton=e.AnalyzePackageButton;exports.BrowserWorkbookStorage=e.BrowserWorkbookStorage;exports.ConnectionExplorer=e.ConnectionExplorer;exports.DimensionFilter=e.DimensionFilter;exports.EmbeddedQueryResult=e.EmbeddedQueryResult;exports.Environment=e.Environment;exports.Home=e.Home;exports.Loading=e.Loading;exports.Model=e.Model;exports.ModelExplorer=e.ModelExplorer;exports.ModelExplorerDialog=e.ModelExplorerDialog;exports.Notebook=e.Notebook;exports.Package=e.Package;exports.Packages=e.Packages;exports.QueryResult=e.QueryResult;exports.RenderedResult=e.RenderedResult;exports.ResultContainer=e.ResultContainer;exports.SourceExplorerComponent=e.SourceExplorerComponent;exports.SourcesExplorer=e.SourcesExplorer;exports.Workbook=e.Workbook;exports.WorkbookList=e.WorkbookList;exports.WorkbookManager=e.WorkbookManager;exports.WorkbookStorageProvider=e.WorkbookStorageProvider;exports.createEmbeddedQueryResult=e.createEmbeddedQueryResult;exports.encodeResourceUri=e.encodeResourceUri;exports.extractDimensionSpecs=e.extractDimensionSpecs;exports.extractSourceFromQuery=e.extractSourceFromQuery;exports.generateFilterClause=e.generateFilterClause;exports.getDimensionKey=e.getDimensionKey;exports.getJoinedSources=e.getJoinedSources;exports.injectWhereClause=e.injectWhereClause;exports.makeDimensionKey=e.makeDimensionKey;exports.parseAllSourceInfos=e.parseAllSourceInfos;exports.parseDimensionFilterAnnotation=e.parseDimensionFilterAnnotation;exports.parseNotebookFilterAnnotation=e.parseNotebookFilterAnnotation;exports.parseResourceUri=e.parseResourceUri;exports.useDimensionFilters=e.useDimensionFilters;exports.useDimensionFiltersFromSpec=e.useDimensionFiltersFromSpec;exports.useDimensionFiltersQuery=e.useDimensionFiltersQuery;exports.useDimensionalFilterRangeData=e.useDimensionalFilterRangeData;exports.useModelData=e.useModelData;exports.useRawQueryData=e.useRawQueryData;exports.useRouterClickHandler=e.useRouterClickHandler;exports.ServerProvider=o.ServerProvider;exports.useServer=o.useServer;

package/dist/index.es.js

@@ -1,5 +1,5 @@
-import { A as a, J as o, C as r, D as n, y as t, E as i, H as l, L as u, M as m, o as c, q as d, x as k, N as p, v as D, P as g, Q as S, R, F, r as x, S as y, W as b, G as E, K as C, I as M, B as Q, _ as W, g as v, i as P, j as A, X as f, k as B, l as H, Y as K, p as L, m as N, n as U, Z as j, O as w, T as I, U as J, V as h, t as q, u as z, e as G } from "./index-CN0_kZSF.es.js";
-import { S as T, u as V } from "./ServerProvider-DDScRRDc.es.js";
+import { A as a, I as o, C as r, D as n, x as t, E as i, H as l, L as u, M as m, o as c, q as d, N as k, v as p, P as D, Q as g, R as S, B as R, r as F, S as x, W as y, F as b, J as E, G as C, y as Q, Z as W, g as v, i as M, j as P, V as A, k as f, l as B, X as H, p as K, m as L, n as N, Y as U, K as j, O as w, T as I, U as J, t as h, u as q, e as z } from "./index-BIdK-n2r.es.js";
+import { S as O, u as T } from "./ServerProvider-DDScRRDc.es.js";
 export {
   a as AnalyzePackageButton,
   o as BrowserWorkbookStorage,
@@ -12,39 +12,38 @@ export {
   m as Model,
   c as ModelExplorer,
   d as ModelExplorerDialog,
-  k as Models,
-  p as Notebook,
-  D as Package,
-  g as Packages,
-  S as QueryResult,
-  R as RenderedResult,
-  F as ResultContainer,
-  T as ServerProvider,
-  x as SourceExplorerComponent,
-  y as SourcesExplorer,
-  b as Workbook,
-  E as WorkbookList,
-  C as WorkbookManager,
-  M as WorkbookStorageProvider,
+  k as Notebook,
+  p as Package,
+  D as Packages,
+  g as QueryResult,
+  S as RenderedResult,
+  R as ResultContainer,
+  O as ServerProvider,
+  F as SourceExplorerComponent,
+  x as SourcesExplorer,
+  y as Workbook,
+  b as WorkbookList,
+  E as WorkbookManager,
+  C as WorkbookStorageProvider,
   Q as createEmbeddedQueryResult,
   W as encodeResourceUri,
   v as extractDimensionSpecs,
-  P as extractSourceFromQuery,
-  A as generateFilterClause,
-  f as getDimensionKey,
-  B as getJoinedSources,
-  H as injectWhereClause,
-  K as makeDimensionKey,
-  L as parseAllSourceInfos,
-  N as parseDimensionFilterAnnotation,
-  U as parseNotebookFilterAnnotation,
-  j as parseResourceUri,
-  w as useDimensionFilters,
-  I as useDimensionFiltersFromSpec,
-  J as useDimensionFiltersQuery,
-  h as useDimensionalFilterRangeData,
-  q as useModelData,
-  z as useRawQueryData,
-  G as useRouterClickHandler,
-  V as useServer
+  M as extractSourceFromQuery,
+  P as generateFilterClause,
+  A as getDimensionKey,
+  f as getJoinedSources,
+  B as injectWhereClause,
+  H as makeDimensionKey,
+  K as parseAllSourceInfos,
+  L as parseDimensionFilterAnnotation,
+  N as parseNotebookFilterAnnotation,
+  U as parseResourceUri,
+  j as useDimensionFilters,
+  w as useDimensionFiltersFromSpec,
+  I as useDimensionFiltersQuery,
+  J as useDimensionalFilterRangeData,
+  h as useModelData,
+  q as useRawQueryData,
+  z as useRouterClickHandler,
+  T as useServer
 };

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/sdk",
    "description": "Malloy Publisher SDK",
-   "version": "0.0.198-dev",
+   "version": "0.0.198",
    "type": "module",
    "main": "dist/index.cjs.js",
    "module": "dist/index.es.js",
@@ -71,9 +71,9 @@
       "react-router-dom": ">=7.6.2",
       "@tanstack/react-query": ">=5.59.16",
       "@malloydata/malloy-explorer": "0.0.338-dev260215172810",
-      "@malloydata/malloy-interfaces": "^0.0.383",
-      "@malloydata/malloy-query-builder": "^0.0.383",
-      "@malloydata/render": "^0.0.383",
+      "@malloydata/malloy-interfaces": "^0.0.394",
+      "@malloydata/malloy-query-builder": "^0.0.394",
+      "@malloydata/render": "^0.0.394",
       "@mui/icons-material": ">=7.1.1",
       "@mui/x-date-pickers": ">=7.1.1",
       "@mui/material": ">=7.1.1",
@@ -91,7 +91,7 @@
    },
    "devDependencies": {
       "@malloydata/malloy-explorer": "0.0.338-dev260215172810",
-      "@malloydata/malloy-query-builder": "^0.0.383",
+      "@malloydata/malloy-query-builder": "^0.0.394",
       "@openapitools/openapi-generator-cli": "^2.20.2",
       "@types/bun": "^1.2.21",
       "@types/k6": "^1.0.2",

package/src/components/Environment/AddPackageDialog.tsx

@@ -1,19 +1,22 @@
-import React from "react";
-import Button from "@mui/material/Button";
-import TextField from "@mui/material/TextField";
-import Dialog from "@mui/material/Dialog";
-import DialogActions from "@mui/material/DialogActions";
-import DialogContent from "@mui/material/DialogContent";
-import DialogContentText from "@mui/material/DialogContentText";
-import DialogTitle from "@mui/material/DialogTitle";
-import { useState } from "react";
 import { Add } from "@mui/icons-material";
-import { Snackbar } from "@mui/material";
-import { Package } from "../../client";
+import {
+   Box,
+   Button,
+   Dialog,
+   DialogActions,
+   DialogContent,
+   DialogTitle,
+   Snackbar,
+   Stack,
+   TextField,
+   Typography,
+} from "@mui/material";
 import { useQueryClient } from "@tanstack/react-query";
+import React, { useState } from "react";
+import { Package } from "../../client";
 import { useMutationWithApiError } from "../../hooks/useQueryWithApiError";
-import { useServer } from "../ServerProvider";
 import { parseResourceUri } from "../../utils/formatting";
+import { useServer } from "../ServerProvider";
 
 interface AddPackageDialogProps {
    resourceUri: string;
@@ -27,15 +30,8 @@ export default function AddPackageDialog({
    const queryClient = useQueryClient();
    const [notificationMessage, setNotificationMessage] = useState("");
 
-   const handleClickOpen = () => {
-      setOpen(true);
-   };
-
-   const handleClose = () => {
-      setOpen(false);
-   };
-
    const { environmentName } = parseResourceUri(resourceUri);
+
    const addPackage = useMutationWithApiError({
       async mutationFn(variables: Package) {
          return apiClients.packages.createPackage(environmentName, {
@@ -45,7 +41,7 @@ export default function AddPackageDialog({
          });
       },
       onSuccess() {
-         handleClose();
+         setOpen(false);
          setNotificationMessage("Package created successfully");
          queryClient.invalidateQueries({
             queryKey: ["packages", environmentName],
@@ -70,80 +66,121 @@ export default function AddPackageDialog({
    };
 
    return (
-      <React.Fragment>
+      <>
          <Button
-            onClick={handleClickOpen}
+            onClick={() => setOpen(true)}
             variant="contained"
             color="primary"
             startIcon={<Add />}
-            sx={{
-               color: "white",
-            }}
          >
             Add Package
          </Button>
 
-         <Dialog open={open} onClose={handleClose}>
-            <DialogTitle>Create New Package</DialogTitle>
-            <DialogContent>
-               <DialogContentText>
-                  Create a new malloy package to start exploring your data.
-                  <br />
-                  <br />
-                  The location can be a GitHub/S3/GCP URL containing a package
-                  (Zipped or unzipped), or an absolute path to a directory that
-                  the publisher server has access to.
-                  <br />
-                  <br />
-                  Make sure to conform the{" "}
-                  <a
-                     href="https://github.com/malloydata/publisher/blob/main/README.md#architecture-overview"
-                     target="_blank"
-                     rel="noopener noreferrer"
+         <Dialog
+            open={open}
+            onClose={() => setOpen(false)}
+            maxWidth="sm"
+            fullWidth
+            PaperProps={{ sx: { borderRadius: 2 } }}
+         >
+            <DialogTitle
+               sx={{
+                  fontSize: "1.25rem",
+                  fontWeight: 600,
+                  letterSpacing: "-0.025em",
+                  pt: 3,
+                  pb: 1,
+                  px: 3,
+               }}
+            >
+               Create New Package
+            </DialogTitle>
+            <DialogContent sx={{ px: 3, pb: 0 }}>
+               <Box sx={{ mb: 3 }}>
+                  <Typography
+                     variant="body2"
+                     color="text.secondary"
+                     sx={{ mb: 1.5 }}
                   >
-                     Malloy Package Format
-                  </a>
-                  .
-               </DialogContentText>
+                     Create a new Malloy package to start exploring your data.
+                  </Typography>
+                  <Typography
+                     variant="body2"
+                     color="text.secondary"
+                     sx={{ mb: 1.5 }}
+                  >
+                     The location can be a GitHub/S3/GCP URL containing a
+                     package (zipped or unzipped), or an absolute path to a
+                     directory the publisher server has access to.
+                  </Typography>
+                  <Typography variant="body2" color="text.secondary">
+                     Make sure to conform to the{" "}
+                     <Box
+                        component="a"
+                        href="https://github.com/malloydata/publisher/blob/main/README.md#architecture-overview"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        sx={{
+                           color: "text.primary",
+                           textDecoration: "underline",
+                        }}
+                     >
+                        Malloy Package Format
+                     </Box>
+                     .
+                  </Typography>
+               </Box>
                <form onSubmit={handleSubmit} id="package-form">
-                  <TextField
-                     autoFocus
-                     required
-                     margin="dense"
-                     id="name"
-                     name="name"
-                     label="Package Name"
-                     type="text"
-                     fullWidth
-                     variant="standard"
-                  />
-                  <TextField
-                     id="description"
-                     name="description"
-                     label="Description"
-                     multiline
-                     fullWidth
-                     rows={4}
-                     variant="standard"
-                  />
-                  <TextField
-                     id="location"
-                     name="location"
-                     label="Location"
-                     type="text"
-                     placeholder="E.g. s3://my-bucket/my-package.zip"
-                     fullWidth
-                     variant="standard"
-                  />
+                  <Stack spacing={2.5}>
+                     <TextField
+                        autoFocus
+                        required
+                        id="name"
+                        name="name"
+                        label="Package Name"
+                        type="text"
+                        fullWidth
+                        variant="outlined"
+                        size="small"
+                        InputLabelProps={{ shrink: true }}
+                     />
+                     <TextField
+                        id="description"
+                        name="description"
+                        label="Description"
+                        multiline
+                        rows={3}
+                        fullWidth
+                        variant="outlined"
+                        size="small"
+                        InputLabelProps={{ shrink: true }}
+                     />
+                     <TextField
+                        id="location"
+                        name="location"
+                        label="Location"
+                        type="text"
+                        placeholder="e.g. s3://my-bucket/my-package.zip"
+                        fullWidth
+                        variant="outlined"
+                        size="small"
+                        InputLabelProps={{ shrink: true }}
+                     />
+                  </Stack>
                </form>
             </DialogContent>
-            <DialogActions>
-               <Button disabled={addPackage.isPending} onClick={handleClose}>
+            <DialogActions sx={{ px: 3, pt: 2, pb: 3, gap: 1 }}>
+               <Button
+                  variant="outlined"
+                  disabled={addPackage.isPending}
+                  onClick={() => setOpen(false)}
+               >
                   Cancel
                </Button>
                <Button
                   type="submit"
                   form="package-form"
+                  variant="contained"
                   loading={addPackage.isPending}
                >
                   Save Changes
@@ -156,6 +193,6 @@ export default function AddPackageDialog({
             onClose={() => setNotificationMessage("")}
             message={notificationMessage}
          />
-      </React.Fragment>
+      </>
    );
 }

package/src/components/Environment/DeletePackageDialog.tsx

@@ -13,6 +13,7 @@ import { useMutationWithApiError } from "../../hooks/useQueryWithApiError";
 import { useServer } from "../ServerProvider";
 import { useQueryClient } from "@tanstack/react-query";
 import { parseResourceUri } from "../../utils/formatting";
+import { MALLOY_BRAND } from "../styles";
 
 export default function DeletePackageDialog({
    resourceUri,
@@ -90,8 +91,8 @@ export default function DeletePackageDialog({
                   variant="outlined"
                   onClick={handleClose}
                   style={{
-                     borderColor: "#14b3cb",
-                     color: "#14b3cb",
+                     borderColor: MALLOY_BRAND.teal,
+                     color: MALLOY_BRAND.teal,
                   }}
                >
                   Cancel

package/src/components/Environment/Environment.tsx

@@ -1,8 +1,7 @@
-import { Box, Grid, Typography } from "@mui/material";
+import { Box, Container, Stack, Typography } from "@mui/material";
 import { useEffect } from "react";
 import { parseResourceUri } from "../../utils/formatting";
 import { useServer } from "../ServerProvider";
-import { PackageContainer } from "../styles";
 import About from "./About";
 import AddPackageDialog from "./AddPackageDialog";
 import Packages from "./Packages";
@@ -24,29 +23,51 @@ export default function Environment({
    }, []);
 
    return (
-      <>
-         <PackageContainer>
-            <Box
-               display="flex"
+      <Container
+         maxWidth={false}
+         sx={{ maxWidth: 1024, mx: "auto", px: 4, py: 3 }}
+      >
+         <Box sx={{ mb: 5 }}>
+            <Typography
+               variant="h4"
+               component="h1"
+               sx={{ fontWeight: 600, letterSpacing: "-0.025em", mb: 0.5 }}
+            >
+               {environmentName}
+            </Typography>
+            <Typography variant="body2" color="text.secondary">
+               Manage packages in this environment. Open a package to explore
+               its models, notebooks, and connections.
+            </Typography>
+         </Box>
+
+         <Box sx={{ mb: 5 }}>
+            <Stack
+               direction="row"
                justifyContent="space-between"
-               alignItems="center"
-               mb={2}
+               alignItems="flex-start"
+               sx={{ mb: 3 }}
             >
-               <Typography variant="h6">{environmentName} packages</Typography>
+               <Box>
+                  <Typography
+                     variant="h6"
+                     sx={{ fontWeight: 600, letterSpacing: "-0.025em" }}
+                  >
+                     Packages
+                  </Typography>
+                  <Typography variant="body2" color="text.secondary">
+                     Published packages available for use in this environment
+                  </Typography>
+               </Box>
                {mutable && <AddPackageDialog resourceUri={resourceUri} />}
-            </Box>
-            <Grid container spacing={3} columns={12}>
-               <Grid size={{ xs: 12, md: 12 }}>
-                  <Packages
-                     onSelectPackage={onSelectPackage}
-                     resourceUri={resourceUri}
-                  />
-               </Grid>
-               <Grid size={{ xs: 12, md: 12 }}>
-                  <About resourceUri={resourceUri} />
-               </Grid>
-            </Grid>
-         </PackageContainer>
-      </>
+            </Stack>
+            <Packages
+               onSelectPackage={onSelectPackage}
+               resourceUri={resourceUri}
+            />
+         </Box>
+
+         <About resourceUri={resourceUri} />
+      </Container>
    );
 }