Merge branch 'development' into aakash/bug/workspace-sorting-withtime

sparrowapp-dev · Dec 23, 2024 · 21d581b · 21d581b
2 parents 8493c89 + a7a5225
commit 21d581b
Show file tree

Hide file tree

Showing 54 changed files with 1,059 additions and 570 deletions.
diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
@@ -23,7 +23,9 @@ env:
   VITE_CANNY_URL: ${{ vars.VITE_CANNY_URL }}
   VITE_BASE_URL: ${{ vars.VITE_BASE_URL }}
   VITE_SPARROW_LINKEDIN: ${{ vars.VITE_SPARROW_LINKEDIN }}
+  VITE_WEB_SOCKET_IO_API_URL: ${{ vars.VITE_WEB_SOCKET_IO_API_URL }}
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+  CI: false
 
 jobs:
   release_win:
@@ -62,6 +64,9 @@ jobs:
           Set-Content -Path apps/@sparrow-desktop/src-tauri/tauri.conf.json -Value $newContent
         shell: pwsh
 
+      - name: Increase Yarn network timeout
+        run: yarn config set network-timeout 600000
+
       - name: Build Tauri App
         run: |
           yarn cache clean
@@ -130,6 +135,9 @@ jobs:
           echo "$newContent" > apps/@sparrow-desktop/src-tauri/tauri.conf.json
         shell: bash
 
+      - name: Increase Yarn network timeout
+        run: yarn config set network-timeout 600000
+
       - name: Build Tauri App
         run: |
           yarn cache clean
@@ -145,6 +153,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          CI: false
 
       - name: file content
         run: |

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -23,7 +23,9 @@ env:
   VITE_CANNY_URL: ${{ vars.VITE_CANNY_URL }}
   VITE_BASE_URL: ${{ vars.VITE_BASE_URL }}
   VITE_SPARROW_LINKEDIN: ${{ vars.VITE_SPARROW_LINKEDIN }}
+  VITE_WEB_SOCKET_IO_API_URL: ${{ vars.VITE_WEB_SOCKET_IO_API_URL }}
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+  CI: false
 
 jobs:
   release_win:
@@ -62,6 +64,9 @@ jobs:
           Set-Content -Path apps/@sparrow-desktop/src-tauri/tauri.conf.json -Value $newContent
         shell: pwsh
 
+      - name: Increase Yarn network timeout
+        run: yarn config set network-timeout 600000
+
       - name: Build Tauri App
         run: |
           yarn cache clean
@@ -130,6 +135,9 @@ jobs:
           echo "$newContent" > apps/@sparrow-desktop/src-tauri/tauri.conf.json
         shell: bash
 
+      - name: Increase Yarn network timeout
+        run: yarn config set network-timeout 600000
+
       - name: Build Tauri App
         run: |
           yarn cache clean
