Merge pull request #493 from Azure/master

Release master to stable for 0.5.0

Author: timotheeguerin

.travis.yml

@@ -1,10 +1,19 @@
 language: node_js
+dist: trusty
+sudo: false
 node_js:
     - '6.9.4'
+python:
+  - "3.6"
+
+before_install:
+  - python3 --version
 
 install:
   - npm install -g yarn
   - yarn install
+  - python3 --version
+  - pip3 install -r python/requirements.txt
 
 before_script:
   - export DISPLAY=:99.0
@@ -13,6 +22,7 @@ before_script:
 
 script:
     - ./scripts/travis/build-and-test.sh
+    - pylint python/main.py
 
 branches:
   only:

.vscode/launch.json

@@ -5,11 +5,11 @@
       "name": "Launch",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceRoot}/client/main.ts",
+      "program": "${workspaceRoot}/src/client/main.ts",
       "stopOnEntry": false,
       "args": [],
       "cwd": "${workspaceRoot}",
-      "preLaunchTask": "build-node-ts",
+      "preLaunchTask": "build-client",
       "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
       "windows": {
         "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"

.vscode/settings.json

@@ -12,6 +12,9 @@
     "release/**": true,
     "dll/**": true
   },
+  "python.autoComplete.extraPaths": [
+    "${workspaceRoot}/python"
+  ],
   "tslint.jsEnable": true,
   "tslint.autoFixOnSave": true,
   "vsicons.presets.angular": true,

.vscode/tasks.json

