admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2025-08-01' into feature/IO-3255-simplified-part-management

Browse Source
This commit is contained in:
Dave Richer
2025-07-31 15:47:07 -04:00
parent d0370d3e60 66c51a4be5
commit dd20871707
2 changed files with 8 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx
View File

@@ -1,44 +1,17 @@
import { PushpinFilled, PushpinOutlined } from "@ant-design/icons"; import { PushpinFilled, PushpinOutlined } from "@ant-design/icons";
import { useMutation } from "@apollo/client"; import { useMutation } from "@apollo/client";
import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
import { UPDATE_NOTE } from "../../graphql/notes.queries"; import { UPDATE_NOTE } from "../../graphql/notes.queries";
function JobNotesPinToggle({ note }) { function JobNotesPinToggle({ note }) {
const [updateNote] = useMutation(UPDATE_NOTE, { const [updateNote] = useMutation(UPDATE_NOTE);
update(cache, { data: { updateNote: updatedNote } }) {
try {
const existingJob = cache.readQuery({
query: GET_JOB_BY_PK,
variables: { id: note.jobid }
});
if (existingJob) {
cache.writeQuery({
query: GET_JOB_BY_PK,
variables: { id: note.jobid },
data: {
...existingJob,
job: {
...existingJob.job,
notes: updatedNote.pinned
? [updatedNote, ...existingJob.job.notes]
: existingJob.job.notes.filter((n) => n.id !== updatedNote.id)
}
}
});
}
} catch (error) {
// Query not yet executed is most likely. No logging as this isn't a fatal error.
}
}
});
const handlePinToggle = () => { const handlePinToggle = () => {
updateNote({ updateNote({
variables: { variables: {
noteId: note.id, noteId: note.id,
note: { pinned: !note.pinned } note: { pinned: !note.pinned }
} },
refetchQueries: ["GET_JOB_BY_PK", "QUERY_JOB_CARD_DETAILS", "QUERY_PARTS_QUEUE_CARD_DETAILS"]
}); });
}; };

34
client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
View File

@@ -1,4 +1,4 @@
import { useMutation } from "@apollo/client"; import { useApolloClient, useMutation } from "@apollo/client";
import { Form, Modal } from "antd"; import { Form, Modal } from "antd";
import { useEffect } from "react"; import { useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
@@ -43,6 +43,8 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
const [form] = Form.useForm(); const [form] = Form.useForm();
const { client } = useApolloClient();
useEffect(() => { useEffect(() => {
//Required to prevent infinite looping. //Required to prevent infinite looping.
if (existingNote && open) { if (existingNote && open) {
@@ -67,34 +69,8 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
noteId: existingNote.id, noteId: existingNote.id,
note: values note: values
}, },
update(cache, { data: { updateNote: updatedNote } }) { refetchQueries: ["GET_JOB_BY_PK", "QUERY_JOB_CARD_DETAILS", "QUERY_PARTS_QUEUE_CARD_DETAILS"]
try { }).then(() => {
const existingJob = cache.readQuery({
query: GET_JOB_BY_PK,
variables: { id: jobId }
});
if (existingJob) {
cache.writeQuery({
query: GET_JOB_BY_PK,
variables: { id: jobId },
data: {
...existingJob,
job: {
...existingJob.job,
notes: updatedNote.pinned
? [updatedNote, ...existingJob.job.notes]
: existingJob.job.notes.filter((n) => n.id !== updatedNote.id)
}
}
});
}
} catch (error) {
// Cache miss is okay, query hasn't been executed yet
console.log("Cache miss for GET_JOB_BY_PK");
}
}
}).then((r) => {
notification["success"]({ notification["success"]({
message: t("notes.successes.updated") message: t("notes.successes.updated")
}); });