fix(projects): Disable generate/run buttons when applicable (#763)

nrwl · Jul 19, 2019 · 9b7ea68 · 9b7ea68
1 parent ed6fd95
commit 9b7ea68
Show file tree

Hide file tree

Showing 6 changed files with 1,057 additions and 1,157 deletions.
diff --git a/libs/feature-workspaces/src/lib/projects/projects.component.html b/libs/feature-workspaces/src/lib/projects/projects.component.html
@@ -87,7 +87,7 @@
                   #generateMenuTrigger="matMenuTrigger"
                   [matMenuTriggerFor]="generateMenu"
                   [matMenuTriggerData]="{ project: p }"
-                  *ngIf="p.supportsGenerate"
+                  [disabled]="!p.supportsGenerate"
                 >
                   Generate
                 </button>
@@ -96,7 +96,7 @@
                   #runMenuTrigger="matMenuTrigger"
                   [matMenuTriggerFor]="runMenu"
                   [matMenuTriggerData]="{ project: p }"
-                  *ngIf="p.actions.length"
+                  [disabled]="!p.actions.length"
                 >
                   Run
                 </button>

diff --git a/libs/feature-workspaces/src/lib/projects/projects.component.ts b/libs/feature-workspaces/src/lib/projects/projects.component.ts
@@ -147,7 +147,7 @@ export class ProjectsComponent implements OnInit, OnDestroy {
           ...p,
           actions: this.createActions(p),
           links$: this.getLinksForProject(p),
-          supportsGenerate: true
+          supportsGenerate: !(p.architect || []).find(a => a.name === 'e2e')
         };
       });
       return projects;

diff --git a/libs/feature-workspaces/src/lib/projects/projects.constants.ts b/libs/feature-workspaces/src/lib/projects/projects.constants.ts
@@ -51,11 +51,7 @@ export function createLinkForSchematic(
   name: string,
   displayText: string
 ): ProjectAction | undefined {
-  if (
-    (project.projectType === 'application' ||
-      project.projectType === 'library') &&
-    !(project.architect || []).find(a => a.name === 'e2e')
-  ) {
+  {
     return {
       name,
       schematicName,
@@ -67,8 +63,6 @@ export function createLinkForSchematic(
         { project: project.name }
       ]
     };
-  } else {
-    return undefined;
   }
 }