Merge branch 'master' into SHIBUI-754

TIER · Aug 20, 2018 · 12bab6b · 12bab6b
2 parents c9520b9 + b8cc2ab
commit 12bab6b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.ts b/ui/src/app/metadata/provider/container/provider-filter-list.component.ts
@@ -30,7 +30,9 @@ export class ProviderFilterListComponent implements OnDestroy {
         this.filters$ = this.store.select(fromFilter.getAdditionalFilters);
         this.provider$ = this.store.select(fromProvider.getSelectedProvider).pipe(skipWhile(p => !p));
         this.provider$
-            .pipe(takeUntil(this.ngUnsubscribe))
+            .pipe(
+                takeUntil(this.ngUnsubscribe)
+            )
             .subscribe(p => {
                 this.store.dispatch(new LoadFilterRequest(p.resourceId));
             });

diff --git a/ui/src/app/metadata/provider/container/provider-select.component.html b/ui/src/app/metadata/provider/container/provider-select.component.html
@@ -1 +1,3 @@
-<router-outlet></router-outlet>
+<ng-container *ngIf="provider$ | async">
+    <router-outlet></router-outlet>
+</ng-container>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -50,15 +50,5 @@
         <li class="dropdown-item dropdown-item-noresults" *ngIf="matches && matches.length === 0 && !processing">
             {{ noneFoundText }}
         </li>
-        <li class="dropdown-item"
-            *ngIf="showMoreAvailable && matches"
-            [class.active]="state.currentState.selected === matches.length"
-            [class.focused]="state.currentState.focused === matches.length"
-            (click)="handleViewMore($event)"
-            (mousedown)="handleViewMore($event)"
-            (keydown.enter)="handleViewMore($event)"
-            [id]="this.getOptionId(matches.length)">
-            {{ showMoreText }}
-        </li>
     </ul>
 </div>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.ts b/ui/src/app/shared/autocomplete/autocomplete.component.ts
@@ -40,13 +40,12 @@ const INPUT_FIELD_INDEX = -1;
         }
     ]
 })
-export class AutoCompleteComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit, ControlValueAccessor {
+export class AutoCompleteComponent implements OnInit, OnDestroy, AfterViewInit, ControlValueAccessor {
     @Input() defaultValue = '';
     @Input() matches: string[] = [];
     @Input() id: string;
     @Input() autoSelect = false;
     @Input() noneFoundText = 'No Options Found';
-    @Input() showMoreText = 'Show More...';
     @Input() limit = 0;
     @Input() processing = false;
     @Input() dropdown = false;
@@ -119,12 +118,6 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, OnChanges, Afte
         this.listItems.changes.subscribe((changes) => this.setElementReferences(changes));
     }
 
-    ngOnChanges(changes: SimpleChanges): void {
-        if (changes.matches) {
-            this.showMoreAvailable = !!this.limit && this.matches && this.matches.length >= this.limit;
-        }
-    }
-
     writeValue(value: any): void {
         this.input.setValue(value);
     }

diff --git a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json
@@ -50,7 +50,8 @@
             "type": "section",
             "fields": [
                 "name",
-                "@type"
+                "@type",
+                "enabled"
             ]
         },
         {
@@ -96,6 +97,12 @@
                 }
             ]
         },
+        "enabled": {
+            "title": "Enable this service?",
+            "description": "Enable this service?",
+            "type": "boolean",
+            "default": false
+        },
         "xmlId": {
             "title": "ID",
             "description": "Identifier for logging, identification for command line reload, etc.",