1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00

fix(gitops): clean trailing slash [EE-6346] (#10777)

Co-authored-by: testa113 <testa113>
This commit is contained in:
Ali 2023-12-07 13:43:01 +13:00 committed by GitHub
parent a2d6d6002c
commit 4e8b371fb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 16 deletions

View file

@ -9,13 +9,13 @@ import UpToDate from '@/assets/ico/icon_up-to-date.svg?c';
import { isoDateFromTimestamp } from '@/portainer/filters/filters';
import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
import { getDashboardRoute } from '@/react/portainer/environments/utils';
import { cleanGitRepoUrl } from '@/react/portainer/gitops/utils';
import { Button } from '@@/buttons';
import { Icon } from '@@/Icon';
import { Link } from '@@/Link';
import { DeploymentStatus, EdgeStackStatus, StatusType } from '../../types';
import { removeTrailingGitExtension } from '../../utils';
import { EnvironmentActions } from './EnvironmentActions';
import { ActionStatus } from './ActionStatus';
@ -188,9 +188,9 @@ function TargetVersionCell({
{row.original.TargetCommitHash ? (
<div>
<a
href={`${removeTrailingGitExtension(
row.original.GitConfigURL
)}/commit/${row.original.TargetCommitHash}`}
href={`${cleanGitRepoUrl(row.original.GitConfigURL)}/commit/${
row.original.TargetCommitHash
}`}
target="_blank"
rel="noreferrer"
>
@ -239,9 +239,9 @@ function DeployedVersionCell({
<div>
{statusIcon}
<a
href={`${removeTrailingGitExtension(
row.original.GitConfigURL
)}/commit/${row.original.TargetCommitHash}`}
href={`${cleanGitRepoUrl(row.original.GitConfigURL)}/commit/${
row.original.TargetCommitHash
}`}
target="_blank"
rel="noreferrer"
>

View file

@ -3,12 +3,12 @@ import _ from 'lodash';
import { isoDateFromTimestamp } from '@/portainer/filters/filters';
import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
import { cleanGitRepoUrl } from '@/react/portainer/gitops/utils';
import { buildNameColumn } from '@@/datatables/buildNameColumn';
import { Link } from '@@/Link';
import { StatusType } from '../../types';
import { removeTrailingGitExtension } from '../../utils';
import { EdgeStackStatus } from './EdgeStacksStatus';
import { DecoratedEdgeStack } from './types';
@ -147,9 +147,9 @@ export const columns = _.compact([
<div className="text-center">
<a
target="_blank"
href={`${removeTrailingGitExtension(
item.GitConfig.URL
)}/commit/${item.GitConfig.ConfigHash}`}
href={`${cleanGitRepoUrl(item.GitConfig.URL)}/commit/${
item.GitConfig.ConfigHash
}`}
rel="noreferrer"
>
{item.GitConfig.ConfigHash.slice(0, 7)}

View file

@ -19,8 +19,3 @@ export function getValidEditorTypes(
? _.intersection(...endpointTypes.map((type) => right[type]))
: [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$/, '');
}