fix type errors

Author: maslianok

app/by/[rankingType]/[page]/layout.tsx

@@ -8,15 +8,9 @@ import { RANK_NAME } from '@/badge/badge.consts';
 import { Header } from '@/components/header/header';
 import { Page } from '@/components/page/page';
 import { RankingHeaderSection } from '@/components/ranking-header-section/ranking-header-section';
-import { RankingTypeClient } from '@/types/ranking.types';
 import { getRankPropByType } from '@/utils/get-rank-prop-by-ranking-type';
 import { isRankingType } from '@/utils/is-ranking-type';
 
-type GlobalRankingProps = {
-  children: React.ReactNode;
-  params: Promise<{ rankingType: RankingTypeClient; page: string }>;
-};
-
 export async function generateMetadata({ params }: LayoutProps<'/by/[rankingType]/[page]'>): Promise<Metadata> {
   const { rankingType, page: pageParam } = await params;
 

app/language/_sitemap.ts app/language/sitemap.tsapp/language/_sitemap.ts renamed to app/language/sitemap.ts

@@ -14,7 +14,7 @@ import { isLanguageSummaryOrder } from './utils/is-language-summary-order';
 export async function generateMetadata({
   params,
 }: LayoutProps<'/languages/[country]/[orderBy]/[page]'>): Promise<Metadata> {
-  const { orderBy, page, country } = await params;
+  const { page, orderBy, country } = await params;
 
   if (!isLanguageSummaryOrder(orderBy)) {
     throw new Error(`Invalid order by: ${orderBy}`);
@@ -28,14 +28,15 @@ export async function generateMetadata({
 
 export async function generateStaticParams() {
   const page = '1';
+  const country = 'global';
   return [
-    { orderBy: 'score', page },
-    { orderBy: 'size', page },
-    { orderBy: 'users', page },
+    { orderBy: 'score', country, page },
+    { orderBy: 'size', country, page },
+    { orderBy: 'users', country, page },
   ];
 }
 
-export default async function CountriesLayout({
+export default async function LanguagesSummaryLayout({
   children,
   params,
 }: LayoutProps<'/languages/[country]/[orderBy]/[page]'>) {

app/languages/[country]/[orderBy]/[page]/layout.tsx

@@ -8,7 +8,7 @@ import { Avatar, AvatarImage } from '@/components/ui/avatar';
 import { Button } from '@/components/ui/button';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
 import { cn } from '@/lib/utils';
-import { ProfileSummaryQuery } from '@/types/generated/graphql';
+import { PageProfileOverviewQuery } from '@/types/generated/graphql';
 import { ensureLinkProtocol } from '@/utils/ensure-link-protocol';
 
 import { FetchUserButtonForProfilePage } from './fetch-user-button';
@@ -25,7 +25,7 @@ import {
 import { getSocialIcon } from '../utils/get-social-icon';
 
 type LayoutLeftColumnProps = Readonly<{
-  user: ProfileSummaryQuery['user'];
+  user: PageProfileOverviewQuery['user'];
   children: ReactNode;
   className?: string;
 }>;

app/profile/[login]/components/layout-left-column.tsx

@@ -5,7 +5,7 @@ import { TIER_NAMES } from '@/app/app.consts';
 import { AdaptiveTooltip } from '@/components/adaptive-tooltip/adaptive-tooltip';
 import { Link } from '@/components/link/link';
 import { RankChart } from '@/components/rank-chart/rank-chart';
-import { PageProfileOverviewQuery } from '@/types/generated/graphql';
+import { PageProfileOverviewQuery, RankTier } from '@/types/generated/graphql';
 import { calculateTiers } from '@/utils/calculate-tiers/calculate-tiers';
 import { shortenCountryName } from '@/utils/country-name-shortener';
 import { getPersonaType } from '@/utils/get-persona-type';
@@ -31,7 +31,7 @@ const CardFooterRank: FC<PropsWithChildren> = ({ children }) => {
 };
 
 export const ProfileRankCard: FC<ProfileRankCardProps> = ({ login, ranks, tiers, country }) => {
-  const { sTier, cTier, fTier, bestTier } = calculateTiers(ranks, tiers);
+  const { sTier, cTier, fTier, bestTier } = calculateTiers(ranks, tiers as RankTier);
   const sRank = ranks?.s ?? ranks?.sProvisional ?? 0;
   const cRank = ranks?.c ?? ranks?.cProvisional ?? 0;
   const fRank = ranks?.f ?? ranks?.fProvisional ?? 0;

app/profile/[login]/components/overview-cards/overview-rank-card.tsx

@@ -3,7 +3,7 @@ import { FC } from 'react';
 
 import { RANK_DESCRIPTIONS } from '@/app/app.consts';
 import { RankCard } from '@/components/rank-card/rank-card';
-import { PageProfileRanksQuery } from '@/types/generated/graphql';
+import { PageProfileRanksQuery, RankTier } from '@/types/generated/graphql';
 import { UserRankProp } from '@/types/ranking.types';
 import { calculateTiers } from '@/utils/calculate-tiers/calculate-tiers';
 import { shortenCountryName } from '@/utils/country-name-shortener';
@@ -35,7 +35,7 @@ export const RanksPage: FC<OverviewPageProps> = ({ user, isGlobalContext }) => {
 
   const ranks = isGlobalContext ? rankGlobal : rankCountry;
   const tiers = isGlobalContext ? tiersGlobal : tiersCountry;
-  const { sTier, cTier, fTier, bestTier } = calculateTiers(ranks, tiers);
+  const { sTier, cTier, fTier, bestTier } = calculateTiers(ranks, tiers as RankTier);
   const { s, c, f, sM, cM, fM, sProvisional, cProvisional, fProvisional } = ranks ?? {};
 
   const getRankingName = (rankType: UserRankProp) => {

app/profile/[login]/ranks/components/ranks-page.tsx

@@ -1,10 +1,11 @@
 import { RANK_NAME } from '@/badge/badge.consts';
-import { ProfileSeoQuery } from '@/types/generated/graphql';
+import { PageProfileLanguagesQuery, PageProfileOverviewQuery } from '@/types/generated/graphql';
 import { formatNumberShort } from '@/utils/format-number-short';
 import { formatOrdinal } from '@/utils/format-ordinal';
 
 type Tab = 'overview' | 'ranks' | 'repositories' | 'languages';
-type DataType = NonNullable<ProfileSeoQuery['user']>;
+type DataType = NonNullable<PageProfileOverviewQuery['user']>;
+type LanguagesType = NonNullable<PageProfileLanguagesQuery['user']>['languages'];
 
 const clip = (t: string, max = 158) => {
   if (t.length <= max) return t;
@@ -85,7 +86,7 @@ function buildRepositoriesDescription(stats: DataType): string {
   return clip(parts.filter(Boolean).join(' '));
 }
 
-function buildLanguagesDescription(languages?: NonNullable<DataType>['languages']): string {
+function buildLanguagesDescription(languages?: LanguagesType): string {
   const languageParts =
     languages
       ?.slice(0, 3)
@@ -213,7 +214,7 @@ function buildTabSpecificJsonLd(
         about: { '@type': 'Person', name, url: base },
         mainEntity: {
           '@type': 'ItemList',
-          itemListElement: (stats.languages ?? []).slice(0, 3).map((l, i) => ({
+          itemListElement: ((stats.languages as LanguagesType) ?? []).slice(0, 3).map((l, i) => ({
             '@type': 'ListItem',
             position: i + 1,
             name: l.name,

app/profile/[login]/seo.ts

@@ -58,7 +58,9 @@ export const LanguageRankCard: FC<LanguageRankCardProps> = ({ language, country,
         <RankCardItem>{NOT_AVAILABLE}</RankCardItem>
         <RankCardItem Icon={Star}>Language Score: {(score || 0).toLocaleString('en-US')}</RankCardItem>
         {hasRank && <RankCardPosition rank={rankToDisplay} rankedCount={rankedCount} rankingLink={rankingLink} />}
-        {!hasRank && !!rankedCount && <RankCardTotalProfilesRanked rankedCount={rankedCount} />}
+        {!hasRank && !!rankedCount && (
+          <RankCardTotalProfilesRanked rankedCount={rankedCount} rankingLink={rankingLink} />
+        )}
       </>
     );
   };

components/rank-card/language-rank-card.tsx

@@ -1,6 +1,6 @@
-import { ProfileSummaryQuery } from './generated/graphql';
+import { PageProfileOverviewQuery } from './generated/graphql';
 
-export type SocialAccountChangeItem = NonNullable<ProfileSummaryQuery['user']>['socialAccounts'];
+export type SocialAccountChangeItem = NonNullable<PageProfileOverviewQuery['user']>['socialAccounts'];
 
 export type ChangeItemType = string | number | boolean | SocialAccountChangeItem;
 

types/profile-timeline.types.ts

@@ -1,14 +1,8 @@
 import { TIER_NAMES } from '@/app/app.consts';
-import { Tier } from '@/types/generated/graphql';
+import { RankTier, Tier } from '@/types/generated/graphql';
 import { UserRankProp } from '@/types/ranking.types';
 
-import {
-  BestTierResult,
-  ProfileTierType,
-  ProfileTierWithData,
-  RanksType,
-  TiersDataType,
-} from './calculate-tiers.types';
+import { BestTierResult, ProfileTierType, ProfileTierWithData, RanksType } from './calculate-tiers.types';
 
 const BUCKETS: UserRankProp[] = [UserRankProp.s, UserRankProp.c, UserRankProp.f];
 
@@ -70,7 +64,7 @@ function getBestProfileTier(profileTiers: ProfileTierWithData[]): BestTierResult
 }
 
 const findTier = (
-  tiers: NonNullable<TiersDataType>[`${keyof typeof UserRankProp}Tiers`],
+  tiers: NonNullable<RankTier>[`${keyof typeof UserRankProp}Tiers`],
   rank?: number | null,
 ): Tier | undefined => {
   return tiers?.find((tier) => tier.maxRank >= (rank || Number.MAX_SAFE_INTEGER));
@@ -104,7 +98,7 @@ export const getRankingTierData = (
   };
 };
 
-export const calculateTiers = (profileRanks?: RanksType, rankTiers?: TiersDataType) => {
+export const calculateTiers = (profileRanks?: RanksType, rankTiers?: RankTier | null) => {
   const profileTiers = BUCKETS.reduce((acc, propName) => {
     acc[`${propName}Tier`] = getRankingTierData(
       propName,