Skip to content

Commit

Permalink
chore: replace most notifications with showError (#1040)
Browse files Browse the repository at this point in the history
  • Loading branch information
@eglitise
eglitise authored Aug 17, 2023
1 parent 95273f2 commit a6ad90a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 59 deletions.
13 changes: 2 additions & 11 deletions app/renderer/actions/Inspector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import frameworks from '../lib/client-frameworks';
import { getSetting, setSetting, SAVED_FRAMEWORK, SET_SAVED_GESTURES } from '../../shared/settings';
import i18n from '../../configs/i18next.config.renderer';
import AppiumClient, { NATIVE_APP } from '../lib/appium-client';
import { notification } from 'antd';

export const SET_SESSION_DETAILS = 'SET_SESSION_DETAILS';
export const SET_SOURCE_AND_SCREENSHOT = 'SET_SOURCE_AND_SCREENSHOT';
Expand Down Expand Up @@ -285,11 +284,7 @@ export function quitSession (reason, killedByUser = true) {
await applyAction(dispatch, getState);
dispatch({type: QUIT_SESSION_DONE});
if (!killedByUser) {
notification.error({
message: 'Error',
description: reason || i18n.t('Session has been terminated'),
duration: 0
});
showError(new Error(reason || i18n.t('Session has been terminated')), null, 0);
}
};
}
Expand Down Expand Up @@ -571,11 +566,7 @@ export function selectLocatedElement (source, bounds, id) {
const action = selectElement(foundPath);
await action(dispatch, getState);
} else {
notification.error({
message: i18n.t('Error'),
description: i18n.t('findingElementInSourceFailed'),
duration: 8
});
showError(new Error(i18n.t('findingElementInSourceFailed')), null, 8);
}
dispatch({type: FINDING_ELEMENT_IN_SOURCE_COMPLETED});
};
Expand Down
61 changes: 13 additions & 48 deletions app/renderer/actions/Session.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export function getCapsObject (caps) {
})));
}

