Merge branch 'master' into HEAD

app/src/components/App.tsx

@@ -13,6 +13,8 @@ import { connect } from 'react-redux'
 import { globalActions, settingsActions } from '../actions'
 import { Theme, withStyles } from '@material-ui/core/styles'
 
+(window as any).global = window
+
 const Settings = React.lazy(() => import('./SettingsDrawer/Settings'))
 const ContentView = React.lazy(() => import('./Layout/ContentView'))
 
@@ -66,6 +68,8 @@ class App extends React.PureComponent<Props, {}> {
       return null
     }
 
+    const anyProps: any = {};
+
     return (
       <div className={centerContent}>
         <CssBaseline />
@@ -73,7 +77,7 @@ class App extends React.PureComponent<Props, {}> {
           <ConfirmationDialog confirmationRequests={this.props.confirmationRequests} />
           {this.renderNotification()}
           <React.Suspense fallback={<div></div>}>
-            <Settings />
+            <Settings {...anyProps} />
           </React.Suspense>
           <div className={centerContent}>
             <div className={`${settingsVisible ? contentShift : content}`}>

app/src/components/ConnectionSetup/CertificateFileSelection.tsx

@@ -1,7 +1,5 @@
 import * as React from 'react'
-import Add from '@material-ui/icons/Add'
 import ClearAdornment from '../helper/ClearAdornment'
-import Delete from '@material-ui/icons/Delete'
 import Lock from '@material-ui/icons/Lock'
 import { bindActionCreators } from 'redux'
 import { Button, Theme, Tooltip, Typography } from '@material-ui/core'

app/src/components/Demo/Mouse.tsx

@@ -43,15 +43,15 @@ class Demo extends React.Component<{ classes: any }, State> {
   }
 
   public componentDidMount() {
-    ;(window as any).demo.enableMouse = () => {
+    ; (window as any).demo.enableMouse = () => {
       this.setState({ enabled: true })
     }
-    ;(window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => {
-      const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval)
-      const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval)
-      this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } })
-      this.moveCloser()
-    }
+      ; (window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => {
+        const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval)
+        const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval)
+        this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } })
+        this.moveCloser()
+      }
   }
 
   public render() {

app/src/components/Demo/index.tsx

@@ -5,14 +5,14 @@ let heapdump: any
 
 function writeHeapdump(path?: string) {
   if (!heapdump) {
-    heapdump = require('heapdump')
+    //<heapdump = require('heapdump')
   }
 
   heapdump.writeSnapshot(path || `${Date.now()}.heapsnapshot`)
   return path
 }
 
-;(window as any).demo = {
+; (window as any).demo = {
   writeHeapdump,
 }
 

app/src/components/ErrorBoundary.tsx

@@ -2,7 +2,6 @@ import * as React from 'react'
 import PersistentStorage from '../utils/PersistentStorage'
 import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
 import Warning from '@material-ui/icons/Warning'
-import { electronRendererTelemetry } from 'electron-telemetry'
 import { Theme, withStyles } from '@material-ui/core/styles'
 import { Button, Modal, Paper, Toolbar, Typography } from '@material-ui/core'
 
@@ -33,7 +32,7 @@ class ErrorBoundary extends React.PureComponent<Props, State> {
   }
 
   public componentDidCatch(error: Error, errorInfo: any) {
-    electronRendererTelemetry.trackError(error)
+    // electronRendererTelemetry.trackError(error)
     console.log('did catch', error)
   }
 

app/src/components/SettingsDrawer/TimeLocale.tsx

@@ -3,10 +3,17 @@ import DateFormatter from '../helper/DateFormatter'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { Input, InputLabel, MenuItem, Select, StyleRulesCallback, Theme } from '@material-ui/core'
+import { Input, InputLabel, MenuItem, Select, Theme } from '@material-ui/core'
 import { settingsActions } from '../../actions'
 import { withStyles } from '@material-ui/styles'
-import * as moment from 'moment'
+
+function importAll(r: any) {
+  r.keys().forEach(r);
+}
+// @ts-expect-error -- webpack require
+importAll(require.context('moment/locale', true, /\.js$/));
+
+const moment = require('moment')
 
 interface Props {
   actions: {

app/src/components/Sidebar/Publish/Publish.tsx

@@ -122,7 +122,7 @@ const EditorMode = memo(function EditorMode(props: {
         const str = JSON.stringify(JSON.parse(props.payload), undefined, '  ')
         updatePayload(str)
       } catch (error) {
-        props.globalActions.showError(`Format error: ${error.message}`)
+        props.globalActions.showError(`Format error: ${(error as Error)?.message}`)
       }
     }
   }, [props.payload])

app/src/components/UpdateNotifier.tsx

@@ -13,6 +13,7 @@ import { Theme, withStyles } from '@material-ui/core/styles'
 import { updateNotifierActions } from '../actions'
 
 import { Button, IconButton, Modal, Paper, Snackbar, SnackbarContent, Typography } from '@material-ui/core'
+import { rendererRpc, getAppVersion } from '../../../events'
 
 interface Props {
   showUpdateNotification: boolean
@@ -50,18 +51,21 @@ class UpdateNotifier extends React.PureComponent<Props, State> {
     super(props)
     this.state = { newerVersions: [] }
 
-    const ownVersion = electron.remote.app.getVersion()
-    this.fetchReleases().then(releases => {
-      const newerVersions = releases
-        .filter(release => this.allowPrereleaseIfOwnVersionIsBeta(release, ownVersion))
-        .filter(release => compareVersions(release.tag_name, ownVersion) > 0)
-        .sort((a, b) => compareVersions(b.tag_name, a.tag_name))
+    this.checkForUpdates()
+  }
 
-      if (newerVersions.length > 0) {
-        this.setState({ newerVersions })
-        this.props.actions.showUpdateNotification(true)
-      }
-    })
+  private async checkForUpdates() {
+    const ownVersion = await rendererRpc.call(getAppVersion, undefined, 10000);
+    const releases = await this.fetchReleases();
+    const newerVersions = releases
+      .filter(release => this.allowPrereleaseIfOwnVersionIsBeta(release, ownVersion))
+      .filter(release => compareVersions(release.tag_name, ownVersion) > 0)
+      .sort((a, b) => compareVersions(b.tag_name, a.tag_name))
+
+    if (newerVersions.length > 0) {
+      this.setState({ newerVersions })
+      this.props.actions.showUpdateNotification(true)
+    }
   }
 
   private allowPrereleaseIfOwnVersionIsBeta(release: GithubRelease, ownVersion: string) {