Skip to content

feat: Workspaces Page Query Filter #1936

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

Closed
wants to merge 2 commits into from
Closed

feat: Workspaces Page Query Filter #1936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e1aaaf
feat: Add poc for workspace query filer
f0ssel May 27, 2022
139e306
fix query update
f0ssel May 31, 2022
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
11 changes: 9 additions & 2 deletions site/src/pages/WorkspacesPage/WorkspacesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
import { useMachine } from "@xstate/react"
import React from "react"
import { useMachine , useActor } from "@xstate/react"
import React, { useContext } from "react"
import { workspacesMachine } from "../../xServices/workspaces/workspacesXService"
import { WorkspacesPageView } from "./WorkspacesPageView"
import { XServiceContext } from "../../xServices/StateContext"

const WorkspacesPage: React.FC = () => {
const xServices = useContext(XServiceContext)
const [authState] = useActor(xServices.authXService)
const { me } = authState.context
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you only need one thing out of an xservice, it's better to useSelector.


const [workspacesState] = useMachine(workspacesMachine)


return (
<>
<WorkspacesPageView
loading={workspacesState.hasTag("loading")}
workspaces={workspacesState.context.workspaces}
me={me}
error={workspacesState.context.getWorkspacesError}
/>
</>
Expand Down
50 changes: 47 additions & 3 deletions site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,82 @@ import TableBody from "@material-ui/core/TableBody"
import TableCell from "@material-ui/core/TableCell"
import TableHead from "@material-ui/core/TableHead"
import TableRow from "@material-ui/core/TableRow"
import TextField from "@material-ui/core/TextField/TextField"
import AddCircleOutline from "@material-ui/icons/AddCircleOutline"
import useTheme from "@material-ui/styles/useTheme"
import dayjs from "dayjs"
import relativeTime from "dayjs/plugin/relativeTime"
import React from "react"
import { Link as RouterLink } from "react-router-dom"
import * as TypesGen from "../../api/typesGenerated"
import { AvatarData } from "../../components/AvatarData/AvatarData"
import { Margins } from "../../components/Margins/Margins"
import { Stack } from "../../components/Stack/Stack"
import { getDisplayStatus } from "../../util/workspace"
import React, { useCallback, useState } from "react"

dayjs.extend(relativeTime)

export const Language = {
filterLabel: "Filter",
createButton: "Create workspace",
emptyView: "so you can check out your repositories, edit your source code, and build and test your software.",
}

export interface WorkspacesPageViewProps {
loading?: boolean
workspaces?: TypesGen.Workspace[]
me?: TypesGen.User
error?: unknown
}

export const WorkspacesPageView: React.FC<WorkspacesPageViewProps> = (props) => {
const styles = useStyles()
const theme: Theme = useTheme()
const [filteredWorkspaces, setFilteredWorkspaces] = useState<TypesGen.Workspace[] | undefined>(props.workspaces)
const [query, setQuery] = useState<string>("owner:me")
const updateQuery = (e: React.ChangeEvent<HTMLInputElement>) => {
const input = e.target.value
setQuery(input)

if (input.length && props.workspaces?.length) {
const owners: string[] = []
const newWorkspaces: TypesGen.Workspace[] = []
const phrases = input.split(" ")
for (const p of phrases) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We usually use things like map and filter instead of loops, and we're trying to avoid let.

if (p.startsWith("owner:")) {
let v = p.slice("owner:".length)
if (v === "me" && props.me) {
v = props.me.username
}
owners.push(v)
}
}

for (const w of props.workspaces) {
for (const o of owners) {
if (o === w.owner_name) {
newWorkspaces.push(w)
}
}
}
setFilteredWorkspaces(newWorkspaces)
}
}
const handleQueryChange = useCallback(updateQuery, [props.workspaces, props.me])

return (
<Stack spacing={4}>
<Margins>
<div className={styles.actions}>
<form>
<TextField
onChange={handleQueryChange}
value={query}
fullWidth
label="Filter"
variant="outlined"
/>
</form>
<Link underline="none" component={RouterLink} to="/workspaces/new">
<Button startIcon={<AddCircleOutline />}>{Language.createButton}</Button>
</Link>
Expand All @@ -53,7 +97,7 @@ export const WorkspacesPageView: React.FC<WorkspacesPageViewProps> = (props) =>
</TableRow>
</TableHead>
<TableBody>
{!props.loading && !props.workspaces?.length && (
{!props.loading && !filteredWorkspaces?.length && (
<TableRow>
<TableCell colSpan={999}>
<div className={styles.welcome}>
Expand All @@ -67,7 +111,7 @@ export const WorkspacesPageView: React.FC<WorkspacesPageViewProps> = (props) =>
</TableCell>
</TableRow>
)}
{props.workspaces?.map((workspace) => {
{filteredWorkspaces?.map((workspace) => {
const status = getDisplayStatus(theme, workspace.latest_build)
return (
<TableRow key={workspace.id}>
Expand Down