@carlonicora/nextjs-jsonapi 1.0.6 → 1.1.0

package/dist/utils/index.d.ts

@@ -1,10 +1,12 @@
 import { ClassValue } from 'clsx';
 export { ClassValue } from 'clsx';
 import * as React from 'react';
-import { ReactElement } from 'react';
-import { M as ModuleWithPermissions, a as Action } from '../types-Bl61ob-7.js';
+import { ReactElement, ReactNode } from 'react';
+import { M as ModuleWithPermissions, a as Action } from '../types-t2PyXhDu.js';
 import { z } from 'zod';
 import { PartialBlock } from '@blocknote/core';
+import { LucideIcon } from 'lucide-react';
+import { A as ApiDataInterface } from '../ApiDataInterface-DPP8s46n.js';
 
 declare function cn(...inputs: ClassValue[]): string;
 
@@ -197,4 +199,26 @@ declare class BlockNoteWordDiffRendererUtil {
     };
 }
 
-export { type BlockDiffOptions, BlockNoteDiffUtil, BlockNoteWordDiffRendererUtil, type DiffBlock, type DiffResult, type EntityObject, type FormatOption, TableOptions, type UserObject, type WordDiff, cn, composeRefs, entityObjectSchema, exists, formatDate, getTableComponents, getTableOptions, useComposedRefs, useIsMobile, userObjectSchema };
+declare const getIconByModule: (params: {
+    module: ModuleWithPermissions;
+    className?: string;
+}) => ReactNode;
+declare const getIcon: (params: {
+    element: ApiDataInterface;
+    className?: string;
+}) => ReactNode;
+declare const getIconByModuleName: (params: {
+    name: string;
+    className?: string;
+}) => ReactNode;
+declare const getLucideIcon: (params: {
+    element: ApiDataInterface;
+}) => LucideIcon | null;
+declare const getLucideIconByModule: (params: {
+    module: ModuleWithPermissions;
+}) => LucideIcon | null;
+declare const getLucideIconByModuleName: (params: {
+    name: string;
+}) => LucideIcon | null;
+
+export { type BlockDiffOptions, BlockNoteDiffUtil, BlockNoteWordDiffRendererUtil, type DiffBlock, type DiffResult, type EntityObject, type FormatOption, TableOptions, type UserObject, type WordDiff, cn, composeRefs, entityObjectSchema, exists, formatDate, getIcon, getIconByModule, getIconByModuleName, getLucideIcon, getLucideIconByModule, getLucideIconByModuleName, getTableComponents, getTableOptions, useComposedRefs, useIsMobile, userObjectSchema };

package/dist/utils/index.js

@@ -12,7 +12,15 @@
 
 
 
-var _chunkJC3WJK65js = require('../chunk-JC3WJK65.js');
+
+
+
+
+
+
+var _chunkLJRD4SRVjs = require('../chunk-LJRD4SRV.js');
+require('../chunk-WZJDLITG.js');
+require('../chunk-AGAJMJ4T.js');
 require('../chunk-7QVYU63E.js');
 
 
@@ -28,5 +36,11 @@ require('../chunk-7QVYU63E.js');
 
 
 
