fix: pagination and packages (#624)

line · Aug 14, 2024 · 27699e5 · 27699e5
1 parent 9201c27
commit 27699e5
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 35 deletions.
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -103,7 +103,8 @@
     "@ufb/eslint-config": "workspace:*",
     "@ufb/prettier-config": "workspace:*",
     "@ufb/tsconfig": "workspace:*",
-    "eslint": "^9.0.0",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
@@ -113,6 +114,6 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.4.5"
+    "typescript": "catalog:"
   }
 }
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -96,7 +96,8 @@
     "@ufb/prettier-config": "workspace:*",
     "@ufb/tsconfig": "workspace:*",
     "autoprefixer": "^10.4.19",
-    "eslint": "^9.0.0",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jiti": "^1.21.6",
@@ -107,7 +108,7 @@
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
     "ts-toolbelt": "^9.6.0",
-    "typescript": "^5.4.5",
+    "typescript": "catalog:",
     "undici": "~5.28.4"
   }
 }
diff --git a/apps/web/src/entities/user/ui/user-management-table.ui.tsx b/apps/web/src/entities/user/ui/user-management-table.ui.tsx
@@ -107,7 +107,7 @@ const UserManagementTable: React.FC<IProps> = () => {
             disabledNextPage={
               pagination.pageIndex + 1 >= (data?.meta.totalPages ?? 1)
             }
-            disabledPrevPage={pagination.pageIndex <= 1}
+            disabledPrevPage={pagination.pageIndex < 1}
             setLimit={table.setPageSize}
           />
           <TableSearchInput

diff --git a/apps/web/src/widgets/feedback-table/ui/feedback-table-bar.tsx b/apps/web/src/widgets/feedback-table/ui/feedback-table-bar.tsx
@@ -126,7 +126,7 @@ const FeedbackTableBar: React.FC<IProps> = (props) => {
             disabledNextPage={
               pagination.pageIndex + 1 >= (meta?.totalPages ?? 1)
             }
-            disabledPrevPage={pagination.pageIndex <= 1}
+            disabledPrevPage={pagination.pageIndex < 1}
             short
           />
           <div className="bg-fill-tertiary h-4 w-[1px]" />
@@ -180,7 +180,7 @@ const FeedbackTableBar: React.FC<IProps> = (props) => {
             disabledNextPage={
               pagination.pageIndex + 1 >= (meta?.totalPages ?? 1)
             }
-            disabledPrevPage={pagination.pageIndex <= 1}
+            disabledPrevPage={pagination.pageIndex < 1}
           />
           <div className="w-[272px]">
             <DateRangePicker

diff --git a/apps/web/src/widgets/issue-table/ui/issue-table.ui.tsx b/apps/web/src/widgets/issue-table/ui/issue-table.ui.tsx
@@ -177,7 +177,7 @@ const IssueTable: React.FC<IProps> = ({ projectId }) => {
             disabledNextPage={
               pagination.pageIndex + 1 >= (data?.meta.totalPages ?? 1)
             }
-            disabledPrevPage={pagination.pageIndex <= 1}
+            disabledPrevPage={pagination.pageIndex < 1}
             setLimit={table.setPageSize}
           />
           <div className="w-[300px]">

diff --git a/packages/ufb-shared/package.json b/packages/ufb-shared/package.json
@@ -18,9 +18,10 @@
     "@ufb/eslint-config": "workspace:*",
     "@ufb/prettier-config": "workspace:*",
     "@ufb/tsconfig": "workspace:*",
-    "eslint": "^9.0.0",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
     "react": "^18.2.0",
     "tsup": "^8.0.2",
-    "typescript": "^5.4.5"
+    "typescript": "catalog:"
   }
 }
diff --git a/packages/ufb-tailwind/package.json b/packages/ufb-tailwind/package.json
@@ -20,14 +20,14 @@
     "@ufb/eslint-config": "workspace:*",
     "@ufb/prettier-config": "workspace:*",
     "autoprefixer": "^10.4.19",
-    "eslint": "^9.0.0",
+    "eslint": "catalog:",
     "glob": "^11.0.0",
     "postcss": "^8.4.38",
     "postcss-cli": "^11.0.0",
     "postcss-import": "^16.1.0",
     "postcss-nesting": "^12.1.2",
     "prejss-cli": "^0.3.3",
-    "prettier": "^3.2.5",
+    "prettier": "catalog:",
     "tailwindcss": "^3.4.3"
   }
 }
diff --git a/packages/ufb-ui/package.json b/packages/ufb-ui/package.json
@@ -26,7 +26,9 @@
     "@ufb/prettier-config": "workspace:*",
     "@ufb/tailwind": "workspace:*",
     "@ufb/tsconfig": "workspace:*",
-    "eslint": "^9.0.0",
-    "tailwindcss": "^3.4.3"
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "tailwindcss": "^3.4.3",
+    "typescript": "catalog:"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,4 +1,9 @@
 packages:
   - apps/*
   - packages/*
-  - tooling/*
+  - tooling/*
+
+catalog:
+  eslint: ^9.7.0
+  prettier: ^3.3.3
+  typescript: ^5.5.3
diff --git a/tooling/eslint/package.json b/tooling/eslint/package.json
@@ -29,9 +29,10 @@
   "devDependencies": {
     "@ufb/prettier-config": "workspace:*",
     "@ufb/tsconfig": "workspace:*",
-    "eslint": "^9.0.0",
+    "eslint": "catalog:",
     "rimraf": "^6.0.0",
-    "typescript": "^5.4.5"
+    "prettier": "catalog:",
+    "typescript": "catalog:"
   },
   "prettier": "@ufb/prettier-config"
 }
diff --git a/tooling/prettier/package.json b/tooling/prettier/package.json
@@ -14,13 +14,13 @@
   },
   "dependencies": {
     "@ianvs/prettier-plugin-sort-imports": "^4.2.1",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.0"
   },
   "devDependencies": {
     "@types/node": "20.14.14",
     "@ufb/tsconfig": "workspace:*",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "prettier": "@ufb/prettier-config"
 }