Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/2180/nextflow dag buttons #573

Merged
merged 6 commits into from
Mar 13, 2019
Merged

Feature/2180/nextflow dag buttons #573

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f19090
Fix dag controls and alert
garyluu Mar 12, 2019
b55aba5
Reduce margins
garyluu Mar 12, 2019
a01c203
Guard against missing tools for WDL
garyluu Mar 12, 2019
a800345
Remove unneeded styles
garyluu Mar 12, 2019
08de83a
Prevent blank div
garyluu Mar 12, 2019
cd0210d
Handle no files error
garyluu Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reduce margins
  • Loading branch information
@garyluu
garyluu committed Mar 12, 2019
commit b55aba50678d68bfbeb5451b0b6e9246dea3326e
11 changes: 6 additions & 5 deletions src/app/workflow/dag/dag.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<div class="p-3">
<div *ngIf="(isNFL$ | async) && dagType === 'classic'">
<mat-card class="alert alert-warning" role="alert">
<div class="p-3" fxLayout="column" fxLayoutGap="10px">
<div fxFlex class="p-0" *ngIf="(isNFL$ | async) && dagType === 'classic'">
<!-- alert class not present because it adds too much margin above a DAG that actually exists -->
<mat-card class="alert-warning" role="alert">
<mat-icon>warning</mat-icon>&nbsp;DAG display is still experimental for Nextflow.
</mat-card>
</div>
<div *ngIf="dagType === 'classic' && !(isNFL$ | async)">
<div fxFlex *ngIf="dagType === 'classic' && !(isNFL$ | async)">
<mat-card class="alert alert-warning" role="alert" *ngIf="!(dagResult$ | async) && !selectedVersion?.valid">
<mat-icon>warning</mat-icon>&nbsp;
<span *ngIf="(descriptorType$ | async) === ToolDescriptor.TypeEnum.WDL">
Expand All @@ -36,7 +37,7 @@
are missing from Github repo.
</mat-card>
</div>
<div #dagHolder id="dag-holder">
<div fxFlex #dagHolder id="dag-holder">
<div [ngClass]="{'p-3': expanded}" *ngIf="selectedVersion?.valid">
<div fxLayout="row" fxLayoutAlign="space-between start">
<div fxFlex>
Expand Down