- Notifications
You must be signed in to change notification settings - Fork928
refactor: Improve the load state for the list pages#1428
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
10 commits Select commitHold shift + click to select a range
4cef295 Improve loading for Users
BrunoQuaresmac0824d5 Refactor templates table
BrunoQuaresmae1e6d9d Add total label
BrunoQuaresma40afc47 Improve empty state
BrunoQuaresmac76d68c Refactor template page to use MUI table
BrunoQuaresma6b37868 Add templates table
BrunoQuaresmab3bdc36 Add workspaces table
BrunoQuaresma8524f1f Add loading states on storybook
BrunoQuaresma036d18f Merge branch 'main' of github.com:coder/coder into bq/refactor-full-p…
BrunoQuaresmaf52bb68 Fix EmptyState tests
BrunoQuaresmaFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
Add templates table
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit6b378684a977df55528d0c37ade1092bbccacad9
There are no files selected for viewing
23 changes: 23 additions & 0 deletionssite/src/components/TemplatesTable/TemplatesTable.stories.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { ComponentMeta, Story } from "@storybook/react" | ||
| import React from "react" | ||
| import { MockOrganization, MockTemplate } from "../../testHelpers/entities" | ||
| import { TemplatesTable, TemplatesTableProps } from "./TemplatesTable" | ||
| export default { | ||
| title: "components/TemplatesTable", | ||
| component: TemplatesTable, | ||
| } as ComponentMeta<typeof TemplatesTable> | ||
| const Template: Story<TemplatesTableProps> = (args) => <TemplatesTable {...args} /> | ||
| export const Example = Template.bind({}) | ||
| Example.args = { | ||
| templates: [MockTemplate], | ||
| organizations: [MockOrganization], | ||
| } | ||
| export const Empty = Template.bind({}) | ||
| Empty.args = { | ||
| templates: [], | ||
| organizations: [], | ||
| } |
81 changes: 81 additions & 0 deletionssite/src/components/TemplatesTable/TemplatesTable.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import Box from "@material-ui/core/Box" | ||
| import Table from "@material-ui/core/Table" | ||
| 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 React from "react" | ||
| import { Link } from "react-router-dom" | ||
| import * as TypesGen from "../../api/typesGenerated" | ||
| import { CodeExample } from "../../components/CodeExample/CodeExample" | ||
| import { EmptyState } from "../../components/EmptyState/EmptyState" | ||
| import { TableHeaderRow } from "../../components/TableHeaders/TableHeaders" | ||
| import { TableLoader } from "../../components/TableLoader/TableLoader" | ||
| import { TableTitle } from "../../components/TableTitle/TableTitle" | ||
| export const Language = { | ||
| title: "Templates", | ||
| tableTitle: "All templates", | ||
| nameLabel: "Name", | ||
| emptyMessage: "No templates have been created yet", | ||
| emptyDescription: "Run the following command to get started:", | ||
| totalLabel: "total", | ||
| } | ||
| export interface TemplatesTableProps { | ||
| templates?: TypesGen.Template[] | ||
| organizations?: TypesGen.Organization[] | ||
| } | ||
| export const TemplatesTable: React.FC<TemplatesTableProps> = ({ templates, organizations }) => { | ||
| const isLoading = !templates || !organizations | ||
| // Create a dictionary of organization ID -> organization Name | ||
| // Needed to properly construct links to dive into a template | ||
| const orgDictionary = | ||
| organizations && | ||
| organizations.reduce((acc: Record<string, string>, curr: TypesGen.Organization) => { | ||
| return { | ||
| ...acc, | ||
| [curr.id]: curr.name, | ||
| } | ||
| }, {}) | ||
| return ( | ||
| <Table> | ||
| <TableHead> | ||
| <TableTitle title={Language.tableTitle} /> | ||
| <TableHeaderRow> | ||
| <TableCell size="small">{Language.nameLabel}</TableCell> | ||
| </TableHeaderRow> | ||
| </TableHead> | ||
| <TableBody> | ||
| {isLoading && <TableLoader />} | ||
| {templates && | ||
| organizations && | ||
| orgDictionary && | ||
| templates.map((t) => ( | ||
| <TableRow key={t.id}> | ||
| <TableCell> | ||
| <Link to={`/templates/${orgDictionary[t.organization_id]}/${t.name}`}>{t.name}</Link> | ||
| </TableCell> | ||
| </TableRow> | ||
| ))} | ||
| {templates && templates.length === 0 && ( | ||
| <TableRow> | ||
| <TableCell colSpan={999}> | ||
| <Box p={4}> | ||
| <EmptyState | ||
| message={Language.emptyMessage} | ||
| description={Language.emptyDescription} | ||
| cta={<CodeExample code="coder templates create" />} | ||
| /> | ||
| </Box> | ||
| </TableCell> | ||
| </TableRow> | ||
| )} | ||
| </TableBody> | ||
| </Table> | ||
| ) | ||
| } |
66 changes: 4 additions & 62 deletionssite/src/pages/TemplatesPages/TemplatesPage.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.