Replace custom parse-duration implementation with an existing lib

hashicorp · Jan 24, 2020 · 4793dc9 · 4793dc9
1 parent b9b6cda
commit 4793dc9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 184 deletions.
diff --git a/ui/app/components/drain-popover.js b/ui/app/components/drain-popover.js
@@ -3,7 +3,7 @@ import { computed } from '@ember/object';
 import { equal } from '@ember/object/computed';
 import { computed as overridable } from 'ember-overridable-computed';
 import { task } from 'ember-concurrency';
-import parseDuration from 'nomad-ui/utils/parse-duration';
+import Duration from 'duration-js';
 
 export default Component.extend({
   tagName: '',
@@ -53,9 +53,9 @@ export default Component.extend({
 
     let deadline;
     try {
-      deadline = parseDuration(this.deadline);
+      deadline = new Duration(this.deadline).nanoseconds();
     } catch (err) {
-      this.set('parseError', 'Failed to parse duration');
+      this.set('parseError', err.message);
       return;
     }
 

diff --git a/ui/app/utils/parse-duration.js b/ui/app/utils/parse-duration.js
diff --git a/ui/package.json b/ui/package.json
@@ -50,6 +50,7 @@
     "d3-shape": "^1.2.0",
     "d3-time-format": "^2.1.0",
     "d3-transition": "^1.1.0",
+    "duration-js": "^4.0.0",
     "ember-ajax": "^5.0.0",
     "ember-auto-import": "^1.2.21",
     "ember-can": "^2.0.0",

diff --git a/ui/tests/unit/utils/parse-duration-test.js b/ui/tests/unit/utils/parse-duration-test.js
diff --git a/ui/yarn.lock b/ui/yarn.lock
@@ -6375,6 +6375,11 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+duration-js@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/duration-js/-/duration-js-4.0.0.tgz#ab91575a4f1a6b096034685cfc6ea9aca99cd63f"
+  integrity sha1-q5FXWk8aawlgNGhc/G6prKmc1j8=
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"