-exports.BlockNoteDiffUtil = _chunkJC3WJK65js.BlockNoteDiffUtil; exports.BlockNoteWordDiffRendererUtil = _chunkJC3WJK65js.BlockNoteWordDiffRendererUtil; exports.TableOptions = _chunkJC3WJK65js.TableOptions; exports.cn = _chunkJC3WJK65js.cn; exports.composeRefs = _chunkJC3WJK65js.composeRefs; exports.entityObjectSchema = _chunkJC3WJK65js.entityObjectSchema; exports.exists = _chunkJC3WJK65js.exists; exports.formatDate = _chunkJC3WJK65js.formatDate; exports.getTableComponents = _chunkJC3WJK65js.getTableComponents; exports.getTableOptions = _chunkJC3WJK65js.getTableOptions; exports.useComposedRefs = _chunkJC3WJK65js.useComposedRefs; exports.useIsMobile = _chunkJC3WJK65js.useIsMobile; exports.userObjectSchema = _chunkJC3WJK65js.userObjectSchema;
+
+
+
+
+
+
+exports.BlockNoteDiffUtil = _chunkLJRD4SRVjs.BlockNoteDiffUtil; exports.BlockNoteWordDiffRendererUtil = _chunkLJRD4SRVjs.BlockNoteWordDiffRendererUtil; exports.TableOptions = _chunkLJRD4SRVjs.TableOptions; exports.cn = _chunkLJRD4SRVjs.cn; exports.composeRefs = _chunkLJRD4SRVjs.composeRefs; exports.entityObjectSchema = _chunkLJRD4SRVjs.entityObjectSchema; exports.exists = _chunkLJRD4SRVjs.exists; exports.formatDate = _chunkLJRD4SRVjs.formatDate; exports.getIcon = _chunkLJRD4SRVjs.getIcon; exports.getIconByModule = _chunkLJRD4SRVjs.getIconByModule; exports.getIconByModuleName = _chunkLJRD4SRVjs.getIconByModuleName; exports.getLucideIcon = _chunkLJRD4SRVjs.getLucideIcon; exports.getLucideIconByModule = _chunkLJRD4SRVjs.getLucideIconByModule; exports.getLucideIconByModuleName = _chunkLJRD4SRVjs.getLucideIconByModuleName; exports.getTableComponents = _chunkLJRD4SRVjs.getTableComponents; exports.getTableOptions = _chunkLJRD4SRVjs.getTableOptions; exports.useComposedRefs = _chunkLJRD4SRVjs.useComposedRefs; exports.useIsMobile = _chunkLJRD4SRVjs.useIsMobile; exports.userObjectSchema = _chunkLJRD4SRVjs.userObjectSchema;
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/home/runner/work/nextjs-jsonapi/nextjs-jsonapi/dist/utils/index.js"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,uDAA6B;AAC7B,gCAA6B;AAC7B;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,6uBAAC","file":"/home/runner/work/nextjs-jsonapi/nextjs-jsonapi/dist/utils/index.js"}
+{"version":3,"sources":["/home/runner/work/nextjs-jsonapi/nextjs-jsonapi/dist/utils/index.js"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,uDAA6B;AAC7B,gCAA6B;AAC7B,gCAA6B;AAC7B,gCAA6B;AAC7B;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,ymCAAC","file":"/home/runner/work/nextjs-jsonapi/nextjs-jsonapi/dist/utils/index.js"}

package/dist/utils/index.mjs

@@ -7,12 +7,20 @@ import {
   entityObjectSchema,
   exists,
   formatDate,
+  getIcon,
+  getIconByModule,
+  getIconByModuleName,
+  getLucideIcon,
+  getLucideIconByModule,
+  getLucideIconByModuleName,
   getTableComponents,
   getTableOptions,
   useComposedRefs,
   useIsMobile,
   userObjectSchema
-} from "../chunk-2LM6LCJW.mjs";
+} from "../chunk-JLN6UWII.mjs";
+import "../chunk-NPPQNSXN.mjs";
+import "../chunk-RBIVEH2K.mjs";
 import "../chunk-PAWJFY3S.mjs";
 export {
   BlockNoteDiffUtil,
@@ -23,6 +31,12 @@ export {
   entityObjectSchema,
   exists,
   formatDate,
+  getIcon,
+  getIconByModule,
+  getIconByModuleName,
+  getLucideIcon,
+  getLucideIconByModule,
+  getLucideIconByModuleName,
   getTableComponents,
   getTableOptions,
   useComposedRefs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carlonicora/nextjs-jsonapi",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "Next.js JSON:API client with server/client support and caching",
   "author": "Carlo Nicora",
   "license": "GPL-3.0-or-later",

package/src/client/index.ts

@@ -10,15 +10,17 @@ export * from "./hooks";
 export * from "./request";
 export * from "./token";
 
-import { useCompanyTableStructure } from "../features/company/hooks";
 // Table generator registration (must be in client-only context)
+import { useCompanyTableStructure } from "../features/company/hooks";
 import { useRoleTableStructure } from "../features/role/hooks";
 import { useUserTableStructure } from "../features/user/hooks";
 import { registerTableGenerator } from "../hooks";
 
+export * from "../features/content/hooks";
 export * from "../features/role/hooks";
 export * from "../features/user/hooks";
 
 registerTableGenerator("roles", useRoleTableStructure);
 registerTableGenerator("users", useUserTableStructure);
 registerTableGenerator("companies", useCompanyTableStructure);
+// Note: Content registration moved to app-level to support app-specific cellTopic

package/src/components/index.ts

@@ -10,6 +10,7 @@ export * from "./tables";
 
 export * from "../features/auth/components";
 export * from "../features/company/components";
+export * from "../features/content/components";
 export * from "../features/feature/components";
 export * from "../features/notification/components";
 export * from "../features/role/components";

package/src/core/registry/ModuleRegistry.ts

@@ -49,6 +49,15 @@ class ModuleRegistryClass {
     }
     throw new Error(`Module not found: ${moduleName}`);
   }
+
+  findByModelName(modelName: string): ModuleWithPermissions {
+    // Direct lookup by registry key (e.g., "Article", "Document")
+    const module = this._modules.get(modelName);
+    if (!module) {
+      throw new Error(`Module not found for model: ${modelName}`);
+    }
+    return module as ModuleWithPermissions;
+  }
 }
 
 export const ModuleRegistry = new ModuleRegistryClass();
@@ -59,6 +68,12 @@ export const Modules = new Proxy({} as ModuleDefinitions, {
     if (prop === "findByName") {
       return (name: string) => ModuleRegistry.findByName(name);
     }
+    if (prop === "findByModelName") {
+      return (name: string) => ModuleRegistry.findByModelName(name);
+    }
     return ModuleRegistry.get(prop as keyof ModuleDefinitions);
   },
-}) as ModuleDefinitions & { findByName: (name: string) => ModuleWithPermissions };
+}) as ModuleDefinitions & {
+  findByName: (name: string) => ModuleWithPermissions;
+  findByModelName: (name: string) => ModuleWithPermissions;
+};

