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

fix(admin-ui): flickering Timeline (#4231)

Browse Source 
* fix(admin-ui): prevent Timeline flickering while loading

* chore: changesets

---------

Co-authored-by: fPolic <frane@medusajs.com>
This commit is contained in:
Frane Polić
2023-06-07 10:58:30 +02:00
committed by GitHub
parent 2db6a1d407
commit 1bd2e7a5be
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/admin-ui/ui/src/components/molecules/timeline-events/order-edit/created.tsx
View File

@@ -3,7 +3,6 @@ import {
useAdminCancelOrderEdit,
useAdminConfirmOrderEdit,
useAdminDeleteOrderEdit,
useAdminOrderEdit,
useAdminUser,
} from "medusa-react"
import React, { useContext } from "react"
@@ -48,9 +47,9 @@ const EditCreated: React.FC<EditCreatedProps> = ({ event }) => {
const { isModalVisible, showModal, setActiveOrderEdit } =
useContext(OrderEditContext)
const { order_edit: orderEdit, isFetching } = useAdminOrderEdit(event.edit.id)
const orderEdit = event.edit
const { type, user_id } = getInfo(orderEdit || event.edit)
const { type, user_id } = getInfo(orderEdit)
const notification = useNotification()
@@ -60,9 +59,9 @@ const EditCreated: React.FC<EditCreatedProps> = ({ event }) => {
const forceConfirmDialog = useImperativeDialog()
const deleteOrderEdit = useAdminDeleteOrderEdit(event.edit.id)
const cancelOrderEdit = useAdminCancelOrderEdit(event.edit.id)
const confirmOrderEdit = useAdminConfirmOrderEdit(event.edit.id)
const deleteOrderEdit = useAdminDeleteOrderEdit(orderEdit.id)
const cancelOrderEdit = useAdminCancelOrderEdit(orderEdit.id)
const confirmOrderEdit = useAdminConfirmOrderEdit(orderEdit.id)
const onDeleteOrderEditClicked = () => {
deleteOrderEdit.mutate(undefined, {
@@ -120,7 +119,7 @@ const EditCreated: React.FC<EditCreatedProps> = ({ event }) => {
}
// hide last created edit while editing and prevent content flashing while loading
if ((isModalVisible && orderEdit?.status === "created") || isFetching) {
if (isModalVisible && orderEdit?.status === "created") {
return null
}