Merge pull request #165 from dlabrecq/resource-header-fix

fix(resource-header): Added correct DropdownModule to common module

package.json

@@ -170,7 +170,6 @@
     "ng2-dropdown": "0.0.21",
     "ng2-modal": "0.0.25",
     "ng2-restangular": "0.1.29",
-    "ngx-dropdown": "0.0.22",
     "node-sass": "4.5.0",
     "npm-run-all": "4.0.2",
     "null-loader": "0.1.1",

src/app/common/common.module.ts

@@ -6,7 +6,7 @@ import {TruncateWordsPipe} from "./truncate-words.pipe";
 import {LoadingComponent} from "./loading/loading.component";
 import {EntriesPipe} from "./entries.pipe";
 import {ResourceHeaderComponent} from "../kubernetes/components/resource-header/resource.header.component";
-import {DropdownModule} from "ngx-dropdown";
+import {DropdownConfig, DropdownModule} from "ng2-bootstrap";
 import {ParentLinkFactory} from "./parent-link-factory";
 import {OAuthService} from "angular2-oauth2/oauth-service";
 import {OnLogin} from "../shared/onlogin.service";
@@ -35,6 +35,7 @@ import {SafeUrlPipe} from "./safeurl.pipe";
     SafeUrlPipe,
   ],
   providers: [
+    DropdownConfig,
     ParentLinkFactory,
     OAuthService,
     OnLogin,

src/app/kubernetes/components/components.module.ts

@@ -1,5 +1,4 @@
 import {NgModule} from "@angular/core";
-import {DropdownConfig, DropdownModule} from "ng2-bootstrap";
 import {PodPhaseIconComponent} from "./pod-phase-icon/pod-phase-icon.component";
 import {KubernetesLabelsComponent} from "./k8s-labels/k8s-labels.component";
 import {Fabric8CommonModule} from "../../common/common.module";
@@ -10,24 +9,20 @@ import {BuildStatusIconComponent} from "./build-status-icon/build-status-icon.co
 @NgModule({
   imports: [
     CommonModule,
-    DropdownModule,
     Fabric8CommonModule,
   ],
   declarations: [
     BuildStatusIconComponent,
     KubernetesLabelsComponent,
     PodPhaseIconComponent,
-    PipelineStatusComponent,
+    PipelineStatusComponent
   ],
   exports: [
     BuildStatusIconComponent,
     KubernetesLabelsComponent,
     PodPhaseIconComponent,
-    PipelineStatusComponent,
+    PipelineStatusComponent
   ],
-  providers: [
-    DropdownConfig
-  ]
 })
 export class KubernetesComponentsModule {
 }

src/app/kubernetes/components/resource-header/resource.header.component.html

@@ -1,4 +1,4 @@
-<li class='context' dropdown>
+<div class='context' dropdown>
   <button type='button' class='btn btn-default' aria-haspopup='true' aria-expanded='false' dropdownToggle>
     {{current?.name}}
     <span class='caret'></span>
@@ -15,4 +15,4 @@
       <a [routerLink]="['/run/spaces']">Browse all namespaces</a>
     </li>
   </ul>
-</li>
+</div>