-
Notifications
You must be signed in to change notification settings - Fork 593
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.
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
Add pipeline trigger resource pages and related links in details pages #5005
Merged
openshift-merge-robot
merged 1 commit into
openshift:master
from
karthikjeeyar:trigger-pages
Apr 16, 2020
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
frontend/packages/dev-console/src/components/pipelines/EventListenerPage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import * as React from 'react'; | ||
| import { DetailsPage, DetailsPageProps } from '@console/internal/components/factory'; | ||
| import { Kebab, navFactory, viewYamlComponent } from '@console/internal/components/utils'; | ||
| import EventListenerDetails from './detail-page-tabs/EventListenerDetails'; | ||
|
|
||
| const EventListenerPage: React.FC<DetailsPageProps> = (props) => ( | ||
| <DetailsPage | ||
| {...props} | ||
| menuActions={Kebab.factory.common} | ||
| pages={[navFactory.details(EventListenerDetails), navFactory.editYaml(viewYamlComponent)]} | ||
| /> | ||
| ); | ||
|
|
||
| export default EventListenerPage; |
14 changes: 14 additions & 0 deletions
14
frontend/packages/dev-console/src/components/pipelines/TriggerBindingPage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import * as React from 'react'; | ||
| import { DetailsPage, DetailsPageProps } from '@console/internal/components/factory'; | ||
| import { Kebab, navFactory, viewYamlComponent } from '@console/internal/components/utils'; | ||
| import TriggerBindingDetails from './detail-page-tabs/TriggerBindingDetails'; | ||
|
|
||
| const TriggerBindingPage: React.FC<DetailsPageProps> = (props) => ( | ||
| <DetailsPage | ||
| {...props} | ||
| menuActions={Kebab.factory.common} | ||
| pages={[navFactory.details(TriggerBindingDetails), navFactory.editYaml(viewYamlComponent)]} | ||
| /> | ||
| ); | ||
|
|
||
| export default TriggerBindingPage; |
14 changes: 14 additions & 0 deletions
14
frontend/packages/dev-console/src/components/pipelines/TriggerTemplatePage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import * as React from 'react'; | ||
| import { DetailsPage, DetailsPageProps } from '@console/internal/components/factory'; | ||
| import { Kebab, navFactory, viewYamlComponent } from '@console/internal/components/utils'; | ||
| import TriggerTemplateDetails from './detail-page-tabs/TriggerTemplateDetails'; | ||
|
|
||
| const TriggerTemplatePage: React.FC<DetailsPageProps> = (props) => ( | ||
| <DetailsPage | ||
| {...props} | ||
| menuActions={Kebab.factory.common} | ||
| pages={[navFactory.details(TriggerTemplateDetails), navFactory.editYaml(viewYamlComponent)]} | ||
| /> | ||
| ); | ||
|
|
||
| export default TriggerTemplatePage; |
44 changes: 44 additions & 0 deletions
44
...d/packages/dev-console/src/components/pipelines/detail-page-tabs/EventListenerDetails.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import * as React from 'react'; | ||
| import { SectionHeading, ResourceSummary } from '@console/internal/components/utils'; | ||
| import { TriggerTemplateModel, TriggerBindingModel } from '../../../models'; | ||
| import { EventListenerKind } from '../resource-types'; | ||
| import TriggerTemplateResourceLink from '../resource-overview/TriggerTemplateResourceLink'; | ||
| import ResourceLinkList from '../resource-overview/ResourceLinkList'; | ||
| import { | ||
| RouteTemplate, | ||
| useEventListenerTriggerTemplateNames, | ||
| getEventListenerTriggerBindingNames, | ||
| } from '../utils/triggers'; | ||
|
|
||
| export interface EventListenerDetailsProps { | ||
| obj: EventListenerKind; | ||
| } | ||
|
|
||
| const EventListenerDetails: React.FC<EventListenerDetailsProps> = ({ obj: eventListener }) => { | ||
| const routeTemplates: RouteTemplate[] = useEventListenerTriggerTemplateNames(eventListener) || []; | ||
| const bindings: string[] = getEventListenerTriggerBindingNames(eventListener) || []; | ||
| return ( | ||
| <div className="co-m-pane__body"> | ||
| <SectionHeading text="Event Listener Details" /> | ||
| <div className="row"> | ||
| <div className="col-sm-6"> | ||
| <ResourceSummary resource={eventListener} /> | ||
| </div> | ||
| <div className="col-sm-6"> | ||
| <TriggerTemplateResourceLink | ||
| namespace={eventListener.metadata.namespace} | ||
| model={TriggerTemplateModel} | ||
| links={routeTemplates} | ||
| /> | ||
| <ResourceLinkList | ||
| namespace={eventListener.metadata.namespace} | ||
| model={TriggerBindingModel} | ||
| links={bindings} | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default EventListenerDetails; |
33 changes: 33 additions & 0 deletions
33
.../packages/dev-console/src/components/pipelines/detail-page-tabs/TriggerBindingDetails.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import * as React from 'react'; | ||
| import { SectionHeading, ResourceSummary } from '@console/internal/components/utils'; | ||
| import { EventListenerModel } from '../../../models'; | ||
| import ResourceLinkList from '../resource-overview/ResourceLinkList'; | ||
| import { useTriggerBindingEventListenerNames } from '../utils/triggers'; | ||
| import { TriggerBindingKind } from '../resource-types'; | ||
|
|
||
| export interface TriggerBindingDetailsProps { | ||
| obj: TriggerBindingKind; | ||
| } | ||
|
|
||
| const TriggerBindingDetails: React.FC<TriggerBindingDetailsProps> = ({ obj: triggerBinding }) => { | ||
| const eventListeners: string[] = useTriggerBindingEventListenerNames(triggerBinding); | ||
| return ( | ||
| <div className="co-m-pane__body"> | ||
| <SectionHeading text="Trigger Binding Details" /> | ||
| <div className="row"> | ||
| <div className="col-sm-6"> | ||
| <ResourceSummary resource={triggerBinding} /> | ||
| </div> | ||
| <div className="col-sm-6"> | ||
| <ResourceLinkList | ||
| namespace={triggerBinding.metadata.namespace} | ||
| model={EventListenerModel} | ||
| links={eventListeners} | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default TriggerBindingDetails; |
44 changes: 44 additions & 0 deletions
44
...packages/dev-console/src/components/pipelines/detail-page-tabs/TriggerTemplateDetails.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import * as React from 'react'; | ||
| import { SectionHeading, ResourceSummary } from '@console/internal/components/utils'; | ||
| import { EventListenerModel, PipelineModel } from '../../../models'; | ||
| import ResourceLinkList from '../resource-overview/ResourceLinkList'; | ||
| import { | ||
| useTriggerTemplateEventListenerNames, | ||
| getTriggerTemplatePipelineName, | ||
| } from '../utils/triggers'; | ||
| import { TriggerTemplateKind } from '../resource-types'; | ||
|
|
||
| export interface TriggerTemplateDetailsProps { | ||
| obj: TriggerTemplateKind; | ||
| } | ||
|
|
||
| const TriggerTemplateDetails: React.FC<TriggerTemplateDetailsProps> = ({ | ||
| obj: triggerTemplate, | ||
| }) => { | ||
| const eventListeners: string[] = useTriggerTemplateEventListenerNames(triggerTemplate); | ||
| const pipelineName: string = getTriggerTemplatePipelineName(triggerTemplate); | ||
| return ( | ||
| <div className="co-m-pane__body"> | ||
| <SectionHeading text="Trigger Template Details" /> | ||
| <div className="row"> | ||
| <div className="col-sm-6"> | ||
| <ResourceSummary resource={triggerTemplate} /> | ||
| </div> | ||
| <div className="col-sm-6"> | ||
| <ResourceLinkList | ||
| namespace={triggerTemplate.metadata.namespace} | ||
| model={PipelineModel} | ||
| links={[pipelineName]} | ||
| /> | ||
| <ResourceLinkList | ||
| namespace={triggerTemplate.metadata.namespace} | ||
| model={EventListenerModel} | ||
| links={eventListeners} | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default TriggerTemplateDetails; |
66 changes: 30 additions & 36 deletions
66
...ev-console/src/components/pipelines/detail-page-tabs/pipeline-details/PipelineDetails.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,42 @@ | ||
| import * as React from 'react'; | ||
| import { SectionHeading, ResourceSummary, ResourceLink } from '@console/internal/components/utils'; | ||
| import { referenceForModel } from '@console/internal/module/k8s'; | ||
| import { Pipeline, getResourceModelFromTask } from '../../../../utils/pipeline-augment'; | ||
| import { SectionHeading, ResourceSummary } from '@console/internal/components/utils'; | ||
| import { Pipeline } from '../../../../utils/pipeline-augment'; | ||
| import { TriggerTemplateModel, TaskModel } from '../../../../models'; | ||
| import { usePipelineTriggerTemplateNames, RouteTemplate } from '../../utils/triggers'; | ||
| import TriggerTemplateResourceLink from '../../resource-overview/TriggerTemplateResourceLink'; | ||
| import ResourceLinkList from '../../resource-overview/ResourceLinkList'; | ||
| import PipelineVisualization from './PipelineVisualization'; | ||
|
|
||
| interface PipelineDetailsProps { | ||
| obj: Pipeline; | ||
| } | ||
|
|
||
| const PipelineDetails: React.FC<PipelineDetailsProps> = ({ obj: pipeline }) => ( | ||
| <div className="co-m-pane__body"> | ||
| <SectionHeading text="Pipeline Details" /> | ||
| <PipelineVisualization pipeline={pipeline} /> | ||
| <div className="row"> | ||
| <div className="col-sm-6"> | ||
| <ResourceSummary resource={pipeline} /> | ||
| </div> | ||
| {pipeline.spec && pipeline.spec.tasks && ( | ||
| const PipelineDetails: React.FC<PipelineDetailsProps> = ({ obj: pipeline }) => { | ||
| const routeTemplates: RouteTemplate[] = usePipelineTriggerTemplateNames(pipeline) || []; | ||
| const pipelineTasks = pipeline.spec.tasks.map((task) => task.taskRef.name); | ||
| return ( | ||
| <div className="co-m-pane__body"> | ||
| <SectionHeading text="Pipeline Details" /> | ||
| <PipelineVisualization pipeline={pipeline} /> | ||
| <div className="row"> | ||
| <div className="col-sm-6"> | ||
| <ResourceSummary resource={pipeline} /> | ||
| </div> | ||
| <div className="col-sm-6"> | ||
| <SectionHeading text="Tasks" /> | ||
| <dl> | ||
| {pipeline.spec.tasks.map((task) => { | ||
| const resourceModel = getResourceModelFromTask(task); | ||
| return ( | ||
| <React.Fragment key={task.name}> | ||
| <dt>Name: {task.name}</dt> | ||
| <dd> | ||
| Ref:{' '} | ||
| <ResourceLink | ||
| kind={referenceForModel(resourceModel)} | ||
| name={task.taskRef.name} | ||
| namespace={pipeline.metadata.namespace} | ||
| title={task.taskRef.name} | ||
| inline | ||
| /> | ||
| </dd> | ||
| </React.Fragment> | ||
| ); | ||
| })} | ||
| </dl> | ||
| <TriggerTemplateResourceLink | ||
| namespace={pipeline.metadata.namespace} | ||
| model={TriggerTemplateModel} | ||
| links={routeTemplates} | ||
| /> | ||
| <ResourceLinkList | ||
| namespace={pipeline.metadata.namespace} | ||
| links={pipelineTasks} | ||
| model={TaskModel} | ||
| /> | ||
| </div> | ||
| )} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| ); | ||
| }; | ||
|
|
||
| export default PipelineDetails; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
...end/packages/dev-console/src/components/pipelines/resource-overview/ResourceLinkList.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .odc-resource-link-list { | ||
| margin-bottom: var(--pf-global--spacer--lg); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Net zero changes please.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated