refactor: code structure for improved readability and maintainability

Author: dunseen

package.json

@@ -10,89 +10,87 @@
     "start": "next start"
   },
   "dependencies": {
-    "@casl/ability": "^6.7.3",
-    "@casl/react": "^5.0.0",
-    "@grafana/faro-web-sdk": "^1.19.0",
-    "@grafana/faro-web-tracing": "^1.19.0",
-    "@hookform/resolvers": "^3.9.1",
-    "@internationalized/date": "^3.7.0",
-    "@radix-ui/react-accordion": "^1.2.1",
-    "@radix-ui/react-alert-dialog": "^1.1.2",
-    "@radix-ui/react-avatar": "^1.1.1",
-    "@radix-ui/react-checkbox": "^1.1.2",
-    "@radix-ui/react-collapsible": "^1.1.1",
-    "@radix-ui/react-dialog": "^1.1.2",
-    "@radix-ui/react-dropdown-menu": "^2.1.2",
-    "@radix-ui/react-label": "^2.1.0",
-    "@radix-ui/react-popover": "^1.1.2",
-    "@radix-ui/react-select": "^2.1.2",
-    "@radix-ui/react-separator": "^1.1.0",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@radix-ui/react-tabs": "^1.1.1",
-    "@radix-ui/react-tooltip": "^1.1.3",
+    "@casl/ability": "6.7.3",
+    "@casl/react": "5.0.0",
+    "@grafana/faro-web-sdk": "1.19.0",
+    "@grafana/faro-web-tracing": "1.19.0",
+    "@hookform/resolvers": "3.10.0",
+    "@internationalized/date": "3.10.0",
+    "@radix-ui/react-accordion": "1.2.12",
+    "@radix-ui/react-alert-dialog": "1.1.15",
+    "@radix-ui/react-avatar": "1.1.11",
+    "@radix-ui/react-checkbox": "1.3.3",
+    "@radix-ui/react-collapsible": "1.1.12",
+    "@radix-ui/react-dialog": "1.1.15",
+    "@radix-ui/react-dropdown-menu": "2.1.16",
+    "@radix-ui/react-label": "2.1.8",
+    "@radix-ui/react-popover": "1.1.15",
+    "@radix-ui/react-select": "2.2.6",
+    "@radix-ui/react-separator": "1.1.8",
+    "@radix-ui/react-slot": "1.2.4",
+    "@radix-ui/react-tabs": "1.1.13",
+    "@radix-ui/react-tooltip": "1.2.8",
     "@react-input/mask": "2.0.4",
-    "@t3-oss/env-nextjs": "^0.10.1",
-    "@tanstack/react-query": "^5.62.2",
-    "@tanstack/react-query-devtools": "^5.62.2",
-    "@tanstack/react-table": "^8.20.5",
-    "axios": "1.12.0",
-    "class-variance-authority": "^0.7.0",
-    "clsx": "^2.1.1",
-    "date-fns": "^4.1.0",
-    "embla-carousel-react": "^8.3.0",
-    "geist": "^1.3.0",
-    "html2canvas": "^1.4.1",
-    "jspdf": "3.0.2",
+    "@t3-oss/env-nextjs": "0.13.8",
+    "@tanstack/react-query": "5.90.11",
+    "@tanstack/react-query-devtools": "5.91.1",
+    "@tanstack/react-table": "8.21.3",
+    "axios": "1.13.2",
+    "class-variance-authority": "0.7.1",
+    "clsx": "2.1.1",
+    "date-fns": "4.1.0",
+    "embla-carousel-react": "8.6.0",
+    "html2canvas": "1.4.1",
+    "jspdf": "3.0.4",
     "leaflet": "1.9.4",
     "leaflet-defaulticon-compatibility": "0.1.2",
     "leaflet-geosearch": "4.2.2",
-    "lucide-react": "^0.460.0",
-    "next": "15.5.6",
-    "next-auth": "4.24.12",
-    "next-themes": "^0.4.4",
-    "qrcode": "^1.5.4",
-    "react": "^18.3.1",
+    "lucide-react": "0.555.0",
+    "next": "15.4.7",
+    "next-auth": "4.24.13",
+    "next-themes": "0.4.6",
+    "qrcode": "1.5.4",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-day-picker": "8.10.1",
-    "react-dom": "^18.3.1",
     "react-hook-form": "7.53.1",
-    "react-infinite-scroll-component": "^6.1.0",
+    "react-infinite-scroll-component": "6.1.0",
     "react-leaflet": "5.0.0-rc.1",
-    "react-select": "^5.8.2",
-    "react-use": "^17.6.0",
-    "recharts": "^2.13.3",
-    "sonner": "^2.0.1",
-    "tailwind-merge": "^2.5.3",
-    "tailwindcss-animate": "^1.0.7",
-    "zod": "^3.23.8"
+    "react-select": "5.10.2",
+    "react-use": "17.6.0",
+    "recharts": "2.15.4",
+    "sonner": "2.0.7",
+    "tailwind-merge": "2.6.0",
+    "tailwindcss-animate": "1.0.7",
+    "zod": "3.25.76"
   },
   "devDependencies": {
-    "@faker-js/faker": "^9.2.0",
-    "@tanstack/eslint-plugin-query": "^5.62.1",
-    "@types/eslint": "^8.56.10",
-    "@types/leaflet": "^1.9.21",
-    "@types/node": "^20.14.10",
-    "@types/qrcode": "^1.5.5",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.1.0",
-    "@typescript-eslint/parser": "^8.1.0",
-    "axe-core": "^4.10.3",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "^14.2.4",
-    "postcss": "^8.4.39",
-    "prettier": "^3.3.2",
-    "prettier-plugin-tailwindcss": "^0.6.5",
-    "tailwindcss": "^3.4.3",
-    "typescript": "^5.5.3"
+    "@tanstack/eslint-plugin-query": "5.91.2",
+    "@types/eslint": "8.56.12",
+    "@types/leaflet": "1.9.21",
+    "@types/node": "20.19.25",
+    "@types/qrcode": "1.5.6",
+    "@types/react": "18.3.27",
+    "@types/react-dom": "18.3.7",
+    "@typescript-eslint/eslint-plugin": "8.48.0",
+    "@typescript-eslint/parser": "8.48.0",
+    "axe-core": "4.11.0",
+    "eslint": "8.57.1",
+    "eslint-config-next": "14.2.33",
+    "postcss": "8.5.6",
+    "prettier": "3.7.2",
+    "prettier-plugin-tailwindcss": "0.6.14",
+    "tailwindcss": "3.4.18",
+    "typescript": "5.9.3"
   },
   "ct3aMetadata": {
     "initVersion": "7.37.0"
   },
   "resolutions": {
-    "@babel/runtime": "7.26.10",
+    "@babel/runtime": "7.28.4",
     "glob": "10.5.0",
     "js-yaml": "4.1.1",
     "nanoid": "3.3.8"
   },
   "packageManager": "yarn@1.22.19"
