Fix/mm2 1209: Fix TS errors part 1

src/components/common/calendar/calendar.tsx

@@ -4,7 +4,7 @@ import * as React from "react"
 import { DayPicker } from "react-day-picker"
 
 import { ChevronLeft, ChevronRight } from "@medusajs/icons"
-import { clx } from "@medusajs/ui"
+import { clx, IconButton } from "@medusajs/ui"
 
 import "react-day-picker/src/style.css"
 
@@ -59,18 +59,28 @@ function Calendar({
         ...classNames,
       }}
       components={{
-        PreviousMonthButton: ({ className, ...props }) => (
-          <ChevronLeft
-            className={clx("absolute left-2 top-5", className)}
-            {...props}
-          />
-        ),
-        NextMonthButton: ({ className, ...props }) => (
-          <ChevronRight
-            className={clx("absolute right-2 top-5", className)}
-            {...props}
-          />
-        ),
+        PreviousMonthButton: ({ className, ...props }) => {
+          return (
+            <IconButton
+              className={clx("absolute left-0 top-2.5", className)}
+              variant="transparent"
+              {...props}
+            >
+              <ChevronLeft />
+            </IconButton>
+          )
+        },
+        NextMonthButton: ({ className, ...props }) => {
+          return (
+            <IconButton
+              className={clx("absolute right-0 top-2.5", className)}
+              variant="transparent"
+              {...props}
+            >
+              <ChevronRight />
+            </IconButton>
+          )
+        },
       }}
       {...props}
     />

src/components/common/stars-rating/stars-rating.tsx

@@ -3,13 +3,9 @@ import { Star, StarSolid } from "@medusajs/icons"
 export const StarsRating = ({ rate }: { rate: number }) => {
   return (
     <div className="flex gap-1">
-      {[
-        ...Array(5)
-          .keys()
-          .map((key: number) => {
-            return key < rate ? <StarSolid key={key} /> : <Star key={key} />
-          }),
-      ]}
+      {Array.from({ length: 5 }, (_, key) => {
+        return key < rate ? <StarSolid key={key} /> : <Star key={key} />
+      })}
     </div>
   )
 }

src/components/data-grid/components/data-grid-root.tsx

