From 36f289a1531e2c56d5b03028f5b5394b9dcdfe76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Thu, 25 Oct 2018 14:03:45 +0200 Subject: [PATCH] open correct viewer for each type and reorder the structure --- .../components/content}/DownloadViewer.js | 2 +- .../components/content}/ImageViewer.js | 2 +- .../components/content}/SourcecodeViewer.js | 4 +-- .../content}/SourcecodeViewer.test.js | 0 .../containers}/Content.js | 26 +++++++++++++++---- .../containers}/Content.test.js | 0 .../src/repos/sources/containers/Sources.js | 2 +- 7 files changed, 26 insertions(+), 10 deletions(-) rename scm-ui/src/repos/{content/components => sources/components/content}/DownloadViewer.js (93%) rename scm-ui/src/repos/{content/components => sources/components/content}/ImageViewer.js (94%) rename scm-ui/src/repos/{content/components => sources/components/content}/SourcecodeViewer.js (81%) rename scm-ui/src/repos/{content/components => sources/components/content}/SourcecodeViewer.test.js (100%) rename scm-ui/src/repos/{content/components => sources/containers}/Content.js (64%) rename scm-ui/src/repos/{content/components => sources/containers}/Content.test.js (100%) diff --git a/scm-ui/src/repos/content/components/DownloadViewer.js b/scm-ui/src/repos/sources/components/content/DownloadViewer.js similarity index 93% rename from scm-ui/src/repos/content/components/DownloadViewer.js rename to scm-ui/src/repos/sources/components/content/DownloadViewer.js index f2e10b376c..9f5e9cdf75 100644 --- a/scm-ui/src/repos/content/components/DownloadViewer.js +++ b/scm-ui/src/repos/sources/components/content/DownloadViewer.js @@ -22,7 +22,7 @@ class DownloadViewer extends React.Component { componentDidMount() {} render() { - return null; + return "DownloadViewer"; } } diff --git a/scm-ui/src/repos/content/components/ImageViewer.js b/scm-ui/src/repos/sources/components/content/ImageViewer.js similarity index 94% rename from scm-ui/src/repos/content/components/ImageViewer.js rename to scm-ui/src/repos/sources/components/content/ImageViewer.js index de4fc840fa..0b5eae20d7 100644 --- a/scm-ui/src/repos/content/components/ImageViewer.js +++ b/scm-ui/src/repos/sources/components/content/ImageViewer.js @@ -22,7 +22,7 @@ class ImageViewer extends React.Component { componentDidMount() {} render() { - return null; + return "ImageViewer"; } } diff --git a/scm-ui/src/repos/content/components/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js similarity index 81% rename from scm-ui/src/repos/content/components/SourcecodeViewer.js rename to scm-ui/src/repos/sources/components/content/SourcecodeViewer.js index 6303bdd874..dacbbd6283 100644 --- a/scm-ui/src/repos/content/components/SourcecodeViewer.js +++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js @@ -1,7 +1,7 @@ // @flow import React from "react"; import { translate } from "react-i18next"; -import { apiClient } from "@scm-manager/ui-components"; +import { apiClient } from "../../../../../../scm-ui-components/packages/ui-components/src/index"; type Props = { t: string => string @@ -23,7 +23,7 @@ class SourcecodeViewer extends React.Component { componentDidMount() {} render() { - return null; + return "sourceCodeViewer"; } } diff --git a/scm-ui/src/repos/content/components/SourcecodeViewer.test.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js similarity index 100% rename from scm-ui/src/repos/content/components/SourcecodeViewer.test.js rename to scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js diff --git a/scm-ui/src/repos/content/components/Content.js b/scm-ui/src/repos/sources/containers/Content.js similarity index 64% rename from scm-ui/src/repos/content/components/Content.js rename to scm-ui/src/repos/sources/containers/Content.js index 124407dc1f..3518a03468 100644 --- a/scm-ui/src/repos/content/components/Content.js +++ b/scm-ui/src/repos/sources/containers/Content.js @@ -1,11 +1,20 @@ // @flow import React from "react"; import { translate } from "react-i18next"; -import { apiClient } from "@scm-manager/ui-components"; -import { getSources } from "../../sources/modules/sources"; -import type { Repository, File } from "@scm-manager/ui-types"; -import { ErrorNotification, Loading } from "@scm-manager/ui-components"; +import { apiClient } from "../../../../../scm-ui-components/packages/ui-components/src/index"; +import { getSources } from "../modules/sources"; +import type { + Repository, + File +} from "../../../../../scm-ui-components/packages/ui-types/src/index"; +import { + ErrorNotification, + Loading +} from "../../../../../scm-ui-components/packages/ui-components/src/index"; import { connect } from "react-redux"; +import ImageViewer from "../components/content/ImageViewer"; +import SourcecodeViewer from "../components/content/SourcecodeViewer"; +import DownloadViewer from "../components/content/DownloadViewer"; type Props = { t: string => string, @@ -49,8 +58,15 @@ class Content extends React.Component { if (!file) { return ; } + if (contentType.startsWith("image")) { + return ; + } - return this.state.contentType; + if (contentType.startsWith("text")) { + return ; + } + + return ; } } diff --git a/scm-ui/src/repos/content/components/Content.test.js b/scm-ui/src/repos/sources/containers/Content.test.js similarity index 100% rename from scm-ui/src/repos/content/components/Content.test.js rename to scm-ui/src/repos/sources/containers/Content.test.js diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js index 9a862a0996..1a9f1d62e7 100644 --- a/scm-ui/src/repos/sources/containers/Sources.js +++ b/scm-ui/src/repos/sources/containers/Sources.js @@ -13,7 +13,7 @@ import { isFetchBranchesPending } from "../../modules/branches"; import { compose } from "redux"; -import Content from "../../content/components/Content"; +import Content from "./Content"; import { fetchSources, isDirectory } from "../modules/sources"; type Props = {