-}
+}

src/app/dashboard/collection/characteristics/api/useGetCharacteristicTypes.ts

@@ -33,7 +33,7 @@ const getCharacteristicsConfig = (
         params: {
           page: pageParam,
           limit: params?.limit ?? 10,
-          name: params?.name ? params.name : undefined,
+          name: params?.name ?? undefined,
         },
         signal,
       };

src/app/dashboard/collection/characteristics/api/useGetCharacteristics.ts

@@ -21,7 +21,7 @@ async function fetchCharacteristics(params?: GetCharacteristicsParams) {
     params: {
       page: params?.page ?? 1,
       limit: params?.limit ?? 10,
-      name: params?.name ? params.name : undefined,
+      name: params?.name ?? undefined,
     },
   };
 

src/app/dashboard/collection/species/api/useGetSpecialists.ts

@@ -22,7 +22,7 @@ async function fetchSpecialists(params?: GetSpecialistsParams) {
     params: {
       page: params?.page ?? 1,
       limit: params?.limit ?? 10,
-      name: params?.name ? params.name : undefined,
+      name: params?.name ?? undefined,
       type: params?.type,
     },
   };

src/app/dashboard/collection/species/api/useGetSpecies.ts

@@ -21,7 +21,7 @@ async function fetchSpecies(params?: GetSpeciesParams) {
     params: {
       page: params?.page ?? 1,
       limit: params?.limit ?? 10,
-      name: params?.name ? params.name : undefined,
+      name: params?.name ?? undefined,
     },
   };
 

src/app/dashboard/collection/taxonomy/api/useGetHierarchy.ts

@@ -18,7 +18,7 @@ async function fetchHierarchies(params?: GetHierarchyParams) {
     params: {
       page: params?.page ?? 1,
       limit: params?.limit ?? 10,
-      name: params?.name ? params.name : undefined,
+      name: params?.name ?? undefined,
     },
   };
 

src/app/dashboard/collection/taxonomy/api/useGetTaxons.ts

@@ -22,7 +22,7 @@ async function fetchTaxons(params?: GetTaxonsParams) {
     params: {
       page: params?.page ?? 1,
       limit: params?.limit ?? 10,
-      name: params?.name ? params.name : undefined,
+      name: params?.name ?? undefined,
       hierarchyId: params?.hierarchyId
         ? Number(params?.hierarchyId)
         : undefined,

src/app/dashboard/system/activities/components/change-request-detail/characteristic-change-request-content.tsx

@@ -38,8 +38,8 @@ export function CharacteristicChangeRequestContent({
           formatValue={(value) => {
             if (!value) return "-";
             if (typeof value === "string") return value;
-            if (hasNameProperty(value)) return String(value.name ?? "-");
-            return String(value);
+            if (hasNameProperty(value)) return value.name ?? "-";
+            return "-";
           }}
         />
       </div>

src/app/dashboard/system/activities/components/change-request-detail/formatters/characteristics-formatter.ts

@@ -0,0 +1,16 @@
+/**
+ * Formats characteristics array for display
+ */
+export function formatCharacteristics(val: unknown): string {
+  if (!val) return "-";
+
+  if (Array.isArray(val)) {
+    return val.map((c: { name: string }) => c.name).join(", ");
+  }
+
+  if (typeof val === "string") {
+    return val;
+  }
+
+  return "-";
+}

src/app/dashboard/system/activities/components/change-request-detail/formatters/index.ts

@@ -0,0 +1,9 @@
+export { formatTaxonomy } from "./taxonomy-formatter";
+export { formatCharacteristics } from "./characteristics-formatter";
+export {
+  formatState,
+  formatCity,
+  formatLatitude,
+  formatLongitude,
+} from "./location-formatters";
+export { formatSpecialist, formatDate } from "./specialist-formatters";