From 7fde1fad4f3e6663dc388fce45f380f9f0531a4f Mon Sep 17 00:00:00 2001 From: Louis Jimenez Date: Wed, 24 Apr 2019 14:45:45 -0400 Subject: [PATCH] fix(core): Show all app selections when creating a pipeline from mptv2 (#6891) --- .../config/templates/v2/PipelineTemplatesV2.tsx | 2 +- .../CreatePipelineFromTemplate.tsx | 10 ++++++---- .../createPipelineFromTemplate.less | 3 +++ .../templates/v2/createPipelineFromTemplate/index.ts | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) rename app/scripts/modules/core/src/pipeline/config/templates/v2/{ => createPipelineFromTemplate}/CreatePipelineFromTemplate.tsx (94%) create mode 100644 app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/createPipelineFromTemplate.less create mode 100644 app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/index.ts diff --git a/app/scripts/modules/core/src/pipeline/config/templates/v2/PipelineTemplatesV2.tsx b/app/scripts/modules/core/src/pipeline/config/templates/v2/PipelineTemplatesV2.tsx index 18084340e1d..df98738103f 100644 --- a/app/scripts/modules/core/src/pipeline/config/templates/v2/PipelineTemplatesV2.tsx +++ b/app/scripts/modules/core/src/pipeline/config/templates/v2/PipelineTemplatesV2.tsx @@ -6,7 +6,7 @@ import { Subscription } from 'rxjs'; import { UISref } from '@uirouter/react'; import { PipelineTemplateV2Service } from './pipelineTemplateV2.service'; -import CreatePipelineFromTemplate from './CreatePipelineFromTemplate'; +import { CreatePipelineFromTemplate } from './createPipelineFromTemplate'; import { IPipelineTemplateV2 } from 'core/domain/IPipelineTemplateV2'; import { ShowPipelineTemplateJsonModal } from 'core/pipeline/config/actions/templateJson/ShowPipelineTemplateJsonModal'; import { ReactInjector, IStateChange } from 'core/reactShims'; diff --git a/app/scripts/modules/core/src/pipeline/config/templates/v2/CreatePipelineFromTemplate.tsx b/app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/CreatePipelineFromTemplate.tsx similarity index 94% rename from app/scripts/modules/core/src/pipeline/config/templates/v2/CreatePipelineFromTemplate.tsx rename to app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/CreatePipelineFromTemplate.tsx index dbc8d4d35c1..128b6f94c5b 100644 --- a/app/scripts/modules/core/src/pipeline/config/templates/v2/CreatePipelineFromTemplate.tsx +++ b/app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/CreatePipelineFromTemplate.tsx @@ -4,14 +4,16 @@ import { Option } from 'react-select'; import { Observable, Subject } from 'rxjs'; import { Application, ApplicationReader, IApplicationSummary } from 'core/application'; -import ApplicationSelector from './ApplicationSelector'; +import ApplicationSelector from '../ApplicationSelector'; import { CreatePipelineModal } from 'core/pipeline'; import { IPipelineTemplateV2 } from 'core/domain/IPipelineTemplateV2'; import { ReactInjector } from 'core/reactShims'; import { Spinner } from 'core/widgets/spinners/Spinner'; import { SubmitButton } from 'core/modal/buttons/SubmitButton'; -export interface ICreatePipelineFromTemplateProps { +import './createPipelineFromTemplate.less'; + +interface ICreatePipelineFromTemplateProps { closeModalCallback: () => void; template: IPipelineTemplateV2; } @@ -26,7 +28,7 @@ interface ICreatePipelineFromTemplateState { submitting: boolean; } -export default class CreatePipelineFromTemplate extends React.Component< +export class CreatePipelineFromTemplate extends React.Component< ICreatePipelineFromTemplateProps, ICreatePipelineFromTemplateState > { @@ -128,7 +130,7 @@ export default class CreatePipelineFromTemplate extends React.Component< } return ( - + Select An Application diff --git a/app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/createPipelineFromTemplate.less b/app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/createPipelineFromTemplate.less new file mode 100644 index 00000000000..ce6d238ffa3 --- /dev/null +++ b/app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/createPipelineFromTemplate.less @@ -0,0 +1,3 @@ +.create-pipeline-from-template-modal .modal-content { + overflow: visible; +} diff --git a/app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/index.ts b/app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/index.ts new file mode 100644 index 00000000000..bdbc9478ec7 --- /dev/null +++ b/app/scripts/modules/core/src/pipeline/config/templates/v2/createPipelineFromTemplate/index.ts @@ -0,0 +1 @@ +export * from './CreatePipelineFromTemplate';