Fix branch action & details rendering conditions

This commit is contained in:
Konstantin Schaper
2023-08-17 08:58:53 +02:00
parent 9fbcddfcaa
commit 81a4afdd79

View File

@@ -22,18 +22,18 @@
* SOFTWARE. * SOFTWARE.
*/ */
import { Dialog, Menu } from "@scm-manager/ui-overlays"; import { Card, CardList } from "@scm-manager/ui-layout";
import { Icon } from "@scm-manager/ui-buttons";
import { CardList, Card } from "@scm-manager/ui-layout";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { encodePart } from "../../sources/components/content/FileLink"; import { encodePart } from "../../sources/components/content/FileLink";
import { useKeyboardIteratorTarget } from "@scm-manager/ui-shortcuts"; import { useKeyboardIteratorTarget } from "@scm-manager/ui-shortcuts";
import { Trans, useTranslation } from "react-i18next"; import { Trans, useTranslation } from "react-i18next";
import { DateFromNow } from "@scm-manager/ui-components"; import { DateFromNow } from "@scm-manager/ui-components";
import { ExtensionPoint, extensionPoints } from "@scm-manager/ui-extensions"; import { ExtensionPoint, extensionPoints, useBinder } from "@scm-manager/ui-extensions";
import React, { FC } from "react"; import React, { FC } from "react";
import { Branch, BranchDetails, Repository } from "@scm-manager/ui-types"; import { Branch, BranchDetails, Repository } from "@scm-manager/ui-types";
import AheadBehindTag from "./AheadBehindTag"; import AheadBehindTag from "./AheadBehindTag";
import { Dialog, Menu } from "@scm-manager/ui-overlays";
import { Icon } from "@scm-manager/ui-buttons";
type Props = { type Props = {
branch: Branch; branch: Branch;
@@ -46,13 +46,29 @@ type Props = {
const BranchListItem: FC<Props> = ({ branch, remove, isLoading, branchesDetails, baseUrl, repository }) => { const BranchListItem: FC<Props> = ({ branch, remove, isLoading, branchesDetails, baseUrl, repository }) => {
const [t] = useTranslation("repos"); const [t] = useTranslation("repos");
const binder = useBinder();
const branchDetails = branchesDetails?.find(({ branchName }) => branchName === branch.name); const branchDetails = branchesDetails?.find(({ branchName }) => branchName === branch.name);
const canDelete = "delete" in branch._links;
const hasAction =
canDelete ||
binder.hasExtension<extensionPoints.BranchListMenu>("branches.list.menu", {
repository,
branch,
});
const hasDetails =
!branch.defaultBranch ||
binder.hasExtension<extensionPoints.BranchListDetail>("branches.list.detail", {
branch,
branchDetails,
repository,
});
return ( return (
<CardList.Card <CardList.Card
key={branch.name} key={branch.name}
action={ action={
"delete" in branch._links ? ( hasAction ? (
<Menu> <Menu>
{canDelete ? (
<Menu.DialogButton <Menu.DialogButton
title={t("branch.delete.confirmAlert.title")} title={t("branch.delete.confirmAlert.title")}
description={t("branch.delete.confirmAlert.message", { branch: branch.name })} description={t("branch.delete.confirmAlert.message", { branch: branch.name })}
@@ -68,6 +84,7 @@ const BranchListItem: FC<Props> = ({ branch, remove, isLoading, branchesDetails,
<Icon>trash</Icon> <Icon>trash</Icon>
{t("branch.delete.button")} {t("branch.delete.button")}
</Menu.DialogButton> </Menu.DialogButton>
) : null}
<ExtensionPoint<extensionPoints.BranchListMenu> <ExtensionPoint<extensionPoints.BranchListMenu>
name="branches.list.menu" name="branches.list.menu"
props={{ props={{
@@ -100,18 +117,19 @@ const BranchListItem: FC<Props> = ({ branch, remove, isLoading, branchesDetails,
}} }}
/> />
</Card.Row> </Card.Row>
{hasDetails ? (
<Card.Row> <Card.Row>
<Card.Details> <Card.Details>
{!branch.defaultBranch ? (
<Card.Details.Detail> <Card.Details.Detail>
{({ labelId }) => ( {({ labelId }) => (
<> <>
<Card.Details.Detail.Label id={labelId}> <Card.Details.Detail.Label id={labelId}>{t("branch.aheadBehind.label")}</Card.Details.Detail.Label>
{branch.defaultBranch ? null : t("branch.aheadBehind.label")}
</Card.Details.Detail.Label>
<AheadBehindTag branch={branch} details={branchDetails} labelId={labelId} /> <AheadBehindTag branch={branch} details={branchDetails} labelId={labelId} />
</> </>
)} )}
</Card.Details.Detail> </Card.Details.Detail>
) : null}
<ExtensionPoint<extensionPoints.BranchListDetail> <ExtensionPoint<extensionPoints.BranchListDetail>
name="branches.list.detail" name="branches.list.detail"
props={{ props={{
@@ -123,6 +141,7 @@ const BranchListItem: FC<Props> = ({ branch, remove, isLoading, branchesDetails,
/> />
</Card.Details> </Card.Details>
</Card.Row> </Card.Row>
) : null}
</CardList.Card> </CardList.Card>
); );
}; };