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

refactor(site): Refactor alerts#7587

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
BrunoQuaresma merged 13 commits intomainfrombq/refactor-alerts
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
13 commits
Select commitHold shift + click to select a range
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
PrevPrevious commit
Apply minor fixes
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committedMay 18, 2023
commit00b5e4e89b60512bf4104bde420eed2702e44ab6
1 change: 1 addition & 0 deletionssite/src/components/Alert/ErrorAlert.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ export const ErrorAlert: FC<
component="span"
color={(theme) => theme.palette.text.secondary}
fontSize={13}
data-chromatic="ignore"
>
{detail}
</Box>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -206,7 +206,6 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({

<Button
title="Build template (Ctrl + Enter)"
size="small"
disabled={disablePreview}
onClick={() => {
triggerPreview()
Expand All@@ -224,7 +223,6 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
? "Something"
: ""
}
size="small"
disabled={dirty || disableUpdate}
onClick={onPublish}
>
Expand All@@ -240,7 +238,6 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
<div className={styles.sidebarActions}>
<Tooltip title="Create File" placement="top">
<IconButton
size="small"
aria-label="Create File"
onClick={(event) => {
setCreateFileOpen(true)
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,12 @@ export const TemplateVersionWarnings: FC<
<Maybe condition={Boolean(warnings.includes("DEPRECATED_PARAMETERS"))}>
<div data-testid="warning-deprecated-parameters">
<Alert severity="warning">
<div>
This template uses legacy parameters which will be deprecated in the
next Coder release. Learn how to migrate in{" "}
<Link href="https://coder.com/docs/v2/latest/templates/parameters#migration">
our documentation
</Link>
.
</div>
This template uses legacy parameters which will be deprecated in the
next Coder release. Learn how to migrate in{" "}
<Link href="https://coder.com/docs/v2/latest/templates/parameters#migration">
our documentation
</Link>
.
</Alert>
</div>
</Maybe>
Expand Down
1 change: 0 additions & 1 deletionsite/src/components/VersionsTable/VersionRow.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ export const VersionRow: React.FC<VersionRowProps> = ({
) : (
onPromoteClick && (
<Button
size="small"
className={styles.promoteButton}
onClick={(e) => {
e.preventDefault()
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ ExampleWithDismiss.args = {
}

const ExampleAction = (
<Button onClick={() => null} size="small">
<Button onClick={() => null} size="small" variant="text">
Button
</Button>
)
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export const WorkspaceDeletedBanner: FC<
const { t } = useTranslation("workspacePage")

const NewWorkspaceButton = (
<Button onClick={handleClick} size="small">
<Button onClick={handleClick} size="small" variant="text">
{t("ctas.createWorkspaceCta")}
</Button>
)
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ export const AddNewLicensePageView: FC<AddNewLicenseProps> = ({
justifyContent="space-between"
>
<Header
title="Add aLicense"
title="Add alicense"
description="Get access to high availability, RBAC, quotas, and more."
/>
<Button
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { FC } from "react"
import Confetti from "react-confetti"
import { Link } from "react-router-dom"
import useWindowSize from "react-use/lib/useWindowSize"
import MuiLink from "@mui/material/Link"

type Props = {
showConfetti: boolean
Expand DownExpand Up@@ -59,7 +60,7 @@ const LicensesSettingsPageView: FC<Props> = ({
to="/settings/deployment/licenses/add"
startIcon={<AddIcon />}
>
Add aLicense
Add alicense
</Button>
</Stack>

Expand DownExpand Up@@ -89,9 +90,12 @@ const LicensesSettingsPageView: FC<Props> = ({
</span>
<span className={styles.description}>
You{"'"}re missing out on high availability, RBAC, quotas, and
much more. Contact <a href="mailto:sales@coder.com">sales</a> or{" "}
<a href="https://coder.com/trial">request a trial license</a> to
get started.
much more. Contact{" "}
<MuiLink href="mailto:sales@coder.com">sales</MuiLink> or{" "}
<MuiLink href="https://coder.com/trial">
request a trial license
</MuiLink>{" "}
to get started.
</span>
</Stack>
</Stack>
Expand Down
1 change: 0 additions & 1 deletionsite/src/pages/GroupsPage/GroupsPageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ export const GroupsPageView: FC<GroupsPageViewProps> = ({
href="https://coder.com/docs/coder-oss/latest/enterprise"
target="_blank"
rel="noreferrer"
size="small"
startIcon={<ArrowRightAltOutlined />}
variant="contained"
>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ export const TemplatePermissionsPage: FC<
rel="noreferrer"
>
<Button
size="small"
startIcon={<ArrowRightAltOutlined />}
variant="contained"
>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,15 @@ export const TemplateVariablesPageView: FC<TemplateVariablesPageViewProps> = ({
<PageHeader className={classes.pageHeader}>
<PageHeaderTitle>{t("title")}</PageHeaderTitle>
</PageHeader>
{Boolean(errors.getTemplateDataError) && (
<ErrorAlert error={errors.getTemplateDataError} />
)}
{Boolean(errors.updateTemplateError) && (
<ErrorAlert error={errors.updateTemplateError} />
)}
{Boolean(errors.jobError) && <ErrorAlert error={errors.jobError} />}
<div className={classes.errorContainer}>
{Boolean(errors.getTemplateDataError) && (
<ErrorAlert error={errors.getTemplateDataError} />
)}
{Boolean(errors.updateTemplateError) && (
<ErrorAlert error={errors.updateTemplateError} />
)}
{Boolean(errors.jobError) && <ErrorAlert error={errors.jobError} />}
</div>
{isLoading && <Loader />}
{templateVersion && templateVariables && templateVariables.length > 0 && (
<TemplateVariablesForm
Expand Down
8 changes: 4 additions & 4 deletionssite/src/theme/theme.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,14 +48,14 @@ export let dark = createTheme({
dark: colors.green[15],
},
info: {
light: colors.blue[9],
main: colors.blue[11],
light: colors.blue[7],
main: colors.blue[9],
dark: colors.blue[15],
contrastText: colors.gray[4],
},
error: {
light: colors.red[7],
main: colors.red[9],
light: colors.red[6],
main: colors.red[8],
dark: colors.red[15],
contrastText: colors.gray[4],
},
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp