Merge branch 'stable' of https://github.com/Azure/BatchLabs

Author: timotheeguerin

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.10.2
+### Bug:
+
+* VM Size selector broken [\#940](https://github.com/Azure/BatchLabs/issues/940)
+
 # 0.10.1
 [All items](https://github.com/Azure/BatchLabs/milestone/13?closed=1)
 

app/components/pool/action/add/vm-size-picker.html

@@ -1,4 +1,4 @@
-<mat-tab-group class="form-tabs">
+<mat-tab-group class="form-tabs" [@.disabled]="true">
     <mat-tab *ngFor="let category of categoryNames" [label]="categoryLabelName(category)">
         <bl-focus-section>
             <bl-table [activeItem]="pickedSize" (activeItemChange)="pickSize($event)">

app/services/monaco-loader.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { Constants } from "app/utils";
+import { Constants, OS } from "app/utils";
 import { AutoscaleLanguage } from "app/utils/monaco-languages/autoscale.language";
 import { JsonLanguage } from "app/utils/monaco-languages/json/json.language";
 
@@ -24,9 +24,12 @@ export class MonacoLoader {
 
     public load(): Promise<any> {
         return new Promise((resolve) => {
-
+            let baseUrl = path.join(Constants.Client.root, "build/vendor/");
+            if (!OS.isWindows()) {
+                baseUrl = `file://${baseUrl}`;
+            }
             const onGotAmdLoader = () => {
-                anyWindow.amdRequire.config({ baseUrl: path.join(Constants.Client.root, "build/vendor/") });
+                anyWindow.amdRequire.config({ baseUrl });
                 // workaround monaco-css not understanding the environment
                 (self as any).module = undefined;
                 // workaround monaco-typescript not understanding the environment

package.json

@@ -9,7 +9,7 @@
     "name": "Microsoft Corporation",
     "email": "tiguerin@microsoft.com"
   },
-  "version": "0.10.1",
+  "version": "0.10.2",
   "main": "build/client/main.prod.js",
   "scripts": {
     "ts": "ts-node --project tsconfig.node.json",

test/app/components/pool/action/add/vm-size-picker.spec.ts

@@ -2,6 +2,7 @@ import { Component, DebugElement, NO_ERRORS_SCHEMA } from "@angular/core";
 import { ComponentFixture, TestBed, fakeAsync, tick } from "@angular/core/testing";
 import { FormsModule } from "@angular/forms";
 import { By } from "@angular/platform-browser";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
 import { List } from "immutable";
 import { Observable } from "rxjs";
 
@@ -60,7 +61,7 @@ describe("VmSizePickerComponent", () => {
         };
 
         TestBed.configureTestingModule({
-            imports: [FormsModule],
+            imports: [FormsModule, NoopAnimationsModule],
             declarations: [VmSizePickerComponent, TestComponent],
             providers: [
                 { provide: VmSizeService, useValue: vmSizeServiceSpy },