@tulip-systems/core 0.5.8 → 0.5.10

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":";;;;;;;;;;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,uBAAA,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;;;;;;;;;;;;;;;;;;;;wCAA5B,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,kCAAA,CAAA;IAAA,IAAA,EAAA,QAAA;IAaxB,SAAA,EAAA,OAAiB;IAKhB,QAAA,EAAA,SAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAsB,SAAA,kCAAA,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,kCAAmC,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,uBAAA,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,uBAAA,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"}
+{"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/package.json

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

package/src/components/entry.ts

@@ -10,12 +10,13 @@ export * from "./editor/lib/types";
 /**
  * Components Layouts
  */
+export * from "./layouts/admin-error-pages";
 export * from "./layouts/admin-loading";
 export * from "./layouts/empty-page";
 export * from "./layouts/error-page";
+export * from "./layouts/error-sections";
 export * from "./layouts/list-layout";
-export * from "./layouts/not-allowed-page";
-export * from "./layouts/not-found-page";
+export * from "./layouts/root-error-pages";
 export * from "./layouts/root-loading";
 export * from "./layouts/tab-layout";
 

package/src/components/layouts/admin-error-pages.tsx

@@ -0,0 +1,109 @@
+import { ServerError } from "@/modules/router/lib/error.server";
+import { CommonORPCErrorCode } from "@orpc/client";
+import { Header } from "../header/header.client";
+import { Topbar, TopbarTitle } from "../header/top-bar.client";
+import {
+  DefaultErrorSection,
+  NotAllowedSection,
+  NotFoundSection,
+  ServerErrorSection,
+} from "./error-sections";
+
+/**
+ * Admin Not Found Page
+ */
+export function AdminNotFoundPage() {
+  return (
+    <>
+      <Header>
+        <Topbar>
+          <TopbarTitle breadcrumbs={[{ label: "404" }]} />
+        </Topbar>
+      </Header>
+
+      <div className="p-content">
+        <NotFoundSection className="min-h-[calc(100dvh-var(--header-top-bar-height)-var(--content)-var(--content))]" />
+      </div>
+    </>
+  );
+}
+
+/**
+ * Admin Not Allowed Page
+ */
+export function AdminNotAllowedPage() {
+  return (
+    <>
+      <Header>
+        <Topbar>
+          <TopbarTitle breadcrumbs={[{ label: "Unauthorized" }]} />
+        </Topbar>
+      </Header>
+
+      <div className="p-content">
+        <NotAllowedSection className="min-h-[calc(100dvh-var(--header-top-bar-height)-var(--content)-var(--content))]" />
+      </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 <AdminNotAllowedPage />;
+  }
+
+  /**
+   * If the error is a ServerError and the code is "UNAUTHORIZED", show the NotAllowedPage
+   */
+  if (serverErrorCode === "NOT_FOUND") {
+    return <AdminNotFoundPage />;
+  }
+
+  /**
+   * If the error is a ServerError and the code is "UNAUTHORIZED", show the NotAllowedPage
+   */
+  if (serverErrorCode === "INTERNAL_SERVER_ERROR") {
+    return (
+      <>
+        <Header>
+          <Topbar>
+            <TopbarTitle breadcrumbs={[{ label: "Server Error" }]} />
+          </Topbar>
+        </Header>
+
+        <div className="p-content">
+          <ServerErrorSection className="min-h-[calc(100dvh-var(--header-top-bar-height)-var(--content)-var(--content))]" />
+        </div>
+      </>
+    );
+  }
+
+  /**
+   * Else show the ErrorPage
+   */
+  return (
+    <>
+      <Header>
+        <Topbar>
+          <TopbarTitle breadcrumbs={[{ label: "Error" }]} />
+        </Topbar>
+      </Header>
+
+      <div className="p-content">
+        <DefaultErrorSection className="min-h-[calc(100dvh-var(--header-top-bar-height)-var(--content)-var(--content))]" />
+      </div>
+    </>
+  );
+}

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

@@ -40,20 +40,3 @@ export function EmptyPageDescription({ className, children, ...props }: Componen
     </p>
   );
 }
