Accord’s Library
+Accord’s Library
)} {
- setMenuGestures(state);
+ setMenuGestures(!state);
}, [setMenuGestures, state]);
return (
diff --git a/src/components/PostPage.tsx b/src/components/PostPage.tsx
index 83167b2..07f8e75 100644
--- a/src/components/PostPage.tsx
+++ b/src/components/PostPage.tsx
@@ -1,7 +1,7 @@
import { AppStaticProps } from "graphql/getAppStaticProps";
import { getDescription } from "helpers/description";
import { prettySlug } from "helpers/formatters";
-import { getStatusDescription } from "helpers/others";
+import { filterHasAttributes, getStatusDescription } from "helpers/others";
import { PostWithTranslations } from "helpers/types";
import { useSmartLanguage } from "hooks/useSmartLanguage";
import { Fragment, useMemo } from "react";
@@ -102,14 +102,12 @@ export function PostPage(props: Props): JSX.Element {
-): JSX.Element {
+export function TranslatedPreviewCard(props: TranslatedProps): JSX.Element {
const {
translations = [{ title: props.slug, language: "default" }],
slug,
diff --git a/src/components/PreviewLine.tsx b/src/components/PreviewLine.tsx
index a76e478..5e34e0c 100644
--- a/src/components/PreviewLine.tsx
+++ b/src/components/PreviewLine.tsx
@@ -89,7 +89,7 @@ interface TranslatedProps
}
export function TranslatedPreviewLine(
- props: Immutable
+ props: TranslatedProps
): JSX.Element {
const {
translations = [{ title: props.slug, language: "default" }],
diff --git a/src/components/RecorderChip.tsx b/src/components/RecorderChip.tsx
index 1da4460..9aadef6 100644
--- a/src/components/RecorderChip.tsx
+++ b/src/components/RecorderChip.tsx
@@ -2,6 +2,7 @@ import { Chip } from "components/Chip";
import { RecorderChipFragment } from "graphql/generated";
import { AppStaticProps } from "graphql/getAppStaticProps";
import { ImageQuality } from "helpers/img";
+import { filterHasAttributes } from "helpers/others";
import { Fragment } from "react";
import { Img } from "./Img";
@@ -33,13 +34,13 @@ export function RecorderChip(props: Props): JSX.Element {
{recorder.languages?.data && recorder.languages.data.length > 0 && (
- {language.attributes && (
+ {filterHasAttributes(recorder.languages.data).map(
+ (language) => (
+
{language.attributes.code.toUpperCase()}
- )}
-
- ))}
+
+ )
+ )}
)}
{recorder.pronouns && (
diff --git a/src/components/ThumbnailHeader.tsx b/src/components/ThumbnailHeader.tsx
index 87dfd97..4d7445c 100644
--- a/src/components/ThumbnailHeader.tsx
+++ b/src/components/ThumbnailHeader.tsx
@@ -6,6 +6,7 @@ import { GetContentTextQuery, UploadImageFragment } from "graphql/generated";
import { AppStaticProps } from "graphql/getAppStaticProps";
import { prettyinlineTitle, prettySlug, slugify } from "helpers/formatters";
import { getAssetURL, ImageQuality } from "helpers/img";
+import { filterHasAttributes } from "helpers/others";
import { useLightBox } from "hooks/useLightBox";
@@ -89,9 +90,11 @@ export function ThumbnailHeader(props: Props): JSX.Element {
)}
diff --git a/src/components/Wiki/Chronology/ChronologyItemComponent.tsx b/src/components/Wiki/Chronology/ChronologyItemComponent.tsx
index c85c4bb..a2af90b 100644
--- a/src/components/Wiki/Chronology/ChronologyItemComponent.tsx
+++ b/src/components/Wiki/Chronology/ChronologyItemComponent.tsx
@@ -6,7 +6,11 @@ import {
GetChronologyItemsQuery,
} from "graphql/generated";
import { AppStaticProps } from "graphql/getAppStaticProps";
-import { getStatusDescription } from "helpers/others";
+import {
+ filterDefined,
+ filterHasAttributes,
+ getStatusDescription,
+} from "helpers/others";
import { Fragment } from "react";
@@ -44,13 +48,16 @@ export function ChronologyItemComponent(props: Props): JSX.Element {
["data"];
type GroupLibraryItems = Map;
@@ -13,67 +13,67 @@ export function getGroups(
groupByType: number,
items: Items
): GroupLibraryItems {
+ const groups: GroupLibraryItems = new Map();
+
switch (groupByType) {
case 0: {
- const typeGroup = new Map();
- typeGroup.set("Drakengard 1", []);
- typeGroup.set("Drakengard 1.3", []);
- typeGroup.set("Drakengard 2", []);
- typeGroup.set("Drakengard 3", []);
- typeGroup.set("Drakengard 4", []);
- typeGroup.set("NieR Gestalt", []);
- typeGroup.set("NieR Replicant", []);
- typeGroup.set("NieR Replicant ver.1.22474487139...", []);
- typeGroup.set("NieR:Automata", []);
- typeGroup.set("NieR Re[in]carnation", []);
- typeGroup.set("SINoALICE", []);
- typeGroup.set("Voice of Cards", []);
- typeGroup.set("Final Fantasy XIV", []);
- typeGroup.set("Thou Shalt Not Die", []);
- typeGroup.set("Bakuken", []);
- typeGroup.set("YoRHa", []);
- typeGroup.set("YoRHa Boys", []);
- typeGroup.set(langui.no_category, []);
+ const noCategory = langui.no_category ?? "No category";
+ groups.set("Drakengard 1", []);
+ groups.set("Drakengard 1.3", []);
+ groups.set("Drakengard 2", []);
+ groups.set("Drakengard 3", []);
+ groups.set("Drakengard 4", []);
+ groups.set("NieR Gestalt", []);
+ groups.set("NieR Replicant", []);
+ groups.set("NieR Replicant ver.1.22474487139...", []);
+ groups.set("NieR:Automata", []);
+ groups.set("NieR Re[in]carnation", []);
+ groups.set("SINoALICE", []);
+ groups.set("Voice of Cards", []);
+ groups.set("Final Fantasy XIV", []);
+ groups.set("Thou Shalt Not Die", []);
+ groups.set("Bakuken", []);
+ groups.set("YoRHa", []);
+ groups.set("YoRHa Boys", []);
+ groups.set(noCategory, []);
items.map((item) => {
if (item.attributes?.categories?.data.length === 0) {
- typeGroup.get(langui.no_category)?.push(item);
+ groups.get(noCategory)?.push(item);
} else {
item.attributes?.categories?.data.map((category) => {
- typeGroup.get(category.attributes?.name)?.push(item);
+ groups.get(category.attributes?.name ?? noCategory)?.push(item);
});
}
});
-
- return typeGroup;
+ break;
}
case 1: {
- const group = new Map();
- group.set(langui.audio ?? "Audio", []);
- group.set(langui.game ?? "Game", []);
- group.set(langui.textual ?? "Textual", []);
- group.set(langui.video ?? "Video", []);
- group.set(langui.other ?? "Other", []);
- group.set(langui.group ?? "Group", []);
- group.set(langui.no_type ?? "No type", []);
+ groups.set(langui.audio ?? "Audio", []);
+ groups.set(langui.game ?? "Game", []);
+ groups.set(langui.textual ?? "Textual", []);
+ groups.set(langui.video ?? "Video", []);
+ groups.set(langui.other ?? "Other", []);
+ groups.set(langui.group ?? "Group", []);
+ groups.set(langui.no_type ?? "No type", []);
items.map((item) => {
if (item.attributes?.metadata && item.attributes.metadata.length > 0) {
switch (item.attributes.metadata[0]?.__typename) {
case "ComponentMetadataAudio":
- group.get(langui.audio ?? "Audio")?.push(item);
+ groups.get(langui.audio ?? "Audio")?.push(item);
break;
case "ComponentMetadataGame":
- group.get(langui.game ?? "Game")?.push(item);
+ groups.get(langui.game ?? "Game")?.push(item);
break;
case "ComponentMetadataBooks":
- group.get(langui.textual ?? "Textual")?.push(item);
+ groups.get(langui.textual ?? "Textual")?.push(item);
break;
case "ComponentMetadataVideo":
- group.get(langui.video ?? "Video")?.push(item);
+ groups.get(langui.video ?? "Video")?.push(item);
break;
case "ComponentMetadataOther":
- group.get(langui.other ?? "Other")?.push(item);
+ groups.get(langui.other ?? "Other")?.push(item);
break;
case "ComponentMetadataGroup":
switch (
@@ -81,19 +81,19 @@ export function getGroups(
?.slug
) {
case "audio":
- group.get(langui.audio ?? "Audio")?.push(item);
+ groups.get(langui.audio ?? "Audio")?.push(item);
break;
case "video":
- group.get(langui.video ?? "Video")?.push(item);
+ groups.get(langui.video ?? "Video")?.push(item);
break;
case "game":
- group.get(langui.game ?? "Game")?.push(item);
+ groups.get(langui.game ?? "Game")?.push(item);
break;
case "textual":
- group.get(langui.textual ?? "Textual")?.push(item);
+ groups.get(langui.textual ?? "Textual")?.push(item);
break;
case "mixed":
- group.get(langui.group ?? "Group")?.push(item);
+ groups.get(langui.group ?? "Group")?.push(item);
break;
default: {
throw new Error(
@@ -107,10 +107,10 @@ export function getGroups(
}
}
} else {
- group.get(langui.no_type ?? "No type")?.push(item);
+ groups.get(langui.no_type ?? "No type")?.push(item);
}
});
- return group;
+ break;
}
case 2: {
@@ -121,29 +121,28 @@ export function getGroups(
years.push(item.attributes.release_date.year);
}
});
- const group = new Map();
+
years.sort((a, b) => a - b);
years.map((year) => {
- group.set(year.toString(), []);
+ groups.set(year.toString(), []);
});
- group.set(langui.no_year ?? "No year", []);
+ groups.set(langui.no_year ?? "No year", []);
items.map((item) => {
if (item.attributes?.release_date?.year) {
- group.get(item.attributes.release_date.year.toString())?.push(item);
+ groups.get(item.attributes.release_date.year.toString())?.push(item);
} else {
- group.get(langui.no_year ?? "No year")?.push(item);
+ groups.get(langui.no_year ?? "No year")?.push(item);
}
});
-
- return group;
+ break;
}
default: {
- const group = new Map();
- group.set("", items);
- return group;
+ groups.set("", items);
+ break;
}
}
+ return mapRemoveEmptyValues(groups);
}
export function filterItems(
@@ -155,7 +154,7 @@ export function filterItems(
showSecondaryItems: boolean,
filterUserStatus: LibraryItemUserStatus | undefined
): Items {
- return [...items].filter((item) => {
+ return items.filter((item) => {
if (!showSubitems && !item.attributes?.root_item) return false;
if (showSubitems && isUntangibleGroupItem(item.attributes?.metadata?.[0])) {
return false;
@@ -212,7 +211,7 @@ export function sortBy(
): Items {
switch (orderByType) {
case 0:
- return [...items].sort((a, b) => {
+ return items.sort((a, b) => {
const titleA = prettyinlineTitle(
"",
a.attributes?.title,
@@ -226,7 +225,7 @@ export function sortBy(
return titleA.localeCompare(titleB);
});
case 1:
- return [...items].sort((a, b) => {
+ return items.sort((a, b) => {
const priceA = a.attributes?.price
? convertPrice(a.attributes.price, currencies[0])
: 99999;
@@ -236,7 +235,7 @@ export function sortBy(
return priceA - priceB;
});
case 2:
- return [...items].sort((a, b) => {
+ return items.sort((a, b) => {
const dateA = a.attributes?.release_date
? prettyDate(a.attributes.release_date)
: "9999";
diff --git a/src/helpers/others.ts b/src/helpers/others.ts
index cdaa15b..64d2dce 100644
--- a/src/helpers/others.ts
+++ b/src/helpers/others.ts
@@ -4,6 +4,7 @@ import {
GetLibraryItemScansQuery,
} from "graphql/generated";
import { AppStaticProps } from "../graphql/getAppStaticProps";
+import { SelectiveRequiredNonNullable } from "./types";
type SortContentProps =
| NonNullable<
@@ -59,11 +60,6 @@ export function getStatusDescription(
}
}
-export function arrayMove(arr: T[], old_index: number, new_index: number) {
- arr.splice(new_index, 0, arr.splice(old_index, 1)[0]);
- return arr;
-}
-
export function isDefined(t: T): t is NonNullable {
return t !== null && t !== undefined;
}
@@ -78,6 +74,51 @@ export function isDefinedAndNotEmpty(
return isDefined(string) && string.length > 0;
}
-export function filterDefined(t: T[]): NonNullable[] {
+export function filterDefined(t: T[] | undefined | null): NonNullable[] {
+ if (isUndefined(t)) return [];
return t.filter((item) => isDefined(item)) as NonNullable[];
}
+
+export function filterHasAttributes>(
+ t: T[] | undefined | null,
+ attributes?: P[]
+): SelectiveRequiredNonNullable, P>[] {
+ if (isUndefined(t)) return [];
+ return t.filter((item) => {
+ if (isDefined(item)) {
+ const attributesToCheck = attributes ?? (Object.keys(item) as P[]);
+ return attributesToCheck.every((attribute) => isDefined(item[attribute]));
+ }
+ return false;
+ }) as unknown as SelectiveRequiredNonNullable, P>[];
+}
+
+export function iterateMap(
+ map: Map,
+ callbackfn: (key: K, value: V, index: number) => U
+): U[] {
+ const result: U[] = [];
+ let index = 0;
+ for (const [key, value] of map.entries()) {
+ result.push(callbackfn(key, value, index));
+ index += 1;
+ }
+ return result;
+}
+
+export function mapMoveEntry(
+ map: Map,
+ sourceIndex: number,
+ targetIndex: number
+) {
+ return new Map(arrayMove([...map], sourceIndex, targetIndex));
+}
+
+function arrayMove(arr: T[], sourceIndex: number, targetIndex: number) {
+ arr.splice(targetIndex, 0, arr.splice(sourceIndex, 1)[0]);
+ return arr;
+}
+
+export function mapRemoveEmptyValues(groups: Map): Map {
+ return new Map([...groups].filter(([_, items]) => items.length > 0));
+}
diff --git a/src/helpers/types.ts b/src/helpers/types.ts
index 973bc84..68714b9 100644
--- a/src/helpers/types.ts
+++ b/src/helpers/types.ts
@@ -30,9 +30,13 @@ export interface WikiPageWithTranslations
translations: NonNullable;
}
-export type RequiredNonNullable = Required<{
- [P in keyof T]: NonNullable;
-}>;
+export type RequiredNonNullable = {
+ [P in keyof T]-?: NonNullable;
+};
+
+export type SelectiveRequiredNonNullable = Omit & {
+ [P in K]-?: NonNullable;
+};
export enum LibraryItemUserStatus {
None = 0,
diff --git a/src/hooks/useSmartLanguage.tsx b/src/hooks/useSmartLanguage.tsx
index d8ec52e..b3b454c 100644
--- a/src/hooks/useSmartLanguage.tsx
+++ b/src/hooks/useSmartLanguage.tsx
@@ -1,7 +1,7 @@
import { LanguageSwitcher } from "components/Inputs/LanguageSwitcher";
import { useAppLayout } from "contexts/AppLayoutContext";
import { AppStaticProps } from "graphql/getAppStaticProps";
-import { isDefined } from "helpers/others";
+import { filterDefined, isDefined } from "helpers/others";
import { useRouter } from "next/router";
import { useEffect, useMemo, useState } from "react";
@@ -39,11 +39,9 @@ export function useSmartLanguage(
const availableLocales = useMemo(() => {
const map = new Map();
- items.map((elem, index) => {
- if (isDefined(elem)) {
- const result = languageExtractor(elem);
- if (isDefined(result)) map.set(result, index);
- }
+ filterDefined(items).map((elem, index) => {
+ const result = languageExtractor(elem);
+ if (isDefined(result)) map.set(result, index);
});
return map;
}, [items, languageExtractor]);
diff --git a/src/pages/archives/videos/c/[uid].tsx b/src/pages/archives/videos/c/[uid].tsx
index 744853b..15cb249 100644
--- a/src/pages/archives/videos/c/[uid].tsx
+++ b/src/pages/archives/videos/c/[uid].tsx
@@ -24,7 +24,7 @@ import { Fragment, useState } from "react";
import { Icon } from "components/Ico";
import { useMediaHoverable } from "hooks/useMediaQuery";
import { WithLabel } from "components/Inputs/WithLabel";
-import { isDefined } from "helpers/others";
+import { filterHasAttributes, isDefined } from "helpers/others";
interface Props extends AppStaticProps {
channel: NonNullable<
@@ -74,27 +74,25 @@ export default function Channel(props: Props): JSX.Element {
className="grid items-start gap-8 border-b-[3px] border-dotted pb-12 last-of-type:border-0
desktop:grid-cols-[repeat(auto-fill,_minmax(15rem,1fr))] mobile:grid-cols-2"
>
- {channel?.videos?.data.map((video) => (
+ {filterHasAttributes(channel?.videos?.data).map((video) => (
- {video.attributes && (
-
))}
@@ -137,13 +135,12 @@ export async function getStaticPaths(
const channels = await sdk.getVideoChannelsSlugs();
const paths: GetStaticPathsResult["paths"] = [];
if (channels.videoChannels?.data)
- channels.videoChannels.data.map((channel) => {
+ filterHasAttributes(channels.videoChannels.data).map((channel) => {
context.locales?.map((local) => {
- if (channel.attributes)
- paths.push({
- params: { uid: channel.attributes.uid },
- locale: local,
- });
+ paths.push({
+ params: { uid: channel.attributes.uid },
+ locale: local,
+ });
});
});
return {
diff --git a/src/pages/archives/videos/index.tsx b/src/pages/archives/videos/index.tsx
index 5aa39fb..f3b9414 100644
--- a/src/pages/archives/videos/index.tsx
+++ b/src/pages/archives/videos/index.tsx
@@ -18,6 +18,7 @@ import { GetVideosPreviewQuery } from "graphql/generated";
import { AppStaticProps, getAppStaticProps } from "graphql/getAppStaticProps";
import { getReadySdk } from "graphql/sdk";
import { prettyDate } from "helpers/formatters";
+import { filterHasAttributes } from "helpers/others";
import { getVideoThumbnailURL } from "helpers/videos";
import { useMediaHoverable } from "hooks/useMediaQuery";
import { GetStaticPropsContext } from "next";
@@ -95,27 +96,25 @@ export default function Videos(props: Props): JSX.Element {
desktop:grid-cols-[repeat(auto-fill,_minmax(15rem,1fr))] mobile:grid-cols-2
thin:grid-cols-1"
>
- {paginatedVideos[page].map((video) => (
+ {filterHasAttributes(paginatedVideos[page]).map((video) => (
- {video.attributes && (
-
))}
diff --git a/src/pages/archives/videos/v/[uid].tsx b/src/pages/archives/videos/v/[uid].tsx
index 813e1a7..52ea437 100644
--- a/src/pages/archives/videos/v/[uid].tsx
+++ b/src/pages/archives/videos/v/[uid].tsx
@@ -18,7 +18,7 @@ import { GetVideoQuery } from "graphql/generated";
import { AppStaticProps, getAppStaticProps } from "graphql/getAppStaticProps";
import { getReadySdk } from "graphql/sdk";
import { prettyDate, prettyShortenNumber } from "helpers/formatters";
-import { isDefined } from "helpers/others";
+import { filterHasAttributes, isDefined } from "helpers/others";
import { getVideoFile } from "helpers/videos";
import { useMediaMobile } from "hooks/useMediaQuery";
import {
@@ -213,10 +213,9 @@ export async function getStaticPaths(
const videos = await sdk.getVideosSlugs();
const paths: GetStaticPathsResult["paths"] = [];
if (videos.videos?.data)
- videos.videos.data.map((video) => {
+ filterHasAttributes(videos.videos.data).map((video) => {
context.locales?.map((local) => {
- if (video.attributes)
- paths.push({ params: { uid: video.attributes.uid }, locale: local });
+ paths.push({ params: { uid: video.attributes.uid }, locale: local });
});
});
return {
diff --git a/src/pages/contents/[slug]/index.tsx b/src/pages/contents/[slug]/index.tsx
index 00f4061..407e957 100644
--- a/src/pages/contents/[slug]/index.tsx
+++ b/src/pages/contents/[slug]/index.tsx
@@ -26,7 +26,11 @@ import {
prettySlug,
} from "helpers/formatters";
import { isUntangibleGroupItem } from "helpers/libraryItem";
-import { getStatusDescription } from "helpers/others";
+import {
+ filterHasAttributes,
+ getStatusDescription,
+ isDefinedAndNotEmpty,
+} from "helpers/others";
import { ContentWithTranslations } from "helpers/types";
import { useMediaMobile } from "hooks/useMediaQuery";
import { AnchorIds, useScrollTopOnChange } from "hooks/useScrollTopOnChange";
@@ -82,31 +86,29 @@ export default function Content(props: Props): JSX.Element {
horizontalLine
/>
- {selectedTranslation?.text_set && (
+ {selectedTranslation?.text_set?.source_language?.data?.attributes
+ ?.code !== undefined && (
{"Authors"}:
- {post.authors.data.map((author) => (
+ {filterHasAttributes(post.authors.data).map((author) => (
- {author.attributes && (
-
))}
diff --git a/src/components/PreviewCard.tsx b/src/components/PreviewCard.tsx
index ff3c330..2e2e095 100644
--- a/src/components/PreviewCard.tsx
+++ b/src/components/PreviewCard.tsx
@@ -244,7 +244,8 @@ export function PreviewCard(props: Props): JSX.Element {
cIf(
!keepInfoVisible,
`-inset-x-0.5 bottom-2 opacity-0 group-hover:opacity-100 hoverable:absolute
- hoverable:drop-shadow-shade-lg notHoverable:rounded-b-md`
+ hoverable:drop-shadow-shade-lg notHoverable:opacity-100
+ notHoverable:rounded-b-md`
)
)}
>
@@ -302,9 +303,7 @@ interface TranslatedProps
languages: AppStaticProps["languages"];
}
-export function TranslatedPreviewCard(
- props: Immutable{langui.languages}:
- {recorder.languages.data.map((language) => ( -{langui.categories}
- {categories.data.map((category) => (
- {category.attributes?.name}
- ))}
+ {filterHasAttributes(categories.data).map(
+ (category) => (
+ {category.attributes.name}
+ )
+ )}
- {props.item.attributes.events?.map((event) => (
-
- {event && (
+ {props.item.attributes.events &&
+ filterHasAttributes(props.item.attributes.events, [
+ "id",
+ "translations",
+ ]).map((event) => (
+
);
diff --git a/src/helpers/libraryItem.ts b/src/helpers/libraryItem.ts
index df09011..bada7af 100644
--- a/src/helpers/libraryItem.ts
+++ b/src/helpers/libraryItem.ts
@@ -3,7 +3,7 @@ import { GetLibraryItemsPreviewQuery } from "graphql/generated";
import { AppStaticProps } from "graphql/getAppStaticProps";
import { prettyinlineTitle, prettyDate } from "./formatters";
import { convertPrice } from "./numbers";
-import { isDefined } from "./others";
+import { isDefined, mapRemoveEmptyValues } from "./others";
import { LibraryItemUserStatus } from "./types";
type Items = NonNullable
- {event.translations?.map((translation, translationIndex) => (
-
- {translation && (
+ {filterDefined(event.translations).map(
+ (translation, translationIndex) => (
+
- ))}
+
+ ))}
- )}
-
- ))}
+
+ )
+ )}
- )}
- {event.source?.data ? ( @@ -109,9 +116,8 @@ export function ChronologyItemComponent(props: Props): JSX.Element { )}
- {selectedTranslation.text_set.source_language?.data?.attributes - ?.code === selectedTranslation.language?.data?.attributes?.code + {selectedTranslation.text_set.source_language.data.attributes + .code === selectedTranslation.language?.data?.attributes?.code ? langui.transcript_notice : langui.translation_notice}
- {selectedTranslation.text_set.source_language?.data?.attributes - ?.code && - selectedTranslation.text_set.source_language.data.attributes - .code !== - selectedTranslation.language?.data?.attributes?.code && ( -
-
- {prettyLanguage(
- selectedTranslation.text_set.source_language.data.attributes
- .code,
- languages
- )}
-
-
- )}
+ {selectedTranslation.text_set.source_language.data.attributes.code !==
+ selectedTranslation.language?.data?.attributes?.code && (
+ {langui.source_language}:
-
+
+ {prettyLanguage(
+ selectedTranslation.text_set.source_language.data.attributes
+ .code,
+ languages
+ )}
+
+
+ )}
{langui.source_language}:
+{langui.status}:
@@ -127,18 +129,16 @@ export default function Content(props: Props): JSX.Element {{langui.transcribers}:
- {selectedTranslation.text_set.transcribers.data.map(
- (recorder) => (
-
- {recorder.attributes && (
-
- )
- )}
+ {filterHasAttributes(
+ selectedTranslation.text_set.transcribers.data
+ ).map((recorder) => (
+
+
+ ))}
{langui.translators}:
- {selectedTranslation.text_set.translators.data.map(
- (recorder) => (
-
- {recorder.attributes && (
-
- )
- )}
+ {filterHasAttributes(
+ selectedTranslation.text_set.translators.data
+ ).map((recorder) => (
+
+
+ ))}
{langui.proofreaders}:
- {selectedTranslation.text_set.proofreaders.data.map(
- (recorder) => (
-
- {recorder.attributes && (
-
- )
- )}
+ {filterHasAttributes(
+ selectedTranslation.text_set.proofreaders.data
+ ).map((recorder) => (
+
+
+ ))}
{"Notes"}:
@@ -450,13 +446,12 @@ export async function getStaticPaths(
const sdk = getReadySdk();
const contents = await sdk.getContentsSlugs();
const paths: GetStaticPathsResult["paths"] = [];
- contents.contents?.data.map((item) => {
+ filterHasAttributes(contents.contents?.data).map((item) => {
context.locales?.map((local) => {
- if (item.attributes)
- paths.push({
- params: { slug: item.attributes.slug },
- locale: local,
- });
+ paths.push({
+ params: { slug: item.attributes.slug },
+ locale: local,
+ });
});
});
return {
diff --git a/src/pages/contents/index.tsx b/src/pages/contents/index.tsx
index 27a42a6..4f3fcfe 100644
--- a/src/pages/contents/index.tsx
+++ b/src/pages/contents/index.tsx
@@ -21,6 +21,12 @@ import { WithLabel } from "components/Inputs/WithLabel";
import { Button } from "components/Inputs/Button";
import { TextInput } from "components/Inputs/TextInput";
import { useMediaHoverable } from "hooks/useMediaQuery";
+import {
+ filterHasAttributes,
+ iterateMap,
+ mapRemoveEmptyValues,
+} from "helpers/others";
+import { ContentPlaceholder } from "components/PanelComponents/ContentPlaceholder";
interface Props extends AppStaticProps {
contents: NonNullable["data"];
@@ -128,8 +134,18 @@ export default function Contents(props: Props): JSX.Element {
);
const contentPanel = (
- {[...groups].map(
- ([name, items], index) =>
+ {/* TODO: Add to langui */}
+ {groups.size === 0 && (
+
{name && (
@@ -140,7 +156,10 @@ export default function Contents(props: Props): JSX.Element {
{name}
{`${items.reduce((currentSum, item) => {
if (effectiveCombineRelatedContent) {
- if (item.attributes?.group?.data?.attributes?.combine) {
+ if (
+ item.attributes?.group?.data?.attributes?.combine ===
+ true
+ ) {
return (
currentSum +
(item.attributes.group.data.attributes.contents?.data
@@ -161,50 +180,49 @@ export default function Contents(props: Props): JSX.Element {
className="grid grid-cols-2 items-end gap-8
desktop:grid-cols-[repeat(auto-fill,_minmax(15rem,1fr))] mobile:gap-4"
>
- {items.map((item) => (
+ {filterHasAttributes(items).map((item) => (
- {item.attributes && (
- ({
- pre_title: translation?.pre_title,
- title: translation?.title,
- subtitle: translation?.subtitle,
- language:
- translation?.language?.data?.attributes?.code,
- })
- )}
- slug={item.attributes.slug}
- languages={languages}
- thumbnail={item.attributes.thumbnail?.data?.attributes}
- thumbnailAspectRatio="3/2"
- thumbnailForceAspectRatio
- stackNumber={
- effectiveCombineRelatedContent &&
- item.attributes.group?.data?.attributes?.combine
- ? item.attributes.group.data.attributes.contents
- ?.data.length
- : 0
- }
- topChips={
- item.attributes.type?.data?.attributes
- ? [
- item.attributes.type.data.attributes.titles?.[0]
- ? item.attributes.type.data.attributes
- .titles[0]?.title
- : prettySlug(
- item.attributes.type.data.attributes.slug
- ),
- ]
- : undefined
- }
- bottomChips={item.attributes.categories?.data.map(
- (category) => category.attributes?.short ?? ""
- )}
- keepInfoVisible={keepInfoVisible}
- />
- )}
+ ({
+ pre_title: translation?.pre_title,
+ title: translation?.title,
+ subtitle: translation?.subtitle,
+ language:
+ translation?.language?.data?.attributes?.code,
+ })
+ )}
+ slug={item.attributes.slug}
+ languages={languages}
+ thumbnail={item.attributes.thumbnail?.data?.attributes}
+ thumbnailAspectRatio="3/2"
+ thumbnailForceAspectRatio
+ stackNumber={
+ effectiveCombineRelatedContent &&
+ item.attributes.group?.data?.attributes?.combine ===
+ true
+ ? item.attributes.group.data.attributes.contents?.data
+ .length
+ : 0
+ }
+ topChips={
+ item.attributes.type?.data?.attributes
+ ? [
+ item.attributes.type.data.attributes.titles?.[0]
+ ? item.attributes.type.data.attributes.titles[0]
+ ?.title
+ : prettySlug(
+ item.attributes.type.data.attributes.slug
+ ),
+ ]
+ : undefined
+ }
+ bottomChips={item.attributes.categories?.data.map(
+ (category) => category.attributes?.short ?? ""
+ )}
+ keepInfoVisible={keepInfoVisible}
+ />
))}
@@ -252,71 +270,72 @@ function getGroups(
groupByType: number,
items: Props["contents"]
): GroupContentItems {
+ const groups: GroupContentItems = new Map();
+
switch (groupByType) {
case 0: {
- const group = new Map();
- group.set("Drakengard 1", []);
- group.set("Drakengard 1.3", []);
- group.set("Drakengard 2", []);
- group.set("Drakengard 3", []);
- group.set("Drakengard 4", []);
- group.set("NieR Gestalt", []);
- group.set("NieR Replicant", []);
- group.set("NieR Replicant ver.1.22474487139...", []);
- group.set("NieR:Automata", []);
- group.set("NieR Re[in]carnation", []);
- group.set("SINoALICE", []);
- group.set("Voice of Cards", []);
- group.set("Final Fantasy XIV", []);
- group.set("Thou Shalt Not Die", []);
- group.set("Bakuken", []);
- group.set("YoRHa", []);
- group.set("YoRHa Boys", []);
- group.set(langui.no_category, []);
+ const noCategory = langui.no_category ?? "No category";
+ groups.set("Drakengard 1", []);
+ groups.set("Drakengard 1.3", []);
+ groups.set("Drakengard 2", []);
+ groups.set("Drakengard 3", []);
+ groups.set("Drakengard 4", []);
+ groups.set("NieR Gestalt", []);
+ groups.set("NieR Replicant", []);
+ groups.set("NieR Replicant ver.1.22474487139...", []);
+ groups.set("NieR:Automata", []);
+ groups.set("NieR Re[in]carnation", []);
+ groups.set("SINoALICE", []);
+ groups.set("Voice of Cards", []);
+ groups.set("Final Fantasy XIV", []);
+ groups.set("Thou Shalt Not Die", []);
+ groups.set("Bakuken", []);
+ groups.set("YoRHa", []);
+ groups.set("YoRHa Boys", []);
+ groups.set(noCategory, []);
items.map((item) => {
if (item.attributes?.categories?.data.length === 0) {
- group.get(langui.no_category)?.push(item);
+ groups.get(noCategory)?.push(item);
} else {
item.attributes?.categories?.data.map((category) => {
- group.get(category.attributes?.name)?.push(item);
+ groups.get(category.attributes?.name ?? noCategory)?.push(item);
});
}
});
- return group;
+ break;
}
case 1: {
- const group = new Map();
items.map((item) => {
+ const noType = langui.no_type ?? "No type";
const type =
item.attributes?.type?.data?.attributes?.titles?.[0]?.title ??
item.attributes?.type?.data?.attributes?.slug
? prettySlug(item.attributes.type.data.attributes.slug)
: langui.no_type;
- if (!group.has(type)) group.set(type, []);
- group.get(type)?.push(item);
+ if (!groups.has(type ?? noType)) groups.set(type ?? noType, []);
+ groups.get(type ?? noType)?.push(item);
});
- return group;
+ break;
}
default: {
- const group: GroupContentItems = new Map();
- group.set("", items);
- return group;
+ groups.set("", items);
}
}
+ return mapRemoveEmptyValues(groups);
}
function filterContents(
- contents: Immutable{item?.title}
- {item?.subtitle &&{item.subtitle}
} + {item && isDefinedAndNotEmpty(item.subtitle) && ( +{item.subtitle}
+ )}{langui.available_at}
- {item.urls - .filter((url) => url) - .map((url, index) => ( -{langui.item_not_available}
@@ -225,26 +228,19 @@ export default function LibrarySlug(props: Props): JSX.Element { className="grid w-full grid-cols-[repeat(auto-fill,_minmax(15rem,1fr))] items-end gap-8" > - {item.gallery.data.map((galleryItem, index) => ( - {
- if (item.gallery?.data) {
- const images: string[] = [];
- item.gallery.data.map((image) => {
- if (image.attributes)
- images.push(
- getAssetURL(
- image.attributes.url,
- ImageQuality.Large
- )
- );
- });
- openLightBox(images, index);
- }
+ const images: string[] = filterHasAttributes(
+ item.gallery?.data
+ ).map((image) =>
+ getAssetURL(image.attributes.url, ImageQuality.Large)
+ );
+ openLightBox(images, index);
}}
>
![]()
- )}
-