Merge branch 'develop' into beta

jarrodek · jarrodek · commit c6d52c1e5f8a · 2022-02-01T13:47:20.000-08:00
diff --git a/src/app/bindings/GoogleAnalyticsBindings.js b/src/app/bindings/GoogleAnalyticsBindings.js
@@ -101,6 +101,7 @@ export class GoogleAnalyticsBindings extends PlatformBindings {
     window.addEventListener(EventTypes.Telemetry.exception, this.exceptionHandler.bind(this));
     window.addEventListener(EventTypes.Telemetry.view, this.viewHandler.bind(this));
     window.addEventListener(EventTypes.Telemetry.timing, this.timingHandler.bind(this));
+    window.addEventListener(EventTypes.Telemetry.State.set, this.stateSetHandler.bind(this));
     ArcEnvironment.ipc.on('preferences-value-updated', this.preferenceHandler.bind(this));
   }
 
@@ -271,4 +272,12 @@ export class GoogleAnalyticsBindings extends PlatformBindings {
       default:
     }
   }
+
+  /**
+   * This is a handler for the event dispatched by the GA consent screen.
+   * It dispatches a message to the IO so it knows to continue with the application flow.
+   */
+  stateSetHandler() {
+    ArcEnvironment.ipc.send('telemetry-set');
+  }
 }
diff --git a/src/app/data-migration.js b/src/app/data-migration.js
@@ -1,5 +1,4 @@
 import { ApplicationScreen, html } from '../../web_modules/index.js';
