Commit 26029a58 authored by Fatih Acet's avatar Fatih Acet

Merge branch '9684-geo-rename-disable-to-pause-resume-admin-geo-nodes' into 'master'

Geo: Rename "Disable" to "Pause|Resume" (Admin > Geo Nodes)

Closes #9684

See merge request gitlab-org/gitlab-ee!10297
parents 0e7b7e06 6d75ee4a
......@@ -31,7 +31,10 @@ export default {
return !this.node.primary && this.nodeEditAllowed;
},
nodeToggleLabel() {
return this.node.enabled ? __('Disable') : __('Enable');
return this.node.enabled ? __('Pause replication') : __('Resume replication');
},
nodeToggleIcon() {
return this.node.enabled ? 'pause' : 'play';
},
isSecondaryNode() {
return !this.node.primary;
......@@ -42,7 +45,7 @@ export default {
eventHub.$emit('showNodeActionModal', {
actionType: NODE_ACTIONS.TOGGLE,
node: this.node,
modalMessage: s__('GeoNodes|Disabling a node stops the sync process. Are you sure?'),
modalMessage: s__('GeoNodes|Pausing replication stops the sync process.'),
modalActionLabel: this.nodeToggleLabel,
});
},
......@@ -98,6 +101,7 @@ export default {
class="btn btn-sm btn-node-action"
@click="onToggleNode"
>
<icon :name="nodeToggleIcon" />
{{ nodeToggleLabel }}
</button>
</div>
......
---
title: 'Geo: Rename "Disable" to "Pause|Resume" (Admin > Geo Nodes)'
merge_request: 10297
author:
type: changed
......@@ -53,13 +53,13 @@ describe('GeoNodeActionsComponent', () => {
let mockNode = Object.assign({}, mockNodes[1]);
let vmX = createComponent(mockNode);
expect(vmX.nodeToggleLabel).toBe('Disable');
expect(vmX.nodeToggleLabel).toBe('Pause replication');
vmX.$destroy();
mockNode = Object.assign({}, mockNodes[1], { enabled: false });
vmX = createComponent(mockNode);
expect(vmX.nodeToggleLabel).toBe('Enable');
expect(vmX.nodeToggleLabel).toBe('Resume replication');
vmX.$destroy();
});
});
......@@ -74,7 +74,7 @@ describe('GeoNodeActionsComponent', () => {
expect(eventHub.$emit).toHaveBeenCalledWith('showNodeActionModal', {
actionType: NODE_ACTIONS.TOGGLE,
node: vm.node,
modalMessage: 'Disabling a node stops the sync process. Are you sure?',
modalMessage: 'Pausing replication stops the sync process.',
modalActionLabel: vm.nodeToggleLabel,
});
});
......
......@@ -5013,9 +5013,6 @@ msgstr ""
msgid "GeoNodes|Data replication lag"
msgstr ""
msgid "GeoNodes|Disabling a node stops the sync process. Are you sure?"
msgstr ""
msgid "GeoNodes|Does not match the primary storage configuration"
msgstr ""
......@@ -5082,6 +5079,9 @@ msgstr ""
msgid "GeoNodes|Out of sync"
msgstr ""
msgid "GeoNodes|Pausing replication stops the sync process."
msgstr ""
msgid "GeoNodes|Removing a primary node stops the sync process for all nodes. Syncing cannot be resumed without losing some data on all secondaries. In this case we would recommend setting up all nodes from scratch. Are you sure?"
msgstr ""
......@@ -7953,6 +7953,9 @@ msgstr ""
msgid "Pause"
msgstr ""
msgid "Pause replication"
msgstr ""
msgid "Paused Runners don't accept new jobs"
msgstr ""
......@@ -9444,6 +9447,9 @@ msgstr ""
msgid "Resume"
msgstr ""
msgid "Resume replication"
msgstr ""
msgid "Retry"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment