@tulip-systems/core 0.5.3 → 0.5.4

package/dist/modules/storage/lib/router.server.mjs

@@ -1,5 +1,5 @@
-import { isFolder } from "./helpers.mjs";
 import { ServerError } from "../../router/lib/error.server.mjs";
+import { isFolder } from "./helpers.mjs";
 import { bulkActionSchema } from "../../router/lib/validators.mjs";
 import { initRPC } from "../../router/handler/init.server.mjs";
 import { nodes } from "./schema.mjs";

package/dist/modules/storage/lib/schema.mjs

@@ -1,6 +1,6 @@
-import { nodeSubtypes } from "./helpers.mjs";
 import { baseColumns } from "../../config/db/helpers.mjs";
 import { users } from "../../auth/db/schema.mjs";
+import { nodeSubtypes } from "./helpers.mjs";
 import { imageDispositions, imageVariants } from "./constants.mjs";
 import { boolean, pgEnum, pgTable, unique } from "drizzle-orm/pg-core";
 import { relations } from "drizzle-orm";

package/dist/modules/storage/lib/service.server.d.mts

@@ -91,20 +91,20 @@ declare class StorageService<TSchema extends TDatabaseSchema> {
    * Upload file to S3 and add it to the database
    **/
   uploadFile(input: UploadFileSchema & Pick<PutObjectInput, "body">): Promise<{
+    size: number | null;
+    id: string;
     name: string;
-    namespace: string;
     type: "file" | "folder" | null;
+    hidden: boolean | null;
     mode: "private" | "public" | null;
+    isPending: boolean;
+    namespace: string;
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
-    size: number | null;
     contentType: string | null;
     readonly: boolean | null;
-    hidden: boolean | null;
-    id: string;
     createdAt: Date;
     updatedAt: Date;
     createdBy: string | null;
-    isPending: boolean;
     isDeleted: boolean;
     orphanedAt: Date | null;
     parentId: string | null;
@@ -116,20 +116,20 @@ declare class StorageService<TSchema extends TDatabaseSchema> {
     id: string;
     presignedUrl: string;
     node: {
+      size: number | null;
+      id: string;
       name: string;
-      namespace: string;
       type: "file" | "folder" | null;
+      hidden: boolean | null;
       mode: "private" | "public" | null;
+      isPending: boolean;
+      namespace: string;
       subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
-      size: number | null;
       contentType: string | null;
       readonly: boolean | null;
-      hidden: boolean | null;
-      id: string;
       createdAt: Date;
       updatedAt: Date;
       createdBy: string | null;
-      isPending: boolean;
       isDeleted: boolean;
       orphanedAt: Date | null;
       parentId: string | null;
@@ -151,20 +151,20 @@ declare class StorageService<TSchema extends TDatabaseSchema> {
    * Create a new folder
    */
   createFolder(input: CreateFolderNodeSchema): Promise<{
+    size: number | null;
+    id: string;
     name: string;
-    namespace: string;
     type: "file" | "folder" | null;
+    hidden: boolean | null;
     mode: "private" | "public" | null;
+    isPending: boolean;
+    namespace: string;
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
-    size: number | null;
     contentType: string | null;
     readonly: boolean | null;
-    hidden: boolean | null;
-    id: string;
     createdAt: Date;
     updatedAt: Date;
     createdBy: string | null;
-    isPending: boolean;
     isDeleted: boolean;
     orphanedAt: Date | null;
     parentId: string | null;

package/dist/modules/storage/lib/service.server.mjs

@@ -1,7 +1,7 @@
-import { getDriveBucketKey, inferNodeSubtype, isFile, isFolder } from "./helpers.mjs";
+import { ServerError } from "../../router/lib/error.server.mjs";
 import { generateDefaultUUID } from "../../config/db/helpers.mjs";
 import { BUCKET_NAME } from "../../../lib/config/constants.mjs";
-import { ServerError } from "../../router/lib/error.server.mjs";
+import { getDriveBucketKey, inferNodeSubtype, isFile, isFolder } from "./helpers.mjs";
 import { convertSearchToQueryParams } from "../../data-tables/lib/converters/search.mjs";
 import { convertOrderByToQueryParams } from "../../data-tables/lib/converters/sorting.mjs";
 import { deviceSizes } from "./constants.mjs";

package/dist/modules/storage/lib/validators.d.mts

@@ -1285,19 +1285,19 @@ type NodesTableFilters = z$1.input<typeof nodesTableFiltersSchema>;
  * Create folder node
  */
 declare const createFolderNodeSchema: z$1.ZodObject<{
+  id: z$1.ZodOptional<z$1.ZodUUID>;
   name: z$1.ZodString;
-  namespace: z$1.ZodString;
+  hidden: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
   mode: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodEnum<{
     private: "private";
     public: "public";
   }>>>;
+  isPending: z$1.ZodOptional<z$1.ZodBoolean>;
+  namespace: z$1.ZodString;
   readonly: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
-  hidden: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
-  id: z$1.ZodOptional<z$1.ZodUUID>;
   createdAt: z$1.ZodOptional<z$1.ZodDate>;
   updatedAt: z$1.ZodOptional<z$1.ZodDate>;
   createdBy: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodUUID>>;
-  isPending: z$1.ZodOptional<z$1.ZodBoolean>;
   isDeleted: z$1.ZodOptional<z$1.ZodBoolean>;
   orphanedAt: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodDate>>;
   parentId: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodUUID>>;
@@ -1310,12 +1310,16 @@ type CreateFolderNodeSchema = z$1.infer<typeof createFolderNodeSchema>;
  * Upload file schema
  */
 declare const uploadFileSchema: z$1.ZodObject<{
+  size: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodInt>>;
+  id: z$1.ZodOptional<z$1.ZodUUID>;
   name: z$1.ZodString;
-  namespace: z$1.ZodString;
+  hidden: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
   mode: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodEnum<{
     private: "private";
     public: "public";
   }>>>;
+  isPending: z$1.ZodOptional<z$1.ZodBoolean>;
+  namespace: z$1.ZodString;
   subtype: z$1.ZodOptional<z$1.ZodEnum<{
     image: "image";
     document: "document";
@@ -1325,15 +1329,11 @@ declare const uploadFileSchema: z$1.ZodObject<{
     archive: "archive";
     other: "other";
   }>>;
-  size: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodInt>>;
   contentType: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
   readonly: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
-  hidden: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
-  id: z$1.ZodOptional<z$1.ZodUUID>;
   createdAt: z$1.ZodOptional<z$1.ZodDate>;
   updatedAt: z$1.ZodOptional<z$1.ZodDate>;
   createdBy: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodUUID>>;
-  isPending: z$1.ZodOptional<z$1.ZodBoolean>;
   isDeleted: z$1.ZodOptional<z$1.ZodBoolean>;
   orphanedAt: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodDate>>;
   parentId: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodUUID>>;
@@ -1346,12 +1346,15 @@ type UploadFileSchema = z$1.infer<typeof uploadFileSchema>;
  * Presign file schema
  */
 declare const presignFileSchema: z$1.ZodObject<{
+  size: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodInt>>;
   name: z$1.ZodString;
-  namespace: z$1.ZodString;
+  hidden: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
   mode: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodEnum<{
     private: "private";
     public: "public";
   }>>>;
+  isPending: z$1.ZodOptional<z$1.ZodBoolean>;
+  namespace: z$1.ZodString;
   subtype: z$1.ZodOptional<z$1.ZodEnum<{
     image: "image";
     document: "document";
@@ -1361,14 +1364,11 @@ declare const presignFileSchema: z$1.ZodObject<{
     archive: "archive";
     other: "other";
   }>>;
-  size: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodInt>>;
   contentType: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
   readonly: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
-  hidden: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodBoolean>>;
   createdAt: z$1.ZodOptional<z$1.ZodDate>;
   updatedAt: z$1.ZodOptional<z$1.ZodDate>;
   createdBy: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodUUID>>;
-  isPending: z$1.ZodOptional<z$1.ZodBoolean>;
   isDeleted: z$1.ZodOptional<z$1.ZodBoolean>;
   orphanedAt: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodDate>>;
   parentId: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodUUID>>;
@@ -1401,8 +1401,8 @@ type GetFileURLSchema = z$1.infer<typeof getFileURLSchema>;
  * Get by parent id input
  */
 declare const getNodesByParentIdSchema: z$1.ZodObject<{
-  sort: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
   search: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
+  sort: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
   order: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodEnum<{
     asc: "asc";
     desc: "desc";

package/dist/modules/storage/lib/validators.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.mts","names":[],"sources":["../../../../src/modules/storage/lib/validators.ts"],"sourcesContent":[],"mappings":"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"}
+{"version":3,"file":"validators.d.mts","names":[],"sources":["../../../../src/modules/storage/lib/validators.ts"],"sourcesContent":[],"mappings":";;;;;;;;;;KAYY,IAAA,UAAc,KAAA,CAAM;AAApB,KACA,QAAA,GADI,OACc,KAAA,CAAM,YADQ,GAAA;EAChC,IAAA,EAAA,MAAQ;AACpB,CAAA;AAKa,KALD,UAAA,GAKiD,OAL7B,KAAA,CAAM,YAKX,GAAA;EACf,IAAA,EAAA,QAAQ;AAKpB,CAAA;;;;cANa,gBAAc,GAAA,CAAA;;;;KACf,QAAA,GAAW,GAAA,CAAE,aAAa;;;;cAKzB,+BAAgB;QAE3B,oBAAA,CAAA;;;;;;;;;gBAF2B,EAAA,KAAA;IAAA,eAAA,EAAA,KAAA;IAIjB,iBAAe,EAAA,KAAA;IACf,UAAA,EAAA,CAAA,MAAgB,EAAA,GAAA,MAAkB,EAAA,CAAA;IAKjC,UAAA,EAAA,KAA4C;IAAA,QAAA,EAAA,SAAA;;;;;;;;;;;;;;;;;;;;qCAA5B,CAAA;IAAA,IAAA,EAAA,MAAA;IAEjB,SAAA,EAAA,OAAe;IACf,QAAA,EAAA,QAAgB;IAKf,UAAA,EAAA,cAA4C;IAAA,IAAA,EAAA,MAAA,GAAA,QAAA;;;;;;;;;;;;;;;;;;;;cAA5B,EAAA,IAAA;IAAA,YAAA,EAAA,KAAA;IAChB,eAAA,EAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAA4B,UAAA,EAAA,KAAA;IAAA,YAAA,EAAA,KAAA;IAI7B,eAAgB,EAAA,KAAA;IAChB,iBAAA,EAAA,KAAA;IAKC,UAAA,EAAA,CAAA,MAAA,EAAA,GAWR,MAAA,EAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;IAX+B,SAAA,EAAA,SAAA;;EAAA,MAAA,+BAAA,CAAA;IAAA,IAAA,EAAA,QAAA;IAaxB,SAAA,EAAA,OAAiB;IAKhB,QAAA,EAAA,SAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAsB,SAAA,+BAAA,CAAA;IAAA,IAAA,EAAA,WAAA;IAOvB,SAAA,EAAA,OAAA;IAKC,QAAA,EAAA,SAAwD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAxC,UAAA,EAAA,KAAA;IAAA,YAAA,EAAA,KAAA;IAEjB,eAAgB,EAAA,KAAA;IAKf,iBAA6D,EAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAA5C,SAAA,EAAA,SAAA;EAAA,CAAA,EAAA,CAAA,CAAA,EAAA,CAAA,CAAA,CAAA;EAElB,SAAA,+BAAmC,CAAA;IAKlC,IAAA,EAAA,WAAA;IAEA,SAAA,EAAA,OAGX;;;;;;;;IAH2B,eAAA,EAAA,KAAA;IAAA,iBAAA,EAAA,KAAA;IAKjB,UAAA,EAAA,SAAe;IACf,UAAA,EAAA,KAAgB;IAKf,QAAA,EAAA,SAAA;;;;;;;;;;;;;;;;;;;;;;;KAlFD,eAAA,GAAkB,GAAA,CAAE,aAAa;KACjC,gBAAA,GAAmB,GAAA,CAAE,aAAa;;;;cAKjC,+BAAgB;QAA4B,oBAAA,CAAA;;;;;;IA4EpB,WAAA,EAAA,MAAA;IAAA,OAAA,EAAA,IAAA;IAIzB,UAAA,EAAA,KAAA;IAKC,YAAA,EAIX,KAAA;;;;;;;;;IAJ0B,IAAA,EAAA,WAAA;IAAA,SAAA,EAAA,OAAA;IAMhB,QAAA,EAAA,QAAc;IACd,UAAA,EAAA,QAAe;IAKd,IAAA,EAAA,MAAA;;;;;;;;;;;;;;;;;IAAe,IAAA,EAAA,MAAA,GAAA,QAAA;IAAA,WAAA,EAAA,MAAA;IAShB,OAAA,EAAA,KAAc;IAAkB,UAAA,EAAA,KAAA;IAAb,YAAA,EAAA,KAAA;IACtB,eAAA,EAAA,KAAA;IAAqB,iBAAA,EAAA,KAAA;IAGlB,UAAA,EAAA,CAAA,MAAe,EAAA,QAAkB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA5GjC,eAAA,GAAkB,GAAA,CAAE,aAAa;KACjC,gBAAA,GAAmB,GAAA,CAAE,aAAa;;;;cAKjC,+BAAgB;QAA4B,oBAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAC5C,8BAA4B,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAI7B,gBAAA,GAAmB,GAAA,CAAE,aAAa;KAClC,4BAAA,GAA+B,GAAA,CAAE,aAAa;;;;cAK7C,yBAAuB,GAAA,CAAA,QAAA,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAaxB,iBAAA,GAAoB,GAAA,CAAE,aAAa;;;;cAKlC,wBAAsB,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;KAOvB,sBAAA,GAAyB,GAAA,CAAE,aAAa;;;;cAKvC,kBAAgB,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAEjB,gBAAA,GAAmB,GAAA,CAAE,aAAa;;;;cAKjC,mBAAiB,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAElB,iBAAA,GAAoB,GAAA,CAAE,aAAa;;;;cAKlC;;;;cAEA,kBAAgB,GAAA,CAAA;;;;;;;;;;KAKjB,eAAA,GAAkB,GAAA,CAAE,aAAa;KACjC,gBAAA,GAAmB,GAAA,CAAE,aAAa;;;;cAKjC,0BAAwB,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAIzB,uBAAA,GAA0B,GAAA,CAAE,aAAa;;;;cAKxC,iBAAe,GAAA,CAAA;;;;;;;;KAMhB,cAAA,GAAiB,GAAA,CAAE,aAAa;KAChC,eAAA,GAAkB,GAAA,CAAE,aAAa;;;;cAKhC,iBAAe,GAAA,CAAA;;;;;;;;;;;KAShB,cAAA,GAAiB,GAAA,CAAE,aAAa;SACnC;;KAGG,eAAA,GAAkB,GAAA,CAAE,aAAa"}

package/dist/router/server.mjs

@@ -1,5 +1,5 @@
-import { HydrateClient, getQueryClient } from "../modules/router/lib/query-client.server.mjs";
 import { ServerError } from "../modules/router/lib/error.server.mjs";
+import { HydrateClient, getQueryClient } from "../modules/router/lib/query-client.server.mjs";
 import { createRPCCaller } from "../modules/router/handler/caller.server.mjs";
 import { createRPCContext } from "../modules/router/handler/context.server.mjs";
 import { initRPC } from "../modules/router/handler/init.server.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tulip-systems/core",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",

package/src/components/editor/extensions/file-handler/utils.ts

@@ -7,7 +7,7 @@
  * @example
  * const imageCounts = collectImageIds(editorDoc);
  * imageCounts.forEach((count, imageId) => {
- *   console.log(`Image ${imageId} appears ${count} times`);
+ *   console.info(`Image ${imageId} appears ${count} times`);
  * });
  */
 export function collectImageIds(doc: any): Map<string, number> {

package/src/components/editor/extensions/image/extension.ts

@@ -45,8 +45,6 @@ export const Image = TiptapImage.extend<ImageOptions>({
   renderHTML({ HTMLAttributes }) {
     const { src: _, ...attrs } = HTMLAttributes;
 
-    console.log("attrs", attrs);
-
     const nodeId = attrs.nodeId as string | null;
     const isPending = Boolean(attrs.isPending);
 

package/src/components/editor/lib/helpers.ts

@@ -1,17 +1,53 @@
+import Blockquote from "@tiptap/extension-blockquote";
+import Bold from "@tiptap/extension-bold";
+import Document from "@tiptap/extension-document";
+import HardBreak from "@tiptap/extension-hard-break";
+import Heading from "@tiptap/extension-heading";
+import HorizontalRule from "@tiptap/extension-horizontal-rule";
+import Italic from "@tiptap/extension-italic";
+import Link from "@tiptap/extension-link";
+import { BulletList, ListItem, ListKeymap, OrderedList } from "@tiptap/extension-list";
+import Paragraph from "@tiptap/extension-paragraph";
+import Strike from "@tiptap/extension-strike";
+import Text from "@tiptap/extension-text";
+import Underline from "@tiptap/extension-underline";
+import { Dropcursor, Gapcursor, TrailingNode, UndoRedo } from "@tiptap/extensions";
 import { generateHTML, generateJSON } from "@tiptap/html";
-import { EDITOR_EXTENSIONS_VALUES } from "./constants";
 import { EditorJSONContent } from "./types";
 
+const EXTENSIONS_FOR_GENERATION = [
+  Blockquote,
+  BulletList,
+  Document,
+  HardBreak,
+  Heading,
+  HorizontalRule,
+  ListItem,
+  OrderedList,
+  Paragraph,
+  Text,
+  Bold,
+  Italic,
+  Link,
+  Strike,
+  Underline,
+  Dropcursor,
+  Gapcursor,
+  UndoRedo,
+  ListKeymap,
+  TrailingNode,
+];
+
 /**
  * Convert text to editor content
  */
 export function convertHTMLToEditorContent(html: string): EditorJSONContent {
-  return generateJSON(html, EDITOR_EXTENSIONS_VALUES);
+  return generateJSON(html, EXTENSIONS_FOR_GENERATION);
 }
 
 /**
  * Convert editor content to text
  */
 export function convertEditorContentToHTML(content: EditorJSONContent): string {
-  return generateHTML(content, EDITOR_EXTENSIONS_VALUES);
+  return generateHTML(content, EXTENSIONS_FOR_GENERATION);
 }

package/src/components/entry.ts

@@ -12,7 +12,9 @@ export * from "./editor/lib/types";
  */
 export * from "./layouts/admin-loading";
 export * from "./layouts/empty-page";
+export * from "./layouts/error-page";
 export * from "./layouts/list-layout";
+export * from "./layouts/not-allowed-page";
 export * from "./layouts/not-found-page";
 export * from "./layouts/root-loading";
 export * from "./layouts/tab-layout";

package/src/components/layouts/error-page.tsx

@@ -0,0 +1,61 @@
+import { cn } from "@/lib/utils/cn";
+import { ServerError } from "@/modules/router/lib/error.server";
+import { CommonORPCErrorCode } from "@orpc/client";
+import { BugIcon } from "lucide-react";
+import { ComponentProps } from "react";
+import { NotAllowedPage } from "./not-allowed-page";
+import { NotFoundSection } from "./not-found-section";
+
+/**
+ * ErrorPage
+ */
+export function ErrorPage({ className, ...props }: ComponentProps<"div">) {
+  return (
+    <div {...props} className={cn("relative z-0 grid h-dvh w-full place-items-center", className)}>
+      <div className="flex flex-col items-center gap-12 text-center">
+        <span className="text-destructive flex flex-col items-center gap-2">
+          <BugIcon className="size-20 xl:size-32" />
+          <h1 className="text-2xl font-bold lg:text-3xl">Oeps, er is iets fout gegaan.</h1>
+        </span>
+      </div>
+    </div>
+  );
+}
+
+/**
+ * ErrorPage
+ * - If the error is a ServerError and the code is "UNAUTHORIZED", show the NotAllowedPage
+ * - If the error is a ServerError and the code is "NOT_FOUND", show the NotFoundSection
+ * - Else show the ErrorPage
+ */
+export function AdminErrorPage(props: { error: Error }) {
+  const serverErrorCode: CommonORPCErrorCode =
+    props.error instanceof ServerError ? props.error.code : undefined;
+
+  /**
+   * If the error is a ServerError and the code is "UNAUTHORIZED", show the NotAllowedPage
+   */
+  if (serverErrorCode === "UNAUTHORIZED") {
+    return (
+      <div className="p-content h-dvh">
+        <NotAllowedPage className="h-full" />
+      </div>
+    );
+  }
+
+  /**
+   * If the error is a ServerError and the code is "UNAUTHORIZED", show the NotAllowedPage
+   */
+  if (serverErrorCode === "NOT_FOUND") {
+    return (
+      <div className="relative z-0 grid h-dvh w-full place-items-center">
+        <NotFoundSection href="/admin" />
+      </div>
+    );
+  }
+
+  /**
+   * Else show the ErrorPage
+   */
+  return <ErrorPage />;
+}

package/src/components/layouts/not-allowed-page.tsx

@@ -14,7 +14,7 @@ export type NotAllowedPageProps = HTMLAttributes<HTMLDivElement> & {
   };
 };
 
-export default function NotAllowedPage({
+export function NotAllowedPage({
   title,
   description,
   callToAction,

package/src/components/navigation/admin-sidebar-paths.client.tsx

@@ -51,8 +51,24 @@ export function Paths({ children, ...props }: React.ComponentProps<typeof Sideba
 /**
  * Path Group
  */
-export function PathGroup(props: React.ComponentProps<"div">) {
-  return <SidebarGroup {...props} />;
+export type PathGroupProps = React.ComponentProps<"div"> & {
+  /**
+   * Permission to check with the any strategy for displaying the group
+   * @example { project: ["view", "create"], client: ["view"], drive: ["view"] }
+   */
+  permission?: Permission[];
+};
+
+export function PathGroup({ permission, ...props }: PathGroupProps) {
+  if (!permission) {
+    return <SidebarGroup {...props} />;
+  }
+
+  return (
+    <Allowed permission={permission} strategy="any">
+      <SidebarGroup {...props} />
+    </Allowed>
+  );
 }
 
 /**

package/src/components/ui/tooltip.client.tsx

@@ -48,7 +48,7 @@ function TooltipContent({
         {...props}
       >
         {children}
-        <TooltipPrimitive.Arrow className="bg-primary fill-primary z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]" />
+        <TooltipPrimitive.Arrow className="bg-primary fill-primary z-50 size-2.5 translate-y-[calc(-50%-2px)] rotate-45 rounded-[2px]" />
       </TooltipPrimitive.Content>
     </TooltipPrimitive.Portal>
   );

package/src/modules/auth/components/allowed.client.tsx

@@ -1,20 +1,48 @@
 "use client";
 
 import { JSX } from "react";
-import { usePermission } from "../hooks/use-permission";
-import { type Permission } from "../lib/permissions";
+import { usePermission, UsePermissionProps } from "../hooks/use-permission";
 
 /**
- * Allowed
+ * Allowed types
  */
-type AllowedProps = {
-  permission: Permission;
+export type AllowedStrategy = "all" | "any";
+
+/**
+ * Allowed props
+ */
+export type AllowedProps = UsePermissionProps & {
+  // /**
+  //  * Permission to check
+  //  * @example { project: ["view", "create"] }
+  //  */
+  // permission: Permission;
+
+  // /**
+  //  * Strategy to use when checking multiple permissions
+  //  * - "all": all permissions must be allowed
+  //  * - "any": at least one permission must be allowed
+  //  * @default "all"
+  //  */
+  // strategy?: AllowedStrategy;
+
+  /**
+   * Fallback component to render if the user doesn't have the permission
+   * @default null
+   */
   fallback?: JSX.Element | string;
+
+  /**
+   * Children to render if the user has the permission
+   */
   children: React.ReactNode;
 };
 
-export function Allowed({ permission, fallback, children }: AllowedProps) {
-  const { data } = usePermission(permission);
+/**
+ * Allowed
+ */
+export function Allowed({ permission, strategy, fallback, children }: AllowedProps) {
+  const { data } = usePermission({ permission, strategy } as UsePermissionProps);
 
   if (data?.success) return <>{children}</>;
 

package/src/modules/auth/hooks/use-permission.ts

@@ -1,6 +1,6 @@
 "use client";
 
-import { useSuspenseQueries } from "@tanstack/react-query";
+import { useSuspenseQueries, useSuspenseQuery } from "@tanstack/react-query";
 import { authClient } from "../handler/client.client";
 import { type Permission } from "../lib/permissions";
 import { useSession } from "./use-session";
@@ -8,7 +8,93 @@ import { useSession } from "./use-session";
 /**
  * UsePermission
  */
-export function usePermission(permission?: Permission) {
+export type UsePermissionProps =
+  | {
+      /**
+       * Strategy to use when checking multiple permissions
+       * - "all": all permissions must be allowed
+       * - "any": at least one permission must be allowed
+       * @default "all"
+       */
+      strategy?: "all";
+
+      /**
+       * Permission to check
+       * @example { project: ["view", "create"] }
+       */
+      permission?: Permission;
+    }
+  | {
+      /**
+       * Strategy to use when checking multiple permissions
+       * - "all": all permissions must be allowed
+       * - "any": at least one permission must be allowed
+       * @default "all"
+       */
+      strategy?: "any";
+
+      /**
+       * Permission to check
+       * @example [{ project: ["view", "create"] }, { client: ["view"] }, { drive: ["view"] }]
+       */
+      permission?: Permission[];
+    };
+
+export function usePermission({ permission, strategy = "all" }: UsePermissionProps) {
+  const sessionQuery = useSession();
+
+  return useSuspenseQuery({
+    queryKey: ["permission", { permission, strategy }],
+    queryFn: async () => {
+      // If no permission is provided, allow by default
+      if (!permission) return { permission, success: true };
+
+      // If no user is logged in, deny by default
+      if (!sessionQuery.data) return { permission, success: false };
+      const userId = sessionQuery.data?.user.id;
+      if (!userId) return { permission, success: false };
+
+      // If the strategy is "any", check if the user has any of the permissions
+      const permissions = Array.isArray(permission) ? permission : [permission];
+
+      // Check if the user has the permission
+      const results = await Promise.all(
+        permissions.map((permission) => authClient.admin.hasPermission({ permission, userId })),
+      );
+
+      const data = results.map(({ data }) => data).filter((data) => !!data);
+      const errors = results.filter(({ error }) => !!error).map(({ error }) => error);
+
+      // If there is an error, log it and return false
+      if (errors.length > 0) {
+        console.error(...errors);
+        return { permission, success: false };
+      }
+
+      // Determine if the user has the permission based on the strategy
+      const success =
+        strategy === "all"
+          ? data.every(({ success }) => success)
+          : data.some(({ success }) => success);
+
+      // Return the result
+      return {
+        permission,
+        success,
+      };
+    },
+    staleTime: 5 * 60 * 1000, // 5 minutes
+  });
+}
+
+/**
+ * Check multiple permissions in parallel
+ * @param permission
+ * @param strategy
+ * @returns
+ * @deprecated Use `usePermission` with strategy "any" or "all" instead
+ */
+export function usePermissions(permission?: Permission) {
   const sessionQuery = useSession();
 
   const keys = Object.entries(permission ?? {}).flatMap(([resource, permissions]) =>

package/src/modules/commands/hooks/use-command-menu.client.tsx

@@ -1,8 +1,5 @@
 "use client";
 
-import { Permission } from "@/modules/auth/entry";
-import { usePermission } from "@/modules/auth/hooks/use-permission";
-import { mergePermissions } from "@/modules/auth/lib/utils";
 import {
   type BulkCommandDefRenderParams,
   type CommandDef,
@@ -115,8 +112,8 @@ export function useSingleCommandMenu<TData, TMeta>({
   commands,
   meta,
 }: SingleCommandMenuProps<TData, TMeta> & { data: TData }) {
-  const permissions = commands.map((command) => command.permission).filter(Boolean) as Permission[];
-  usePermission(mergePermissions(permissions));
+  // const permissions = commands.map((command) => command.permission).filter(Boolean) as Permission[];
+  // usePermission(mergePermissions(permissions));
 
   // filter out commands that don't have valid conditions
   const validCommands = commands.filter((command) =>
@@ -142,8 +139,8 @@ export function useBulkCommandMenu<TData, TMeta>({
   commands,
   meta,
 }: BulkCommandMenuProps<TData, TMeta>) {
-  const permissions = commands.map((command) => command.permission).filter(Boolean) as Permission[];
-  usePermission(mergePermissions(permissions));
+  // const permissions = commands.map((command) => command.permission).filter(Boolean) as Permission[];
+  // usePermission(mergePermissions(permissions));
 
   /**
    * Filter out commands that don't have valid conditions

package/dist/modules/auth/lib/utils.mjs

@@ -1,21 +0,0 @@
-//#region src/modules/auth/lib/utils.ts
-/**
-* mergePermissions
-*/
-function mergePermissions(permissions) {
-	return permissions.flatMap(Object.entries).reduce((acc, [key, value]) => {
-		const accValue = acc[key];
-		if (!accValue) return {
-			...acc,
-			[key]: [...value]
-		};
-		return {
-			...acc,
-			[key]: Array.from(new Set([...accValue, ...value]))
-		};
-	}, {});
-}
-
-//#endregion
-export { mergePermissions };
-//# sourceMappingURL=utils.mjs.map

package/dist/modules/auth/lib/utils.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.mjs","names":[],"sources":["../../../../src/modules/auth/lib/utils.ts"],"sourcesContent":["import { Permission } from \"./permissions\";\n\n/**\n * mergePermissions\n */\nexport function mergePermissions(permissions: Permission[]): Permission {\n  return permissions.flatMap(Object.entries).reduce((acc, [key, value]) => {\n    const accValue = acc[key];\n\n    if (!accValue) return { ...acc, [key]: [...value] };\n\n    return {\n      ...acc,\n      [key]: Array.from(new Set([...accValue, ...value])),\n    };\n  }, {} as Permission);\n}\n"],"mappings":";;;;AAKA,SAAgB,iBAAiB,aAAuC;AACtE,QAAO,YAAY,QAAQ,OAAO,QAAQ,CAAC,QAAQ,KAAK,CAAC,KAAK,WAAW;EACvE,MAAM,WAAW,IAAI;AAErB,MAAI,CAAC,SAAU,QAAO;GAAE,GAAG;IAAM,MAAM,CAAC,GAAG,MAAM;GAAE;AAEnD,SAAO;GACL,GAAG;IACF,MAAM,MAAM,KAAK,IAAI,IAAI,CAAC,GAAG,UAAU,GAAG,MAAM,CAAC,CAAC;GACpD;IACA,EAAE,CAAe"}