-import { ArcBindings } from './bindings/ArcBindings.js';
 
 export class DataMigrationScreen extends ApplicationScreen {
   constructor() {
@@ -62,9 +61,6 @@ export class DataMigrationScreen extends ApplicationScreen {
 }
 
 (async () => {
-  const bindings = new ArcBindings();
-  await bindings.initialize();
-  
   const page = new DataMigrationScreen();
   await page.initialize();
 })();
diff --git a/src/app/styles/data-migration.css b/src/app/styles/data-migration.css
@@ -0,0 +1,14 @@
+.app-loader.error {
+  background-color: #F44336;
+  color: #fff;
+}
+
+.error-stack {
+  white-space: pre;
+}
+
+.error-message,
+.error-stack,
+.selectable {
+  user-select: text;
+}
diff --git a/src/io/TelemetryConsent.js b/src/io/TelemetryConsent.js
@@ -22,6 +22,7 @@ export class TelemetryConsent {
   constructor(wm) {
     this.wm = wm;
     this.lockFile = path.join(process.env.ARC_HOME, '.telemetry-consent.lock');
+    this.pageHandler = this.pageHandler.bind(this);
   }
 
   /**
@@ -34,7 +35,7 @@ export class TelemetryConsent {
       return undefined;
     }
     await this.renderDialog();
-    ipcMain.on('telemetry-set', this.pageHandler.bind(this));
+    ipcMain.on('telemetry-set', this.pageHandler);
     return new Promise((resolve) => {
       this.resolve = resolve;
     });
@@ -62,6 +63,7 @@ export class TelemetryConsent {
   async pageHandler() {
     await fs.writeFile(this.lockFile, 'Do not remove this file. It prohibits showing the analytics dialog.');
     this.resolve();
+    ipcMain.removeListener('telemetry-set', this.pageHandler);
     if (this.loader && !this.loader.isDestroyed()) {
       this.loader.close();
     }
diff --git a/src/io/defaults/db-server.html b/src/io/defaults/db-server.html
@@ -3,43 +3,15 @@
 <head>
 </head>
 <body>
-<project-model></project-model>
-<url-history-model></url-history-model>
-<websocket-url-history-model></websocket-url-history-model>
-<history-data-model></history-data-model>
-<client-certificate-model></client-certificate-model>
-<variables-model></variables-model>
-<auth-data-model></auth-data-model>
-<request-model></request-model>
-<host-rules-model></host-rules-model>
-<rest-api-model></rest-api-model>
-<url-indexer></url-indexer>
 <script type="module">
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable import/no-unresolved */
-
 /**
  * This import the entire data export logic for ARC and dumps all the user data
  * into a temporary folder (in the system's TMP path).
  * 
  * Then it reports the operation finished to the IO process so it can run the import window
  * and import the data into the application.
  */
-
-import PouchDB from 'web-module:../web_modules/pouchdb/dist/pouchdb.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/project-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/url-history-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/websocket-url-history-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/history-data-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/client-certificate-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/variables-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/auth-data-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/request-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/host-rules-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/rest-api-model.js';
-import 'web-module:../web_modules/@advanced-rest-client/arc-models/url-indexer.js';
-import { ExportProcessor, ExportFactory } from 'web-module:../web_modules/@advanced-rest-client/arc-models/index.js';
+ import { PouchDB, ExportProcessor, ExportFactory } from 'web-module:../web_modules/index.js';
 
 window.PouchDB = PouchDB;
 const { ipcRenderer } = require('electron');
@@ -53,6 +25,7 @@
  * @return Promise<void>
  */
 async function start(e, storeLocation) {
+  console.info('Starting data migration');
   try {
     const factory = new ExportFactory();
     const data = /** @type any[] */ (await factory.getExportData({
@@ -85,10 +58,10 @@
     await fs.outputJson(storeLocation, exportObject);
     ipcRenderer.send('server-db-finished');
   } catch (e) {
+    console.error(e);
     ipcRenderer.send('db-error', e.message, e.stack);
   }
 }
-
 ipcRenderer.once('server-start', start);
 </script>
 </body>
diff --git a/src/io/start.js b/src/io/start.js
@@ -1,4 +1,5 @@
 import { app, protocol } from 'electron';
+import path from 'path';
 import { logger, setLevel } from './Logger.js';
 import { ApplicationPaths } from './ApplicationPaths.js';
 import { ApplicationOptions } from './ApplicationOptions.js';
@@ -110,17 +111,17 @@ export default async function start(startTime) {
   initOptions = startupOptions.getOptions();
   if (initOptions.dev) {
     setLevel(initOptions.debugLevel || 'silly');
-    // logger.level = initOptions.debugLevel || 'warn';
   } else if (initOptions.debugLevel) {
-    // logger.level = initOptions.debugLevel;
     setLevel(initOptions.debugLevel);
   } else {
-    // logger.level = 'error';
     setLevel('error');
   }
   
   if (initOptions.userDataDir) {
     app.setPath('userData', initOptions.userDataDir);
+  } else if (initOptions.dev) {
+    const appData = app.getPath('appData');
+    app.setPath('userData', path.join(appData, 'advanced-rest-client-dev'));
   }
 
   // Standard scheme must be registered before the app is ready
diff --git a/tasks/index.js b/tasks/index.js
@@ -6,6 +6,7 @@ import '@advanced-rest-client/base/define/variables-suggestions.js';
 export { RequestAuthorization, ResponseAuthorization, ModulesRegistry } from '@advanced-rest-client/base'
 export * from '@advanced-rest-client/app';
 export * from '@advanced-rest-client/events';
+export { ExportProcessor, ExportFactory, ProjectModel, RequestModel, RestApiModel, AuthDataModel, HostRulesModel, VariablesModel, UrlHistoryModel, HistoryDataModel, ClientCertificateModel, WebsocketUrlHistoryModel, UrlIndexer } from '@advanced-rest-client/idb-store';
 export * as IdbKeyVal from 'idb-keyval';
 export { default as Jexl } from 'jexl';
 export { default as PouchDB } from 'pouchdb/dist/pouchdb.js';

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ export class GoogleAnalyticsBindings extends PlatformBindings {`
`101`	`101`	`window.addEventListener(EventTypes.Telemetry.exception, this.exceptionHandler.bind(this));`
`102`	`102`	`window.addEventListener(EventTypes.Telemetry.view, this.viewHandler.bind(this));`
`103`	`103`	`window.addEventListener(EventTypes.Telemetry.timing, this.timingHandler.bind(this));`
	`104`	`+ window.addEventListener(EventTypes.Telemetry.State.set, this.stateSetHandler.bind(this));`
`104`	`105`	`ArcEnvironment.ipc.on('preferences-value-updated', this.preferenceHandler.bind(this));`
`105`	`106`	`}`
`106`	`107`
`@@ -271,4 +272,12 @@ export class GoogleAnalyticsBindings extends PlatformBindings {`
`271`	`272`	`default:`
`272`	`273`	`}`
`273`	`274`	`}`
	`275`	`+`
	`276`	`+ /**`
	`277`	`+ * This is a handler for the event dispatched by the GA consent screen.`
	`278`	`+ * It dispatches a message to the IO so it knows to continue with the application flow.`
	`279`	`+ */`
	`280`	`+ stateSetHandler() {`
	`281`	`+ ArcEnvironment.ipc.send('telemetry-set');`
	`282`	`+ }`
`274`	`283`	`}`