diff --git a/package-lock.json b/package-lock.json index 4479160..41e6b9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5575,7 +5575,7 @@ }, "encoding": { "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "resolved": false, "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "requires": { "iconv-lite": "~0.4.13" @@ -11321,6 +11321,11 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" }, + "moment-duration-format": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz", + "integrity": "sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", diff --git a/package.json b/package.json index fccb600..9d6a6a4 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "libcimsvg": "git+https://git.rwth-aachen.de/acs/public/cim/pintura-npm-package.git", "lodash": "^4.17.20", "moment": "^2.29.1", + "moment-duration-format": "^2.3.2", "multiselect-react-dropdown": "^1.6.2", "node-sass": "^4.14.1", "popper.js": "^1.16.1", diff --git a/src/ic/ics.js b/src/ic/ics.js index 0056a5c..5614d8d 100644 --- a/src/ic/ics.js +++ b/src/ic/ics.js @@ -22,6 +22,7 @@ import FileSaver from 'file-saver'; import _ from 'lodash'; import moment from 'moment' + import AppDispatcher from '../common/app-dispatcher'; import InfrastructureComponentStore from './ic-store'; @@ -332,7 +333,11 @@ class InfrastructureComponents extends Component { modifyUptimeColumn(uptime, component){ if(uptime >= 0){ - return {uptime + "s"} + let momentDurationFormatSetup = require("moment-duration-format"); + momentDurationFormatSetup(moment) + + let timeString = moment.duration(uptime, "seconds").format(); + return {timeString} } else{ return Unknown