dn-react-router-toolkit 0.8.0 → 0.8.1

package/dist/api/index.js

@@ -379,18 +379,27 @@ function apiHandler({
 var import_http3 = require("dn-react-toolkit/http");
 function itemApiHandler({
   withAuthAction,
-  repository
+  repository,
+  isOwnedBy,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ params, request }) => {
-    if (!auth || auth.role !== "admin") {
-      return (0, import_http3.UNAUTHORIZED)();
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw (0, import_http3.UNAUTHORIZED)();
+    }
+    const itemId = params.itemId;
+    const existing = await repository.find(itemId);
+    if (!existing) {
+      throw (0, import_http3.NOT_FOUND)();
+    }
+    if (isOwnedBy && !isOwnedBy(existing, auth)) {
+      throw (0, import_http3.FORBIDDEN)();
     }
     switch (request.method) {
       case "DELETE": {
-        const itemId = params.itemId;
         await repository.delete(itemId);
         return {};
       }

package/dist/api/index.mjs

@@ -371,21 +371,30 @@ function apiHandler({
 }
 
 // src/api/item_api_handler.ts
-import { UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
+import { FORBIDDEN, NOT_FOUND as NOT_FOUND2, UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
 function itemApiHandler({
   withAuthAction,
-  repository
+  repository,
+  isOwnedBy,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ params, request }) => {
-    if (!auth || auth.role !== "admin") {
-      return UNAUTHORIZED2();
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw UNAUTHORIZED2();
+    }
+    const itemId = params.itemId;
+    const existing = await repository.find(itemId);
+    if (!existing) {
+      throw NOT_FOUND2();
+    }
+    if (isOwnedBy && !isOwnedBy(existing, auth)) {
+      throw FORBIDDEN();
     }
     switch (request.method) {
       case "DELETE": {
-        const itemId = params.itemId;
         await repository.delete(itemId);
         return {};
       }

package/dist/api/item_api_handler.d.mts

@@ -2,16 +2,18 @@ import { LoaderFunctionArgs } from 'react-router';
 import { TableRepository } from '../table/repository.mjs';
 import { PgTableWithColumns } from 'drizzle-orm/pg-core';
 import { WithAuthHandler } from '../auth/with_auth.mjs';
+import { AccessTokenPayload } from 'dn-react-toolkit/auth';
 import 'drizzle-orm';
 import 'drizzle-orm/node-postgres';
-import 'dn-react-toolkit/auth';
 import 'dn-react-toolkit/auth/server';
 
 type ItemAPIHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
     withAuthAction: WithAuthHandler<LoaderFunctionArgs>;
     repository: TableRepository<T, TSelect>;
+    isOwnedBy?: (item: TSelect, auth: AccessTokenPayload | undefined) => boolean;
+    roles?: string[];
 };
-declare function itemApiHandler<T extends PgTableWithColumns<any>, TSelect>({ withAuthAction, repository, }: ItemAPIHandlerOptions<T, TSelect>): {
+declare function itemApiHandler<T extends PgTableWithColumns<any>, TSelect>({ withAuthAction, repository, isOwnedBy, roles, }: ItemAPIHandlerOptions<T, TSelect>): {
     loader: ({ request }: LoaderFunctionArgs) => Promise<{}>;
     action: (arg: LoaderFunctionArgs<any>) => Promise<unknown> | unknown;
 };

package/dist/api/item_api_handler.d.ts

@@ -2,16 +2,18 @@ import { LoaderFunctionArgs } from 'react-router';
 import { TableRepository } from '../table/repository.js';
 import { PgTableWithColumns } from 'drizzle-orm/pg-core';
 import { WithAuthHandler } from '../auth/with_auth.js';
+import { AccessTokenPayload } from 'dn-react-toolkit/auth';
 import 'drizzle-orm';
 import 'drizzle-orm/node-postgres';
-import 'dn-react-toolkit/auth';
 import 'dn-react-toolkit/auth/server';
 
 type ItemAPIHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
     withAuthAction: WithAuthHandler<LoaderFunctionArgs>;
     repository: TableRepository<T, TSelect>;
+    isOwnedBy?: (item: TSelect, auth: AccessTokenPayload | undefined) => boolean;
+    roles?: string[];
 };
-declare function itemApiHandler<T extends PgTableWithColumns<any>, TSelect>({ withAuthAction, repository, }: ItemAPIHandlerOptions<T, TSelect>): {
+declare function itemApiHandler<T extends PgTableWithColumns<any>, TSelect>({ withAuthAction, repository, isOwnedBy, roles, }: ItemAPIHandlerOptions<T, TSelect>): {
     loader: ({ request }: LoaderFunctionArgs) => Promise<{}>;
     action: (arg: LoaderFunctionArgs<any>) => Promise<unknown> | unknown;
 };

package/dist/api/item_api_handler.js

@@ -26,18 +26,27 @@ module.exports = __toCommonJS(item_api_handler_exports);
 var import_http = require("dn-react-toolkit/http");
 function itemApiHandler({
   withAuthAction,
-  repository
+  repository,
+  isOwnedBy,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ params, request }) => {
-    if (!auth || auth.role !== "admin") {
-      return (0, import_http.UNAUTHORIZED)();
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw (0, import_http.UNAUTHORIZED)();
+    }
+    const itemId = params.itemId;
+    const existing = await repository.find(itemId);
+    if (!existing) {
+      throw (0, import_http.NOT_FOUND)();
+    }
+    if (isOwnedBy && !isOwnedBy(existing, auth)) {
+      throw (0, import_http.FORBIDDEN)();
     }
     switch (request.method) {
       case "DELETE": {
-        const itemId = params.itemId;
         await repository.delete(itemId);
         return {};
       }

package/dist/api/item_api_handler.mjs

@@ -1,19 +1,28 @@
 // src/api/item_api_handler.ts
-import { UNAUTHORIZED } from "dn-react-toolkit/http";
+import { FORBIDDEN, NOT_FOUND, UNAUTHORIZED } from "dn-react-toolkit/http";
 function itemApiHandler({
   withAuthAction,
-  repository
+  repository,
+  isOwnedBy,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ params, request }) => {
-    if (!auth || auth.role !== "admin") {
-      return UNAUTHORIZED();
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw UNAUTHORIZED();
+    }
+    const itemId = params.itemId;
+    const existing = await repository.find(itemId);
+    if (!existing) {
+      throw NOT_FOUND();
+    }
+    if (isOwnedBy && !isOwnedBy(existing, auth)) {
+      throw FORBIDDEN();
     }
     switch (request.method) {
       case "DELETE": {
-        const itemId = params.itemId;
         await repository.delete(itemId);
         return {};
       }

package/dist/crud/crud_loader.js

@@ -38,11 +38,22 @@ async function loadTable({
   const offset = Number(searchParams.get("offset") ?? "0");
   const orderBy = searchParams.get("orderBy") ?? defaultOrderBy;
   const direction = searchParams.get("direction") ?? defaultDirection;
+  const filterWhere = Object.entries(options.filters ?? {}).map(([key, value]) => {
+    const param = searchParams.get(key);
+    if (param) {
+      return (0, import_drizzle_orm.eq)(
+        repository.schema[key],
+        decodeURIComponent(param)
+      );
+    }
+    return void 0;
+  }).filter(Boolean);
   const whereClauses = (0, import_drizzle_orm.and)(
     searchKey && query ? (0, import_drizzle_orm.ilike)(
       repository.schema[searchKey],
       `%${query}%`
     ) : void 0,
+    ...filterWhere,
     ...where ?? []
   );
   const total = await repository.countTotal({ where: whereClauses });
@@ -53,6 +64,14 @@ async function loadTable({
     offset,
     where: whereClauses
   });
+  const filters = Object.fromEntries(
+    await Promise.all(
+      Object.keys(options.filters ?? {}).map(async (key) => {
+        const values = await repository.select(key);
+        return [key, values.filter(Boolean)];
+      })
+    )
+  );
   return {
     items,
     total,
@@ -60,7 +79,8 @@ async function loadTable({
     offset,
     orderBy,
     direction,
-    searchKey
+    searchKey,
+    filters
   };
 }
 
@@ -229,18 +249,27 @@ function apiHandler({
 var import_http2 = require("dn-react-toolkit/http");
 function itemApiHandler({
   withAuthAction,
-  repository
+  repository,
+  isOwnedBy,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ params, request }) => {
-    if (!auth || auth.role !== "admin") {
-      return (0, import_http2.UNAUTHORIZED)();
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw (0, import_http2.UNAUTHORIZED)();
+    }
+    const itemId = params.itemId;
+    const existing = await repository.find(itemId);
+    if (!existing) {
+      throw (0, import_http2.NOT_FOUND)();
+    }
+    if (isOwnedBy && !isOwnedBy(existing, auth)) {
+      throw (0, import_http2.FORBIDDEN)();
     }
     switch (request.method) {
       case "DELETE": {
-        const itemId = params.itemId;
         await repository.delete(itemId);
         return {};
       }

package/dist/crud/crud_loader.mjs

@@ -1,6 +1,7 @@
 // src/table/load_table.tsx
 import {
   and,
+  eq,
   ilike
 } from "drizzle-orm";
 async function loadTable({
@@ -15,11 +16,22 @@ async function loadTable({
   const offset = Number(searchParams.get("offset") ?? "0");
   const orderBy = searchParams.get("orderBy") ?? defaultOrderBy;
   const direction = searchParams.get("direction") ?? defaultDirection;
+  const filterWhere = Object.entries(options.filters ?? {}).map(([key, value]) => {
+    const param = searchParams.get(key);
+    if (param) {
+      return eq(
+        repository.schema[key],
+        decodeURIComponent(param)
+      );
+    }
+    return void 0;
+  }).filter(Boolean);
   const whereClauses = and(
     searchKey && query ? ilike(
       repository.schema[searchKey],
       `%${query}%`
     ) : void 0,
+    ...filterWhere,
     ...where ?? []
   );
   const total = await repository.countTotal({ where: whereClauses });
@@ -30,6 +42,14 @@ async function loadTable({
     offset,
     where: whereClauses
   });
+  const filters = Object.fromEntries(
+    await Promise.all(
+      Object.keys(options.filters ?? {}).map(async (key) => {
+        const values = await repository.select(key);
+        return [key, values.filter(Boolean)];
+      })
+    )
+  );
   return {
     items,
     total,
@@ -37,7 +57,8 @@ async function loadTable({
     offset,
     orderBy,
     direction,
-    searchKey
+    searchKey,
+    filters
   };
 }
 
@@ -212,21 +233,30 @@ function apiHandler({
 }
 
 // src/api/item_api_handler.ts
-import { UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
+import { FORBIDDEN, NOT_FOUND, UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
 function itemApiHandler({
   withAuthAction,
-  repository
+  repository,
+  isOwnedBy,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ params, request }) => {
-    if (!auth || auth.role !== "admin") {
-      return UNAUTHORIZED2();
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw UNAUTHORIZED2();
+    }
+    const itemId = params.itemId;
+    const existing = await repository.find(itemId);
+    if (!existing) {
+      throw NOT_FOUND();
+    }
+    if (isOwnedBy && !isOwnedBy(existing, auth)) {
+      throw FORBIDDEN();
     }
     switch (request.method) {
       case "DELETE": {
-        const itemId = params.itemId;
         await repository.delete(itemId);
         return {};
       }

package/dist/crud/crud_page.js

@@ -195,7 +195,8 @@ function Table({
   limit,
   offset,
   orderBy,
-  direction
+  direction,
+  filters
 }) {
   const keys = Object.entries(columns).filter((entry) => entry[1]).map(([key]) => key);
   const sortedArray = [...data];
@@ -203,7 +204,10 @@ function Table({
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
     "table",
     {
-      className: (0, import_utils2.cn)(className, "text-[15px] border-separate border-spacing-0"),
+      className: (0, import_utils2.cn)(
+        className,
+        "text-[15px] border-separate border-spacing-0"
+      ),
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("thead", { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("tr", { children: keys.map((key) => {
           const value = columns[key];
@@ -220,8 +224,8 @@ function Table({
                 "button",
                 {
                   className: (0, import_utils2.cn)(
-                    orderBy === key ? "text-neutral-900 font-medium" : "text-neutral-500",
-                    "px-4 h-14 flex items-center w-full"
+                    orderBy === key ? "text-gray-900 font-medium" : "text-gray-500 font-medium",
+                    "px-4 flex items-center w-full"
                   ),
                   onClick: () => {
                     let newDirection = "asc";
@@ -242,14 +246,59 @@ function Table({
             }
             return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_jsx_runtime2.Fragment, { children: reactNode });
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("th", { className: (0, import_utils2.cn)("border-y font-normal"), children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Head, {}) }, key);
+          const filter = filters[key];
+          return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+            "th",
+            {
+              className: (0, import_utils2.cn)(
+                "py-4 border-y font-normal align-top"
+              ),
+              children: [
+                /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Head, {}),
+                filter && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "px-3 mt-4", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+                  "select",
+                  {
+                    className: "w-full h-10 px-1.5 border rounded-full outline-none",
+                    onChange: (e) => {
+                      const value2 = e.target.value;
+                      setSearchParams((prev) => {
+                        if (value2) {
+                          prev.set(
+                            key,
+                            encodeURIComponent(
+                              value2
+                            )
+                          );
+                        } else {
+                          prev.delete(key);
+                        }
+                        return prev;
+                      });
+                    },
+                    children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("option", { value: "", children: "\uC804\uCCB4" }),
+                      filter.map((option) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                        "option",
+                        {
+                          value: option,
+                          children: option
+                        },
+                        option
+                      ))
+                    ]
+                  }
+                ) })
+              ]
+            },
+            key
+          );
         }) }) }),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("tbody", { children: [
           sortedArray.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("tr", { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
             "td",
             {
               colSpan: keys.length,
-              className: "px-4 h-14 text-neutral-400 text-center",
+              className: "px-4 h-20 text-gray-400 text-center",
               children: "\uB370\uC774\uD130\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."
             }
           ) }),
@@ -288,16 +337,7 @@ function Table({
 var import_react_router3 = require("react-router");
 function useTable() {
   const { table } = (0, import_react_router3.useLoaderData)();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = table;
-  return {
-    items,
-    total,
-    limit,
-    offset,
-    orderBy,
-    direction,
-    searchKey
-  };
+  return table;
 }
 
 // src/table/buttons.tsx
@@ -380,7 +420,16 @@ function TableForm({
   primaryKey = "id"
 }) {
   const { pathname } = (0, import_react_router5.useLocation)();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = useTable();
+  const {
+    items,
+    total,
+    limit,
+    offset,
+    orderBy,
+    direction,
+    searchKey,
+    filters
+  } = useTable();
   const navigate = (0, import_react_router5.useNavigate)();
   const search = (query) => {
     const searchParams2 = new URLSearchParams(window.location.search);
@@ -393,7 +442,7 @@ function TableForm({
     searchKey && /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       "form",
       {
-        className: "h-18 px-4 flex items-center border-t",
+        className: "h-20 px-4 flex items-center border-t",
         onSubmit: (e) => {
           e.preventDefault();
           const formData = new FormData(e.currentTarget);
@@ -430,7 +479,8 @@ function TableForm({
         limit,
         offset,
         orderBy,
-        direction
+        direction,
+        filters
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(

package/dist/crud/crud_page.mjs

@@ -174,7 +174,8 @@ function Table({
   limit,
   offset,
   orderBy,
-  direction
+  direction,
+  filters
 }) {
   const keys = Object.entries(columns).filter((entry) => entry[1]).map(([key]) => key);
   const sortedArray = [...data];
@@ -182,7 +183,10 @@ function Table({
   return /* @__PURE__ */ jsxs(
     "table",
     {
-      className: cn(className, "text-[15px] border-separate border-spacing-0"),
+      className: cn(
+        className,
+        "text-[15px] border-separate border-spacing-0"
+      ),
       children: [
         /* @__PURE__ */ jsx2("thead", { children: /* @__PURE__ */ jsx2("tr", { children: keys.map((key) => {
           const value = columns[key];
@@ -199,8 +203,8 @@ function Table({
                 "button",
                 {
                   className: cn(
-                    orderBy === key ? "text-neutral-900 font-medium" : "text-neutral-500",
-                    "px-4 h-14 flex items-center w-full"
+                    orderBy === key ? "text-gray-900 font-medium" : "text-gray-500 font-medium",
+                    "px-4 flex items-center w-full"
                   ),
                   onClick: () => {
                     let newDirection = "asc";
@@ -221,14 +225,59 @@ function Table({
             }
             return /* @__PURE__ */ jsx2(Fragment, { children: reactNode });
           }
-          return /* @__PURE__ */ jsx2("th", { className: cn("border-y font-normal"), children: /* @__PURE__ */ jsx2(Head, {}) }, key);
+          const filter = filters[key];
+          return /* @__PURE__ */ jsxs(
+            "th",
+            {
+              className: cn(
+                "py-4 border-y font-normal align-top"
+              ),
+              children: [
+                /* @__PURE__ */ jsx2(Head, {}),
+                filter && /* @__PURE__ */ jsx2("div", { className: "px-3 mt-4", children: /* @__PURE__ */ jsxs(
+                  "select",
+                  {
+                    className: "w-full h-10 px-1.5 border rounded-full outline-none",
+                    onChange: (e) => {
+                      const value2 = e.target.value;
+                      setSearchParams((prev) => {
+                        if (value2) {
+                          prev.set(
+                            key,
+                            encodeURIComponent(
+                              value2
+                            )
+                          );
+                        } else {
+                          prev.delete(key);
+                        }
+                        return prev;
+                      });
+                    },
+                    children: [
+                      /* @__PURE__ */ jsx2("option", { value: "", children: "\uC804\uCCB4" }),
+                      filter.map((option) => /* @__PURE__ */ jsx2(
+                        "option",
+                        {
+                          value: option,
+                          children: option
+                        },
+                        option
+                      ))
+                    ]
+                  }
+                ) })
+              ]
+            },
+            key
+          );
         }) }) }),
         /* @__PURE__ */ jsxs("tbody", { children: [
           sortedArray.length === 0 && /* @__PURE__ */ jsx2("tr", { children: /* @__PURE__ */ jsx2(
             "td",
             {
               colSpan: keys.length,
-              className: "px-4 h-14 text-neutral-400 text-center",
+              className: "px-4 h-20 text-gray-400 text-center",
               children: "\uB370\uC774\uD130\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."
             }
           ) }),
@@ -267,16 +316,7 @@ function Table({
 import { useLoaderData } from "react-router";
 function useTable() {
   const { table } = useLoaderData();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = table;
-  return {
-    items,
-    total,
-    limit,
-    offset,
-    orderBy,
-    direction,
-    searchKey
-  };
+  return table;
 }
 
 // src/table/buttons.tsx
@@ -359,7 +399,16 @@ function TableForm({
   primaryKey = "id"
 }) {
   const { pathname } = useLocation2();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = useTable();
+  const {
+    items,
+    total,
+    limit,
+    offset,
+    orderBy,
+    direction,
+    searchKey,
+    filters
+  } = useTable();
   const navigate = useNavigate2();
   const search = (query) => {
     const searchParams2 = new URLSearchParams(window.location.search);
@@ -372,7 +421,7 @@ function TableForm({
     searchKey && /* @__PURE__ */ jsxs3(
       "form",
       {
-        className: "h-18 px-4 flex items-center border-t",
+        className: "h-20 px-4 flex items-center border-t",
         onSubmit: (e) => {
           e.preventDefault();
           const formData = new FormData(e.currentTarget);
@@ -409,7 +458,8 @@ function TableForm({
         limit,
         offset,
         orderBy,
-        direction
+        direction,
+        filters
       }
     ),
     /* @__PURE__ */ jsx4(