Add files to empty repository (#1717)

It should also be possible to create new files in empty non-initiated repositories with the help of scm-manager/scm-editor-plugin/pull/39. So that the plugin can mount itself, a new endpoint was provided hereby. Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
2025-11-08 22:45:45 +01:00 · 2021-07-13 11:40:49 +02:00
parent 1ce19eea4a
commit 0d0f9995fe
7 changed files with 168 additions and 105 deletions
--- a/gradle/changelog/add_files_to_empty_repo.yaml
+++ b/gradle/changelog/add_files_to_empty_repo.yaml
@@ -0,0 +1,2 @@
+- type: Added
+  description: Create files in empty non-initiated repositories ([#1717](https://github.com/scm-manager/scm-manager/pull/1717))
--- a/scm-ui/ui-components/src/Breadcrumb.tsx
+++ b/scm-ui/ui-components/src/Breadcrumb.tsx
@@ -26,12 +26,12 @@ import { useTranslation } from "react-i18next";
 import { useHistory, useLocation, Link } from "react-router-dom";
 import classNames from "classnames";
 import styled from "styled-components";
-import { binder, ExtensionPoint } from "@scm-manager/ui-extensions";
+import { urls } from "@scm-manager/ui-api";
 import { Branch, Repository, File } from "@scm-manager/ui-types";
+import { binder, ExtensionPoint, extensionPoints } from "@scm-manager/ui-extensions";
 import Icon from "./Icon";
 import Tooltip from "./Tooltip";
 import copyToClipboard from "./CopyToClipboard";
-import { urls } from "@scm-manager/ui-api";

 type Props = {
  repository: Repository;
@@ -65,8 +65,6 @@ const BreadcrumbNav = styled.nav`
  flex: 1;
  display: flex;
  align-items: center;
-  margin: 1rem 1rem !important;
-
  width: 100%;

  /* move slash to end */
@@ -127,7 +125,7 @@ const Breadcrumb: FC<Props> = ({
  baseUrl,
  sources,
  permalink,
-  preButtons
+  preButtons,
 }) => {
  const location = useLocation();
  const history = useHistory();
@@ -138,7 +136,10 @@ const Breadcrumb: FC<Props> = ({
    if (path) {
      const paths = path.split("/");
      return paths.map((pathFragment, index) => {
-        const currPath = paths.slice(0, index + 1).join("/");
+        let currPath = paths.slice(0, index + 1).join("/");
+        if (!currPath.endsWith("/")) {
+          currPath = currPath + "/";
+        }
        if (paths.length - 1 === index) {
          return (
            <li className="is-active" key={index}>
@@ -172,30 +173,22 @@ const Breadcrumb: FC<Props> = ({
    ).finally(() => setCopying(false));
  };

-  let homeUrl = baseUrl + "/";
-  if (revision) {
-    homeUrl += encodeURIComponent(revision) + "/";
-  }
-
+  const renderBreadcrumbNav = () => {
    let prefixButtons = null;
    if (preButtons) {
      prefixButtons = <PrefixButton>{preButtons}</PrefixButton>;
    }

-  const extProps = {
-    baseUrl,
-    revision: revision ? encodeURIComponent(revision) : "",
-    branch: branch ? branch : defaultBranch,
-    path,
-    sources,
-    repository
-  };
+    let homeUrl = baseUrl + "/";
+    if (revision) {
+      homeUrl += encodeURIComponent(revision) + "/";
+    } else {
+      homeUrl = `/repo/${repository.namespace}/${repository.name}/code/sources/`;
+    }

    return (
-    <>
-      <div className="is-flex is-align-items-center">
      <BreadcrumbNav
-          className={classNames("breadcrumb", "sources-breadcrumb", "ml-1", "mb-0")}
+        className={classNames("breadcrumb", "sources-breadcrumb", "mx-2", "my-4")}
        aria-label="breadcrumbs"
      >
        {prefixButtons}
@@ -217,11 +210,42 @@ const Breadcrumb: FC<Props> = ({
          )}
        </PermaLinkWrapper>
      </BreadcrumbNav>
-        {binder.hasExtension("repos.sources.actionbar") && (
-          <ActionBar>
-            <ExtensionPoint name="repos.sources.actionbar" props={extProps} renderAll={true} />
-          </ActionBar>
-        )}
+    );
+  };
+
+  const extProps = {
+    baseUrl,
+    revision: revision ? encodeURIComponent(revision) : "",
+    branch: branch ? branch : defaultBranch,
+    path,
+    sources,
+    repository,
+  };
+
+  const renderExtensionPoints = () => {
+    if (
+      binder.hasExtension<extensionPoints.ReposSourcesEmptyActionbar>("repos.sources.empty.actionbar") &&
+      sources?._embedded?.children?.length === 0
+    ) {
+      return (
+        <ExtensionPoint
+          name="repos.sources.empty.actionbar"
+          props={{ repository, sources }}
+          renderAll={true}
+        />
+      );
+    }
+    if (binder.hasExtension<extensionPoints.ReposSourcesActionbar>("repos.sources.actionbar")) {
+      return <ExtensionPoint name="repos.sources.actionbar" props={extProps} renderAll={true} />;
+    }
+    return null;
+  };
+
+  return (
+    <>
+      <div className="is-flex is-align-items-center is-justify-content-flex-end">
+        {renderBreadcrumbNav()}
+        {<ActionBar className="my-2">{renderExtensionPoints()}</ActionBar>}
      </div>
      <hr className="is-marginless" />
    </>
--- a/scm-ui/ui-components/src/snapshots/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/snapshots/storyshots.test.ts.snap
@@ -1663,11 +1663,11 @@ exports[`Storyshots BreadCrumb Default 1`] = `
  className="Breadcrumbstories__Wrapper-sc-1eq8sgz-0 exRctT"
 >
  <div
-    className="is-flex is-align-items-center"
+    className="is-flex is-align-items-center is-justify-content-flex-end"
  >
    <nav
      aria-label="breadcrumbs"
-      className="Breadcrumb__BreadcrumbNav-zvtb4t-1 ieUHOq breadcrumb sources-breadcrumb ml-1 mb-0"
+      className="Breadcrumb__BreadcrumbNav-zvtb4t-1 eupowG breadcrumb sources-breadcrumb mx-2 my-4"
    >
      <ul>
        <li>
@@ -1684,7 +1684,7 @@ exports[`Storyshots BreadCrumb Default 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/src"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/src/"
            onClick={[Function]}
            title="src"
          >
@@ -1694,7 +1694,7 @@ exports[`Storyshots BreadCrumb Default 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/src/main"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/src/main/"
            onClick={[Function]}
            title="main"
          >
@@ -1704,7 +1704,7 @@ exports[`Storyshots BreadCrumb Default 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/src/main/java"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/src/main/java/"
            onClick={[Function]}
            title="java"
          >
@@ -1714,7 +1714,7 @@ exports[`Storyshots BreadCrumb Default 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/src/main/java/com"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/src/main/java/com/"
            onClick={[Function]}
            title="com"
          >
@@ -1748,6 +1748,9 @@ exports[`Storyshots BreadCrumb Default 1`] = `
        </span>
      </span>
    </nav>
+    <div
+      className="Breadcrumb__ActionBar-zvtb4t-3 izqSnl my-2"
+    />
  </div>
  <hr
    className="is-marginless"
@@ -1760,11 +1763,11 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
  className="Breadcrumbstories__Wrapper-sc-1eq8sgz-0 exRctT"
 >
  <div
-    className="is-flex is-align-items-center"
+    className="is-flex is-align-items-center is-justify-content-flex-end"
  >
    <nav
      aria-label="breadcrumbs"
-      className="Breadcrumb__BreadcrumbNav-zvtb4t-1 ieUHOq breadcrumb sources-breadcrumb ml-1 mb-0"
+      className="Breadcrumb__BreadcrumbNav-zvtb4t-1 eupowG breadcrumb sources-breadcrumb mx-2 my-4"
    >
      <ul>
        <li>
@@ -1781,7 +1784,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/"
            onClick={[Function]}
            title="dream-path"
          >
@@ -1791,7 +1794,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/"
            onClick={[Function]}
            title="src"
          >
@@ -1801,7 +1804,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/"
            onClick={[Function]}
            title="main"
          >
@@ -1811,7 +1814,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/"
            onClick={[Function]}
            title="scm-plugins"
          >
@@ -1821,7 +1824,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/"
            onClick={[Function]}
            title="javaUtilityHomeHousingLinkReferrer"
          >
@@ -1831,7 +1834,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/sonia"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/sonia/"
            onClick={[Function]}
            title="sonia"
          >
@@ -1841,7 +1844,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/sonia/scm"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/sonia/scm/"
            onClick={[Function]}
            title="scm"
          >
@@ -1851,7 +1854,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/sonia/scm/repositoryUndergroundSupportManager"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/sonia/scm/repositoryUndergroundSupportManager/"
            onClick={[Function]}
            title="repositoryUndergroundSupportManager"
          >
@@ -1861,7 +1864,7 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        <li>
          <a
            className="is-ellipsis-overflow"
-            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/sonia/scm/repositoryUndergroundSupportManager/spi"
+            href="/scm-manager.org/scm/repo/hitchhiker/heartOfGold/sources/1/dream-path/src/main/scm-plugins/javaUtilityHomeHousingLinkReferrer/sonia/scm/repositoryUndergroundSupportManager/spi/"
            onClick={[Function]}
            title="spi"
          >
@@ -1895,6 +1898,9 @@ exports[`Storyshots BreadCrumb Long path 1`] = `
        </span>
      </span>
    </nav>
+    <div
+      className="Breadcrumb__ActionBar-zvtb4t-3 izqSnl my-2"
+    />
  </div>
  <hr
    className="is-marginless"
--- a/scm-ui/ui-extensions/src/extensionPoints.ts
+++ b/scm-ui/ui-extensions/src/extensionPoints.ts
@@ -22,14 +22,16 @@
 * SOFTWARE.
 */

-import { ExtensionPointDefinition } from "./binder";
+import React from "react";
 import {
+  Branch,
  IndexResources,
  NamespaceStrategies,
  Repository,
  RepositoryCreation,
  RepositoryTypeCollection,
 } from "@scm-manager/ui-types";
+import { ExtensionPointDefinition } from "./binder";

 type RepositoryCreatorSubFormProps = {
  repository: RepositoryCreation;
@@ -58,3 +60,24 @@ export type RepositoryCreatorExtension = {
 export type RepositoryCreator = ExtensionPointDefinition<"repos.creator", RepositoryCreatorExtension>;

 export type RepositoryFlags = ExtensionPointDefinition<"repository.flags", { repository: Repository }>;
+
+export type ReposSourcesActionbarExtensionProps = {
+  baseUrl: string;
+  revision: string;
+  branch: Branch | undefined;
+  path: string;
+  sources: File;
+  repository: Repository;
+};
+export type ReposSourcesActionbarExtension = React.ComponentType<ReposSourcesActionbarExtensionProps>;
+export type ReposSourcesActionbar = ExtensionPointDefinition<"repos.sources.actionbar", ReposSourcesActionbarExtension>;
+
+export type ReposSourcesEmptyActionbarExtensionProps = {
+  sources: File;
+  repository: Repository;
+};
+export type ReposSourcesEmptyActionbarExtension = ReposSourcesActionbarExtension;
+export type ReposSourcesEmptyActionbar = ExtensionPointDefinition<
+  "repos.sources.empty.actionbar",
+  ReposSourcesEmptyActionbarExtension
+>;
--- a/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
+++ b/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
@@ -26,7 +26,7 @@ import { Route, useLocation } from "react-router-dom";
 import Sources from "../../sources/containers/Sources";
 import ChangesetsRoot from "../../containers/ChangesetsRoot";
 import { Branch, Repository } from "@scm-manager/ui-types";
-import { ErrorPage, Loading, Notification } from "@scm-manager/ui-components";
+import { ErrorPage, Loading } from "@scm-manager/ui-components";
 import { useTranslation } from "react-i18next";
 import { useBranches } from "@scm-manager/ui-api";
 import FileSearch from "./FileSearch";
@@ -71,7 +71,7 @@ const CodeOverviewWithBranches: FC<Props> = ({ repository, baseUrl }) => {
  }

  if (branches.length === 0) {
-    return <Notification type="info">{t("code.noBranches")}</Notification>;
+    return <Sources repository={repository} baseUrl={baseUrl} />;
  }

  return <CodeRouting repository={repository} baseUrl={baseUrl} branches={branches} selectedBranch={selectedBranch} />;
--- a/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
@@ -22,17 +22,17 @@
 * SOFTWARE.
 */
 import React, { FC, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { useHistory, useLocation, useParams } from "react-router-dom";
+import { useSources } from "@scm-manager/ui-api";
 import { Branch, Repository } from "@scm-manager/ui-types";
 import { Breadcrumb, Loading, Notification } from "@scm-manager/ui-components";
 import FileTree from "../components/FileTree";
 import Content from "./Content";
 import CodeActionBar from "../../codeSection/components/CodeActionBar";
 import replaceBranchWithRevision from "../ReplaceBranchWithRevision";
-import { useSources } from "@scm-manager/ui-api";
-import { useHistory, useLocation, useParams } from "react-router-dom";
 import FileSearchButton from "../../codeSection/components/FileSearchButton";
 import { isEmptyDirectory, isRootFile } from "../utils/files";
-import { useTranslation } from "react-i18next";

 type Props = {
  repository: Repository;
@@ -84,6 +84,10 @@ const Sources: FC<Props> = ({ repository, branches, selectedBranch, baseUrl }) =
    return <Loading />;
  }

+  if (!file) {
+    return null;
+  }
+
  const onSelectBranch = (branch?: Branch) => {
    let url;
    if (branch) {
@@ -129,7 +133,8 @@ const Sources: FC<Props> = ({ repository, branches, selectedBranch, baseUrl }) =
    );
  };

-  if (file && file.directory) {
+  const renderPanelContent = () => {
+    if (file.directory) {
      let body;
      if (isRootFile(file) && isEmptyDirectory(file)) {
        body = (
@@ -139,8 +144,6 @@ const Sources: FC<Props> = ({ repository, branches, selectedBranch, baseUrl }) =
        );
      } else {
        body = (
-        <>
-          {renderBreadcrumb()}
          <FileTree
            directory={file}
            revision={revision || file.revision}
@@ -148,40 +151,45 @@ const Sources: FC<Props> = ({ repository, branches, selectedBranch, baseUrl }) =
            isFetchingNextPage={isFetchingNextPage}
            fetchNextPage={fetchNextPage}
          />
-        </>
        );
      }

      return (
-      <>
-        <CodeActionBar
-          selectedBranch={selectedBranch}
-          branches={branches}
-          onSelectBranch={onSelectBranch}
-          switchViewLink={evaluateSwitchViewLink()}
-        />
-        <div className="panel">{body}</div>
-      </>
+        <div className="panel">
+          {renderBreadcrumb()}
+          {body}
+        </div>
      );
-  } else {
+    }
+
    return (
-      <>
-        <CodeActionBar
-          selectedBranch={selectedBranch}
-          branches={branches}
-          onSelectBranch={onSelectBranch}
-          switchViewLink={evaluateSwitchViewLink()}
-        />
      <Content
        file={file}
        repository={repository}
        revision={revision || file.revision}
        breadcrumb={renderBreadcrumb()}
-          error={error}
+        error={error || undefined}
      />
+    );
+  };
+
+  const hasBranchesWhenSupporting = (repository: Repository) => {
+    return !repository._links.branches || (branches && branches.length !== 0);
+  };
+
+  return (
+    <>
+      {hasBranchesWhenSupporting(repository) && (
+        <CodeActionBar
+          selectedBranch={selectedBranch}
+          branches={branches}
+          onSelectBranch={onSelectBranch}
+          switchViewLink={evaluateSwitchViewLink()}
+        />
+      )}
+      {renderPanelContent()}
    </>
  );
-  }
 };

 export default Sources;
--- a/scm-ui/ui-webapp/src/repos/sources/utils/files.ts
+++ b/scm-ui/ui-webapp/src/repos/sources/utils/files.ts
@@ -28,14 +28,14 @@ export const isRootPath = (path: string) => {
 };

 export const isRootFile = (file: File) => {
-  if (!file.directory) {
+  if (!file?.directory) {
    return false;
  }
  return isRootPath(file.path);
 };

 export const isEmptyDirectory = (file: File) => {
-  if (!file.directory) {
+  if (!file?.directory) {
    return false;
  }
  return (file._embedded?.children?.length || 0) === 0;