Commit efd8cff2 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'sh-fix-geo-node-status-lies' into 'master'

Remove the incorrect "events behind" text in Geo admin screen

Closes #5827

See merge request gitlab-org/gitlab-ee!5648
parents ec71b136 5f9c2576
<script>
import { s__, sprintf } from '~/locale';
import { formatDate } from '~/lib/utils/datetime_utility';
import timeAgoMixin from '~/vue_shared/mixins/timeago';
import tooltip from '~/vue_shared/directives/tooltip';
......@@ -35,11 +34,6 @@
return formatDate(this.timeStamp);
},
eventString() {
if (this.eventTypeLogStatus) {
return sprintf(s__('GeoNodes|%{eventId} events behind'), {
eventId: this.eventId,
});
}
return this.eventId;
},
},
......
......@@ -65,7 +65,7 @@
customType: CUSTOM_TYPE.EVENT,
},
{
itemTitle: s__('GeoNodes|Latest event log status'),
itemTitle: s__('GeoNodes|Last event ID processed by cursor'),
itemValue: this.cursorLastEventStatus(),
itemValueType: VALUE_TYPE.CUSTOM,
customType: CUSTOM_TYPE.EVENT,
......
......@@ -2428,7 +2428,7 @@ msgstr ""
msgid "GeoNodeSyncStatus|Node is slow, overloaded, or it just recovered after an outage."
msgstr ""
msgid "GeoNodes|%{eventId} events behind"
msgid "GeoNodes|%{eventId}"
msgstr ""
msgid "GeoNodes|Checksummed"
......@@ -2461,7 +2461,7 @@ msgstr ""
msgid "GeoNodes|Last event ID seen from primary"
msgstr ""
msgid "GeoNodes|Latest event log status"
msgid "GeoNodes|Last event ID processed by cursor"
msgstr ""
msgid "GeoNodes|Learn more about Repository checksum progress"
......
......@@ -45,7 +45,7 @@ describe('GeoNodeEventStatus', () => {
describe('eventString', () => {
it('returns computed event string when `eventTypeLogStatus` prop is true', () => {
const vmWithLogStatus = createComponent({ eventTypeLogStatus: true });
expect(vmWithLogStatus.eventString).toBe(`${mockNodeDetails.lastEvent.id} events behind`);
expect(vmWithLogStatus.eventString).toBe(mockNodeDetails.lastEvent.id);
vmWithLogStatus.$destroy();
});
......
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