Merge branch 'release/v3.0.1'

platformio · Nov 13, 2019 · 6072f52 · 6072f52
2 parents 86a193a + 0470c65
commit 6072f52
Show file tree

Hide file tree

Showing 61 changed files with 390 additions and 378 deletions.
diff --git a/app/footer.jsx b/app/footer.jsx
@@ -110,9 +110,6 @@ class AppFooter extends React.Component {
   }
 }
 
-export default connect(
-  null,
-  {
-    osOpenUrl
-  }
-)(AppFooter);
+export default connect(null, {
+  osOpenUrl
+})(AppFooter);
diff --git a/app/modules/account/containers/forgot-page.jsx b/app/modules/account/containers/forgot-page.jsx
@@ -50,7 +50,4 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { ...actions, osOpenUrl }
-)(AccountForgotPage);
+export default connect(mapStateToProps, { ...actions, osOpenUrl })(AccountForgotPage);
diff --git a/app/modules/account/containers/information-page.jsx b/app/modules/account/containers/information-page.jsx
@@ -73,7 +73,6 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { ...actions, osOpenUrl }
-)(AccountInformationPage);
+export default connect(mapStateToProps, { ...actions, osOpenUrl })(
+  AccountInformationPage
+);
diff --git a/app/modules/account/containers/login-page.jsx b/app/modules/account/containers/login-page.jsx
@@ -65,7 +65,4 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { ...actions, osOpenUrl }
-)(AccountLoginPage);
+export default connect(mapStateToProps, { ...actions, osOpenUrl })(AccountLoginPage);
diff --git a/app/modules/account/containers/password-page.jsx b/app/modules/account/containers/password-page.jsx
@@ -55,7 +55,4 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  actions
-)(AccountPasswordPage);
+export default connect(mapStateToProps, actions)(AccountPasswordPage);
diff --git a/app/modules/account/containers/registration-page.jsx b/app/modules/account/containers/registration-page.jsx
@@ -48,7 +48,6 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { ...actions, osOpenUrl }
-)(AccountRegistrationPage);
+export default connect(mapStateToProps, { ...actions, osOpenUrl })(
+  AccountRegistrationPage
+);
diff --git a/app/modules/account/containers/token-page.jsx b/app/modules/account/containers/token-page.jsx
@@ -59,7 +59,4 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { ...actions, osOpenUrl }
-)(AccountTokenPage);
+export default connect(mapStateToProps, { ...actions, osOpenUrl })(AccountTokenPage);
diff --git a/app/modules/core/containers/code-beautifier.jsx b/app/modules/core/containers/code-beautifier.jsx
@@ -127,7 +127,4 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { requestContent }
-)(CodeBeautifier);
+export default connect(mapStateToProps, { requestContent })(CodeBeautifier);
diff --git a/app/modules/core/containers/file-explorer.jsx b/app/modules/core/containers/file-explorer.jsx
@@ -452,7 +452,4 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  actions
-)(FileExplorer);
+export default connect(mapStateToProps, actions)(FileExplorer);
diff --git a/app/modules/core/containers/open-in-browser.jsx b/app/modules/core/containers/open-in-browser.jsx
@@ -46,9 +46,6 @@ class OpenInBrowser extends React.Component {
 
 // Redux
 
-export default connect(
-  null,
-  {
-    osOpenUrl
-  }
-)(OpenInBrowser);
+export default connect(null, {
+  osOpenUrl
+})(OpenInBrowser);
diff --git a/app/modules/core/containers/repo-changelog.jsx b/app/modules/core/containers/repo-changelog.jsx
@@ -134,7 +134,4 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { requestContent }
-)(RepositoryChangelog);
+export default connect(mapStateToProps, { requestContent })(RepositoryChangelog);
diff --git a/app/modules/core/containers/routed-menu.jsx b/app/modules/core/containers/routed-menu.jsx
@@ -147,7 +147,4 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { connectRouter }
-)(RoutedMenu);
+export default connect(mapStateToProps, { connectRouter })(RoutedMenu);
diff --git a/app/modules/core/containers/social-buttons.jsx b/app/modules/core/containers/social-buttons.jsx
@@ -68,9 +68,6 @@ class SocialButtons extends React.Component {
 
 // Redux
 
-export default connect(
-  null,
-  {
-    osOpenUrl
-  }
-)(SocialButtons);
+export default connect(null, {
+  osOpenUrl
+})(SocialButtons);
diff --git a/app/modules/device/containers/logical-page.jsx b/app/modules/device/containers/logical-page.jsx
@@ -133,10 +133,7 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  {
-    loadLogicalDevices,
-    osOpenUrl
-  }
-)(DeviceLogicalPage);
+export default connect(mapStateToProps, {
+  loadLogicalDevices,
+  osOpenUrl
+})(DeviceLogicalPage);
diff --git a/app/modules/device/containers/mdns-page.jsx b/app/modules/device/containers/mdns-page.jsx
@@ -160,10 +160,7 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  {
-    ...actions,
-    osOpenUrl
-  }
-)(DeviceMDNSPage);
+export default connect(mapStateToProps, {
+  ...actions,
+  osOpenUrl
+})(DeviceMDNSPage);
diff --git a/app/modules/device/containers/serial-page.jsx b/app/modules/device/containers/serial-page.jsx
@@ -163,10 +163,7 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  {
-    ...actions,
-    osOpenUrl
-  }
-)(DeviceSerialPage);
+export default connect(mapStateToProps, {
+  ...actions,
+  osOpenUrl
+})(DeviceSerialPage);
diff --git a/app/modules/home/containers/home-page.jsx b/app/modules/home/containers/home-page.jsx
@@ -247,10 +247,7 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  {
-    osOpenUrl,
-    showAtStartup
-  }
-)(HomePage);
+export default connect(mapStateToProps, {
+  osOpenUrl,
+  showAtStartup
+})(HomePage);
diff --git a/app/modules/home/containers/pio-versions.jsx b/app/modules/home/containers/pio-versions.jsx
@@ -77,7 +77,4 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  { osOpenUrl }
-)(PioVersions);
+export default connect(mapStateToProps, { osOpenUrl })(PioVersions);
diff --git a/app/modules/home/containers/recent-news.jsx b/app/modules/home/containers/recent-news.jsx
@@ -138,10 +138,7 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(
-  mapStateToProps,
-  {
-    loadLatestTweets,
-    osOpenUrl
-  }
-)(RecentNews);
+export default connect(mapStateToProps, {
+  loadLatestTweets,
+  osOpenUrl
+})(RecentNews);
diff --git a/app/modules/home/sagas.js b/app/modules/home/sagas.js
@@ -35,9 +35,29 @@ function* watchLoadLatestTweets() {
         query: 'misc.load_latest_tweets',
         params: [`https://dl.platformio.org/tweets/${username}/data.json`]
       });