package/src/features/content/components/index.ts

@@ -0,0 +1 @@
+export * from "./lists";

package/src/features/content/components/lists/ContentsList.tsx

@@ -0,0 +1,67 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { Modules } from "../../../../core";
+import { usePageUrlGenerator } from "../../../../hooks";
+import { HoverCard, HoverCardContent, HoverCardTrigger, Link } from "../../../../shadcnui";
+import { getIconByModule } from "../../../../utils";
+import { ContributorsList } from "../../../user/components";
+import { ContentInterface } from "../../data";
+
+type ContentsListProps = {
+  contentList: ContentInterface[];
+};
+
+export function ContentsList({ contentList }: ContentsListProps) {
+  const t = useTranslations();
+
+  return (
+    <div className="flex min-h-0 w-full flex-col overflow-y-auto">
+      <h2 className="text-xl font-semibold">{t(`foundations.content.news`)}</h2>
+      <div className="flex flex-col">
+        {contentList.map((content) => (
+          <ContentsListElement content={content} key={content.id} />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+type ContentsListElementProps = {
+  content: ContentInterface;
+};
+
+function ContentsListElement({ content }: ContentsListElementProps) {
+  const generateUrl = usePageUrlGenerator();
+
+  const contentModule = content.contentType ? Modules.findByModelName(content.contentType) : undefined;
+  const link = contentModule ? generateUrl({ page: contentModule, id: content.id }) : "#";
+
+  return (
+    <div className="hover:bg-muted flex w-full flex-col gap-y-2 border-b p-2 py-4">
+      <div className="flex w-full justify-between gap-x-2">
+        <HoverCard>
+          <HoverCardTrigger asChild>
+            <Link href={link} className="flex w-full items-center justify-start gap-2 font-semibold">
+              {contentModule && getIconByModule({ module: contentModule, className: "h-4 w-4" })}
+              {content.name}
+            </Link>
+          </HoverCardTrigger>
+          <HoverCardContent className="flex max-h-96 w-96 flex-col gap-y-4 overflow-y-auto">
+            <Link href={link} className="font-semibold">
+              {content.name}
+            </Link>
+            <div className="text-xs">{content.abstract}</div>
+          </HoverCardContent>
+        </HoverCard>
+        <ContributorsList content={content} />
+      </div>
+      {/* <div className="text-muted-foreground text-xs">{content.tldr}</div>
+      {content.topics.length > 0 && (
+        <div className="flex w-full items-center justify-between">
+          <TopicBadgesList topics={content.topics} limit={1} />
+        </div>
+      )} */}
+    </div>
+  );
+}

package/src/features/content/components/lists/ContentsListById.tsx

@@ -0,0 +1,30 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { ContentListTable } from "../../../../components";
+import { Modules } from "../../../../core";
+import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
+import { ContentFields, ContentInterface, ContentService } from "../../data";
+
+type ContentsListByIdProps = {
+  contentIds: string[];
+};
+
+export function ContentsListById({ contentIds }: ContentsListByIdProps) {
+  const t = useTranslations();
+
+  const data: DataListRetriever<ContentInterface> = useDataListRetriever({
+    module: Modules.Content,
+    retriever: (params) => ContentService.findMany(params),
+    retrieverParams: { contentIds: contentIds },
+  });
+
+  return (
+    <ContentListTable
+      data={data}
+      fields={[ContentFields.name, ContentFields.authors, ContentFields.updatedAt]}
+      tableGeneratorType={Modules.Content}
+      title={t(`generic.relevant`)}
+    />
+  );
+}

package/src/features/content/components/lists/RelevantContentsList.tsx

@@ -0,0 +1,30 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { ContentListTable } from "../../../../components";
+import { Modules } from "../../../../core";
+import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
+import { ContentFields, ContentInterface, ContentService } from "../../data";
+
+type RelevantContentsListProps = {
+  id: string;
+};
+
+export function RelevantContentsList({ id }: RelevantContentsListProps) {
+  const t = useTranslations();
+
+  const data: DataListRetriever<ContentInterface> = useDataListRetriever({
+    module: Modules.Content,
+    retriever: (params) => ContentService.findRelevant(params),
+    retrieverParams: { id: id },
+  });
+
+  return (
+    <ContentListTable
+      data={data}
+      fields={[ContentFields.name, ContentFields.authors, ContentFields.relevance, ContentFields.updatedAt]}
+      tableGeneratorType={Modules.Content}
+      title={t(`generic.relevant`)}
+    />
+  );
+}

package/src/features/content/components/lists/index.ts

@@ -0,0 +1,3 @@
+export * from "./ContentsList";
+export * from "./ContentsListById";
+export * from "./RelevantContentsList";

package/src/features/content/data/content.fields.ts

@@ -5,8 +5,6 @@ export enum ContentFields {
   relevance = "relevance",
 
   authors = "authors",
-  topic = "topic",
-  expertise = "expertise",
 
   createdAt = "createdAt",
   updatedAt = "updatedAt",

package/src/features/content/hooks/index.ts

@@ -0,0 +1 @@
+export * from "./useContentTableStructure";

package/src/features/content/hooks/useContentTableStructure.tsx

@@ -0,0 +1,132 @@
+"use client";
+
+import { ColumnDef } from "@tanstack/react-table";
+import { useTranslations } from "next-intl";
+import { useMemo } from "react";
+import { cellDate, cellId, ContributorsList } from "../../../components";
+import { Modules } from "../../../core";
+import { TableContent, usePageUrlGenerator, UseTableStructureHook } from "../../../hooks";
+import { Link, Tooltip, TooltipContent, TooltipTrigger } from "../../../shadcnui";
+import { getIconByModule } from "../../../utils";
+import { ContentFields, ContentInterface } from "../data";
+
+export const useContentTableStructure = <U extends string = ContentFields>(
+  params: Parameters<UseTableStructureHook<ContentInterface, U>>[0],
+): ReturnType<UseTableStructureHook<ContentInterface, U>> => {
+  const t = useTranslations();
+  const generateUrl = usePageUrlGenerator();
+
+  const tableData = useMemo(() => {
+    return params.data.map((content: ContentInterface) => {
+      const entry: TableContent<ContentInterface> = {
+        jsonApiData: content,
+      };
+      entry[ContentFields.contentId] = content.id;
+      params.fields.forEach((field) => {
+        entry[field as string] = content[field as keyof ContentInterface];
+      });
+      return entry;
+    });
+  }, [params.data, params.fields]);
+
+  const fieldColumnMap: Partial<Record<string, () => any>> = {
+    [ContentFields.contentId]: () =>
+      cellId({
+        name: "contentId",
+        checkedIds: params.checkedIds,
+        toggleId: params.toggleId,
+      }),
+    [ContentFields.name]: () => ({
+      id: "name",
+      accessorKey: "name",
+      header: t(`foundations.content.fields.name.label`),
+      cell: ({ row }: { row: TableContent<ContentInterface> }) => {
+        const content: ContentInterface = row.original.jsonApiData;
+
+        const contentModule = content.contentType ? Modules.findByModelName(content.contentType) : undefined;
+        const link = contentModule ? generateUrl({ page: contentModule, id: content.id }) : "#";
+
+        return (
+          <Tooltip>
+            <TooltipTrigger className="flex items-center justify-start space-x-2">
+              <>
+                {contentModule && getIconByModule({ module: contentModule, className: "h-4 w-4" })}
+                <Link href={link}>{content.name}</Link>
+              </>
+            </TooltipTrigger>
+            <TooltipContent>{content.tldr}</TooltipContent>
+          </Tooltip>
+        );
+      },
+      enableSorting: false,
+      enableHiding: false,
+    }),
+    [ContentFields.relevance]: () => ({
+      id: "relevance",
+      accessorKey: "relevance",
+      header: t(`generic.relevance`),
+      cell: ({ row }: { row: TableContent<ContentInterface> }) => {
+        const content: ContentInterface = row.original.jsonApiData;
+
+        if (!content.relevance) return <></>;
+
+        const response = `${content.relevance.toFixed(0)}%`;
+
+        return (
+          <div className="relative flex h-5 w-20 items-center justify-center overflow-hidden rounded border text-center">
+            <div
+              className={`bg-accent absolute top-0 left-0 h-full opacity-${Math.round(content.relevance)}`}
+              style={{ width: `${content.relevance}%` }}
+            ></div>
+            <span
+              className={`relative text-xs ${content.relevance < 40 ? "text-muted-foreground" : "text-accent-foreground font-semibold"}`}
+            >
+              {response}
+            </span>
+          </div>
+        );
+      },
+      enableSorting: false,
+      enableHiding: false,
+    }),
+    [ContentFields.authors]: () => ({
+      id: "authors",
+      accessorKey: "authors",
+      header: t(`generic.relationships.author.label`),
+      cell: ({ row }: { row: TableContent<ContentInterface> }) => {
+        const content: ContentInterface = row.original.jsonApiData;
+        return <ContributorsList content={content} />;
+      },
+      enableSorting: false,
+      enableHiding: false,
+    }),
+    [ContentFields.createdAt]: () =>
+      cellDate({
+        name: "createdAt",
+        title: t(`generic.date.create`),
+      }),
+    [ContentFields.updatedAt]: () =>
+      cellDate({
+        name: "updatedAt",
+        title: t(`generic.date.update`),
+      }),
+  };
+
+  const columns = useMemo(() => {
+    return params.fields
+      .map((field) => {
+        // First check local fieldColumnMap
+        const localHandler = fieldColumnMap[field];
+        if (localHandler) return localHandler();
+
+        // Fallback to customCells from context
+        const customHandler = params.context?.customCells?.[field];
+        if (customHandler) return customHandler({ t });
+
+        return undefined;
+      })
+      .filter((col) => col !== undefined) as ColumnDef<TableContent<ContentInterface>>[];
+  }, [params.fields, fieldColumnMap, t, generateUrl, params.context?.customCells]);
+
+  return useMemo(() => ({ data: tableData, columns: columns }), [tableData, columns]);
+};

package/src/permissions/types.ts

@@ -1,3 +1,4 @@
+import { LucideIcon } from "lucide-react";
 import { ApiRequestDataTypeInterface } from "../core/interfaces/ApiRequestDataTypeInterface";
 import { FieldSelector } from "../core/fields/FieldSelector";
 
@@ -80,6 +81,7 @@ export type ModuleWithPermissions = ApiRequestDataTypeInterface & {
   pageUrl?: string;
   feature?: string;
   moduleId?: string;
+  icon?: LucideIcon;
   inclusions?: Record<
     string,
     {
@@ -99,6 +101,7 @@ export type ModuleFactory = (params: {
   model: any;
   feature?: string;
   moduleId?: string;
+  icon?: LucideIcon;
   inclusions?: Record<
     string,
     {

package/src/utils/icons.tsx

@@ -0,0 +1,40 @@
+import { LucideIcon } from "lucide-react";
+import { ReactNode } from "react";
+import { ApiDataInterface, Modules } from "../core";
+import { ContentInterface } from "../features/content/data/content.interface";
+import { ModuleWithPermissions } from "../permissions";
+import { cn } from "./cn";
+
+export const getIconByModule = (params: { module: ModuleWithPermissions; className?: string }): ReactNode => {
+  const IconComponent = getLucideIconByModule({ module: params.module });
+  if (!IconComponent) return null;
+  return <IconComponent className={cn(``, params.className)} />;
+};
+
+export const getIcon = (params: { element: ApiDataInterface; className?: string }): ReactNode => {
+  const IconComponent = getLucideIcon({ element: params.element });
+  if (!IconComponent) return null;
+  return <IconComponent className={cn(``, params.className)} />;
+};
+
+export const getIconByModuleName = (params: { name: string; className?: string }): ReactNode => {
+  return getIconByModule({ module: Modules.findByModelName(params.name), className: params.className });
+};
+
+export const getLucideIcon = (params: { element: ApiDataInterface }): LucideIcon | null => {
+  if (params.element.type === "contents") {
+    const contentType = (params.element as ContentInterface).contentType;
+    if (!contentType) return null;
+    return getLucideIconByModule({ module: Modules.findByModelName(contentType) });
+  }
+
+  return getLucideIconByModule({ module: Modules.findByName(params.element.type) });
+};
+
+export const getLucideIconByModule = (params: { module: ModuleWithPermissions }): LucideIcon | null => {
+  return params.module.icon ?? null;
+};
+
+export const getLucideIconByModuleName = (params: { name: string }): LucideIcon | null => {
+  return getLucideIconByModule({ module: Modules.findByModelName(params.name) });
+};

package/src/utils/index.ts

@@ -13,3 +13,4 @@ export { entityObjectSchema, userObjectSchema, type EntityObject, type UserObjec
 
 export * from "./blocknote-diff.util";
 export * from "./blocknote-word-diff-renderer.util";
+export * from "./icons";