Merge branch 'master' into dev-dataflow

Signed-off-by: Alex Collins <[email protected]>
argoproj · Apr 23, 2021 · 08a126e · 08a126e
2 parents 10905da + 2a05034
commit 08a126e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 33 deletions.
diff --git a/docs/events.md b/docs/events.md
@@ -148,12 +148,12 @@ Metadata is data about the event, this includes **headers**:
 
 HTTP header names are lowercase and only include those that have `x-` as their prefix. Their values are lists, not single values. 
 
-* Wrong: `metadata["X-Github-Event"] = "push"`
-* Wrong: `metadata["x-github-event"] = "push"`
-* Wrong: `metadata["X-Github-Event"] = ["push"]`
-* Wrong: `metadata["github-event"] = ["push"]`
-* Wrong: `metadata["authorization"] = ["push"]`
-* Right: `metadata["x-github-event"] = ["push"]`
+* Wrong: `metadata["X-Github-Event"] == "push"`
+* Wrong: `metadata["x-github-event"] == "push"`
+* Wrong: `metadata["X-Github-Event"] == ["push"]`
+* Wrong: `metadata["github-event"] == ["push"]`
+* Wrong: `metadata["authorization"] == ["push"]`
+* Right: `metadata["x-github-event"] == ["push"]`
 
 Example:
 

diff --git a/...app/archived-workflows/components/archived-workflow-details/archived-workflow-details.tsx b/...app/archived-workflows/components/archived-workflow-details/archived-workflow-details.tsx
@@ -157,18 +157,20 @@ export class ArchivedWorkflowDetails extends BasePage<RouteComponentProps<any>,
  return (
  <>
  {this.tab === 'summary' ? (
- <div className='argo-container'>
- <div className='workflow-details__content'>
- <WorkflowSummaryPanel workflow={this.state.workflow} />
- {execSpec(this.state.workflow).arguments && execSpec(this.state.workflow).arguments.parameters && (
- <React.Fragment>
- <h6>Parameters</h6>
- <WorkflowParametersPanel parameters={execSpec(this.state.workflow).arguments.parameters} />
- </React.Fragment>
- )}
- <h6>Artifacts</h6>
- <WorkflowArtifacts workflow={this.state.workflow} archived={true} />
- <WorkflowResourcePanel workflow={this.state.workflow} />
+ <div className='workflow-details__container'>
+ <div className='argo-container'>
+ <div className='workflow-details__content'>
+ <WorkflowSummaryPanel workflow={this.state.workflow} />
+ {execSpec(this.state.workflow).arguments && execSpec(this.state.workflow).arguments.parameters && (
+ <React.Fragment>
+ <h6>Parameters</h6>
+ <WorkflowParametersPanel parameters={execSpec(this.state.workflow).arguments.parameters} />
+ </React.Fragment>
+ )}
+ <h6>Artifacts</h6>
+ <WorkflowArtifacts workflow={this.state.workflow} archived={true} />
+ <WorkflowResourcePanel workflow={this.state.workflow} />
+ </div>
  </div>
  </div>
  ) : (

diff --git a/ui/src/app/userinfo/components/cli-help.tsx b/ui/src/app/userinfo/components/cli-help.tsx
@@ -13,7 +13,7 @@ export const CliHelp = () => {
  .split(';')
  .map(x => x.trim())
  .find(x => x.startsWith('authorization=')) || ''
- ).replace(/^authorization="?(.*)"?$/, '$1');
+ ).replace(/^authorization="?(.*?)"?$/, '$1');
 
  const text = `export ARGO_SERVER='${document.location.hostname}:${document.location.port || (argoSecure ? 443 : 80)}' 
 export ARGO_HTTP1=true 

diff --git a/ui/src/app/workflows/components/workflow-details/workflow-details.scss b/ui/src/app/workflows/components/workflow-details/workflow-details.scss
@@ -37,6 +37,12 @@
  }
  }
 
+ &__container {
+ height: calc(100vh - 2 * #{$top-bar-height});
+ max-width: 100%;
+ overflow: auto;
+ }
+
  &__graph-container {
  position: relative;
  height: calc(100vh - 2 * #{$top-bar-height});

diff --git a/ui/src/app/workflows/components/workflow-details/workflow-details.tsx b/ui/src/app/workflows/components/workflow-details/workflow-details.tsx
@@ -163,20 +163,22 @@ export const WorkflowDetails = ({history, location, match}: RouteComponentProps<
  {!workflow ? (
  <Loading />
  ) : (
- <div className='argo-container'>
- <div className='workflow-details__content'>
- <WorkflowSummaryPanel workflow={workflow} />
- {renderSecurityNudge()}
- {renderCostOptimisations()}
- {workflow.spec.arguments && workflow.spec.arguments.parameters && (
- <React.Fragment>
- <h6>Parameters</h6>
- <WorkflowParametersPanel parameters={workflow.spec.arguments.parameters} />
- </React.Fragment>
- )}
- <h5>Artifacts</h5>
- <WorkflowArtifacts workflow={workflow} archived={false} />
- <WorkflowResourcePanel workflow={workflow} />
+ <div className='workflow-details__container'>
+ <div className='argo-container'>
+ <div className='workflow-details__content'>
+ <WorkflowSummaryPanel workflow={workflow} />
+ {renderSecurityNudge()}
+ {renderCostOptimisations()}
+ {workflow.spec.arguments && workflow.spec.arguments.parameters && (
+ <React.Fragment>
+ <h6>Parameters</h6>
+ <WorkflowParametersPanel parameters={workflow.spec.arguments.parameters} />
+ </React.Fragment>
+ )}
+ <h5>Artifacts</h5>
+ <WorkflowArtifacts workflow={workflow} archived={false} />
+ <WorkflowResourcePanel workflow={workflow} />
+ </div>
  </div>
  </div>
  )}