Merge pull request #1572 from sparrowapp-dev/development

Release Version 2.7.0 [Merging development into prod]
sparrowapp-dev · Sep 13, 2024 · ebe93ef · ebe93ef
2 parents 3198e30 + 9c79a60
commit ebe93ef
Show file tree

Hide file tree

Showing 146 changed files with 6,471 additions and 1,384 deletions.
diff --git a/.env.example b/.env.example
@@ -9,4 +9,6 @@ VITE_SPARROW_DOWNLOAD_LINK="https://github.com/sparrowapp-dev/sparrow-app/releas
 VITE_RELEASE_NOTES_PAT_TOKEN=""
 VITE_RELEASE_NOTES_API="https://api.github.com/repos/sparrowapp-dev/sparrow-app/releases"
 VITE_AZURE_CDN_URL=
-VITE_AZURE_INSIGHTS_CONNECTION_STRING=
+VITE_AZURE_INSIGHTS_CONNECTION_STRING=
+VITE_BASE_URL=
+VITE_SPARROW_LINKEDIN=
diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
@@ -21,6 +21,8 @@ env:
   VITE_AZURE_INSIGHTS_CONNECTION_STRING: ${{ vars.VITE_AZURE_INSIGHTS_CONNECTION_STRING }}
   VITE_CANNY_API: ${{ vars.VITE_CANNY_API }}
   VITE_CANNY_URL: ${{ vars.VITE_CANNY_URL }}
+  VITE_BASE_URL: ${{ vars.VITE_BASE_URL }}
+  VITE_SPARROW_LINKEDIN: ${{ vars.VITE_SPARROW_LINKEDIN }}
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
 jobs:
@@ -179,8 +181,8 @@ jobs:
           appcenter login --token ${{ secrets.APPCENTER_API_TOKEN }}
           branch_name="${{ steps.pr_branch.outputs.branch }}"
           echo "Branch Name: $branch_name"
