From 20a19dacf026aec8163d3b25b0c91b49dac33bff Mon Sep 17 00:00:00 2001 From: Quang Lam Date: Fri, 30 Aug 2019 20:52:54 +0700 Subject: [PATCH] Fix trial limitation is not imposed correctly (#1) --- public/listeners/index.js | 9 +++++++-- src/components/main/index.js | 12 +++++++++++- src/senders/index.js | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/public/listeners/index.js b/public/listeners/index.js index 4a6c4d86..14b3607e 100755 --- a/public/listeners/index.js +++ b/public/listeners/index.js @@ -38,10 +38,11 @@ const { const createMenu = require('../libs/create-menu'); const addWorkspaceWindow = require('../windows/add-workspace'); +const codeInjectionWindow = require('../windows/code-injection'); +const editWorkspaceWindow = require('../windows/edit-workspace'); +const licenseRegistrationWindow = require('../windows/license-registration'); const mainWindow = require('../windows/main'); const preferencesWindow = require('../windows/preferences'); -const editWorkspaceWindow = require('../windows/edit-workspace'); -const codeInjectionWindow = require('../windows/code-injection'); const loadListeners = () => { ipcMain.on('request-open-in-browser', (e, url) => { @@ -142,6 +143,10 @@ const loadListeners = () => { addWorkspaceWindow.show(); }); + ipcMain.on('request-show-license-registration-window', () => { + licenseRegistrationWindow.show(); + }); + ipcMain.on('request-show-require-restart-dialog', () => { dialog.showMessageBox({ type: 'question', diff --git a/src/components/main/index.js b/src/components/main/index.js index 09ccdf37..35f667b2 100644 --- a/src/components/main/index.js +++ b/src/components/main/index.js @@ -24,6 +24,7 @@ import { requestShowAddWorkspaceWindow, requestShowEditWorkspaceWindow, requestShowPreferencesWindow, + requestShowLicenseRegistrationWindow, } from '../../senders'; const { remote } = window.require('electron'); @@ -157,7 +158,16 @@ const Main = ({ }} /> ))} - + { + if (Object.keys(workspaces).length > 1) { + requestShowLicenseRegistrationWindow(); + return; + } + requestShowAddWorkspaceWindow(); + }} + /> {!navigationBar && (
diff --git a/src/senders/index.js b/src/senders/index.js index 5e4931c0..2bb9c13b 100644 --- a/src/senders/index.js +++ b/src/senders/index.js @@ -14,6 +14,8 @@ export const requestShowPreferencesWindow = () => ipcRenderer.send('request-show export const requestShowEditWorkspaceWindow = (id) => ipcRenderer.send('request-show-edit-workspace-window', id); export const requestShowAddWorkspaceWindow = () => ipcRenderer.send('request-show-add-workspace-window'); export const requestShowCodeInjectionWindow = (type) => ipcRenderer.send('request-show-code-injection-window', type); +export const requestShowLicenseRegistrationWindow = (type) => ipcRenderer.send('request-show-license-registration-window', type); + // Preferences export const getPreference = (name) => ipcRenderer.sendSync('get-preference', name);