mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-17 21:30:31 +00:00
fix: retrieve the build org job state
This commit is contained in:
@@ -25,7 +25,7 @@ function SetupInitializingForm({
|
||||
const [isJobDone, setIsJobDone] = React.useState(false);
|
||||
|
||||
const {
|
||||
data: { running, queued, failed, completed },
|
||||
data: { isRunning, isWaiting, isFailed, isCompleted },
|
||||
isFetching: isJobFetching,
|
||||
} = useJob(organization?.build_job_id, {
|
||||
refetchInterval: 2000,
|
||||
@@ -33,11 +33,11 @@ function SetupInitializingForm({
|
||||
});
|
||||
|
||||
React.useEffect(() => {
|
||||
if (completed) {
|
||||
if (isCompleted) {
|
||||
refetch();
|
||||
setIsJobDone(true);
|
||||
}
|
||||
}, [refetch, completed, setOrganizationSetupCompleted]);
|
||||
}, [refetch, isCompleted, setOrganizationSetupCompleted]);
|
||||
|
||||
React.useEffect(() => {
|
||||
if (isSuccess && isJobDone) {
|
||||
@@ -48,11 +48,11 @@ function SetupInitializingForm({
|
||||
|
||||
return (
|
||||
<div class="setup-initializing-form">
|
||||
{failed ? (
|
||||
{isFailed ? (
|
||||
<SetupInitializingFailed />
|
||||
) : running || queued || isJobFetching ? (
|
||||
) : isRunning || isWaiting || isJobFetching ? (
|
||||
<SetupInitializingRunning />
|
||||
) : completed ? (
|
||||
) : isCompleted ? (
|
||||
<SetupInitializingCompleted />
|
||||
) : (
|
||||
<SetupInitializingFailed />
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// @ts-nocheck
|
||||
import { transformToCamelCase } from '@/utils';
|
||||
import { useRequestQuery } from '../useQueryRequest';
|
||||
|
||||
/**
|
||||
@@ -7,9 +8,9 @@ import { useRequestQuery } from '../useQueryRequest';
|
||||
export function useJob(jobId, props = {}) {
|
||||
return useRequestQuery(
|
||||
['JOB', jobId],
|
||||
{ method: 'get', url: `jobs/${jobId}` },
|
||||
{ method: 'get', url: `organization/build/${jobId}` },
|
||||
{
|
||||
select: (res) => res.data.job,
|
||||
select: (res) => transformToCamelCase(res.data),
|
||||
defaultData: {},
|
||||
...props,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user