fix: build (nrwl#754)

apps/vscode/src/app/tree-view/current-workspace-tree-provider.ts

@@ -1,12 +1,12 @@
 import { WorkspaceDefinition } from '@angular-console/schema';
+import { join } from 'path';
+import { TreeItem } from 'vscode';
 
 import {
   WorkspaceRoute,
   WorkspaceRouteTitle
 } from '../tree-item/workspace-route';
 import { AbstractTreeProvider } from './abstract-tree-provider';
-import { TreeItem } from 'vscode';
-import { join } from 'path';
 
 const SCANNING_FOR_WORKSPACE = new TreeItem(
   'Scanning for your Angular Workspace...'
@@ -87,7 +87,7 @@ export class CurrentWorkspaceTreeProvider extends AbstractTreeProvider<
       }
     }
 
-    return Promise.resolve([
+    return [
       ...[
         'Projects',
         'Generate',
@@ -105,6 +105,6 @@ export class CurrentWorkspaceTreeProvider extends AbstractTreeProvider<
           )
       ),
       SELECT_A_DIFFERENT_WORKSPACE
-    ]);
+    ];
   }
 }

apps/vscode/src/main.ts

@@ -1,11 +1,14 @@
 import { WorkspaceDefinition } from '@angular-console/schema';
+import { stream } from 'fast-glob';
+import { existsSync } from 'fs';
 import { Server } from 'http';
-import { join, parse, dirname } from 'path';
+import { dirname, join, parse } from 'path';
 import {
   commands,
   ExtensionContext,
   TreeView,
   ViewColumn,
+  WebviewPanel,
   window,
   workspace
 } from 'vscode';
@@ -22,11 +25,11 @@ import {
   LOCATE_YOUR_WORKSPACE
 } from './app/tree-view/current-workspace-tree-provider';
 import { createWebViewPanel } from './app/webview.factory';
-import { stream } from 'fast-glob';
-import { existsSync } from 'fs';
+
 let server: Promise<Server>;
 let currentWorkspace: TreeView<Workspace | WorkspaceRoute>;
 let treeDataProvider: CurrentWorkspaceTreeProvider;
