@c-rex/components 0.1.38 → 0.1.39

package/src/results/filter-sidebar/utils.ts

@@ -1,164 +1,196 @@
-import { FilterItem, Tags } from "@c-rex/interfaces";
-import { EN_LANG } from "@c-rex/constants";
-
-export const updateFilterParam = (key: string, item: FilterItem, filter: string | null): Record<string, string | null> => {
-
-    if (key === "packages") {
-        return { packages: item.shortId }
-    }
-
-    const value = `${key}.shortId=${item.shortId}`
-    let aux = value
-
-    if (filter != null) {
-        const splittedParam = filter.split(",")
-        const finalValue = [...splittedParam]
-
-        const hasParams = filter.includes(key)
-
-        if (hasParams) {
-            let mainIndex = -1
-
-            splittedParam.forEach((el, index) => {
-                if (el.includes(key)) {
-                    mainIndex = index
-                }
-            })
-            finalValue[mainIndex] = value
-        } else {
-            finalValue.push(value)
-        }
-
-        aux = finalValue.join(",")
-    }
-
-    return { filter: aux }
-};
-
-export const removeFilterItem = (key: string, item: FilterItem, filter: string | null): Record<string, string | null> => {
-    if (key === "packages") {
-        return { packages: null }
-    }
-
-    if (filter !== null) {
-        const value = `${key}.shortId=${item.shortId}`
-        const newValue = filter.split(",").filter(item => item !== value).join(",")
-        return { filter: newValue.length === 0 ? null : newValue }
-    }
-
-    return {}
-}
-
-export const clearData = (tags: Tags): Record<string, FilterItem[]> => {
-    const contentLang = EN_LANG.toLowerCase()
-    const splittedContentLang = contentLang.split("-")[0];
-    const filteredTags: Record<string, FilterItem[]> = {}
-
-    for (const [key, value] of Object.entries(tags)) {
-        if (!value || !value.items || value.items.length === 0) {
-            continue;
-        }
-
-        const aux = value.items.map(item => {
-            if (item?.shortId === undefined) return null
-            if (Number(item.hits) === 0) return null
-            if (item?.labels === undefined || item?.labels.length === 0) {
-                /*
-                logger.log({
-                    level: "warning",
-                    message: `No labels on item with id ${item.shortId} from category ${key}`
-                })
-                */
-
-                return null;
-            }
-
-            let label = ""
-
-            for (const labelItem of item.labels) {
-                if (labelItem.language === undefined) {
-                    /*
-                    logger.log({
-                        level: "info",
-                        message: `No language on label ${labelItem.value} from category ${key}`
-                    })
-                    */
-                    label = labelItem.value
-                    break;
-                }
-
-                if (labelItem.language.toLowerCase() === contentLang || labelItem.language.toLowerCase() === splittedContentLang) {
-                    label = labelItem.value
-                    break;
-                }
-
-                label = labelItem.value
-
-                // todo: fallback in english
-            }
-
-            return {
-                hits: item.hits,
-                total: item.total,
-                label: label,
-                active: false,
-                shortId: item.shortId,
-            }
-        }).filter((item) => item !== null)
-
-        if (aux.length === 0) {
-            continue;
-        }
-
-        filteredTags[key] = aux;
-    }
-
-    return filteredTags;
-}
-
-export const memoizeFilteredTags = (tags: Tags | undefined, filter: string | null, packages: string | null) => {
-
-    if (!tags) return {};
-
-    const newTags: Record<string, FilterItem[]> = clearData(tags);
-
-    if (filter !== null) {
-        const splittedParam = filter.split(",")
-
-        splittedParam.forEach((item) => {
-            const aux = item.split(".shortId=")
-            const name = aux[0] as string
-            const shortId = aux[1] as string
-
-            if (!Object.keys(newTags).includes(name)) {
-                newTags[name] = []
-            }
-
-            newTags[name]?.forEach((el) => {
-                if (el.shortId == shortId) {
-                    el.active = true
-                } else {
-                    el.active = false
-                }
-            })
-        })
-    } else {
-        Object.keys(newTags).forEach((key) => {
-            newTags[key]?.forEach((el) => {
-                el.active = false
-            })
-        })
-    }
-
-    if (packages !== null && newTags["packages"]) {
-        newTags["packages"].forEach((el) => {
-            if (el.shortId == packages) {
-                el.active = true
-            } else {
-                el.active = false
-            }
-        })
-    }
-
-    return newTags
-}
+import { FilterItem, Tags } from "@c-rex/interfaces";
+import { EN_LANG } from "@c-rex/constants";
+
+export type FacetLabelOverride = {
+    label: string;
+    groupLabel?: string;
+    sectionLabel?: string;
+};
+
+export type FacetLabelOverrides = Partial<Record<string, Record<string, FacetLabelOverride>>>;
+
+export type ResolvedFilterItem = FilterItem & {
+    groupLabel?: string;
+    sectionLabel?: string;
+    taxonomyId?: string;
+};
+
+export const updateFilterParam = (key: string, item: FilterItem, filter: string | null): Record<string, string | null> => {
+
+    if (key === "packages") {
+        return { packages: item.shortId }
+    }
+
+    const value = `${key}.shortId=${item.shortId}`
+    let aux = value
+
+    if (filter != null) {
+        const splittedParam = filter.split(",")
+        const finalValue = [...splittedParam]
+
+        const hasParams = filter.includes(key)
+
+        if (hasParams) {
+            let mainIndex = -1
+
+            splittedParam.forEach((el, index) => {
+                if (el.includes(key)) {
+                    mainIndex = index
+                }
+            })
+            finalValue[mainIndex] = value
+        } else {
+            finalValue.push(value)
+        }
+
+        aux = finalValue.join(",")
+    }
+
+    return { filter: aux }
+};
+
+export const removeFilterItem = (key: string, item: FilterItem, filter: string | null): Record<string, string | null> => {
+    if (key === "packages") {
+        return { packages: null }
+    }
+
+    if (filter !== null) {
+        const value = `${key}.shortId=${item.shortId}`
+        const newValue = filter.split(",").filter(item => item !== value).join(",")
+        return { filter: newValue.length === 0 ? null : newValue }
+    }
+
+    return {}
+}
+
+export const resolveLabelByLanguage = (
+    labels: { language?: string; value: string }[],
+    uiLanguage?: string
+): string | undefined => {
+    if (!labels || labels.length === 0) return undefined;
+
+    const normalizedLanguage = (uiLanguage || EN_LANG).toLowerCase();
+    const baseLanguage = normalizedLanguage.split("-")[0];
+
+    const exact = labels.find((item) => item.language?.toLowerCase() === normalizedLanguage)?.value;
+    if (exact) return exact;
+
+    const base = labels.find((item) => item.language?.toLowerCase() === baseLanguage)?.value;
+    if (base) return base;
+
+    const withoutLanguage = labels.find((item) => !item.language)?.value;
+    if (withoutLanguage) return withoutLanguage;
+
+    return labels[0]?.value;
+};
+
+export const clearData = (
+    tags: Tags,
+    options?: { uiLanguage?: string; labelOverrides?: FacetLabelOverrides; includeZeroHits?: boolean }
+): Record<string, ResolvedFilterItem[]> => {
+    const includeZeroHits = options?.includeZeroHits ?? true;
+    const filteredTags: Record<string, ResolvedFilterItem[]> = {}
+
+    for (const [key, value] of Object.entries(tags)) {
+        if (!value || !value.items || value.items.length === 0) {
+            continue;
+        }
+
+        const aux = value.items.map(item => {
+            if (item?.shortId === undefined) return null
+            if (!includeZeroHits && Number(item.hits) === 0) return null
+
+            const override = options?.labelOverrides?.[key]?.[item.shortId];
+            const label = override?.label || resolveLabelByLanguage(item.labels || [], options?.uiLanguage);
+            if (!label) return null;
+            const taxonomyId = (item as { id?: string }).id;
+
+            return {
+                hits: item.hits,
+                total: item.total,
+                label,
+                active: false,
+                shortId: item.shortId,
+                groupLabel: override?.groupLabel,
+                sectionLabel: override?.sectionLabel,
+                taxonomyId,
+            }
+        }).filter((item) => item !== null)
+
+        if (aux.length === 0) {
+            continue;
+        }
+
+        filteredTags[key] = aux;
+    }
+
+    return filteredTags;
+}
+
+export const memoizeFilteredTags = (
+    tags: Tags | undefined,
+    filter: string | null,
+    packages: string | null,
+    options?: { uiLanguage?: string; labelOverrides?: FacetLabelOverrides; includeZeroHits?: boolean }
+) => {
+
+    if (!tags) return {};
+
+    const newTags: Record<string, ResolvedFilterItem[]> = clearData(tags, options);
+
+    if (filter !== null) {
+        const splittedParam = filter.split(",")
+
+        splittedParam.forEach((item) => {
+            const aux = item.split(".shortId=")
+            const name = aux[0] as string
+            const shortId = aux[1] as string
+
+            if (!Object.keys(newTags).includes(name)) {
+                newTags[name] = []
+            }
+
+            newTags[name]?.forEach((el) => {
+                if (el.shortId == shortId) {
+                    el.active = true
+                } else {
+                    el.active = false
+                }
+            })
+        })
+    } else {
+        Object.keys(newTags).forEach((key) => {
+            newTags[key]?.forEach((el) => {
+                el.active = false
+            })
+        })
+    }
+
+    if (packages !== null && newTags["packages"]) {
+        newTags["packages"].forEach((el) => {
+            if (el.shortId == packages) {
+                el.active = true
+            } else {
+                el.active = false
+            }
+        })
+    }
+
+    return newTags
+}
+
+export const applyFacetPropertyVisibility = (
+    tags: Record<string, ResolvedFilterItem[]>,
+    includeProperties?: string[],
+    excludeProperties?: string[]
+): Record<string, ResolvedFilterItem[]> => {
+    const includeSet = new Set((includeProperties || []).filter(Boolean));
+    const excludeSet = new Set((excludeProperties || []).filter(Boolean));
+
+    return Object.entries(tags).reduce<Record<string, ResolvedFilterItem[]>>((acc, [key, value]) => {
+        if (includeSet.size > 0 && !includeSet.has(key)) return acc;
+        if (excludeSet.has(key)) return acc;
+        acc[key] = value;
+        return acc;
+    }, {});
+}

