fix: Show correct 'no results' message on workspace filters

f0ssel · f0ssel · commit 44d0d6df73da · 2022-06-07T16:19:11.000Z
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.test.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.test.tsx
@@ -23,7 +23,7 @@ describe("WorkspacesPage", () => {
     render(<WorkspacesPage />)
 
     // Then
-    await screen.findByText(Language.emptyMessage)
+    await screen.findByText(Language.emptyCreateWorkspaceMessage)
   })
 
   it("renders a filled workspaces page", async () => {
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -40,11 +40,11 @@ import { getDisplayStatus } from "../../util/workspace"
 dayjs.extend(relativeTime)
 
 export const Language = {
-  createButton: "Create workspace",
-  emptyMessage: "Create your first workspace",
-  emptyDescription: "Start editing your source code and building your software",
-  filterName: "Filters",
   createWorkspaceButton: "Create workspace",
+  emptyCreateWorkspaceMessage: "Create your first workspace",
+  emptyCreateWorkspaceDescription: "Start editing your source code and building your software",
+  emptyResultsMessage: "No results matched your search",
+  filterName: "Filters",
   yourWorkspacesButton: "Your workspaces",
   allWorkspacesButton: "All workspaces",
   workspaceTooltipTitle: "What is workspace?",
@@ -200,19 +200,31 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, works
         <TableBody>
           {!workspaces && loading && <TableLoader />}
           {workspaces && workspaces.length === 0 && (
-            <TableRow>
-              <TableCell colSpan={999}>
-                <EmptyState
-                  message={Language.emptyMessage}
-                  description={Language.emptyDescription}
-                  cta={
-                    <Link underline="none" component={RouterLink} to="/workspaces/new">
-                      <Button startIcon={<AddCircleOutline />}>{Language.createButton}</Button>
-                    </Link>
-                  }
-                />
-              </TableCell>
-            </TableRow>
+            <>
+              {filter === "owner:me" || filter === "" ? (
+                <TableRow>
+                  <TableCell colSpan={999}>
+                    <EmptyState
+                      message={Language.emptyCreateWorkspaceMessage}
+                      description={Language.emptyCreateWorkspaceDescription}
+                      cta={
+                        <Link underline="none" component={RouterLink} to="/workspaces/new">
+                          <Button startIcon={<AddCircleOutline />}>{Language.createWorkspaceButton}</Button>
+                        </Link>
+                      }
+                    />
+                  </TableCell>
+                </TableRow>
+              ) : (
+                <TableRow>
+                  <TableCell colSpan={999}>
+                    <EmptyState
+                      message={Language.emptyResultsMessage}
+                    />
+                  </TableCell>
+                </TableRow>
+              )}
+            </>
           )}
           {workspaces &&
             workspaces.map((workspace) => {