-    } catch (err) {
-      items = err;
-      console.error(err);
+    } catch (err1) {
+      console.error(err1);
+      // FIXME: Remove this code after PIO Core 4.1.1 release (begin)
+      try {
+        const cacheValid = '1d';
+        items = JSON.parse(
+          yield call(apiFetchData, {
+            query: 'os.request_content',
+            params: [
+              `https://dl.platformio.org/tweets/${username}/data.json`,
+              undefined,
+              undefined,
+              cacheValid
+            ]
+          })
+        );
+        // fallvback to backend cache
+        items = items.result ? items.result : items;
+      } catch (err2) {
+        console.error(err2);
+        items = err2;
+      }
+      // FIXME: Remove this code after PIO Core 4.1.1 release (end)
     }
     yield put(updateEntity('latestTweets', items));
   });

diff --git a/app/modules/inspect/constants.js b/app/modules/inspect/constants.js
@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-//  Prefix for names of entities
-export const PREFIX = 'inspect';
-
 // Entity name to save list of environments
-export const CONFIG_KEY = PREFIX + 'Configuration';
-
-export const RESULT_KEY = PREFIX + 'Sizedata';
+export const STORAGE_KEY = 'inspect';
+export const CONFIG_KEY = 'configuration';
+export const METRICS_KEY = 'metrics';
 
-export const METRICS_KEY = PREFIX + 'Metrics';
+export const RESULT_KEY = 'inspectSizedata';
 
 export const SYMBOL_ICON_BY_TYPE = Object.freeze({
   STT_FUNC: 'profile',

diff --git a/app/modules/inspect/containers/code.jsx b/app/modules/inspect/containers/code.jsx
@@ -70,7 +70,4 @@ const dispatchToProps = {
   openTextDocument
 };
 
-export default connect(
-  mapStateToProps,
-  dispatchToProps
-)(CodePage);
+export default connect(mapStateToProps, dispatchToProps)(CodePage);
diff --git a/app/modules/inspect/containers/configuration.jsx b/app/modules/inspect/containers/configuration.jsx
@@ -57,7 +57,7 @@ class InspectionFormComponent extends React.Component {
       memory: true,
       code: true
     };
-    this.props.loadProjects();
+    this.props.loadProjects(true);
     // Storage with saved configuration loads asynchronously, so data can come later
     this.props.form.setFieldsValue(this.props.savedConfiguration || defaults);
   }
@@ -69,6 +69,16 @@ class InspectionFormComponent extends React.Component {
     ) {
       this.props.form.setFieldsValue(this.props.savedConfiguration);
     }
+    if (this.props.projects && prevProps.projects !== this.props.projects) {
+      // ensure selected project still exists
+      const selectedProject = this.props.form.getFieldValue('projectDir');
+      if (
+        selectedProject &&
+        !this.props.projects.find(p => p.path === selectedProject)
+      ) {
+        this.props.form.setFieldsValue({ projectDir: undefined });
+      }
+    }
   }
 
   componentWillUnmount() {

diff --git a/app/modules/inspect/containers/mem-explorer.jsx b/app/modules/inspect/containers/mem-explorer.jsx
@@ -216,7 +216,4 @@ const dispatchToProps = {
   openTextDocument
 };
 
-export default connect(
-  mapStateToProps,
-  dispatchToProps
-)(FileExplorerPage);
+export default connect(mapStateToProps, dispatchToProps)(FileExplorerPage);
diff --git a/app/modules/inspect/containers/mem-symbols.jsx b/app/modules/inspect/containers/mem-symbols.jsx
@@ -59,7 +59,4 @@ const dispatchToProps = {
   openTextDocument
 };
 
-export default connect(
-  mapStateToProps,
-  dispatchToProps
-)(SymbolsPage);
+export default connect(mapStateToProps, dispatchToProps)(SymbolsPage);