@malloy-publisher/sdk 0.0.196-dev → 0.0.198-dev

package/src/components/Home/{EditProjectDialog.tsx → EditEnvironmentDialog.tsx}

@@ -9,24 +9,24 @@ import DialogTitle from "@mui/material/DialogTitle";
 import { useState } from "react";
 import { Edit } from "@mui/icons-material";
 import { MenuItem, ListItemIcon, ListItemText, Snackbar } from "@mui/material";
-import { Project } from "../../client";
+import { Environment } from "../../client";
 import {
-   generateProjectReadme,
-   getProjectDescription,
+   generateEnvironmentReadme,
+   getEnvironmentDescription,
 } from "../../utils/parsing";
 import { useQueryClient } from "@tanstack/react-query";
 import { useMutationWithApiError } from "../../hooks/useQueryWithApiError";
 import { useServer } from "../ServerProvider";
 
-interface EditProjectModalProps {
-   project: Project;
+interface EditEnvironmentModalProps {
+   environment: Environment;
    onCloseDialog: () => void;
 }
 
-export default function EditProjectDialog({
-   project,
+export default function EditEnvironmentDialog({
+   environment,
    onCloseDialog,
-}: EditProjectModalProps) {
+}: EditEnvironmentModalProps) {
    const [open, setOpen] = useState(false);
    const { apiClients } = useServer();
    const queryClient = useQueryClient();
@@ -41,14 +41,14 @@ export default function EditProjectDialog({
       onCloseDialog();
    };
 
-   const editProject = useMutationWithApiError({
+   const editEnvironment = useMutationWithApiError({
       async mutationFn(variables: { description: string }) {
-         return apiClients.projects.updateProject(project.name, {
-            name: project.name,
-            readme: generateProjectReadme(
+         return apiClients.environments.updateEnvironment(environment.name, {
+            name: environment.name,
+            readme: generateEnvironmentReadme(
                {
-                  name: project.name,
-                  readme: project.readme,
+                  name: environment.name,
+                  readme: environment.readme,
                },
                variables.description,
             ),
@@ -56,8 +56,8 @@ export default function EditProjectDialog({
       },
       onSuccess() {
          handleClose();
-         queryClient.invalidateQueries({ queryKey: ["projects"] });
-         setNotificationMessage("Project updated successfully");
+         queryClient.invalidateQueries({ queryKey: ["environments"] });
+         setNotificationMessage("Environment updated successfully");
       },
       onError(error) {
          setNotificationMessage(
@@ -72,7 +72,7 @@ export default function EditProjectDialog({
       event.preventDefault();
       const formData = new FormData(event.currentTarget);
       const description = formData.get("description")?.toString();
-      editProject.mutate({ description });
+      editEnvironment.mutate({ description });
    };
 
    return (
@@ -85,46 +85,50 @@ export default function EditProjectDialog({
          </MenuItem>
 
          <Dialog open={open} onClose={handleClose}>
-            <DialogTitle>Edit Project</DialogTitle>
+            <DialogTitle>Edit Environment</DialogTitle>
             <DialogContent>
                <DialogContentText>
-                  Add a new project to start exploring semantic models and
-                  analyzing data.
+                  Edit this environment&apos;s description.
                </DialogContentText>
-               <form onSubmit={handleSubmit} id="project-form">
+               <form onSubmit={handleSubmit} id="environment-form">
                   <TextField
                      autoFocus
                      required
                      margin="dense"
                      id="name"
                      name="name"
-                     label="Project Name"
+                     label="Environment Name"
                      disabled
                      type="text"
                      fullWidth
                      variant="standard"
-                     defaultValue={project.name}
+                     defaultValue={environment.name}
                   />
                   <TextField
                      margin="dense"
                      id="description"
                      name="description"
-                     label="Project Description"
+                     label="Environment Description"
                      type="text"
                      fullWidth
                      variant="standard"
-                     defaultValue={getProjectDescription(project.readme)}
+                     defaultValue={getEnvironmentDescription(
+                        environment.readme,
+                     )}
                   />
                </form>
             </DialogContent>
             <DialogActions>
-               <Button disabled={editProject.isPending} onClick={handleClose}>
+               <Button
+                  disabled={editEnvironment.isPending}
+                  onClick={handleClose}
+               >
                   Cancel
                </Button>
                <Button
                   type="submit"
-                  form="project-form"
-                  loading={editProject.isPending}
+                  form="environment-form"
+                  loading={editEnvironment.isPending}
                >
                   Save Changes
                </Button>

package/src/components/Home/Home.tsx

@@ -21,30 +21,30 @@ import {
    Typography,
 } from "@mui/material";
 import { useState } from "react";
-import { Project } from "../../client";
+import { Environment } from "../../client";
 import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
-import { getProjectDescription } from "../../utils/parsing";
+import { getEnvironmentDescription } from "../../utils/parsing";
 import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import { Loading } from "../Loading";
 import { useServer } from "../ServerProvider";
-import AddProjectDialog from "./AddProjectDialog";
-import DeleteProjectDialog from "./DeleteProjectDialog";
-import EditProjectDialog from "./EditProjectDialog";
+import AddEnvironmentDialog from "./AddEnvironmentDialog";
+import DeleteEnvironmentDialog from "./DeleteEnvironmentDialog";
+import EditEnvironmentDialog from "./EditEnvironmentDialog";
 
 interface HomeProps {
-   onClickProject?: (to: string, event?: React.MouseEvent) => void;
+   onClickEnvironment?: (to: string, event?: React.MouseEvent) => void;
 }
 
-export default function Home({ onClickProject }: HomeProps) {
+export default function Home({ onClickEnvironment }: HomeProps) {
    const { apiClients, mutable } = useServer();
 
    const { data, isSuccess, isError, error } = useQueryWithApiError({
-      queryKey: ["projects"],
-      queryFn: () => apiClients.projects.listProjects(),
+      queryKey: ["environments"],
+      queryFn: () => apiClients.environments.listEnvironments(),
    });
 
    if (isError) {
-      return <ApiErrorDisplay error={error} context="Projects List" />;
+      return <ApiErrorDisplay error={error} context="Environments List" />;
    }
 
    if (isSuccess) {
@@ -247,7 +247,7 @@ export default function Home({ onClickProject }: HomeProps) {
 
             <Divider sx={{ my: 4 }} />
 
-            {/* Project Selection Section */}
+            {/* Environment Selection Section */}
             {data.data.length > 0 ? (
                <>
                   <Box sx={{ textAlign: "center", mb: 4 }}>
@@ -262,24 +262,24 @@ export default function Home({ onClickProject }: HomeProps) {
                            sx={{ color: "primary.main", fontSize: 24 }}
                         />
                         <Typography variant="h4" fontWeight={600}>
-                           Select a Project
+                           Select an Environment
                         </Typography>
                      </Stack>
                      <Typography variant="body1" color="text.secondary">
-                        Choose a project to explore its semantic models and
+                        Choose an environment to explore its semantic models and
                         start analyzing your data
                      </Typography>
-                     {mutable && <AddProjectDialog />}
+                     {mutable && <AddEnvironmentDialog />}
                   </Box>
                   <Grid container spacing={3} justifyContent="center">
-                     {data.data.map((project) => (
+                     {data.data.map((environment) => (
                         <Grid
                            size={{ xs: 12, sm: 6, md: 4 }}
-                           key={project.name}
+                           key={environment.name}
                         >
-                           <ProjectCard
-                              project={project}
-                              onClickProject={onClickProject}
+                           <EnvironmentCard
+                              environment={environment}
+                              onClickEnvironment={onClickEnvironment}
                            />
                         </Grid>
                      ))}
@@ -306,12 +306,12 @@ export default function Home({ onClickProject }: HomeProps) {
                      color="text.secondary"
                      sx={{ mb: 3 }}
                   >
-                     No projects found. Create your first Malloy project to
-                     start exploring semantic models and building data
+                     No environments found. Create your first Malloy environment
+                     to start exploring semantic models and building data
                      experiences.
                   </Typography>
                   {mutable ? (
-                     <AddProjectDialog />
+                     <AddEnvironmentDialog />
                   ) : (
                      <Button
                         variant="contained"
@@ -359,15 +359,15 @@ export default function Home({ onClickProject }: HomeProps) {
          </Container>
       );
    } else {
-      return <Loading text="Loading projects..." />;
+      return <Loading text="Loading environments..." />;
    }
 }
-function ProjectCard({
-   project,
-   onClickProject,
+function EnvironmentCard({
+   environment,
+   onClickEnvironment,
 }: {
-   project: Project;
-   onClickProject: (to: string, event?: React.MouseEvent) => void;
+   environment: Environment;
+   onClickEnvironment: (to: string, event?: React.MouseEvent) => void;
 }) {
    const { mutable } = useServer();
    const [menuAnchorEl, setMenuAnchorEl] = useState<null | HTMLElement>(null);
@@ -395,7 +395,8 @@ function ProjectCard({
             {mutable && (
                <>
                   <IconButton
-                     aria-controls={isMenuOpen ? "project-menu" : undefined}
+                     aria-label={`Environment actions for ${environment.name}`}
+                     aria-controls={isMenuOpen ? "environment-menu" : undefined}
                      aria-haspopup="true"
                      aria-expanded={isMenuOpen ? "true" : undefined}
                      onClick={openMenu}
@@ -404,7 +405,7 @@ function ProjectCard({
                      <MoreVert fontSize="small" />
                   </IconButton>
                   <Menu
-                     id="project-menu"
+                     id="environment-menu"
                      aria-haspopup="true"
                      aria-expanded={isMenuOpen ? "true" : undefined}
                      open={isMenuOpen}
@@ -420,12 +421,12 @@ function ProjectCard({
                         horizontal: "right",
                      }}
                   >
-                     <EditProjectDialog
-                        project={project}
+                     <EditEnvironmentDialog
+                        environment={environment}
                         onCloseDialog={closeMenu}
                      />
-                     <DeleteProjectDialog
-                        project={project}
+                     <DeleteEnvironmentDialog
+                        environment={environment}
                         onCloseDialog={closeMenu}
                      />
                   </Menu>
@@ -440,14 +441,14 @@ function ProjectCard({
                   }}
                />
                <Typography variant="h6" fontWeight={600} gutterBottom>
-                  {project.name}
+                  {environment.name}
                </Typography>
                <Typography
                   variant="body2"
                   color="text.secondary"
                   sx={{ mb: 2, minHeight: "60px" }}
                >
-                  {getProjectDescription(project.readme)}
+                  {getEnvironmentDescription(environment.readme)}
                </Typography>
                <Button
                   variant="contained"
@@ -455,10 +456,10 @@ function ProjectCard({
                   endIcon={<ArrowForwardRoundedIcon />}
                   fullWidth
                   onClick={(event) =>
-                     onClickProject(`/${project.name}/`, event)
+                     onClickEnvironment(`/${environment.name}/`, event)
                   }
                >
-                  Open Project
+                  Open Environment
                </Button>
             </CardContent>
          </Card>

package/src/components/Model/ModelCell.tsx

@@ -32,7 +32,7 @@ export function ModelCell({
    const [resultsDialogOpen, setResultsDialogOpen] = React.useState(false);
    const [hasRun, setHasRun] = React.useState(false);
 
-   const { packageName, projectName, versionId, modelPath } =
+   const { packageName, environmentName, versionId, modelPath } =
       parseResourceUri(resourceUri);
    const { apiClients } = useServer();
 
@@ -44,7 +44,7 @@ export function ModelCell({
       queryKey: ["namedQueryResult", resourceUri, queryName],
       queryFn: () =>
          apiClients.models.executeQueryModel(
-            projectName,
+            environmentName,
             packageName,
             modelPath,
             {

package/src/components/Model/SourcesExplorer.tsx

@@ -142,7 +142,7 @@ function SourceExplorerComponentInner({
       }
    }, [onChange, query]);
    const {
-      projectName: projectName,
+      environmentName: environmentName,
       packageName: packageName,
       versionId: versionId,
    } = parseResourceUri(resourceUri);
@@ -178,7 +178,7 @@ function SourceExplorerComponentInner({
             query: malloy,
          });
          return apiClients.models.executeQueryModel(
-            projectName,
+            environmentName,
             packageName,
             sourceAndPath.modelPath,
             {

package/src/components/Model/useModelData.ts

@@ -8,15 +8,15 @@ import { useServer } from "../ServerProvider";
  * useQueryWithApiError to fetch a compiled model.
  */
 export function useModelData(resourceUri: string, enabled: boolean = true) {
-   const { modelPath, projectName, packageName, versionId } =
+   const { modelPath, environmentName, packageName, versionId } =
       parseResourceUri(resourceUri);
    const { apiClients } = useServer();
 
    return useQueryWithApiError<CompiledModel>({
-      queryKey: ["package", projectName, packageName, modelPath, versionId],
+      queryKey: ["package", environmentName, packageName, modelPath, versionId],
       queryFn: async () => {
          const response = await apiClients.models.getModel(
-            projectName,
+            environmentName,
             packageName,
             modelPath,
             versionId,

package/src/components/Notebook/Notebook.tsx

@@ -45,7 +45,7 @@ export default function Notebook({
 }: NotebookProps) {
    const { apiClients } = useServer();
    const {
-      projectName,
+      environmentName,
       packageName,
       versionId,
       modelPath: notebookPath,
@@ -61,7 +61,7 @@ export default function Notebook({
       queryKey: [resourceUri],
       queryFn: async () => {
          const response = await apiClients.notebooks.getNotebook(
-            projectName,
+            environmentName,
             packageName,
             notebookPath,
             versionId,
@@ -232,7 +232,7 @@ export default function Notebook({
    // current selection. Otherwise selecting "FORD" would hide every other
    // manufacturer from the dropdown.
    const { data: filterValuesData } = useDimensionalFilterRangeData({
-      project: projectName,
+      environment: environmentName,
       package: packageName,
       dimensionSpecs,
       versionId,
@@ -316,7 +316,7 @@ export default function Notebook({
                      // Use notebook cell execution API with optional filter_params
                      const response =
                         await apiClients.notebooks.executeNotebookCell(
-                           projectName,
+                           environmentName,
                            packageName,
                            notebookPath,
                            cellIndex,
@@ -381,7 +381,7 @@ export default function Notebook({
          notebook,
          useServerFilters,
          buildFilterParams,
-         projectName,
+         environmentName,
          packageName,
          notebookPath,
          versionId,
@@ -533,7 +533,7 @@ export default function Notebook({
                {/* Error States */}
                {isError && error.status === 404 && (
                   <Typography variant="body2" sx={{ color: "#666666" }}>
-                     <code>{`${projectName} > ${packageName} > ${notebookPath}`}</code>{" "}
+                     <code>{`${environmentName} > ${packageName} > ${notebookPath}`}</code>{" "}
                      not found.
                   </Typography>
                )}
@@ -541,7 +541,7 @@ export default function Notebook({
                {isError && error.status !== 404 && (
                   <ApiErrorDisplay
                      error={error}
-                     context={`${projectName} > ${packageName} > ${notebookPath}`}
+                     context={`${environmentName} > ${packageName} > ${notebookPath}`}
                   />
                )}
 

package/src/components/Package/Config.tsx

@@ -18,16 +18,16 @@ type Props = {
 export default function Config({ resourceUri }: Props) {
    const { apiClients } = useServer();
    const {
-      projectName: projectName,
+      environmentName: environmentName,
       packageName: packageName,
       versionId: versionId,
    } = parseResourceUri(resourceUri);
 
    const { data, isSuccess, isError, error } = useQueryWithApiError({
-      queryKey: ["package", projectName, packageName, versionId],
+      queryKey: ["package", environmentName, packageName, versionId],
       queryFn: () =>
          apiClients.packages.getPackage(
-            projectName,
+            environmentName,
             packageName,
             versionId,
             false,
@@ -86,7 +86,7 @@ export default function Config({ resourceUri }: Props) {
                   {isError && (
                      <ApiErrorDisplay
                         error={error}
-                        context={`${projectName} > ${packageName} > ${versionId}`}
+                        context={`${environmentName} > ${packageName} > ${versionId}`}
                      />
                   )}
                </List>

package/src/components/Package/Connections.tsx

@@ -24,7 +24,7 @@ import { ApiErrorDisplay } from "../ApiErrorDisplay";
 import AddConnectionDialog from "../Connections/AddConnectionDialog";
 import DeleteConnectionDialog from "../Connections/DeleteConnectionDialog";
 import EditConnectionDialog from "../Connections/EditConnectionDialog";
-import ConnectionExplorer from "../Project/ConnectionExplorer";
+import ConnectionExplorer from "../Environment/ConnectionExplorer";
 import { useServer } from "../ServerProvider";
 import {
    PackageCard,
@@ -115,19 +115,19 @@ type ConnectionsProps = {
 export default function Connections({ resourceUri }: ConnectionsProps) {
    const { apiClients, mutable } = useServer();
    const queryClient = useQueryClient();
-   const { projectName: projectName } = parseResourceUri(resourceUri);
+   const { environmentName: environmentName } = parseResourceUri(resourceUri);
    const [notificationMessage, setNotificationMessage] = useState("");
    const [selectedConnection, setSelectedConnection] = useState<string | null>(
       null,
    );
    const selectedConnectionResourceUri = encodeResourceUri({
-      projectName: projectName,
+      environmentName: environmentName,
       connectionName: selectedConnection,
    });
 
    const { data, isSuccess, isError, error } = useQueryWithApiError({
-      queryKey: ["connections", projectName],
-      queryFn: () => apiClients.connections.listConnections(projectName),
+      queryKey: ["connections", environmentName],
+      queryFn: () => apiClients.connections.listConnections(environmentName),
    });
 
    const handleConnectionClick = (connectionName: string) => {
@@ -140,15 +140,15 @@ export default function Connections({ resourceUri }: ConnectionsProps) {
 
    const addConnection = useMutationWithApiError({
       mutationFn: (payload: ApiConnection) => {
-         return apiClients.projects.updateProject(projectName, {
-            name: projectName,
+         return apiClients.environments.updateEnvironment(environmentName, {
+            name: environmentName,
             connections: [...data.data, payload],
          });
       },
       onSuccess() {
          setNotificationMessage("Connection added successfully");
          queryClient.invalidateQueries({
-            queryKey: ["connections", projectName],
+            queryKey: ["connections", environmentName],
          });
       },
       onError(error) {
@@ -158,8 +158,8 @@ export default function Connections({ resourceUri }: ConnectionsProps) {
 
    const updateConnection = useMutationWithApiError({
       mutationFn: (payload: ApiConnection) => {
-         return apiClients.projects.updateProject(projectName, {
-            name: projectName,
+         return apiClients.environments.updateEnvironment(environmentName, {
+            name: environmentName,
             connections: data.data.map((conn) =>
                conn.name === payload.name ? payload : conn,
             ),
@@ -170,7 +170,7 @@ export default function Connections({ resourceUri }: ConnectionsProps) {
             `Connection ${variables.name} updated successfully`,
          );
          queryClient.invalidateQueries({
-            queryKey: ["connections", projectName],
+            queryKey: ["connections", environmentName],
          });
       },
       onError(error) {
@@ -180,8 +180,8 @@ export default function Connections({ resourceUri }: ConnectionsProps) {
 
    const deleteConnection = useMutationWithApiError({
       mutationFn: (payload: ApiConnection) => {
-         return apiClients.projects.updateProject(projectName, {
-            name: projectName,
+         return apiClients.environments.updateEnvironment(environmentName, {
+            name: environmentName,
             connections: data.data.filter((conn) => conn.name !== payload.name),
          });
       },
@@ -190,7 +190,7 @@ export default function Connections({ resourceUri }: ConnectionsProps) {
             `Connection ${variables.name} deleted successfully`,
          );
          queryClient.invalidateQueries({
-            queryKey: ["connections", projectName],
+            queryKey: ["connections", environmentName],
          });
       },
       onError(error) {
@@ -305,7 +305,7 @@ export default function Connections({ resourceUri }: ConnectionsProps) {
                   {isError && (
                      <ApiErrorDisplay
                         error={error}
-                        context={`${projectName} > Connections`}
+                        context={`${environmentName} > Connections`}
                      />
                   )}
                </Box>

package/src/components/Package/Databases.tsx

@@ -33,7 +33,7 @@ type Props = {
 export default function Databases({ resourceUri }: Props) {
    const { apiClients } = useServer();
    const {
-      projectName: projectName,
+      environmentName: environmentName,
       packageName: packageName,
       versionId: versionId,
    } = parseResourceUri(resourceUri);
@@ -53,10 +53,10 @@ export default function Databases({ resourceUri }: Props) {
    };
 
    const { data, isError, error, isSuccess } = useQueryWithApiError({
-      queryKey: ["databases", projectName, packageName, versionId],
+      queryKey: ["databases", environmentName, packageName, versionId],
       queryFn: () =>
          apiClients.databases.listDatabases(
-            projectName,
+            environmentName,
             packageName,
             versionId,
          ),
@@ -89,7 +89,7 @@ export default function Databases({ resourceUri }: Props) {
                   {isError && (
                      <ApiErrorDisplay
                         error={error}
-                        context={`${projectName} > ${packageName} > Databases`}
+                        context={`${environmentName} > ${packageName} > Databases`}
                      />
                   )}
                   {isSuccess && data.data.length > 0 && (

package/src/components/Package/Models.tsx

@@ -20,16 +20,16 @@ interface ModelsProps {
 
 export default function Models({ onClickModelFile, resourceUri }: ModelsProps) {
    const {
-      projectName: projectName,
+      environmentName: environmentName,
       packageName: packageName,
       versionId: versionId,
    } = parseResourceUri(resourceUri);
    const { apiClients } = useServer();
 
    const { data, isError, error, isSuccess } = useQueryWithApiError({
-      queryKey: ["models", projectName, packageName, versionId],
+      queryKey: ["models", environmentName, packageName, versionId],
       queryFn: () =>
-         apiClients.models.listModels(projectName, packageName, versionId),
+         apiClients.models.listModels(environmentName, packageName, versionId),
    });
 
    return (
@@ -46,7 +46,7 @@ export default function Models({ onClickModelFile, resourceUri }: ModelsProps) {
                {isError && (
                   <ApiErrorDisplay
                      error={error}
-                     context={`${projectName} > ${packageName} > Models`}
+                     context={`${environmentName} > ${packageName} > Models`}
                   />
                )}
                {isSuccess && data.data.length > 0 && (

package/src/components/Package/Notebooks.tsx

@@ -24,16 +24,16 @@ export default function Notebooks({
 }: NotebooksProps) {
    const { apiClients } = useServer();
    const {
-      projectName: projectName,
+      environmentName: environmentName,
       packageName: packageName,
       versionId: versionId,
    } = parseResourceUri(resourceUri);
 
    const { data, isError, error, isSuccess } = useQueryWithApiError({
-      queryKey: ["notebooks", projectName, packageName, versionId],
+      queryKey: ["notebooks", environmentName, packageName, versionId],
       queryFn: () =>
          apiClients.notebooks.listNotebooks(
-            projectName,
+            environmentName,
             packageName,
             versionId,
          ),
@@ -55,7 +55,7 @@ export default function Notebooks({
                {isError && (
                   <ApiErrorDisplay
                      error={error}
-                     context={`${projectName} > ${packageName} > Notebooks`}
+                     context={`${environmentName} > ${packageName} > Notebooks`}
                   />
                )}
                {isSuccess && data.data.length > 0 && (