Edit org UI text (#32455)

* Update NewOrgPage.tsx

* Update SelectOrgPage.tsx

* Update UserInviteForm.tsx

* Update UserInvitePage.tsx
This commit is contained in:
Diana Payton
2021-03-30 20:54:31 +02:00
committed by GitHub
parent 552c4bf124
commit 904187eb5a
4 changed files with 12 additions and 12 deletions
+5 -5
View File
@@ -41,12 +41,12 @@ export const NewOrgPage: FC<PropsWithState> = ({ navModel }) => {
return (
<Page navModel={navModel}>
<Page.Contents>
<h3 className="page-sub-heading">New Organization</h3>
<h3 className="page-sub-heading">New organization</h3>
<p className="playlist-description">
Each organization contains their own dashboards, data sources and configuration, and cannot be shared between
orgs. While users may belong to more than one, multiple organization are most frequently used in multi-tenant
deployments.{' '}
Each organization contains their own dashboards, data sources, and configuration, which cannot be shared
shared between organizations. While users might belong to more than one organization, multiple organizations
are most frequently used in multi-tenant deployments.{' '}
</p>
<Form<CreateOrgFormDTO> onSubmit={createOrg}>
@@ -55,7 +55,7 @@ export const NewOrgPage: FC<PropsWithState> = ({ navModel }) => {
<>
<Field label="Organization name" invalid={!!errors.name} error={errors.name && errors.name.message}>
<Input
placeholder="Org. name"
placeholder="Org name"
name="name"
ref={register({
required: 'Organization name is required',
+2 -2
View File
@@ -38,8 +38,8 @@ export const SelectOrgPage: FC = () => {
<Page.Contents>
<div>
<p>
You have been added to another Organization due to an open invitation! Please select which organization you
want to use right now (you can change this later at any time).
You have been invited to another organization! Please select which organization that you want to use right
now. You can change this later at any time.
</p>
<HorizontalGroup wrap>
{orgs &&
+3 -3
View File
@@ -37,7 +37,7 @@ export const UserInviteForm: FC<Props> = ({}) => {
try {
await getBackendSrv().post('/api/org/invites', formData);
} catch (err) {
appEvents.emit(AppEvents.alertError, ['Failed to send invite', err.message]);
appEvents.emit(AppEvents.alertError, ['Failed to send invitation.', err.message]);
}
locationService.push('/org/users/');
};
@@ -56,8 +56,8 @@ export const UserInviteForm: FC<Props> = ({}) => {
<>
<Field
invalid={!!errors.loginOrEmail}
error={!!errors.loginOrEmail ? 'Email or Username is required' : undefined}
label="Email or Username"
error={!!errors.loginOrEmail ? 'Email or username is required' : undefined}
label="Email or username"
>
<Input name="loginOrEmail" placeholder="email@example.com" ref={register({ required: true })} />
</Field>
+2 -2
View File
@@ -15,9 +15,9 @@ export const UserInvitePage: FC<Props> = ({ navModel }) => {
return (
<Page navModel={navModel}>
<Page.Contents>
<h3 className="page-sub-heading">Invite User</h3>
<h3 className="page-sub-heading">Invite user</h3>
<div className="p-b-2">
Send invite or add existing Grafana user to the organization
Send invitation or add existing Grafana user to the organization.
<span className="highlight-word"> {contextSrv.user.orgName}</span>
</div>
<UserInviteForm />