Compare commits

...

19 Commits

Author SHA1 Message Date
Allan Carr
fbaf47b89b IO-3428 Media Selector
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2025-10-31 15:13:29 -07:00
Dave Richer
907f291f90 Merged in release/2025-10-24 (pull request #2640)
Release/2025 10 24 into master-AIO - IO-3412 - IO-3398
2025-10-25 01:41:09 +00:00
Patrick Fic
abce19530f Merged in feature/IO-3398-bill-line-select-display (pull request #2638)
IO-3398 Bill line search select will now show price in select value.
2025-10-23 18:49:29 +00:00
Patrick Fic
1fd9b68320 IO-3398 Bill line search select will now show price in select value. 2025-10-23 11:48:35 -07:00
Patrick Fic
cff1afe605 Merged in feature/IO-3412-costing-tax-rate-typo (pull request #2637)
IO-3412 Resolve tax rate typo in job costing.
2025-10-23 16:21:03 +00:00
Patrick Fic
b337309f94 IO-3412 Resolve tax rate typo in job costing. 2025-10-23 09:17:15 -07:00
Patrick Fic
77f041b0f1 Merged in feature/IO-3407-us-qbd-tax-adj-quantity (pull request #2636)
IO-3407 Remove tax code ref for adjustment as well.
2025-10-17 22:09:11 +00:00
Patrick Fic
68be8670b4 IO-3407 Remove tax code ref for adjustment as well. 2025-10-17 15:06:58 -07:00
Patrick Fic
745c429f08 Merged in feature/IO-3407-us-qbd-tax-adj-quantity (pull request #2635)
IO-3407 Resolve quantity required for QBD sales tax adj.
2025-10-17 21:57:23 +00:00
Patrick Fic
cc9e4740de IO-3407 Resolve quantity required for QBD sales tax adj. 2025-10-17 14:56:44 -07:00
Dave Richer
06ebcbaa07 Merged in release/2025-10-17 (pull request #2633)
Release/2025 10 17  into Master-AIO - IO-3373 - IO-3404 - IO-3385
2025-10-17 18:59:37 +00:00
Dave
42427c4569 release/2025-10-17 - Refine Job Totals Logging (switch from error to warn for USA key issues, normalize case on logging level) 2025-10-17 14:56:21 -04:00
Dave Richer
d5f921ed35 Merged in feature/IO-3385-Remove-CASL-From-Rome (pull request #2631)
feature/IO-3385-Remove-CASL-From-Rome - Remove CASL Report from Rome Customers.
2025-10-15 15:48:13 +00:00
Dave Richer
54850e8ee2 Merged in feature/IO-3404-Seamless-Logout (pull request #2629)
feature/IO-3404-Seamless-Logout - Implement Seamless Logout
2025-10-15 15:33:29 +00:00
Dave
199ddc7d9e feature/IO-3404-Seamless-Logout - Implement Seamless Logout 2025-10-15 11:31:34 -04:00
Dave Richer
e3337bacea Merged in hotfix/2025-10-10 (pull request #2626)
Hotfix/2025 10 10
2025-10-10 20:05:08 +00:00
Allan Carr
29df829120 Merged in feature/IO-3373-Dashboard-Component-Redux-Fix (pull request #2622)
IO-3373 Dashboard Component Refresh Cyclic object fix

Approved-by: Dave Richer
2025-10-10 16:08:21 +00:00
Allan Carr
d2b6054e60 Merged in feature/IO-3386-carfax-rps (pull request #2620)
IO-3368 CARFAX Adjustments for OP_CODE [PENDING APPROVAL]
2025-10-09 17:28:31 +00:00
Allan Carr
7004ed9880 IO-3373 Dashboard Component Refresh Cyclic object fix
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2025-10-09 09:13:03 -07:00
14 changed files with 442 additions and 118 deletions

View File

@@ -12,6 +12,7 @@ import GlobalLoadingBar from "../components/global-loading-bar/global-loading-ba
import { setDarkMode } from "../redux/application/application.actions";
import { selectDarkMode } from "../redux/application/application.selectors";
import { selectCurrentUser } from "../redux/user/user.selectors.js";
import { signOutStart } from "../redux/user/user.actions";
import client from "../utils/GraphQLClient";
import App from "./App";
import getTheme from "./themeProvider";
@@ -20,14 +21,13 @@ import getTheme from "./themeProvider";
const config = {
core: {
authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
key: "anon" // Default key, overridden dynamically by SplitClientProvider
key: "anon"
}
};
// Custom provider to manage the Split client key based on imexshopid from Redux
function SplitClientProvider({ children }) {
const imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
const splitClient = useSplitClient({ key: imexshopid || "anon" }); // Use imexshopid or fallback to "anon"
const imexshopid = useSelector((state) => state.user.imexshopid);
const splitClient = useSplitClient({ key: imexshopid || "anon" });
useEffect(() => {
if (splitClient && imexshopid) {
console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
@@ -36,40 +36,66 @@ function SplitClientProvider({ children }) {
return children;
}
const mapDispatchToProps = (dispatch) => ({
setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode))
});
const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser
});
function AppContainer({ currentUser, setDarkMode }) {
const mapDispatchToProps = (dispatch) => ({
setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode)),
signOutStart: () => dispatch(signOutStart())
});
function AppContainer({ currentUser, setDarkMode, signOutStart }) {
const { t } = useTranslation();
const isDarkMode = useSelector(selectDarkMode);
const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);
// Update data-theme attribute when dark mode changes
// Global seamless logout listener with redirect to /signin
useEffect(() => {
const handleSeamlessLogout = (event) => {
if (event.data?.type !== "seamlessLogoutRequest") return;
const requestOrigin = event.origin;
if (currentUser?.authorized !== true) {
window.parent.postMessage(
{ type: "seamlessLogoutResponse", status: "already_logged_out" },
requestOrigin || "*"
);
return;
}
signOutStart();
window.parent.postMessage({ type: "seamlessLogoutResponse", status: "logged_out" }, requestOrigin || "*");
};
window.addEventListener("message", handleSeamlessLogout);
return () => {
window.removeEventListener("message", handleSeamlessLogout);
};
}, [signOutStart, currentUser]);
// Update data-theme attribute
useEffect(() => {
document.documentElement.setAttribute("data-theme", isDarkMode ? "dark" : "light");
return () => document.documentElement.removeAttribute("data-theme");
}, [isDarkMode]);
// Sync Redux darkMode with localStorage on user change
// Sync darkMode with localStorage
useEffect(() => {
if (currentUser?.uid) {
const savedMode = localStorage.getItem(`dark-mode-${currentUser.uid}`);
if (savedMode !== null) {
setDarkMode(JSON.parse(savedMode));
} else {
setDarkMode(false); // default to light mode
setDarkMode(false);
}
} else {
setDarkMode(false);
}
}, [currentUser?.uid]);
}, [currentUser?.uid, setDarkMode]);
// Persist darkMode to localStorage when it or user changes
// Persist darkMode
useEffect(() => {
if (currentUser?.uid) {
localStorage.setItem(`dark-mode-${currentUser.uid}`, JSON.stringify(isDarkMode));

View File

@@ -45,7 +45,7 @@ export function BillEnterModalLinesComponent({
title: t("billlines.fields.jobline"),
dataIndex: "joblineid",
editable: true,
width: "20rem",
minWidth: "10rem",
formItemProps: (field) => {
return {
key: `${field.index}joblinename`,
@@ -71,9 +71,9 @@ export function BillEnterModalLinesComponent({
disabled={disabled}
options={lineData}
style={{
width: "20rem",
maxWidth: "20rem",
minWidth: "10rem",
//width: "10rem",
// maxWidth: "20rem",
minWidth: "20rem",
whiteSpace: "normal",
height: "auto",
minHeight: "32px" // default height of Ant Design inputs
@@ -110,7 +110,7 @@ export function BillEnterModalLinesComponent({
title: t("billlines.fields.line_desc"),
dataIndex: "line_desc",
editable: true,
width: "20rem",
minWidth: "10rem",
formItemProps: (field) => {
return {
key: `${field.index}line_desc`,
@@ -232,7 +232,7 @@ export function BillEnterModalLinesComponent({
title: t("billlines.fields.actual_cost"),
dataIndex: "actual_cost",
editable: true,
width: "8rem",
width: "10rem",
formItemProps: (field) => {
return {
@@ -357,6 +357,7 @@ export function BillEnterModalLinesComponent({
title: t("billlines.labels.deductedfromlbr"),
dataIndex: "deductedfromlbr",
editable: true,
width: "40px",
formItemProps: (field) => {
return {
valuePropName: "checked",
@@ -464,7 +465,7 @@ export function BillEnterModalLinesComponent({
title: t("billlines.fields.federal_tax_applicable"),
dataIndex: "applicable_taxes.federal",
editable: true,
width: "40px",
formItemProps: (field) => {
return {
key: `${field.index}fedtax`,
@@ -485,7 +486,7 @@ export function BillEnterModalLinesComponent({
title: t("billlines.fields.state_tax_applicable"),
dataIndex: "applicable_taxes.state",
editable: true,
width: "40px",
formItemProps: (field) => {
return {
key: `${field.index}statetax`,
@@ -503,7 +504,7 @@ export function BillEnterModalLinesComponent({
title: t("billlines.fields.local_tax_applicable"),
dataIndex: "applicable_taxes.local",
editable: true,
width: "40px",
formItemProps: (field) => {
return {
key: `${field.index}localtax`,

View File

@@ -39,30 +39,32 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
style: {
...(item.removed ? { textDecoration: "line-through" } : {})
},
name: `${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
item.oem_partno ? ` - ${item.oem_partno}` : ""
}${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim(),
label: (
<div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
<span>
{`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
item.oem_partno ? ` - ${item.oem_partno}` : ""
}${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
</span>
{InstanceRenderMgr({
rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
<span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
)
})}
<span style={{ float: "right", paddingleft: "1rem" }}>
{item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
</span>
</div>
)
name: generateLineName(item),
label: generateLineName(item)
}))
]}
{...restProps}
></Select>
);
};
function generateLineName(item) {
return (
<div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
<span>
{`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
item.oem_partno ? ` - ${item.oem_partno}` : ""
}${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
</span>
{InstanceRenderMgr({
rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
<span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
)
})}
<span style={{ float: "right", paddingleft: "1rem" }}>
{item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
</span>
</div>
);
}
export default forwardRef(BillLineSearchSelect);

View File

@@ -40,7 +40,11 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
variables: {
jobId: conversation.job_conversations[0]?.jobid
},
skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
skip:
!open ||
!conversation.job_conversations ||
conversation.job_conversations.length === 0 ||
bodyshop.uselocalmediaserver
});
const handleVisibleChange = (change) => {
@@ -48,7 +52,8 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
};
useEffect(() => {
setSelectedMedia([]);
// Instead of wiping the array (which holds media objects), just clear selection flags
setSelectedMedia((prev) => prev.map((m) => ({ ...m, isSelected: false })));
}, [setSelectedMedia, conversation]);
//Knowingly taking on the technical debt of poor implementation below. Done this way to avoid an edge case where no component may be displayed.
@@ -75,6 +80,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
<JobDocumentsLocalGalleryExternal
externalMediaState={[selectedMedia, setSelectedMedia]}
jobId={conversation.job_conversations[0]?.jobid}
context="chat"
/>
)}
</>
@@ -90,6 +96,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
<JobDocumentsLocalGalleryExternal
externalMediaState={[selectedMedia, setSelectedMedia]}
jobId={conversation.job_conversations[0]?.jobid}
context="chat"
/>
)}
</>
@@ -110,6 +117,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
trigger="click"
open={open}
onOpenChange={handleVisibleChange}
destroyOnHidden
classNames={{ root: "media-selector-popover" }}
>
<Badge count={selectedMedia.filter((s) => s.isSelected).length}>

View File

@@ -196,7 +196,7 @@ export function DashboardGridComponent({ currentUser }) {
<PageHeader
extra={
<Space>
<Button onClick={refetch}>
<Button onClick={() => refetch()}>
<SyncOutlined />
</Button>
<Dropdown menu={menu} trigger={["click"]}>

View File

@@ -67,6 +67,7 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
<JobsDocumentsLocalGalleryExternalComponent
externalMediaState={[selectedMedia, setSelectedMedia]}
jobId={emailConfig.jobid}
context="email"
/>
)}
</>
@@ -82,6 +83,7 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
<JobsDocumentsLocalGalleryExternalComponent
externalMediaState={[selectedMedia, setSelectedMedia]}
jobId={emailConfig.jobid}
context="email"
/>
)}
</>

View File

@@ -1,11 +1,12 @@
import { useEffect } from "react";
import { Gallery } from "react-grid-gallery";
import { useEffect, useMemo, useState, useCallback } from "react";
import LocalMediaGrid from "./local-media-grid.component";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { getJobMedia } from "../../redux/media/media.actions";
import { selectAllMedia } from "../../redux/media/media.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -18,41 +19,127 @@ const mapDispatchToProps = (dispatch) => ({
export default connect(mapStateToProps, mapDispatchToProps)(JobDocumentsLocalGalleryExternal);
function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia }) {
/**
* JobDocumentsLocalGalleryExternal
* Fetches and displays job-related image media using the custom LocalMediaGrid.
*
* Props:
* - jobId: string | number (required to fetch media)
* - externalMediaState: [imagesArray, setImagesFn] (state lifted to parent for shared selection)
* - getJobMedia: dispatching function to retrieve media for a job
* - allMedia: redux slice keyed by jobId containing raw media records
* - context: "chat" | "email" | other string used to drive grid behavior
*
* Notes:
* - The previous third-party gallery required a remount key (openVersion); custom grid no longer does.
* - Selection flags are preserved when media refreshes.
* - Loading state ends after transformation regardless of whether any images were found.
*/
function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia, context = "chat" }) {
const [galleryImages, setgalleryImages] = externalMediaState;
const { t } = useTranslation();
const [isLoading, setIsLoading] = useState(false);
const { t } = useTranslation(); // i18n hook retained if future translations are added
const DEBUG_LOCAL_GALLERY = false; // flip to true for verbose console logging
// Transform raw media record into a normalized image object consumed by the grid.
const transformMediaToImages = useCallback((raw) => {
return raw
.filter((m) => m.type?.mime?.startsWith("image"))
.map((m) => ({
...m,
src: m.thumbnail,
thumbnail: m.thumbnail,
fullsize: m.src,
width: 225,
height: 225,
thumbnailWidth: 225,
thumbnailHeight: 225,
caption: m.filename || m.key
}));
}, []);
// Fetch media when jobId changes (network request triggers Redux update -> documents memo recalculates).
useEffect(() => {
if (jobId) {
getJobMedia(jobId);
}
if (!jobId) return;
setIsLoading(true);
getJobMedia(jobId);
}, [jobId, getJobMedia]);
useEffect(() => {
let documents = allMedia?.[jobId]
? allMedia[jobId].reduce((acc, val) => {
if (val.type?.mime && val.type.mime.startsWith("image")) {
acc.push({ ...val, src: val.thumbnail, fullsize: val.src });
}
return acc;
}, [])
: [];
console.log(
"🚀 ~ file: jobs-documents-local-gallery.external.component.jsx:48 ~ useEffect ~ documents:",
documents
);
// Memo: transform raw redux media into gallery documents.
const documents = useMemo(
() => transformMediaToImages(allMedia?.[jobId] || []),
[allMedia, jobId, transformMediaToImages]
);
setgalleryImages(documents);
}, [allMedia, jobId, setgalleryImages, t]);
// Sync transformed documents into external state while preserving selection flags.
useEffect(() => {
const prevSelection = new Map(galleryImages.map((p) => [p.filename, p.isSelected]));
const nextImages = documents.map((d) => ({ ...d, isSelected: prevSelection.get(d.filename) || false }));
// Micro-optimization: if array length and each filename + selection flag match, skip creating a new array.
if (galleryImages.length === nextImages.length) {
let identical = true;
for (let i = 0; i < nextImages.length; i++) {
if (
galleryImages[i].filename !== nextImages[i].filename ||
galleryImages[i].isSelected !== nextImages[i].isSelected
) {
identical = false;
break;
}
}
if (identical) {
setIsLoading(false); // ensure loading stops even on no-change
if (DEBUG_LOCAL_GALLERY) {
console.log("[LocalGallery] documents unchanged", { jobId, count: documents.length });
}
return;
}
}
setgalleryImages(nextImages);
setIsLoading(false); // stop loading after transform regardless of emptiness
if (DEBUG_LOCAL_GALLERY) {
console.log("[LocalGallery] documents transformed", { jobId, count: documents.length });
}
}, [documents, setgalleryImages, galleryImages, jobId, DEBUG_LOCAL_GALLERY]);
// Toggle handler (stable reference)
const handleToggle = useCallback(
(idx) => {
setgalleryImages((imgs) => imgs.map((g, gIdx) => (gIdx === idx ? { ...g, isSelected: !g.isSelected } : g)));
},
[setgalleryImages]
);
const messageStyle = { textAlign: "center", padding: "1rem" }; // retained for potential future states
if (!jobId) {
return (
<div aria-label="media gallery unavailable" style={{ position: "relative", minHeight: 80 }}>
<div style={messageStyle}>No job selected.</div>
</div>
);
}
return (
<div className="clearfix">
<Gallery
images={galleryImages}
onSelect={(index) => {
setgalleryImages(galleryImages.map((g, idx) => (index === idx ? { ...g, isSelected: !g.isSelected } : g)));
}}
/>
<div
className="clearfix"
style={{ position: "relative", minHeight: 80 }}
data-jobid={jobId}
aria-label={`media gallery for job ${jobId}`}
>
{isLoading && galleryImages.length === 0 && (
<div className="local-gallery-loading" style={messageStyle} role="status" aria-live="polite">
<LoadingSpinner />
</div>
)}
{galleryImages.length > 0 && (
<LocalMediaGrid images={galleryImages} minColumns={4} context={context} onToggle={handleToggle} />
)}
{galleryImages.length > 0 && (
<div style={{ fontSize: 10, color: "#888", marginTop: 4 }} aria-live="off">
{`${t("general.labels.media")}: ${galleryImages.length}`}
</div>
)}
</div>
);
}

View File

@@ -0,0 +1,207 @@
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
/**
* LocalMediaGrid
* Lightweight replacement for react-grid-gallery inside the chat popover.
* Props:
* - images: Array<{ src, fullsize, filename?, isSelected? }>
* - onToggle(index)
*/
export function LocalMediaGrid({
images,
onToggle,
thumbSize = 100,
gap = 8,
minColumns = 3,
maxColumns = 12,
context = "default"
}) {
const containerRef = useRef(null);
const [cols, setCols] = useState(() => {
// Pre-calc initial columns to stabilize layout before images render
const count = images.length;
if (count === 0) return minColumns; // reserve minimal structure
if (count === 1 && context === "chat") return 1;
return Math.min(maxColumns, Math.max(minColumns, count));
});
const [justifyMode, setJustifyMode] = useState("start");
const [distributeExtra, setDistributeExtra] = useState(false);
const [loadedMap, setLoadedMap] = useState(() => new Map()); // filename -> boolean loaded
const handleImageLoad = useCallback((key) => {
setLoadedMap((prev) => {
if (prev.get(key)) return prev; // already loaded
const next = new Map(prev);
next.set(key, true);
return next;
});
}, []);
// Dynamically compute columns for all contexts to avoid auto-fit stretching gaps in email overlay
useEffect(() => {
const el = containerRef.current;
if (!el) return;
const compute = () => {
// For non-chat (email / default) we rely on CSS auto-fill; only chat needs explicit column calc & distribution logic.
if (context !== "chat") {
setCols(images.length || 0); // retain count for ARIA semantics; not used for template when non-chat.
setDistributeExtra(false);
return;
}
const width = el.clientWidth;
if (!width) return;
const perCol = thumbSize + gap; // track + gap space
const fitCols = Math.max(1, Math.floor((width + gap) / perCol));
// base desired columns: up to how many images we have and how many fit
let finalCols = Math.min(images.length || 1, fitCols, maxColumns);
// enforce minimum columns to reserve layout skeleton (except when fewer images)
if (finalCols < minColumns && images.length >= minColumns) {
finalCols = Math.min(fitCols, minColumns);
}
// chat-specific clamp
if (context === "chat") {
finalCols = Math.min(finalCols, 4);
}
if (finalCols < 1) finalCols = 1;
setCols(finalCols);
setJustifyMode("start");
// Determine if there is leftover horizontal space that can't fit another column.
// Only distribute when we're at the maximum allowed columns for the context and images exceed or meet that count.
const contextMax = context === "chat" ? 4 : maxColumns;
const baseWidthNeeded = finalCols * thumbSize + (finalCols - 1) * gap;
const leftover = width - baseWidthNeeded;
const atMaxColumns = finalCols === contextMax && images.length >= finalCols;
// leftover must be positive but less than space needed for an additional column (perCol)
if (atMaxColumns && leftover > 0 && leftover < perCol) {
setDistributeExtra(true);
} else {
setDistributeExtra(false);
}
};
compute();
const ro = new ResizeObserver(() => compute());
ro.observe(el);
return () => ro.disconnect();
}, [images.length, thumbSize, gap, minColumns, maxColumns, context]);
const gridTemplateColumns = useMemo(() => {
if (context === "chat") {
if (distributeExtra) {
return `repeat(${cols}, minmax(${thumbSize}px, 1fr))`;
}
return `repeat(${cols}, ${thumbSize}px)`;
}
// Non-chat contexts: allow browser to auto-fill columns; fixed min (thumbSize) ensures squares; tracks expand to distribute remaining space.
return `repeat(auto-fill, minmax(${thumbSize}px, 1fr))`;
}, [cols, thumbSize, distributeExtra, context]);
const stableWidth = undefined; // no fixed width
const handleKeyDown = useCallback(
(e, idx) => {
if (e.key === "Enter" || e.key === " ") {
e.preventDefault();
onToggle(idx);
}
},
[onToggle]
);
return (
<div
className="local-media-grid"
style={{
display: "grid",
gridTemplateColumns,
gap,
maxHeight: 420,
overflowY: "auto",
overflowX: "hidden",
padding: 4,
justifyContent: justifyMode,
width: stableWidth
}}
ref={containerRef}
role="list"
aria-label="media thumbnails"
>
{images.map((img, idx) => (
<div
key={img.filename || idx}
role="listitem"
tabIndex={0}
aria-label={img.filename || `image ${idx + 1}`}
onClick={() => onToggle(idx)}
onKeyDown={(e) => handleKeyDown(e, idx)}
style={{
position: "relative",
border: img.isSelected ? "2px solid #1890ff" : "1px solid #ccc",
outline: "none",
borderRadius: 4,
cursor: "pointer",
background: "#fafafa",
width: thumbSize,
height: thumbSize,
overflow: "hidden",
boxSizing: "border-box"
}}
>
{(() => {
const key = img.filename || idx;
const loaded = loadedMap.get(key) === true;
return (
<>
{!loaded && (
<div
aria-hidden="true"
style={{
position: "absolute",
inset: 0,
background: "#f0f0f0",
display: "flex",
alignItems: "center",
justifyContent: "center",
fontSize: 10,
color: "#bbb"
}}
>
{/* simple skeleton; no shimmer to reduce cost */}
</div>
)}
<img
src={img.src}
alt={img.filename || img.caption || "thumbnail"}
loading="lazy"
onLoad={() => handleImageLoad(key)}
style={{
width: thumbSize,
height: thumbSize,
objectFit: "cover",
display: "block",
borderRadius: 4,
opacity: loaded ? 1 : 0,
transition: "opacity .25s ease"
}}
/>
</>
);
})()}
{img.isSelected && (
<div
aria-hidden="true"
style={{
position: "absolute",
inset: 0,
background: "rgba(24,144,255,0.45)",
borderRadius: 4
}}
/>
)}
</div>
))}
{/* No placeholders needed; layout uses auto-fit for non-chat or fixed columns for chat */}
</div>
);
}
export default LocalMediaGrid;

View File

@@ -19,29 +19,19 @@ const mediaReducer = (state = INITIAL_STATE, action) => {
case MediaActionTypes.TOGGLE_MEDIA_SELECTED:
return {
...state,
[action.payload.jobid]: state[action.payload.jobid].map((p) => {
if (p.filename === action.payload.filename) {
p.isSelected = !p.isSelected;
}
return p;
})
[action.payload.jobid]: state[action.payload.jobid].map((p) =>
p.filename === action.payload.filename ? { ...p, isSelected: !p.isSelected } : p
)
};
case MediaActionTypes.SELECT_ALL_MEDIA_FOR_JOB:
return {
...state,
[action.payload.jobid]: state[action.payload.jobid].map((p) => {
p.isSelected = true;
return p;
})
[action.payload.jobid]: state[action.payload.jobid].map((p) => ({ ...p, isSelected: true }))
};
case MediaActionTypes.DESELECT_ALL_MEDIA_FOR_JOB:
return {
...state,
[action.payload.jobid]: state[action.payload.jobid].map((p) => {
p.isSelected = false;
return p;
})
[action.payload.jobid]: state[action.payload.jobid].map((p) => ({ ...p, isSelected: false }))
};
default:
return state;

View File

@@ -2,4 +2,5 @@ import { createSelector } from "reselect";
const selectMedia = (state) => state.media;
export const selectAllMedia = createSelector([selectMedia], (media) => media);
// Return a shallow copy to avoid identity selector warning and allow memoization to detect actual changes.
export const selectAllMedia = createSelector([selectMedia], (media) => ({ ...media }));

View File

@@ -919,16 +919,16 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
FullName: responsibilityCenters.ttl_tax_adjustment?.accountitem
},
Desc: "Tax Adjustment",
Quantity: 1,
//Quantity: 1,
Amount: Dinero(jobs_by_pk.job_totals.totals?.ttl_tax_adjustment).toFormat(DineroQbFormat),
SalesTaxCodeRef: InstanceManager({
imex: {
FullName: "E"
},
rome: {
FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
}
})
// SalesTaxCodeRef: InstanceManager({
// imex: {
// FullName: "E"
// },
// rome: {
// FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
// }
// })
});
}
}

View File

@@ -405,7 +405,7 @@ function GenerateCostingData(job) {
) {
const discountRate =
Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp) > 1
? job.parts_tax_rates_rates[val.part_type.toUpperCase()].prt_discp
? job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp
: job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp * 100;
const disc = partsAmount.percentage(discountRate).multiply(-1);
partsAmount = partsAmount.add(disc);

View File

@@ -24,7 +24,7 @@ exports.totalsSsu = async function (req, res) {
const BearerToken = req.BearerToken;
const client = req.userGraphQLClient;
logger.log("job-totals-ssu-USA", "DEBUG", req?.user?.email, id);
logger.log("job-totals-ssu-USA", "debug", req?.user?.email, id);
try {
const job = await client.setHeaders({ Authorization: BearerToken }).request(queries.GET_JOB_BY_PK, {
@@ -49,7 +49,7 @@ exports.totalsSsu = async function (req, res) {
res.status(200).send();
} catch (error) {
logger.log("job-totals-ssu-USA-error", "ERROR", req?.user?.email, id, {
logger.log("job-totals-ssu-USA-error", "error", req?.user?.email, id, {
jobid: id,
error: error.message,
stack: error.stack
@@ -95,7 +95,7 @@ async function TotalsServerSide(req, res) {
ret.totals.subtotal = ret.totals.subtotal.add(ret.totals.ttl_adjustment);
ret.totals.total_repairs = ret.totals.total_repairs.add(ret.totals.ttl_adjustment);
ret.totals.net_repairs = ret.totals.net_repairs.add(ret.totals.ttl_adjustment);
logger.log("job-totals-USA-ttl-adj", "DEBUG", null, job.id, {
logger.log("job-totals-USA-ttl-adj", "debug", null, job.id, {
adjAmount: ttlDifference
});
}
@@ -116,7 +116,7 @@ async function TotalsServerSide(req, res) {
ret.totals.ttl_tax_adjustment = Dinero({ amount: Math.round(ttlTaxDifference * 100) });
ret.totals.total_repairs = ret.totals.total_repairs.add(ret.totals.ttl_tax_adjustment);
ret.totals.net_repairs = ret.totals.net_repairs.add(ret.totals.ttl_tax_adjustment);
logger.log("job-totals-USA-ttl-tax-adj", "DEBUG", null, job.id, {
logger.log("job-totals-USA-ttl-tax-adj", "debug", null, job.id, {
adjAmount: ttlTaxDifference
});
}
@@ -124,7 +124,7 @@ async function TotalsServerSide(req, res) {
return ret;
} catch (error) {
logger.log("job-totals-ssu-USA-error", "ERROR", req.user?.email, job.id, {
logger.log("job-totals-ssu-USA-error", "error", req.user?.email, job.id, {
jobid: job.id,
error: error.message,
stack: error.stack
@@ -142,7 +142,7 @@ async function Totals(req, res) {
const logger = req.logger;
const client = req.userGraphQLClient;
logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, job.id, {
logger.log("job-totals-ssu-USA", "debug", req.user.email, job.id, {
jobid: job.id,
id: id
});
@@ -159,7 +159,7 @@ async function Totals(req, res) {
res.status(200).json(ret);
} catch (error) {
logger.log("job-totals-ssu-USA-error", "ERROR", req.user.email, job.id, {
logger.log("job-totals-ssu-USA-error", "error", req.user.email, job.id, {
jobid: job.id,
error: error.message,
stack: error.stack
@@ -240,7 +240,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
job.joblines.push(newAtsLine);
}
} catch (error) {
logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
jobid: job.id,
error: error.message,
stack: error.stack
@@ -258,7 +258,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
job.joblines[atsLineIndex].act_price = atsAmount;
}
} catch (error) {
logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
jobid: job.id,
atsLineIndex: atsLineIndex,
atsAmount: atsAmount,
@@ -1055,7 +1055,7 @@ function CalculateTaxesTotals(job, otherTotals) {
}
}
} catch (error) {
logger.log("job-totals-USA Key with issue", "error", null, job.id, {
logger.log("job-totals-USA Key with issue", "warn", null, job.id, {
key: key,
error: error.message,
stack: error.stack

View File

@@ -23,7 +23,7 @@ exports.totalsSsu = async function (req, res) {
const BearerToken = req.BearerToken;
const client = req.userGraphQLClient;
logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
logger.log("job-totals-ssu", "debug", req.user.email, id, null);
try {
const job = await client.setHeaders({ Authorization: BearerToken }).request(queries.GET_JOB_BY_PK, {
@@ -49,7 +49,7 @@ exports.totalsSsu = async function (req, res) {
res.status(200).send();
} catch (error) {
logger.log("job-totals-ssu-error", "ERROR", req.user.email, id, {
logger.log("job-totals-ssu-error", "error", req.user.email, id, {
jobid: id,
error: error.message,
stack: error.stack
@@ -73,7 +73,7 @@ async function TotalsServerSide(req, res) {
return ret;
} catch (error) {
logger.log("job-totals-ssu-error", "ERROR", req?.user?.email, job.id, {
logger.log("job-totals-ssu-error", "error", req?.user?.email, job.id, {
jobid: job.id,
error: error.message,
stack: error.stack
@@ -91,7 +91,7 @@ async function Totals(req, res) {
const logger = req.logger;
const client = req.userGraphQLClient;
logger.log("job-totals-ssu", "DEBUG", req.user.email, job.id, {
logger.log("job-totals-ssu", "debug", req.user.email, job.id, {
jobid: job.id,
id: id
});
@@ -108,7 +108,7 @@ async function Totals(req, res) {
res.status(200).json(ret);
} catch (error) {
logger.log("job-totals-ssu-error", "ERROR", req.user.email, job.id, {
logger.log("job-totals-ssu-error", "error", req.user.email, job.id, {
jobid: job.id,
error: error.message,
stack: error.stack
@@ -189,7 +189,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
job.joblines.push(newAtsLine);
}
} catch (error) {
logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
jobid: job.id,
error: error.message,
stack: error.stack
@@ -207,7 +207,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
job.joblines[atsLineIndex].act_price = atsAmount;
}
} catch (error) {
logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
jobid: job.id,
atsLineIndex: atsLineIndex,
atsAmount: atsAmount,