diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-12 17:18:19 +0200 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-12 17:18:19 +0200 |
commit | 9620db3443c70d6f92b55725ed07a17adda8cea4 (patch) | |
tree | 2819bbbfedbd9842a1a7fd8249d123224445139f /src/components/layout | |
parent | cleanup console log artifacts (diff) | |
download | ferdium-app-9620db3443c70d6f92b55725ed07a17adda8cea4.tar.gz ferdium-app-9620db3443c70d6f92b55725ed07a17adda8cea4.tar.zst ferdium-app-9620db3443c70d6f92b55725ed07a17adda8cea4.zip |
link to in-app changelog on new update notification
Diffstat (limited to 'src/components/layout')
-rw-r--r-- | src/components/layout/AppLayout.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index eb3f03f12..d5febfaf4 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -17,6 +17,7 @@ import { isWindows } from '../../environment'; | |||
17 | import AnnouncementScreen from '../../features/announcements/components/AnnouncementScreen'; | 17 | import AnnouncementScreen from '../../features/announcements/components/AnnouncementScreen'; |
18 | import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; | 18 | import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; |
19 | import { workspaceStore } from '../../features/workspaces'; | 19 | import { workspaceStore } from '../../features/workspaces'; |
20 | import { announcementActions } from '../../features/announcements/actions'; | ||
20 | 21 | ||
21 | function createMarkup(HTMLString) { | 22 | function createMarkup(HTMLString) { |
22 | return { __html: HTMLString }; | 23 | return { __html: HTMLString }; |
@@ -72,6 +73,7 @@ class AppLayout extends Component { | |||
72 | // isOnline: PropTypes.bool.isRequired, | 73 | // isOnline: PropTypes.bool.isRequired, |
73 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, | 74 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, |
74 | appUpdateIsDownloaded: PropTypes.bool.isRequired, | 75 | appUpdateIsDownloaded: PropTypes.bool.isRequired, |
76 | nextAppReleaseVersion: PropTypes.string, | ||
75 | removeNewsItem: PropTypes.func.isRequired, | 77 | removeNewsItem: PropTypes.func.isRequired, |
76 | reloadServicesAfterUpdate: PropTypes.func.isRequired, | 78 | reloadServicesAfterUpdate: PropTypes.func.isRequired, |
77 | installAppUpdate: PropTypes.func.isRequired, | 79 | installAppUpdate: PropTypes.func.isRequired, |
@@ -86,6 +88,7 @@ class AppLayout extends Component { | |||
86 | 88 | ||
87 | static defaultProps = { | 89 | static defaultProps = { |
88 | children: [], | 90 | children: [], |
91 | nextAppReleaseVersion: null, | ||
89 | }; | 92 | }; |
90 | 93 | ||
91 | static contextTypes = { | 94 | static contextTypes = { |
@@ -104,6 +107,7 @@ class AppLayout extends Component { | |||
104 | news, | 107 | news, |
105 | showServicesUpdatedInfoBar, | 108 | showServicesUpdatedInfoBar, |
106 | appUpdateIsDownloaded, | 109 | appUpdateIsDownloaded, |
110 | nextAppReleaseVersion, | ||
107 | removeNewsItem, | 111 | removeNewsItem, |
108 | reloadServicesAfterUpdate, | 112 | reloadServicesAfterUpdate, |
109 | installAppUpdate, | 113 | installAppUpdate, |
@@ -181,9 +185,13 @@ class AppLayout extends Component { | |||
181 | <span className="mdi mdi-information" /> | 185 | <span className="mdi mdi-information" /> |
182 | {intl.formatMessage(messages.updateAvailable)} | 186 | {intl.formatMessage(messages.updateAvailable)} |
183 | {' '} | 187 | {' '} |
184 | <a href="https://meetfranz.com/changelog" target="_blank"> | 188 | <button |
189 | className="info-bar__inline-button" | ||
190 | type="button" | ||
191 | onClick={() => announcementActions.show({ targetVersion: nextAppReleaseVersion })} | ||
192 | > | ||
185 | <u>{intl.formatMessage(messages.changelog)}</u> | 193 | <u>{intl.formatMessage(messages.changelog)}</u> |
186 | </a> | 194 | </button> |
187 | </InfoBar> | 195 | </InfoBar> |
188 | )} | 196 | )} |
189 | {isDelayAppScreenVisible && (<DelayApp />)} | 197 | {isDelayAppScreenVisible && (<DelayApp />)} |