Skip to content

Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia

chore: add workspace switcher login A/B testing flow (#4053)

Nivedinf8ac6dfeb127
diff --git a/packages/hoppscotch-common/src/components/app/Header.vue b/packages/hoppscotch-common/src/components/app/Header.vue
index aa1a448da..e43782267 100644
--- a/packages/hoppscotch-common/src/components/app/Header.vue
+++ b/packages/hoppscotch-common/src/components/app/Header.vue
@@ -43,12 +43,19 @@
@click="invokeAction('modals.support.toggle')"
/>
</div>
- <div class="flex">
+ <div
+ class="flex"
+ :class="{
+ 'flex-row-reverse gap-2':
+ workspaceSelectorFlagEnabled && !currentUser,
+ }"
+ >
<div
v-if="currentUser === null"
class="inline-flex items-center space-x-2"
>
<HoppButtonSecondary
+ v-if="!workspaceSelectorFlagEnabled"
:icon="IconUploadCloud"
:label="t('header.save_workspace')"
class="!focus-visible:text-emerald-600 !hover:text-emerald-600 hidden h-8 border border-emerald-600/25 bg-emerald-500/10 !text-emerald-500 hover:border-emerald-600/20 hover:bg-emerald-600/20 focus-visible:border-emerald-600/20 focus-visible:bg-emerald-600/20 md:flex"
@@ -60,18 +67,22 @@
@click="invokeAction('modals.login.toggle')"
/>
</div>
- <div v-else class="inline-flex items-center space-x-2">
- <TeamsMemberStack
- v-if="
- workspace.type === 'team' &&
- selectedTeam &&
- selectedTeam.teamMembers.length > 1
- "
- :team-members="selectedTeam.teamMembers"
- show-count
- class="mx-2"
- @handle-click="handleTeamEdit()"
- />
+ <TeamsMemberStack
+ v-else-if="
+ currentUser !== null &&
+ workspace.type === 'team' &&
+ selectedTeam &&
+ selectedTeam.teamMembers.length > 1
+ "
+ :team-members="selectedTeam.teamMembers"
+ show-count
+ class="mx-2"
+ @handle-click="handleTeamEdit()"
+ />
+ <div
+ v-if="workspaceSelectorFlagEnabled || currentUser"
+ class="inline-flex items-center space-x-2"
+ >
<div
class="flex h-8 divide-x divide-emerald-600/25 rounded border border-emerald-600/25 bg-emerald-500/10 focus-within:divide-emerald-600/20 focus-within:border-emerald-600/20 focus-within:bg-emerald-600/20 hover:divide-emerald-600/20 hover:border-emerald-600/20 hover:bg-emerald-600/20"
>
@@ -84,6 +95,7 @@
/>
<HoppButtonSecondary
v-if="
+ currentUser &&
workspace.type === 'team' &&
selectedTeam &&
selectedTeam?.myRole === 'OWNER'
@@ -124,7 +136,7 @@
</div>
</template>
</tippy>
- <span class="px-2">
+ <span v-if="currentUser" class="px-2">
<tippy
interactive
trigger="click"
@@ -259,6 +271,13 @@ import {
const t = useI18n()
const toast = useToast()
+/**
+ * Feature flag to enable the workspace selector login conversion
+ */
+const workspaceSelectorFlagEnabled = computed(
+ () => !!platform.platformFeatureFlags.workspaceSwitcherLogin?.value
+)
+
/**
* Once the PWA code is initialized, this holds a method
* that can be called to show the user the installation
@@ -380,6 +399,8 @@ const inviteTeam = (team: { name: string }, teamID: string) => {
// Show the workspace selected team invite modal if the user is an owner of the team else show the default invite modal
const handleInvite = () => {
+ if (!currentUser.value) return invokeAction("modals.login.toggle")
+
if (
workspace.value.type === "team" &&
workspace.value.teamID &&
diff --git a/packages/hoppscotch-common/src/components/workspace/Selector.vue b/packages/hoppscotch-common/src/components/workspace/Selector.vue
index c1b4fca50..5ac3d7b65 100644
--- a/packages/hoppscotch-common/src/components/workspace/Selector.vue
+++ b/packages/hoppscotch-common/src/components/workspace/Selector.vue
@@ -59,7 +59,7 @@
/>
</div>
<div
- v-if="!loading && teamListAdapterError"
+ v-else-if="teamListAdapterError"
class="flex flex-col items-center py-4"
>
<icon-lucide-help-circle class="svg-icons mb-4" />
@@ -85,7 +85,7 @@ import { useColorMode } from "@composables/theming"
import { GetMyTeamsQuery } from "~/helpers/backend/graphql"
import IconDone from "~icons/lucide/check"
import { useLocalState } from "~/newstore/localstate"
-import { defineActionHandler } from "~/helpers/actions"
+import { defineActionHandler, invokeAction } from "~/helpers/actions"
import { WorkspaceService } from "~/services/workspace.service"
import { useService } from "dioc/vue"
import { useElementVisibility, useIntervalFn } from "@vueuse/core"
@@ -157,8 +157,8 @@ const switchToTeamWorkspace = (team: GetMyTeamsQuery["myTeams"][number]) => {
workspaceService.changeWorkspace({
teamID: team.id,
teamName: team.name,
- role: team.myRole,
type: "team",
+ role: team.myRole,
})
}
@@ -174,12 +174,16 @@ watch(
(user) => {
if (!user) {
switchToPersonalWorkspace()
+ teamListadapter.dispose()
}
}
)
const displayModalAdd = (shouldDisplay: boolean) => {
+ if (!currentUser.value) return invokeAction("modals.login.toggle")
+
showModalAdd.value = shouldDisplay
+ teamListadapter.fetchList()
}
defineActionHandler("modals.team.new", () => {
diff --git a/packages/hoppscotch-common/src/helpers/teams/TeamListAdapter.ts b/packages/hoppscotch-common/src/helpers/teams/TeamListAdapter.ts
index 271e6e2a1..7f0626aa4 100644
--- a/packages/hoppscotch-common/src/helpers/teams/TeamListAdapter.ts
+++ b/packages/hoppscotch-common/src/helpers/teams/TeamListAdapter.ts
@@ -50,6 +50,7 @@ export default class TeamListAdapter {
}
public dispose() {
+ this.teamList$.next([])
this.isDispose = true
clearTimeout(this.timeoutHandle as any)
this.timeoutHandle = null
diff --git a/packages/hoppscotch-common/src/platform/index.ts b/packages/hoppscotch-common/src/platform/index.ts
index 9caf20e89..088cc2509 100644
--- a/packages/hoppscotch-common/src/platform/index.ts
+++ b/packages/hoppscotch-common/src/platform/index.ts
@@ -11,6 +11,7 @@ import { InspectorsPlatformDef } from "./inspectors"
import { ServiceClassInstance } from "dioc"
import { IOPlatformDef } from "./io"
import { SpotlightPlatformDef } from "./spotlight"
+import { Ref } from "vue"
export type PlatformDef = {
ui?: UIPlatformDef
@@ -45,6 +46,11 @@ export type PlatformDef = {
* If a value is not given, then the value is assumed to be true
*/
promptAsUsingCookies?: boolean
+
+ /**
+ * Whether to show the A/B testing workspace switcher click login flow or not
+ */
+ workspaceSwitcherLogin?: Ref<boolean>
}
}