Merge branch 'improvement/ZKUI-345-improve-label-azure-archive' into …

…q/2.0
scality · Apr 6, 2023 · 75194c4 · 75194c4
2 parents b543b88 + fa8ab1e
commit 75194c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 38 deletions.
diff --git a/src/react/backend/location/LocationDetails/LocationDetailsAzureArchive.tsx b/src/react/backend/location/LocationDetails/LocationDetailsAzureArchive.tsx
@@ -283,7 +283,7 @@ const LocationDetailsAzureArchive = ({
             />
             <FormGroup
               id="queue.topicSubscriptionId"
-              label="Topic Subscription ID"
+              label="Topic Subscription Name"
               helpErrorPosition="bottom"
               required
               content={
@@ -302,17 +302,7 @@ const LocationDetailsAzureArchive = ({
               id="queue.namespace"
               label="Service Bus Endpoint"
               helpErrorPosition="bottom"
-              labelHelpTooltip={
-                <>
-                  {
-                    'https://<<ServiceBusNamespace>>.servicebus.windows.net is usually used as the Storage queue endpoint.'
-                  }
-                  <br />
-                  <br />
-                  It will be derived from the Service Bus namespace if not
-                  explicitely provided.
-                </>
-              }
+              labelHelpTooltip="https://<<ServiceBusNamespace>>.servicebus.windows.net is usually used as the Storage queue endpoint."
               required
               content={
                 <Input
@@ -357,17 +347,7 @@ const LocationDetailsAzureArchive = ({
               label="Service Bus Endpoint"
               id="queue.endpoint"
               helpErrorPosition="bottom"
-              labelHelpTooltip={
-                <>
-                  {
-                    'https://<<ServiceBusNamespace>>.servicebus.windows.net is usually used as the Storage queue endpoint.'
-                  }
-                  <br />
-                  <br />
-                  It will be derived from the Service Bus namespace if not
-                  explicitely provided.
-                </>
-              }
+              labelHelpTooltip="https://<<ServiceBusNamespace>>.servicebus.windows.net is usually used as the Storage queue endpoint."
               required
               content={
                 <Input
@@ -411,17 +391,8 @@ const LocationDetailsAzureArchive = ({
               label="Queue Endpoint"
               id="queue.endpoint"
               helpErrorPosition="bottom"
-              labelHelpTooltip={
-                <>
-                  {
-                    'https://<<StorageaccountName>>.queue.core.windows.net is usually used as the Storage queue endpoint.'
-                  }
-                  <br />
-                  <br />
-                  It will be derived from the storage account name if not
-                  explicitely provided.
-                </>
-              }
+              labelHelpTooltip="https://<<StorageaccountName>>.queue.core.windows.net is usually used as the Storage queue endpoint."
+              required
               content={
                 <Input
                   name="queue.endpoint"

diff --git a/src/react/backend/location/LocationDetails/__tests__/LocationDetailsAzureArchive.test.tsx b/src/react/backend/location/LocationDetails/__tests__/LocationDetailsAzureArchive.test.tsx
@@ -113,7 +113,7 @@ const prefilledHelper = (container: HTMLElement, values: prefilledValues) => {
 const serviceBusTopicHelper = (container: HTMLElement) => {
   const preDefinedAzureServiceBusTopic: [RegExp, string][] = [
     [/Topic Name \*/, 'mock-topic-name'],
-    [/Topic Subscription ID \*/, 'mock-subscription-id'],
+    [/Topic Subscription Name \*/, 'mock-subscription-name'],
     [/Service Bus Endpoint \*/, 'mock-namespace'],
   ];
   prefilledHelper(container, preDefinedAzureServiceBusTopic);
@@ -180,7 +180,7 @@ describe('<LocationDetailsAzureArchive />', () => {
       /target azure container name \*/i,
       /Queue type \*/i,
       /Topic Name \*/i,
-      /topic subscription id \*/i,
+      /topic subscription name \*/i,
       /Service Bus Endpoint */i,
       /Authentication type \*/i,
       /Tenant ID \*/i,
@@ -247,7 +247,7 @@ describe('<LocationDetailsAzureArchive />', () => {
       queue: {
         type: 'location-azure-servicebus-topic-v1',
         topicName: 'mock-topic-name',
-        topicSubscriptionId: 'mock-subscription-id',
+        topicSubscriptionId: 'mock-subscription-name',
         namespace: 'mock-namespace',
       },
       auth: {
@@ -282,7 +282,7 @@ describe('<LocationDetailsAzureArchive />', () => {
       queue: {
         type: 'location-azure-servicebus-topic-v1',
         topicName: 'mock-topic-name',
-        topicSubscriptionId: 'mock-subscription-id',
+        topicSubscriptionId: 'mock-subscription-name',
         namespace: 'mock-namespace',
       },
       auth: {