chore(dashboard): fix type and lint errors (5/n) (#15213)

Author: shahednasser

packages/admin/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/adjust-inventory-drawer.tsx

@@ -1,4 +1,3 @@
-import { InventoryTypes } from "@medusajs/types"
 import { Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { useParams } from "react-router-dom"
@@ -19,8 +18,7 @@ export const AdjustInventoryDrawer = () => {
   } = useInventoryItem(id!)
 
   const inventoryLevel = inventoryItem?.location_levels!.find(
-    (level: InventoryTypes.InventoryLevelDTO) =>
-      level.location_id === location_id
+    (level) => level.location_id === location_id
   )
 
   const { stock_location, isLoading: isLoadingLocation } = useStockLocation(

packages/admin/dashboard/src/routes/inventory/inventory-detail/components/adjust-inventory/components/adjust-inventory-form.tsx

@@ -1,5 +1,9 @@
 import { zodResolver } from "@hookform/resolvers/zod"
-import { HttpTypes, InventoryLevelDTO, StockLocationDTO } from "@medusajs/types"
+import {
+  AdminInventoryLevel,
+  AdminStockLocation,
+  HttpTypes,
+} from "@medusajs/types"
 import { Button, Input, Text, toast } from "@medusajs/ui"
 import { useForm, useWatch } from "react-hook-form"
 import { useTranslation } from "react-i18next"
@@ -13,8 +17,8 @@ import { castNumber } from "../../../../../../lib/cast-number"
 
 type AdjustInventoryFormProps = {
   item: HttpTypes.AdminInventoryItem
-  level: InventoryLevelDTO
-  location: StockLocationDTO
+  level: AdminInventoryLevel
+  location: AdminStockLocation
 }
 
 const AttributeGridRow = ({

packages/admin/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item-attributes/components/edit-item-attributes-form.tsx

@@ -4,7 +4,7 @@ import { Button, Input, toast } from "@medusajs/ui"
 import { RouteDrawer, useRouteModal } from "../../../../../../components/modals"
 
 import { zodResolver } from "@hookform/resolvers/zod"
-import { InventoryTypes } from "@medusajs/types"
+import { AdminInventoryItem } from "@medusajs/types"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
@@ -15,7 +15,7 @@ import { KeyboundForm } from "../../../../../../components/utilities/keybound-fo
 import { useUpdateInventoryItem } from "../../../../../../hooks/api/inventory"
 
 type EditInventoryItemAttributeFormProps = {
-  item: InventoryTypes.InventoryItemDTO
+  item: AdminInventoryItem
 }
 
 const EditInventoryItemAttributesSchema = z.object({
@@ -29,7 +29,7 @@ const EditInventoryItemAttributesSchema = z.object({
   origin_country: z.string().optional(),
 })
 
-const getDefaultValues = (item: InventoryTypes.InventoryItemDTO) => {
+const getDefaultValues = (item: AdminInventoryItem) => {
   return {
     height: item.height ?? undefined,
     width: item.width ?? undefined,

packages/admin/dashboard/src/routes/inventory/inventory-detail/components/edit-inventory-item/components/edit-item-form.tsx

@@ -4,7 +4,7 @@ import { Button, Input, toast } from "@medusajs/ui"
 import { RouteDrawer, useRouteModal } from "../../../../../../components/modals"
 
 import { zodResolver } from "@hookform/resolvers/zod"
-import { InventoryTypes } from "@medusajs/types"
+import { AdminInventoryItem } from "@medusajs/types"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
@@ -13,15 +13,15 @@ import { KeyboundForm } from "../../../../../../components/utilities/keybound-fo
 import { useUpdateInventoryItem } from "../../../../../../hooks/api/inventory"
 
 type EditInventoryItemFormProps = {
-  item: InventoryTypes.InventoryItemDTO
+  item: AdminInventoryItem
 }
 
 const EditInventoryItemSchema = z.object({
   title: z.string().optional(),
   sku: z.string().min(1),
 })
 
-const getDefaultValues = (item: InventoryTypes.InventoryItemDTO) => {
+const getDefaultValues = (item: AdminInventoryItem) => {
   return {
     title: item.title ?? undefined,
     sku: item.sku ?? undefined,

packages/admin/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-variants/variants-section.tsx

@@ -45,7 +45,7 @@ export const InventoryItemVariantsSection = ({
                     {variant.options.map((o) => o.value).join(" ⋅ ")}
                   </span>
                 </div>
-                <div className="size-7 flex items-center justify-center">
+                <div className="flex size-7 items-center justify-center">
                   <TriangleRightMini className="text-ui-fg-muted rtl:rotate-180" />
                 </div>
               </div>
@@ -60,7 +60,7 @@ export const InventoryItemVariantsSection = ({
             <Link
               to={link}
               key={variant.id}
-              className="outline-none focus-within:shadow-borders-interactive-with-focus rounded-md [&:hover>div]:bg-ui-bg-component-hover"
+              className="focus-within:shadow-borders-interactive-with-focus [&:hover>div]:bg-ui-bg-component-hover rounded-md outline-none"
             >
               {Inner}
             </Link>

packages/admin/dashboard/src/routes/inventory/inventory-detail/components/location-levels-table/use-location-list-table-columns.tsx

@@ -1,4 +1,4 @@
-import { InventoryTypes, StockLocationDTO } from "@medusajs/types"
+import { AdminInventoryLevel } from "@medusajs/types"
 import { PencilSquare, Trash } from "@medusajs/icons"
 
 import { useMemo } from "react"
@@ -13,25 +13,15 @@ import { sdk } from "../../../../../lib/client"
 import { queryClient } from "../../../../../lib/query-client"
 import { useNavigate } from "react-router-dom"
 
-/**
- * Adds missing properties to the InventoryLevelDTO type.
- */
-interface ExtendedLocationLevel extends InventoryTypes.InventoryLevelDTO {
-  stock_locations: StockLocationDTO[]
-  reserved_quantity: number
-  stocked_quantity: number
-  available_quantity: number
-}
-
-const columnHelper = createDataTableColumnHelper<ExtendedLocationLevel>()
+const columnHelper = createDataTableColumnHelper<AdminInventoryLevel>()
 
 export const useLocationListTableColumns = () => {
   const { t } = useTranslation()
   const navigate = useNavigate()
 
   const prompt = usePrompt()
 
-  const handleDelete = async (level: ExtendedLocationLevel) => {
+  const handleDelete = async (level: AdminInventoryLevel) => {
     const res = await prompt({
       title: t("general.areYouSure"),
       description: t("inventory.deleteWarning"),
@@ -66,13 +56,13 @@ export const useLocationListTableColumns = () => {
         queryKey: inventoryItemLevelsQueryKeys.detail(level.inventory_item_id),
       })
     } catch (e) {
-      toast.error(e.message)
+      toast.error(e instanceof Error ? e.message : t("errorBoundary.defaultTitle"))
     }
   }
 
   return useMemo(
     () => [
-      columnHelper.accessor("stock_locations.0.name", {
+      columnHelper.accessor("stock_locations.0.name" as any, {
         header: t("fields.location"),
         cell: ({ getValue }) => {
           const locationName = getValue()
@@ -147,7 +137,7 @@ export const useLocationListTableColumns = () => {
                 icon: <PencilSquare />,
                 label: t("actions.edit"),
 
-                onClick: (row) => {
+                onClick: () => {
                   navigate(`locations/${level.location_id}`)
                 },
               },

packages/admin/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/use-reservation-list-table-columns.tsx

@@ -4,7 +4,10 @@ import { useMemo } from "react"
 import { useTranslation } from "react-i18next"
 import { CreatedAtCell } from "../../../../../components/table/table-cells/common/created-at-cell"
 import { PlaceholderCell } from "../../../../../components/table/table-cells/common/placeholder-cell"
-import { TextCell, TextHeader } from "../../../../../components/table/table-cells/common/text-cell"
+import {
+  TextCell,
+  TextHeader,
+} from "../../../../../components/table/table-cells/common/text-cell"
 import { ReservationActions } from "./reservation-actions"
 
 /**
@@ -26,9 +29,7 @@ export const useReservationTableColumn = ({ sku }: { sku: string }) => {
         id: "sku",
         header: () => <TextHeader text={t("fields.sku")} />,
         cell: () => {
-          return (
-            <TextCell text={sku} />
-          )
+          return <TextCell text={sku} />
         },
       }),
       columnHelper.accessor("line_item.order_id", {
@@ -40,9 +41,7 @@ export const useReservationTableColumn = ({ sku }: { sku: string }) => {
             return <PlaceholderCell />
           }
 
-          return (
-            <TextCell text={orderId} />
-          )
+          return <TextCell text={orderId} />
         },
       }),
       columnHelper.accessor("description", {
@@ -54,9 +53,7 @@ export const useReservationTableColumn = ({ sku }: { sku: string }) => {
             return <PlaceholderCell />
           }
 
-          return (
-            <TextCell text={description} />
-          )
+          return <TextCell text={description} />
         },
       }),
       columnHelper.accessor("location.name", {
@@ -68,9 +65,7 @@ export const useReservationTableColumn = ({ sku }: { sku: string }) => {
             return <PlaceholderCell />
           }
 
-          return (
-            <TextCell text={location} />
-          )
+          return <TextCell text={location} />
         },
       }),
       columnHelper.accessor("created_at", {

packages/admin/dashboard/src/routes/inventory/inventory-list/components/inventory-actions.tsx

@@ -1,12 +1,12 @@
 import { PencilSquare, Trash } from "@medusajs/icons"
 
 import { ActionMenu } from "../../../../components/common/action-menu"
-import { InventoryItemDTO } from "@medusajs/types"
+import { AdminInventoryItem } from "@medusajs/types"
 import { useDeleteInventoryItem } from "../../../../hooks/api/inventory"
 import { usePrompt } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 
-export const InventoryActions = ({ item }: { item: InventoryItemDTO }) => {
+export const InventoryActions = ({ item }: { item: AdminInventoryItem }) => {
   const { t } = useTranslation()
   const prompt = usePrompt()
   const { mutateAsync } = useDeleteInventoryItem(item.id)

packages/admin/dashboard/src/routes/inventory/inventory-list/components/inventory-list-table.tsx

@@ -1,4 +1,3 @@
-import { InventoryTypes } from "@medusajs/types"
 import { Button, Container, Heading, Text } from "@medusajs/ui"
 
 import { RowSelectionState } from "@tanstack/react-table"
@@ -39,7 +38,7 @@ export const InventoryListTable = () => {
   const columns = useInventoryTableColumns()
 
   const { table } = useDataTable({
-    data: (inventory_items ?? []) as InventoryTypes.InventoryItemDTO[],
+    data: inventory_items,
     columns,
     count,
     enablePagination: true,

packages/admin/dashboard/src/routes/inventory/inventory-list/components/use-inventory-table-columns.tsx

@@ -1,4 +1,4 @@
-import { InventoryTypes, ProductVariantDTO } from "@medusajs/types"
+import { AdminInventoryItem } from "@medusajs/types"
 
 import { Checkbox } from "@medusajs/ui"
 import { createColumnHelper } from "@tanstack/react-table"
@@ -7,16 +7,7 @@ import { useTranslation } from "react-i18next"
 import { PlaceholderCell } from "../../../../components/table/table-cells/common/placeholder-cell"
 import { InventoryActions } from "./inventory-actions"
 
-/**
- * Adds missing properties to the InventoryItemDTO type.
- */
-interface ExtendedInventoryItem extends InventoryTypes.InventoryItemDTO {
-  variants?: ProductVariantDTO[] | null
-  stocked_quantity?: number
-  reserved_quantity?: number
-}
-
-const columnHelper = createColumnHelper<ExtendedInventoryItem>()
+const columnHelper = createColumnHelper<AdminInventoryItem>()
 
 export const useInventoryTableColumns = () => {
   const { t } = useTranslation()