chore: Remove all avatar/logo references (#14532)

* chore: Remove all avatar/logo references

* Updated user profile to only use avatarUrl

* fix: minor style issue

* chore: Remove redundant includeTeamLogo

* fix: Use right avatar default in event type list

* fix: placeholder avatar team profile, target

* chore: Add logoUrl/avatarUrl to JWT

* fix: Bunch of org avatar issues, fix members list

* Fix logoUrl on org pages

* More type fixes

* Hopefully final type fixes

* Another round of type fixes

* fix: UserForm ts

* fix: Handle as return types, not input types

* fix: Remove profile and add avatarUrl

* fix: notFound as const

* fix: Seeder avatarUrl params

* revert: Migration changes for easier recovery

* fix: Add explicit type to builder as avatar is now set

* Add logoUrl to unpublished entity

* Avatar test out of scope here

* fix: Use the new avatarUrl after save

* chore: Removed getOrgAvatarUrl/getTeamAvatarUrl

* fix: Update sidebar image immediately after change

* Unable to safe unnamed user, so default

* fix: Unpublished page, add organization test

* Add more tests

apps/web/modules/users/views/users-public-view.getServerSideProps.tsx

@@ -46,6 +46,7 @@ export type UserPageProps = {
   markdownStrippedBio: string;
   safeBio: string;
   entity: {
+    logoUrl?: string | null;
     considerUnpublished: boolean;
     orgSlug?: string | null;
     name?: string | null;
@@ -98,12 +99,7 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont
     orgSlug: isValidOrgDomain ? currentOrgDomain : null,
   });
 
-  const usersWithoutAvatar = usersInOrgContext.map((user) => {
-    const { avatar: _1, ...rest } = user;
-    return rest;
-  });
-
-  const isDynamicGroup = usersWithoutAvatar.length > 1;
+  const isDynamicGroup = usersInOrgContext.length > 1;
   log.debug(safeStringify({ usersInOrgContext, isValidOrgDomain, currentOrgDomain, isDynamicGroup }));
 
   if (isDynamicGroup) {
@@ -114,40 +110,27 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont
         permanent: false,
         destination: destinationUrl,
       },
-    } as {
-      redirect: {
-        permanent: false;
-        destination: string;
-      };
-    };
+    } as const;
   }
 
-  const users = usersWithoutAvatar.map((user) => ({
-    ...user,
-    avatar: `/${user.username}/avatar.png`,
-  }));
-
   const isNonOrgUser = (user: { profile: UserProfile }) => {
     return !user.profile?.organization;
   };
 
-  const isThereAnyNonOrgUser = users.some(isNonOrgUser);
+  const isThereAnyNonOrgUser = usersInOrgContext.some(isNonOrgUser);
 
-  if (!users.length || (!isValidOrgDomain && !isThereAnyNonOrgUser)) {
+  if (!usersInOrgContext.length || (!isValidOrgDomain && !isThereAnyNonOrgUser)) {
     return {
       notFound: true,
-    } as {
-      notFound: true;
-    };
+    } as const;
   }
 
-  const [user] = users; //to be used when dealing with single user, not dynamic group
+  const [user] = usersInOrgContext; //to be used when dealing with single user, not dynamic group
 
   const profile = {
     name: user.name || user.username || "",
     image: getUserAvatarUrl({
-      ...user,
-      profile: user.profile,
+      avatarUrl: user.avatarUrl,
     }),
     theme: user.theme,
     brandColor: user.brandColor ?? DEFAULT_LIGHT_BRAND_COLOR,
@@ -183,11 +166,11 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont
   const safeBio = markdownToSafeHTML(user.bio) || "";
 
   const markdownStrippedBio = stripMarkdown(user?.bio || "");
-  const org = usersWithoutAvatar[0].profile.organization;
+  const org = usersInOrgContext[0].profile.organization;
 
   return {
     props: {
-      users: users.map((user) => ({
+      users: usersInOrgContext.map((user) => ({
         name: user.name,
         username: user.username,
         bio: user.bio,
@@ -197,6 +180,7 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont
         away: user.away,
       })),
       entity: {
+        ...(org?.logoUrl ? { logoUrl: org?.logoUrl } : {}),
         considerUnpublished: !isARedirectFromNonOrgLink && org?.slug === null,
         orgSlug: currentOrgDomain,
         name: org?.name ?? null,

apps/web/modules/users/views/users-public-view.tsx

@@ -3,7 +3,6 @@
 import classNames from "classnames";
 import type { InferGetServerSidePropsType } from "next";
 import Link from "next/link";
-import { useSearchParams } from "next/navigation";
 import { Toaster } from "react-hot-toast";
 
 import {
@@ -23,7 +22,6 @@ import { type getServerSideProps } from "./users-public-view.getServerSideProps"
 
 export function UserPage(props: InferGetServerSidePropsType<typeof getServerSideProps>) {
   const { users, profile, eventTypes, markdownStrippedBio, entity } = props;
-  const searchParams = useSearchParams();
 
   const [user] = users; //To be used when we only have a single user, not dynamic group
   useTheme(profile.theme);
@@ -43,8 +41,6 @@ export function UserPage(props: InferGetServerSidePropsType<typeof getServerSide
     ...query
   } = useRouterQuery();
 
-  const isRedirect = searchParams?.get("redirected") === "true" || false;
-  const fromUserNameRedirected = searchParams?.get("username") || "";
   /*
    const telemetry = useTelemetry();
    useEffect(() => {