Skip to content

Commit 5678949

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 0ffd9b1 + c356fb7 commit 5678949

2 files changed

Lines changed: 24 additions & 6 deletions

File tree

README.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ evitaLab Desktop allows you to:
3838
- ✅ global notification system - displays toast notifications from desktop app and connections in one place
3939
- _this way you can see notifications from all connections all the time_
4040

41-
As well as the features of the evitaLab core*:
41+
As well as the features of the [evitaLab core](https://github.com/FgForrest/evitalab)*:
4242

4343
- ✅ inspect schemas
4444
- ✅ browse entities in interactive table
@@ -74,6 +74,19 @@ Binaries are available for all major platforms (Windows, Linux, macOS). You can
7474
_Note: evitaLab Desktop versioning is separate from the evitaLab core versioning. Just pick the newest desktop app version
7575
no matter your server version._
7676

77+
### macOS
78+
79+
Newer macOS versions quarantine not-signed apps (we are working on it), therefore after installation, macOS may
80+
throw error saying the app is broken. To prevent that, execute following command after installation to get the app out of
81+
the quarantine:
82+
83+
```shell
84+
cd /Applications
85+
sudo xattr -d com.apple.quarantine evitaLab.app
86+
```
87+
88+
### Other platforms
89+
7790
For other platforms, you will have to clone the repository and configure the [Electron Forge](https://www.electronforge.io/)
7891
config for you platform and build it with:
7992

src/main/connection/service/ConnectionManager.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { ConnectionStyling } from '../model/ConnectionStyling'
77
import { DriverManager } from '../../driver/service/DriverManager'
88
import { Driver } from '../../driver/model/Driver'
99
import semver from 'semver/preload'
10+
import log from 'electron-log/main'
1011

1112
/**
1213
* Gets emitted when a connection was activated.
@@ -147,12 +148,16 @@ export class ConnectionManager extends EventEmitter {
147148

148149
private async checkForDriverUpdate(connectionId: ConnectionId): Promise<void> {
149150
if (!this._connectionsCheckedForDriverUpdate.includes(connectionId)) {
150-
const connection: Connection = this.getConnection(connectionId)
151-
const latestAvailableDriver: Driver = await this.driverManager.resolveLatestAvailableDriver(connection.serverUrl)
152-
if (semver.gt(latestAvailableDriver.version, connection.driverVersion)) {
153-
this.emit(CONNECTION_MANAGER_EMIT_DRIVER_UPDATE_AVAILABLE, connectionId)
151+
try {
152+
const connection: Connection = this.getConnection(connectionId)
153+
const latestAvailableDriver: Driver = await this.driverManager.resolveLatestAvailableDriver(connection.serverUrl)
154+
if (semver.gt(latestAvailableDriver.version, connection.driverVersion)) {
155+
this.emit(CONNECTION_MANAGER_EMIT_DRIVER_UPDATE_AVAILABLE, connectionId)
156+
}
157+
this._connectionsCheckedForDriverUpdate.push(connectionId)
158+
} catch (e) {
159+
log.warn(`Check for driver update wasn't successful for connection '${connectionId}': `, e)
154160
}
155-
this._connectionsCheckedForDriverUpdate.push(connectionId)
156161
}
157162
}
158163

0 commit comments

Comments
 (0)