asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(dashboard,types): Fix TS errors (#10457)

Browse Source 
**What**
- Fixes TS erros in dashboard project
- Updates incorrect HTTP Invite types
- Fixes incorrectly formatted dates in dashboard
This commit is contained in:
Kasper Fabricius Kristensen
2024-12-08 11:51:13 +00:00
committed by GitHub
parent 55f5ce4690
commit 864f53011b
28 changed files with 120 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/admin/dashboard/src/routes/orders/order-create-edit/components/order-edit-create-form/order-edit-items-section.tsx
+11 -8
View File
@@ -1,15 +1,15 @@
import { useMemo, useState } from "react"
import { AdminOrder, AdminOrderPreview } from "@medusajs/types"
import { Button, Heading, Input, toast } from "@medusajs/ui"
import { useMemo, useState } from "react"
import { useTranslation } from "react-i18next"
import {
RouteFocusModal,
StackedFocusModal,
useStackedModal,
} from "../../../../../components/modals"
import { useAddOrderEditItems } from "../../../../../hooks/api/order-edits"
import { AddOrderEditItemsTable } from "../add-order-edit-items-table"
import { OrderEditItem } from "./order-edit-item"
import { useAddOrderEditItems } from "../../../../../hooks/api/order-edits"
type ExchangeInboundSectionProps = {
order: AdminOrder
@@ -39,16 +39,19 @@ export const OrderEditItemsSection = ({
* CALLBACKS
*/
const onItemsSelected = async () => {
try {
await addItems({
await addItems(
{
items: addedVariants.map((i) => ({
variant_id: i,
quantity: 1,
})),
})
} catch (e) {
toast.error(e.message)
}
},
{
onError: (e) => {
toast.error(e.message)
},
}
)
setIsOpen("inbound-items", false)
}
packages/admin/dashboard/src/routes/orders/order-detail/components/order-summary-section/order-summary-section.tsx
+2 -3
View File
@@ -38,7 +38,6 @@ import {
import { AdminReservation } from "@medusajs/types/src/http"
import { AdminPaymentCollection } from "../../../../../../../../core/types/dist/http/payment/admin/entities"
import { ActionMenu } from "../../../../../components/common/action-menu"
import { ButtonMenu } from "../../../../../components/common/button-menu/button-menu"
import { Thumbnail } from "../../../../../components/common/thumbnail"
import { useClaims } from "../../../../../hooks/api/claims"
import { useExchanges } from "../../../../../hooks/api/exchanges"
@@ -193,7 +192,7 @@ export const OrderSummarySection = ({ order }: OrderSummarySectionProps) => {
{t("orders.returns.receive.action")}
</Button>
) : (
<ButtonMenu
<ActionMenu
groups={[
{
actions: receivableReturns.map((r) => {
@@ -225,7 +224,7 @@ export const OrderSummarySection = ({ order }: OrderSummarySectionProps) => {
<Button variant="secondary" size="small">
{t("orders.returns.receive.action")}
</Button>
</ButtonMenu>
</ActionMenu>
))}
{showAllocateButton && (
packages/admin/dashboard/src/routes/orders/order-detail/components/order-summary-section/return-info-popover.tsx
+10 -5
View File
@@ -3,7 +3,7 @@ import { AdminReturn } from "@medusajs/types"
import { Badge, Popover, Text } from "@medusajs/ui"
import { useState } from "react"
import { useTranslation } from "react-i18next"
import { formatDate } from "../../../../../components/common/date"
import { useDate } from "../../../../../hooks/use-date"
type ReturnInfoPopoverProps = {
orderReturn: AdminReturn
@@ -13,6 +13,8 @@ function ReturnInfoPopover({ orderReturn }: ReturnInfoPopoverProps) {
const { t } = useTranslation()
const [open, setOpen] = useState(false)
const { getFullDate } = useDate()
const handleMouseEnter = () => {
setOpen(true)
}
@@ -44,7 +46,7 @@ function ReturnInfoPopover({ orderReturn }: ReturnInfoPopoverProps) {
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
autoFocus={false}
className="focus-visible:outline-none align-sub"
className="align-sub focus-visible:outline-none"
>
<InformationCircleSolid />
</Popover.Trigger>
@@ -52,7 +54,7 @@ function ReturnInfoPopover({ orderReturn }: ReturnInfoPopoverProps) {
<Popover.Content
align="center"
side="top"
className="bg-ui-bg-component focus-visible:outline-none p-2"
className="bg-ui-bg-component p-2 focus-visible:outline-none"
>
<div className="">
<Badge size="2xsmall" className="mb-2" rounded="full">
@@ -64,7 +66,7 @@ function ReturnInfoPopover({ orderReturn }: ReturnInfoPopoverProps) {
{t(`orders.returns.returnRequested`)}
</span>
{" · "}
{formatDate(orderReturn.requested_at)}
{getFullDate({ date: orderReturn.requested_at, includeTime: true })}
</Text>
<Text size="xsmall">
@@ -73,7 +75,10 @@ function ReturnInfoPopover({ orderReturn }: ReturnInfoPopoverProps) {
</span>
{" · "}
{orderReturn.received_at
? formatDate(orderReturn.received_at)
? getFullDate({
date: orderReturn.received_at,
includeTime: true,
})
: "-"}
</Text>
</div>
packages/admin/dashboard/src/routes/tax-regions/common/hooks.ts
+2 -10
View File
@@ -32,20 +32,12 @@ export const useDeleteTaxRegionAction = ({
await mutateAsync(undefined, {
onSuccess: () => {
toast.success(t("general.success"), {
description: t("taxRegions.delete.successToast"),
dismissable: true,
dismissLabel: t("actions.close"),
})
toast.success(t("taxRegions.delete.successToast"))
navigate(to, { replace: true })
},
onError: (e) => {
toast.error(t("general.error"), {
description: e.message,
dismissable: true,
dismissLabel: t("actions.close"),
})
toast.error(e.message)
},
})
}
packages/admin/dashboard/src/routes/users/user-edit/components/edit-user-form/edit-user-form.tsx
+2 -2
View File
@@ -4,14 +4,14 @@ import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next"
import * as zod from "zod"
import { UserDTO } from "@medusajs/types"
import { HttpTypes } from "@medusajs/types"
import { Form } from "../../../../../components/common/form"
import { RouteDrawer, useRouteModal } from "../../../../../components/modals"
import { KeyboundForm } from "../../../../../components/utilities/keybound-form"
import { useUpdateUser } from "../../../../../hooks/api/users"
type EditUserFormProps = {
user: UserDTO
user: HttpTypes.AdminUser
}
const EditUserFormSchema = zod.object({
packages/admin/dashboard/src/routes/users/user-invite/components/invite-user-form/invite-user-form.tsx
+4 -4
View File
@@ -1,6 +1,6 @@
import { zodResolver } from "@hookform/resolvers/zod"
import { ArrowPath, Link, Trash } from "@medusajs/icons"
import { InviteDTO } from "@medusajs/types"
import { HttpTypes } from "@medusajs/types"
import {
Alert,
Button,
@@ -70,7 +70,7 @@ export const InviteUserForm = () => {
const columns = useColumns()
const { table } = useDataTable({
data: (invites ?? []) as InviteDTO[],
data: invites ?? [],
columns,
count,
enablePagination: true,
@@ -185,7 +185,7 @@ export const InviteUserForm = () => {
)
}
const InviteActions = ({ invite }: { invite: InviteDTO }) => {
const InviteActions = ({ invite }: { invite: HttpTypes.AdminInvite }) => {
const { mutateAsync: revokeAsync } = useDeleteInvite(invite.id)
const { mutateAsync: resendAsync } = useResendInvite(invite.id)
@@ -253,7 +253,7 @@ const InviteActions = ({ invite }: { invite: InviteDTO }) => {
)
}
const columnHelper = createColumnHelper<InviteDTO>()
const columnHelper = createColumnHelper<HttpTypes.AdminInvite>()
const useColumns = () => {
const { t } = useTranslation()
packages/admin/dashboard/src/routes/users/user-metadata/user-metadata.tsx
+2 -2
View File
@@ -7,8 +7,8 @@ import { useUpdateUser, useUser } from "../../../hooks/api"
export const UserMetadata = () => {
const { id } = useParams()
const { user, isPending, isError, error } = useUser(id)
const { mutateAsync, isPending: isMutating } = useUpdateUser(id)
const { user, isPending, isError, error } = useUser(id!)
const { mutateAsync, isPending: isMutating } = useUpdateUser(id!)
if (isError) {
throw error