From 4df9c2947bd2637c21f2f62512c814ef23d9362b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 10 Sep 2020 08:37:37 +0200
Subject: [PATCH] Heed peer review

---
 scm-ui/ui-components/src/CardColumnGroup.tsx  | 28 ++++++++-----------
 scm-ui/ui-types/src/Repositories.ts           |  6 +++-
 .../src/repos/containers/Overview.tsx         |  4 +--
 scm-ui/ui-webapp/src/repos/modules/repos.ts   |  4 +--
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/scm-ui/ui-components/src/CardColumnGroup.tsx b/scm-ui/ui-components/src/CardColumnGroup.tsx
index 8b8eebf1c0..c5c07055f2 100644
--- a/scm-ui/ui-components/src/CardColumnGroup.tsx
+++ b/scm-ui/ui-components/src/CardColumnGroup.tsx
@@ -88,24 +88,20 @@ export default class CardColumnGroup extends React.Component<Props, State> {
       });
     }
 
-    const header = url ? (
-      <h2>
-        <span className={classNames("is-size-4", "has-cursor-pointer")} onClick={this.toggleCollapse}>
-          <i className={classNames("fa", icon)} />
-        </span>{" "}
-        <Link to={url} className={"has-text-dark"}>{name}</Link>
-      </h2>
-    ) : (
-      <h2>
-        <span className={classNames("is-size-4", "has-cursor-pointer")} onClick={this.toggleCollapse}>
-          <i className={classNames("fa", icon)} /> {name}
-        </span>
-      </h2>
-    );
-
     return (
       <Container>
-        {header}
+        <h2>
+          <span className={classNames("is-size-4", "has-cursor-pointer")} onClick={this.toggleCollapse}>
+            <i className={classNames("fa", icon)} />
+          </span>{" "}
+          {url ? (
+            <Link to={url} className={"has-text-dark"}>
+              {name}
+            </Link>
+          ) : (
+            name
+          )}
+        </h2>
         <hr />
         <Wrapper className={classNames("columns", "card-columns", "is-multiline")}>{content}</Wrapper>
         <div className="is-clearfix" />
diff --git a/scm-ui/ui-types/src/Repositories.ts b/scm-ui/ui-types/src/Repositories.ts
index 921ec4bba5..8a7a4fee97 100644
--- a/scm-ui/ui-types/src/Repositories.ts
+++ b/scm-ui/ui-types/src/Repositories.ts
@@ -50,7 +50,11 @@ export type RepositoryCollection = PagedCollection & {
   };
 };
 
-export type NamespaceCollection = Namespace[];
+export type NamespaceCollection = {
+  _embedded: {
+    namespaces: Namespace[];
+  };
+};
 
 export type RepositoryGroup = {
   name: string;
diff --git a/scm-ui/ui-webapp/src/repos/containers/Overview.tsx b/scm-ui/ui-webapp/src/repos/containers/Overview.tsx
index d67dad0861..a6a865fc59 100644
--- a/scm-ui/ui-webapp/src/repos/containers/Overview.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/Overview.tsx
@@ -95,7 +95,7 @@ class Overview extends React.Component<Props> {
   getReposLink = () => {
     const { namespace, namespaces, reposLink } = this.props;
     if (namespace) {
-      return namespaces?.find(n => n.namespace === namespace)?._links?.repositories?.href;
+      return namespaces?._embedded.namespaces.find(n => n.namespace === namespace)?._links?.repositories?.href;
     } else {
       return reposLink;
     }
@@ -114,7 +114,7 @@ class Overview extends React.Component<Props> {
 
     const link = namespace ? `repos/${namespace}` : "repos";
 
-    const namespacesToRender = namespaces?["", ...namespaces.map(n => n.namespace).sort()]:[];
+    const namespacesToRender = namespaces ? ["", ...namespaces._embedded.namespaces.map(n => n.namespace).sort()] : [];
 
     return (
       <Page title={t("overview.title")} subtitle={t("overview.subtitle")} loading={loading} error={error}>
diff --git a/scm-ui/ui-webapp/src/repos/modules/repos.ts b/scm-ui/ui-webapp/src/repos/modules/repos.ts
index 0b3af79575..08c4ab6b78 100644
--- a/scm-ui/ui-webapp/src/repos/modules/repos.ts
+++ b/scm-ui/ui-webapp/src/repos/modules/repos.ts
@@ -422,7 +422,7 @@ const reducerByNames = (state: object, repository: Repository) => {
 const reducerForNamespaces = (state: object, namespaces: NamespaceCollection) => {
   return {
     ...state,
-    namespaces: namespaces._embedded
+    namespaces: namespaces
   };
 };
 
@@ -467,7 +467,7 @@ export function getRepositoryCollection(state: object) {
 }
 
 export function getNamespaceCollection(state: object) {
-  return state.repos.namespaces?.namespaces;
+  return state.repos.namespaces;
 }
 
 export function isFetchReposPending(state: object) {