mirror of https://github.com/portainer/portainer
fix(gitops): correct commit hash link [EE-6346] (#10722)
parent
b051629f13
commit
83cd5d9b2f
|
@ -15,6 +15,7 @@ import { Icon } from '@@/Icon';
|
||||||
import { Link } from '@@/Link';
|
import { Link } from '@@/Link';
|
||||||
|
|
||||||
import { DeploymentStatus, EdgeStackStatus, StatusType } from '../../types';
|
import { DeploymentStatus, EdgeStackStatus, StatusType } from '../../types';
|
||||||
|
import { removeTrailingGitExtension } from '../../utils';
|
||||||
|
|
||||||
import { EnvironmentActions } from './EnvironmentActions';
|
import { EnvironmentActions } from './EnvironmentActions';
|
||||||
import { ActionStatus } from './ActionStatus';
|
import { ActionStatus } from './ActionStatus';
|
||||||
|
@ -187,7 +188,9 @@ function TargetVersionCell({
|
||||||
{row.original.TargetCommitHash ? (
|
{row.original.TargetCommitHash ? (
|
||||||
<div>
|
<div>
|
||||||
<a
|
<a
|
||||||
href={`${row.original.GitConfigURL}/commit/${row.original.TargetCommitHash}`}
|
href={`${removeTrailingGitExtension(
|
||||||
|
row.original.GitConfigURL
|
||||||
|
)}/commit/${row.original.TargetCommitHash}`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noreferrer"
|
rel="noreferrer"
|
||||||
>
|
>
|
||||||
|
@ -236,7 +239,9 @@ function DeployedVersionCell({
|
||||||
<div>
|
<div>
|
||||||
{statusIcon}
|
{statusIcon}
|
||||||
<a
|
<a
|
||||||
href={`${row.original.GitConfigURL}/commit/${row.original.TargetCommitHash}`}
|
href={`${removeTrailingGitExtension(
|
||||||
|
row.original.GitConfigURL
|
||||||
|
)}/commit/${row.original.TargetCommitHash}`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noreferrer"
|
rel="noreferrer"
|
||||||
>
|
>
|
||||||
|
|
|
@ -8,6 +8,7 @@ import { buildNameColumn } from '@@/datatables/NameCell';
|
||||||
import { Link } from '@@/Link';
|
import { Link } from '@@/Link';
|
||||||
|
|
||||||
import { StatusType } from '../../types';
|
import { StatusType } from '../../types';
|
||||||
|
import { removeTrailingGitExtension } from '../../utils';
|
||||||
|
|
||||||
import { EdgeStackStatus } from './EdgeStacksStatus';
|
import { EdgeStackStatus } from './EdgeStacksStatus';
|
||||||
import { DecoratedEdgeStack } from './types';
|
import { DecoratedEdgeStack } from './types';
|
||||||
|
@ -151,7 +152,9 @@ export const columns = _.compact([
|
||||||
<div className="text-center">
|
<div className="text-center">
|
||||||
<a
|
<a
|
||||||
target="_blank"
|
target="_blank"
|
||||||
href={`${item.GitConfig.URL}/commit/${item.GitConfig.ConfigHash}`}
|
href={`${removeTrailingGitExtension(
|
||||||
|
item.GitConfig.URL
|
||||||
|
)}/commit/${item.GitConfig.ConfigHash}`}
|
||||||
rel="noreferrer"
|
rel="noreferrer"
|
||||||
>
|
>
|
||||||
{item.GitConfig.ConfigHash.slice(0, 7)}
|
{item.GitConfig.ConfigHash.slice(0, 7)}
|
||||||
|
|
|
@ -19,3 +19,8 @@ export function getValidEditorTypes(
|
||||||
? _.intersection(...endpointTypes.map((type) => right[type]))
|
? _.intersection(...endpointTypes.map((type) => right[type]))
|
||||||
: [EditorType.Compose, EditorType.Kubernetes];
|
: [EditorType.Compose, EditorType.Kubernetes];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function removeTrailingGitExtension(url: string) {
|
||||||
|
// the url could have the .git extension. Remove it if it does.
|
||||||
|
return url.replace(/\.git$/, '');
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue