Skip to content

Commit

Permalink
Merge pull request #3513 from bipuladh/typo-fixes
Browse files Browse the repository at this point in the history
Bug 1777258: Changed how backingstore is spelled through out the console
  • Loading branch information
openshift-merge-robot committed Nov 27, 2019
2 parents cade0d7 + cf274b1 commit c868960
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
Expand Up @@ -112,7 +112,7 @@ const CreateBucketClass: React.FC<CreateBCProps> = ({ match }) => {
},
{
id: CreateStepsBC.BACKINGSTORE,
name: 'BackingStore',
name: 'Backing Store',
component: <BackingStorePageWithFirehose state={state} dispatcher={dispatch} />,
enableNext: backingStoreNextConditions(),
},
Expand Down
Expand Up @@ -109,8 +109,8 @@ const filterSelectedItems = (items: BackingStoreStateType[], tableId: number): s

const getBsLabel = (policy: string) =>
policy === 'Mirror'
? 'Select at least 2 Backingstore resources'
: 'Select at least 1 Backingstore resource';
? 'Select at least 2 Backing Store resources'
: 'Select at least 1 Backing Store resource';

const BackingStorePage: React.FC<BackingStorePageProps> = React.memo(
({ backingStores, dispatcher, state }) => {
Expand Down Expand Up @@ -161,11 +161,11 @@ const BackingStorePage: React.FC<BackingStorePageProps> = React.memo(
className="nb-create-bc-step-page__info"
isInline
variant="info"
title="What is a BackingStore?"
title="What is a Backing Store?"
action={<AlertActionCloseButton onClose={() => setShowHelp(false)} />}
>
<p>
BackingStore represents a storage target to be used as the underlying storage for the
Backing Store represents a storage target to be used as the underlying storage for the
data in MCG buckets.
</p>
<p>
Expand All @@ -181,14 +181,14 @@ const BackingStorePage: React.FC<BackingStorePageProps> = React.memo(
<Form className="nb-bc-step-page-form">
<Title headingLevel="h3" size="xl" className="nb-bc-step-page-form__title">
<Flex breakpointMods={[{ modifier: 'justify-content-space-between' }] as any}>
<FlexItem>Tier 1 - backingStore ({state.tier1Policy})</FlexItem>
<FlexItem>Tier 1 - Backing Store ({state.tier1Policy})</FlexItem>
<FlexItem>
<Button
variant="link"
onClick={openModal}
className="nb-bc-step-page-form__modal-launcher"
>
<PlusCircleIcon /> Create BackingStore
<PlusCircleIcon /> Create Backing Store
</Button>
</FlexItem>
</Flex>
Expand All @@ -202,7 +202,7 @@ const BackingStorePage: React.FC<BackingStorePageProps> = React.memo(
>
<TextInput
className="nb-bc-step-page-form__element--short"
placeholder="Search BackingStore"
placeholder="Search Backing Store"
onChange={setSearchInput}
value={searchInput}
type="text"
Expand All @@ -229,7 +229,7 @@ const BackingStorePage: React.FC<BackingStorePageProps> = React.memo(
{showTier2Table && (
<Form className="nb-bc-step-page-form">
<Title headingLevel="h3" size="xl">
Tier 2 - backingStore ({state.tier2Policy}){' '}
Tier 2 - Backing Store ({state.tier2Policy}){' '}
</Title>
<FormGroup
className="nb-bc-step-page-form__element"
Expand All @@ -239,7 +239,7 @@ const BackingStorePage: React.FC<BackingStorePageProps> = React.memo(
>
<TextInput
className="nb-bc-step-page-form__element--short"
placeholder="Search BackingStore"
placeholder="Search Backing Store"
onChange={(v) => setSearchInput2(v)}
value={searchInput2}
type="text"
Expand Down
Expand Up @@ -48,14 +48,14 @@ const ReviewPage: React.FC<ReviewPageProps> = ({ state }) => {
<Title size="md" headingLevel="h5">
Tier 1: {tier1Policy}
</Title>
<p>Selected BackingStore: {tier1BackingStore.join(', ')}</p>
<p>Selected Backing Store: {tier1BackingStore.join(', ')}</p>
</div>
{tier2Policy && (
<>
<Title size="md" headingLevel="h5">
Tier 2: {tier2Policy}
</Title>
<p>Selected BackingStore: {tier2BackingStore.join(', ')}</p>
<p>Selected Backing Store: {tier2BackingStore.join(', ')}</p>
</>
)}
</div>
Expand Down
Expand Up @@ -11,11 +11,11 @@ import './create-bs.scss';
const CreateBackingStoreFormModal: React.FC<CreateBackingStoreFormModal> = (props) => {
return (
<div className="nb-create-bs__modal">
<ModalTitle>Create new BackingStore</ModalTitle>
<ModalTitle>Create new Backing Store</ModalTitle>
<ModalBody>
<p>
BackingStore represents a storage target to be used as the underlying storage for the data
in MCG buckets.
Backing Store represents a storage target to be used as the underlying storage for the
data in MCG buckets.
</p>
<CreateBackingStoreForm {...props} />
</ModalBody>
Expand Down
Expand Up @@ -47,7 +47,7 @@ const CreateBackingStoreFormPage: React.FC<CreateBackingStoreFormPageProps> = ({
</div>
<div className="nb-bs-page-title">
<Title size="2xl" headingLevel="h1" className="nb-bs-page-title__main">
Create new BackingStore
Create new Backing Store
</Title>
<p className="nb-bs-page-title__info">
Storage targets that are used to store chunks of data on MCG buckets.
Expand All @@ -59,14 +59,14 @@ const CreateBackingStoreFormPage: React.FC<CreateBackingStoreFormPageProps> = ({
<Alert
isInline
variant="info"
title="What is a BackingStore?"
title="What is a Backing Store?"
action={<AlertActionCloseButton onClose={() => setShowHelp(false)} />}
>
BackingStore represent a storage target to be used as the underlying storage for the
data in MCG buckets.
A backing store represents a storage target to be used as the underlying storage layer
in MCG buckets.
<br />
Multiple types of backing-stores are supported: aws-s3, s3-compataible,
google-cloud-storage, azure-blob, obc, PVC.
Multiple types of backing stores are supported: AWS S3, S3 Compatible, Google Cloud
Storage, Azure Blob, PVC.
</Alert>
)}
<CreateBackingStoreForm
Expand Down
Expand Up @@ -99,7 +99,7 @@ const S3EndPointType: React.FC<S3EndpointTypeProps> = (props) => {
const [showSecret, setShowSecret] = React.useState(true);
const { provider, namespace, state, dispatch } = props;

const targetLabel = provider === 'Azure Blob' ? 'Target Container' : 'Target Bucket';
const targetLabel = provider === 'Azure Blob' ? 'Target Blob Container' : 'Target Bucket';
const credentialField1Label = provider === 'Azure Blob' ? 'Account Name' : 'Access Key';
const credentialField2Label = provider === 'Azure Blob' ? 'Account Key' : 'Secret Key';
const resources = [
Expand Down Expand Up @@ -583,7 +583,7 @@ const CreateBackingStoreForm: React.FC<CreateBackingStoreFormProps> = withHandle
</FormGroup>

<FormGroup
label="BackingStore Name"
label="Backing Store Name"
fieldId="backingstore-name"
className="nb-bs-form-entry"
helperText="If not provided, a generic name will be generated."
Expand All @@ -593,7 +593,7 @@ const CreateBackingStoreForm: React.FC<CreateBackingStoreFormProps> = withHandle
onChange={setBsName}
value={bsName}
placeholder="my-backingstore"
aria-label="BackingStore Name"
aria-label="Backing Store Name"
/>
</FormGroup>

Expand All @@ -619,7 +619,7 @@ const CreateBackingStoreForm: React.FC<CreateBackingStoreFormProps> = withHandle
<ButtonBar errorMessage={errorMessage} inProgress={inProgress}>
<ActionGroup>
<Button type="submit" variant="primary" isDisabled={disabled}>
Create BackingStore
Create Backing Store
</Button>
<Button onClick={cancel} variant="secondary">
Cancel
Expand Down

0 comments on commit c868960

Please sign in to comment.