-
-{
-  /* <div className="flex h-full flex-col place-items-center justify-center space-y-6 border border-dashed">
-        <span className="space-y-2 text-center">
-          <h2 className="text-2xl font-bold tracking-tight">{title}</h2>
-          {description && (
-            <p className="text-muted-foreground max-w-[40ch] text-sm">{description}</p>
-          )}
-        </span>
-
-        {callToAction && (
-          <Link href={callToAction.href} className={cn(buttonVariants({ variant: "default" }))}>
-            {callToAction.title}
-          </Link>
-        )}
-      </div> */
-}

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

@@ -1,61 +1,75 @@
 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 { BugIcon, ServerCrashIcon, ShieldBanIcon } 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">) {
+export function ErrorPage({ className, children, ...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
+      {...props}
+      className={cn(
+        "min-h-120 flex h-full w-full flex-col items-center justify-center gap-y-3 border border-dashed text-center",
+        className,
+      )}
+    >
+      {children}
     </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
+ * ErrorPageCode
  */
-export function AdminErrorPage(props: { error: Error }) {
-  const serverErrorCode: CommonORPCErrorCode =
-    props.error instanceof ServerError ? props.error.code : undefined;
+export function ErrorPageCode({ className, children, ...props }: ComponentProps<"h2">) {
+  return (
+    <h2 className={cn("text-9xl font-bold leading-none", className)} {...props}>
+      {children}
+    </h2>
+  );
+}
 
-  /**
-   * 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>
-    );
-  }
+/**
+ * ErrorPageIcon
+ */
+const errorPageIcons = {
+  serverError: ServerCrashIcon,
+  notAllowed: ShieldBanIcon,
+  default: BugIcon,
+  // 404: BombIcon,
+};
 
-  /**
-   * 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>
-    );
-  }
+export function ErrorPageIcon({
+  variant = "default",
+  className,
+  ...props
+}: ComponentProps<"svg"> & { variant?: keyof typeof errorPageIcons }) {
+  const Icon = errorPageIcons[variant];
 
-  /**
-   * Else show the ErrorPage
-   */
-  return <ErrorPage />;
+  return <Icon className={cn("size-16 xl:size-24", className)} {...props} />;
 }
+
+/**
+ * ErrorPageDescription
+ */
+export function ErrorPageDescription({ className, children, ...props }: ComponentProps<"p">) {
+  return (
+    <p className={cn("text-2xl font-bold lg:text-3xl", className)} {...props}>
+      {children}
+    </p>
+  );
+}
+
+// export function ErrorPage({ className, ...props }: ComponentProps<"div">) {
+//   return (
+//     <div {...props} className={cn("relative z-0 grid 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>
+//   );
+// }

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

@@ -0,0 +1,52 @@
+import { cn } from "@/lib/utils/cn";
+import { ComponentProps } from "react";
+import { ErrorPage, ErrorPageCode, ErrorPageDescription, ErrorPageIcon } from "./error-page";
+
+/**
+ * DefaultErrorSection
+ */
+export function DefaultErrorSection({ className, ...props }: ComponentProps<"div">) {
+  return (
+    <ErrorPage {...props} className={cn("text-destructive", className)}>
+      {/* <BugIcon className="size-16 xl:size-24" /> */}
+      <ErrorPageIcon variant="default" />
+      <ErrorPageDescription>Oeps, er is iets fout gegaan</ErrorPageDescription>
+    </ErrorPage>
+  );
+}
+
+/**
+ * ServerErrorSection
+ */
+export function ServerErrorSection({ className, ...props }: ComponentProps<"div">) {
+  return (
+    <ErrorPage {...props} className={cn("text-destructive", className)}>
+      <ErrorPageIcon variant="serverError" />
+      <ErrorPageDescription>Oeps, er is iets fout gegaan met de server</ErrorPageDescription>
+    </ErrorPage>
+  );
+}
+
+/**
+ * NotFoundSection
+ */
+export function NotFoundSection(props: ComponentProps<"div">) {
+  return (
+    <ErrorPage {...props}>
+      <ErrorPageCode>404</ErrorPageCode>
+      <ErrorPageDescription>Oeps, deze pagina is niet gevonden.</ErrorPageDescription>
+    </ErrorPage>
+  );
+}
+
+/**
+ * Not Allowed Section
+ */
+export function NotAllowedSection(props: ComponentProps<"div">) {
+  return (
+    <ErrorPage {...props}>
+      <ErrorPageIcon variant="notAllowed" />
+      <ErrorPageDescription>Je hebt geen toegang tot deze pagina.</ErrorPageDescription>
+    </ErrorPage>
+  );
+}

package/src/components/layouts/root-error-pages.tsx

@@ -0,0 +1,12 @@
+import { NotFoundSection } from "./error-sections";
+
+/**
+ * Admin Not Found Page
+ */
+export function RootNotFoundPage() {
+  return (
+    <div className="relative z-0 grid h-dvh w-full place-items-center">
+      <NotFoundSection className="h-full" />
+    </div>
+  );
+}

package/src/modules/data-tables/lib/converters/search.ts

@@ -1,4 +1,4 @@
-import { type SQL, ilike, or } from "drizzle-orm";
+import { type SQL, ilike, or, sql } from "drizzle-orm";
 import type { PgColumn } from "drizzle-orm/pg-core";
 import { TableQuerySchema } from "../validators";
 
@@ -16,7 +16,7 @@ export function convertSearchToQueryParams(
   if (!search) return undefined;
 
   // create an array of search fields with the search query applied
-  const searchFields = fields.map((field) => ilike(field, `%${search}%`));
+  const searchFields = fields.map((field) => ilike(sql`${field}::text`, `%${search}%`));
 
   // return the query with the search fields
   return or(...searchFields);

package/src/modules/storage/components/image-grid.client.tsx

@@ -14,7 +14,6 @@ import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog.cli
 import { Input } from "@/components/ui/input";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useAction } from "@/lib/entry.client";
-import { arrayMove } from "@/lib/utils/array-move";
 import { cn } from "@/lib/utils/cn";
 import {
   closestCenter,
@@ -47,10 +46,13 @@ type ImageGridProps = ComponentProps<"div"> & {
   nodes: FileNode[];
   disabled?: boolean;
   moveAction: (params: { fromIndex: number; toIndex: number }) => Promise<void>;
+  optimistic?: {
+    move?: (params: { fromIndex: number; toIndex: number }) => Promise<void> | void;
+  };
 };
 
-export function ImageGrid({ nodes, moveAction, disabled, ...props }: ImageGridProps) {
-  const { onUpload, updateData, invalidateQuery } = useUploadZone();
+export function ImageGrid({ nodes, moveAction, optimistic, disabled, ...props }: ImageGridProps) {
+  const uploadZone = useUploadZone();
 
   const images = nodes.flatMap((node) => ({ ...node, url: getFileUrl(node.id) }));
 
@@ -75,12 +77,12 @@ export function ImageGrid({ nodes, moveAction, disabled, ...props }: ImageGridPr
       const fromIndex = images.findIndex((image) => image.id === activeId);
       const toIndex = images.findIndex((image) => image.id === overId);
 
-      await updateData((prev) => arrayMove(prev, { fromIndex, toIndex }));
+      await optimistic?.move?.({ fromIndex, toIndex });
       await moveAction({ fromIndex, toIndex });
     },
     onSuccess: async () => {
       setCurrent(0);
-      await invalidateQuery();
+      await uploadZone.optimistic?.invalidate?.();
     },
     onError: (error) => {
       console.error("Error moving image:", error);
@@ -113,7 +115,7 @@ export function ImageGrid({ nodes, moveAction, disabled, ...props }: ImageGridPr
                   multiple
                   onChange={(e) => {
                     if (!e.target.files) return;
-                    return Array.from(e.target.files).map(onUpload);
+                    return Array.from(e.target.files).map(uploadZone.onUpload);
                   }}
                 />
               </label>
@@ -156,7 +158,7 @@ type ImageGridItemProps = {
 };
 
 function ImageGridItem({ node, index, setCurrent }: ImageGridItemProps) {
-  const { uploadClient } = useUploadZone();
+  const uploadZone = useUploadZone();
 
   const { attributes, listeners, setNodeRef, transform, transition } = useSortable({ id: node.id });
 
@@ -198,7 +200,7 @@ function ImageGridItem({ node, index, setCurrent }: ImageGridItemProps) {
             type="button"
             variant="destructive"
             size="icon"
-            onClick={() => uploadClient.deleteFiles([node.id])}
+            onClick={() => uploadZone.onRemove([node.id])}
             className="absolute left-2 top-2 hidden p-1 group-hover:flex"
           >
             <Icons.trash className="size-4" />

package/src/modules/storage/components/upload-zone-context.client.tsx

@@ -9,9 +9,16 @@ import { FileNode, Node } from "../lib/validators";
  */
 export type UploadZoneContextValue = {
   uploadClient: UploadClient;
-  updateData: (newValue: FileNode[] | ((oldValue: FileNode[]) => FileNode[])) => Promise<void>;
-  invalidateQuery: () => Promise<void> | void;
   onUpload: (file: File) => Promise<Node>;
+  onRemove: (ids: string[]) => Promise<void>;
+  optimistic?: {
+    add?: (newValue: FileNode) => Promise<void> | void;
+    remove?: (ids: string[]) => Promise<void> | void;
+    invalidate?: () => Promise<void> | void;
+    cancel?: () => Promise<void> | void;
+  };
+  // updateData: (newValue: FileNode[] | ((oldValue: FileNode[]) => FileNode[])) => Promise<void>;
+  // invalidateQuery: () => Promise<void> | void;
 };
 
 /**

package/src/modules/storage/components/upload-zone.client.tsx

@@ -4,26 +4,23 @@ import { Input } from "@/components/ui/input";
 import { toast } from "@/components/ui/sonner.client";
 import { cn } from "@/lib/entry";
 import { useAction } from "@/lib/hooks/use-action";
-import { useQueryClient } from "@tanstack/react-query";
 import { ComponentProps, useCallback, useState } from "react";
-import { UploadClient, UploadFileRequest, UploadHooks } from "../lib/create-upload.client";
+import { UploadFileRequest, UploadHooks } from "../lib/create-upload.client";
 import { FileNode, Node, UploadFileSchema } from "../lib/validators";
-import { UploadZoneContext } from "./upload-zone-context.client";
+import { UploadZoneContext, UploadZoneContextValue } from "./upload-zone-context.client";
 
-export type UploadZoneProps = ComponentProps<"div"> & {
-  queryKey: readonly unknown[];
+export type UploadZoneProps = ComponentProps<"div"> &
+  Pick<UploadZoneContextValue, "optimistic" | "uploadClient"> & {
+    variables: Pick<UploadFileSchema, "namespace" | "parentId" | "mode" | "hidden" | "readonly">;
+    uploadHooks?: UploadHooks;
 
-  variables: Pick<UploadFileSchema, "namespace" | "parentId" | "mode" | "hidden" | "readonly">;
-  uploadClient: UploadClient;
-  uploadHooks?: UploadHooks;
-
-  onUploadCompleted?: (node: Node) => Promise<void> | void;
-  onUploadFailed?: (error: unknown) => Promise<void> | void;
-};
+    onUploadCompleted?: (node: Node) => Promise<void> | void;
+    onUploadFailed?: (error: unknown) => Promise<void> | void;
+  };
 
 export function UploadZone({
   variables,
-  queryKey,
+  optimistic,
   uploadClient,
   uploadHooks,
   onUploadCompleted,
@@ -34,41 +31,23 @@ export function UploadZone({
   onDragLeave,
   ...props
 }: UploadZoneProps) {
-  const queryClient = useQueryClient();
   const [isDragging, setIsDragging] = useState(false);
 
-  /**
-   * Optimisticly update the data
-   */
-  const updateData = useCallback(
-    async (newValue: FileNode[] | ((oldValue: FileNode[]) => FileNode[])) => {
-      await queryClient.cancelQueries({ queryKey });
-      await queryClient.setQueryData(queryKey, newValue);
-    },
-    [queryClient, queryKey],
-  );
-
-  /**
-   * Invalidate the query
-   */
-  const invalidateQuery = useCallback(async () => {
-    await queryClient.invalidateQueries({ queryKey });
-  }, [queryClient, queryKey]);
-
   /**
    * Delete mutation
    */
   const deleteMutation = useAction({
-    mutationFn: async (params: { ids: string[] }) => uploadClient.deleteFiles(params.ids),
-    onMutate: async (variables) => {
-      await updateData((prev) => prev.filter((node) => !variables.ids.includes(node.id)));
-    },
-    onSuccess: async () => {
-      await invalidateQuery();
+    mutationFn: async (ids: string[]) => uploadClient.deleteFiles(ids),
+    onMutate: async (ids) => {
+      await optimistic?.cancel?.();
+      await optimistic?.remove?.(ids);
     },
     onError: async (error) => {
-      await onUploadFailed?.(error);
       console.error("Delete failed upload error: ", error);
+      await onUploadFailed?.(error);
+    },
+    onSettled: () => {
+      optimistic?.invalidate?.();
     },
   });
 
@@ -85,7 +64,8 @@ export function UploadZone({
         isPending: true,
       } as FileNode;
 
-      await updateData((prev) => [...(prev ?? []), newNode]);
+      await optimistic?.cancel?.();
+      await optimistic?.add?.(newNode);
     },
     onSuccess: async (data) => {
       await onUploadCompleted?.(data);
@@ -100,10 +80,10 @@ export function UploadZone({
       });
 
       console.info("Deleting failed upload");
-      await deleteMutation.mutateAsync({ ids: [variables.id] });
+      await deleteMutation.mutateAsync([variables.id]);
     },
     onSettled: () => {
-      queryClient.invalidateQueries({ queryKey });
+      optimistic?.invalidate?.();
     },
   });
 
@@ -112,6 +92,7 @@ export function UploadZone({
    */
   const onUpload = useCallback(
     async (file: File) => {
+      console.info("Uploading file", file);
       const req = uploadClient.prepareUpload({ ...variables, file });
       return await uploadMutation.mutateAsync(req);
     },
@@ -121,6 +102,7 @@ export function UploadZone({
   return (
     <div
       {...props}
+      role="region"
       className={cn("relative z-0 flex-1 space-y-6", className)}
       onDragOver={(...args) => {
         setIsDragging(true);
@@ -151,8 +133,8 @@ export function UploadZone({
         value={{
           uploadClient,
           onUpload,
-          updateData,
-          invalidateQuery,
+          onRemove: deleteMutation.mutateAsync,
+          optimistic,
         }}
       >
         {children}

package/dist/components/layouts/not-allowed-page.d.mts

@@ -1,22 +0,0 @@
-import * as react_jsx_runtime247 from "react/jsx-runtime";
-import { HTMLAttributes } from "react";
-import { Route } from "next";
-
-//#region src/components/layouts/not-allowed-page.d.ts
-type NotAllowedPageProps = HTMLAttributes<HTMLDivElement> & {
-  title?: string;
-  description?: string;
-  callToAction?: {
-    href: Route;
-    title: string;
-  };
-};
-declare function NotAllowedPage({
-  title,
-  description,
-  callToAction,
-  ...props
-}: NotAllowedPageProps): react_jsx_runtime247.JSX.Element;
-//#endregion
-export { NotAllowedPage, NotAllowedPageProps };
-//# sourceMappingURL=not-allowed-page.d.mts.map

package/dist/components/layouts/not-allowed-page.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"not-allowed-page.d.mts","names":[],"sources":["../../../src/components/layouts/not-allowed-page.tsx"],"sourcesContent":[],"mappings":";;;;;KAOY,mBAAA,GAAsB,eAAe;;;EAArC,YAAA,CAAA,EAAA;IAAqC,IAAA,EAIvC,KAJuC;IAAf,KAAA,EAAA,MAAA;EAIxB,CAAA;CAAK;AAKC,iBAAA,cAAA,CAAc;EAAA,KAAA;EAAA,WAAA;EAAA,YAAA;EAAA,GAAA;AAAA,CAAA,EAK3B,mBAL2B,CAAA,EAKR,oBAAA,CAAA,GAAA,CAAA,OALQ"}

package/dist/components/layouts/not-allowed-page.mjs

@@ -1,25 +0,0 @@
-import { cn } from "../../lib/utils/cn.mjs";
-import { EmptyPage, EmptyPageDescription, EmptyPageTitle } from "./empty-page.mjs";
-import { buttonVariants } from "../ui/button.mjs";
-import { jsx, jsxs } from "react/jsx-runtime";
-import Link from "next/link";
-
-//#region src/components/layouts/not-allowed-page.tsx
-function NotAllowedPage({ title, description, callToAction, ...props }) {
-	return /* @__PURE__ */ jsxs(EmptyPage, {
-		...props,
-		children: [
-			/* @__PURE__ */ jsx(EmptyPageTitle, { children: title ?? "Geen toegang" }),
-			/* @__PURE__ */ jsx(EmptyPageDescription, { children: description ?? "Je hebt geen toegang tot deze pagina." }),
-			callToAction && /* @__PURE__ */ jsx(Link, {
-				href: callToAction.href,
-				className: cn(buttonVariants({ variant: "default" })),
-				children: callToAction.title
-			})
-		]
-	});
-}
-
-//#endregion
-export { NotAllowedPage };
-//# sourceMappingURL=not-allowed-page.mjs.map

package/dist/components/layouts/not-allowed-page.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"not-allowed-page.mjs","names":[],"sources":["../../../src/components/layouts/not-allowed-page.tsx"],"sourcesContent":["import { cn } from \"@/lib/utils/cn\";\nimport type { Route } from \"next\";\nimport Link from \"next/link\";\nimport type { HTMLAttributes } from \"react\";\nimport { buttonVariants } from \"../ui/button\";\nimport { EmptyPage, EmptyPageDescription, EmptyPageTitle } from \"./empty-page\";\n\nexport type NotAllowedPageProps = HTMLAttributes<HTMLDivElement> & {\n  title?: string;\n  description?: string;\n  callToAction?: {\n    href: Route;\n    title: string;\n  };\n};\n\nexport function NotAllowedPage({\n  title,\n  description,\n  callToAction,\n  ...props\n}: NotAllowedPageProps) {\n  return (\n    <EmptyPage {...props}>\n      <EmptyPageTitle>{title ?? \"Geen toegang\"}</EmptyPageTitle>\n      <EmptyPageDescription>\n        {description ?? \"Je hebt geen toegang tot deze pagina.\"}\n      </EmptyPageDescription>\n\n      {callToAction && (\n        <Link href={callToAction.href} className={cn(buttonVariants({ variant: \"default\" }))}>\n          {callToAction.title}\n        </Link>\n      )}\n    </EmptyPage>\n  );\n}\n\n// <EmptyPage\n//   {...props}\n//   title={title ?? \"Geen toegang\"}\n//   description={description ?? \"Je hebt geen toegang tot deze pagina.\"}\n//   callToAction={callToAction ?? { href: \"/admin\", title: \"Terug naar dashboard\" }}\n// />\n"],"mappings":";;;;;;;AAgBA,SAAgB,eAAe,EAC7B,OACA,aACA,cACA,GAAG,SACmB;AACtB,QACE,qBAAC;EAAU,GAAI;;GACb,oBAAC,4BAAgB,SAAS,iBAAgC;GAC1D,oBAAC,kCACE,eAAe,0CACK;GAEtB,gBACC,oBAAC;IAAK,MAAM,aAAa;IAAM,WAAW,GAAG,eAAe,EAAE,SAAS,WAAW,CAAC,CAAC;cACjF,aAAa;KACT;;GAEC"}