Merge pull request #1110 from johankwarnmarksymphony/sda-2270

chore: SDA-2270: change clientVersion to sbeVersion
This commit is contained in:
Johan Kwarnmark 2020-11-12 18:23:04 +01:00 committed by GitHub
commit 18e4b79f8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -6,13 +6,13 @@ import { ipcRenderer, remote } from './__mocks__/electron';
describe('about app', () => { describe('about app', () => {
const aboutAppDataLabel = 'about-app-data'; const aboutAppDataLabel = 'about-app-data';
const aboutDataMock = { const aboutDataMock = {
sbeVersion: '1',
userConfig: {}, userConfig: {},
globalConfig: {}, globalConfig: {},
cloudConfig: {}, cloudConfig: {},
finalConfig: {}, finalConfig: {},
appName: 'Symphony', appName: 'Symphony',
versionLocalised: 'Version', versionLocalised: 'Version',
clientVersion: '1',
buildNumber: '4.x.x', buildNumber: '4.x.x',
hostname: 'N/A', hostname: 'N/A',
sfeVersion: 'N/A', sfeVersion: 'N/A',

View File

@ -1,7 +1,6 @@
import { ipcRenderer, remote } from 'electron'; import { ipcRenderer, remote } from 'electron';
import * as React from 'react'; import * as React from 'react';
import { i18n } from '../../common/i18n-preload'; import { i18n } from '../../common/i18n-preload';
interface IState { interface IState {
userConfig: object; userConfig: object;
globalConfig: object; globalConfig: object;
@ -131,7 +130,8 @@ export default class AboutApp extends React.Component<{}, IState> {
* Copies the version info on to the clipboard * Copies the version info on to the clipboard
*/ */
public copy(): void { public copy(): void {
const data = this.state; const { clientVersion, ...rest } = this.state;
const data = { ...{ sbeVersion: clientVersion }, ...rest };
if (data) { if (data) {
remote.clipboard.write({ text: JSON.stringify(data, null, 4) }, 'clipboard'); remote.clipboard.write({ text: JSON.stringify(data, null, 4) }, 'clipboard');
} }