Merge branch 'main' into bq/refactor-workspaces

BrunoQuaresma · BrunoQuaresma · commit c28e7312c8c1 · 2023-06-01T16:26:09.000Z
diff --git a/site/src/components/VSCodeDesktopButton/VSCodeDesktopButton.tsx b/site/src/components/VSCodeDesktopButton/VSCodeDesktopButton.tsx
@@ -69,6 +69,7 @@ export const VSCodeDesktopButton: FC<
           onClick={() => {
             setIsVariantMenuOpen(true)
           }}
+          sx={{ px: 0 }}
         >
           <KeyboardArrowDownIcon sx={{ fontSize: 16 }} />
         </PrimaryAgentButton>
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -21,6 +21,8 @@ import { Filter } from "./filter/filter"
 import { hasError, isApiValidationError } from "api/errors"
 import { workspaceFilterQuery } from "utils/filters"
 import { SearchBarWithFilter } from "components/SearchBarWithFilter/SearchBarWithFilter"
+import Box from "@mui/material/Box"
+import Skeleton from "@mui/material/Skeleton"
 
 export const Language = {
   pageTitle: "Workspaces",
@@ -143,9 +145,34 @@ export const WorkspacesPageView: FC<
           />
         )}
       </Stack>
+
+      <Box
+        sx={{
+          fontSize: 13,
+          mb: 2,
+          mt: 1,
+          color: (theme) => theme.palette.text.secondary,
+          "& strong": { color: (theme) => theme.palette.text.primary },
+        }}
+      >
+        {workspaces ? (
+          <>
+            Showing <strong>{workspaces?.length}</strong> of{" "}
+            <strong>{count}</strong> workspaces
+          </>
+        ) : (
+          <Box sx={{ height: 24, display: "flex", alignItems: "center" }}>
+            <Skeleton variant="text" width={160} height={16} />
+          </Box>
+        )}
+      </Box>
+
       <WorkspacesTable
         workspaces={workspaces}
-        isUsingFilter={filterProps.filter.query !== ""}
+        isUsingFilter={
+          filterProps.filter.query !== "" &&
+          filterProps.filter.query !== workspaceFilterQuery.me
+        }
         onUpdateWorkspace={onUpdateWorkspace}
         error={error}
       />
diff --git a/site/src/pages/WorkspacesPage/filter/filter.tsx b/site/src/pages/WorkspacesPage/filter/filter.tsx
@@ -35,6 +35,7 @@ import {
   BaseOption,
 } from "./options"
 import debounce from "just-debounce-it"
+import { workspaceFilterQuery } from "utils/filters"
 
 export type FilterValues = {
   owner?: string // User["username"]
@@ -50,7 +51,7 @@ export const useFilter = ({
   onUpdate?: () => void
 }) => {
   const [searchParams, setSearchParams] = searchParamsResult
-  const query = searchParams.get("filter") ?? ""
+  const query = searchParams.get("filter") ?? workspaceFilterQuery.me
   const values = parseFilterQuery(query)
 
   const update = (values: string | FilterValues) => {

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ export const VSCodeDesktopButton: FC<`
`69`	`69`	`onClick={() => {`
`70`	`70`	`setIsVariantMenuOpen(true)`
`71`	`71`	`}}`
	`72`	`+ sx={{ px: 0 }}`
`72`	`73`	`>`
`73`	`74`	`<KeyboardArrowDownIcon sx={{ fontSize: 16 }} />`
`74`	`75`	`</PrimaryAgentButton>`