-          appcenter distribute release -f /Users/runner/work/sparrow-app/sparrow-app/src-tauri/target/debug/bundle/dmg/*.dmg -g Collaborators --app techdome/Sparrow-1 --build-version test-${branch_name} --build-number ${{ github.run_number }}
-          appcenter distribute release -f msi_files/*.msi -g Collaborators --app techdome/Sparrow --build-version test-${branch_name} --build-number ${{ github.run_number }}
+          appcenter distribute release -f /Users/runner/work/sparrow-app/sparrow-app/src-tauri/target/debug/bundle/dmg/*.dmg -g Collaborators --app techdome/Sparrow-1 --build-version branch-development --build-number ${{ github.run_number }}
+          appcenter distribute release -f msi_files/*.msi -g Collaborators --app techdome/Sparrow --build-version branch-development --build-number ${{ github.run_number }}
       - name: status check and upload
         uses: neonidian/teams-notify-build-status@v3
         if: always()

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -21,6 +21,8 @@ env:
   VITE_AZURE_INSIGHTS_CONNECTION_STRING: ${{ vars.VITE_AZURE_INSIGHTS_CONNECTION_STRING }}
   VITE_CANNY_API: ${{ vars.VITE_CANNY_API }}
   VITE_CANNY_URL: ${{ vars.VITE_CANNY_URL }}
+  VITE_BASE_URL: ${{ vars.VITE_BASE_URL }}
+  VITE_SPARROW_LINKEDIN: ${{ vars.VITE_SPARROW_LINKEDIN }}
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
 jobs:

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "author": "Sparrow",
   "description": "The Sparrow App is your next go to API development buddy which can help you test, debug, distribute better APIs while collaborating with your colleagues and making you a better programmer.",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -124,19 +124,19 @@
           "assets": [
             {
               "path": "/Users/runner/work/sparrow-app/sparrow-app/src-tauri/target/debug/bundle/dmg/*.dmg",
-              "label": "Sparrow_2.6.0.dmg"
+              "label": "Sparrow_2.7.0.dmg"
             },
             {
               "path": "msi_files/*.exe",
-              "label": "Sparrow_2.6.0.exe"
+              "label": "Sparrow_2.7.0.exe"
             },
             {
               "path": "msi_files/*.msi",
-              "label": "Sparrow_2.6.0.msi"
+              "label": "Sparrow_2.7.0.msi"
             },
             {
               "path": "msi_files/*.zip",
-              "label": "Sparrow_2.6.0_x64_en-US.msi.zip"
+              "label": "Sparrow_2.7.0_x64_en-US.msi.zip"
             },
             {
               "path": "/Users/runner/work/sparrow-app/sparrow-app/src-tauri/target/debug/bundle/macos/Sparrow.app.tar.gz",

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -86,5 +86,5 @@
     }
   },
   "productName": "Sparrow",
-  "version": "2.6.0"
+  "version": "2.7.0"
 }
diff --git a/src/packages/@app/components/App.svelte b/src/packages/@app/components/App.svelte
@@ -5,54 +5,21 @@
   import Authguard from "@app/routing/Authguard.svelte";
   import Navigate from "@app/routing/Navigate.svelte";
   import Dashboard from "@app/pages/Dashboard/Dashboard.svelte";
-  import { TabRepository } from "@app/repositories/tab.repository";
-  import { syncTabs } from "$lib/store/request-response-section";
   import EntryPoint from "@app/pages/Auth/entry-point/EntryPoint.svelte";
-  import { resizeWindowOnLogin } from "$lib/components/header/window-resize";
+  import { resizeWindowOnLogin } from "../utils";
   import { registerDeepLinkHandler } from "$lib/utils/deeplink/app.deeplink";
   import { onMount } from "svelte";
   import { user } from "$lib/store/auth.store";
-  import { generateSampleRequest } from "$lib/utils/sample/request.sample";
-  import { createDeepCopy } from "$lib/utils/helpers/conversion.helper";
   import { handleShortcuts } from "$lib/utils/shortcuts";
-  import AutoUpdateDialog from "$lib/components/Modal/AutoUpdateDialog.svelte";
+  import { AppUpdater } from "@common/features";
   import { getCurrent } from "@tauri-apps/api/window";
   import { notifications } from "@library/ui/toast/Toast";
   import LoginPage from "@app/pages/Auth/login-page/LoginPage.svelte";
   import RegisterPage from "@app/pages/Auth/register-page/RegisterPage.svelte";
   import { singleInstanceHandler } from "$lib/utils/singleinstance/app.singleinstance";
 
   export let url = "/";
-  // const tabRepository = new TabRepository();
-  // let flag: boolean = true;
   let isActiveInternet: boolean = true;
-  // let tabList = tabRepository.getTabList();
-  // let sample = generateSampleRequest("id", new Date().toString());
-  // tabList.subscribe((val) => {
-  //   if (val.length > 0) {
-  //     if (flag) {
-  //       let progressiveTab;
-  //       const tabList = val.map((elem) => {
-  //         let temp = createDeepCopy(elem.toJSON());
-  //         if (temp?.property?.request) {
-  //           temp.property.request.state.responseSection =
-  //             sample.property.request.state.responseSection;
-  //           temp.property.request.state.responseRaw =
-  //             sample.property.request.state.responseRaw;
-  //           temp.property.request.state.responseFormatter =
-  //             sample.property.request.state.responseFormatter;
-  //           temp.property.request.response = sample.property.request.response;
-  //         }
-  //         if (elem.isActive) {
-  //           progressiveTab = temp;
-  //         }
-  //         return temp;
-  //       });
-  //       syncTabs(tabList, progressiveTab);
-  //       flag = false;
-  //     }
-  //   }
-  // });
 
   const doOnlineCheck = () => {
     if (!navigator.onLine && isActiveInternet) {
@@ -97,7 +64,7 @@
   });
 </script>
 
-<AutoUpdateDialog />
+<AppUpdater />
 <Router {url}>
   <Authguard>
     <section slot="loggedIn">

diff --git a/src/packages/@app/pages/Auth/entry-point/EntryPoint.svelte b/src/packages/@app/pages/Auth/entry-point/EntryPoint.svelte
@@ -119,6 +119,7 @@
           handleRedirect(true);
           openDefaultBrowser();
         }}
+        id="create_account_or_sign_in"
       >
         Create an Account or Sign In</button
       >
@@ -132,6 +133,7 @@
       </div>
       <div style="height:32px;">
         <Button
+          id="try_sparrow_edge"
           onClick={() => {
             skipLoginHandler();
           }}
@@ -189,7 +191,7 @@
         }}
       >
         <div
-          class="d-flex"
+          class="d-flex align-items-center"
           on:mouseenter={() => {
             isHover = true;
           }}
@@ -250,7 +252,7 @@
   }
   a:hover {
     text-decoration: underline;
-    color: var(--primary-btn-color);
+    color: var(--text-primary-300);
   }
   .cursor-pointer {
     cursor: pointer;
@@ -277,7 +279,7 @@
     color: transparent;
   }
   .star-text-hover {
-    color: var(--primary-btn-color);
+    color: var(--text-primary-300);
     text-decoration: underline;
   }
   .btn-guest {

diff --git a/src/packages/@app/pages/Auth/forgot-password/ForgotPassword.svelte b/src/packages/@app/pages/Auth/forgot-password/ForgotPassword.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import Header from "$lib/components/header/Header.svelte";
   import angleLeft from "$lib/assets/angleLeft.svg";
   import starIcon from "$lib/assets/starIcon.svg";
 
@@ -46,7 +45,7 @@
   class="card-body d-flex flex-column bg-black text-white mx-auto rounded overflow-hidden"
   style="height: 100vh;"
 >
-  <Header />
+  <!-- <Header /> -->
   {#if isLoadingPage}
     <Loader loaderSize={"80px"} loaderMessage="Please Wait..." />
   {:else}

diff --git a/src/packages/@app/pages/Auth/login-page/LoginPage.svelte b/src/packages/@app/pages/Auth/login-page/LoginPage.svelte
@@ -2,15 +2,13 @@
   import { Link, navigate } from "svelte-navigator";
   import { isLoading, isResponseError, setUser } from "$lib/store/auth.store";
   import { jwtDecode } from "$lib/utils/jwt";
-  import Header from "$lib/components/header/Header.svelte";
   import googleLogo from "$lib/assets/googlelogo.svg";
   import eyeHide from "$lib/assets/eye-hide.svg";
   import eyeShow from "$lib/assets/eye-show.svg";
   import { authNavigate, handleLoginValidation } from "./login-page";
   import sparrowicon from "$lib/assets/sparrowIcon.svg";
   import { once } from "@tauri-apps/api/event";
   import { Window } from "@tauri-apps/api/window";
-  import LoginWaitingScreen from "$lib/components/Transition/LoginWaitingScreen.svelte";
 
   let isEmailTouched = false;
 
@@ -108,14 +106,14 @@
 </script>
 
 {#if isSignInPopup}
-  <LoginWaitingScreen onClick={handleSignInPopup} {isLoadingPage} />
+  <!-- <LoginWaitingScreen onClick={handleSignInPopup} {isLoadingPage} /> -->
 {/if}
 
 <div
   class="card-body d-flex flex-column bg-black text-white mx-auto rounded"
   style="height:100vh;"
 >
-  <Header />
+  <!-- <Header /> -->
   <div
     class="container d-flex flex-column align-items-center justify-content-center"
   >

diff --git a/src/packages/@app/pages/Auth/login-page/login-page.ts b/src/packages/@app/pages/Auth/login-page/login-page.ts
@@ -6,10 +6,7 @@ import { checkValidation, loginSchema } from "$lib/utils/validation";
 import { navigate } from "svelte-navigator";
 import { jwtDecode, setAuthJwt } from "$lib/utils/jwt";
 import { isResponseError, setUser } from "$lib/store/auth.store";
-import {
-  resizeWindowOnLogOut,
-  resizeWindowOnLogin,
-} from "$lib/components/header/window-resize";
+import { resizeWindowOnLogOut, resizeWindowOnLogin } from "../../../utils";
 import mixpanel from "mixpanel-browser";
 import MixpanelEvent from "$lib/utils/mixpanel/MixpanelEvent";
 import { Events } from "$lib/utils/enums/mixpanel-events.enum";

diff --git a/src/packages/@app/pages/Auth/redirect/Redirect.svelte b/src/packages/@app/pages/Auth/redirect/Redirect.svelte
@@ -128,9 +128,6 @@
       >
         Version {version}
       </p>
-      <p class="cursor-pointer check-for-update text-center sparrow-fs-12 0">
-        Check for Update
-      </p>
     </div>
   </div>
 </div>

diff --git a/src/packages/@app/pages/Auth/register-page/RegisterPage.svelte b/src/packages/@app/pages/Auth/register-page/RegisterPage.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import Header from "$lib/components/header/Header.svelte";
   import vector1 from "$lib/assets/Vector1.svg";
   import vector2 from "$lib/assets/Vector2.svg";
   import vector3 from "$lib/assets/Vector3.svg";
@@ -144,7 +143,7 @@
   class="card-body d-flex flex-column bg-black text-white mx-auto rounded overflow-hidden"
   style="height: 100vh;"
 >
-  <Header />
+  <!-- <Header /> -->
   {#if isLoadingPage}
     <Loader loaderSize={"80px"} loaderMessage="Please Wait..." />
   {:else}

diff --git a/src/packages/@app/pages/Auth/reset-password/ResetPassword.svelte b/src/packages/@app/pages/Auth/reset-password/ResetPassword.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import Header from "$lib/components/header/Header.svelte";
   import vector1 from "$lib/assets/Vector1.svg";
   import vector2 from "$lib/assets/Vector2.svg";
   // import sparrowicon from "$lib/assets/sparrowIcon.svg";
@@ -123,7 +122,7 @@
   class="card-body d-flex flex-column bg-black text-white mx-auto rounded overflow-hidden"
   style="height: 100vh;"
 >
-  <Header />
+  <!-- <Header /> -->
   <div
     class="d-flex mb-5 flex-column align-items-center justify-content-center"
   >

diff --git a/src/packages/@app/pages/Auth/update-password/UpdatePassword.svelte b/src/packages/@app/pages/Auth/update-password/UpdatePassword.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import Header from "$lib/components/header/Header.svelte";
   import angleLeft from "$lib/assets/angleLeft.svg";
   import lineIcon from "$lib/assets/line.svg";
   import starIcon from "$lib/assets/starIcon.svg";
@@ -87,7 +86,7 @@
   class="card-body d-flex flex-column bg-black text-white mx-auto rounded overflow-hidden"
   style="height: 100vh;"
 >
-  <Header />
+  <!-- <Header /> -->
   {#if isLoadingPage}
     <Loader loaderSize={"80px"} loaderMessage="Please Wait..." />
   {:else}

diff --git a/src/packages/@app/pages/Collections/CollectionPage.ViewModel.ts b/src/packages/@app/pages/Collections/CollectionPage.ViewModel.ts
@@ -85,6 +85,7 @@ import { SocketTabAdapter } from "@app/adapter/socket-tab";
 import type { CollectionDocType } from "@app/models/collection.model";
 import type { GuideQuery } from "@app/types/user-guide";
 import type { FeatureQuery } from "@app/types/feature-switch";
+import { ReduceQueryParams } from "@workspaces/features/rest-explorer/utils";
 
 export default class CollectionsViewModel {
   private tabRepository = new TabRepository();
@@ -724,7 +725,14 @@ export default class CollectionsViewModel {
   ) => {
     const response =
       await this.collectionService.importCollectionFromCurl(importCurl);
+
     if (response.isSuccessful) {
+      const req = response.data.data.request;
+      const reducedQueryParams = new ReduceQueryParams(req.queryParams);
+      const paramString = reducedQueryParams.getValue();
+      if (paramString) {
+        response.data.data.request.url = req.url + "?" + paramString;
+      }
       const requestTabAdapter = new RequestTabAdapter();
       const tabId = UntrackedItems.UNTRACKED + uuidv4();
       const adaptedRequest = requestTabAdapter.adapt(
@@ -3072,10 +3080,9 @@ export default class CollectionsViewModel {
         };
 
         const initCollectionTab = new InitCollectionTab(
-          response.data.data._id,
+          response.data.data.collection._id,
           currentWorkspaceId,
         );
-
         initCollectionTab.updatePath(path);
 
         initCollectionTab.updateName(response.data.data.collection.name);

diff --git a/src/packages/@app/pages/Collections/Collections.ViewModel.old.ts b/src/packages/@app/pages/Collections/Collections.ViewModel.old.ts
@@ -18,10 +18,8 @@
 //   Collection,
 //   RequestBody,
 // } from "$lib/utils/interfaces/request.interface";
-// import { EnvironmentService } from "$lib/services-v2/environment.service";
 // import type { UpdateEnvironmentPostBody } from "$lib/utils/dto";
 // import { CollectionService } from "$lib/services/collection.service";
-// import { notifications } from "$lib/components/toast-notification/ToastNotification";
 // import { setContentTypeHeader } from "$lib/utils/helpers";
 // import { RequestDataset } from "$lib/utils/enums";
 // import { updateCollectionRequest } from "$lib/services/collection";
-Original file line number
+Diff line change
@@ Expand Up / @@ -128,9 +128,6 @@ @@
           >
             Version {version}
           </p>
-          <p class="cursor-pointer check-for-update text-center sparrow-fs-12 0">
-            Check for Update
-          </p>
         </div>
       </div>
     </div>
@@ Expand Down @@