Merge stable in master

Author: timotheeguerin

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.12.3
+
+### Hot fix:
+* File-group/container issue with adding more files(Disabled for non file group for now) [\#1033](https://github.com/Azure/BatchLabs/issues/1033)
+* Storage Container Search Broken  [\#1039](https://github.com/Azure/BatchLabs/issues/1039)
+
+# 0.12.2
+
+### Hot fix:
+* Update Electron to fix vulnerability [\#1030](https://github.com/Azure/BatchLabs/issues/1030)
+
 # 0.12.1
 
 ### Hot fix:

app/components/base/buttons/buttons.component.ts

@@ -6,6 +6,7 @@ import { Job, JobState } from "app/models";
 
 export class BaseButton {
     @Input() public action: ButtonAction;
+    @Input() public disabled: boolean;
     @Input() public tooltipPosition: string = "below";
 }
 
@@ -215,7 +216,12 @@ export class ResizeButtonComponent extends BaseButton {
 @Component({
     selector: "bl-edit-button",
     template: `
-        <bl-button color="light" [action]="action" [title]="title" icon="fa fa-pencil-square-o" permission="write">
+        <bl-button color="light"
+            [action]="action"
+            [title]="title"
+            icon="fa fa-pencil-square-o"
+            permission="write"
+            [disabled]="disabled">
         </bl-button>
     `,
 })

app/components/base/list-and-show-layout/list-and-show-layout.component.ts

@@ -56,6 +56,9 @@ export class ListAndShowLayoutComponent implements AfterViewInit, OnChanges, OnD
     @Output()
     public listScrolledToBottom = new EventEmitter<any>();
 
+    @Output()
+    public filterChange = new EventEmitter<Filter>();
+
     @ViewChild("quickSearchInput")
     public quickSearchInput: ElementRef;
 
@@ -167,6 +170,7 @@ export class ListAndShowLayoutComponent implements AfterViewInit, OnChanges, OnD
 
     private _updateFilter() {
         this.filter = FilterBuilder.and(this.quickFilter, this.advancedFilter);
+        this.filterChange.emit(this.filter);
     }
 
     private _clearListSubs() {

app/components/data/details/data-details.component.ts

@@ -30,6 +30,7 @@ export class DataDetailsComponent implements OnInit, OnDestroy {
     public containerId: string;
     public decorator: ApplicationDecorator;
     public data: EntityView<BlobContainer, GetContainerParams>;
+    public isFileGroup = false;
 
     private _paramsSubscriber: Subscription;
 
@@ -43,6 +44,7 @@ export class DataDetailsComponent implements OnInit, OnDestroy {
         this.data = this.storageService.containerView();
         this.data.item.subscribe((container) => {
             this.container = container;
+            this.isFileGroup = container && container.isFileGroup;
         });
 
         this.data.deleted.subscribe((key) => {

app/components/data/details/data-details.html

@@ -7,7 +7,7 @@
             </div>
             <bl-button-group summaryActions>
                 <bl-refresh-btn [refresh]="refresh"></bl-refresh-btn>
-                <bl-edit-button title="Add more files to the file group" [action]="manageFileGroup"></bl-edit-button>
+                <bl-edit-button title="Add more files to the file group" [action]="manageFileGroup" [disabled]="!isFileGroup"></bl-edit-button>
                 <bl-delete-button title="Delete this file group" [action]="deleteFileGroup"></bl-delete-button>
                 <bl-download-button title="Download this file group" [action]="download"></bl-download-button>
             </bl-button-group>

app/components/data/home/data-home.component.ts

@@ -33,7 +33,7 @@ export class DataHomeComponent implements OnDestroy {
     @ViewChild(MatMenuTrigger) public trigger: MatMenuTrigger;
 
     public containerTypes = containerTypes;
-    public quickSearchQuery = new FormControl();
+    public quickSearchQuery: string = "";
     public filter: Filter = FilterBuilder.none();
     public hasAutoStorage = true;
     public containerTypePrefix = new FormControl("");
@@ -45,10 +45,6 @@ export class DataHomeComponent implements OnDestroy {
         private dialogService: DialogService,
         public storageService: StorageService) {
 
-        this.quickSearchQuery.valueChanges.debounceTime(400).distinctUntilChanged().subscribe((query: string) => {
-            this._updateFilter();
-        });
-
         this.containerTypePrefix.valueChanges.subscribe((prefix) => {
             this._updateFilter();
         });
@@ -62,6 +58,15 @@ export class DataHomeComponent implements OnDestroy {
         this._autoStorageSub.unsubscribe();
     }
 
+    public quickSearchFilterChanged(filter: Filter) {
+        if (filter.isEmpty()) {
+            this.quickSearchQuery = "";
+        } else {
+            this.quickSearchQuery = (filter.properties[0] as any).value;
+        }
+        this._updateFilter();
+    }
+
     @autobind()
     public addFileGroup() {
         this.trigger.openMenu();
@@ -104,7 +109,7 @@ export class DataHomeComponent implements OnDestroy {
 
     private _updateFilter() {
         const prefix = this.containerTypePrefix.value || "";
-        const search = this.quickSearchQuery.value || "";
+        const search = this.quickSearchQuery || "";
         const query = prefix + search;
         if (query === "") {
             this.filter = FilterBuilder.none();

app/components/data/home/data-home.html

@@ -1,6 +1,7 @@
 <bl-storage-error-display [noClassic]="true"></bl-storage-error-display>
 
-<bl-list-and-show-layout #layout (listScrolledToBottom)="fileGroupList.onScrollToBottom()" [list]="fileGroupList" *ngIf="storageService.hasArmAutoStorage | async">
+<bl-list-and-show-layout #layout (listScrolledToBottom)="fileGroupList.onScrollToBottom()" (filterChange)="quickSearchFilterChanged($event)"
+    [list]="fileGroupList" *ngIf="storageService.hasArmAutoStorage | async">
     <div bl-list-title>
         Storage containers
     </div>

app/models/blob-container.ts

@@ -1,4 +1,5 @@
 import { Model, Prop, Record } from "app/core";
+import { Constants } from "common";
 import { ContainerLease, ContainerLeaseAttributes } from "./container-lease";
 import { NavigableRecord } from "./navigable-record";
 
@@ -31,4 +32,8 @@ export class BlobContainer extends Record<BlobContainerAttributes> implements Na
     public get routerLink(): string[] {
         return ["/data", this.id];
     }
+
+    public get isFileGroup() {
+        return this.id && this.id.startsWith(Constants.ncjFileGroupPrefix);
+    }
 }

package.json

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