@@ -9,7 +9,7 @@
   ],
   "tasks": [
     {
-      "taskName": "build-node-ts",
+      "taskName": "build-client",
       "args": [],
       "isBuildCommand": true
     },

CHANGELOG.md

@@ -1,3 +1,19 @@
+# Version 0.5.0(Beta)
+[All items](https://github.com/Azure/BatchLabs/milestone/5?closed=1)
+
+### Features
+* Link Storage account in batch labs [\#385](https://github.com/Azure/BatchLabs/issues/385)
+* New actions buttons [\#408](https://github.com/Azure/BatchLabs/issues/408)
+* Low priority VMs [\#414](https://github.com/Azure/BatchLabs/issues/414)
+* Details now refresh automatically every 10 seconds [\#428](https://github.com/Azure/BatchLabs/issues/428)
+* Show batch account quotas [\#413](https://github.com/Azure/BatchLabs/issues/413)
+* Job show manager task details [\#447](https://github.com/Azure/BatchLabs/issues/447)
+* Preview images(and gif) and code files in labs  [\#417](https://github.com/Azure/BatchLabs/issues/417)
+* Setup python support for ncj [\#439](https://github.com/Azure/BatchLabs/issues/439)
+* Task output quick add otherfiles for debug [\#184](https://github.com/Azure/BatchLabs/issues/184)
+* Job prep/release task status read experience [\#429](https://github.com/Azure/BatchLabs/issues/429)
+* Start task failed show error banner on node details [\#476](https://github.com/Azure/BatchLabs/issues/476)
+
 # Version 0.4.0(Beta)
 [All items](https://github.com/Azure/BatchLabs/milestone/3?closed=1)
 

Readme.md

@@ -3,12 +3,12 @@
 
 **Note: BatchLabs is in beta. We don't provide any installer/packaged binaries as of now. You will need to build this app yourself.**
 
-This is the readme for master branch is contains the latest changes. Stable might be slightly different [Stable readme](https://github.com/Azure/BatchLabs/tree/stable)
+This is the readme for the 'master' branch which contains the latest changes, 'stable' may differ from this [Stable readme](https://github.com/Azure/BatchLabs/tree/stable)
 
 ## Description
 
-Batch Labs is a tool to manage your Azure Batch accounts. The goal is to implement some great user experience that will help you debug, monitor and manage your pools, jobs and tasks.
-It will also include expermiental features such as `No Code Job` in the aim to improve your Batch experience. We are open to any feedback, ideas and contribution you might have.
+Batch Labs is a tool to manage your Azure Batch accounts. The goal is to implement a great user experience that will help you debug, monitor and manage your pools, jobs and tasks.
+It will also include expermiental features such as `Batch Templates` in the aim to improve your Batch experience. We are open to any feedback, ideas and contributions you might have.
 
 ## Getting started
 #### 1. Prerequisites
@@ -24,7 +24,7 @@ Move to the directory `cd BatchLabs`
 ```bash
 yarn install
 ```
-Note: You can also use `npm install` at your own risk. However please do not submit an issue if you didn't use `yarn install`. Yarn will make sure you have the exact same set of dependencies as everybody which remove any unexpected third party bugs problems.
+Note: You can also use `npm install` at your own risk. However please do not submit an issue if you didn't use `yarn install`. Yarn will make sure you have the right set of dependencies, which reduces the likelihood of any unexpected build issues relating to third party packages.
 
 #### 4. Build and run the application
 ```bash
@@ -44,7 +44,7 @@ npm run electron
 [Dev docs](docs/readme.md)
 
 For developers, you can set up a development environment as follows:
-**Use `yarn install` instead of `npm install` this will makes sure everybody has the same exact set of depenencies [Migrating from npm to yarn](https://yarnpkg.com/lang/en/docs/migrating-from-npm/)**
+**Use `yarn install` instead of `npm install`. This ensures a consistent build environment with the right set of dependencies [Migrating from npm to yarn](https://yarnpkg.com/lang/en/docs/migrating-from-npm/)**
 
 Start the dev server
 ```bash
@@ -61,7 +61,7 @@ npm run dev-electron
 
 The dev-server and dev-electron support hot reload for a better development experience. Simply saving a file will cause the UI to refresh to your updated changes.
 
-*Note:* Changes to any files in the node client directory ('\client\') require restarting the application.
+*Note:* Changes to any files in the node client directory ('src/client') require restarting the application.
 
 If you're using VSCode (recommended) we suggest you use the following extensions:
 * Debugger for Chrome
@@ -79,7 +79,7 @@ Please also take a look at the [coding guidelines](coding-guidelines.md) for thi
 In vscode install the editorconfig extension
 
 ## Detailed commands:
-**Magic command(Starts the server and electron in dev mode)**
+**Magic command (starts the server and electron in dev mode)**
 ```
 npm run dev
 ```
@@ -94,17 +94,17 @@ Run app
 npm run electron
 ```
 
-Run watch(This will build files on save)
+Run watch (this will build files on save)
 ```
 npm run watch
 ```
 
-Run dev server(This will handle the refresh of files and later should have live reloead)
+Run dev server (this will handle the refresh of files and later should have live reload)
 ```
 npm run dev-server
 ```
 
-Run dev electron(To use the dev server you need to run this)
+Run dev electron (to use the dev server you need to run this)
 ```
 npm run dev-electron
 ```

app/app.component.ts

@@ -7,7 +7,8 @@ import { DomSanitizer } from "@angular/platform-browser";
 import { registerIcons } from "app/config";
 import {
     AccountService, AdalService, AutoscaleFormulaService, CommandService, NodeService,
-    PredefinedFormulaService, SSHKeyService, SettingsService, SubscriptionService, VmSizeService,
+    PredefinedFormulaService, PricingService, PythonRpcService, SSHKeyService, SettingsService, SubscriptionService,
+    VmSizeService,
 } from "app/services";
 import { SidebarContentComponent, SidebarManager } from "./components/base/sidebar";
 
@@ -44,17 +45,21 @@ export class AppComponent implements AfterViewInit, OnInit {
         private subscriptionService: SubscriptionService,
         private nodeService: NodeService,
         private sshKeyService: SSHKeyService,
+        pythonRpcService: PythonRpcService,
         private vmSizeService: VmSizeService,
-        private predefinedFormulaService: PredefinedFormulaService) {
+        private pricingService: PricingService,
+        private predefinedFormulaService: PredefinedFormulaService,
+        ) {
         this.autoscaleFormulaService.init();
         this.settingsService.init();
         this.sshKeyService.init();
         this.commandService.init();
-        // Init the pricing when good to go.
-        // this.pricingService.init();
+        this.pricingService.init();
         this.vmSizeService.init();
         this.adalService.init(adalConfig);
         this.accountService.loadInitialData();
+        pythonRpcService.init();
+
         this.predefinedFormulaService.init();
         this.hasAccount = accountService.currentAccount.map((x) => Boolean(x));
 

app/app.module.ts

@@ -28,6 +28,8 @@ import { TaskModule } from "app/components/task/task.module";
 import { BatchLabsErrorHandler } from "app/error-handler";
 
 // services
+import { HttpModule } from "@angular/http";
+import { PollService } from "app/services/core";
 import {
     AccountService,
     AdalService,
@@ -37,21 +39,25 @@ import {
     AzureHttpService,
     BatchClientService,
     CommandService,
+    ComputeService,
     ElectronRemote,
     ElectronShell,
     FileService,
     FileSystemService,
     GithubDataService,
     HttpUploadService,
+    JobHookTaskService,
     JobService,
     LocalFileStorage,
     NodeService,
     NodeUserService,
     PoolService,
     PredefinedFormulaService,
     PricingService,
+    PythonRpcService,
     SSHKeyService,
     SettingsService,
+    StorageAccountService,
     StorageClientService,
     StorageService,
     SubscriptionService,
@@ -82,6 +88,7 @@ const modules = [
         FormsModule,
         MaterialModule,
         ReactiveFormsModule,
+        HttpModule,
         RouterModule.forRoot(routes, { useHash: true }),
         BaseModule,
         ...modules,
@@ -96,19 +103,24 @@ const modules = [
         ArmHttpService,
         BatchClientService,
         CommandService,
+        ComputeService,
         ElectronRemote,
         ElectronShell,
         FileService,
         FileSystemService,
         GithubDataService,
         HttpUploadService,
+        JobHookTaskService,
         JobService,
         LocalFileStorage,
         NodeService,
         NodeUserService,
+        PollService,
         PoolService,
         PricingService,
+        PythonRpcService,
         SettingsService,
+        StorageAccountService,
         StorageClientService,
         StorageService,
         SSHKeyService,

app/app.ts

@@ -1,5 +1,6 @@
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 import { remote } from "electron";
+import * as MouseTrap from "mousetrap";
 
 import { log } from "app/utils";
 import { AppModule } from "./app.module";
@@ -25,3 +26,11 @@ platform.bootstrapModule(AppModule)
         log.error("Bootstrapping failed :: ", error);
         handleCoreError(error);
     });
+
+MouseTrap.bind("ctrl+shift+i", () => {
+    if (remote.getCurrentWindow().webContents.isDevToolsOpened()) {
+        remote.getCurrentWindow().webContents.closeDevTools();
+    } else {
+        remote.getCurrentWindow().webContents.openDevTools();
+    }
+});

app/components/account/account.module.ts

@@ -1,16 +1,21 @@
 import { NgModule } from "@angular/core";
 
 import { commonModules } from "app/common";
-import { AccountCreateDialogComponent } from "app/components/account/action/add/account-create-dialog.component";
-import { DeleteAccountDialogComponent } from "app/components/account/action/delete/delete-account-dialog.component";
-import { AccountBrowseModule } from "app/components/account/browse";
-import { AccountDefaultComponent, AccountDetailsComponent } from "app/components/account/details";
-import { AccountHomeComponent } from "app/components/account/home";
+import { EditStorageAccountFormComponent } from "app/components/account/action/edit-storage-account";
+import { StorageAccountPickerComponent } from "app/components/account/base/storage-account-picker";
 import { PoolDetailsModule } from "app/components/pool/details";
+import { AccountCreateDialogComponent } from "./action/add/account-create-dialog.component";
+import { DeleteAccountDialogComponent } from "./action/delete/delete-account-dialog.component";
+import { AccountBrowseModule } from "./browse";
+import { AccountDefaultComponent, AccountDetailsComponent } from "./details";
+import { AccountQuotasCardComponent } from "./details/account-quotas-card";
+import { StorageAccountCardComponent } from "./details/storage-account-card";
+import { AccountHomeComponent } from "./home";
 
 const components = [
     AccountCreateDialogComponent, AccountDefaultComponent, AccountDetailsComponent,
-    AccountHomeComponent, DeleteAccountDialogComponent,
+    AccountHomeComponent, DeleteAccountDialogComponent, StorageAccountCardComponent,
+    EditStorageAccountFormComponent, StorageAccountPickerComponent, AccountQuotasCardComponent,
 ];
 
 const modules = [
@@ -24,6 +29,7 @@ const modules = [
     entryComponents: [
         AccountCreateDialogComponent,
         DeleteAccountDialogComponent,
+        EditStorageAccountFormComponent,
     ],
 })
 export class AccountModule {