From 64c3ff8d6b81d976ca62b687dd908157a834b29f Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Fri, 19 Jun 2020 19:11:02 -0700
Subject: [PATCH] chore: Remove 'DEPLOYMENT' env option Add 'Installation'
 section

---
 .env.sample                                   |  1 -
 app.json                                      |  7 +--
 app/components/Sidebar/Settings.js            | 32 ++++++-----
 .../Sidebar/components/SidebarLink.js         |  5 +-
 app/components/Sidebar/components/Version.js  | 53 +++++++++++++++++++
 app/components/Sidebar/icons/Slack.js         |  8 ++-
 app/components/Sidebar/icons/Zapier.js        |  8 ++-
 server/app.js                                 |  1 +
 8 files changed, 91 insertions(+), 24 deletions(-)
 create mode 100644 app/components/Sidebar/components/Version.js

diff --git a/.env.sample b/.env.sample
index 517b164f..379c02fd 100644
--- a/.env.sample
+++ b/.env.sample
@@ -17,7 +17,6 @@ PORT=3000
 # set to false if  your SSL is terminated at a loadbalancer, for example
 FORCE_HTTPS=true
 
-DEPLOYMENT=self
 ENABLE_UPDATES=true
 WEBSOCKETS_ENABLED=true
 DEBUG=cache,presenters,events
diff --git a/app.json b/app.json
index 66ce6a04..5670a107 100644
--- a/app.json
+++ b/app.json
@@ -35,11 +35,6 @@
       "generator": "secret",
       "required": true
     },
