From e577fe0888da77541fa901d2d1799b00f3a5b5ea Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Tue, 28 Aug 2018 16:11:01 -0400 Subject: [PATCH] Hide disabled option altogether * would prefer tooltip, but for https://github.com/angular/material2/issues/7953 --- src/app/search/map-friendly-values.pipe.ts | 6 +++++- .../register-workflow-modal.component.html | 16 ++++++++++------ .../register-workflow-modal.service.ts | 14 +++++++------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/app/search/map-friendly-values.pipe.ts b/src/app/search/map-friendly-values.pipe.ts index 51d313ec61..69d11eb841 100644 --- a/src/app/search/map-friendly-values.pipe.ts +++ b/src/app/search/map-friendly-values.pipe.ts @@ -35,7 +35,11 @@ export class MapFriendlyValuesPipe implements PipeTransform { ])], ['source_control_provider.keyword', new Map([ ['GITHUB', 'github.com'], ['BITBUCKET', 'bitbucket.org'], ['GITLAB', 'gitlab.com'], ['DOCKSTORE', 'dockstore.org'] - ])] + ])], + ['descriptor_tooltip', new Map([ + ['CWL', 'Common Workflow Language'], ['WDL', 'Workflow Description Language'], + ['Nextflow', 'Nextflow coming soon!'] + ])], ]); /** diff --git a/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html b/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html index 3552cca726..1be3897851 100644 --- a/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html +++ b/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html @@ -114,12 +114,16 @@

Register Workflow

- - Descriptor Type: - - {{'descriptor_type' | mapFriendlyValue : descriptorType}} - + + Descriptor Type: + + + {{'descriptor_type' | mapFriendlyValue : descriptorType}} + + Workflow Name diff --git a/src/app/workflow/register-workflow-modal/register-workflow-modal.service.ts b/src/app/workflow/register-workflow-modal/register-workflow-modal.service.ts index ced771c8d6..590dc2ce8c 100644 --- a/src/app/workflow/register-workflow-modal/register-workflow-modal.service.ts +++ b/src/app/workflow/register-workflow-modal/register-workflow-modal.service.ts @@ -20,13 +20,13 @@ import { Router } from '@angular/router'; import { BehaviorSubject, Observable } from 'rxjs'; import { finalize } from 'rxjs/operators'; -import { DescriptorLanguageService } from './../../shared/entry/descriptor-language.service'; -import { StateService } from './../../shared/state.service'; -import { HostedService } from './../../shared/swagger/api/hosted.service'; -import { MetadataService } from './../../shared/swagger/api/metadata.service'; -import { WorkflowsService } from './../../shared/swagger/api/workflows.service'; -import { Workflow } from './../../shared/swagger/model/workflow'; -import { WorkflowService } from './../../shared/workflow.service'; +import { DescriptorLanguageService } from '../../shared/entry/descriptor-language.service'; +import { StateService } from '../../shared/state.service'; +import { HostedService } from '../../shared/swagger'; +import { MetadataService } from '../../shared/swagger'; +import { WorkflowsService } from '../../shared/swagger'; +import { Workflow } from '../../shared/swagger'; +import { WorkflowService } from '../../shared/workflow.service'; import { RegisterWorkflowModalComponent } from './register-workflow-modal.component'; @Injectable()