maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Missing subteam URL [CAL-2240] (#10399)

This commit is contained in:
Leo Giovanetti 2023-07-26 12:41:38 -03:00 committed by GitHub
parent 9dc4c84cfd
commit bd40dcfa4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/features/ee/teams/pages/team-profile-view.tsx
View File

@ -7,6 +7,8 @@ import { useState, useLayoutEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import { z } from "zod";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
import { getOrgFullDomain } from "@calcom/features/ee/organizations/lib/orgDomains";
import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants";
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@ -35,7 +37,6 @@ import {
import { ExternalLink, Link as LinkIcon, Trash2, LogOut } from "@calcom/ui/components/icon";
import { getLayout } from "../../../settings/layouts/SettingsLayout";
import { extractDomainFromWebsiteUrl } from "../../organizations/lib/utils";
const regex = new RegExp("^[a-zA-Z0-9-]*$");
@ -57,6 +58,7 @@ const ProfileView = () => {
const utils = trpc.useContext();
const session = useSession();
const [firstRender, setFirstRender] = useState(true);
const orgBranding = useOrgBranding();
useLayoutEffect(() => {
document.body.focus();
@ -220,8 +222,8 @@ const ProfileView = () => {
label={t("team_url")}
value={value}
addOnLeading={
team.parent
? `${team.parent.slug}.${extractDomainFromWebsiteUrl}/`
team.parent && orgBranding
? getOrgFullDomain(orgBranding?.slug, { protocol: false })
: `${WEBAPP_URL}/team/`
}
onChange={(e) => {