fix issues for users that have workspace but downgraded to free

6 files changed, 90 insertions, 43 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 4329c3097..52d4e0c27 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -90,6 +90,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         getServicesForWorkspace={workspace => (
           workspace ? workspace.services.map(id => services.one(id).name) : services.all.map(s => s.name)
         )}
+        onUpgradeAccountClick={() => openSettings({ path: 'user' })}
       />
     );
 
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 3602da792..baf59a1fb 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -33,6 +33,10 @@ const messages = defineMessages({
     id: 'workspaceDrawer.premiumCtaButtonLabel',
     defaultMessage: '!!!Create your first workspace',
   },
+  reactivatePremiumAccount: {
+    id: 'workspaceDrawer.reactivatePremiumAccountLabel',
+    defaultMessage: '!!!Reactivate premium account',
+  },
 });
 
 const styles = theme => ({
@@ -77,6 +81,7 @@ class WorkspaceDrawer extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     getServicesForWorkspace: PropTypes.func.isRequired,
+    onUpgradeAccountClick: PropTypes.func.isRequired,
   };
 
   static contextTypes = {
@@ -91,6 +96,7 @@ class WorkspaceDrawer extends Component {
     const {
       classes,
       getServicesForWorkspace,
+      onUpgradeAccountClick,
     } = this.props;
     const { intl } = this.context;
     const {
@@ -119,19 +125,32 @@ class WorkspaceDrawer extends Component {
             />
           </span>
         </H1>
-        {!workspaceStore.userHasWorkspaces ? (
+        {workspaceStore.isPremiumUpgradeRequired ? (
           <div className={classes.premiumAnnouncement}>
             <FormattedHTMLMessage {...messages.workspaceFeatureInfo} />
-            <Button
-              className={classes.premiumCtaButton}
-              buttonType="primary"
-              label={intl.formatMessage(messages.premiumCtaButtonLabel)}
-              icon="mdiPlusBox"
-              onClick={() => {
-                workspaceActions.openWorkspaceSettings();
-                gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta');
-              }}
-            />
+            {workspaceStore.userHasWorkspaces ? (
+              <Button
+                className={classes.premiumCtaButton}
+                buttonType="primary"
+                label={intl.formatMessage(messages.reactivatePremiumAccount)}
+                icon="mdiStar"
+                onClick={() => {
+                  onUpgradeAccountClick();
+                  gaEvent('User', 'upgrade', 'workspaceDrawer');
+                }}
+              />
+            ) : (
+              <Button
+                className={classes.premiumCtaButton}
+                buttonType="primary"
+                label={intl.formatMessage(messages.premiumCtaButtonLabel)}
+                icon="mdiPlusBox"
+                onClick={() => {
+                  workspaceActions.openWorkspaceSettings();
+                  gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta');
+                }}
+              />
+            )}
           </div>
         ) : (
           <div className={classes.workspaces}>
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index a0a34c778..18813e267 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -147,38 +147,38 @@ class WorkspacesDashboard extends Component {
                 onSubmit={onCreateWorkspaceSubmit}
               />
             </div>
+            {getUserWorkspacesRequest.isExecuting ? (
+              <Loader />
+            ) : (
+              <Fragment>
+                {/* ===== Workspace could not be loaded error ===== */}
+                {getUserWorkspacesRequest.error ? (
+                  <Infobox
+                    icon="alert"
+                    type="danger"
+                    ctaLabel={intl.formatMessage(messages.tryReloadWorkspaces)}
+                    ctaLoading={getUserWorkspacesRequest.isExecuting}
+                    ctaOnClick={getUserWorkspacesRequest.retry}
+                  >
+                    {intl.formatMessage(messages.workspacesRequestFailed)}
+                  </Infobox>
+                ) : (
+                  <table className="workspace-table">
+                    {/* ===== Workspaces list ===== */}
+                    <tbody>
+                      {workspaces.map(workspace => (
+                        <WorkspaceItem
+                          key={workspace.id}
+                          workspace={workspace}
+                          onItemClick={w => onWorkspaceClick(w)}
+                        />
+                      ))}
+                    </tbody>
+                  </table>
+                )}
+              </Fragment>
+            )}
           </PremiumFeatureContainer>
-          {getUserWorkspacesRequest.isExecuting ? (
-            <Loader />
-          ) : (
-            <Fragment>
-              {/* ===== Workspace could not be loaded error ===== */}
-              {getUserWorkspacesRequest.error ? (
-                <Infobox
-                  icon="alert"
-                  type="danger"
-                  ctaLabel={intl.formatMessage(messages.tryReloadWorkspaces)}
-                  ctaLoading={getUserWorkspacesRequest.isExecuting}
-                  ctaOnClick={getUserWorkspacesRequest.retry}
-                >
-                  {intl.formatMessage(messages.workspacesRequestFailed)}
-                </Infobox>
-              ) : (
-                <table className="workspace-table">
-                  {/* ===== Workspaces list ===== */}
-                  <tbody>
-                    {workspaces.map(workspace => (
-                      <WorkspaceItem
-                        key={workspace.id}
-                        workspace={workspace}
-                        onItemClick={w => onWorkspaceClick(w)}
-                      />
-                    ))}
-                  </tbody>
-                </table>
-              )}
-            </Fragment>
-          )}
         </div>
       </div>
     );
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 500053377..ec519bad5 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3386,6 +3386,19 @@
           "column": 25,
           "line": 32
         }
+      },
+      {
+        "defaultMessage": "!!!Reactivate your premium account!",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.reactivatePremiumAccountLabel",
+        "start": {
+          "column": 28,
+          "line": 36
+        }
       }
     ],
     "path": "src/features/workspaces/components/WorkspaceDrawer.json"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 9770ff0d5..ed5d5e345 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -311,6 +311,7 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
+  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "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>",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
index acd304253..37bae262a 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
@@ -63,5 +63,18 @@
       "line": 35,
       "column": 3
     }
+  },
+  {
+    "id": "workspaceDrawer.reactivatePremiumAccountLabel",
+    "defaultMessage": "!!!Reactivate premium account",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 36,
+      "column": 28
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file