Merge branch 'develop' into alpha

advanced-rest-client · Feb 9, 2021 · f6095dc · f6095dc
2 parents 04d7761 + 9f42a50
commit f6095dc
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "@advanced-rest-client/arc-menu": "^4.0.3",
     "@advanced-rest-client/arc-messages": "^0.1.0",
     "@advanced-rest-client/arc-models": "^4.2.9",
-    "@advanced-rest-client/arc-request-ui": "^0.1.10",
+    "@advanced-rest-client/arc-request-ui": "^0.1.11",
     "@advanced-rest-client/arc-settings": "^0.1.2",
     "@advanced-rest-client/bottom-sheet": "^3.2.2",
     "@advanced-rest-client/client-certificates": "^0.1.0",

diff --git a/src/app/scripts/apic/ApiConsole.js b/src/app/scripts/apic/ApiConsole.js
@@ -582,7 +582,7 @@ export class ApiConsoleApplication extends AmfHelperMixin(ApplicationPage) {
   headerTemplate() {
     return html`
     <header>
-      <anypoint-icon-button title="Back to the request workspace" @click="${this[mainBackHandler]}">
+      <anypoint-icon-button title="Back to the request workspace" @click="${this[mainBackHandler]}" class="header-action-button">
         <arc-icon icon="arrowBack"></arc-icon>
       </anypoint-icon-button>
       API Console by MuleSoft.
@@ -644,6 +644,7 @@ export class ApiConsoleApplication extends AmfHelperMixin(ApplicationPage) {
       verticalAlign="top"
       horizontalAlign="auto"
       closeOnActivate
+      class="header-action-button"
     >
       <anypoint-icon-button slot="dropdown-trigger" ?compatibility="${this.compatibility}">
         <arc-icon icon="moreVert"></arc-icon>

diff --git a/src/app/scripts/arc/AdvancedRestClientApplication.js b/src/app/scripts/arc/AdvancedRestClientApplication.js
@@ -479,7 +479,8 @@ export class AdvancedRestClientApplication extends ApplicationPage {
    * @param {ARCConfig} cnf
    */
   setConfigVariables(cnf) {
-    if (!!cnf.request || (cnf.request && typeof cnf.request.ignoreSessionCookies === 'boolean' && cnf.request.ignoreSessionCookies)) {
+    const ignoreCookies = !!cnf.request && cnf.request.ignoreSessionCookies === false;
+    if (!ignoreCookies) {
       ModulesRegistry.register(ModulesRegistry.request, 'arc/request/cookies', RequestCookies.processRequestCookies, ['events']);
       ModulesRegistry.register(ModulesRegistry.response, 'arc/response/cookies', RequestCookies.processResponseCookies, ['events']);
     }

diff --git a/src/io/ArcEnvironment.js b/src/io/ArcEnvironment.js
@@ -342,6 +342,10 @@ export class ArcEnvironment {
           ignoreWindowSessionSettings: true,
           noMenu: true,
           parent: win,
+          sizing: {
+            height: 800,
+            width: 800,
+          },
         });
         break;
       case 'open-privacy-policy':

diff --git a/src/io/start.js b/src/io/start.js
@@ -78,6 +78,10 @@ export default async function start(startTime) {
   app.commandLine.appendSwitch('enable-experimental-web-platform-features');
   app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors');
 
+  // Sets the application version in a global variable so the renderer process 
+  // has this information without querying for it.
+  process.env.ARC_VERSION = app.getVersion();
+
   process.on('uncaughtException', (error) => {
     if (error.message) {
       logger.error(error.message);

diff --git a/src/preload/arc-preload.esm.js b/src/preload/arc-preload.esm.js
@@ -17,7 +17,7 @@ import { GoogleDriveProxy } from './GoogleDriveProxy.js';
 import { GoogleAnalytics } from './GoogleAnalytics.js';
 
 const env = {};
-const APP_VERSION = process.env.npm_package_version;
+const APP_VERSION = process.env.ARC_VERSION;
 Object.keys(process.env).forEach((key) => {
   if (key.indexOf('npm_') === 0 || key.indexOf('ARC_') === 0) {
     return;