Merge pull request #2332 from Azure/master

Merge master into stable for release 2.10.0

Author: gingi

.eslintrc.common.json

@@ -1,6 +1,7 @@
 {
   "plugins": [
-    "@typescript-eslint"
+    "@typescript-eslint",
+    "unused-imports"
   ],
   "extends": [
     "eslint:recommended",
@@ -11,7 +12,7 @@
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-inferrable-types": "off",
-    "@typescript-eslint/no-unused-vars": "off",
+    "unused-imports/no-unused-imports": "error",
     "max-len": [
       "error",
       {

.vscode/launch.json

@@ -32,7 +32,11 @@
           "hidden": false,
           "group": "Debug",
           "order": 20
-      }
+      },
+      "skipFiles": [
+        "<node_internals>/**",
+        "${workspaceFolder}/node_modules/**"
+      ]
     },
     {
       "name": "Attach: Renderer",
@@ -41,14 +45,17 @@
       "port": 9222,
       "sourceMaps": true,
       "trace": "verbose",
-      "url": "file://*",
       "webRoot": "${workspaceRoot}/build",
       "timeout": 30000,
       "presentation": {
         "hidden": false,
         "group": "Debug",
         "order": 30
-      }
+      },
+      "skipFiles": [
+        "<node_internals>/**",
+        "${workspaceFolder}/node_modules/**"
+      ]
     },
     {
       "name": "Test: Client",
@@ -68,7 +75,12 @@
         "hidden": false,
         "group": "Test",
         "order": 10
-      }
+      },
+      "skipFiles": [
+        "<node_internals>/**",
+        "${workspaceFolder}/node_modules/**",
+        "${workspaceFolder}/test/client/**"
+      ]
     }
   ],
   "compounds": [

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.10.0
+
+[All items](https://github.com/Azure/BatchExplorer/milestone/44?closed=1)
+
+### feature
+
+* Migrates authentication to MSAL [\#2331](https://github.com/Azure/BatchExplorer/issues/2331)
+
+### other
+
+* Switch to Typescript in upload-to-storage [\#2308](https://github.com/Azure/BatchExplorer/issues/2308)
+
 # 2.9.0
 
 [All items](https://github.com/Azure/BatchExplorer/milestone/43?closed=1)

ThirdPartyNotices.txt

@@ -18,50 +18,51 @@ Microsoft reserves all other rights not expressly granted under this agreement,
 8. @angular/platform-browser-dynamic(https://github.com/angular/angular#readme) - MIT
 9. @angular/platform-server(https://github.com/angular/angular#readme) - MIT
 10. @angular/router(https://github.com/angular/angular/tree/master/packages/router) - MIT
-11. @azure/storage-blob(https://github.com/Azure/azure-sdk-for-js#readme) - MIT
-12. @types/keytar(https://github.com/node-keytar) - MIT
-13. applicationinsights(https://github.com/Microsoft/ApplicationInsights-node.js#readme) - MIT
-14. azure-storage(http://github.com/Azure/azure-storage-node) - Apache-2.0
-15. chart.js(https://www.chartjs.org) - MIT
-16. chokidar(https://github.com/paulmillr/chokidar) - MIT
-17. commander(https://github.com/tj/commander.js#readme) - MIT
-18. d3(https://d3js.org) - BSD-3-Clause
-19. decode-uri-component(https://github.com/SamVerschueren/decode-uri-component#readme) - MIT
-20. download(https://github.com/kevva/download#readme) - MIT
-21. electron-updater(https://github.com/electron-userland/electron-builder) - MIT
-22. element-resize-detector(https://github.com/wnr/element-resize-detector) - MIT
-23. extract-zip(https://github.com/maxogden/extract-zip#readme) - BSD-2-Clause
-24. focus-visible(https://github.com/WICG/focus-visible) - W3C
-25. font-awesome(http://fontawesome.io/) - (OFL-1.1 AND MIT)
-26. get-proxy-settings(https://github.com/Azure/get-proxy-settings) - MIT
-27. glob(https://github.com/isaacs/node-glob#readme) - ISC
-28. hammerjs(http://hammerjs.github.io/) - MIT
-29. https-proxy-agent(https://github.com/TooTallNate/node-https-proxy-agent#readme) - MIT
-30. immutable(https://facebook.github.com/immutable-js) - MIT
-31. inflection(https://github.com/dreamerslab/node.inflection#readme) - MIT
-32. js-yaml(https://github.com/nodeca/js-yaml) - MIT
-33. jschardet(https://github.com/aadsm/jschardet#readme) - LGPL-2.1+
-34. keytar(http://atom.github.io/node-keytar) - MIT
-35. load-json-file(https://github.com/sindresorhus/load-json-file#readme) - MIT
-36. luxon(https://github.com/moment/luxon#readme) - MIT
-37. make-dir(https://github.com/sindresorhus/make-dir#readme) - MIT
-38. node-abi(https://github.com/lgeiger/node-abi#readme) - MIT
-39. node-forge(https://github.com/digitalbazaar/forge) - (BSD-3-Clause OR GPL-2.0)
-40. patternomaly(https://github.com/ashiguruma/patternomaly#readme) - MIT
-41. reflect-metadata(http://rbuckton.github.io/reflect-metadata) - Apache-2.0
-42. rxjs(https://github.com/ReactiveX/RxJS) - Apache-2.0
-43. strip-json-comments(https://github.com/sindresorhus/strip-json-comments#readme) - MIT
-44. tinycolor2(https://github.com/TinyColor) - MIT
-45. winston(https://github.com/winstonjs/winston#readme) - MIT
-46. winston-daily-rotate-file(https://github.com/winstonjs/winston-daily-rotate-file#readme) - MIT
-47. write-file-webpack-plugin(https://github.com/gajus/write-file-webpack-plugin#readme) - BSD-3-Clause
-48. xml2js(https://github.com/Leonidas-from-XIV/node-xml2js) - MIT
-49. zone.js(https://github.com/angular/angular#readme) - MIT
-50. websockets(https://github.com/aaugustin/websockets) - BSD-3-Clause
-51. azure-batch-cli-extensions(https://github.com/Azure/azure-batch-cli-extensions) - MIT
-52. node.js(https://nodejs.org/en/) - MIT
-53. python(https://www.python.org/) - PSF
-54. Electron(https://electronjs.org/) - electron
+11. @azure/msal-node(https://github.com/AzureAD/microsoft-authentication-library-for-js#readme) - MIT
+12. @azure/storage-blob(https://github.com/Azure/azure-sdk-for-js#readme) - MIT
+13. @types/keytar(https://github.com/node-keytar) - MIT
+14. applicationinsights(https://github.com/microsoft/ApplicationInsights-node.js#readme) - MIT
+15. azure-storage(http://github.com/Azure/azure-storage-node) - Apache-2.0
+16. chart.js(https://www.chartjs.org) - MIT
+17. chokidar(https://github.com/paulmillr/chokidar) - MIT
+18. commander(https://github.com/tj/commander.js#readme) - MIT
+19. d3(https://d3js.org) - BSD-3-Clause
+20. decode-uri-component(https://github.com/SamVerschueren/decode-uri-component#readme) - MIT
+21. download(https://github.com/kevva/download#readme) - MIT
+22. electron-updater(https://github.com/electron-userland/electron-builder) - MIT
+23. element-resize-detector(https://github.com/wnr/element-resize-detector) - MIT
+24. extract-zip(https://github.com/maxogden/extract-zip#readme) - BSD-2-Clause
+25. focus-visible(https://github.com/WICG/focus-visible) - W3C
+26. font-awesome(http://fontawesome.io/) - (OFL-1.1 AND MIT)
+27. get-proxy-settings(https://github.com/Azure/get-proxy-settings) - MIT
+28. glob(https://github.com/isaacs/node-glob#readme) - ISC
+29. hammerjs(http://hammerjs.github.io/) - MIT
+30. https-proxy-agent(https://github.com/TooTallNate/node-https-proxy-agent#readme) - MIT
+31. immutable(https://facebook.github.com/immutable-js) - MIT
+32. inflection(https://github.com/dreamerslab/node.inflection#readme) - MIT
+33. js-yaml(https://github.com/nodeca/js-yaml) - MIT
+34. jschardet(https://github.com/aadsm/jschardet#readme) - LGPL-2.1+
+35. keytar(http://atom.github.io/node-keytar) - MIT
+36. load-json-file(https://github.com/sindresorhus/load-json-file#readme) - MIT
+37. luxon(https://github.com/moment/luxon#readme) - MIT
+38. make-dir(https://github.com/sindresorhus/make-dir#readme) - MIT
+39. node-abi(https://github.com/lgeiger/node-abi#readme) - MIT
+40. node-forge(https://github.com/digitalbazaar/forge) - (BSD-3-Clause OR GPL-2.0)
+41. patternomaly(https://github.com/ashiguruma/patternomaly#readme) - MIT
+42. reflect-metadata(http://rbuckton.github.io/reflect-metadata) - Apache-2.0
+43. rxjs(https://github.com/ReactiveX/RxJS) - Apache-2.0
+44. strip-json-comments(https://github.com/sindresorhus/strip-json-comments#readme) - MIT
+45. tinycolor2(https://github.com/bgrins/TinyColor#readme) - MIT
+46. winston(https://github.com/winstonjs/winston#readme) - MIT
+47. winston-daily-rotate-file(https://github.com/winstonjs/winston-daily-rotate-file#readme) - MIT
+48. write-file-webpack-plugin(https://github.com/gajus/write-file-webpack-plugin#readme) - BSD-3-Clause
+49. xml2js(https://github.com/Leonidas-from-XIV/node-xml2js) - MIT
+50. zone.js(https://github.com/angular/angular#readme) - MIT
+51. websockets(https://github.com/aaugustin/websockets) - BSD-3-Clause
+52. azure-batch-cli-extensions(https://github.com/Azure/azure-batch-cli-extensions) - MIT
+53. node.js(https://nodejs.org/en/) - MIT
+54. python(https://www.python.org/) - PSF
+55. Electron(https://electronjs.org/) - electron
 
 ============================================================
     Start license for @angular/animations
@@ -382,6 +383,9 @@ THE SOFTWARE.
     End license for @angular/router
 ============================================================
 
+============================================================
+    Start license for @azure/msal-node
+------------------------------------------------------------
 ============================================================
     Start license for @azure/storage-blob
 ------------------------------------------------------------
@@ -416,6 +420,31 @@ SOFTWARE.
 ============================================================
     Start license for applicationinsights
 ------------------------------------------------------------
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------
+    End license for applicationinsights
+============================================================
+
 ============================================================
     Start license for azure-storage
 ------------------------------------------------------------
@@ -2370,6 +2399,30 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 ============================================================
     Start license for tinycolor2
 ------------------------------------------------------------
+Copyright (c), Brian Grinstead, http://briangrinstead.com
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------
+    End license for tinycolor2
+============================================================
+
 ============================================================
     Start license for winston
 ------------------------------------------------------------
@@ -2490,7 +2543,7 @@ THE SOFTWARE.
 ============================================================
     Start license for websockets
 ------------------------------------------------------------
-Copyright (c) 2013-2019 Aymeric Augustin and contributors.
+Copyright (c) 2013-2021 Aymeric Augustin and contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -3879,29 +3932,6 @@ The externally maintained libraries used by Node.js are:
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   """
 
-- node-inspect, located at deps/node-inspect, is licensed as follows:
-  """
-    Copyright Node.js contributors. All rights reserved.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-  """
-
 - large_pages, located at src/large_pages, is licensed as follows:
   """
      Copyright (C) 2018 Intel Corporation

docs/testing.md

@@ -23,7 +23,7 @@ fdescribe("MyModuleB", () => {
 });
 ```
 
-**Note: TSLint will scan for `fdescribe` and `fit` so you don't forget one when creating a PR**
+**Note: ESLint will scan for `fdescribe` and `fit` so you don't forget one when creating a PR**
 
 ## Test the client
 

karma.conf.js

@@ -3,7 +3,7 @@ const webpackConfig = require("./config/webpack.config.test");
 process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = "true";
 
 // Only enable coverage if env is defined(So we don't enable it in watch mode as it duplicate logs)
-const coverageReporters = process.env.COVERAGE ? ["coverage", "remap-coverage", "junit"] : [];
+const coverageReporters = process.env.COVERAGE ? ["coverage", "junit"] : [];
 
 // Karma config for testing the code running the browser environemnt.
 // For the client testing use the mocha command line.
@@ -87,13 +87,12 @@ module.exports = function(config) {
             reportSlowerThan: 200,
         },
         coverageReporter: {
-            type: "in-memory"
-        },
-        remapCoverageReporter: {
-            "text-summary": null,
-            json: "./coverage/coverage.json",
-            html: "./coverage/html",
-            cobertura: "./coverage/cobertura.xml",
+            dir: "./coverage",
+            reporters: [
+                { type: "json", subdir: ".", file: "coverage.json" },
+                { type: "html", subdir: "./html" },
+                { type: "cobertura", subdir: ".", file: "cobertura.xml" },
+            ]
         },
         // Can't enable yet has a conflict in dependency with azure-storage
         junitReporter: {