Skip to content

Commit

Permalink
fix: hooks order in task list
Browse files Browse the repository at this point in the history
  • Loading branch information
martastain committed Dec 13, 2023
1 parent 08c46cd commit cb619a6
Showing 1 changed file with 20 additions and 22 deletions.
42 changes: 20 additions & 22 deletions src/containers/taskList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const TaskList = ({ style = {}, autoSelect = false }) => {
data: tasksData = [],
isFetching,
isError,
error,
} = useGetTasksQuery({ projectName, folderIds, userName }, { skip: !folderIds.length })

const selectedTasks = useMemo(() => {
Expand Down Expand Up @@ -94,6 +93,25 @@ const TaskList = ({ style = {}, autoSelect = false }) => {
dispatch(setFocusedTasks({ ids: [event.value] }))
}

// CONTEXT MENU
const ctxMenuItems = [
{
label: 'Detail',
command: () => setShowDetail(true),
icon: 'database',
},
]

const [ctxMenuShow] = useCreateContext(ctxMenuItems)

// create 10 dummy rows
const loadingData = useMemo(() => {
return Array.from({ length: 6 }, (_, i) => ({
key: i,
data: {},
}))
}, [])

//
// Render
//
Expand Down Expand Up @@ -121,8 +139,7 @@ const TaskList = ({ style = {}, autoSelect = false }) => {
}

if (isError) {
toast.error(`Unable to load tasks. ${error}`)

toast.error(`Unable to load tasks.`)
return <>Error</>
}

Expand All @@ -149,25 +166,6 @@ const TaskList = ({ style = {}, autoSelect = false }) => {
dispatch(setPairing([]))
}

// CONTEXT MENU
const ctxMenuItems = [
{
label: 'Detail',
command: () => setShowDetail(true),
icon: 'database',
},
]

const [ctxMenuShow] = useCreateContext(ctxMenuItems)

// create 10 dummy rows
const loadingData = useMemo(() => {
return Array.from({ length: 6 }, (_, i) => ({
key: i,
data: {},
}))
}, [])

if (isFetching) {
tasksData = loadingData
}
Expand Down

0 comments on commit cb619a6

Please sign in to comment.