From 949252918856f5d40dfd44dcdcc282ea312dcdc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 10 Oct 2018 14:17:38 +0200
Subject: [PATCH] Replace sources collection with file in frontend

---
 scm-ui-components/packages/ui-types/src/Sources.js |  7 -------
 scm-ui-components/packages/ui-types/src/index.js   |  2 +-
 scm-ui/src/repos/sources/components/FileTree.js    |  6 +++---
 scm-ui/src/repos/sources/containers/Sources.js     |  4 ++--
 scm-ui/src/repos/sources/modules/sources.js        | 10 +++-------
 5 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/scm-ui-components/packages/ui-types/src/Sources.js b/scm-ui-components/packages/ui-types/src/Sources.js
index e7ea7dafa0..3852466635 100644
--- a/scm-ui-components/packages/ui-types/src/Sources.js
+++ b/scm-ui-components/packages/ui-types/src/Sources.js
@@ -22,10 +22,3 @@ export type File = {
     children: File[]
   }
 };
-
-export type SourcesCollection = Collection & {
-  revision: string,
-  _embedded: {
-    files: File[]
-  }
-};
diff --git a/scm-ui-components/packages/ui-types/src/index.js b/scm-ui-components/packages/ui-types/src/index.js
index c72b958cab..90500ff2e7 100644
--- a/scm-ui-components/packages/ui-types/src/index.js
+++ b/scm-ui-components/packages/ui-types/src/index.js
@@ -13,4 +13,4 @@ export type { Config } from "./Config";
 
 export type { Permission, PermissionEntry, PermissionCollection } from "./RepositoryPermissions";
 
-export type { SubRepository, File, SourcesCollection } from "./Sources";
+export type { SubRepository, File } from "./Sources";
diff --git a/scm-ui/src/repos/sources/components/FileTree.js b/scm-ui/src/repos/sources/components/FileTree.js
index d606ece0b8..a2c0445ba8 100644
--- a/scm-ui/src/repos/sources/components/FileTree.js
+++ b/scm-ui/src/repos/sources/components/FileTree.js
@@ -3,7 +3,7 @@ import React from "react";
 import { translate } from "react-i18next";
 import injectSheet from "react-jss";
 import FileTreeLeaf from "./FileTreeLeaf";
-import type { SourcesCollection } from "@scm-manager/ui-types";
+import type { File } from "@scm-manager/ui-types";
 
 const styles = {
   iconColumn: {
@@ -12,7 +12,7 @@ const styles = {
 };
 
 type Props = {
-  tree: SourcesCollection,
+  tree: File,
   revision: string,
   path: string,
   baseUrl: string,
@@ -53,7 +53,7 @@ class FileTree extends React.Component<Props> {
         directory: true
       });
     }
-    files.push(...tree._embedded.files);
+    files.push(...tree._embedded.children);
 
     return (
       <table className="table table-hover table-sm is-fullwidth">
diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js
index fcfd0c284a..c0cb5dde54 100644
--- a/scm-ui/src/repos/sources/containers/Sources.js
+++ b/scm-ui/src/repos/sources/containers/Sources.js
@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import { connect } from "react-redux";
-import type { Repository, SourcesCollection } from "@scm-manager/ui-types";
+import type { Repository, File } from "@scm-manager/ui-types";
 import FileTree from "../components/FileTree";
 import { ErrorNotification, Loading } from "@scm-manager/ui-components";
 import {
@@ -13,7 +13,7 @@ import {
 
 type Props = {
   repository: Repository,
-  sources: SourcesCollection,
+  sources: File,
   loading: boolean,
   error: Error,
   revision: string,
diff --git a/scm-ui/src/repos/sources/modules/sources.js b/scm-ui/src/repos/sources/modules/sources.js
index 7e4d21722e..fb606228a5 100644
--- a/scm-ui/src/repos/sources/modules/sources.js
+++ b/scm-ui/src/repos/sources/modules/sources.js
@@ -1,11 +1,7 @@
 // @flow
 
 import * as types from "../../../modules/types";
-import type {
-  Repository,
-  SourcesCollection,
-  Action
-} from "@scm-manager/ui-types";
+import type { Repository, File, Action } from "@scm-manager/ui-types";
 import { apiClient } from "@scm-manager/ui-components";
 import { isPending } from "../../../modules/pending";
 import { getFailure } from "../../../modules/failure";
@@ -61,7 +57,7 @@ export function fetchSourcesSuccess(
   repository: Repository,
   revision: string,
   path: string,
-  sources: SourcesCollection
+  sources: File
 ) {
   return {
     type: FETCH_SOURCES_SUCCESS,
@@ -111,7 +107,7 @@ export function getSources(
   repository: Repository,
   revision: string,
   path: string
-): ?SourcesCollection {
+): ?File {
   if (state.sources) {
     return state.sources[createItemId(repository, revision, path)];
   }