Merge branch 'improvement/ZENKO-3386-enhance-ux-storage-location-form…

…' into q/1.0

src/react/account/details/Locations.jsx

@@ -60,7 +60,7 @@ const Overlay = styled.div`
 
 const CustomHeader = () => <span>
     Target Bucket
-    <Tooltip overlay={<Overlay> Name of the bucket/container created in the specific location (e.g. RING, Azure, AWS S3, GCP...), and where the Zenko buckets attached to that location will store data. </Overlay>} placement="right">
+    <Tooltip overlay={<Overlay> Name of the bucket/container created in the specific location (e.g. RING, Azure, AWS S3, GCP...), and where buckets attached to that location will store data. </Overlay>} placement="right">
         <IconTooltip className='fas fa-question-circle'/>
     </Tooltip>
 </span>;

src/react/account/details/__tests__/Locations.test.jsx

@@ -150,7 +150,7 @@ describe('Locations', () => {
         const thirdRowColumns = thirdRow.find(T.Cell).map(column => column.text());
         expect(thirdRowColumns.length).toEqual(nbrOfColumnsExpected);
         expect(thirdRowColumns[0]).toEqual('location-file');
-        expect(thirdRowColumns[1]).toEqual('Zenko Local Filesystem');
+        expect(thirdRowColumns[1]).toEqual('Local Filesystem');
         expect(thirdRowColumns[2]).toEqual('');
         // edit button
         expect(thirdRow.find(T.Cell).find(ActionButton).first().prop('disabled')).toBeTruthy();
@@ -161,7 +161,7 @@ describe('Locations', () => {
         const fourthRowColumns = fourthRow.find(T.Cell).map(column => column.text());
         expect(fourthRowColumns.length).toEqual(nbrOfColumnsExpected);
         expect(fourthRowColumns[0]).toEqual('location-hd');
-        expect(fourthRowColumns[1]).toEqual('Scality Hyperdrive');
+        expect(fourthRowColumns[1]).toEqual('Storage Service for Artesca');
         expect(fourthRowColumns[2]).toEqual('');
         // edit button
         expect(fourthRow.find(T.Cell).find(ActionButton).first().prop('disabled')).toBeFalsy();

src/react/backend/location/LocationDetails/LocationDetails.jsx

@@ -62,7 +62,7 @@ export default class LocationDetails extends React.Component<Props> {
                     <div>
                         <span className="mr-2 fa fa-exclamation-circle" />
                         <span>
-                            Your Zenko instance failed to automatically resume this location. Please resume manually.
+                            Your instance failed to automatically resume this location. Please resume manually.
                         </span>
                     </div>
                 );

src/react/backend/location/LocationDetails/LocationDetailsAws.jsx

@@ -85,7 +85,7 @@ export default class LocationDetailsAws extends React.Component<Props, State> {
                     />
                     <small>
                         Your credentials are encrypted in transit, then at rest using your
-                        Zenko instance&apos;s RSA key pair so that we&apos;re unable to see them.
+                        instance&apos;s RSA key pair so that we&apos;re unable to see them.
                     </small>
                 </Fieldset>
                 <Fieldset>

src/react/backend/location/LocationDetails/LocationDetailsAwsCustom.jsx

@@ -93,7 +93,7 @@ export default class LocationDetailsAwsCustom extends React.Component<Props, Sta
                     />
                     <small>
                         Your credentials are encrypted in transit, then at rest using your
-                        Zenko instance&apos;s RSA key pair so that we&apos;re unable to see them.
+                        instance&apos;s RSA key pair so that we&apos;re unable to see them.
                     </small>
                 </Fieldset>
                 <Fieldset>
@@ -120,7 +120,7 @@ export default class LocationDetailsAwsCustom extends React.Component<Props, Sta
                         placeholder="https://hosted-s3-server.internal.example.com:4443"
                     />
                     <small>Endpoint to reach the S3 server, including scheme and port.
-                        Zenko will use path-style access to buckets.
+                        The buckets will have a path-style access.
                     </small>
                 </Fieldset>
                 <Fieldset>

src/react/backend/location/LocationDetails/LocationDetailsAzure.jsx

@@ -92,7 +92,7 @@ export default class LocationDetailsAzure extends React.Component<Props, State>
                         onChange={this.onChange} />
                     <small>
                         Your credentials are encrypted in transit, then at rest using your
-                        Zenko instance&apos;s RSA key pair so that we&apos;re unable to see them.
+                        instance&apos;s RSA key pair so that we&apos;re unable to see them.
                     </small>
                 </Fieldset>
                 <Fieldset>

src/react/backend/location/LocationDetails/LocationDetailsDOSpaces.jsx

@@ -84,7 +84,7 @@ export default class LocationDetailsDOSpaces extends React.Component<Props, Stat
                     />
                     <small>
                         Your credentials are encrypted in transit, then at rest using your
-                        Zenko instance&apos;s RSA key pair so that we&apos;re unable to see them.
+                        instance&apos;s RSA key pair so that we&apos;re unable to see them.
                     </small>
                 </Fieldset>
                 <Fieldset>
@@ -93,7 +93,7 @@ export default class LocationDetailsDOSpaces extends React.Component<Props, Stat
                         name="bucketName"
                         id="bucketName"
                         type="text"
-                        placeholder="zenko-space-target"
+                        placeholder="space-target"
                         value={this.state.bucketName}
                         onChange={this.onChange}
                         autoComplete="off"

src/react/backend/location/LocationDetails/LocationDetailsGcp.jsx

@@ -83,7 +83,7 @@ export default class LocationDetailsGcp extends React.Component<Props, State> {
                     />
                     <small>
                         Your credentials are encrypted in transit, then at rest using your
-                        Zenko instance&apos;s RSA key pair so that we&apos;re unable to see them.
+                        instance&apos;s RSA key pair so that we&apos;re unable to see them.
                     </small>
                 </Fieldset>
                 <Fieldset>

src/react/backend/location/LocationDetails/LocationDetailsWasabi.jsx

@@ -88,7 +88,7 @@ export default class LocationDetailsWasabi extends React.Component<Props, State>
                     />
                     <small>
                         Your credentials are encrypted in transit, then at rest using your
-                        Zenko instance&apos;s RSA key pair so that we&apos;re unable to see them.
+                        instance&apos;s RSA key pair so that we&apos;re unable to see them.
                     </small>
                 </Fieldset>
                 <Fieldset>

src/react/backend/location/LocationDetails/storageOptions.js

@@ -74,8 +74,8 @@ export const storageOptions: ({ [name: string]: any }) = {
         ingestCapability: 'nfsIngestLocation',
     },
     'location-scality-hdclient-v2': {
-        name: 'Scality Hyperdrive',
-        short: 'Hyperdrive',
+        name: 'Storage Service for Artesca',
+        short: 'Storage Service',
         formDetails: LocationDetailsHyperdriveV2,
         supportsVersioning: true,
         supportsReplicationTarget: false,
@@ -118,8 +118,8 @@ export const storageOptions: ({ [name: string]: any }) = {
         hasIcon: false,
     },
     'location-file-v1': {
-        name: 'Zenko Local Filesystem',
-        short: 'Zenko',
+        name: 'Local Filesystem',
+        short: 'Local Filesystem',
         supportsVersioning: true,
         supportsReplicationTarget: false,
         supportsReplicationSource: true,

src/react/backend/location/LocationEditor.jsx

@@ -152,7 +152,7 @@ function LocationEditor() {
                     debounceTimeout={0}
                     onChange={onChange}
                     value={location.name}
-                    placeholder="zenko-us-west-2"
+                    placeholder="us-west-2"
                     disabled={editingExisting}
                     autoComplete='off' />
             </F.Fieldset>

src/react/databrowser/buckets/__tests__/BucketList.test.jsx

@@ -36,15 +36,15 @@ describe('BucketList', () => {
         const firstBucketCellLocation = firstRow.find('Cell').at(1);
         const firstBucketCellDate = firstRow.find('Cell').at(2);
         expect(firstBucketCellLink.text()).toContain('bucket1');
-        expect(firstBucketCellLocation.text()).toBe('us-east-1 / Zenko Local Filesystem');
+        expect(firstBucketCellLocation.text()).toBe('us-east-1 / Local Filesystem');
         expect(firstBucketCellDate.text()).toBe('Wed Oct 07 2020 16:35:57');
 
         const secondRow = rows.at(1);
         const secondBucketCellLink = secondRow.find('Cell').at(0);
         const secondBucketCellLocation = component.find('Cell').at(1);
         const secondBucketCellDate = component.find('Cell').at(2);
         expect(secondBucketCellLink.text()).toContain('bucket2');
-        expect(secondBucketCellLocation.text()).toBe('us-east-1 / Zenko Local Filesystem');
+        expect(secondBucketCellLocation.text()).toBe('us-east-1 / Local Filesystem');
         expect(secondBucketCellDate.text()).toBe('Wed Oct 07 2020 16:35:57');
     });
 

src/react/ui-elements/FormLayout.jsx

@@ -54,13 +54,16 @@ export const Select = styled(BasicSelect)`
 `;
 
 export const CheckboxContainer = styled.div`
-    display: flex;
+    display: block;
     margin: ${padding.small} 0px ${padding.smaller} 0px;
     align-items: baseline;
+    
+    .sc-checkbox {
+        margin-right: 8px;
+    }
 `;
 
 export const Checkbox = styled(BasicCheckbox)`
-    margin-left: ${padding.base};
 `;
 
 export const Input = styled(BasicInput)`

src/react/ui-elements/Warning.jsx

@@ -74,7 +74,7 @@ export const NoBucketWarning = () => (
     <Container2>
         <i className='fas fa-2x fa-exclamation-circle'></i>
         <Title> No bucket </Title>
-        <Description> Data workflows and search work on Zenko buckets, but no bucket has been created yet. </Description>
+        <Description> Data workflows and search work on buckets, but no bucket has been created yet. </Description>
     </Container2>
 );