Fixed deleting of jobs and added more detail to error result atoms. RPS-23
This commit is contained in:
@@ -25,6 +25,8 @@ export function DeleteJobAtom({ setSelectedJobId, jobId }) {
|
|||||||
});
|
});
|
||||||
const result = await deleteJob({
|
const result = await deleteJob({
|
||||||
variables: { jobId: jobId },
|
variables: { jobId: jobId },
|
||||||
|
refetchQueries: ["QUERY_ALL_JOBS_PAGINATED"],
|
||||||
|
awaitRefetchQueries: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (result.errors) {
|
if (result.errors) {
|
||||||
|
|||||||
@@ -37,7 +37,13 @@ export default function JobPartsGraphAtom({
|
|||||||
}, [job, price]);
|
}, [job, price]);
|
||||||
|
|
||||||
if (loading) return <Skeleton active />;
|
if (loading) return <Skeleton active />;
|
||||||
if (!job) return <ErrorResultAtom title="Error displaying job data." />;
|
if (!job)
|
||||||
|
return (
|
||||||
|
<ErrorResultAtom
|
||||||
|
title="Error displaying parts graphs."
|
||||||
|
errorMessage="It looks like this job doesn't exist."
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -10,7 +10,13 @@ import DeleteJobAtom from "../../atoms/delete-job/delete-job.atom";
|
|||||||
export default function JobsDetailDescriptionMolecule({ loading, job }) {
|
export default function JobsDetailDescriptionMolecule({ loading, job }) {
|
||||||
if (loading) return <Skeleton active />;
|
if (loading) return <Skeleton active />;
|
||||||
|
|
||||||
if (!job) return <ErrorResultAtom title="Error displaying job data." />;
|
if (!job)
|
||||||
|
return (
|
||||||
|
<ErrorResultAtom
|
||||||
|
title="Error displaying job header data."
|
||||||
|
errorMessage="It looks like this job doesn't exist."
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import React, { useState } from "react";
|
|||||||
import ipcTypes from "../../../ipc.types";
|
import ipcTypes from "../../../ipc.types";
|
||||||
import { alphaSort } from "../../../util/sorters";
|
import { alphaSort } from "../../../util/sorters";
|
||||||
import CurrencyFormatterAtom from "../../atoms/currency-formatter/currency-formatter.atom";
|
import CurrencyFormatterAtom from "../../atoms/currency-formatter/currency-formatter.atom";
|
||||||
|
import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
|
||||||
import IgnoreJobLine from "../../atoms/ignore-job-line/ignore-job-line.atom";
|
import IgnoreJobLine from "../../atoms/ignore-job-line/ignore-job-line.atom";
|
||||||
import partTypeConverterAtom from "../../atoms/part-type-converter/part-type-converter.atom";
|
import partTypeConverterAtom from "../../atoms/part-type-converter/part-type-converter.atom";
|
||||||
import PriceDiffPcFormatterAtom from "../../atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom";
|
import PriceDiffPcFormatterAtom from "../../atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom";
|
||||||
@@ -13,6 +14,14 @@ export default function JobLinesTableMolecule({ loading, job }) {
|
|||||||
const [searchText, setSearchText] = useState("");
|
const [searchText, setSearchText] = useState("");
|
||||||
const [filters, setFilters] = useState({ ignore: ["false"] });
|
const [filters, setFilters] = useState({ ignore: ["false"] });
|
||||||
|
|
||||||
|
if (!job) {
|
||||||
|
return (
|
||||||
|
<ErrorResultAtom
|
||||||
|
title="Error Displaying Job Lines"
|
||||||
|
errorMessage="It looks like this job doesn't exist."
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
const { joblines } = job;
|
const { joblines } = job;
|
||||||
const columns = [
|
const columns = [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { createStructuredSelector } from "reselect";
|
|||||||
import { selectSelectedJobTargetPc } from "../../../redux/application/application.selectors";
|
import { selectSelectedJobTargetPc } from "../../../redux/application/application.selectors";
|
||||||
import {
|
import {
|
||||||
CalculateJobRpsDollars,
|
CalculateJobRpsDollars,
|
||||||
CalculateJobRpsPc
|
CalculateJobRpsPc,
|
||||||
} from "../../../util/CalculateJobRps";
|
} from "../../../util/CalculateJobRps";
|
||||||
import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
|
import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
|
||||||
|
|
||||||
@@ -38,7 +38,13 @@ export function JobsTargetsStatsMolecule({
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (loading) return <Skeleton active />;
|
if (loading) return <Skeleton active />;
|
||||||
if (!job) return <ErrorResultAtom title="Error displaying job data." />;
|
if (!job)
|
||||||
|
return (
|
||||||
|
<ErrorResultAtom
|
||||||
|
title="Error displaying job totals."
|
||||||
|
errorMessage="It looks like this job doesn't exist."
|
||||||
|
/>
|
||||||
|
);
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
|
|||||||
@@ -29,10 +29,10 @@ export function JobsDetailOrganism({ selectedJobId, setSelectedJobTargetPc }) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (data)
|
if (data && data.jobs_by_pk)
|
||||||
setSelectedJobTargetPc({
|
setSelectedJobTargetPc({
|
||||||
group: data.jobs_by_pk.group,
|
group: data.jobs_by_pk && data.jobs_by_pk.group,
|
||||||
v_age: data.jobs_by_pk.v_age,
|
v_age: data.jobs_by_pk && data.jobs_by_pk.v_age,
|
||||||
});
|
});
|
||||||
}, [data, setSelectedJobTargetPc]);
|
}, [data, setSelectedJobTargetPc]);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user