You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/11/05 12:58:17 UTC
[incubator-datalab] branch DATALAB-2123 updated: [DATALAB-2123]:
Update angular
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2123
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2123 by this push:
new 05485e4 [DATALAB-2123]: Update angular
05485e4 is described below
commit 05485e4e6c9eb75a363f5ef89535aa7d3c2678be
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Nov 5 14:57:30 2020 +0200
[DATALAB-2123]: Update angular
---
.../src/main/resources/webapp/package-lock.json | 179 +++++++++++----------
.../src/main/resources/webapp/package.json | 3 +-
.../src/app/core/services/localization.service.ts | 6 +-
.../audit-toolbar/audit-toolbar.component.html | 2 +-
.../audit/audit-toolbar/audit-toolbar.component.ts | 34 ++--
.../webapp/src/app/reports/audit/audit.module.ts | 4 +-
.../src/app/reports/reporting/reporting.module.ts | 5 +-
.../reporting/toolbar/toolbar.component.html | 2 +-
.../reports/reporting/toolbar/toolbar.component.ts | 22 +--
.../app/resources/scheduler/scheduler.component.ts | 74 +++++----
10 files changed, 172 insertions(+), 159 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/package-lock.json b/services/self-service/src/main/resources/webapp/package-lock.json
index 2736e9a..a4d8a2f 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -312,9 +312,9 @@
}
},
"@angular/animations": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.2.1.tgz",
- "integrity": "sha512-WD3WGMLhGdvmBNIf9l+H3NwniQr+yBnTEOyUnsOokXsX3I5LYYPCR+3E/YBRDbbBuf4Y3v3sEkijHT5xZ+jQHw==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.2.2.tgz",
+ "integrity": "sha512-vxDbDeGggYeK5YXuBrzeZEO4nrZoQlJfgdUBGPNJmz97ZgX0sgjbmt3y/S7qupHNwdV4QExkaXRlGk0wcYuEqQ==",
"requires": {
"tslib": "^2.0.0"
},
@@ -400,9 +400,9 @@
}
},
"@angular/common": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.2.1.tgz",
- "integrity": "sha512-aJtgokgWxibd7wGmktHm0uYkR/lOrbcStrn6Qisj/PIJf9xTGXYFB0yusnk103aiuBfCIKq+Wl0ZGc1s81Okaw==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.2.2.tgz",
+ "integrity": "sha512-iV5kTGg7Xe79iih0RzulNFgDhyCgqpf0GC9MsWm663sYfeKaGmO0++O4FKCahE4N/++7thRMFgXy9PpSYDrFfg==",
"requires": {
"tslib": "^2.0.0"
},
@@ -415,9 +415,9 @@
}
},
"@angular/compiler": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.2.1.tgz",
- "integrity": "sha512-nJkRSqwQSGeudBWr9JK30Yi2yBvURYTKW4x4GxdW3YiEGBIlKU6aX6q5yi2xHdWO4AEgRs21ZjTs/wp00qnqTg==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.2.2.tgz",
+ "integrity": "sha512-62wb/aj8ORaUyVcI6cxf07gBc3/hb+bVGl9Yni51e8//G2W7gleyQAXtIeZsT9NHi0KX1nKdXvUVwAoq4u7eHw==",
"requires": {
"tslib": "^2.0.0"
},
@@ -430,9 +430,9 @@
}
},
"@angular/compiler-cli": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.2.1.tgz",
- "integrity": "sha512-LSqnJ6K6lZCMrlp47SMysHwyl4NOcOAhnZ1x4aqX85w/rBL5ge1Y57KFZFJ4wYVnboXpQCnPU/uojNuQIQJ8LQ==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.2.2.tgz",
+ "integrity": "sha512-Erbb7Rs5fo+7/gG1WPwtO5UfSq8qtBBucGu9da/HQLJdw5AO/5pKRl4PLQlxjSopsb8eRC+yVpt9OlCYaY2Chg==",
"dev": true,
"requires": {
"canonical-path": "1.0.0",
@@ -471,9 +471,9 @@
}
},
"@angular/core": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.2.1.tgz",
- "integrity": "sha512-zt9G5Ei1nxB6yVJqpiH7K6npaiEUrPWlDCq6vwXeJbmO3tbw2WWiqD55Wkx5hRfysY43swC5j7VveNytHidkkQ==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.2.2.tgz",
+ "integrity": "sha512-9IHZF4/zcCKCLGzsbaUeNE8V+R9kcCu0ZNXvqkxd1+vTPdcf00185KzD6CAm+OiskLwvmrudh4vh0CQ+JHSTtQ==",
"requires": {
"tslib": "^2.0.0"
},
@@ -486,9 +486,9 @@
}
},
"@angular/forms": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.2.1.tgz",
- "integrity": "sha512-cGJZRb/caqHeNLpl/f4uFUtCxF8hc1Jd1dkDzfxG3Ea3J96qNsApxWCdwI09aI6KyYADSvQKTjZcgdASmTr/cA==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.2.2.tgz",
+ "integrity": "sha512-ATPMEvM1I/oEXn24qyHpgihYsXrXqnBXJkIGMFb4Tty2ay9xWDtV9aDknvd/7In1/SbHwcSdwhfJJ43apDB6yg==",
"requires": {
"tslib": "^2.0.0"
},
@@ -501,9 +501,9 @@
}
},
"@angular/localize": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-10.2.1.tgz",
- "integrity": "sha512-Imi5xFlML/D9D9lx4p1IjzFzFFtew65M78QobMpxWGXb1X5K9gy0b9OaNKJVPaitnnMkuhFJICvC1WQYatwShA==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-10.2.2.tgz",
+ "integrity": "sha512-QZSr0CNurtZYcmm15sIIcTiX2x3eewEQHyYv8+wxB8sw4qtTPR3OiQM/99ndyfNrhhQKWeq2qFxcp5sgUCFW5g==",
"requires": {
"@babel/core": "7.8.3",
"glob": "7.1.2",
@@ -541,9 +541,9 @@
}
},
"@angular/platform-browser": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.2.1.tgz",
- "integrity": "sha512-kuxqntIbiyxHIgEopBXoO10HqsFQyzV8Y11+KcnIFN0tte7oOAc6REvUxnvtwKOyFOyYQFv0BhA1QCuddqytGA==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.2.2.tgz",
+ "integrity": "sha512-vxUKppRS5rIytzp8rV7pcqobopqBqSpXd5Rv/C5yVU9fTqg/hxbMPF8fRDITRqhArtuT7iT3Vv3TK+whqXTyNQ==",
"requires": {
"tslib": "^2.0.0"
},
@@ -556,9 +556,9 @@
}
},
"@angular/platform-browser-dynamic": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.2.1.tgz",
- "integrity": "sha512-AyN3dchRIHTXrN8lSni7PfZTHuJcQ4Qp3ZCunxal3dmfIqWKHBCvotJX02UXVPqVC/9qvnyZ1Ezvfw5vx8MVEg==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.2.2.tgz",
+ "integrity": "sha512-+Py/UhIOjsGvOozUFrCS/roAXLwSoE+moiJIxZkMrVVaRx/72P91bF3Zd17kYiXUGyEe7Im5NpXzWeK6y16oRg==",
"requires": {
"tslib": "^2.0.0"
},
@@ -571,9 +571,9 @@
}
},
"@angular/platform-server": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-10.2.1.tgz",
- "integrity": "sha512-VCpd2KEyGA4zhw8E82jJb19VsKVhPiogRaHNZ7xNiMYxu3JTFIDGMnTsT3nILGAKeDxQUeyU0oyguQfXPz4wag==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-10.2.2.tgz",
+ "integrity": "sha512-k8rHF7+jP2anICYoGRX/PGL++/1mNQBmG/kFprtYX6KGqLLoDGrfOp+atHtZIWtFclTuVKq9Xip1uiBwoGz64Q==",
"requires": {
"domino": "^2.1.2",
"tslib": "^2.0.0",
@@ -588,9 +588,9 @@
}
},
"@angular/router": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.2.1.tgz",
- "integrity": "sha512-w2iS/gq4dcPd4cPGgd7HGEANg5BfE+fg0cI81ah7e79OatDP+Y1atxmNXyF50gCxl8x6WDnUiNu8nfjTebgRAw==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.2.2.tgz",
+ "integrity": "sha512-jskLB4B3ccJS9YUFGgrR8JC6Ae31U1iw6gefh/S0xP742IxhgexxrxDUu/NAZkLV51sQ++snpnUK9DZU1kpXmA==",
"requires": {
"tslib": "^2.0.0"
},
@@ -611,9 +611,9 @@
}
},
"@babel/compat-data": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz",
- "integrity": "sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==",
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz",
+ "integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==",
"dev": true
},
"@babel/core": {
@@ -639,11 +639,11 @@
}
},
"@babel/generator": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz",
- "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==",
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+ "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
"requires": {
- "@babel/types": "^7.12.1",
+ "@babel/types": "^7.12.5",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
@@ -668,14 +668,14 @@
}
},
"@babel/helper-compilation-targets": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz",
- "integrity": "sha512-jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==",
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz",
+ "integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==",
"dev": true,
"requires": {
- "@babel/compat-data": "^7.12.1",
+ "@babel/compat-data": "^7.12.5",
"@babel/helper-validator-option": "^7.12.1",
- "browserslist": "^4.12.0",
+ "browserslist": "^4.14.5",
"semver": "^5.5.0"
}
},
@@ -760,12 +760,12 @@
}
},
"@babel/helper-module-imports": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz",
- "integrity": "sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==",
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+ "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
"dev": true,
"requires": {
- "@babel/types": "^7.12.1"
+ "@babel/types": "^7.12.5"
}
},
"@babel/helper-module-transforms": {
@@ -821,15 +821,15 @@
}
},
"@babel/helper-replace-supers": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz",
- "integrity": "sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==",
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+ "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
"dev": true,
"requires": {
"@babel/helper-member-expression-to-functions": "^7.12.1",
"@babel/helper-optimise-call-expression": "^7.10.4",
- "@babel/traverse": "^7.12.1",
- "@babel/types": "^7.12.1"
+ "@babel/traverse": "^7.12.5",
+ "@babel/types": "^7.12.5"
}
},
"@babel/helper-simple-access": {
@@ -882,13 +882,13 @@
}
},
"@babel/helpers": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz",
- "integrity": "sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==",
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz",
+ "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==",
"requires": {
"@babel/template": "^7.10.4",
- "@babel/traverse": "^7.12.1",
- "@babel/types": "^7.12.1"
+ "@babel/traverse": "^7.12.5",
+ "@babel/types": "^7.12.5"
}
},
"@babel/highlight": {
@@ -902,9 +902,9 @@
}
},
"@babel/parser": {
- "version": "7.12.3",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
- "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+ "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
},
"@babel/plugin-proposal-async-generator-functions": {
"version": "7.12.1",
@@ -978,9 +978,9 @@
}
},
"@babel/plugin-proposal-numeric-separator": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz",
- "integrity": "sha512-MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==",
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz",
+ "integrity": "sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.10.4",
@@ -1582,25 +1582,25 @@
}
},
"@babel/traverse": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz",
- "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==",
+ "version": "7.12.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+ "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
"requires": {
"@babel/code-frame": "^7.10.4",
- "@babel/generator": "^7.12.1",
+ "@babel/generator": "^7.12.5",
"@babel/helper-function-name": "^7.10.4",
"@babel/helper-split-export-declaration": "^7.11.0",
- "@babel/parser": "^7.12.1",
- "@babel/types": "^7.12.1",
+ "@babel/parser": "^7.12.5",
+ "@babel/types": "^7.12.5",
"debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.19"
}
},
"@babel/types": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
- "integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
+ "version": "7.12.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+ "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
"requires": {
"@babel/helper-validator-identifier": "^7.10.4",
"lodash": "^4.17.19",
@@ -2907,9 +2907,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001154",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz",
- "integrity": "sha512-y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==",
+ "version": "1.0.30001156",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001156.tgz",
+ "integrity": "sha512-z7qztybA2eFZTB6Z3yvaQBIoJpQtsewRD74adw2UbRWwsRq3jIPvgrQGawBMbfafekQaD21FWuXNcywtTDGGCw==",
"dev": true
},
"canonical-path": {
@@ -3799,6 +3799,11 @@
"whatwg-url": "^8.0.0"
}
},
+ "date-fns": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+ "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
+ },
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
@@ -4197,9 +4202,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.586",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.586.tgz",
- "integrity": "sha512-or8FCbQCRlPZHkOoqBULOI9hzTiStVIQqDLgAPt8pzY+swTrW+89vsqd24Zn+Iv4guAJLxRBD6OR5AmbpabGDA==",
+ "version": "1.3.588",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.588.tgz",
+ "integrity": "sha512-0zr+ZfytnLeJZxGgmEpPTcItu5Mm4A5zHPZXLfHcGp0mdsk95rmD7ePNewYtK1yIdLbk8Z1U2oTRRfOtR4gbYg==",
"dev": true
},
"elliptic": {
@@ -5893,9 +5898,9 @@
}
},
"is-core-module": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz",
- "integrity": "sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz",
+ "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==",
"requires": {
"has": "^1.0.3"
}
@@ -7079,6 +7084,14 @@
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
"dev": true
},
+ "ng-daterangepicker": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/ng-daterangepicker/-/ng-daterangepicker-1.1.0.tgz",
+ "integrity": "sha512-xYY+ieQUlKADvvZ+Nqpm+Mi8+fSNzAvCvbOY+jVRRDemVFGOO6gDAP1SXsCvZZ3JSUpjKfuLEOSjS3C+C5w7zQ==",
+ "requires": {
+ "date-fns": "^1.29.0"
+ }
+ },
"ngx-toastr": {
"version": "12.1.0",
"resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-12.1.0.tgz",
diff --git a/services/self-service/src/main/resources/webapp/package.json b/services/self-service/src/main/resources/webapp/package.json
index ce41e9b..6baa7a2 100644
--- a/services/self-service/src/main/resources/webapp/package.json
+++ b/services/self-service/src/main/resources/webapp/package.json
@@ -30,8 +30,9 @@
"@angular/router": "^10.2.1",
"core-js": "^3.6.5",
"guacamole-common-js": "^1.2.0",
- "moment": "^2.29.1",
+ "moment": "^2.24.0",
"moment-timezone": "^0.5.31",
+ "ng-daterangepicker": "^1.1.0",
"ngx-toastr": "^12.1.0",
"rxjs": "^6.6.3",
"rxjs-compat": "6.5.3",
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
index 9e6533a..7aa9a0a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
@@ -19,15 +19,15 @@
import { Injectable } from '@angular/core';
import { registerLocaleData } from '@angular/common';
-// import * as _moment from 'moment';
-// import 'moment-timezone';
+import * as _moment from 'moment';
+import 'moment-timezone';
@Injectable({
providedIn: 'root'
})
export class LocalizationService {
- // public timezone = _moment().format('Z');
+ public timezone = _moment().format('Z');
private _locale;
constructor() { }
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html
index 61f824c..468ebb3 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html
@@ -31,7 +31,7 @@
</div>
<div id="range-picker">
-<!-- <ng-daterangepicker [(ngModel)]="value" [options]="options" (ngModelChange)="onChange($event)"></ng-daterangepicker>-->
+ <ng-daterangepicker [(ngModel)]="value" [options]="options" (ngModelChange)="onChange($event)"></ng-daterangepicker>
</div>
<div class="action-butt">
<button mat-raised-button class="butt" (click)="rebuild($event)">
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts
index 33c9e8f..680dc0b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts
@@ -18,7 +18,7 @@
*/
import { Component, OnInit, AfterViewInit, Output, EventEmitter, ViewEncapsulation, ViewChild } from '@angular/core';
-// import { NgDateRangePickerOptions } from 'ng-daterangepicker';
+import { NgDateRangePickerOptions } from 'ng-daterangepicker';
import { DICTIONARY } from '../../../../dictionary/global.dictionary';
import {skip} from 'rxjs/operators';
import {Subscription} from 'rxjs';
@@ -41,7 +41,7 @@ export class AuditToolbarComponent implements OnInit, AfterViewInit {
healthStatus: GeneralEnvironmentStatus;
rangeOptions = { 'YTD': 'Year To Date', 'QTD': 'Quarter To Date', 'MTD': 'Month To Date', 'reset': 'All Period Report' };
- // options: NgDateRangePickerOptions;
+ options: NgDateRangePickerOptions;
rangeLabels: any;
@Output() rebuildAudit: EventEmitter<{}> = new EventEmitter();
@@ -49,15 +49,15 @@ export class AuditToolbarComponent implements OnInit, AfterViewInit {
@Output() setRangeOption: EventEmitter<{}> = new EventEmitter();
constructor(private healthStatusService: HealthStatusService) {
- // this.options = {
- // theme: 'default',
- // range: 'tm',
- // dayNames: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
- // presetNames: ['This Month', 'Last Month', 'This Week', 'Last Week', 'This Year', 'Last Year', 'From', 'To'],
- // dateFormat: 'dd MMM y',
- // outputFormat: 'YYYY/MM/DD',
- // startOfWeek: 1
- // };
+ this.options = {
+ theme: 'default',
+ range: 'tm',
+ dayNames: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+ presetNames: ['This Month', 'Last Month', 'This Week', 'Last Week', 'This Year', 'Last Year', 'From', 'To'],
+ dateFormat: 'dd MMM y',
+ outputFormat: 'YYYY/MM/DD',
+ startOfWeek: 1
+ };
}
ngOnInit() {
@@ -71,11 +71,13 @@ export class AuditToolbarComponent implements OnInit, AfterViewInit {
private setInitDatapickerConfig() {
const labels = <NodeListOf<Element>>document.querySelectorAll('.label-txt');
const rangeLabels = <NodeListOf<Element>>document.querySelectorAll('.value-txt');
- labels[0].innerHTML = 'From date';
- labels[1].innerHTML = 'To date';
- for (let label = 0; label < rangeLabels.length; ++label) {
- rangeLabels[label].classList.add('d-none');
- rangeLabels[label].classList.add('untouched');
+ if (labels && rangeLabels) {
+ labels[0].innerHTML = 'From date';
+ labels[1].innerHTML = 'To date';
+ for (let label = 0; label < rangeLabels.length; ++label) {
+ rangeLabels[label].classList.add('d-none');
+ rangeLabels[label].classList.add('untouched');
+ }
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts
index e45114d..dbffc6a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts
@@ -19,7 +19,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
-// import { NgDateRangePickerModule } from 'ng-daterangepicker';
+import { NgDateRangePickerModule } from 'ng-daterangepicker';
import { MaterialModule } from '../../shared/material.module';
import { FormControlsModule } from '../../shared/form-controls';
import { KeysPipeModule, LineBreaksPipeModule, ConvertActionPipeModule } from '../../core/pipes';
@@ -37,7 +37,7 @@ import {LocalCurrencyModule} from '../../core/pipes/local-currency-pipe';
ConvertActionPipeModule,
KeysPipeModule,
LineBreaksPipeModule,
- // NgDateRangePickerModule,
+ NgDateRangePickerModule,
MaterialModule,
LocalDatePipeModule,
LocalCurrencyModule
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.module.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.module.ts
index 660b17f..efcbfd9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.module.ts
@@ -20,8 +20,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
-// import { NgDateRangePickerModule } from 'ng-daterangepicker';
-
+import { NgDateRangePickerModule } from 'ng-daterangepicker';
import { MaterialModule } from '../../shared/material.module';
import { FormControlsModule } from '../../shared/form-controls';
import { ReportingComponent } from './reporting.component';
@@ -38,7 +37,7 @@ import {LocalDatePipeModule} from '../../core/pipes/local-date-pipe';
FormControlsModule,
KeysPipeModule,
LineBreaksPipeModule,
- // NgDateRangePickerModule,
+ NgDateRangePickerModule,
MaterialModule,
LocalCurrencyModule,
LocalDatePipeModule
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.html
index 3ae013f..ca883aa 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.html
@@ -31,7 +31,7 @@
</div>
<div id="range-picker">
-<!-- <ng-daterangepicker [(ngModel)]="value" [options]="options" (ngModelChange)="onChange($event)"></ng-daterangepicker>-->
+ <ng-daterangepicker [(ngModel)]="value" [options]="options" (ngModelChange)="onChange($event)"></ng-daterangepicker>
</div>
<div class="action-butt">
<button mat-raised-button class="butt" (click)="export($event)" [disabled]="!reportData?.report_lines.length">
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.ts
index 5be32f3..2b13c8e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.ts
@@ -18,7 +18,7 @@
*/
import { Component, OnInit, AfterViewInit, Output, EventEmitter, ViewEncapsulation, ViewChild } from '@angular/core';
-// import { NgDateRangePickerOptions } from 'ng-daterangepicker';
+import { NgDateRangePickerOptions } from 'ng-daterangepicker';
import { DICTIONARY } from '../../../../dictionary/global.dictionary';
import {skip} from 'rxjs/operators';
import {Subscription} from 'rxjs';
@@ -41,7 +41,7 @@ export class ToolbarComponent implements OnInit, AfterViewInit {
healthStatus: GeneralEnvironmentStatus;
rangeOptions = { 'YTD': 'Year To Date', 'QTD': 'Quarter To Date', 'MTD': 'Month To Date', 'reset': 'All Period Report' };
- // options: NgDateRangePickerOptions;
+ options: NgDateRangePickerOptions;
rangeLabels: any;
@Output() rebuildReport: EventEmitter<{}> = new EventEmitter();
@@ -49,15 +49,15 @@ export class ToolbarComponent implements OnInit, AfterViewInit {
@Output() setRangeOption: EventEmitter<{}> = new EventEmitter();
constructor(private healthStatusService: HealthStatusService) {
- // this.options = {
- // theme: 'default',
- // range: 'tm',
- // dayNames: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
- // presetNames: ['This Month', 'Last Month', 'This Week', 'Last Week', 'This Year', 'Last Year', 'From', 'To'],
- // dateFormat: 'dd MMM y',
- // outputFormat: 'YYYY/MM/DD',
- // startOfWeek: 1
- // };
+ this.options = {
+ theme: 'default',
+ range: 'tm',
+ dayNames: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+ presetNames: ['This Month', 'Last Month', 'This Week', 'Last Week', 'This Year', 'Last Year', 'From', 'To'],
+ dateFormat: 'dd MMM y',
+ outputFormat: 'YYYY/MM/DD',
+ startOfWeek: 1
+ };
}
ngOnInit() {
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
index ca9b455..79b5008 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
@@ -22,8 +22,8 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { ToastrService } from 'ngx-toastr';
-// import * as _moment from 'moment';
-// import 'moment-timezone';
+import * as _moment from 'moment';
+import 'moment-timezone';
import { SchedulerService } from '../../core/services';
@@ -62,8 +62,7 @@ export class SchedulerComponent implements OnInit {
public schedulerForm: FormGroup;
public destination: any;
public zones: {};
- //public tzOffset: string = _moment().format('Z');
- public tzOffset: string = '+0300';
+ public tzOffset: string = _moment().format('Z');
public startTime = SchedulerCalculations.convertTimeFormat('09:00');
public startTimeMilliseconds: number = SchedulerCalculations.setTimeInMiliseconds(this.startTime);
public endTime = SchedulerCalculations.convertTimeFormat('20:00');
@@ -91,13 +90,13 @@ export class SchedulerComponent implements OnInit {
public open(notebook, type, resource?): void {
this.notebook = notebook;
- // this.zones = _moment.tz.names()
- // .map(item => [_moment.tz(item).format('Z'), item])
- // .sort()
- // .reduce((memo, item) => {
- // memo[item[0]] ? memo[item[0]] += `, ${item[1]}` : memo[item[0]] = item[1];
- // return memo;
- // }, {});
+ this.zones = _moment.tz.names()
+ .map(item => [_moment.tz(item).format('Z'), item])
+ .sort()
+ .reduce((memo, item) => {
+ memo[item[0]] ? memo[item[0]] += `, ${item[1]}` : memo[item[0]] = item[1];
+ return memo;
+ }, {});
this.model = new SchedulerModel(
response => {
@@ -151,7 +150,6 @@ export class SchedulerComponent implements OnInit {
}
public toggleSchedule($event) {
- console.log(this.tzOffset);
this.enableSchedule = $event.checked;
this.timeReqiered = false;
this.allowInheritView = this.destination.type === 'СOMPUTATIONAL' || this.checkIsActiveSpark();
@@ -226,9 +224,9 @@ export class SchedulerComponent implements OnInit {
finishDate: this.schedulerForm.controls.finishDate.value,
terminateDate: this.schedulerForm.controls.terminateDate.value
};
- // const terminateDateTime = (data.terminateDate && this.terminateTime)
- // ? `${_moment(data.terminateDate).format(this.date_format)} ${SchedulerCalculations.convertTimeFormat(this.terminateTime)}`
- // : null;
+ const terminateDateTime = (data.terminateDate && this.terminateTime)
+ ? `${_moment(data.terminateDate).format(this.date_format)} ${SchedulerCalculations.convertTimeFormat(this.terminateTime)}`
+ : null;
if (!this.startTime && !this.endTime && !this.terminateTime && this.enableSchedule) {
this.timeReqiered = true;
@@ -241,25 +239,25 @@ export class SchedulerComponent implements OnInit {
}
const selectedDays = Object.keys(this.selectedStartWeekDays);
- // const parameters: ScheduleSchema = {
- // begin_date: data.startDate ? _moment(data.startDate).format(this.date_format) : null,
- // finish_date: data.finishDate ? _moment(data.finishDate).format(this.date_format) : null,
- // start_time: this.startTime ? SchedulerCalculations.convertTimeFormat(this.startTime) : null,
- // end_time: this.endTime ? SchedulerCalculations.convertTimeFormat(this.endTime) : null,
- // start_days_repeat: selectedDays.filter(el => Boolean(this.selectedStartWeekDays[el])).map(day => day.toUpperCase()),
- // stop_days_repeat: selectedDays.filter(el => Boolean(this.selectedStopWeekDays[el])).map(day => day.toUpperCase()),
- // timezone_offset: this.tzOffset,
- // sync_start_required: this.inherit,
- // check_inactivity_required: this.enableIdleTime,
- // terminate_datetime: terminateDateTime
- // };
-
- // if (this.destination.type === 'СOMPUTATIONAL') {
- // this.model.confirmAction(this.notebook.project, this.notebook.name, parameters, this.destination.computational_name);
- // } else {
- // parameters['consider_inactivity'] = this.considerInactivity;
- // this.model.confirmAction(this.notebook.project, this.notebook.name, parameters);
- // }
+ const parameters: ScheduleSchema = {
+ begin_date: data.startDate ? _moment(data.startDate).format(this.date_format) : null,
+ finish_date: data.finishDate ? _moment(data.finishDate).format(this.date_format) : null,
+ start_time: this.startTime ? SchedulerCalculations.convertTimeFormat(this.startTime) : null,
+ end_time: this.endTime ? SchedulerCalculations.convertTimeFormat(this.endTime) : null,
+ start_days_repeat: selectedDays.filter(el => Boolean(this.selectedStartWeekDays[el])).map(day => day.toUpperCase()),
+ stop_days_repeat: selectedDays.filter(el => Boolean(this.selectedStopWeekDays[el])).map(day => day.toUpperCase()),
+ timezone_offset: this.tzOffset,
+ sync_start_required: this.inherit,
+ check_inactivity_required: this.enableIdleTime,
+ terminate_datetime: terminateDateTime
+ };
+
+ if (this.destination.type === 'СOMPUTATIONAL') {
+ this.model.confirmAction(this.notebook.project, this.notebook.name, parameters, this.destination.computational_name);
+ } else {
+ parameters['consider_inactivity'] = this.considerInactivity;
+ this.model.confirmAction(this.notebook.project, this.notebook.name, parameters);
+ }
}
private setScheduleByInactivity() {
@@ -275,9 +273,9 @@ export class SchedulerComponent implements OnInit {
private formInit(start?: string, end?: string, terminate?: string) {
this.schedulerForm = this.formBuilder.group({
- // startDate: { disabled: this.inherit, value: start ? _moment(start).format() : null },
- // finishDate: { disabled: this.inherit, value: end ? _moment(end).format() : null },
- // terminateDate: { disabled: false, value: terminate ? _moment(terminate).format() : null },
+ startDate: { disabled: this.inherit, value: start ? _moment(start).format() : null },
+ finishDate: { disabled: this.inherit, value: end ? _moment(end).format() : null },
+ terminateDate: { disabled: false, value: terminate ? _moment(terminate).format() : null },
inactivityTime: [this.inactivityLimits.min,
[Validators.compose([Validators.pattern(this.integerRegex), this.validInactivityRange.bind(this)])]]
});
@@ -343,7 +341,7 @@ export class SchedulerComponent implements OnInit {
this.enableSchedule = false;
this.considerInactivity = false;
this.enableIdleTime = false;
- // this.tzOffset = _moment().format('Z');
+ this.tzOffset = _moment().format('Z');
this.startTime = SchedulerCalculations.convertTimeFormat('09:00');
this.endTime = SchedulerCalculations.convertTimeFormat('20:00');
this.terminateTime = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org