Merge branch 'release/5.4.0-beta.3' into fix/only-load-workspace-related-services

4 files changed, 11 insertions, 14 deletions

diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 28b079e6b..5b28fb7c8 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -67,12 +67,12 @@ export default function init(stores) {
             gaPage('/delayApp');
             gaEvent('DelayApp', 'show', 'Delay App Feature');
 
-            timeLastDelay = moment();
-            shownAfterLaunch = true;
 
             setTimeout(() => {
               debug('Resetting app delay');
 
+              shownAfterLaunch = true;
+              timeLastDelay = moment();
               setVisibility(false);
             }, config.delayDuration + 1000); // timer needs to be able to hit 0
           } else {
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index a39fcfe0e..c6331073b 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -148,6 +148,7 @@ class WebControls extends Component {
           type="button"
           className={classes.button}
           data-tip={intl.formatMessage(messages.goHome)}
+          data-place="bottom"
         >
           <Icon
             icon={mdiHomeOutline}
@@ -160,6 +161,7 @@ class WebControls extends Component {
           className={classes.button}
           disabled={!canGoBack}
           data-tip={intl.formatMessage(messages.back)}
+          data-place="bottom"
         >
           <Icon
             icon={mdiArrowLeft}
@@ -172,6 +174,7 @@ class WebControls extends Component {
           className={classes.button}
           disabled={!canGoForward}
           data-tip={intl.formatMessage(messages.forward)}
+          data-place="bottom"
         >
           <Icon
             icon={mdiArrowRight}
@@ -183,6 +186,7 @@ class WebControls extends Component {
           type="button"
           className={classes.button}
           data-tip={intl.formatMessage(messages.reload)}
+          data-place="bottom"
         >
           <Icon
             icon={mdiReload}
@@ -196,6 +200,7 @@ class WebControls extends Component {
             inputUrl: event.target.value,
           })}
           onFocus={(event) => {
+            console.log('on focus event');
             event.target.select();
             this.setState({
               editUrl: true,
@@ -223,14 +228,13 @@ class WebControls extends Component {
           type="button"
           className={classes.button}
           data-tip={intl.formatMessage(messages.openInBrowser)}
-          data-place="left"
+          data-place="bottom"
         >
           <Icon
             icon={mdiEarth}
             className={classes.icon}
           />
         </button>
-        {/* <ReactTooltip place="bottom" type="dark" effect="solid" /> */}
       </div>
     );
   }
diff --git a/src/features/webControls/constants.js b/src/features/webControls/constants.js
new file mode 100644
index 000000000..270a3568e
--- /dev/null
+++ b/src/features/webControls/constants.js
@@ -0,0 +1 @@
+export const CUSTOM_WEBSITE_ID = 'franz-custom-website';
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index b83fe335a..13227e033 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -146,16 +146,8 @@ export default class WorkspacesStore extends FeatureStore {
 
   filterServicesByActiveWorkspace = (services) => {
     const { activeWorkspace, isFeatureActive } = this;
-    if (isFeatureActive) {
-      if (activeWorkspace) {
-        return this.getWorkspaceServices(activeWorkspace);
-      }
-      // There is no active workspace yet but we might be still loading them
-      if (!getUserWorkspacesRequest.wasExecuted || getUserWorkspacesRequest.isExecutingFirstTime) {
-        // If so, do not show any services to avoid loading all of them unfiltered
-        // and then having the filter flashing in (which is ugly and slow).
-        return [];
-      }
+    if (isFeatureActive && activeWorkspace) {
+      return this.getWorkspaceServices(activeWorkspace);
     }
     return services;
   };