+let webViewPanel: WebviewPanel | undefined;
 
 export function activate(context: ExtensionContext) {
   treeDataProvider = CurrentWorkspaceTreeProvider.create({
@@ -112,6 +115,9 @@ export function activate(context: ExtensionContext) {
 }
 
 function setAngularWorkspace(context: ExtensionContext, workspacePath: string) {
+  if (webViewPanel) {
+    webViewPanel.dispose();
+  }
   treeDataProvider.setWorkspacePath(workspacePath);
   import('./app/start-server').then(({ startServer }) => {
     server = startServer(context, workspacePath);
@@ -144,7 +150,7 @@ async function main(config: {
     throw new Error(`Server address format is unsupported: ${address}`);
   }
 
-  const webViewPanel = createWebViewPanel(
+  webViewPanel = createWebViewPanel(
     context,
     viewColumn,
     `http://localhost:${address!.port}/`,
@@ -154,6 +160,10 @@ async function main(config: {
   );
   context.subscriptions.push(webViewPanel);
 
+  webViewPanel.onDidDispose(() => {
+    webViewPanel = undefined;
+  });
+
   webViewPanel.onDidChangeViewState(e => {
     if (e.webviewPanel.visible) {
       revealWorkspaceRoute(currentWorkspace);

libs/feature-generate/src/lib/schematic/schematic.component.html

@@ -18,11 +18,6 @@
   </ui-command-output>
 </ui-task-runner>
 <ng-template #emptyMessage>
-  <ui-entity-docs
-    *ngIf="(docs$ | async) as docks; else noDocs"
-    [docs]="docs$ | async"
-    style="margin-left: 15px"
-  ></ui-entity-docs>
   <ng-template #noDocs>
     Click the Generate button to start this task.
   </ng-template>

libs/feature-generate/src/lib/schematic/schematic.component.ts

@@ -1,15 +1,14 @@
 import { Schematic } from '@angular-console/schema';
 import {
+  CommandOutputComponent,
   FlagsComponent,
-  TaskRunnerComponent,
-  CommandOutputComponent
+  TaskRunnerComponent
 } from '@angular-console/ui';
 import {
-  IncrementalCommandOutput,
   CommandRunner,
-  Serializer,
   CommandStatus,
-  Settings
+  IncrementalCommandOutput,
+  Serializer
 } from '@angular-console/utils';
 import {
   ChangeDetectionStrategy,
@@ -31,11 +30,11 @@ import {
   tap,
   withLatestFrom
 } from 'rxjs/operators';
+
 import {
   GenerateGQL,
   GenerateUsingNmpGQL,
-  SchematicCollectionsByNameGQL,
-  SchematicDocsGQL
+  SchematicCollectionsByNameGQL
 } from '../generated/graphql';
 
 const DEBOUNCE_TIME = 300;
@@ -69,8 +68,6 @@ export class SchematicComponent implements OnInit {
   taskRunner: TaskRunnerComponent;
   @ViewChild(FlagsComponent, { static: false }) flags: FlagsComponent;
 
-  docs$: Observable<any[]>;
-
   hasNeverBeenValid = true;
 
   private readonly ngGen$ = new Subject<void>();
@@ -84,8 +81,6 @@ export class SchematicComponent implements OnInit {
     private readonly contextActionService: ContextualActionBarService,
     private readonly generateGQL: GenerateGQL,
     private readonly generateUsingNpmGQL: GenerateUsingNmpGQL,
-    private readonly schematicDocsGQL: SchematicDocsGQL,
-    private readonly settings: Settings,
     private readonly schematicCollectionsByNameGQL: SchematicCollectionsByNameGQL
   ) {}
 
@@ -238,31 +233,6 @@ export class SchematicComponent implements OnInit {
         );
       })
     );
-
-    if (this.settings.showDocs) {
-      this.docs$ = schematicDescription$.pipe(
-        switchMap((d: any) => {
-          if (d === null) {
-            return of(null);
-          } else {
-            return this.schematicDocsGQL.fetch({
-              path: d.path,
-              collectionName: d.collection,
-              name: d.schematic
-            });
-          }
-        }),
-        map(r => {
-          if (!r) {
-            return [];
-          } else {
-            return r.data.workspace.docs.schematicDocs;
-          }
-        })
-      );
-    } else {
-      this.docs$ = of([]);
-    }
   }
 
   private runCommand(

libs/feature-run/src/lib/target/target.component.html

@@ -20,10 +20,5 @@
   </ui-command-output>
 </ui-task-runner>
 <ng-template #emptyMessage>
-  <ui-entity-docs
-    *ngIf="(docs$ | async) as docks; else noDocs"
-    [docs]="docs$ | async"
-    style="margin-left: 15px"
-  ></ui-entity-docs>
   <ng-template #noDocs> Click the Run button to start this task. </ng-template>
 </ng-template>

libs/feature-run/src/lib/target/target.component.ts

@@ -1,11 +1,31 @@
 import { Architect, Project } from '@angular-console/schema';
-import { CommandOutputComponent, FlagsComponent, TaskRunnerComponent } from '@angular-console/ui';
-import { CommandRunner, IncrementalCommandOutput, Serializer } from '@angular-console/utils';
-import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core';
+import {
+  CommandOutputComponent,
+  FlagsComponent,
+  TaskRunnerComponent
+} from '@angular-console/ui';
+import {
+  CommandRunner,
+  IncrementalCommandOutput,
+  Serializer
+} from '@angular-console/utils';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  ViewChild
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ContextualActionBarService } from '@nrwl/angular-console-enterprise-frontend';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
-import { map, publishReplay, refCount, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import {
+  map,
+  publishReplay,
+  refCount,
+  switchMap,
+  tap,
+  withLatestFrom
+} from 'rxjs/operators';
 
 import { ProjectsGQL, RunNgGQL } from '../generated/graphql';
 
@@ -29,8 +49,6 @@ export class TargetComponent implements OnInit {
   taskRunner: TaskRunnerComponent;
   @ViewChild(FlagsComponent, { static: false }) flags: FlagsComponent;
 
-  docs$: Observable<any[]> = of();
-
   private readonly ngRun$ = new Subject<any>();
   private readonly ngRunDisabled$ = new BehaviorSubject(true);
 
@@ -158,6 +176,10 @@ export class TargetComponent implements OnInit {
   }
 
   initSourceMapAndStatsJson(architect: Architect) {
+    if (architect.name !== 'build') {
+      return;
+    }
+
     const defaultValues = architect.configurations[0]
       ? architect.configurations[0].defaultValues
       : [];

libs/feature-settings/src/lib/settings/settings.component.html

@@ -23,6 +23,21 @@ <h4 mat-line>Disable Animations</h4>
         [checked]="settings.useDisableAnimations()"
       ></mat-slide-toggle>
     </div>
+    <div
+      fxLayout="row wrap"
+      *ngIf="!isElectron"
+      fxFill
+      fxLayoutAlign="start center"
+    >
+      <div fxFlex>
+        <h4 mat-line>Show Routes Sidenav</h4>
+        <p mat-line>Pin navigation buttons to the left hand side of console</p>
+      </div>
+      <mat-slide-toggle
+        (change)="settings.setShowRoutesSideNav($event.checked)"
+        [checked]="settings.showRoutesSideNav()"
+      ></mat-slide-toggle>
+    </div>
     <div fxLayout="row wrap" fxFill fxLayoutAlign="start center">
       <div fxFlex>
         <h4 mat-line>Use detailed status</h4>

libs/feature-settings/src/lib/settings/settings.component.ts

@@ -1,3 +1,4 @@
+import { IS_ELECTRON } from '@angular-console/environment';
 import { Settings, Telemetry } from '@angular-console/utils';
 import { Component, Inject, OnDestroy } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
@@ -15,6 +16,7 @@ export class SettingsComponent implements OnDestroy {
 
   constructor(
     readonly settings: Settings,
+    @Inject(IS_ELECTRON) readonly isElectron: boolean,
     @Inject('telemetry') private readonly telemetry: Telemetry,
     private readonly contextualActionBarService: ContextualActionBarService,
     router: Router

libs/feature-workspaces/src/lib/workspace/workspace.component.html

@@ -1,7 +1,7 @@
 <div fxFlex fxLayout="column">
   <div class="content" fxLayout="row" fxFlex>
     <div
-      *ngIf="isElectron"
+      *ngIf="isElectron || settings.showRoutesSideNav"
       class="routes-side-nav-container"
       [@growShrink]="sideNavAnimationState$ | async"
     >

libs/feature-workspaces/src/lib/workspace/workspace.component.ts

@@ -9,11 +9,11 @@ import {
   trigger
 } from '@angular/animations';
 import {
+  ChangeDetectionStrategy,
   Component,
   Inject,
   OnDestroy,
-  ViewEncapsulation,
-  ChangeDetectionStrategy
+  ViewEncapsulation
 } from '@angular/core';
 import { MediaObserver } from '@angular/flex-layout';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
@@ -196,9 +196,9 @@ export class WorkspaceComponent implements OnDestroy {
   constructor(
     @Inject(IS_ELECTRON) readonly isElectron: boolean,
     @Inject(IS_INTELLIJ) readonly isIntellij: boolean,
+    readonly settings: Settings,
     private readonly route: ActivatedRoute,
     private readonly router: Router,
-    private readonly settings: Settings,
     private readonly mediaObserver: MediaObserver,
     private readonly contextualActionBarService: ContextualActionBarService,
     private readonly editorSupport: EditorSupport,

libs/schema/src/lib/generated/graphql-types.ts

@@ -33,6 +33,8 @@ export interface Settings {
 
   enableDetailedStatus?: Maybe<boolean>;
 
+  showRoutesSideNav?: Maybe<boolean>;
+
   channel?: Maybe<string>;
 
   workspaceSchematicsDirectory?: Maybe<string>;
@@ -621,6 +623,12 @@ export namespace SettingsResolvers {
       Context
     >;
 
+    showRoutesSideNav?: ShowRoutesSideNavResolver<
+      Maybe<boolean>,
+      TypeParent,
+      Context
+    >;
+
     channel?: ChannelResolver<Maybe<string>, TypeParent, Context>;
 
     workspaceSchematicsDirectory?: WorkspaceSchematicsDirectoryResolver<
@@ -674,6 +682,11 @@ export namespace SettingsResolvers {
     Parent = any,
     Context = any
   > = Resolver<R, Parent, Context>;
+  export type ShowRoutesSideNavResolver<
+    R = Maybe<boolean>,
+    Parent = any,
+    Context = any
+  > = Resolver<R, Parent, Context>;
   export type ChannelResolver<
     R = Maybe<string>,
     Parent = any,

libs/server/src/assets/schema.graphql

@@ -3,7 +3,7 @@ type Architect {
   project: String!
   builder: String!
   description: String!
-  options: Options!,
+  options: Options!
   configurations: [ArchitectConfigurations!]!
   schema: [Schema!]!
 }
@@ -70,7 +70,6 @@ type Extension {
   installed: Boolean
 }
 
-
 type IsNodeInstalledResult {
   result: Boolean!
 }
@@ -221,6 +220,7 @@ type Settings {
   showSupportPlugin: Boolean
   installNodeManually: Boolean
   enableDetailedStatus: Boolean
+  showRoutesSideNav: Boolean
   channel: String
   workspaceSchematicsDirectory: String
   workspaceSchematicsNpmScript: String