Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore: edit CLI/UI copy#2247

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
khorne3 merged 24 commits intomainfromcli-ui-copyedits
Jun 16, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
24 commits
Select commitHold shift + click to select a range
110ea81
chore: update CLI copy
Jun 10, 2022
ac10e6c
chore: update UI copy
Jun 10, 2022
0c21651
chore: escape apostrophe
Jun 10, 2022
953c542
chore: lint
Jun 10, 2022
2f0be80
Add template tooltips/kira pilot (#2308)
Kira-PilotJun 14, 2022
d602078
Merge branch 'main' into cli-ui-copyedits
Jun 14, 2022
dd94aca
chore: fix issues w/ merge conflict resolution
Jun 14, 2022
d2dcdd8
resolving in flight conflicts
Kira-PilotJun 14, 2022
4a2900f
formating server.go
Kira-PilotJun 14, 2022
d7d1a04
Merge remote-tracking branch 'origin/main' into cli-ui-copyedits
Kira-PilotJun 14, 2022
78b8f9b
Merge remote-tracking branch 'origin/main' into cli-ui-copyedits
Kira-PilotJun 14, 2022
f5e73a2
Apply suggestions from review
Jun 15, 2022
0f1e8c0
Merge branch 'main' into cli-ui-copyedits
Jun 15, 2022
4684bd1
chore: fix typos
Jun 15, 2022
6d4afa2
chore: update template definition
Jun 15, 2022
e4a6c04
chore: fix wording; lint
Jun 15, 2022
21d87a9
chore: expand defintion of provisioner-daemons
Jun 15, 2022
3cb014c
chore: update wording
Jun 15, 2022
a7927dc
Merge remote-tracking branch 'origin/main' into cli-ui-copyedits
Kira-PilotJun 15, 2022
43642ed
fix test
Kira-PilotJun 15, 2022
d8bc927
Merge remote-tracking branch 'origin/main' into cli-ui-copyedits
Kira-PilotJun 15, 2022
4e5067d
chore: remove provisioner daemons line
Jun 15, 2022
9400b2f
Merge branch 'main' into cli-ui-copyedits
Jun 15, 2022
555c636
Merge branch 'main' into cli-ui-copyedits
Jun 16, 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
38 changes: 2 additions & 36 deletionssite/src/components/Resources/Resources.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,16 +9,11 @@ import { FC } from "react"
import { Workspace, WorkspaceResource } from "../../api/typesGenerated"
import { getDisplayAgentStatus } from "../../util/workspace"
import { AppLink } from "../AppLink/AppLink"
import {
HelpTooltip,
HelpTooltipLink,
HelpTooltipLinksGroup,
HelpTooltipText,
HelpTooltipTitle,
} from "../HelpTooltip/HelpTooltip"
import { Stack } from "../Stack/Stack"
import { TableHeaderRow } from "../TableHeaders/TableHeaders"
import { TerminalLink } from "../TerminalLink/TerminalLink"
import { AgentHelpTooltip } from "../Tooltips/AgentHelpTooltip"
import { ResourcesHelpTooltip } from "../Tooltips/ResourcesHelpTooltip"
import { WorkspaceSection } from "../WorkspaceSection/WorkspaceSection"

const Language = {
Expand All@@ -28,35 +23,6 @@ const Language = {
agentLabel: "Agent",
statusLabel: "Status",
accessLabel: "Access",
resourceTooltipTitle: "What is a resource?",
resourceTooltipText: "A resource is an infrastructure object that is create when the workspace is provisioned.",
resourceTooltipLink: "Persistent and ephemeral resources",
agentTooltipTitle: "What is an agent?",
agentTooltipText:
"The Coder agent runs inside your resource and gives you direct access to the shell via the UI or CLI.",
}

const ResourcesHelpTooltip: React.FC = () => {
return (
<HelpTooltip size="small">
<HelpTooltipTitle>{Language.resourceTooltipTitle}</HelpTooltipTitle>
<HelpTooltipText>{Language.resourceTooltipText}</HelpTooltipText>
<HelpTooltipLinksGroup>
<HelpTooltipLink href="https://github.com/coder/coder/blob/main/docs/templates.md#persistent-and-ephemeral-resources">
{Language.resourceTooltipLink}
</HelpTooltipLink>
</HelpTooltipLinksGroup>
</HelpTooltip>
)
}

const AgentHelpTooltip: React.FC = () => {
return (
<HelpTooltip size="small">
<HelpTooltipTitle>{Language.agentTooltipTitle}</HelpTooltipTitle>
<HelpTooltipText>{Language.agentTooltipText}</HelpTooltipText>
</HelpTooltip>
)
}

interface ResourcesProps {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { fireEvent, render, screen } from "@testing-library/react"
import { FC } from "react"
import { WrapperComponent } from "../../testHelpers/renderHelpers"
import { Language as AgentTooltipLanguage } from "../Tooltips/AgentHelpTooltip"
import { Language as ResourceTooltipLanguage } from "../Tooltips/ResourcesHelpTooltip"
import { TemplateResourcesProps, TemplateResourcesTable } from "./TemplateResourcesTable"

const Component: FC<TemplateResourcesProps> = (props) => (
<WrapperComponent>
<TemplateResourcesTable {...props} />
</WrapperComponent>
)

describe("TemplateResourcesTable", () => {
it("displays resources tooltip", () => {
const props: TemplateResourcesProps = {
resources: [],
}
render(<Component {...props} />)
const resourceTooltipButton = screen.getAllByRole("button")[0]
fireEvent.click(resourceTooltipButton)
const resourceTooltipTitle = screen.getByText(ResourceTooltipLanguage.resourceTooltipTitle)
expect(resourceTooltipTitle).toBeDefined()
})
it("displays agent tooltip", () => {
const props: TemplateResourcesProps = {
resources: [],
}
render(<Component {...props} />)
const agentTooltipButton = screen.getAllByRole("button")[1]
fireEvent.click(agentTooltipButton)
const agentTooltipTitle = screen.getByText(AgentTooltipLanguage.agentTooltipTitle)
expect(agentTooltipTitle).toBeDefined()
})
})
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import TableHead from "@material-ui/core/TableHead"
import TableRow from "@material-ui/core/TableRow"
import { FC } from "react"
import { WorkspaceResource } from "../../api/typesGenerated"
import { Stack } from "../Stack/Stack"
import { TableHeaderRow } from "../TableHeaders/TableHeaders"
import { AgentHelpTooltip } from "../Tooltips/AgentHelpTooltip"
import { ResourcesHelpTooltip } from "../Tooltips/ResourcesHelpTooltip"

const Language = {
exportconst Language = {
resourceLabel: "Resource",
agentLabel: "Agent",
}

interface TemplateResourcesProps {
exportinterface TemplateResourcesProps {
resources: WorkspaceResource[]
}

Expand All@@ -24,8 +27,18 @@ export const TemplateResourcesTable: FC<TemplateResourcesProps> = ({ resources }
<Table className={styles.table}>
<TableHead>
<TableHeaderRow>
<TableCell>{Language.resourceLabel}</TableCell>
<TableCell className={styles.agentColumn}>{Language.agentLabel}</TableCell>
<TableCell>
<Stack direction="row" spacing={0.5} alignItems="center">
{Language.resourceLabel}
<ResourcesHelpTooltip />
</Stack>
</TableCell>
<TableCell className={styles.agentColumn}>
<Stack direction="row" spacing={0.5} alignItems="center">
{Language.agentLabel}
<AgentHelpTooltip />
</Stack>
</TableCell>
</TableHeaderRow>
</TableHead>
<TableBody>
Expand Down
16 changes: 16 additions & 0 deletionssite/src/components/Tooltips/AgentHelpTooltip.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { HelpTooltip, HelpTooltipText, HelpTooltipTitle } from "./HelpTooltip/HelpTooltip"

export const Language = {
agentTooltipTitle: "What is an agent?",
agentTooltipText:
"The Coder agent runs inside your resource and gives you direct access to the shell via the UI or CLI.",
}

export const AgentHelpTooltip: React.FC = () => {
return (
<HelpTooltip size="small">
<HelpTooltipTitle>{Language.agentTooltipTitle}</HelpTooltipTitle>
<HelpTooltipText>{Language.agentTooltipText}</HelpTooltipText>
</HelpTooltip>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,8 @@ export default {

const Template: Story<HelpTooltipProps> = (args) => (
<HelpTooltip {...args}>
<HelpTooltipTitle>What is template?</HelpTooltipTitle>
<HelpTooltipText>
With templates you can create a common configuration for your workspaces using Terraform. So, you and your team
can use the same environment to deliver great software.
</HelpTooltipText>
<HelpTooltipTitle>What is a template?</HelpTooltipTitle>
<HelpTooltipText>A template is a common configuration for your team`&apos;`s workspaces.</HelpTooltipText>
<HelpTooltipLinksGroup>
<HelpTooltipLink href="https://github.com/coder/coder/">Creating a template</HelpTooltipLink>
<HelpTooltipLink href="https://github.com/coder/coder/">Updating a template</HelpTooltipLink>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { makeStyles } from "@material-ui/core/styles"
import HelpIcon from "@material-ui/icons/HelpOutline"
import OpenInNewIcon from "@material-ui/icons/OpenInNew"
import React, { createContext, useContext, useState } from "react"
import { Stack } from "../Stack/Stack"
import { Stack } from "../../Stack/Stack"

type Icon = typeof HelpIcon

Expand Down
27 changes: 27 additions & 0 deletionssite/src/components/Tooltips/ResourcesHelpTooltip.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import {
HelpTooltip,
HelpTooltipLink,
HelpTooltipLinksGroup,
HelpTooltipText,
HelpTooltipTitle,
} from "./HelpTooltip/HelpTooltip"

export const Language = {
resourceTooltipTitle: "What is a resource?",
resourceTooltipText: "A resource is an infrastructure object that is created when the workspace is provisioned.",
resourceTooltipLink: "Persistent and ephemeral resources",
}

export const ResourcesHelpTooltip: React.FC = () => {
return (
<HelpTooltip size="small">
<HelpTooltipTitle>{Language.resourceTooltipTitle}</HelpTooltipTitle>
<HelpTooltipText>{Language.resourceTooltipText}</HelpTooltipText>
<HelpTooltipLinksGroup>
<HelpTooltipLink href="https://coder.com/docs/coder-oss/latest/templates#persistent-and-ephemeral-resources">
{Language.resourceTooltipLink}
</HelpTooltipLink>
</HelpTooltipLinksGroup>
</HelpTooltip>
)
}
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,7 +204,7 @@ export const WorkspaceScheduleForm: FC<WorkspaceScheduleFormProps> = ({
]

return (
<FullPageForm onCancel={onCancel} title="WorkspaceSchedule">
<FullPageForm onCancel={onCancel} title="Workspaceschedule">
<form onSubmit={form.handleSubmit} className={styles.form}>
<Stack>
<TextField
Expand Down
2 changes: 1 addition & 1 deletionsite/src/pages/TemplatePage/TemplatePageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import { WorkspaceSection } from "../../components/WorkspaceSection/WorkspaceSec

const Language = {
createButton: "Create workspace",
noDescription: "No description",
noDescription: "",
readmeTitle: "README",
resourcesTitle: "Resources",
}
Expand Down
10 changes: 5 additions & 5 deletionssite/src/pages/TemplatesPage/TemplatesPageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,17 +14,17 @@ import * as TypesGen from "../../api/typesGenerated"
import { AvatarData } from "../../components/AvatarData/AvatarData"
import { CodeExample } from "../../components/CodeExample/CodeExample"
import { EmptyState } from "../../components/EmptyState/EmptyState"
import { Margins } from "../../components/Margins/Margins"
import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
import { Stack } from "../../components/Stack/Stack"
import { TableLoader } from "../../components/TableLoader/TableLoader"
import {
HelpTooltip,
HelpTooltipLink,
HelpTooltipLinksGroup,
HelpTooltipText,
HelpTooltipTitle,
} from "../../components/HelpTooltip/HelpTooltip"
import { Margins } from "../../components/Margins/Margins"
import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
import { Stack } from "../../components/Stack/Stack"
import { TableLoader } from "../../components/TableLoader/TableLoader"
} from "../../components/Tooltips/HelpTooltip/HelpTooltip"

dayjs.extend(relativeTime)

Expand Down
14 changes: 7 additions & 7 deletionssite/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,18 +25,18 @@ import { Link as RouterLink, useNavigate } from "react-router-dom"
import { AvatarData } from "../../components/AvatarData/AvatarData"
import { CloseDropdown, OpenDropdown } from "../../components/DropdownArrows/DropdownArrows"
import { EmptyState } from "../../components/EmptyState/EmptyState"
import { Margins } from "../../components/Margins/Margins"
import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
import { Stack } from "../../components/Stack/Stack"
import { TableLoader } from "../../components/TableLoader/TableLoader"
import {
HelpTooltip,
HelpTooltipAction,
HelpTooltipLink,
HelpTooltipLinksGroup,
HelpTooltipText,
HelpTooltipTitle,
} from "../../components/HelpTooltip/HelpTooltip"
import { Margins } from "../../components/Margins/Margins"
import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
import { Stack } from "../../components/Stack/Stack"
import { TableLoader } from "../../components/TableLoader/TableLoader"
} from "../../components/Tooltips/HelpTooltip/HelpTooltip"
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
import { getDisplayStatus, workspaceFilterQuery } from "../../util/workspace"
import { WorkspaceItemMachineRef } from "../../xServices/workspaces/workspacesXService"
Expand All@@ -51,9 +51,9 @@ export const Language = {
filterName: "Filters",
yourWorkspacesButton: "Your workspaces",
allWorkspacesButton: "All workspaces",
workspaceTooltipTitle: "What is workspace?",
workspaceTooltipTitle: "What isaworkspace?",
workspaceTooltipText:
"Itis yourworkstation. It is a workspace that will provide youthenecessary computeandaccesstoyour development environment.",
"A workspaceis yourdevelopment environment in the cloud. It includestheinfrastructureandtools you needtowork on your project.",
workspaceTooltipLink1: "Create workspaces",
workspaceTooltipLink2: "Connect with SSH",
workspaceTooltipLink3: "Editors and IDEs",
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp