fix: duplicate request

README.md

@@ -22,15 +22,15 @@ Install the `altair-graphql-plugin-github-sync` plugin from Avaiable Plugins > A
 
 ## Usage
 
-- Click on "Upload" to send your collections to Gist.
-- Click on "Donwload" to get your collections from Gist.
+- Click on "Upload" to send your collections, app settings, environment to Gist.
+- Click on "Donwload" to get your collections, app settings, environment from Gist.
 
 ## For developer only
 
 1. Download and Open the Altair GraphQL Client
 2. Open the settings modal
 3. Toggle "ON" the "Enable experimental features in Altair. Note: The features might be unstable"
-4. Add "url:altair-graphql-plugin-github-sync@1.0.0::[url]->[http://localhost:8002]" to the plugins list and hit "Save" at the bottom of the settings modal
+4. Add "url:altair-graphql-plugin-github-sync@1.0.1::[url]->[http://localhost:8002]" to the plugins list and hit "Save" at the bottom of the settings modal
 5. After refresh Gist Sync panel will show in the left
 
 ## Credit

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "altair-graphql-plugin-github-sync",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "display_name": "Altair Github Sync",
   "description": "Save altair collections to github gist",
   "author_email": "[email protected]",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "altair-graphql-plugin-github-sync",
   "description": "Altair Sync Gist plugin",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": false,
   "license": "MIT",
   "homepage": "https://github.com/boydaihungst/altair-graphql-plugin-github-sync",

src/providers/SyncProvider.ts

@@ -4,6 +4,7 @@ import { IQueryCollection } from './StorageService';
 import merge from 'lodash/merge';
 import values from 'lodash/values';
 import keyBy from 'lodash/keyBy';
+import { STORE_KEY_API_KEY } from '@/constant/gist-provider.enum';
 abstract class SyncProvider {
   private altairContext: AltairContext;
 
@@ -18,20 +19,20 @@ abstract class SyncProvider {
    * @returns
    */
   mergeQueriesOfCollection(oldQueries: any[], newQueries: any[]) {
+    const now = this.altairContext.db.now();
     const mergedQueries = values(
-      merge(
-        keyBy(oldQueries, o => o.id),
-        keyBy(newQueries, o => o.id),
-      ),
-    );
+      merge(keyBy(oldQueries, 'id'), keyBy(newQueries, 'id')),
+    ).map(query => {
+      return { ...query, created_at: now, updated_at: now };
+    });
     return mergedQueries;
   }
 
   createCollection(collection: IQueryCollection) {
     const now = this.altairContext.db.now();
 
     collection.queries = collection.queries.map(query => {
-      return { ...query, id: uuid(), created_at: now, updated_at: now };
+      return { ...query, created_at: now, updated_at: now };
     });
     return this.altairContext.db.queryCollections.add({
       ...collection,
@@ -41,18 +42,19 @@ abstract class SyncProvider {
   }
 
   protected async updateCollection(
-    collectionTitle: string,
-    modifiedCollection: IQueryCollection,
+    oldCollection: IQueryCollection,
+    newCollection: IQueryCollection,
   ) {
-    return this.altairContext.db.queryCollections
-      .where('title')
-      .equals(collectionTitle)
-      .modify((oldCollection, ctx) => {
-        modifiedCollection.queries = this.mergeQueriesOfCollection(
-          oldCollection.queries,
-          modifiedCollection.queries,
-        );
-        ctx.value = modifiedCollection;
+    if (!oldCollection.id) return null;
+    const mergedQueries = this.mergeQueriesOfCollection(
+      oldCollection.queries,
+      newCollection.queries,
+    );
+    return await this.altairContext.db.queryCollections
+      .where('id')
+      .equals(oldCollection.id)
+      .modify({
+        queries: mergedQueries,
       });
   }
 
@@ -65,6 +67,7 @@ abstract class SyncProvider {
     if (data.localStorage) {
       // Restore localStorage
       Object.keys(data.localStorage).forEach(key => {
+        if (key === STORE_KEY_API_KEY) return;
         localStorage.setItem(key, data.localStorage[key]);
       });
     }
@@ -77,10 +80,7 @@ abstract class SyncProvider {
         .first();
       // Update old one with new one
       if (oldCollection) {
-        await this.updateCollection(
-          collection.title,
-          merge(oldCollection, collection),
-        );
+        await this.updateCollection(oldCollection, collection);
         continue;
       }
       // Create if not exist
@@ -101,10 +101,6 @@ abstract class SyncProvider {
   protected async exportFromAltair(): Promise<string> {
     const altairCollections = await this.altairContext.db.queryCollections.toArray();
     const altairAppState = await this.altairContext.db.appState.toArray();
-    // Prevent save app settings
-    altairAppState.splice(
-      altairAppState.findIndex(item => item.key === '[altair_]::settings'),
-    );
     const altairsSlectedFiles = await this.altairContext.db.selectedFiles.toArray();
 
     const data: AltairData = {