Skip to content

G
gitlab-ce
Commit 65ec1f17 authored by Zack Cuddy's avatar Zack Cuddy
Browse files
Options

Changes based on @mlunoe feedback 

Abstract some logic to child component.
Fix translations
Clean up extendWrapper madness.
Prop cleanup.
parent 0a428380
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 154 deletions
ee/app/assets/javascripts/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts.vue
View file @ 65ec1f17
<script> <script>
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { REPOSITORY, BLOB } from 'ee/geo_nodes_beta/constants'; import { REPOSITORY, BLOB } from 'ee/geo_nodes_beta/constants';
import { roundDownFloat } from '~/lib/utils/common_utils';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import GeoNodeReplicationSyncPercentage from './geo_node_replication_sync_percentage.vue';
export default { export default {
name: 'GeoNodeReplicationCounts', name: 'GeoNodeReplicationCounts',
...@@ -10,71 +10,44 @@ export default { ...@@ -10,71 +10,44 @@ export default {
dataType: s__('Geo|Data type'), dataType: s__('Geo|Data type'),
synchronization: s__('Geo|Synchronization'), synchronization: s__('Geo|Synchronization'),
verification: s__('Geo|Verification'), verification: s__('Geo|Verification'),
nA: __('N/A'), git: __('Git'),
git: s__('Geo|Git'), file: __('File'),
file: s__('Git|File'), },
components: {
GeoNodeReplicationSyncPercentage,
}, },
props: { props: {
node: { nodeId: {
type: Object, type: Number,
required: true, required: true,
}, },
}, },
computed: { computed: {
...mapGetters(['verificationInfo', 'syncInfo']), ...mapGetters(['verificationInfo', 'syncInfo']),
replicationOverview() { replicationOverview() {
const syncInfoData = this.syncInfo(this.node.id); const syncInfoData = this.syncInfo(this.nodeId);
const verificationInfoData = this.verificationInfo(this.node.id); const verificationInfoData = this.verificationInfo(this.nodeId);
const overview = [ return [
{ {
title: this.$options.i18n.git, title: this.$options.i18n.git,
sync: syncInfoData.filter((replicable) => replicable.dataType === REPOSITORY), sync: syncInfoData
verification: verificationInfoData.filter( .filter((replicable) => replicable.dataType === REPOSITORY)
(replicable) => replicable.dataType === REPOSITORY, .map((d) => d.values),
), verification: verificationInfoData
.filter((replicable) => replicable.dataType === REPOSITORY)
.map((d) => d.values),
}, },
{ {
title: this.$options.i18n.file, title: this.$options.i18n.file,
sync: syncInfoData.filter((replicable) => replicable.dataType === BLOB), sync: syncInfoData
verification: verificationInfoData.filter((replicable) => replicable.dataType === BLOB), .filter((replicable) => replicable.dataType === BLOB)
.map((d) => d.values),
verification: verificationInfoData
.filter((replicable) => replicable.dataType === BLOB)
.map((d) => d.values),
}, },
]; ];
return overview.map((type) => {
return {
title: type.title,
synchronizationPercent: this.getPercent(type.sync),
verificationPercent: this.getPercent(type.verification),
};
});
},
},
methods: {
getPercent(type) {
// If no data at all, handle as N/A
if (!type.length) {
return null;
}
const total = type.map((t) => t.values.total).reduce((a, b) => a + b);
const success = type.map((t) => t.values.success).reduce((a, b) => a + b);
const percent = roundDownFloat((success / total) * 100, 1);
if (percent > 0 && percent < 1) {
// Special case for very small numbers
return '< 1';
}
// If total/success has any null values it will return NaN, lets render N/A for this case too.
return Number.isNaN(percent) ? null : percent;
},
percentColor(value) {
if (value === null) {
return 'gl-bg-gray-200';
}
return value === 100 ? 'gl-bg-green-500' : 'gl-bg-red-500';
}, },
}, },
}; };
...@@ -94,29 +67,8 @@ export default { ...@@ -94,29 +67,8 @@ export default {
data-testid="replication-type" data-testid="replication-type"
> >
<span class="gl-flex-fill-1" data-testid="replicable-title">{{ type.title }}</span> <span class="gl-flex-fill-1" data-testid="replicable-title">{{ type.title }}</span>
<div class="gl-display-flex gl-align-items-center gl-flex-fill-1" data-testid="sync-data"> <geo-node-replication-sync-percentage :values="type.sync" />
<div <geo-node-replication-sync-percentage :values="type.verification" />
:class="percentColor(type.synchronizationPercent)"
class="gl-rounded-full gl-w-3 gl-h-3 gl-mr-2"
></div>
<span class="gl-font-weight-bold">{{
type.synchronizationPercent === null
? $options.i18n.nA
: `${type.synchronizationPercent}%`
}}</span>
</div>
<div
class="gl-display-flex gl-align-items-center gl-flex-fill-1"
data-testid="verification-data"
>
<div
:class="percentColor(type.verificationPercent)"
class="gl-rounded-full gl-w-3 gl-h-3 gl-mr-2"
></div>
<span class="gl-font-weight-bold">{{
type.verificationPercent === null ? $options.i18n.nA : `${type.verificationPercent}%`
}}</span>
</div>
</div> </div>
</div> </div>
</template> </template>
ee/app/assets/javascripts/geo_nodes_beta/components/details/secondary_node/geo_node_replication_summary.vue
View file @ 65ec1f17
...@@ -50,6 +50,6 @@ export default { ...@@ -50,6 +50,6 @@ export default {
<span>{{ $options.i18n.syncSettings }}</span> <span>{{ $options.i18n.syncSettings }}</span>
<geo-node-sync-settings class="gl-mt-2" :node="node" /> <geo-node-sync-settings class="gl-mt-2" :node="node" />
</div> </div>
<geo-node-replication-counts :node="node" class="gl-mb-5" /> <geo-node-replication-counts :node-id="node.id" class="gl-mb-5" />
</gl-card> </gl-card>
</template> </template>
ee/app/assets/javascripts/geo_nodes_beta/components/details/secondary_node/geo_node_replication_sync_percentage.vue 0 → 100644
View file @ 65ec1f17
<script>
import { roundDownFloat } from '~/lib/utils/common_utils';
import { __ } from '~/locale';
export default {
name: 'GeoNodeReplicationSyncPercentage',
i18n: {
nA: __('N/A'),
},
props: {
values: {
type: Array,
required: false,
default: () => [],
},
},
computed: {
percent() {
if (!this.values.length) {
return null;
}
const total = this.values.map((v) => v.total).reduce((a, b) => a + b);
const success = this.values.map((v) => v.success).reduce((a, b) => a + b);
const percent = roundDownFloat((success / total) * 100, 1);
if (percent > 0 && percent < 1) {
// Special case for very small numbers
return '< 1';
}
// If total/success has any null values it will return NaN, lets render N/A for this case too.
return Number.isNaN(percent) ? null : percent;
},
percentColor() {
if (this.percent === null) {
return 'gl-bg-gray-200';
}
return this.percent === 100 ? 'gl-bg-green-500' : 'gl-bg-red-500';
},
},
};
</script>
<template>
<div class="gl-display-flex gl-align-items-center gl-flex-fill-1">
<div :class="percentColor" class="gl-rounded-full gl-w-3 gl-h-3 gl-mr-2"></div>
<span class="gl-font-weight-bold">
{{ percent === null ? $options.i18n.nA : `${percent}%` }}
</span>
</div>
</template>
ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts_spec.js
View file @ 65ec1f17
...@@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils'; ...@@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import GeoNodeReplicationCounts from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts.vue'; import GeoNodeReplicationCounts from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_counts.vue';
import GeoNodeReplicationSyncPercentage from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_sync_percentage.vue';
import { REPOSITORY, BLOB } from 'ee/geo_nodes_beta/constants'; import { REPOSITORY, BLOB } from 'ee/geo_nodes_beta/constants';
import { import {
MOCK_NODES, MOCK_NODES,
...@@ -16,7 +17,7 @@ describe('GeoNodeReplicationCounts', () => { ...@@ -16,7 +17,7 @@ describe('GeoNodeReplicationCounts', () => {
let wrapper; let wrapper;
const defaultProps = { const defaultProps = {
node: MOCK_NODES[1], nodeId: MOCK_NODES[1].id,
}; };
const createComponent = (props, getters) => { const createComponent = (props, getters) => {
...@@ -45,11 +46,9 @@ describe('GeoNodeReplicationCounts', () => { ...@@ -45,11 +46,9 @@ describe('GeoNodeReplicationCounts', () => {
const findReplicationTypeSections = () => wrapper.findAllByTestId('replication-type'); const findReplicationTypeSections = () => wrapper.findAllByTestId('replication-type');
const findReplicationTypeSectionTitles = () => const findReplicationTypeSectionTitles = () =>
findReplicationTypeSections().wrappers.map((w) => findReplicationTypeSections().wrappers.map((w) => w.text());
extendedWrapper(w).findByTestId('replicable-title').text(), const findGeoNodeReplicationSyncPercentage = () =>
); wrapper.findAllComponents(GeoNodeReplicationSyncPercentage);
const findReplicationTypeSyncData = () => wrapper.findAllByTestId('sync-data');
const findReplicationTypeVerificationData = () => wrapper.findAllByTestId('verification-data');
describe('template', () => { describe('template', () => {
describe('always', () => { describe('always', () => {
...@@ -62,85 +61,27 @@ describe('GeoNodeReplicationCounts', () => { ...@@ -62,85 +61,27 @@ describe('GeoNodeReplicationCounts', () => {
expect(findReplicationTypeSectionTitles()).toStrictEqual(['Git', 'File']); expect(findReplicationTypeSectionTitles()).toStrictEqual(['Git', 'File']);
}); });
it('renders a sync section for Git and File', () => { it('renders a sync and verification section for Git and File', () => {
expect(findReplicationTypeSyncData()).toHaveLength(2); expect(findGeoNodeReplicationSyncPercentage()).toHaveLength(4);
});
it('renders a verification section for Git and File', () => {
expect(findReplicationTypeVerificationData()).toHaveLength(2);
}); });
}); });
describe.each` describe.each`
description | mockGetterData | expectedUI description | mockGetterData | expectedData
${'with no data'} | ${[]} | ${{ GIT: { color: 'gl-bg-gray-200', text: 'N/A' }, FILE: { color: 'gl-bg-gray-200', text: 'N/A' } }} ${'with no data'} | ${[]} | ${[{ title: 'Git', sync: [], verification: [] }, { title: 'File', sync: [], verification: [] }]}
${'with no File data'} | ${[{ dataType: REPOSITORY, values: { total: 100, success: 0 } }]} | ${{ GIT: { color: 'gl-bg-red-500', text: '0%' }, FILE: { color: 'gl-bg-gray-200', text: 'N/A' } }} ${'with no File data'} | ${[{ dataType: REPOSITORY, values: { total: 100, success: 0 } }]} | ${[{ title: 'Git', sync: [{ total: 100, success: 0 }], verification: [{ total: 100, success: 0 }] }, { title: 'File', sync: [], verification: [] }]}
${'with no Git data'} | ${[{ dataType: BLOB, values: { total: 100, success: 100 } }]} | ${{ GIT: { color: 'gl-bg-gray-200', text: 'N/A' }, FILE: { color: 'gl-bg-green-500', text: '100%' } }} ${'with no Git data'} | ${[{ dataType: BLOB, values: { total: 100, success: 100 } }]} | ${[{ title: 'Git', sync: [], verification: [] }, { title: 'File', sync: [{ total: 100, success: 100 }], verification: [{ total: 100, success: 100 }] }]}
${'with all data'} | ${[{ dataType: REPOSITORY, values: { total: 100, success: 0 } }, { dataType: BLOB, values: { total: 100, success: 100 } }]} | ${{ GIT: { color: 'gl-bg-red-500', text: '0%' }, FILE: { color: 'gl-bg-green-500', text: '100%' } }} ${'with all data'} | ${[{ dataType: REPOSITORY, values: { total: 100, success: 0 } }, { dataType: BLOB, values: { total: 100, success: 100 } }]} | ${[{ title: 'Git', sync: [{ total: 100, success: 0 }], verification: [{ total: 100, success: 0 }] }, { title: 'File', sync: [{ total: 100, success: 100 }], verification: [{ total: 100, success: 100 }] }]}
${'with malformed data'} | ${[{ dataType: REPOSITORY, values: { total: null, success: 0 } }]} | ${{ GIT: { color: 'gl-bg-gray-200', text: 'N/A' }, FILE: { color: 'gl-bg-gray-200', text: 'N/A' } }} `('replicationOverview $description', ({ mockGetterData, expectedData }) => {
${'with very small data'} | ${[{ dataType: REPOSITORY, values: { total: 1000, success: 1 } }]} | ${{ GIT: { color: 'gl-bg-red-500', text: '< 1%' }, FILE: { color: 'gl-bg-gray-200', text: 'N/A' } }}
`(`percentages`, ({ description, mockGetterData, expectedUI }) => {
const gitReplicationSection = {};
const fileReplicationSection = {};
beforeEach(() => { beforeEach(() => {
createComponent(null, { createComponent(null, {
syncInfo: () => () => mockGetterData, syncInfo: () => () => mockGetterData,
verificationInfo: () => () => mockGetterData, verificationInfo: () => () => mockGetterData,
}); });
gitReplicationSection.syncData = extendedWrapper(
findReplicationTypeSections().at(0),
).findByTestId('sync-data');
gitReplicationSection.verificationData = extendedWrapper(
findReplicationTypeSections().at(0),
).findByTestId('verification-data');
fileReplicationSection.syncData = extendedWrapper(
findReplicationTypeSections().at(1),
).findByTestId('sync-data');
fileReplicationSection.verificationData = extendedWrapper(
findReplicationTypeSections().at(1),
).findByTestId('verification-data');
}); });
describe(`Git section ${description}`, () => { it('creates the correct array', () => {
it('renders the correct sync data percentage color and text', () => { expect(wrapper.vm.replicationOverview).toStrictEqual(expectedData);
expect(
gitReplicationSection.syncData.find('.gl-rounded-full').classes(expectedUI.GIT.color),
).toBe(true);
expect(gitReplicationSection.syncData.find('span').text()).toBe(expectedUI.GIT.text);
});
it('renders the correct verification data percentage color and text', () => {
expect(
gitReplicationSection.verificationData
.find('.gl-rounded-full')
.classes(expectedUI.GIT.color),
).toBe(true);
expect(gitReplicationSection.verificationData.find('span').text()).toBe(
expectedUI.GIT.text,
);
});
});
describe(`File section ${description}`, () => {
it('renders the correct sync data percentage color and text', () => {
expect(
fileReplicationSection.syncData.find('.gl-rounded-full').classes(expectedUI.FILE.color),
).toBe(true);
expect(fileReplicationSection.syncData.find('span').text()).toBe(expectedUI.FILE.text);
});
it('renders the correct verification data percentage color and text', () => {
expect(
fileReplicationSection.verificationData
.find('.gl-rounded-full')
.classes(expectedUI.FILE.color),
).toBe(true);
expect(fileReplicationSection.verificationData.find('span').text()).toBe(
expectedUI.FILE.text,
);
});
}); });
}); });
}); });
......
ee/spec/frontend/geo_nodes_beta/components/details/secondary_node/geo_node_replication_sync_percentage_spec.js 0 → 100644
View file @ 65ec1f17
import { shallowMount } from '@vue/test-utils';
import GeoNodeReplicationSyncPercentage from 'ee/geo_nodes_beta/components/details/secondary_node/geo_node_replication_sync_percentage.vue';
describe('GeoNodeReplicationSyncPercentage', () => {
let wrapper;
const defaultProps = {
values: [],
};
const createComponent = (props) => {
wrapper = shallowMount(GeoNodeReplicationSyncPercentage, {
propsData: {
...defaultProps,
...props,
},
});
};
afterEach(() => {
wrapper.destroy();
});
const findPercentageIndicator = () => wrapper.find('.gl-rounded-full');
const findPercentage = () => wrapper.find('span');
describe('template', () => {
describe('always', () => {
beforeEach(() => {
createComponent();
});
it('renders the percentage indicator', () => {
expect(findPercentageIndicator().exists()).toBe(true);
});
it('renders the percentage number', () => {
expect(findPercentage().exists()).toBe(true);
});
});
describe.each`
description | values | expectedColor | expectedText
${'with no data'} | ${[]} | ${'gl-bg-gray-200'} | ${'N/A'}
${'with all success'} | ${[{ total: 100, success: 100 }]} | ${'gl-bg-green-500'} | ${'100%'}
${'with all failure'} | ${[{ total: 100, success: 0 }]} | ${'gl-bg-red-500'} | ${'0%'}
${'with multiple data'} | ${[{ total: 100, success: 100 }, { total: 100, success: 0 }]} | ${'gl-bg-red-500'} | ${'50%'}
${'with malformed data'} | ${[{ total: null, success: 0 }]} | ${'gl-bg-gray-200'} | ${'N/A'}
${'with very small data'} | ${[{ total: 1000, success: 1 }]} | ${'gl-bg-red-500'} | ${'< 1%'}
`('conditionally $description', ({ values, expectedColor, expectedText }) => {
beforeEach(() => {
createComponent({ values });
});
it('renders the correct percentage color', () => {
expect(findPercentageIndicator().classes(expectedColor)).toBe(true);
});
it('renders the correct percentage text', () => {
expect(findPercentage().text()).toBe(expectedText);
});
});
});
});
locale/gitlab.pot
View file @ 65ec1f17
...@@ -14314,9 +14314,6 @@ msgstr "" ...@@ -14314,9 +14314,6 @@ msgstr ""
msgid "Geo|Geo sites" msgid "Geo|Geo sites"
msgstr "" msgstr ""
msgid "Geo|Git"
msgstr ""
msgid "Geo|Go to the primary site" msgid "Geo|Go to the primary site"
msgstr "" msgstr ""
...@@ -14878,9 +14875,6 @@ msgstr "" ...@@ -14878,9 +14875,6 @@ msgstr ""
msgid "Gitpod|e.g. https://gitpod.example.com" msgid "Gitpod|e.g. https://gitpod.example.com"
msgstr "" msgstr ""
msgid "Git|File"
msgstr ""
msgid "Given access %{time_ago}" msgid "Given access %{time_ago}"
msgstr "" 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7