Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

cleanup

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-09-16 15:09:30 +02:00
parent 29134ae261
commit 89b6829108
7 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-hg-plugin/src/main/js/HgTagInformation.tsx
View File

@@ -41,7 +41,7 @@ const HgTagInformation: FC<Props> = ({ tag }) => {
<> <>
<h4>{t("scm-hg-plugin.information.checkoutTag")}</h4> <h4>{t("scm-hg-plugin.information.checkoutTag")}</h4>
<pre> <pre>
<code>hg update {tag?.name}</code> <code>hg update {tag.name}</code>
</pre> </pre>
</> </>
); );

10
scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx
View File

@@ -49,10 +49,12 @@ const BranchRow: FC<Props> = ({ baseUrl, branch }) => {
<Link to={to} title={branch.name}> <Link to={to} title={branch.name}>
{branch.name} {branch.name}
<DefaultBranchTag defaultBranch={branch.defaultBranch} /> <DefaultBranchTag defaultBranch={branch.defaultBranch} />
<Modified className="has-text-grey is-ellipsis-overflow"> {branch?.lastModified && branch.lastModifier && (
{t("branches.overview.lastModified")} <DateFromNow date={branch.lastModified} />{" "} <Modified className="has-text-grey is-ellipsis-overflow">
{t("branches.overview.lastModifier")} {branch.lastModifier?.name} {t("branches.overview.lastModified")} <DateFromNow date={branch.lastModified} />{" "}
</Modified> {t("branches.overview.lastModifier")} {branch.lastModifier?.name}
</Modified>
)}
</Link> </Link>
</td> </td>
</tr> </tr>

4
scm-ui/ui-webapp/src/repos/branches/modules/branches.ts
View File

@@ -129,8 +129,8 @@ export function createBranch(
// Selectors // Selectors
function collectBranches(repoState: any) { function collectBranches(repoState) {
return repoState.list._embedded.branches.map((name: string) => repoState.byName[name]); return repoState.list._embedded.branches.map(name => repoState.byName[name]);
} }
const memoizedBranchCollector = memoizeOne(collectBranches); const memoizedBranchCollector = memoizeOne(collectBranches);

4
scm-ui/ui-webapp/src/repos/tags/components/TagView.tsx
View File

@@ -34,7 +34,7 @@ type Props = {
const TagView: FC<Props> = ({ repository, tag }) => { const TagView: FC<Props> = ({ repository, tag }) => {
return ( return (
<div> <>
<TagDetail tag={tag} repository={repository} /> <TagDetail tag={tag} repository={repository} />
<hr /> <hr />
<div className="content"> <div className="content">
@@ -47,7 +47,7 @@ const TagView: FC<Props> = ({ repository, tag }) => {
}} }}
/> />
</div> </div>
</div> </>
); );
}; };

4
scm-ui/ui-webapp/src/repos/tags/container/TagRoot.tsx
View File

@@ -54,8 +54,8 @@ const TagRoot: FC<Props> = ({ repository, baseUrl }) => {
}, [repository]); }, [repository]);
useEffect(() => { useEffect(() => {
const tagName = match?.params?.tag; const tagName = decodeURIComponent(match?.params?.tag);
const link = tags && tags.length > 0 && (tags.find(tag => tag.name === tagName)?._links.self as Link).href; const link = tags?.length > 0 && (tags.find(tag => tag.name === tagName)?._links.self as Link).href;
if (link) { if (link) {
apiClient apiClient
.get(link) .get(link)

2
scm-ui/ui-webapp/src/repos/tags/container/TagsOverview.tsx
View File

@@ -54,7 +54,7 @@ const TagsOverview: FC<Props> = ({ repository, baseUrl }) => {
}, [repository]); }, [repository]);
const renderTagsTable = () => { const renderTagsTable = () => {
if (!loading && tags && tags.length > 0) { if (!loading && tags?.length > 0) {
orderTags(tags); orderTags(tags);
return <TagTable baseUrl={baseUrl} tags={tags} />; return <TagTable baseUrl={baseUrl} tags={tags} />;
} }

1
scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchDto.java
View File

@@ -54,6 +54,7 @@ public class BranchDto extends HalRepresentation {
private boolean defaultBranch; private boolean defaultBranch;
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
private Instant lastModified; private Instant lastModified;
@JsonInclude(JsonInclude.Include.NON_NULL)
private PersonDto lastModifier; private PersonDto lastModifier;
BranchDto(Links links, Embedded embedded) { BranchDto(Links links, Embedded embedded) {