diff --git a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx index 094f873f6..f7702b7f1 100644 --- a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx +++ b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx @@ -15,6 +15,7 @@ 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'; @@ -187,7 +188,9 @@ function TargetVersionCell({ {row.original.TargetCommitHash ? (
@@ -236,7 +239,9 @@ function DeployedVersionCell({
{statusIcon} diff --git a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx index 354b9669a..5452d926f 100644 --- a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx +++ b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx @@ -8,6 +8,7 @@ import { buildNameColumn } from '@@/datatables/NameCell'; import { Link } from '@@/Link'; import { StatusType } from '../../types'; +import { removeTrailingGitExtension } from '../../utils'; import { EdgeStackStatus } from './EdgeStacksStatus'; import { DecoratedEdgeStack } from './types'; @@ -151,7 +152,9 @@ export const columns = _.compact([
{item.GitConfig.ConfigHash.slice(0, 7)} diff --git a/app/react/edge/edge-stacks/utils.ts b/app/react/edge/edge-stacks/utils.ts index 82cbfec7b..5c4bedee2 100644 --- a/app/react/edge/edge-stacks/utils.ts +++ b/app/react/edge/edge-stacks/utils.ts @@ -19,3 +19,8 @@ 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$/, ''); +}