Skip to content

Commit 67dff5f

Browse files
refactor: backport cloud for orgs related foundational changes
- Remove organization branding updates. - Update `Hoppscotch Cloud` organization sidebar item. - Ensure organization switcher sidebar isn't displayed on the central cloud instance.
1 parent 29d8b6c commit 67dff5f

File tree

2 files changed

+4
-49
lines changed

2 files changed

+4
-49
lines changed

packages/hoppscotch-common/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2218,7 +2218,7 @@
22182218
},
22192219
"organization_sidebar": {
22202220
"instances": "Instances",
2221-
"hoppscotch": "Hoppscotch",
2221+
"hoppscotch_cloud": "Hoppscotch Cloud",
22222222
"admin": "Admin",
22232223
"no_orgs_title": "No organizations yet",
22242224
"no_orgs_description": "Join or create an organization to collaborate with your team",

packages/hoppscotch-common/src/components/app/Header.vue

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -45,43 +45,7 @@
4545
</template>
4646
</tippy>
4747

48-
<router-link
49-
v-else-if="showOrgLogo"
50-
to="/"
51-
class="flex items-center gap-2 px-2 py-1 rounded hover:bg-primaryDark focus-visible:bg-primaryDark focus-visible:outline-none transition-colors"
52-
>
53-
<div
54-
v-if="orgInfo?.logo"
55-
class="h-6 w-6 rounded overflow-hidden flex-shrink-0"
56-
>
57-
<img
58-
:src="sanitizeLogoUrl(orgInfo.logo)"
59-
:alt="orgInfo.name || t('app.name')"
60-
class="h-full w-full object-cover"
61-
/>
62-
</div>
63-
<div
64-
v-else-if="orgInfo?.name"
65-
class="h-6 w-6 rounded flex items-center justify-center text-xs font-semibold flex-shrink-0"
66-
:class="getOrgColor(orgInfo.name)"
67-
aria-hidden="true"
68-
>
69-
{{ getOrgInitials(orgInfo.name) }}
70-
</div>
71-
<div class="flex items-center gap-1.5 min-w-0">
72-
<span class="font-bold tracking-wide text-secondaryDark truncate">
73-
{{ orgInfo?.name || t("app.name") }}
74-
</span>
75-
<span
76-
class="text-secondary text-xs hidden sm:inline flex-shrink-0"
77-
>
78-
• {{ t("app.powered_by") }}
79-
</span>
80-
</div>
81-
</router-link>
82-
8348
<HoppButtonSecondary
84-
v-else
8549
class="!font-bold uppercase tracking-wide !text-secondaryDark hover:bg-primaryDark focus-visible:bg-primaryDark"
8650
:label="t('app.name')"
8751
to="/"
@@ -391,11 +355,6 @@ import { getKernelMode } from "@hoppscotch/kernel"
391355
import { useI18n } from "@composables/i18n"
392356
import { useReadonlyStream } from "@composables/stream"
393357
import { defineActionHandler, invokeAction } from "@helpers/actions"
394-
import {
395-
getOrgInitials,
396-
getOrgColor,
397-
sanitizeLogoUrl,
398-
} from "@helpers/utils/organization"
399358
import { breakpointsTailwind, useBreakpoints, useNetwork } from "@vueuse/core"
400359
import { useService } from "dioc/vue"
401360
import * as TE from "fp-ts/TaskEither"
@@ -405,22 +364,22 @@ import { useToast } from "~/composables/toast"
405364
import { GetMyTeamsQuery, TeamAccessRole } from "~/helpers/backend/graphql"
406365
import { deleteTeam as backendDeleteTeam } from "~/helpers/backend/mutations/Team"
407366
import { platform } from "~/platform"
367+
import { AdditionalLinksService } from "~/services/additionalLinks.service"
408368
import {
409369
BANNER_PRIORITY_LOW,
410370
BannerContent,
411371
BannerService,
412372
} from "~/services/banner.service"
413373
import { WorkspaceService } from "~/services/workspace.service"
374+
import IconChevronDown from "~icons/lucide/chevron-down"
414375
import IconDownload from "~icons/lucide/download"
376+
import IconLayoutDashboard from "~icons/lucide/layout-dashboard"
415377
import IconLifeBuoy from "~icons/lucide/life-buoy"
416378
import IconSettings from "~icons/lucide/settings"
417379
import IconUploadCloud from "~icons/lucide/upload-cloud"
418380
import IconUser from "~icons/lucide/user"
419381
import IconUserPlus from "~icons/lucide/user-plus"
420382
import IconUsers from "~icons/lucide/users"
421-
import IconChevronDown from "~icons/lucide/chevron-down"
422-
import IconLayoutDashboard from "~icons/lucide/layout-dashboard"
423-
import { AdditionalLinksService } from "~/services/additionalLinks.service"
424383
425384
const t = useI18n()
426385
const toast = useToast()
@@ -441,10 +400,6 @@ const workspaceSelectorFlagEnabled = computed(
441400
() => !!platform.platformFeatureFlags.workspaceSwitcherLogin?.value
442401
)
443402
444-
const showOrgLogo = computed(() => {
445-
return platform.organization?.isDefaultCloudInstance === false
446-
})
447-
448403
onMounted(async () => {
449404
const { organization } = platform
450405

0 commit comments

Comments
 (0)