diff --git a/gradle/changelog/ahead-behind.yaml b/gradle/changelog/ahead-behind.yaml index bb66e2d2c8..d3804f40ca 100644 --- a/gradle/changelog/ahead-behind.yaml +++ b/gradle/changelog/ahead-behind.yaml @@ -1,2 +1,4 @@ - type: changed description: Apply new design to ahead behind tag +- type: bugfix + description: Fixed a bug where the loadingspinner would not show up diff --git a/scm-ui/ui-webapp/src/repos/branches/components/BranchListItem.tsx b/scm-ui/ui-webapp/src/repos/branches/components/BranchListItem.tsx index 5c65c0857b..90b8a7acc1 100644 --- a/scm-ui/ui-webapp/src/repos/branches/components/BranchListItem.tsx +++ b/scm-ui/ui-webapp/src/repos/branches/components/BranchListItem.tsx @@ -29,7 +29,7 @@ import { Link } from "react-router-dom"; import { encodePart } from "../../sources/components/content/FileLink"; import { useKeyboardIteratorTarget } from "@scm-manager/ui-shortcuts"; import { Trans, useTranslation } from "react-i18next"; -import { DateFromNow } from "@scm-manager/ui-components"; +import {DateFromNow, SmallLoadingSpinner} from "@scm-manager/ui-components"; import { ExtensionPoint, extensionPoints } from "@scm-manager/ui-extensions"; import React, { FC } from "react"; import { Branch, BranchDetails, Repository } from "@scm-manager/ui-types"; @@ -47,7 +47,6 @@ type Props = { const BranchListItem: FC = ({ branch, remove, isLoading, branchesDetails, baseUrl, repository }) => { const [t] = useTranslation("repos"); const branchDetails = branchesDetails?.find(({ branchName }) => branchName === branch.name); - return ( = ({ branch, remove, isLoading, branchesDetails, {branch.defaultBranch ? null : t("branch.aheadBehind.label")} - + {isLoading? : } )}