From 918c70a8435939b4a80dfbebaf0f27d32ac3e810 Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Mon, 14 Oct 2019 11:20:47 -0500 Subject: [PATCH 1/3] Disable delete label action --- email_mailbox/src/components/SettingLabels.js | 28 +++++++++++-------- .../src/components/settingdevices.scss | 7 +++-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/email_mailbox/src/components/SettingLabels.js b/email_mailbox/src/components/SettingLabels.js index 27aefd33b..ead4c5d1a 100644 --- a/email_mailbox/src/components/SettingLabels.js +++ b/email_mailbox/src/components/SettingLabels.js @@ -74,9 +74,11 @@ const renderCustomLabelsBlock = props => (

{string.settings.show_in_label_list}

-
-

{string.settings.action}

-
+ {props.exist && ( +
+

{string.settings.action}

+
+ )}
{props.customLabels.map((customLabel, index) => @@ -102,12 +104,14 @@ const renderCustomLabelItem = (index, customLabelItem, props) => ( status={customLabelItem.visible ? 'all' : 'none'} />
-
props.onClickRemoveLabel(customLabelItem.id)} - > - {string.settings.remove} -
+ {props.exist && ( +
props.onClickRemoveLabel(customLabelItem.id)} + > + {string.settings.remove} +
+ )} ); @@ -145,12 +149,14 @@ renderSystemLabelsBlock.propTypes = { }; renderCustomLabelsBlock.propTypes = { - customLabels: PropTypes.array + customLabels: PropTypes.array, + exist: PropTypes.bool }; renderCustomLabelItem.propTypes = { onClickChangeLabelVisibility: PropTypes.func, - onClickRemoveLabel: PropTypes.func + onClickRemoveLabel: PropTypes.func, + exist: PropTypes.bool }; renderInputAddNewLabel.propTypes = { diff --git a/email_mailbox/src/components/settingdevices.scss b/email_mailbox/src/components/settingdevices.scss index 9973feb69..362469210 100644 --- a/email_mailbox/src/components/settingdevices.scss +++ b/email_mailbox/src/components/settingdevices.scss @@ -70,13 +70,14 @@ } button { - display: flex; align-items: center; - padding-left: 5%; + background-color: transparent; color: #d94e47; + cursor: pointer; + display: flex; font-size: 12px; font-weight: 600; - cursor: pointer; + padding-left: 5%; } } } From 9ec2608e18a85155b08fc87058b59b8978a9f188 Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Mon, 14 Oct 2019 15:43:29 -0500 Subject: [PATCH 2/3] Fix close login --- electron_app/src/ipc/login.js | 4 +-- electron_app/src/windows/composer.js | 5 ++-- electron_app/src/windows/login.js | 5 +++- electron_app/src/windows/mailbox.js | 26 ++++++++----------- .../src/components/ChangePasswordWrapper.js | 2 +- email_login/src/components/PanelWrapper.js | 6 ++--- .../src/components/SignInPasswordWrapper.js | 2 +- email_login/src/components/titleBar.js | 2 +- email_login/src/utils/ipc.js | 4 +-- 9 files changed, 27 insertions(+), 29 deletions(-) diff --git a/electron_app/src/ipc/login.js b/electron_app/src/ipc/login.js index 3033f14d5..8bec7b3b9 100644 --- a/electron_app/src/ipc/login.js +++ b/electron_app/src/ipc/login.js @@ -1,8 +1,8 @@ const ipc = require('@criptext/electron-better-ipc'); const loginWindow = require('../windows/login'); -ipc.answerRenderer('close-login', () => { - loginWindow.close(); +ipc.answerRenderer('close-login', ({ forceClose }) => { + loginWindow.close({ forceClose }); }); ipc.answerRenderer('minimize-login', () => { diff --git a/electron_app/src/windows/composer.js b/electron_app/src/windows/composer.js index 93892c556..9d05ce179 100644 --- a/electron_app/src/windows/composer.js +++ b/electron_app/src/windows/composer.js @@ -164,9 +164,8 @@ const destroy = async ({ const sendEventToMailbox = (eventName, data) => { const mailboxWindow = require('./mailbox'); - if (mailboxWindow && mailboxWindow.send) { - mailboxWindow.send(eventName, data); - } + if (!mailboxWindow) return; + mailboxWindow.send(eventName, data); }; const saveDraftToDatabase = async (composerId, data) => { diff --git a/electron_app/src/windows/login.js b/electron_app/src/windows/login.js index bcce383e9..2c3d0acaf 100644 --- a/electron_app/src/windows/login.js +++ b/electron_app/src/windows/login.js @@ -4,6 +4,7 @@ const { loginUrl } = require('./../window_routing'); const globalManager = require('./../globalManager'); const { addEventTrack, NUCLEUS_EVENTS } = require('./../nucleusManager'); let loginWindow; +let shouldCloseForce = false; const loginSize = { width: 328, @@ -34,6 +35,7 @@ const create = () => { loginWindow.on('close', e => { const isMacOs = process.platform === 'darwin'; + if (shouldCloseForce === true) return; if (isMacOs && !globalManager.forcequit.get()) { e.preventDefault(); hide(); @@ -63,7 +65,8 @@ const show = async () => { } }; -const close = () => { +const close = ({ forceClose }) => { + shouldCloseForce = forceClose; if (loginWindow !== undefined) { loginWindow.close(); } diff --git a/electron_app/src/windows/mailbox.js b/electron_app/src/windows/mailbox.js index 796979633..7f757f2f5 100644 --- a/electron_app/src/windows/mailbox.js +++ b/electron_app/src/windows/mailbox.js @@ -68,18 +68,17 @@ const create = () => { mailboxWindow.webContents.on('new-window', openLinkInDefaultBrowser); mailboxWindow.webContents.on('will-navigate', openLinkInDefaultBrowser); mailboxWindow.on('close', e => { - if (!globalManager.forcequit.get()) { - e.preventDefault(); - if (mailboxWindow && mailboxWindow.isFullScreen()) { - mailboxWindow.setFullScreen(false); - setTimeout(() => hide(), 1200); - } else { - hide(); - } - } else { + if (!mailboxWindow || globalManager.forcequit.get()) { destroyTrayIcon(); require('./../socketClient').disconnect(); } + e.preventDefault(); + if (mailboxWindow && mailboxWindow.isFullScreen()) { + mailboxWindow.setFullScreen(false); + setTimeout(() => hide(), 1200); + } else { + hide(); + } }); mailboxWindow.webContents.once('did-frame-finish-load', () => { if (!isFromStore) appUpdater(); @@ -149,15 +148,12 @@ const toggleMaximize = () => { }; const minimize = () => { - if (mailboxWindow !== undefined) { - mailboxWindow.minimize(); - } + if (!mailboxWindow) return; + mailboxWindow.minimize(); }; const send = (message, data) => { - if (!mailboxWindow) { - return; - } + if (!mailboxWindow) return; mailboxWindow.webContents.send(message, data); }; diff --git a/email_login/src/components/ChangePasswordWrapper.js b/email_login/src/components/ChangePasswordWrapper.js index a762407dc..db6cd088f 100644 --- a/email_login/src/components/ChangePasswordWrapper.js +++ b/email_login/src/components/ChangePasswordWrapper.js @@ -122,7 +122,7 @@ class ChangePasswordWrapper extends Component { token } }); - closeLoginWindow(); + closeLoginWindow({ forceClose: true }); break; } case LOGIN_FIRST_STATUS.WRONG_CREDENTIALS: { diff --git a/email_login/src/components/PanelWrapper.js b/email_login/src/components/PanelWrapper.js index 0d1b58689..d3694bafc 100644 --- a/email_login/src/components/PanelWrapper.js +++ b/email_login/src/components/PanelWrapper.js @@ -87,7 +87,7 @@ const commitNewUser = validInputData => { loadingType: 'signup', remoteData: validInputData }); - closeLoginWindow(); + closeLoginWindow({ forceClose: true }); }; class PanelWrapper extends Component { @@ -822,7 +822,7 @@ class PanelWrapper extends Component { remoteData }); deleteTemporalAccount(); - closeLoginWindow(); + closeLoginWindow({ forceClose: true }); return; } default: { @@ -902,7 +902,7 @@ class PanelWrapper extends Component { name } }); - closeLoginWindow(); + closeLoginWindow({ forceClose: true }); } else { const error = { name: string.errors.loginFailed.name, diff --git a/email_login/src/components/SignInPasswordWrapper.js b/email_login/src/components/SignInPasswordWrapper.js index 79c56bf0f..b19d0437f 100644 --- a/email_login/src/components/SignInPasswordWrapper.js +++ b/email_login/src/components/SignInPasswordWrapper.js @@ -120,7 +120,7 @@ class SignInPasswordWrapper extends Component { name } }); - closeLoginWindow(); + closeLoginWindow({ forceClose: true }); break; } case LOGIN_STATUS.WRONG_CREDENTIALS: { diff --git a/email_login/src/components/titleBar.js b/email_login/src/components/titleBar.js index 78ae380a0..b996180f2 100644 --- a/email_login/src/components/titleBar.js +++ b/email_login/src/components/titleBar.js @@ -17,7 +17,7 @@ const titleBar = () => ( - closeLoginWindow()}> + closeLoginWindow({})}> diff --git a/email_login/src/utils/ipc.js b/email_login/src/utils/ipc.js index 432f5bb3f..5b5ed6ba9 100644 --- a/email_login/src/utils/ipc.js +++ b/email_login/src/utils/ipc.js @@ -1,7 +1,7 @@ import { callMain } from '@criptext/electron-better-ipc/renderer'; -export const closeLoginWindow = () => { - callMain('close-login'); +export const closeLoginWindow = params => { + callMain('close-login', params); }; export const getComputerName = () => callMain('get-computer-name'); From cc3176b4e3da22f039dcdcc469bad628acb2ba7f Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Mon, 14 Oct 2019 15:47:15 -0500 Subject: [PATCH 3/3] Update version 0.23.10 --- electron_app/package.json | 2 +- email_composer/package.json | 2 +- email_loading/package.json | 2 +- email_login/package.json | 2 +- email_mailbox/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/electron_app/package.json b/electron_app/package.json index 5e3f2beba..3e4effc2c 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -1,6 +1,6 @@ { "name": "criptext", - "version": "0.23.9", + "version": "0.23.10", "author": { "name": "Criptext Inc", "email": "support@criptext.com", diff --git a/email_composer/package.json b/email_composer/package.json index f5d9d9e05..972c5b962 100644 --- a/email_composer/package.json +++ b/email_composer/package.json @@ -1,6 +1,6 @@ { "name": "email_composer", - "version": "0.23.9", + "version": "0.23.10", "private": true, "dependencies": { "@criptext/electron-better-ipc": "^0.1.2-rc5", diff --git a/email_loading/package.json b/email_loading/package.json index b9fad1351..df492ba71 100644 --- a/email_loading/package.json +++ b/email_loading/package.json @@ -1,6 +1,6 @@ { "name": "email_loading", - "version": "0.23.9", + "version": "0.23.10", "private": true, "dependencies": { "@criptext/electron-better-ipc": "^0.1.2-rc5", diff --git a/email_login/package.json b/email_login/package.json index b363c85ab..c8c3a2904 100644 --- a/email_login/package.json +++ b/email_login/package.json @@ -1,6 +1,6 @@ { "name": "email_login", - "version": "0.23.9", + "version": "0.23.10", "private": true, "dependencies": { "@criptext/electron-better-ipc": "^0.1.2-rc5", diff --git a/email_mailbox/package.json b/email_mailbox/package.json index d3cd797c2..93e25a190 100644 --- a/email_mailbox/package.json +++ b/email_mailbox/package.json @@ -1,6 +1,6 @@ { "name": "email_mailbox", - "version": "0.23.9", + "version": "0.23.10", "private": true, "dependencies": { "@criptext/electron-better-ipc": "^0.1.2-rc5",