Skip to content

Commit f6095dc

Browse files
committed
Merge branch 'develop' into alpha
2 parents 04d7761 + 9f42a50 commit f6095dc

File tree

7 files changed

+41
-21
lines changed

7 files changed

+41
-21
lines changed

package-lock.json

Lines changed: 27 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@advanced-rest-client/arc-menu": "^4.0.3",
4444
"@advanced-rest-client/arc-messages": "^0.1.0",
4545
"@advanced-rest-client/arc-models": "^4.2.9",
46-
"@advanced-rest-client/arc-request-ui": "^0.1.10",
46+
"@advanced-rest-client/arc-request-ui": "^0.1.11",
4747
"@advanced-rest-client/arc-settings": "^0.1.2",
4848
"@advanced-rest-client/bottom-sheet": "^3.2.2",
4949
"@advanced-rest-client/client-certificates": "^0.1.0",

src/app/scripts/apic/ApiConsole.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ export class ApiConsoleApplication extends AmfHelperMixin(ApplicationPage) {
582582
headerTemplate() {
583583
return html`
584584
<header>
585-
<anypoint-icon-button title="Back to the request workspace" @click="${this[mainBackHandler]}">
585+
<anypoint-icon-button title="Back to the request workspace" @click="${this[mainBackHandler]}" class="header-action-button">
586586
<arc-icon icon="arrowBack"></arc-icon>
587587
</anypoint-icon-button>
588588
API Console by MuleSoft.
@@ -644,6 +644,7 @@ export class ApiConsoleApplication extends AmfHelperMixin(ApplicationPage) {
644644
verticalAlign="top"
645645
horizontalAlign="auto"
646646
closeOnActivate
647+
class="header-action-button"
647648
>
648649
<anypoint-icon-button slot="dropdown-trigger" ?compatibility="${this.compatibility}">
649650
<arc-icon icon="moreVert"></arc-icon>

src/app/scripts/arc/AdvancedRestClientApplication.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,8 @@ export class AdvancedRestClientApplication extends ApplicationPage {
479479
* @param {ARCConfig} cnf
480480
*/
481481
setConfigVariables(cnf) {
482-
if (!!cnf.request || (cnf.request && typeof cnf.request.ignoreSessionCookies === 'boolean' && cnf.request.ignoreSessionCookies)) {
482+
const ignoreCookies = !!cnf.request && cnf.request.ignoreSessionCookies === false;
483+
if (!ignoreCookies) {
483484
ModulesRegistry.register(ModulesRegistry.request, 'arc/request/cookies', RequestCookies.processRequestCookies, ['events']);
484485
ModulesRegistry.register(ModulesRegistry.response, 'arc/response/cookies', RequestCookies.processResponseCookies, ['events']);
485486
}

src/io/ArcEnvironment.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,10 @@ export class ArcEnvironment {
342342
ignoreWindowSessionSettings: true,
343343
noMenu: true,
344344
parent: win,
345+
sizing: {
346+
height: 800,
347+
width: 800,
348+
},
345349
});
346350
break;
347351
case 'open-privacy-policy':

src/io/start.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ export default async function start(startTime) {
7878
app.commandLine.appendSwitch('enable-experimental-web-platform-features');
7979
app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors');
8080

81+
// Sets the application version in a global variable so the renderer process
82+
// has this information without querying for it.
83+
process.env.ARC_VERSION = app.getVersion();
84+
8185
process.on('uncaughtException', (error) => {
8286
if (error.message) {
8387
logger.error(error.message);

src/preload/arc-preload.esm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { GoogleDriveProxy } from './GoogleDriveProxy.js';
1717
import { GoogleAnalytics } from './GoogleAnalytics.js';
1818

1919
const env = {};
20-
const APP_VERSION = process.env.npm_package_version;
20+
const APP_VERSION = process.env.ARC_VERSION;
2121
Object.keys(process.env).forEach((key) => {
2222
if (key.indexOf('npm_') === 0 || key.indexOf('ARC_') === 0) {
2323
return;

0 commit comments

Comments
 (0)