@@ -146,6 +154,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          CI: false
 
       - name: dmg sig
         run: cat /Users/runner/work/sparrow-app/sparrow-app/apps/@sparrow-desktop/src-tauri/target/debug/bundle/macos/*.sig

diff --git a/.github/workflows/sparrow-web-dev.yml b/.github/workflows/sparrow-web-dev.yml
@@ -36,6 +36,7 @@ jobs:
                 --build-arg VITE_WEB_MARKETING_URL=${{ vars.VITE_WEB_MARKETING_URL }} \
                 --build-arg VITE_WEB_SPARROW_DOCS=${{ vars.VITE_WEB_SPARROW_DOCS }} \
                 --build-arg VITE_WEB_PROXY_SERVICE=${{ vars.VITE_WEB_PROXY_SERVICE }} \
+                --build-arg VITE_WEB_SOCKET_IO_API_URL=${{ vars.VITE_WEB_SOCKET_IO_API_URL }} \
                 -t sparrowprod.azurecr.io/sparrow-web:${{ github.run_number }} .
 
               docker push sparrowprod.azurecr.io/sparrow-web:${{ github.run_number }}

diff --git a/.github/workflows/sparrow-web-prod.yml b/.github/workflows/sparrow-web-prod.yml
@@ -36,6 +36,7 @@ jobs:
                 --build-arg VITE_WEB_MARKETING_URL=${{ vars.VITE_WEB_MARKETING_URL }} \
                 --build-arg VITE_WEB_SPARROW_DOCS=${{ vars.VITE_WEB_SPARROW_DOCS }} \
                 --build-arg VITE_WEB_PROXY_SERVICE=${{ vars.VITE_WEB_PROXY_SERVICE }} \
+                --build-arg VITE_WEB_SOCKET_IO_API_URL=${{ vars.VITE_WEB_SOCKET_IO_API_URL }} \
                 -t sparrowprod.azurecr.io/sparrow-web:${{ github.run_number }} .
 
               docker push sparrowprod.azurecr.io/sparrow-web:${{ github.run_number }}

diff --git a/apps/@sparrow-desktop/package.json b/apps/@sparrow-desktop/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.13.0",
+  "version": "2.14.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -132,19 +132,19 @@
           "assets": [
             {
               "path": "/Users/runner/work/sparrow-app/sparrow-app/apps/@sparrow-desktop/src-tauri/target/debug/bundle/dmg/*.dmg",
-              "label": "Sparrow_2.13.0.dmg"
+              "label": "Sparrow_2.14.0.dmg"
             },
             {
               "path": "msi_files/*.exe",
-              "label": "Sparrow_2.13.0.exe"
+              "label": "Sparrow_2.14.0.exe"
             },
             {
               "path": "msi_files/*.msi",
-              "label": "Sparrow_2.13.0.msi"
+              "label": "Sparrow_2.14.0.msi"
             },
             {
               "path": "msi_files/*.zip",
-              "label": "Sparrow_2.13.0_x64_en_US.msi.zip"
+              "label": "Sparrow_2.14.0_x64_en_US.msi.zip"
             },
             {
               "path": "/Users/runner/work/sparrow-app/sparrow-app/apps/@sparrow-desktop/src-tauri/target/debug/bundle/macos/Sparrow.app.tar.gz",

diff --git a/apps/@sparrow-desktop/src-tauri/Cargo.lock b/apps/@sparrow-desktop/src-tauri/Cargo.lock
diff --git a/apps/@sparrow-desktop/src-tauri/Cargo.toml b/apps/@sparrow-desktop/src-tauri/Cargo.toml
@@ -48,5 +48,7 @@ tauri-plugin-shell = "2.2.0"
 tauri-plugin-dialog = "2.2.0"
 tauri-plugin-fs = "2.2.0"
 tauri-plugin-deep-link = "2.2.0"
+
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
+cocoa = "0.26.0"
diff --git a/apps/@sparrow-desktop/src-tauri/capabilities/migrated.json b/apps/@sparrow-desktop/src-tauri/capabilities/migrated.json
@@ -2,7 +2,7 @@
   "identifier": "migrated",
   "description": "permissions that were migrated from v1",
   "context": "local",
-  "windows": ["main"],
+  "windows": ["main", "windows"],
   "permissions": [
     "core:path:default",
     "core:event:default",

diff --git a/apps/@sparrow-desktop/src-tauri/gen/schemas/capabilities.json b/apps/@sparrow-desktop/src-tauri/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","deep-link:default","core:window:allow-center","core:window:allow-maximize","core:window:allow-toggle-maximize","core:window:allow-unmaximize","core:window:allow-minimize","core:window:allow-unminimize","core:window:allow-show","core:window:allow-hide","core:window:allow-close","core:window:allow-set-size","core:window:allow-set-fullscreen","core:window:allow-set-focus","core:window:allow-start-dragging","core:window:allow-start-resize-dragging","os:allow-platform","deep-link:allow-get-current","core:window:allow-set-shadow","updater:allow-check","updater:default","process:allow-restart","core:webview:allow-internal-toggle-devtools","core:webview:default","core:webview:allow-set-webview-focus","core:webview:allow-set-webview-zoom","shell:allow-open","dialog:allow-save","fs:allow-write-file","fs:allow-write-text-file","core:window:allow-set-max-size","core:window:allow-set-position"],"platforms":["linux","macOS","windows","android","iOS"]}}
+{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main","windows"],"permissions":["core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","deep-link:default","core:window:allow-center","core:window:allow-maximize","core:window:allow-toggle-maximize","core:window:allow-unmaximize","core:window:allow-minimize","core:window:allow-unminimize","core:window:allow-show","core:window:allow-hide","core:window:allow-close","core:window:allow-set-size","core:window:allow-set-fullscreen","core:window:allow-set-focus","core:window:allow-start-dragging","core:window:allow-start-resize-dragging","os:allow-platform","deep-link:allow-get-current","core:window:allow-set-shadow","updater:allow-check","updater:default","process:allow-restart","core:webview:allow-internal-toggle-devtools","core:webview:default","core:webview:allow-set-webview-focus","core:webview:allow-set-webview-zoom","shell:allow-open","dialog:allow-save","fs:allow-write-file","fs:allow-write-text-file","core:window:allow-set-max-size","core:window:allow-set-position"],"platforms":["linux","macOS","windows","android","iOS"]}}
diff --git a/apps/@sparrow-desktop/src-tauri/gen/schemas/windows-schema.json b/apps/@sparrow-desktop/src-tauri/gen/schemas/windows-schema.json
@@ -84,7 +84,7 @@
           }
         },
         "permissions": {
-          "description": "List of permissions attached to this capability.\n\nMust include the plugin name as prefix in the form of `${plugin-name}:${permission-name}`. For commands directly implemented in the application itself only `${permission-name}` is required.\n\n## Example\n\n```json [ \"core:default\", \"shell:allow-open\", \"dialog:open\", { \"identifier\": \"fs:allow-write-text-file\", \"allow\": [{ \"path\": \"$HOME/test.txt\" }] } ```",
+          "description": "List of permissions attached to this capability.\n\nMust include the plugin name as prefix in the form of `${plugin-name}:${permission-name}`. For commands directly implemented in the application itself only `${permission-name}` is required.\n\n## Example\n\n```json [ \"core:default\", \"shell:allow-open\", \"dialog:open\", { \"identifier\": \"fs:allow-write-text-file\", \"allow\": [{ \"path\": \"$HOME/test.txt\" }] } ] ```",
           "type": "array",
           "items": {
             "$ref": "#/definitions/PermissionEntry"
@@ -140,7 +140,7 @@
                   "identifier": {
                     "anyOf": [
                       {
-                        "description": "This set of permissions describes the what kind of\nfile system access the `fs` plugin has enabled or denied by default.\n\n#### Granted Permissions\n\nThis default permission set enables read access to the\napplication specific directories (AppConfig, AppData, AppLocalData, AppCache,\nAppLog) and all files and sub directories created in it.\nThe location of these directories depends on the operating system,\nwhere the application is run.\n\nIn general these directories need to be manually created\nby the application at runtime, before accessing files or folders\nin it is possible.\n\nTherefore, it is also allowed to create all of these folders via\nthe `mkdir` command.\n\n#### Denied Permissions\n\nThis default permission set prevents access to critical components\nof the Tauri application by default.\nOn Windows the webview data folder access is denied.\n\n",
+                        "description": "This set of permissions describes the what kind of\nfile system access the `fs` plugin has enabled or denied by default.\n\n#### Granted Permissions\n\nThis default permission set enables read access to the\napplication specific directories (AppConfig, AppData, AppLocalData, AppCache,\nAppLog) and all files and sub directories created in it.\nThe location of these directories depends on the operating system,\nwhere the application is run.\n\nIn general these directories need to be manually created\nby the application at runtime, before accessing files or folders\nin it is possible.\n\nTherefore, it is also allowed to create all of these folders via\nthe `mkdir` command.\n\n#### Denied Permissions\n\nThis default permission set prevents access to critical components\nof the Tauri application by default.\nOn Windows the webview data folder access is denied.\n\n#### Included permissions within this default permission set:\n",
                         "type": "string",
                         "const": "fs:default"
                       },
@@ -984,6 +984,11 @@
                         "type": "string",
                         "const": "fs:allow-seek"
                       },
+                      {
+                        "description": "Enables the size command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "fs:allow-size"
+                      },
                       {
                         "description": "Enables the stat command without any pre-configured scope.",
                         "type": "string",
@@ -1109,6 +1114,11 @@
                         "type": "string",
                         "const": "fs:deny-seek"
                       },
+                      {
+                        "description": "Denies the size command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "fs:deny-size"
+                      },
                       {
                         "description": "Denies the stat command without any pre-configured scope.",
                         "type": "string",
@@ -1581,7 +1591,7 @@
                       "description": "FS scope entry.",
                       "anyOf": [
                         {
-                          "description": "FS scope path.",
+                          "description": "A path that can be accessed by the webview when using the fs APIs. FS scope path pattern.\n\nThe pattern can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$APP`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
                           "type": "string"
                         },
                         {
@@ -1591,7 +1601,7 @@
                           ],
                           "properties": {
                             "path": {
-                              "description": "FS scope path.",
+                              "description": "A path that can be accessed by the webview when using the fs APIs.\n\nThe pattern can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$APP`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
                               "type": "string"
                             }
                           }
@@ -1605,7 +1615,7 @@
                       "description": "FS scope entry.",
                       "anyOf": [
                         {
-                          "description": "FS scope path.",
+                          "description": "A path that can be accessed by the webview when using the fs APIs. FS scope path pattern.\n\nThe pattern can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$APP`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
                           "type": "string"
                         },
                         {
@@ -1615,7 +1625,7 @@
                           ],
                           "properties": {
                             "path": {
-                              "description": "FS scope path.",
+                              "description": "A path that can be accessed by the webview when using the fs APIs.\n\nThe pattern can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$APP`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
                               "type": "string"
                             }
                           }
@@ -3458,7 +3468,7 @@
           "const": "dialog:deny-save"
         },
         {
-          "description": "This set of permissions describes the what kind of\nfile system access the `fs` plugin has enabled or denied by default.\n\n#### Granted Permissions\n\nThis default permission set enables read access to the\napplication specific directories (AppConfig, AppData, AppLocalData, AppCache,\nAppLog) and all files and sub directories created in it.\nThe location of these directories depends on the operating system,\nwhere the application is run.\n\nIn general these directories need to be manually created\nby the application at runtime, before accessing files or folders\nin it is possible.\n\nTherefore, it is also allowed to create all of these folders via\nthe `mkdir` command.\n\n#### Denied Permissions\n\nThis default permission set prevents access to critical components\nof the Tauri application by default.\nOn Windows the webview data folder access is denied.\n\n",
+          "description": "This set of permissions describes the what kind of\nfile system access the `fs` plugin has enabled or denied by default.\n\n#### Granted Permissions\n\nThis default permission set enables read access to the\napplication specific directories (AppConfig, AppData, AppLocalData, AppCache,\nAppLog) and all files and sub directories created in it.\nThe location of these directories depends on the operating system,\nwhere the application is run.\n\nIn general these directories need to be manually created\nby the application at runtime, before accessing files or folders\nin it is possible.\n\nTherefore, it is also allowed to create all of these folders via\nthe `mkdir` command.\n\n#### Denied Permissions\n\nThis default permission set prevents access to critical components\nof the Tauri application by default.\nOn Windows the webview data folder access is denied.\n\n#### Included permissions within this default permission set:\n",
           "type": "string",
           "const": "fs:default"
         },
@@ -4302,6 +4312,11 @@
           "type": "string",
           "const": "fs:allow-seek"
         },
+        {
+          "description": "Enables the size command without any pre-configured scope.",
+          "type": "string",
+          "const": "fs:allow-size"
+        },
         {
           "description": "Enables the stat command without any pre-configured scope.",
           "type": "string",
@@ -4427,6 +4442,11 @@
           "type": "string",
           "const": "fs:deny-seek"
         },
+        {
+          "description": "Denies the size command without any pre-configured scope.",
+          "type": "string",
+          "const": "fs:deny-size"
+        },
         {
           "description": "Denies the stat command without any pre-configured scope.",
           "type": "string",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","deep-link:default","core:window:allow-center","core:window:allow-maximize","core:window:allow-toggle-maximize","core:window:allow-unmaximize","core:window:allow-minimize","core:window:allow-unminimize","core:window:allow-show","core:window:allow-hide","core:window:allow-close","core:window:allow-set-size","core:window:allow-set-fullscreen","core:window:allow-set-focus","core:window:allow-start-dragging","core:window:allow-start-resize-dragging","os:allow-platform","deep-link:allow-get-current","core:window:allow-set-shadow","updater:allow-check","updater:default","process:allow-restart","core:webview:allow-internal-toggle-devtools","core:webview:default","core:webview:allow-set-webview-focus","core:webview:allow-set-webview-zoom","shell:allow-open","dialog:allow-save","fs:allow-write-file","fs:allow-write-text-file","core:window:allow-set-max-size","core:window:allow-set-position"],"platforms":["linux","macOS","windows","android","iOS"]}}
		{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main","windows"],"permissions":["core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","deep-link:default","core:window:allow-center","core:window:allow-maximize","core:window:allow-toggle-maximize","core:window:allow-unmaximize","core:window:allow-minimize","core:window:allow-unminimize","core:window:allow-show","core:window:allow-hide","core:window:allow-close","core:window:allow-set-size","core:window:allow-set-fullscreen","core:window:allow-set-focus","core:window:allow-start-dragging","core:window:allow-start-resize-dragging","os:allow-platform","deep-link:allow-get-current","core:window:allow-set-shadow","updater:allow-check","updater:default","process:allow-restart","core:webview:allow-internal-toggle-devtools","core:webview:default","core:webview:allow-set-webview-focus","core:webview:allow-set-webview-zoom","shell:allow-open","dialog:allow-save","fs:allow-write-file","fs:allow-write-text-file","core:window:allow-set-max-size","core:window:allow-set-position"],"platforms":["linux","macOS","windows","android","iOS"]}}