fix: link templates not replacing multiple templates with same name (a…

…rgoproj#4516) Signed-off-by: Ludovic Cleroux <[email protected]>
dreamholy · Nov 13, 2020 · d0082e8 · d0082e8
1 parent 411bde3
commit d0082e8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/USERS.md b/USERS.md
@@ -70,6 +70,7 @@ Currently, the following organizations are **officially** using Argo Workflows:
 1. [Mixpanel](https://mixpanel.com)
 1. [New Relic](https://newrelic.com/)
 1. [Nikkei](https://www.nikkei.co.jp/nikkeiinfo/en/)
+1. [Norwegian Refugee Council](https://www.nrc.no/)
 1. [nrd.io](https://nrd.io/)
 1. [NVIDIA](https://www.nvidia.com/)
 1. [Onepanel](https://docs.onepanel.ai)

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
@@ -248,9 +248,9 @@ export class ArchivedWorkflowDetails extends BasePage<RouteComponentProps<any>,
 
  private openLink(link: Link) {
  document.location.href = link.url
- .replace('${metadata.namespace}', this.state.workflow.metadata.namespace)
- .replace('${metadata.name}', this.state.workflow.metadata.name)
- .replace('${status.startedAt}', this.state.workflow.status.startedAt)
- .replace('${status.finishedAt}', this.state.workflow.status.finishedAt);
+ .replace(/\${metadata\.namespace}/g, this.state.workflow.metadata.namespace)
+ .replace(/\${metadata\.name}/g, this.state.workflow.metadata.name)
+ .replace(/\${status\.startedAt}/g, this.state.workflow.status.startedAt)
+ .replace(/\${status\.finishedAt}/g, this.state.workflow.status.finishedAt);
  }
 }
diff --git a/ui/src/app/workflows/components/workflow-details/workflow-details.tsx b/ui/src/app/workflows/components/workflow-details/workflow-details.tsx
@@ -350,10 +350,10 @@ export class WorkflowDetails extends React.Component<RouteComponentProps<any>, W
 
  private openLink(link: Link) {
  const url = link.url
- .replace('${metadata.namespace}', this.state.workflow.metadata.namespace)
- .replace('${metadata.name}', this.state.workflow.metadata.name)
- .replace('${status.startedAt}', this.state.workflow.status.startedAt)
- .replace('${status.finishedAt}', this.state.workflow.status.finishedAt);
+ .replace(/\${metadata\.namespace}/g, this.state.workflow.metadata.namespace)
+ .replace(/\${metadata\.name}/g, this.state.workflow.metadata.name)
+ .replace(/\${status\.startedAt}/g, this.state.workflow.status.startedAt)
+ .replace(/\${status\.finishedAt}/g, this.state.workflow.status.finishedAt);
  if ((window.event as MouseEvent).ctrlKey) {
  window.open(url, '_blank');
  } else {

diff --git a/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx b/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx
@@ -119,10 +119,10 @@ export const WorkflowNodeSummary = (props: Props) => {
  <a
  className='argo-button argo-button--base-o'
  href={link.url
- .replace('${metadata.namespace}', props.workflow.metadata.namespace)
- .replace('${metadata.name}', props.node.id)
- .replace('${status.startedAt}', props.node.startedAt)
- .replace('${status.finishedAt}', props.node.finishedAt)}>
+ .replace(/\${metadata\.namespace}/g, props.workflow.metadata.namespace)
+ .replace(/\${metadata\.name}/g, props.node.id)
+ .replace(/\${status\.startedAt}/g, props.node.startedAt)
+ .replace(/\${status\.finishedAt}/g, props.node.finishedAt)}>
  <i className='fa fa-link' /> {link.name}
  </a>
  ))}