dn-react-router-toolkit 0.8.0 → 0.8.1

package/dist/crud/index.js

@@ -6516,10 +6516,10 @@ var require_listCacheClear = __commonJS({
 var require_eq = __commonJS({
   "node_modules/lodash/eq.js"(exports2, module2) {
     "use strict";
-    function eq(value, other) {
+    function eq2(value, other) {
       return value === other || value !== value && other !== other;
     }
-    module2.exports = eq;
+    module2.exports = eq2;
   }
 });
 
@@ -6527,11 +6527,11 @@ var require_eq = __commonJS({
 var require_assocIndexOf = __commonJS({
   "node_modules/lodash/_assocIndexOf.js"(exports2, module2) {
     "use strict";
-    var eq = require_eq();
+    var eq2 = require_eq();
     function assocIndexOf(array, key) {
       var length = array.length;
       while (length--) {
-        if (eq(array[length][0], key)) {
+        if (eq2(array[length][0], key)) {
           return length;
         }
       }
@@ -6989,12 +6989,12 @@ var require_assignValue = __commonJS({
   "node_modules/lodash/_assignValue.js"(exports2, module2) {
     "use strict";
     var baseAssignValue = require_baseAssignValue();
-    var eq = require_eq();
+    var eq2 = require_eq();
     var objectProto = Object.prototype;
     var hasOwnProperty = objectProto.hasOwnProperty;
     function assignValue(object, key, value) {
       var objValue = object[key];
-      if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || value === void 0 && !(key in object)) {
+      if (!(hasOwnProperty.call(object, key) && eq2(objValue, value)) || value === void 0 && !(key in object)) {
         baseAssignValue(object, key, value);
       }
     }
@@ -8005,11 +8005,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 });
@@ -8020,6 +8031,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,
@@ -8027,7 +8046,8 @@ async function loadTable({
     offset,
     orderBy,
     direction,
-    searchKey
+    searchKey,
+    filters
   };
 }
 
@@ -8157,18 +8177,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 {};
       }
@@ -8269,7 +8298,8 @@ function Table({
   limit,
   offset,
   orderBy,
-  direction
+  direction,
+  filters
 }) {
   const keys = Object.entries(columns).filter((entry) => entry[1]).map(([key]) => key);
   const sortedArray = [...data];
@@ -8277,7 +8307,10 @@ function Table({
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
     "table",
     {
-      className: (0, import_utils3.cn)(className, "text-[15px] border-separate border-spacing-0"),
+      className: (0, import_utils3.cn)(
+        className,
+        "text-[15px] border-separate border-spacing-0"
+      ),
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("thead", { children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("tr", { children: keys.map((key) => {
           const value = columns[key];
@@ -8294,8 +8327,8 @@ function Table({
                 "button",
                 {
                   className: (0, import_utils3.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";
@@ -8316,14 +8349,59 @@ function Table({
             }
             return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_jsx_runtime7.Fragment, { children: reactNode });
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("th", { className: (0, import_utils3.cn)("border-y font-normal"), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Head, {}) }, key);
+          const filter = filters[key];
+          return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+            "th",
+            {
+              className: (0, import_utils3.cn)(
+                "py-4 border-y font-normal align-top"
+              ),
+              children: [
+                /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Head, {}),
+                filter && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: "px-3 mt-4", children: /* @__PURE__ */ (0, import_jsx_runtime7.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_runtime7.jsx)("option", { value: "", children: "\uC804\uCCB4" }),
+                      filter.map((option) => /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                        "option",
+                        {
+                          value: option,
+                          children: option
+                        },
+                        option
+                      ))
+                    ]
+                  }
+                ) })
+              ]
+            },
+            key
+          );
         }) }) }),
         /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("tbody", { children: [
           sortedArray.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("tr", { children: /* @__PURE__ */ (0, import_jsx_runtime7.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."
             }
           ) }),
@@ -8362,16 +8440,7 @@ function Table({
 var import_react_router5 = require("react-router");
 function useTable() {
   const { table } = (0, import_react_router5.useLoaderData)();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = table;
-  return {
-    items,
-    total,
-    limit,
-    offset,
-    orderBy,
-    direction,
-    searchKey
-  };
+  return table;
 }
 
 // src/table/buttons.tsx
@@ -8454,7 +8523,16 @@ function TableForm({
   primaryKey = "id"
 }) {
   const { pathname } = (0, import_react_router7.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_router7.useNavigate)();
   const search = (query) => {
     const searchParams2 = new URLSearchParams(window.location.search);
@@ -8467,7 +8545,7 @@ function TableForm({
     searchKey && /* @__PURE__ */ (0, import_jsx_runtime9.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);
@@ -8504,7 +8582,8 @@ function TableForm({
         limit,
         offset,
         orderBy,
-        direction
+        direction,
+        filters
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(

package/dist/crud/index.mjs

@@ -6510,10 +6510,10 @@ var require_listCacheClear = __commonJS({
 var require_eq = __commonJS({
   "node_modules/lodash/eq.js"(exports, module) {
     "use strict";
-    function eq(value, other) {
+    function eq2(value, other) {
       return value === other || value !== value && other !== other;
     }
-    module.exports = eq;
+    module.exports = eq2;
   }
 });
 
@@ -6521,11 +6521,11 @@ var require_eq = __commonJS({
 var require_assocIndexOf = __commonJS({
   "node_modules/lodash/_assocIndexOf.js"(exports, module) {
     "use strict";
-    var eq = require_eq();
+    var eq2 = require_eq();
     function assocIndexOf(array, key) {
       var length = array.length;
       while (length--) {
-        if (eq(array[length][0], key)) {
+        if (eq2(array[length][0], key)) {
           return length;
         }
       }
@@ -6983,12 +6983,12 @@ var require_assignValue = __commonJS({
   "node_modules/lodash/_assignValue.js"(exports, module) {
     "use strict";
     var baseAssignValue = require_baseAssignValue();
-    var eq = require_eq();
+    var eq2 = require_eq();
     var objectProto = Object.prototype;
     var hasOwnProperty = objectProto.hasOwnProperty;
     function assignValue(object, key, value) {
       var objValue = object[key];
-      if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || value === void 0 && !(key in object)) {
+      if (!(hasOwnProperty.call(object, key) && eq2(objValue, value)) || value === void 0 && !(key in object)) {
         baseAssignValue(object, key, value);
       }
     }
@@ -7980,6 +7980,7 @@ function CrudForm({
 // src/table/load_table.tsx
 import {
   and,
+  eq,
   ilike
 } from "drizzle-orm";
 async function loadTable({
@@ -7994,11 +7995,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 });
@@ -8009,6 +8021,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,
@@ -8016,7 +8036,8 @@ async function loadTable({
     offset,
     orderBy,
     direction,
-    searchKey
+    searchKey,
+    filters
   };
 }
 
@@ -8152,21 +8173,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 {};
       }
@@ -8267,7 +8297,8 @@ function Table({
   limit,
   offset,
   orderBy,
-  direction
+  direction,
+  filters
 }) {
   const keys = Object.entries(columns).filter((entry) => entry[1]).map(([key]) => key);
   const sortedArray = [...data];
@@ -8275,7 +8306,10 @@ function Table({
   return /* @__PURE__ */ jsxs3(
     "table",
     {
-      className: cn2(className, "text-[15px] border-separate border-spacing-0"),
+      className: cn2(
+        className,
+        "text-[15px] border-separate border-spacing-0"
+      ),
       children: [
         /* @__PURE__ */ jsx7("thead", { children: /* @__PURE__ */ jsx7("tr", { children: keys.map((key) => {
           const value = columns[key];
@@ -8292,8 +8326,8 @@ function Table({
                 "button",
                 {
                   className: cn2(
-                    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";
@@ -8314,14 +8348,59 @@ function Table({
             }
             return /* @__PURE__ */ jsx7(Fragment3, { children: reactNode });
           }
-          return /* @__PURE__ */ jsx7("th", { className: cn2("border-y font-normal"), children: /* @__PURE__ */ jsx7(Head, {}) }, key);
+          const filter = filters[key];
+          return /* @__PURE__ */ jsxs3(
+            "th",
+            {
+              className: cn2(
+                "py-4 border-y font-normal align-top"
+              ),
+              children: [
+                /* @__PURE__ */ jsx7(Head, {}),
+                filter && /* @__PURE__ */ jsx7("div", { className: "px-3 mt-4", children: /* @__PURE__ */ jsxs3(
+                  "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__ */ jsx7("option", { value: "", children: "\uC804\uCCB4" }),
+                      filter.map((option) => /* @__PURE__ */ jsx7(
+                        "option",
+                        {
+                          value: option,
+                          children: option
+                        },
+                        option
+                      ))
+                    ]
+                  }
+                ) })
+              ]
+            },
+            key
+          );
         }) }) }),
         /* @__PURE__ */ jsxs3("tbody", { children: [
           sortedArray.length === 0 && /* @__PURE__ */ jsx7("tr", { children: /* @__PURE__ */ jsx7(
             "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."
             }
           ) }),
@@ -8360,16 +8439,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
@@ -8452,7 +8522,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);
@@ -8465,7 +8544,7 @@ function TableForm({
     searchKey && /* @__PURE__ */ jsxs5(
       "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);
@@ -8502,7 +8581,8 @@ function TableForm({
         limit,
         offset,
         orderBy,
-        direction
+        direction,
+        filters
       }
     ),
     /* @__PURE__ */ jsx9(

package/dist/post/index.js

@@ -6516,10 +6516,10 @@ var require_listCacheClear = __commonJS({
 var require_eq = __commonJS({
   "node_modules/lodash/eq.js"(exports2, module2) {
     "use strict";
-    function eq(value, other) {
+    function eq2(value, other) {
       return value === other || value !== value && other !== other;
     }
-    module2.exports = eq;
+    module2.exports = eq2;
   }
 });
 
@@ -6527,11 +6527,11 @@ var require_eq = __commonJS({
 var require_assocIndexOf = __commonJS({
   "node_modules/lodash/_assocIndexOf.js"(exports2, module2) {
     "use strict";
-    var eq = require_eq();
+    var eq2 = require_eq();
     function assocIndexOf(array, key) {
       var length = array.length;
       while (length--) {
-        if (eq(array[length][0], key)) {
+        if (eq2(array[length][0], key)) {
           return length;
         }
       }
@@ -6989,12 +6989,12 @@ var require_assignValue = __commonJS({
   "node_modules/lodash/_assignValue.js"(exports2, module2) {
     "use strict";
     var baseAssignValue = require_baseAssignValue();
-    var eq = require_eq();
+    var eq2 = require_eq();
     var objectProto = Object.prototype;
     var hasOwnProperty = objectProto.hasOwnProperty;
     function assignValue(object, key, value) {
       var objValue = object[key];
-      if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || value === void 0 && !(key in object)) {
+      if (!(hasOwnProperty.call(object, key) && eq2(objValue, value)) || value === void 0 && !(key in object)) {
         baseAssignValue(object, key, value);
       }
     }

package/dist/post/index.mjs

@@ -6510,10 +6510,10 @@ var require_listCacheClear = __commonJS({
 var require_eq = __commonJS({
   "node_modules/lodash/eq.js"(exports, module) {
     "use strict";
-    function eq(value, other) {
+    function eq2(value, other) {
       return value === other || value !== value && other !== other;
     }
-    module.exports = eq;
+    module.exports = eq2;
   }
 });
 
@@ -6521,11 +6521,11 @@ var require_eq = __commonJS({
 var require_assocIndexOf = __commonJS({
   "node_modules/lodash/_assocIndexOf.js"(exports, module) {
     "use strict";
-    var eq = require_eq();
+    var eq2 = require_eq();
     function assocIndexOf(array, key) {
       var length = array.length;
       while (length--) {
-        if (eq(array[length][0], key)) {
+        if (eq2(array[length][0], key)) {
           return length;
         }
       }
@@ -6983,12 +6983,12 @@ var require_assignValue = __commonJS({
   "node_modules/lodash/_assignValue.js"(exports, module) {
     "use strict";
     var baseAssignValue = require_baseAssignValue();
-    var eq = require_eq();
+    var eq2 = require_eq();
     var objectProto = Object.prototype;
     var hasOwnProperty = objectProto.hasOwnProperty;
     function assignValue(object, key, value) {
       var objValue = object[key];
-      if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || value === void 0 && !(key in object)) {
+      if (!(hasOwnProperty.call(object, key) && eq2(objValue, value)) || value === void 0 && !(key in object)) {
         baseAssignValue(object, key, value);
       }
     }
@@ -7938,6 +7938,7 @@ import { Fragment as Fragment2, jsx as jsx8, jsxs as jsxs3 } from "react/jsx-run
 // src/table/load_table.tsx
 import {
   and,
+  eq,
   ilike
 } from "drizzle-orm";
 
@@ -7956,7 +7957,7 @@ import {
 import { v4 } from "uuid";
 
 // 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";
 
 // src/crud/crud_page.tsx
 import { useLoaderData as useLoaderData2, useLocation as useLocation4 } from "react-router";

package/dist/post/post_form_page.js

@@ -6516,10 +6516,10 @@ var require_listCacheClear = __commonJS({
 var require_eq = __commonJS({
   "node_modules/lodash/eq.js"(exports2, module2) {
     "use strict";
-    function eq(value, other) {
+    function eq2(value, other) {
       return value === other || value !== value && other !== other;
     }
-    module2.exports = eq;
+    module2.exports = eq2;
   }
 });
 
@@ -6527,11 +6527,11 @@ var require_eq = __commonJS({
 var require_assocIndexOf = __commonJS({
   "node_modules/lodash/_assocIndexOf.js"(exports2, module2) {
     "use strict";
-    var eq = require_eq();
+    var eq2 = require_eq();
     function assocIndexOf(array, key) {
       var length = array.length;
       while (length--) {
-        if (eq(array[length][0], key)) {
+        if (eq2(array[length][0], key)) {
           return length;
         }
       }
@@ -6989,12 +6989,12 @@ var require_assignValue = __commonJS({
   "node_modules/lodash/_assignValue.js"(exports2, module2) {
     "use strict";
     var baseAssignValue = require_baseAssignValue();
-    var eq = require_eq();
+    var eq2 = require_eq();
     var objectProto = Object.prototype;
     var hasOwnProperty = objectProto.hasOwnProperty;
     function assignValue(object, key, value) {
       var objValue = object[key];
-      if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || value === void 0 && !(key in object)) {
+      if (!(hasOwnProperty.call(object, key) && eq2(objValue, value)) || value === void 0 && !(key in object)) {
         baseAssignValue(object, key, value);
       }
     }