diff --git a/package-lock.json b/package-lock.json index 6e55b7a1..bfff9ca6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2174,12 +2174,12 @@ }, "@types/node": { "version": "8.9.5", - "resolved": "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==" }, "@types/q": { "version": "0.0.32", - "resolved": "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", + "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", "dev": true }, @@ -2461,7 +2461,7 @@ }, "adm-zip": { "version": "0.4.4", - "resolved": "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz", "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=", "dev": true }, @@ -2782,7 +2782,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -2809,7 +2809,7 @@ }, "async": { "version": "1.5.2", - "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" }, "async-array-reduce": { @@ -3844,7 +3844,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -3881,7 +3881,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -3936,7 +3936,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -4033,7 +4033,7 @@ }, "cacache": { "version": "10.0.4", - "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { @@ -4098,16 +4098,6 @@ "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=" }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "dev": true, - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, "camelcase": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", @@ -4115,7 +4105,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "optional": true, @@ -4940,7 +4930,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -4953,7 +4943,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -5360,7 +5350,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -5774,22 +5764,12 @@ }, "es6-promisify": { "version": "5.0.0", - "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "requires": { "es6-promise": "^4.0.3" } }, - "es6-templates": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz", - "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=", - "dev": true, - "requires": { - "recast": "~0.11.12", - "through": "~2.3.6" - } - }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -5941,7 +5921,7 @@ }, "expand-range": { "version": "0.1.1", - "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", "dev": true, "requires": { @@ -5973,7 +5953,7 @@ }, "expand-range": { "version": "1.8.2", - "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "requires": { "fill-range": "^2.1.0" @@ -6733,7 +6713,7 @@ }, "fs-access": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { @@ -7881,66 +7861,6 @@ "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", "dev": true }, - "html-loader": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.5.5.tgz", - "integrity": "sha512-7hIW7YinOYUpo//kSYcPB6dCKoceKLmOwjEMmhIobHuWGDVl0Nwe4l68mdG/Ru0wcUxQjVMEoZpkalZ/SE7zog==", - "dev": true, - "requires": { - "es6-templates": "^0.2.3", - "fastparse": "^1.1.1", - "html-minifier": "^3.5.8", - "loader-utils": "^1.1.0", - "object-assign": "^4.1.1" - } - }, - "html-minifier": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz", - "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==", - "dev": true, - "requires": { - "camel-case": "3.0.x", - "clean-css": "4.2.x", - "commander": "2.17.x", - "he": "1.2.x", - "param-case": "2.1.x", - "relateurl": "0.2.x", - "uglify-js": "3.4.x" - }, - "dependencies": { - "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", - "dev": true - }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, - "uglify-js": { - "version": "3.4.10", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", - "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==", - "dev": true, - "requires": { - "commander": "~2.19.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", - "dev": true - } - } - } - } - }, "http-cache-semantics": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", @@ -8003,7 +7923,7 @@ }, "http-proxy-middleware": { "version": "0.18.0", - "resolved": "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz", "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==", "dev": true, "requires": { @@ -9189,7 +9109,7 @@ }, "jasmine-core": { "version": "2.99.1", - "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=", "dev": true }, @@ -9257,7 +9177,7 @@ }, "jsesc": { "version": "1.3.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, @@ -9501,7 +9421,7 @@ }, "lodash": { "version": "3.10.1", - "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", "dev": true }, @@ -9671,7 +9591,7 @@ }, "karma-jasmine-html-reporter": { "version": "0.2.2", - "resolved": "http://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz", + "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz", "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=", "dev": true, "requires": { @@ -9847,7 +9767,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "requires": { "graceful-fs": "^4.1.2", @@ -10017,7 +9937,7 @@ }, "log4js": { "version": "0.6.38", - "resolved": "http://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", "dev": true, "requires": { @@ -10033,7 +9953,7 @@ }, "readable-stream": { "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { @@ -10045,13 +9965,13 @@ }, "semver": { "version": "4.3.6", - "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", "dev": true }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true } @@ -10107,12 +10027,6 @@ "signal-exit": "^3.0.0" } }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", - "dev": true - }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -10427,7 +10341,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { @@ -10452,7 +10366,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "optional": true, @@ -10672,7 +10586,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" @@ -10928,15 +10842,6 @@ } } }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "dev": true, - "requires": { - "lower-case": "^1.1.1" - } - }, "node-fetch-npm": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz", @@ -10977,7 +10882,7 @@ "dependencies": { "semver": { "version": "5.3.0", - "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true, "optional": true @@ -11878,12 +11783,12 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { "version": "1.4.0", - "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { "lcid": "^1.0.0" @@ -11905,7 +11810,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "osenv": { @@ -12177,15 +12082,6 @@ "readable-stream": "^2.1.5" } }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "dev": true, - "requires": { - "no-case": "^2.2.0" - } - }, "parse-asn1": { "version": "5.1.4", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", @@ -12316,7 +12212,7 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { @@ -12612,12 +12508,6 @@ "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -13061,7 +12951,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -13358,38 +13248,6 @@ } } }, - "recast": { - "version": "0.11.23", - "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz", - "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=", - "dev": true, - "requires": { - "ast-types": "0.9.6", - "esprima": "~3.1.0", - "private": "~0.1.5", - "source-map": "~0.5.0" - }, - "dependencies": { - "ast-types": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz", - "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=", - "dev": true - }, - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, "receptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/receptor/-/receptor-1.0.0.tgz", @@ -13484,13 +13342,13 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, "regjsparser": { "version": "0.1.5", - "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { @@ -13499,18 +13357,12 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } } }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", - "dev": true - }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -13753,7 +13605,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { "ret": "~0.1.10" @@ -13849,7 +13701,7 @@ }, "sax": { "version": "0.5.8", - "resolved": "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", "dev": true }, @@ -13877,7 +13729,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "optional": true, @@ -14136,7 +13988,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { @@ -15689,7 +15541,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" @@ -15697,7 +15549,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" @@ -15727,7 +15579,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, "strip-indent": { @@ -15785,7 +15637,7 @@ }, "source-map": { "version": "0.1.43", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { @@ -16107,7 +15959,7 @@ }, "through": { "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "through2": { @@ -16798,12 +16650,6 @@ } } }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", - "dev": true - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -17580,13 +17426,13 @@ "dependencies": { "sax": { "version": "0.6.1", - "resolved": "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=", "dev": true }, "selenium-webdriver": { "version": "2.53.3", - "resolved": "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz", "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=", "dev": true, "requires": { @@ -18805,7 +18651,7 @@ }, "wrap-ansi": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { "string-width": "^1.0.1", @@ -18869,7 +18715,7 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" }, "xmlhttprequest-ssl": { diff --git a/src/app/system-account/system-account-data/system-account.data.ts b/src/app/system-account/system-account-data/system-account.data.ts index 9069ea29..8ef2a355 100644 --- a/src/app/system-account/system-account-data/system-account.data.ts +++ b/src/app/system-account/system-account-data/system-account.data.ts @@ -2,65 +2,189 @@ import { SystemAccountData } from './system-account.model'; export let SystemAccountList: SystemAccountData[] = [ { - "status": "Active", - "id" : "00001", - "activeDate": "2019-10-12", - "expiresDate": "2020-10-12", - "info": { - "accountName": "MyCMS System One", - "systemDescription": "This is the contract writing system used by most of the agency.", - "systemNameAndVersion": "CMS Pro Version 4.3" + status: 'Active', + id : '00001', + activeDate: '2019-10-12', + expiresDate: '2020-10-12', + info: { + accountName: 'MyCMS System One', + systemDescription: 'This is the contract writing system used by most of the agency.', + systemNameAndVersion: 'CMS Pro Version 4.3' }, - "organization": { - "organizationName": "National Institute of Health", - "administrators": [ "Jonathan Morgan", "Alexandra Anthony" ], - "managers": [ "Stephanie Worthington", "Harrison Myers" ] + organization: { + organizationName: 'National Institute of Health', + administrators: [ 'Jonathan Morgan', 'Alexandra Anthony' ], + managers: [ 'Stephanie Worthington', 'Harrison Myers' ] }, - "permissions": { - "domains": [ + permissions: { + domains: [ { - "domainName": "Contract Opportunities", - "permissions": [ + domainName: 'Contract Opportunities', + permissions: [ { - "id": "read", - "label": "Read", - "hasAccess": true + id: 'read', + label: 'Read', + hasAccess: true } ] }, { - "domainName": "Contract Data", - "permissions": [ + domainName: 'Contract Data', + permissions: [ { - "id": "read", - "label": "Read", - "hasAccess": true + id: 'read', + label: 'Read', + hasAccess: true } ] }, { - "domainName": "Entity Information", - "permissions": [ + domainName: 'Entity Information', + permissions: [ { - "id": "read", - "label": "Read", - "hasAccess": true + id: 'read', + label: 'Read', + hasAccess: true } ] } ], - "overallFIPSLevel" : "Medium" + overallFIPSLevel : 'Medium' }, - "security": { - "ipAddress": "127.0.0.0", - "connectionType": "Web Services", - "physicalLocation": "This service is located at NIH Headquarters Building in Bethesda, MD", - "officialName": "Karen P. Jones", - "officialEmail": "karen.jones@hhs.gov" + security: { + ipAddress: '127.0.0.0', + connectionType: 'Web Services', + physicalLocation: 'This service is located at NIH Headquarters Building in Bethesda, MD', + officialName: 'Karen P. Jones', + officialEmail: 'karen.jones@hhs.gov' }, - "auth": { - "officialName": "Susan Alexander", - "authDate" : "2019-10-12" + auth: { + officialName: 'Susan Alexander', + authDate : '2019-10-12' } - } + }, + { + status: 'Draft', + id : '00002', + activeDate: '2019-10-12', + expiresDate: '2020-10-12', + info: { + accountName: 'MyCMS System Two', + systemDescription: 'This is the contract writing system used by most of the agency.', + systemNameAndVersion: 'CMS Pro Version 4.3' + }, + organization: { + organizationName: 'National Institute of Health', + administrators: [ 'Jonathan Morgan', 'Alexandra Anthony' ], + managers: [ 'Stephanie Worthington', 'Harrison Myers' ] + }, + permissions: { + domains: [ + { + domainName: 'Contract Opportunities', + permissions: [ + { + id: 'read', + label: 'Read', + hasAccess: true + } + ] + }, + { + domainName: 'Contract Data', + permissions: [ + { + id: 'read', + label: 'Read', + hasAccess: true + } + ] + }, + { + domainName: 'Entity Information', + permissions: [ + { + id: 'read', + label: 'Read', + hasAccess: true + } + ] + } + ], + overallFIPSLevel : 'Medium' + }, + security: { + ipAddress: '127.0.0.0', + connectionType: 'Web Services', + physicalLocation: 'This service is located at NIH Headquarters Building in Bethesda, MD', + officialName: 'Karen P. Jones', + officialEmail: 'karen.jones@hhs.gov' + }, + auth: { + officialName: 'Susan Alexander', + authDate : '2019-10-12' + } + }, + { + status: 'Pending', + id : '00002', + activeDate: '2019-10-12', + expiresDate: '2020-10-12', + info: { + accountName: 'MyCMS System Three', + systemDescription: 'This is the contract writing system used by most of the agency.', + systemNameAndVersion: 'CMS Pro Version 4.3' + }, + organization: { + organizationName: 'National Institute of Health', + administrators: [ 'Jonathan Morgan', 'Alexandra Anthony' ], + managers: [ 'Stephanie Worthington', 'Harrison Myers' ] + }, + permissions: { + domains: [ + { + domainName: 'Contract Opportunities', + permissions: [ + { + id: 'read', + label: 'Read', + hasAccess: true + } + ] + }, + { + domainName: 'Contract Data', + permissions: [ + { + id: 'read', + label: 'Read', + hasAccess: true + } + ] + }, + { + domainName: 'Entity Information', + permissions: [ + { + id: 'read', + label: 'Read', + hasAccess: true + } + ] + } + ], + overallFIPSLevel : 'Medium' + }, + security: { + ipAddress: '127.0.0.0', + connectionType: 'Web Services', + physicalLocation: 'This service is located at NIH Headquarters Building in Bethesda, MD', + officialName: 'Karen P. Jones', + officialEmail: 'karen.jones@hhs.gov' + }, + auth: { + officialName: 'Susan Alexander', + authDate : '2019-10-12' + } + } ]; \ No newline at end of file diff --git a/src/app/system-account/system-account.component.html b/src/app/system-account/system-account.component.html index a822943a..f24387d5 100644 --- a/src/app/system-account/system-account.component.html +++ b/src/app/system-account/system-account.component.html @@ -62,7 +62,8 @@

{{model.status}} - {{model.status}} + {{model.status}} + {{model.status}}
diff --git a/src/app/system-account/system-account.component.ts b/src/app/system-account/system-account.component.ts index 65a19af9..495e4c5c 100644 --- a/src/app/system-account/system-account.component.ts +++ b/src/app/system-account/system-account.component.ts @@ -4,8 +4,6 @@ import { SideNavigationModel, NavigationMode, INavigationLink } from '@gsa-sam/c import { SystemAccountDataService } from './system-account-data/system-account-data.service'; import { SystemAccountData } from './system-account-data/system-account.model'; -import { systemAccountsSideNavigationData } from './navigation.data'; - @Component({ selector: 'app-system-account', templateUrl: './system-account.component.html', @@ -14,7 +12,57 @@ import { systemAccountsSideNavigationData } from './navigation.data'; }) export class SystemAccountComponent implements OnInit { - sideNavModel: SideNavigationModel = systemAccountsSideNavigationData; + sideNavModel: SideNavigationModel = { + navigationLinks: [ + { + id: 'edit', text: 'Account Details', mode: NavigationMode.INTERNAL, route: 'review', children: [ + { + id: 'info', + // showFunction:this.isDraft.bind(this), + text: 'System Information', mode: NavigationMode.INTERNAL, route: 'info' + }, + { + id: 'organization', + // showFunction:this.isDraft.bind(this), + text: 'Organization', + // showFunction:this.isDraft.bind(this), + mode: NavigationMode.INTERNAL, route: 'organization' + }, + { + id: 'permissions', + // showFunction:this.isDraft.bind(this), + text: 'Permissions', mode: NavigationMode.INTERNAL, route: 'permissions' + }, + { + id: 'security', + // showFunction:this.isDraft.bind(this), + text: 'Security', mode: NavigationMode.INTERNAL, route: 'security' + }, + { + id: 'authorization', + // showFunction:this.isDraft.bind(this), + text: 'Authorization', mode: NavigationMode.INTERNAL, route: 'auth' + } + ] + }, + { + id: 'reset-password', + // showFunction:this.isDraft.bind(this), + text: 'Reset Password', + // showFunction:this.isNotDraft.bind(this), + mode: NavigationMode.INTERNAL, route: 'system-password' + }, + { + id: 'history', + // showFunction:this.isNotDraft.bind(this), + text: 'History', mode: NavigationMode.INTERNAL, route: 'history' + } + ] + }; + + + + model: SystemAccountData; public subheader = { @@ -27,16 +75,25 @@ export class SystemAccountComponent implements OnInit { ] }; - constructor(public service: SystemAccountDataService, private route: ActivatedRoute) { + constructor(public service: SystemAccountDataService, private route: ActivatedRoute) { } ngOnInit() { this.route.paramMap.subscribe(params => { - this.model = this.service.getAccount(params.get('id')); - this.service.setCurrentAccount(this.model); + this.model = this.service.getAccount(params.get('id')); + this.service.setCurrentAccount(this.model); }); } + + isDraft() { + return this.model.status === 'Draft'; + } + + isNotDraft() { + return !this.isDraft; + } + log(value) { console.log(`%cLog: ${value}`, 'color: blue; font-weight: bold'); } diff --git a/src/app/workspace/system-accounts-workspace/system-account-item/system-account-item.component.html b/src/app/workspace/system-accounts-workspace/system-account-item/system-account-item.component.html index 3e76e10e..c638f94a 100644 --- a/src/app/workspace/system-accounts-workspace/system-account-item/system-account-item.component.html +++ b/src/app/workspace/system-accounts-workspace/system-account-item/system-account-item.component.html @@ -30,6 +30,7 @@

{{model.status}} {{model.status}} + {{model.status}}
diff --git a/src/app/workspace/system-accounts-workspace/system-account-item/system-account-item.component.ts b/src/app/workspace/system-accounts-workspace/system-account-item/system-account-item.component.ts index 557d1494..84e6fc8e 100644 --- a/src/app/workspace/system-accounts-workspace/system-account-item/system-account-item.component.ts +++ b/src/app/workspace/system-accounts-workspace/system-account-item/system-account-item.component.ts @@ -1,5 +1,6 @@ -import { Component, OnInit, Input, ChangeDetectionStrategy } from '@angular/core'; +import { Component, OnInit, AfterContentInit, Input, ChangeDetectionStrategy } from '@angular/core'; import { SystemAccountData } from '../../../system-account/system-account-data/system-account.model'; +import { ThisSiteModule } from 'src/app/about/this-site/this-site.module'; @Component({ selector: 'system-account-item', @@ -7,21 +8,39 @@ import { SystemAccountData } from '../../../system-account/system-account-data/s styleUrls: ['./system-account-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class SystemAccountItemComponent implements OnInit { +export class SystemAccountItemComponent implements OnInit, AfterContentInit { + @Input() model: SystemAccountData; menu = { trigger: 'primary', actions: [ - { id: 'ViewBtn', icon: 'bars', text: 'View' }, - { id: 'UpdateBtn', icon: 'bars', text: 'Update' }, - { id: 'DeactivateBtn', icon: 'bars', text: 'Deactivate' } + { id: 'ViewBtn', icon: 'bars', text: 'View' } + ] }; ngOnInit() { - + + } + + ngAfterContentInit(): void { + switch (this.model.status) { + case 'Draft': + this.menu.actions.push({ id: 'deleteBtn', icon: 'bars', text: 'Delete Draft' }); + this.menu.actions.push({ id: 'submitBtn', icon: 'bars', text: 'Submit' }); + break; + case 'Active': + this.menu.actions.push({ id: 'updateBtn', icon: 'bars', text: 'Update' }); + this.menu.actions.push({ id: 'dactivateBtn', icon: 'bars', text: 'Deactivate' }); + break; + case 'Pending': + this.menu.actions.push({ id: 'cancelBtn', icon: 'bars', text: 'Cancel' }); + break; + default: + + } } log(value) {