diff --git a/package-lock.json b/package-lock.json index 256a5da..94feac1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ucentral-client", - "version": "2.7.0(6)", + "version": "2.7.0(7)", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ucentral-client", - "version": "2.7.0(6)", + "version": "2.7.0(7)", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/package.json b/package.json index 3062dc3..ea4dc96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucentral-client", - "version": "2.7.0(6)", + "version": "2.7.0(7)", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/src/components/CommandHistory/index.js b/src/components/CommandHistory/index.js index 6075518..272d682 100644 --- a/src/components/CommandHistory/index.js +++ b/src/components/CommandHistory/index.js @@ -205,10 +205,11 @@ const DeviceCommands = () => { const columns = [ { key: 'submitted', label: t('common.submitted'), filter: false, _style: { width: '20%' } }, - { key: 'command', label: t('common.command'), _style: { width: '15%' } }, + { key: 'command', label: t('common.command'), _style: { width: '0%' } }, + { key: 'status', label: t('common.status'), _style: { width: '0%' } }, { key: 'executed', label: t('common.executed'), filter: false, _style: { width: '16%' } }, { key: 'completed', label: t('common.completed'), filter: false, _style: { width: '16%' } }, - { key: 'errorCode', label: t('common.error_code'), filter: false, _style: { width: '8%' } }, + { key: 'errorCode', label: t('common.error_code'), filter: false }, { key: 'show_buttons', label: '', @@ -317,16 +318,17 @@ const DeviceCommands = () => { {item.completed && item.completed !== 0 ? ( ) : ( - 'Pending' + '-' )} ), + status: (item) => {item.status}, executed: (item) => ( {item.executed && item.executed !== 0 ? ( ) : ( - 'Pending' + '-' )} ), @@ -335,7 +337,7 @@ const DeviceCommands = () => { {item.submitted && item.submitted !== '' ? ( ) : ( - 'Pending' + '-' )} ),