export function showError (e, methodName, secs = 5) {
export function showError (e, methodName = null, secs = 5) {
let errMessage;
if (e['jsonwire-error'] && e['jsonwire-error'].status === 7) {
// FIXME: we probably should set 'findElement' as the method name
Expand Down Expand Up @@ -152,6 +152,7 @@ export function showError (e, methodName, secs = 5) {
errMessage = i18n.t('couldNotConnect');
}

console.error(errMessage); // eslint-disable-line no-console
notification.error({
message: methodName ? i18n.t('callToMethodFailed', {methodName}) : i18n.t('Error'),
description: errMessage,
Expand Down Expand Up @@ -258,11 +259,7 @@ export function newSession (caps, attachSessId = null) {
username = session.server.sauce.username || process.env.SAUCE_USERNAME;
accessKey = session.server.sauce.accessKey || process.env.SAUCE_ACCESS_KEY;
if (!username || !accessKey) {
notification.error({
message: i18n.t('Error'),
description: i18n.t('sauceCredentialsRequired'),
duration: 4
});
showError(new Error(i18n.t('sauceCredentialsRequired')));
return false;
}
https = false;
Expand All @@ -279,7 +276,7 @@ export function newSession (caps, attachSessId = null) {
try {
headspinUrl = new URL(session.server.headspin.webDriverUrl);
} catch (ign) {
showError(new Error(`${session.server.headspin.webDriverUrl} is invalid url`), null, 0);
showError(new Error(`${i18n.t('Invalid URL:')} ${session.server.headspin.webDriverUrl}`));
return false;
}
host = session.server.headspin.hostname = headspinUrl.hostname;
Expand All @@ -295,11 +292,7 @@ export function newSession (caps, attachSessId = null) {
token = session.server.perfecto.token || process.env.PERFECTO_TOKEN;
path = session.server.perfecto.path = '/nexperience/perfectomobile/wd/hub';
if (!token) {
notification.error({
message: i18n.t('Error'),
description: i18n.t('Perfecto SecurityToken is required'),
duration: 4
});
showError(new Error(i18n.t('Perfecto SecurityToken is required')));
return false;
}
desiredCapabilities['perfecto:options'] = {securityToken: token};
Expand All @@ -316,11 +309,7 @@ export function newSession (caps, attachSessId = null) {
desiredCapabilities['bstack:options'].source = 'appiumdesktop';
accessKey = session.server.browserstack.accessKey || process.env.BROWSERSTACK_ACCESS_KEY;
if (!username || !accessKey) {
notification.error({
message: i18n.t('Error'),
description: i18n.t('browserstackCredentialsRequired'),
duration: 4
});
showError(new Error(i18n.t('browserstackCredentialsRequired')));
return false;
}
https = session.server.browserstack.ssl = (parseInt(port, 10) === 443);
Expand All @@ -345,11 +334,7 @@ export function newSession (caps, attachSessId = null) {
}
accessKey = session.server.lambdatest.accessKey || process.env.LAMBDATEST_ACCESS_KEY;
if (!username || !accessKey) {
notification.error({
message: i18n.t('Error'),
description: i18n.t('lambdatestCredentialsRequired'),
duration: 4,
});
showError(new Error(i18n.t('lambdatestCredentialsRequired')));
return false;
}
https = session.server.lambdatest.ssl = parseInt(port, 10) === 443;
Expand All @@ -360,11 +345,7 @@ export function newSession (caps, attachSessId = null) {
path = session.server.bitbar.path = '/wd/hub';
accessKey = session.server.bitbar.apiKey || process.env.BITBAR_API_KEY;
if (!accessKey) {
notification.error({
message: i18n.t('Error'),
description: i18n.t('bitbarCredentialsRequired'),
duration: 4
});
showError(new Error(i18n.t('bitbarCredentialsRequired')));
return false;
}
desiredCapabilities['bitbar:options'] = {
Expand All @@ -382,11 +363,7 @@ export function newSession (caps, attachSessId = null) {
desiredCapabilities['kobiton:options'] = {};
desiredCapabilities['kobiton:options'].source = 'appiumdesktop';
if (!username || !accessKey) {
notification.error({
message: i18n.t('Error'),
description: i18n.t('kobitonCredentialsRequired'),
duration: 4
});
showError(new Error(i18n.t('kobitonCredentialsRequired')));
return false;
}
https = session.server.kobiton.ssl = true;
Expand All @@ -399,11 +376,7 @@ export function newSession (caps, attachSessId = null) {
desiredCapabilities.pCloudy_ApiKey = session.server.pcloudy.accessKey || process.env.PCLOUDY_ACCESS_KEY;
if (!(session.server.pcloudy.username || process.env.PCLOUDY_USERNAME) ||
!(session.server.pcloudy.accessKey || process.env.PCLOUDY_ACCESS_KEY)) {
notification.error({
message: 'Error',
description: 'PCLOUDY username and api key are required!',
duration: 4
});
showError(new Error('PCLOUDY username and api key are required!'));
return false;
}
https = session.server.pcloudy.ssl = true;
Expand All @@ -419,22 +392,14 @@ export function newSession (caps, attachSessId = null) {
desiredCapabilities['tb:options'].secret = session.server.testingbot.secret || process.env.TB_SECRET;
if (!(session.server.testingbot.key || process.env.TB_KEY) ||
!(session.server.testingbot.secret || process.env.TB_SECRET)) {
notification.error({
message: 'Error',
description: i18n.t('testingbotCredentialsRequired'),
duration: 4
});
showError(new Error(i18n.t('testingbotCredentialsRequired')));
return false;
}
https = session.server.testingbot.ssl = true;
break;
case ServerTypes.experitest: {
if (!session.server.experitest.url || !session.server.experitest.accessKey) {
notification.error({
message: i18n.t('Error'),
description: i18n.t('experitestAccessKeyURLRequired'),
duration: 4
});
showError(new Error(i18n.t('experitestAccessKeyURLRequired')));
return false;
}
desiredCapabilities['experitest:accessKey'] = session.server.experitest.accessKey;
Expand All @@ -443,7 +408,7 @@ export function newSession (caps, attachSessId = null) {
try {
experitestUrl = new URL(session.server.experitest.url);
} catch (ign) {
showError(new Error(`${session.server.experitest.url} is invalid url`), null, 0);
showError(new Error(`${i18n.t('Invalid URL:')} ${session.server.experitest.url}`));
return false;
}

Expand Down
1 change: 1 addition & 0 deletions assets/locales/en/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"findElementFailure": "Failed to find element for '{{methodName}}'. Please refresh page and try again.",
"Could not start session": "Could not start session",
"couldNotConnect": "Could not connect to server; are you sure it's running? If you are using the browser version, also ensure your Appium server has been started with --allow-cors.",
"Invalid URL:": "Invalid URL:",
"sauceCredentialsRequired": "Sauce username and access key are required!",
"testingbotCredentialsRequired": "TestingBot key and secret are required!",
"Perfecto SecurityToken is required": "Perfecto SecurityToken is required",
Expand Down

0 comments on commit a6ad90a

Please sign in to comment.