Post merge fixes

cloudfoundry · nwmac · Dec 13, 2018 · Dec 13, 2018 · Dec 13, 2018 · Dec 14, 2018
commit b910e0fbbc7a40e5cabc11b3408323344c4697e9
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
@@ -3,6 +3,7 @@
 @import '../src/features/dashboard/dashboard-base/dashboard-base.component.theme';
 @import '../src/features/login/login-page/login-page.component.theme';
 @import '../src/features/applications/deploy-application/deploy-application.component.theme';
+@import '../src/features/dashboard/page-side-nav/page-side-nav.component.theme';
 @import '../src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme';
 @import '../src/features/about/about-page/about-page.component.theme';
 @import '../src/shared/components/display-value/display-value.component.theme';
@@ -127,6 +128,8 @@ $side-nav-light-active: #484848;
   @include metrics-chart-theme($theme, $app-theme);
   @include metrics-range-selector-theme($theme, $app-theme);
   @include app-multiline-title-theme($theme, $app-theme);
+  @include page-side-nav-theme($theme, $app-theme);
+  // @include cf-admin-add-user-warning($theme, $app-theme);
 }
 
 @function app-generate-nav-theme($theme, $nav-theme: null) {

diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
@@ -58,6 +58,7 @@ import { ApplicationStateService } from './shared/components/application-state/a
 import { favoritesConfigMapper } from './shared/components/favorites-meta-card/favorite-config-mapper';
 import { SharedModule } from './shared/shared.module';
 import { XSRFModule } from './xsrf.module';
+import { TabNavService } from '../tab-nav.service';
 
 // Create action for router navigation. See
 // - https://github.com/ngrx/platform/issues/68
@@ -117,6 +118,7 @@ export class CustomRouterStateSerializer
     CloudFoundryModule
   ],
   providers: [
+    TabNavService,
     LoggedInService,
     ExtensionService,
     DynamicExtensionRoutes,

diff --git a/src/frontend/packages/core/src/app.routing.ts b/src/frontend/packages/core/src/app.routing.ts
@@ -30,7 +30,7 @@ const appRoutes: Routes = [
         path: 'home', component: HomePageComponent,
         data: {
           stratosNavigation: {
-            text: 'Home',
+            label: 'Home',
             matIcon: 'home',
             position: 10
           }
@@ -41,7 +41,7 @@ const appRoutes: Routes = [
         loadChildren: './features/applications/applications.module#ApplicationsModule',
         data: {
           stratosNavigation: {
-            text: 'Applications',
+            label: 'Applications',
             matIcon: 'apps',
             position: 20
           }
@@ -51,7 +51,7 @@ const appRoutes: Routes = [
         path: 'endpoints',
         data: {
           stratosNavigation: {
-            text: 'Endpoints',
+            label: 'Endpoints',
             matIcon: 'settings_ethernet',
             position: 100
           }
@@ -69,7 +69,7 @@ const appRoutes: Routes = [
         path: 'marketplace', loadChildren: './features/service-catalog/service-catalog.module#ServiceCatalogModule',
         data: {
           stratosNavigation: {
-            text: 'Marketplace',
+            label: 'Marketplace',
             matIcon: 'store',
             position: 30
           }
@@ -79,7 +79,7 @@ const appRoutes: Routes = [
         path: 'services', loadChildren: './features/services/services.module#ServicesModule',
         data: {
           stratosNavigation: {
-            text: 'Services',
+            label: 'Services',
             matIcon: 'service',
             matIconFont: 'stratos-icons',
             position: 40
@@ -90,7 +90,7 @@ const appRoutes: Routes = [
         path: 'cloud-foundry', loadChildren: './features/cloud-foundry/cloud-foundry.module#CloudFoundryModule',
         data: {
           stratosNavigation: {
-            text: 'Cloud Foundry',
+            label: 'Cloud Foundry',
             matIcon: 'cloud_foundry',
             matIconFont: 'stratos-icons',
             position: 50

diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
@@ -27,7 +27,7 @@ import { TruncatePipe } from './truncate.pipe';
 import { UserService } from './user.service';
 import { UtilsService } from './utils.service';
 import { WindowRef } from './window-ref/window-ref.service';
-
+import { PortalModule } from '@angular/cdk/portal';
 
 @NgModule({
   imports: [
@@ -51,6 +51,7 @@ import { WindowRef } from './window-ref/window-ref.service';
     DotContentComponent,
     ButtonBlurOnClickDirective,
     PageNotFoundComponentComponent,
+    PortalModule,
     EntityFavoriteStarComponent,
     RecentEntitiesComponent,
     DisableRouterLinkDirective

diff --git a/...tures/applications/application/application-tabs-base/application-tabs-base.component.html b/...tures/applications/application/application-tabs-base/application-tabs-base.component.html
@@ -45,6 +45,8 @@ <h1>{{ (applicationService.application$ | async)?.app?.entity?.name }} </h1>
     </span>
   </div>
 </app-page-header>
+<app-page-sub-nav>
+</app-page-sub-nav>
 <app-loading-page [entityId]="applicationService.appGuid" [entitySchema]="schema" deleteText="Deleting application"
   text="Retrieving application" class="router-component">
   <router-outlet></router-outlet>

diff --git a/...eatures/applications/application/application-tabs-base/application-tabs-base.component.ts b/...eatures/applications/application/application-tabs-base/application-tabs-base.component.ts
@@ -41,6 +41,7 @@ import { GitSCMService, GitSCMType } from '../../../../shared/data-services/scm/
 import { ENTITY_SERVICE } from '../../../../shared/entity.tokens';
 import { ApplicationData, ApplicationService } from '../../application.service';
 import { EndpointsService } from './../../../../core/endpoints.service';
+import { IPageSideNavTab } from '../../../dashboard/page-side-nav/page-side-nav.component';
 
 // Confirmation dialogs
 const appStopConfirmation = new ConfirmationDialogConfig(
@@ -127,14 +128,14 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
     );
 
     this.tabLinks = [
-      { link: 'summary', label: 'Summary' },
-      { link: 'instances', label: 'Instances' },
-      { link: 'routes', label: 'Routes' },
-      { link: 'log-stream', label: 'Log Stream' },
-      { link: 'services', label: 'Services' },
-      { link: 'variables', label: 'Variables', hidden: appDoesNotHaveEnvVars$ },
-      { link: 'events', label: 'Events' }
-    ];
+      { link: 'summary', label: 'Summary', matIcon: 'description' },
+      { link: 'instances', label: 'Instances', matIcon: 'library_books' },
+      { link: 'routes', label: 'Routes', matIconFont: 'stratos-icons', matIcon: 'network_route' },
+      { link: 'log-stream', label: 'Log Stream', matIcon: 'featured_play_list' },
+      { link: 'services', label: 'Services', matIconFont: 'stratos-icons', matIcon: 'service' },
+      { link: 'variables', label: 'Variables', matIcon: 'lock', hidden: appDoesNotHaveEnvVars$ },
+      { link: 'events', label: 'Events', matIcon: 'watch_later' }
+    ];;
 
     this.endpointsService.hasMetrics(applicationService.cfGuid).subscribe(hasMetrics => {
       if (hasMetrics) {
@@ -183,7 +184,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
     update => update[this.autoRefreshString] || { busy: false }
   ));
 
-  tabLinks: ISubHeaderTabs[];
+  tabLinks: IPageSideNavTab[];
 
   private getBreadcrumbs(
     application: IApp,

diff --git a/...e/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/...e/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
@@ -14,8 +14,8 @@ import {
   StratosTabType,
 } from '../../../core/extension/extension-service';
 import { environment } from '../../../environments/environment.prod';
-import { ISubHeaderTabs } from '../../../shared/components/page-subheader/page-subheader.types';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
+import { IPageSideNavTab } from '../../dashboard/page-side-nav/page-side-nav.component';
 
 @Component({
   selector: 'app-cloud-foundry-tabs-base',
@@ -27,15 +27,15 @@ export class CloudFoundryTabsBaseComponent implements OnInit {
   static users = 'users';
   static cells = 'cells';
 
-  public tabLinks: ISubHeaderTabs[];
+  public tabLinks: IPageSideNavTab[];
 
   // Used to hide tab that is not yet implemented when in production
   isDevEnvironment = !environment.production;
 
   isFetching$: Observable<boolean>;
 
   public canAddOrg$: Observable<boolean>;
-
+  public tabsHeader = 'Cloud Foundry';
   public extensionActions: StratosActionMetadata[] = getActionsFromExtensions(StratosActionType.CloudFoundry);
 
   public favorite$: Observable<UserFavoriteEndpoint>;
@@ -71,29 +71,33 @@ export class CloudFoundryTabsBaseComponent implements OnInit {
 
     // Default tabs + add any tabs from extensions
     this.tabLinks = [
-      { link: 'summary', label: 'Summary' },
-      { link: 'organizations', label: 'Organizations' },
+      { link: 'summary', label: 'Summary', matIcon: 'description' },
+      { link: 'organizations', label: 'Organizations', matIcon: 'organization', matIconFont: 'stratos-icons' },
       {
         link: CloudFoundryTabsBaseComponent.cells,
         label: 'Cells',
+        matIcon: 'select_all',
         hidden: cellsHidden$
       },
-      { link: 'routes', label: 'Routes' },
+      { link: 'routes', label: 'Routes', matIcon: 'network_route', matIconFont: 'stratos-icons', },
       {
         link: CloudFoundryTabsBaseComponent.users,
         label: 'Users',
-        hidden: usersHidden$
+        hidden: usersHidden$,
+        matIcon: 'people'
       },
       {
         link: CloudFoundryTabsBaseComponent.firehose,
         label: 'Firehose',
-        hidden: firehoseHidden$
+        hidden: firehoseHidden$,
+        matIcon: 'featured_play_list'
       },
-      { link: 'feature-flags', label: 'Feature Flags' },
-      { link: 'build-packs', label: 'Build Packs' },
-      { link: 'stacks', label: 'Stacks' },
-      { link: 'security-groups', label: 'Security Groups' }
-    ].concat(getTabsFromExtensions(StratosTabType.CloudFoundry));
+      { link: 'feature-flags', label: 'Feature Flags', matIcon: 'flag' },
+      { link: 'build-packs', label: 'Build Packs', matIcon: 'build' },
+      { link: 'stacks', label: 'Stacks', matIcon: 'code' },
+      { link: 'security-groups', label: 'Security Groups', matIcon: 'security' },
+      ...getTabsFromExtensions(StratosTabType.CloudFoundry)
+    ];
   }
 
   ngOnInit() {

diff --git a/...dry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts b/...dry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
@@ -3,11 +3,11 @@ import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
 import { IHeaderBreadcrumb } from '../../../../../../shared/components/page-header/page-header.types';
-import { ISubHeaderTabs } from '../../../../../../shared/components/page-subheader/page-subheader.types';
 import { getActiveRouteCfCellProvider } from '../../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryCellService } from '../cloud-foundry-cell.service';
 import { entityFactory, metricSchemaKey } from '../../../../../../../../store/src/helpers/entity-factory';
+import { IPageSideNavTab } from '../../../../../dashboard/page-side-nav/page-side-nav.component';
 
 @Component({
   selector: 'app-cloud-foundry-cell-base',
@@ -22,10 +22,11 @@ export class CloudFoundryCellBaseComponent {
 
   static AppsLinks = 'apps';
 
-  tabLinks: ISubHeaderTabs[] = [
+  tabLinks: IPageSideNavTab[] = [
     {
       link: 'summary',
-      label: 'Summary'
+      label: 'Summary',
+      matIcon: 'description'
     },
     {
       link: 'charts',

diff --git a/...rganizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts b/...rganizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
@@ -16,11 +16,11 @@ import {
 import { getFavoriteFromCfEntity } from '../../../../../core/user-favorite-helpers';
 import { environment } from '../../../../../environments/environment.prod';
 import { IHeaderBreadcrumb } from '../../../../../shared/components/page-header/page-header.types';
-import { ISubHeaderTabs } from '../../../../../shared/components/page-subheader/page-subheader.types';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
+import { IPageSideNavTab } from '../../../../dashboard/page-side-nav/page-side-nav.component';
 
 @Component({
   selector: 'app-cloud-foundry-organization-base',
@@ -35,21 +35,23 @@ import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry
 })
 export class CloudFoundryOrganizationBaseComponent {
 
-  tabLinks: ISubHeaderTabs[] = [
+  tabLinks: IPageSideNavTab[] = [
     {
       link: 'summary',
-      label: 'Summary'
+      label: 'Summary',
+      matIcon: 'description'
     },
     {
       link: 'spaces',
-      label: 'Spaces'
+      label: 'Spaces',
+      matIcon: 'language'
     },
     {
       link: 'users',
       label: 'Users',
+      matIcon: 'people'
     }
   ];
-
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
 
   public name$: Observable<string>;

diff --git a/...oundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts b/...oundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
@@ -26,6 +26,7 @@ import { getActiveRouteCfOrgSpaceProvider } from '../../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../../services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../../../../services/cloud-foundry-space.service';
+import { IPageSideNavTab } from '../../../../../dashboard/page-side-nav/page-side-nav.component';
 
 @Component({
   selector: 'app-cloud-foundry-space-base',
@@ -40,26 +41,33 @@ import { CloudFoundrySpaceService } from '../../../../services/cloud-foundry-spa
 })
 export class CloudFoundrySpaceBaseComponent implements OnDestroy {
 
-  tabLinks = [
+  tabLinks: IPageSideNavTab[] = [
     {
       link: 'summary',
       label: 'Summary',
+      matIcon: 'description'
     },
     {
       link: 'apps',
       label: 'Applications',
+      matIcon: 'apps'
     },
     {
       link: 'service-instances',
-      label: 'Service Instances'
+      label: 'Services',
+      matIconFont: 'stratos-icons',
+      matIcon: 'service'
     },
     {
       link: 'routes',
       label: 'Routes',
+      matIconFont: 'stratos-icons',
+      matIcon: 'network_route'
     },
     {
       link: 'users',
       label: 'Users',
+      matIcon: 'people'
     }
   ];