Skip to content

feat(site): add WorkspacesButton component #10011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Oct 5, 2023
Merged

feat(site): add WorkspacesButton component #10011

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f0a2aae
chore: Add OverflowY component
Parkreiner Oct 3, 2023
2420167
chore: Add PopoverContainer component
Parkreiner Oct 3, 2023
88d73af
chore: Add SearchBox
Parkreiner Oct 3, 2023
209eed4
feat: add WorkspacesButton
Parkreiner Oct 3, 2023
9300b11
chore: Install MUI utils package
Parkreiner Oct 3, 2023
2b13f1e
chore: integrate WorkspacesButton
Parkreiner Oct 3, 2023
e86207e
chore: reorganize files
Parkreiner Oct 3, 2023
5b249d5
fix: resolve hover state visual glitch
Parkreiner Oct 3, 2023
b1e1271
chore: Add story for OverflowY
Parkreiner Oct 3, 2023
b367495
fix: remove dynamic name from OverflowY story
Parkreiner Oct 3, 2023
5a34769
chore: update stories again
Parkreiner Oct 3, 2023
b9f6cb8
fix: remove all references to icons (for now)
Parkreiner Oct 3, 2023
1996e2b
refactor: move flex shrink to be OverflowY concern
Parkreiner Oct 4, 2023
5ecbbe6
fix: remove needless render key
Parkreiner Oct 4, 2023
55ab10a
fix: make sure popover closes before navigation
Parkreiner Oct 5, 2023
1a01127
refactor: clean up WorkspacesButton to use more native MUI
Parkreiner Oct 5, 2023
80928c6
Merge branch 'main' into mes/workspace-button-2
Parkreiner Oct 5, 2023
55c6061
fix: update integration into rest of view
Parkreiner Oct 5, 2023
5aea06f
fix: remove JS security concern
Parkreiner Oct 5, 2023
2aee4fe
refactor: parameterize button language
Parkreiner Oct 5, 2023
12ac56f
revert: undo sql/go file change
Parkreiner Oct 5, 2023
99f2656
fix: remove permissions dependency
Parkreiner Oct 5, 2023
430e30c
fix: simplify button prop types
Parkreiner Oct 5, 2023
ff37ab5
fix: lift data dependencies to page component
Parkreiner Oct 5, 2023
1b934ab
refactor: clean up props
Parkreiner Oct 5, 2023
84c6642
fix: update dependencies again for Storybook
Parkreiner Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: parameterize button language
  • Loading branch information
@Parkreiner
Parkreiner committed Oct 5, 2023
commit 2aee4fe791edf21099d30b4a36e9fd08bb1ecdda
16 changes: 12 additions & 4 deletions site/src/pages/WorkspacesPage/WorkspacesButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type ReactNode, useState } from "react";
import { type ReactNode, useState, ReactElement } from "react";
import { useOrganizationId, usePermissions } from "hooks";

import { useQuery } from "@tanstack/react-query";
Expand Down Expand Up @@ -113,7 +113,15 @@ function WorkspaceResultsRow({ template }: { template: Template }) {
);
}

export function WorkspacesButton() {
type WorkspacesButtonProps = {
children: string | ReactElement;
seeMoreTemplatesText: string | ReactElement;
};

export function WorkspacesButton({
children,
seeMoreTemplatesText,
}: WorkspacesButtonProps) {
const organizationId = useOrganizationId();
const permissions = usePermissions();
const templatesQuery = useQuery(templates(organizationId));
Expand Down Expand Up @@ -152,7 +160,7 @@ export function WorkspacesButton() {
sx={{ display: "flex", flexFlow: "column nowrap" }}
anchorButton={
<Button startIcon={<AddIcon />} variant="contained">
Create Workspace&hellip;
{children}
</Button>
}
>
Expand Down Expand Up @@ -211,7 +219,7 @@ export function WorkspacesButton() {
sx={{ fontSize: "16px", marginX: "auto", display: "block" }}
/>
</Box>
<span>See all templates</span>
<span>{seeMoreTemplatesText}</span>
</Box>
</Link>
)}
Expand Down
11 changes: 9 additions & 2 deletions site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export const Language = {
yourWorkspacesButton: "Your workspaces",
allWorkspacesButton: "All workspaces",
runningWorkspacesButton: "Running workspaces",
createANewWorkspace: `Create a new workspace from a `,
createWorkspace: <>Create Workspace&hellip;</>,
moreTemplates: "See all templates",
template: "Template",
};

Expand Down Expand Up @@ -73,7 +74,13 @@ export const WorkspacesPageView: FC<

return (
<Margins>
<PageHeader actions={<WorkspacesButton />}>
<PageHeader
actions={
<WorkspacesButton seeMoreTemplatesText={Language.moreTemplates}>
{Language.createWorkspace}
</WorkspacesButton>
}
>
<PageHeaderTitle>
<Stack direction="row" spacing={1} alignItems="center">
<span>{Language.pageTitle}</span>
Expand Down