From d6c840011616317ba98f143da61b8f38bc1f5fc2 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Thu, 11 May 2023 16:50:49 +0530 Subject: [PATCH] chore: bump version to 2023.4.3 --- packages/hoppscotch-backend/package.json | 2 +- packages/hoppscotch-common/package.json | 2 +- .../src/components/environments/index.vue | 16 ++++++---------- packages/hoppscotch-selfhost-web/package.json | 2 +- packages/hoppscotch-sh-admin/package.json | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/hoppscotch-backend/package.json b/packages/hoppscotch-backend/package.json index 242989a7f..0b79f310c 100644 --- a/packages/hoppscotch-backend/package.json +++ b/packages/hoppscotch-backend/package.json @@ -1,6 +1,6 @@ { "name": "hoppscotch-backend", - "version": "2023.4.2", + "version": "2023.4.3", "description": "", "author": "", "private": true, diff --git a/packages/hoppscotch-common/package.json b/packages/hoppscotch-common/package.json index 31a9695f0..0e65743b0 100644 --- a/packages/hoppscotch-common/package.json +++ b/packages/hoppscotch-common/package.json @@ -1,7 +1,7 @@ { "name": "@hoppscotch/common", "private": true, - "version": "2023.4.2", + "version": "2023.4.3", "scripts": { "dev": "pnpm exec npm-run-all -p -l dev:*", "dev:vite": "vite", diff --git a/packages/hoppscotch-common/src/components/environments/index.vue b/packages/hoppscotch-common/src/components/environments/index.vue index 2232a5dcd..0635deb1d 100644 --- a/packages/hoppscotch-common/src/components/environments/index.vue +++ b/packages/hoppscotch-common/src/components/environments/index.vue @@ -150,16 +150,12 @@ const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" }) // Used to switch environment type and team when user switch workspace in the global workspace switcher // Check if there is a teamID in the workspace, if yes, switch to team environment and select the team // If there is no teamID, switch to my environment -watch(workspace, (newWorkspace, oldWorkspace) => { - // If we are switching into personal from outside - if (newWorkspace.type === "personal" && oldWorkspace.type !== "personal") { - // If the selected environment is not a my environment, turn off the env - if (selectedEnvironmentIndex.value.type !== "MY_ENV") { - switchToMyEnvironments() - setSelectedEnvironmentIndex({ - type: "NO_ENV_SELECTED", - }) - } +watch(workspace, (newWorkspace) => { + if (newWorkspace.type === "personal") { + switchToMyEnvironments() + setSelectedEnvironmentIndex({ + type: "NO_ENV_SELECTED", + }) } else if (newWorkspace.type === "team") { const team = myTeams.value?.find((t) => t.id === newWorkspace.teamID) updateSelectedTeam(team) diff --git a/packages/hoppscotch-selfhost-web/package.json b/packages/hoppscotch-selfhost-web/package.json index 92150d2df..169dceb5a 100644 --- a/packages/hoppscotch-selfhost-web/package.json +++ b/packages/hoppscotch-selfhost-web/package.json @@ -1,7 +1,7 @@ { "name": "@hoppscotch/selfhost-web", "private": true, - "version": "2023.4.2", + "version": "2023.4.3", "type": "module", "scripts": { "dev:vite": "vite", diff --git a/packages/hoppscotch-sh-admin/package.json b/packages/hoppscotch-sh-admin/package.json index 9b668487a..c274b4e3d 100644 --- a/packages/hoppscotch-sh-admin/package.json +++ b/packages/hoppscotch-sh-admin/package.json @@ -1,7 +1,7 @@ { "name": "hoppscotch-sh-admin", "private": true, - "version": "2023.4.2", + "version": "2023.4.3", "type": "module", "scripts": { "dev": "pnpm exec npm-run-all -p -l dev:*",