-    "DEPLOYMENT": {
-      "description": "Should be 'self' for self hosted installations, turns off things like pricing pages",
-      "value": "self",
-      "required": true
-    },
     "ENABLE_UPDATES": {
       "value": "true",
       "required": true
@@ -149,4 +144,4 @@
       "required": false
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/components/Sidebar/Settings.js b/app/components/Sidebar/Settings.js
index 866922d4..c4c0731a 100644
--- a/app/components/Sidebar/Settings.js
+++ b/app/components/Sidebar/Settings.js
@@ -26,6 +26,7 @@ import Section from './components/Section';
 import Header from './components/Header';
 import SidebarLink from './components/SidebarLink';
 import HeaderBlock from './components/HeaderBlock';
+import Version from './components/Version';
 import PoliciesStore from 'stores/PoliciesStore';
 import AuthStore from 'stores/AuthStore';
 
@@ -67,17 +68,17 @@ class SettingsSidebar extends React.Component<Props> {
               <Header>Account</Header>
               <SidebarLink
                 to="/settings"
-                icon={<ProfileIcon />}
+                icon={<ProfileIcon color="currentColor" />}
                 label="Profile"
               />
               <SidebarLink
                 to="/settings/notifications"
-                icon={<EmailIcon />}
+                icon={<EmailIcon color="currentColor" />}
                 label="Notifications"
               />
               <SidebarLink
                 to="/settings/tokens"
-                icon={<CodeIcon />}
+                icon={<CodeIcon color="currentColor" />}
                 label="API Tokens"
               />
             </Section>
@@ -86,45 +87,45 @@ class SettingsSidebar extends React.Component<Props> {
               {can.update && (
                 <SidebarLink
                   to="/settings/details"
-                  icon={<TeamIcon />}
+                  icon={<TeamIcon color="currentColor" />}
                   label="Details"
                 />
               )}
               {can.update && (
                 <SidebarLink
                   to="/settings/security"
-                  icon={<PadlockIcon />}
+                  icon={<PadlockIcon color="currentColor" />}
                   label="Security"
                 />
               )}
               <SidebarLink
                 to="/settings/people"
-                icon={<UserIcon />}
+                icon={<UserIcon color="currentColor" />}
                 exact={false}
                 label="People"
               />
               <SidebarLink
                 to="/settings/groups"
-                icon={<GroupIcon />}
+                icon={<GroupIcon color="currentColor" />}
                 exact={false}
                 label="Groups"
               />
               <SidebarLink
                 to="/settings/shares"
-                icon={<LinkIcon />}
+                icon={<LinkIcon color="currentColor" />}
                 label="Share Links"
               />
               {can.auditLog && (
                 <SidebarLink
                   to="/settings/events"
-                  icon={<BulletedListIcon />}
+                  icon={<BulletedListIcon color="currentColor" />}
                   label="Audit Log"
                 />
               )}
               {can.export && (
                 <SidebarLink
                   to="/settings/export"
-                  icon={<DocumentIcon />}
+                  icon={<DocumentIcon color="currentColor" />}
                   label="Export Data"
                 />
               )}
@@ -134,16 +135,23 @@ class SettingsSidebar extends React.Component<Props> {
                 <Header>Integrations</Header>
                 <SidebarLink
                   to="/settings/integrations/slack"
-                  icon={<SlackIcon />}
+                  icon={<SlackIcon color="currentColor" />}
                   label="Slack"
                 />
                 <SidebarLink
                   to="/settings/integrations/zapier"
-                  icon={<ZapierIcon />}
+                  icon={<ZapierIcon color="currentColor" />}
                   label="Zapier"
                 />
               </Section>
             )}
+            {can.update &&
+              process.env.DEPLOYMENT !== 'hosted' && (
+                <Section>
+                  <Header>Installation</Header>
+                  <Version />
+                </Section>
+              )}
           </Scrollable>
         </Flex>
       </Sidebar>
diff --git a/app/components/Sidebar/components/SidebarLink.js b/app/components/Sidebar/components/SidebarLink.js
index a70d9f03..80dd6ade 100644
--- a/app/components/Sidebar/components/SidebarLink.js
+++ b/app/components/Sidebar/components/SidebarLink.js
@@ -9,6 +9,7 @@ import Flex from 'shared/components/Flex';
 
 type Props = {
   to?: string | Object,
+  href?: string | Object,
   onClick?: (SyntheticEvent<>) => void,
   children?: React.Node,
   icon?: React.Node,
@@ -63,6 +64,7 @@ class SidebarLink extends React.Component<Props> {
       menuOpen,
       hideDisclosure,
       exact,
+      href,
     } = this.props;
     const showDisclosure = !!children && !hideDisclosure;
     const activeStyle = {
@@ -80,7 +82,8 @@ class SidebarLink extends React.Component<Props> {
           onClick={onClick}
           exact={exact !== false}
           to={to}
-          as={to ? undefined : 'div'}
+          as={to ? undefined : href ? 'a' : 'div'}
+          href={href}
         >
           {icon && <IconWrapper>{icon}</IconWrapper>}
           <Label onClick={this.handleExpand}>
diff --git a/app/components/Sidebar/components/Version.js b/app/components/Sidebar/components/Version.js
new file mode 100644
index 00000000..140a23d1
--- /dev/null
+++ b/app/components/Sidebar/components/Version.js
@@ -0,0 +1,53 @@
+// @flow
+import * as React from 'react';
+import styled from 'styled-components';
+import Badge from 'components/Badge';
+import SidebarLink from './SidebarLink';
+import { version } from '../../../../package.json';
+
+export default function Version() {
+  // $FlowFixMe
+  const [releasesBehind, setReleasesBehind] = React.useState(0);
+
+  // $FlowFixMe
+  React.useEffect(() => {
+    async function loadReleases() {
+      let out = 0;
+      const res = await fetch(
+        'https://api.github.com/repos/outline/outline/releases'
+      );
+      const releases = await res.json();
+      for (const release of releases) {
+        if (release.tag_name === `v${version}`) {
+          return setReleasesBehind(out);
+        } else {
+          out++;
+        }
+      }
+    }
+    loadReleases();
+  }, []);
+
+  return (
+    <SidebarLink
+      href="https://github.com/outline/outline/releases"
+      label={
+        <React.Fragment>
+          v{version}
+          <br />
+          <LilBadge>
+            {releasesBehind === 0
+              ? 'Up to date'
+              : `${releasesBehind} version${
+                  releasesBehind === 1 ? '' : 's'
+                } behind`}
+          </LilBadge>
+        </React.Fragment>
+      }
+    />
+  );
+}
+
+const LilBadge = styled(Badge)`
+  margin-left: 0;
+`;
diff --git a/app/components/Sidebar/icons/Slack.js b/app/components/Sidebar/icons/Slack.js
index be5c63e3..8c6a07f0 100644
--- a/app/components/Sidebar/icons/Slack.js
+++ b/app/components/Sidebar/icons/Slack.js
@@ -1,10 +1,14 @@
 // @flow
 import * as React from 'react';
 
-export default function SlackIcon() {
+type Props = {
+  color?: string,
+};
+
+export default function SlackIcon({ color = '#4E5C6E' }: Props) {
   return (
     <svg
-      fill="#4E5C6E"
+      fill={color}
       width="24px"
       height="24px"
       viewBox="0 0 24 24"
diff --git a/app/components/Sidebar/icons/Zapier.js b/app/components/Sidebar/icons/Zapier.js
index 0d52c3fe..e1d0e8dc 100644
--- a/app/components/Sidebar/icons/Zapier.js
+++ b/app/components/Sidebar/icons/Zapier.js
@@ -1,10 +1,14 @@
 // @flow
 import * as React from 'react';
 
-export default function ZapierIcon() {
+type Props = {
+  color?: string,
+};
+
+export default function ZapierIcon({ color = '#4E5C6E' }: Props) {
   return (
     <svg
-      fill="#4E5C6E"
+      fill={color}
       width="24px"
       height="24px"
       viewBox="0 0 24 24"
diff --git a/server/app.js b/server/app.js
index 426d13d7..dd5175c9 100644
--- a/server/app.js
+++ b/server/app.js
@@ -149,6 +149,7 @@ app.use(
         "'self'",
         process.env.AWS_S3_UPLOAD_BUCKET_URL.replace('s3:', 'localhost:'),
         'www.google-analytics.com',
+        'api.github.com',
         'sentry.io',
       ]),
     },