Add external link for git submodule with absolute urls

This commit is contained in:
Florian Scholdei
2020-10-01 15:52:07 +02:00
parent fb3ba789ea
commit 362a5447d1
2 changed files with 82 additions and 38 deletions

View File

@@ -22,15 +22,14 @@
* SOFTWARE.
*/
import * as React from "react";
import { Link } from "react-router-dom";
import { WithTranslation, withTranslation } from "react-i18next";
import classNames from "classnames";
import styled from "styled-components";
import { binder, ExtensionPoint } from "@scm-manager/ui-extensions";
import { File } from "@scm-manager/ui-types";
import { DateFromNow, FileSize, Tooltip } from "@scm-manager/ui-components";
import { DateFromNow, FileSize, Tooltip, Icon } from "@scm-manager/ui-components";
import FileIcon from "./FileIcon";
import { Icon } from "@scm-manager/ui-components";
import { WithTranslation, withTranslation } from "react-i18next";
import FileLink from "./content/FileLink";
type Props = WithTranslation & {
file: File;
@@ -45,46 +44,21 @@ const NoWrapTd = styled.td`
white-space: nowrap;
`;
export function createLink(base: string, file: File) {
let link = base;
if (file.path) {
let path = file.path;
if (path.startsWith("/")) {
path = path.substring(1);
}
link += "/" + path;
}
if (!link.endsWith("/")) {
link += "/";
}
return link;
}
class FileTreeLeaf extends React.Component<Props> {
createLink = (file: File) => {
return createLink(this.props.baseUrl, file);
};
createFileIcon = (file: File) => {
if (file.directory) {
return (
<Link to={this.createLink(file)}>
<FileIcon file={file} />
</Link>
);
}
return (
<Link to={this.createLink(file)}>
<FileLink baseUrl={this.props.baseUrl} file={file}>
<FileIcon file={file} />
</Link>
</FileLink>
);
};
createFileName = (file: File) => {
if (file.directory) {
return <Link to={this.createLink(file)}>{file.name}</Link>;
}
return <Link to={this.createLink(file)}>{file.name}</Link>;
return (
<FileLink baseUrl={this.props.baseUrl} file={file}>
{file.name}
</FileLink>
);
};
contentIfPresent = (file: File, attribute: string, content: (file: File) => any) => {
@@ -94,13 +68,13 @@ class FileTreeLeaf extends React.Component<Props> {
} else if (file.computationAborted) {
return (
<Tooltip location="top" message={t("sources.file-tree.computationAborted")}>
<Icon name={"question-circle"} />
<Icon name="question-circle" />
</Tooltip>
);
} else if (file.partialResult) {
return (
<Tooltip location="top" message={t("sources.file-tree.notYetComputed")}>
<Icon name={"hourglass"} />
<Icon name="hourglass" />
</Tooltip>
);
} else {

View File

@@ -0,0 +1,70 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import React, { FC, ReactNode } from "react";
import { Link } from "react-router-dom";
import { File } from "@scm-manager/ui-types";
type Props = {
baseUrl: string;
file: File;
children: ReactNode;
};
const createFolderLink = (base: string, file: File) => {
let link = base;
if (file.path) {
let path = file.path;
if (path.startsWith("/")) {
path = path.substring(1);
}
link += "/" + path;
}
if (!link.endsWith("/")) {
link += "/";
}
return link;
};
const createRelativeLink = (base: string, path: string) => {
let link = base;
link += path.split(".").join("");
if (!link.endsWith("/")) {
link += "/";
}
return link;
};
const FileLink: FC<Props> = ({ baseUrl, file, children }) => {
if (file?.subRepository?.repositoryUrl) {
const link = file.subRepository.repositoryUrl;
if (link.startsWith("http://") || link.startsWith("https://")) {
return <a href={link}>{children}</a>;
} else if (link.startsWith(".")) {
return <Link to={createRelativeLink(baseUrl, link)}>{children}</Link>;
}
}
return <Link to={createFolderLink(baseUrl, file)}>{children}</Link>;
};
export default FileLink;