Merge branch '247907-node-form-updates' into 'master'

Geo Node Form - Text Updates

See merge request gitlab-org/gitlab!47297

ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue

@@ -23,25 +23,25 @@ export default {
       formGroups: [
         {
           id: 'node-repository-capacity-field',
-          label: __('Repository sync capacity'),
+          label: __('Repository synchronization concurrency limit'),
           key: VALIDATION_FIELD_KEYS.REPOS_MAX_CAPACITY,
           conditional: 'secondary',
         },
         {
           id: 'node-file-capacity-field',
-          label: __('File sync capacity'),
+          label: __('File synchronization concurrency limit'),
           key: VALIDATION_FIELD_KEYS.FILES_MAX_CAPACITY,
           conditional: 'secondary',
         },
         {
           id: 'node-container-repository-capacity-field',
-          label: __('Container repositories sync capacity'),
+          label: __('Container repositories synchronization concurrency limit'),
           key: VALIDATION_FIELD_KEYS.CONTAINER_REPOSITORIES_MAX_CAPACITY,
           conditional: 'secondary',
         },
         {
           id: 'node-verification-capacity-field',
-          label: __('Verification capacity'),
+          label: __('Verification concurrency limit'),
           key: VALIDATION_FIELD_KEYS.VERIFICATION_MAX_CAPACITY,
         },
         {
@@ -68,9 +68,9 @@ export default {
     },
     sectionDescription() {
       return this.nodeData.primary
-        ? __('Set the synchronization and verification capacity for the secondary node.')
+        ? __('Set verification limit and frequency.')
         : __(
-            'Set the number of concurrent requests this secondary node will make to the primary node while backfilling.',
+            'Limit the number of concurrent operations this secondary node can run in the background.',
           );
     },
     sectionLink() {

ee/app/assets/javascripts/geo_node_form/components/geo_node_form_selective_sync.vue

@@ -52,13 +52,9 @@ export default {
 
 <template>
   <div ref="geoNodeFormSelectiveSyncContainer">
-    <h2 class="gl-font-size-h2 gl-my-5">{{ __('Selective synchronization') }}</h2>
+    <h2 class="gl-font-size-h2 gl-my-5">{{ __('Synchronization settings') }}</h2>
     <p class="gl-mb-5">
-      {{
-        __(
-          'Set what should be replicated by choosing specific projects or groups by the secondary node.',
-        )
-      }}
+      {{ __('Set what should be replicated by this secondary node.') }}
       <gl-link
         :href="$options.SELECTIVE_SYNC_MORE_INFO"
         target="_blank"
@@ -69,6 +65,7 @@ export default {
     <gl-form-group
       :label="__('Selective synchronization')"
       label-for="node-selective-synchronization-field"
+      :description="__('Choose specific groups or storage shards')"
     >
       <gl-form-select
         id="node-selective-synchronization-field"

ee/changelogs/unreleased/247907-node-form-updates.yml

+---
+title: Geo Node Form - Text Updates
+merge_request: 47297
+author:
+type: changed

ee/spec/frontend/geo_node_form/components/geo_node_form_capacities_spec.js

@@ -61,12 +61,13 @@ describe('GeoNodeFormCapacities', () => {
   const findGeoNodeFormReverificationIntervalField = () =>
     wrapper.find('#node-reverification-interval-field');
   const findErrorMessage = () => wrapper.find('.invalid-feedback');
+  const findFieldLabel = id => wrapper.vm.formGroups.find(el => el.id === id).label;
 
   describe('template', () => {
     describe.each`
-      primaryNode | description                                                                                                     | link
-      ${true}     | ${'Set the synchronization and verification capacity for the secondary node.'}                                  | ${REVERIFICATION_MORE_INFO}
-      ${false}    | ${'Set the number of concurrent requests this secondary node will make to the primary node while backfilling.'} | ${BACKFILL_MORE_INFO}
+      primaryNode | description                                                                                   | link
+      ${true}     | ${'Set verification limit and frequency.'}                                                    | ${REVERIFICATION_MORE_INFO}
+      ${false}    | ${'Limit the number of concurrent operations this secondary node can run in the background.'} | ${BACKFILL_MORE_INFO}
     `(`section description`, ({ primaryNode, description, link }) => {
       describe(`when node is ${primaryNode ? 'primary' : 'secondary'}`, () => {
         beforeEach(() => {
@@ -168,7 +169,9 @@ describe('GeoNodeFormCapacities', () => {
               showError,
             );
             if (showError) {
-              expect(findErrorMessage().text()).toBe(`Verification capacity ${errorMessage}`);
+              expect(findErrorMessage().text()).toBe(
+                `${findFieldLabel('node-verification-capacity-field')} ${errorMessage}`,
+              );
             }
           });
         });
@@ -183,7 +186,9 @@ describe('GeoNodeFormCapacities', () => {
               showError,
             );
             if (showError) {
-              expect(findErrorMessage().text()).toBe(`Re-verification interval ${errorMessage}`);
+              expect(findErrorMessage().text()).toBe(
+                `${findFieldLabel('node-reverification-interval-field')} ${errorMessage}`,
+              );
             }
           });
         });
@@ -202,7 +207,9 @@ describe('GeoNodeFormCapacities', () => {
           it(`${showError ? 'shows' : 'hides'} error when data is ${data}`, () => {
             expect(findGeoNodeFormRepositoryCapacityField().classes('is-invalid')).toBe(showError);
             if (showError) {
-              expect(findErrorMessage().text()).toBe(`Repository sync capacity ${errorMessage}`);
+              expect(findErrorMessage().text()).toBe(
+                `${findFieldLabel('node-repository-capacity-field')} ${errorMessage}`,
+              );
             }
           });
         });
@@ -215,7 +222,9 @@ describe('GeoNodeFormCapacities', () => {
           it(`${showError ? 'shows' : 'hides'} error when data is ${data}`, () => {
             expect(findGeoNodeFormFileCapacityField().classes('is-invalid')).toBe(showError);
             if (showError) {
-              expect(findErrorMessage().text()).toBe(`File sync capacity ${errorMessage}`);
+              expect(findErrorMessage().text()).toBe(
+                `${findFieldLabel('node-file-capacity-field')} ${errorMessage}`,
+              );
             }
           });
         });
@@ -231,7 +240,7 @@ describe('GeoNodeFormCapacities', () => {
             );
             if (showError) {
               expect(findErrorMessage().text()).toBe(
-                `Container repositories sync capacity ${errorMessage}`,
+                `${findFieldLabel('node-container-repository-capacity-field')} ${errorMessage}`,
               );
             }
           });
@@ -247,7 +256,9 @@ describe('GeoNodeFormCapacities', () => {
               showError,
             );
             if (showError) {
-              expect(findErrorMessage().text()).toBe(`Verification capacity ${errorMessage}`);
+              expect(findErrorMessage().text()).toBe(
+                `${findFieldLabel('node-verification-capacity-field')} ${errorMessage}`,
+              );
             }
           });
         });

locale/gitlab.pot

@@ -5327,6 +5327,9 @@ msgstr ""
 msgid "Choose labels"
 msgstr ""
 
+msgid "Choose specific groups or storage shards"
+msgstr ""
+
 msgid "Choose the top-level group for your repository imports."
 msgstr ""
 
@@ -7156,7 +7159,7 @@ msgstr ""
 msgid "Container repositories"
 msgstr ""
 
-msgid "Container repositories sync capacity"
+msgid "Container repositories synchronization concurrency limit"
 msgstr ""
 
 msgid "Container repository"
@@ -11754,7 +11757,7 @@ msgstr ""
 msgid "File renamed with no changes."
 msgstr ""
 
-msgid "File sync capacity"
+msgid "File synchronization concurrency limit"
 msgstr ""
 
 msgid "File templates"
@@ -16053,6 +16056,9 @@ msgstr ""
 msgid "Limit namespaces and projects that can be indexed"
 msgstr ""
 
+msgid "Limit the number of concurrent operations this secondary node can run in the background."
+msgstr ""
+
 msgid "Limited to showing %d event at most"
 msgid_plural "Limited to showing %d events at most"
 msgstr[0] ""
@@ -22856,7 +22862,7 @@ msgstr ""
 msgid "Repository storage"
 msgstr ""
 
-msgid "Repository sync capacity"
+msgid "Repository synchronization concurrency limit"
 msgstr ""
 
 msgid "Repository: %{counter_repositories} / Wikis: %{counter_wikis} / Build Artifacts: %{counter_build_artifacts} / LFS: %{counter_lfs_objects} / Snippets: %{counter_snippets}"
@@ -24559,12 +24565,6 @@ msgstr ""
 msgid "Set the milestone to %{milestone_reference}."
 msgstr ""
 
-msgid "Set the number of concurrent requests this secondary node will make to the primary node while backfilling."
-msgstr ""
-
-msgid "Set the synchronization and verification capacity for the secondary node."
-msgstr ""
-
 msgid "Set the timeout in seconds to send a secondary node status to the primary and IPs allowed for the secondary nodes."
 msgstr ""
 
@@ -24607,13 +24607,16 @@ msgstr ""
 msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically."
 msgstr ""
 
+msgid "Set verification limit and frequency."
+msgstr ""
+
 msgid "Set weight"
 msgstr ""
 
 msgid "Set weight to %{weight}."
 msgstr ""
 
-msgid "Set what should be replicated by choosing specific projects or groups by the secondary node."
+msgid "Set what should be replicated by this secondary node."
 msgstr ""
 
 msgid "SetPasswordToCloneLink|set a password"
@@ -26210,6 +26213,9 @@ msgstr ""
 msgid "Synchronization disabled"
 msgstr ""
 
+msgid "Synchronization settings"
+msgstr ""
+
 msgid "Syncing…"
 msgstr ""
 
@@ -29632,7 +29638,7 @@ msgstr ""
 msgid "Various settings that affect GitLab performance."
 msgstr ""
 
-msgid "Verification capacity"
+msgid "Verification concurrency limit"
 msgstr ""
 
 msgid "Verification information"