@@ -855,10 +855,10 @@ const DataGridCell = <TData,>({
 type DataGridRowProps<TData> = {
   row: Row<TData>
   rowIndex: number
-  virtualRow: VirtualItem<Element>
+  virtualRow: VirtualItem
   virtualPaddingLeft?: number
   virtualPaddingRight?: number
-  virtualColumns: VirtualItem<Element>[]
+  virtualColumns: VirtualItem[]
   flatColumns: Column<TData, unknown>[]
   anchor: DataGridCoordinates | null
   onDragToFillStart: (e: React.MouseEvent<HTMLElement>) => void

src/components/data-grid/helpers/create-data-grid-price-columns.tsx

@@ -14,7 +14,6 @@ type CreateDataGridPriceColumnsProps<
   TFieldValues extends FieldValues,
 > = {
   currencies?: string[]
-  regions?: HttpTypes.AdminRegion[]
   pricePreferences?: HttpTypes.AdminPricePreference[]
   isReadyOnly?: (context: FieldContext<TData>) => boolean
   getFieldName: (
@@ -30,7 +29,6 @@ export const createDataGridPriceColumns = <
   TFieldValues extends FieldValues,
 >({
   currencies,
-  regions,
   pricePreferences,
   isReadyOnly,
   getFieldName,

src/components/layout/main-layout/main-layout.tsx

@@ -14,7 +14,7 @@ import {
   ListCheckbox,
   ChatBubbleLeftRight,
 } from "@medusajs/icons"
-import { Avatar, Divider, Text, clx } from "@medusajs/ui"
+import { Divider, Text, clx } from "@medusajs/ui"
 import { Collapsible as RadixCollapsible } from "radix-ui"
 import { useTranslation } from "react-i18next"
 

src/components/layout/settings-layout/settings-layout.tsx

@@ -49,20 +49,6 @@ const useSettingRoutes = (): INavItem[] => {
   )
 }
 
-const useDeveloperRoutes = (): INavItem[] => {
-  const { t } = useTranslation()
-
-  return useMemo(
-    () => [
-      {
-        label: t("apiKeyManagement.domain.secret"),
-        to: "/settings/secret-api-keys",
-      },
-    ],
-    [t]
-  )
-}
-
 const useMyAccountRoutes = (): INavItem[] => {
   const { t } = useTranslation()
 
@@ -93,7 +79,6 @@ const SettingsSidebar = () => {
   const { getMenu } = useDashboardExtension()
 
   const routes = useSettingRoutes()
-  const developerRoutes = useDeveloperRoutes()
   const myAccountRoutes = useMyAccountRoutes()
   const extensionRoutes = getMenu("settingsExtensions")
 

src/components/search/use-search-results.tsx

@@ -4,7 +4,6 @@ import { TFunction } from "i18next"
 import { useCallback, useEffect, useMemo, useState } from "react"
 import { useTranslation } from "react-i18next"
 import {
-  useApiKeys,
   useCampaigns,
   useCollections,
   useCustomerGroups,
@@ -21,11 +20,8 @@ import {
   useSalesChannels,
   useShippingProfiles,
   useStockLocations,
-  useTaxRegions,
   useUsers,
-  useVariants,
 } from "../../hooks/api"
-import { useReturnReasons } from "../../hooks/api/return-reasons"
 import { Shortcut, ShortcutType } from "../../providers/keybind-provider"
 import { useGlobalShortcuts } from "../../providers/keybind-provider/hooks"
 import { DynamicSearchResult, SearchArea } from "./types"

src/components/utilities/generic-forward-ref/generic-forward-ref.tsx

@@ -3,5 +3,5 @@ import { ReactNode, Ref, RefAttributes, forwardRef } from "react"
 export function genericForwardRef<T, P = {}>(
   render: (props: P, ref: Ref<T>) => ReactNode
 ): (props: P & RefAttributes<T>) => ReactNode {
-  return forwardRef(render) as any
+  return forwardRef(render as any) as any
 }

src/hooks/api/claims.tsx

@@ -234,7 +234,7 @@ export const useUpdateClaimInboundItem = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminClaimResponse,
+    HttpTypes.AdminClaimReturnPreviewResponse,
     FetchError,
     HttpTypes.AdminUpdateClaimInboundItem & { actionId: string }
   >
@@ -264,7 +264,7 @@ export const useUpdateClaimInboundItem = (
 export const useRemoveClaimInboundItem = (
   id: string,
   orderId: string,
-  options?: UseMutationOptions<HttpTypes.AdminClaimResponse, FetchError, string>
+  options?: UseMutationOptions<HttpTypes.AdminClaimReturnPreviewResponse, FetchError, string>
 ) => {
   return useMutation({
     mutationFn: (actionId: string) =>
@@ -292,7 +292,7 @@ export const useAddClaimInboundShipping = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminClaimResponse,
+    HttpTypes.AdminClaimReturnPreviewResponse,
     FetchError,
     HttpTypes.AdminClaimAddInboundShipping
   >
@@ -319,9 +319,9 @@ export const useUpdateClaimInboundShipping = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminClaimResponse,
+    HttpTypes.AdminClaimPreviewResponse,
     FetchError,
-    HttpTypes.AdminClaimUpdateInboundShipping
+    HttpTypes.AdminClaimUpdateInboundShipping & { actionId: string }
   >
 ) => {
   return useMutation({
@@ -348,7 +348,7 @@ export const useUpdateClaimInboundShipping = (
 export const useDeleteClaimInboundShipping = (
   id: string,
   orderId: string,
-  options?: UseMutationOptions<HttpTypes.AdminClaimResponse, FetchError, string>
+  options?: UseMutationOptions<HttpTypes.AdminClaimReturnPreviewResponse, FetchError, string>
 ) => {
   return useMutation({
     mutationFn: (actionId: string) =>
@@ -480,9 +480,9 @@ export const useUpdateClaimOutboundShipping = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminClaimResponse,
+    HttpTypes.AdminClaimPreviewResponse,
     FetchError,
-    HttpTypes.AdminClaimUpdateOutboundShipping
+    HttpTypes.AdminClaimUpdateOutboundShipping & { actionId: string }
   >
 ) => {
   return useMutation({
@@ -567,7 +567,7 @@ export const useClaimConfirmRequest = (
 export const useCancelClaimRequest = (
   id: string,
   orderId: string,
-  options?: UseMutationOptions<HttpTypes.AdminClaimResponse, FetchError>
+  options?: UseMutationOptions<HttpTypes.AdminClaimDeleteResponse, FetchError>
 ) => {
   return useMutation({
     mutationFn: () => sdk.admin.claim.cancelRequest(id),

src/hooks/api/customer-groups.tsx

@@ -7,7 +7,7 @@ import {
   useMutation,
   useQuery,
 } from "@tanstack/react-query"
-import { fetchQuery, sdk } from "../../lib/client"
+import { fetchQuery } from "../../lib/client"
 import { queryClient } from "../../lib/query-client"
 import { queryKeysFactory } from "../../lib/query-key-factory"
 import { customersQueryKeys } from "./customers"

src/hooks/api/exchanges.tsx

@@ -42,7 +42,7 @@ export const useExchanges = (
   query?: HttpTypes.AdminExchangeListParams,
   options?: Omit<
     UseQueryOptions<
-      HttpTypes.AdminExchangeListParams,
+      HttpTypes.AdminExchangeListResponse,
       FetchError,
       HttpTypes.AdminExchangeListResponse,
       QueryKey
@@ -122,7 +122,7 @@ export const useAddExchangeInboundItems = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminExchangeResponse,
+    HttpTypes.AdminExchangeReturnResponse,
     FetchError,
     HttpTypes.AdminAddExchangeInboundItems
   >
@@ -144,7 +144,7 @@ export const useUpdateExchangeInboundItem = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminExchangeResponse,
+    HttpTypes.AdminExchangeReturnResponse,
     FetchError,
     HttpTypes.AdminUpdateExchangeInboundItem & { actionId: string }
   >
@@ -170,7 +170,7 @@ export const useRemoveExchangeInboundItem = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminExchangeResponse,
+    HttpTypes.AdminExchangeReturnResponse,
     FetchError,
     string
   >
@@ -201,7 +201,7 @@ export const useAddExchangeInboundShipping = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminExchangeResponse,
+    HttpTypes.AdminExchangeReturnResponse,
     FetchError,
     HttpTypes.AdminExchangeAddInboundShipping
   >
@@ -223,9 +223,9 @@ export const useUpdateExchangeInboundShipping = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminExchangeResponse,
+    HttpTypes.AdminExchangeReturnResponse,
     FetchError,
-    HttpTypes.AdminExchangeUpdateInboundShipping
+    HttpTypes.AdminExchangeUpdateInboundShipping & { actionId: string }
   >
 ) => {
   return useMutation({
@@ -248,7 +248,7 @@ export const useDeleteExchangeInboundShipping = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminExchangeResponse,
+    HttpTypes.AdminExchangeReturnResponse,
     FetchError,
     string
   >
@@ -368,9 +368,9 @@ export const useUpdateExchangeOutboundShipping = (
   id: string,
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminExchangeResponse,
+    HttpTypes.AdminExchangePreviewResponse,
     FetchError,
-    HttpTypes.AdminExchangeUpdateOutboundShipping
+    HttpTypes.AdminExchangeUpdateOutboundShipping & { actionId: string }
   >
 ) => {
   return useMutation({
@@ -449,7 +449,7 @@ export const useExchangeConfirmRequest = (
 export const useCancelExchangeRequest = (
   id: string,
   orderId: string,
-  options?: UseMutationOptions<HttpTypes.AdminExchangeResponse, FetchError>
+  options?: UseMutationOptions<HttpTypes.AdminExchangeDeleteResponse, FetchError>
 ) => {
   return useMutation({
     mutationFn: () => sdk.admin.exchange.cancelRequest(id),

src/hooks/api/order-edits.tsx

@@ -12,7 +12,7 @@ import { inventoryItemsQueryKeys } from "./inventory.tsx"
 export const useCreateOrderEdit = (
   orderId: string,
   options?: UseMutationOptions<
-    HttpTypes.AdminOrderEditPreviewResponse,
+    HttpTypes.AdminOrderEditResponse,
     FetchError,
     HttpTypes.AdminInitiateOrderEditRequest
   >
@@ -131,7 +131,7 @@ export const useCancelOrderEdit = (
       })
 
       queryClient.invalidateQueries({
-        queryKey: ordersQueryKeys.lineItems(id),
+        queryKey: ordersQueryKeys.lineItems(orderId),
       })
       options?.onSuccess?.(data, variables, context)
     },

src/hooks/api/price-preferences.tsx

@@ -74,11 +74,11 @@ export const useUpsertPricePreference = (
   >
 ) => {
   return useMutation({
-    mutationFn: (payload) => {
+    mutationFn: (payload: HttpTypes.AdminUpdatePricePreference | HttpTypes.AdminCreatePricePreference) => {
       if (id) {
-        return sdk.admin.pricePreference.update(id, payload, query)
+        return sdk.admin.pricePreference.update(id, payload as HttpTypes.AdminUpdatePricePreference, query)
       }
-      return sdk.admin.pricePreference.create(payload, query)
+      return sdk.admin.pricePreference.create(payload as HttpTypes.AdminCreatePricePreference, query)
     },
     onSuccess: (data, variables, context) => {
       queryClient.invalidateQueries({

src/hooks/api/reservations.tsx

@@ -6,7 +6,7 @@ import {
   useQuery,
 } from "@tanstack/react-query"
 import { HttpTypes } from "@medusajs/types"
-import { fetchQuery, sdk } from "../../lib/client"
+import { fetchQuery } from "../../lib/client"
 import { queryClient } from "../../lib/query-client"
 import { queryKeysFactory } from "../../lib/query-key-factory"
 import {

src/hooks/api/shipping-profiles.tsx

@@ -65,14 +65,17 @@ export const useShippingProfile = (
     ...options,
   })
 
+  const shipping_profile = data?.shipping_profile
+    ? {
+        ...data.shipping_profile,
+        name: data.shipping_profile.name?.includes(":")
+          ? data.shipping_profile.name.split(":")[1]
+          : data.shipping_profile.name,
+      }
+    : undefined
+
   return {
-    ...data,
-    shipping_profile: {
-      ...data?.shipping_profile,
-      name: data?.shipping_profile.name.includes(":")
-        ? data?.shipping_profile.name.split(":")[1]
-        : data?.shipping_profile.name,
-    },
+    shipping_profile,
     ...rest,
   }
 }