Merge branch 'feature/announcements' into develop

6 files changed, 54 insertions, 14 deletions

diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 7a818d100..50f1e0522 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -51,6 +51,10 @@ const messages = defineMessages({
     id: 'subscription.features.spellchecker',
     defaultMessage: '!!!Support for Spellchecker',
   },
+  workspaces: {
+    id: 'subscription.features.workspaces',
+    defaultMessage: '!!!Organize your services in workspaces',
+  },
   ads: {
     id: 'subscription.features.ads',
     defaultMessage: '!!!No ads, ever!',
@@ -171,6 +175,9 @@ export default @observer class SubscriptionForm extends Component {
                   {intl.formatMessage(messages.proxy)}
                 </li>
                 <li>
+                  {intl.formatMessage(messages.workspaces)}
+                </li>
+                <li>
                   {intl.formatMessage(messages.ads)}
                 </li>
               </ul>
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
index c087689a7..4658b976f 100644
--- a/src/features/announcements/index.js
+++ b/src/features/announcements/index.js
@@ -3,6 +3,8 @@ import { AnnouncementsStore } from './store';
 
 const debug = require('debug')('Franz:feature:announcements');
 
+export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
+
 export const announcementsStore = new AnnouncementsStore();
 
 export default function initAnnouncements(stores, actions) {
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index 87cf08544..aa98d3bd1 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -8,10 +8,12 @@ import semver from 'semver';
 import localStorage from 'mobx-localstorage';
 
 import { FeatureStore } from '../utils/FeatureStore';
+import { GA_CATEGORY_ANNOUNCEMENTS } from '.';
 import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
 import { announcementActions } from './actions';
 import { createActionBindings } from '../utils/ActionBinding';
 import { createReactions } from '../../stores/lib/Reaction';
+import { gaEvent } from '../../lib/analytics';
 
 const LOCAL_STORAGE_KEY = 'announcements';
 
@@ -98,6 +100,8 @@ export class AnnouncementsStore extends FeatureStore {
         dispose();
       },
     );
+
+    gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show');
   };
 
   @action _hideAnnouncement() {
@@ -113,7 +117,7 @@ export class AnnouncementsStore extends FeatureStore {
 
     // Check if the user has already used current version (= has seen the announcement)
     const { currentVersion, lastSeenAnnouncementVersion } = this;
-    if (semver.gt(currentVersion, lastSeenAnnouncementVersion)) {
+    if (semver.gt(currentVersion, lastSeenAnnouncementVersion || '0.0.0')) {
       debug(`${currentVersion} < ${lastSeenAnnouncementVersion}: announcement is shown`);
       this._showAnnouncement();
     }
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index e662ea6b9..910dac727 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2470,42 +2470,55 @@
         }
       },
       {
-        "defaultMessage": "!!!No ads, ever!",
+        "defaultMessage": "!!!Organize your services in workspaces",
         "end": {
           "column": 3,
           "line": 57
         },
         "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.workspaces",
+        "start": {
+          "column": 14,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!No ads, ever!",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
         "id": "subscription.features.ads",
         "start": {
           "column": 7,
-          "line": 54
+          "line": 58
         }
       },
       {
         "defaultMessage": "!!!coming soon",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 65
         },
         "file": "src/components/subscription/SubscriptionForm.js",
         "id": "subscription.features.comingSoon",
         "start": {
           "column": 14,
-          "line": 58
+          "line": 62
         }
       },
       {
         "defaultMessage": "!!!EU residents: local sales tax may apply",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 69
         },
         "file": "src/components/subscription/SubscriptionForm.js",
         "id": "subscription.euTaxInfo",
         "start": {
           "column": 13,
-          "line": 62
+          "line": 66
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 5bb10438a..1090584c2 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -285,6 +285,7 @@
   "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
   "subscription.features.proxy": "Proxy support for services",
   "subscription.features.spellchecker": "Support for spellchecker",
+  "subscription.features.workspaces": "Organize your services in workspaces",
   "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
   "subscription.paymentSessionError": "Could not initialize payment form",
   "subscription.submit.label": "I want to support the development of Franz",
@@ -320,4 +321,4 @@
   "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
index cc7470358..f98eb986f 100644
--- a/src/i18n/messages/src/components/subscription/SubscriptionForm.json
+++ b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
@@ -130,15 +130,28 @@
     }
   },
   {
+    "id": "subscription.features.workspaces",
+    "defaultMessage": "!!!Organize your services in workspaces",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 54,
+      "column": 14
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
     "id": "subscription.features.ads",
     "defaultMessage": "!!!No ads, ever!",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 54,
+      "line": 58,
       "column": 7
     },
     "end": {
-      "line": 57,
+      "line": 61,
       "column": 3
     }
   },
@@ -147,11 +160,11 @@
     "defaultMessage": "!!!coming soon",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 58,
+      "line": 62,
       "column": 14
     },
     "end": {
-      "line": 61,
+      "line": 65,
       "column": 3
     }
   },
@@ -160,11 +173,11 @@
     "defaultMessage": "!!!EU residents: local sales tax may apply",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 62,
+      "line": 66,
       "column": 13
     },
     "end": {
-      "line": 65,
+      "line": 69,
       "column": 3
     }
   }