package/src/results/generic/table-result-list.tsx

@@ -1,99 +1,97 @@
-import { FC } from "react";
-import { CommonItemsModel } from "@c-rex/interfaces";
-import { cn, generateQueryParams, getLanguage, getTitle, getType } from "@c-rex/utils";
-import { Flag } from "@c-rex/components/flag";
-import { Badge } from "@c-rex/ui/badge";
-import Link from "next/link";
-import { FileDownloadDropdown } from "@c-rex/components/file-download";
-import { getTranslations } from "next-intl/server";
-import { QueryParams } from "@c-rex/types";
-
-interface Props {
-    items: CommonItemsModel[];
-    linkPattern: string;
-    addPackageId: boolean
-    showFilesColumn?: boolean;
-    query?: string
-}
-
-export const GenericTableResultList: FC<Props> = async ({
-    items,
-    linkPattern,
-    addPackageId,
-    query,
-    showFilesColumn = true,
-}) => {
-    const t = await getTranslations("results");
-
-    return (
-        <div className="rounded-md border mb-6 last:border-b-0">
-            <div className="font-bold text-sm p-2 border-b items-center flex-wrap hidden md:flex">
-                <div className="flex-1 p-2">{t("title")}</div>
-                <div className="w-1/2 md:w-1/5 p-2 flex justify-center">{t("language")}</div>
-                <div className="w-1/2 md:w-1/5 p-2 flex justify-center">{t("type")}</div>
-                {showFilesColumn &&
-                    <div className="w-1/2 md:w-1/5 p-2 flex justify-center">{t("files")}</div>
-                }
-            </div>
-
-            {items.map((item) => {
-                const title = getTitle(item.titles, item.labels);
-                const itemType = getType(item.class);
-                const language = getLanguage(item.languages);
-                const packageId = item.packages && item.packages.length > 0 ? item.packages[0]?.shortId : null;
-                const queryParams: QueryParams[] = []
-
-                if (addPackageId && packageId) {
-                    queryParams.push({
-                        key: "package",
-                        value: packageId,
-                    })
-                }
-
-                if (query != undefined) {
-                    queryParams.push({
-                        key: "q",
-                        value: query,
-                    })
-                }
-
-                const params = generateQueryParams(queryParams)
-                const link = linkPattern.replace("{shortId}", item.shortId!) + (params.length > 0 ? `?${params}` : "")
-
-                return (
-                    <div
-                        className={cn(
-                            "min-h-12 c-rex-result-item flex flex-wrap items-center border-b",
-                            `c-rex-result-${itemType.toLowerCase()}`,
-                        )}
-                        key={item.shortId}
-                    >
-                        <div className="flex-1 p-2">
-                            <Link href={link} className="hover:underline">{title}</Link>
-                        </div>
-
-                        <div className="w-1/5 md:w-1/5 flex justify-center p-2">
-                            <span className="w-8 inline-block">
-                                {language.split("-").length > 1 && (
-                                    <Flag countryCode={language.split("-")[1] as string} />
-                                )}
-                            </span>
-                        </div>
-
-                        <div className="w-4/5 md:w-1/5 p-2 flex justify-center">
-                            <Badge variant="secondary">
-                                {itemType}
-                            </Badge>
-                        </div>
-
-                        {showFilesColumn &&
-                            <div className="w-1/5 flex justify-center p-2">
-                                <FileDownloadDropdown renditions={item.renditions} />
-                            </div>
-                        }
-                    </div>
-                )
-            })}
-        </div>
-    );
-};
+import { FC } from "react";
+import { CommonItemsModel } from "@c-rex/interfaces";
+import { cn, generateQueryParams } from "@c-rex/utils";
+import { Flag } from "@c-rex/components/flag";
+import { Badge } from "@c-rex/ui/badge";
+import Link from "next/link";
+import { FileDownloadDropdown } from "@c-rex/components/file-download";
+import { getTranslations } from "next-intl/server";
+import { QueryParams } from "@c-rex/types";
+import { getResultItemSummary } from "../summary";
+
+interface Props {
+    items: CommonItemsModel[];
+    linkPattern: string;
+    addPackageId: boolean
+    showFilesColumn?: boolean;
+    query?: string
+}
+
+export const GenericTableResultList: FC<Props> = async ({
+    items,
+    linkPattern,
+    addPackageId,
+    query,
+    showFilesColumn = true,
+}) => {
+    const t = await getTranslations("results");
+
+    return (
+        <div className="rounded-md border mb-6 last:border-b-0">
+            <div className="font-bold text-sm p-2 border-b items-center flex-wrap hidden md:flex">
+                <div className="flex-1 p-2">{t("title")}</div>
+                <div className="w-1/2 md:w-1/5 p-2 flex justify-center">{t("language")}</div>
+                <div className="w-1/2 md:w-1/5 p-2 flex justify-center">{t("type")}</div>
+                {showFilesColumn &&
+                    <div className="w-1/2 md:w-1/5 p-2 flex justify-center">{t("files")}</div>
+                }
+            </div>
+
+            {items.map((item) => {
+                const { title, itemType, language, countryCode, packageId } = getResultItemSummary(item);
+                const queryParams: QueryParams[] = []
+
+                if (addPackageId && packageId) {
+                    queryParams.push({
+                        key: "package",
+                        value: packageId,
+                    })
+                }
+
+                if (query != undefined) {
+                    queryParams.push({
+                        key: "q",
+                        value: query,
+                    })
+                }
+
+                const params = generateQueryParams(queryParams)
+                const link = linkPattern.replace("{shortId}", item.shortId!) + (params.length > 0 ? `?${params}` : "")
+
+                return (
+                    <div
+                        className={cn(
+                            "min-h-12 c-rex-result-item flex flex-wrap items-center border-b",
+                            `c-rex-result-${itemType.toLowerCase()}`,
+                        )}
+                        key={item.shortId}
+                    >
+                        <div className="flex-1 p-2">
+                            <Link href={link} className="hover:underline">{title}</Link>
+                        </div>
+
+                        <div className="w-1/5 md:w-1/5 flex justify-center p-2">
+                            <span className="w-8 inline-block">
+                                {countryCode.length > 0 && (
+                                    <Flag countryCode={countryCode} />
+                                )}
+                            </span>
+                        </div>
+
+                        <div className="w-4/5 md:w-1/5 p-2 flex justify-center">
+                            <Badge variant="secondary">
+                                {itemType}
+                            </Badge>
+                        </div>
+
+                        {showFilesColumn &&
+                            <div className="w-1/5 flex justify-center p-2">
+                                <FileDownloadDropdown renditions={item.renditions} />
+                            </div>
+                        }
+                    </div>
+                )
+            })}
+        </div>
+    );
+};