Compare commits
1 Commits
feature/IO
...
feature/co
| Author | SHA1 | Date | |
|---|---|---|---|
|
b22480bd02 |
@@ -13,5 +13,4 @@
|
||||
.env.development.local
|
||||
.env.test.local
|
||||
.env.production.local
|
||||
.env.localstack.docker
|
||||
bodyshop_translations.babel
|
||||
bodyshop_translations.babel
|
||||
@@ -1,5 +1,9 @@
|
||||
root = true
|
||||
|
||||
# NOTE: Keep only EditorConfig properties that Prettier actually respects.
|
||||
# Style choices (quotes, bracket spacing, print width, etc.) live in `.prettierrc.js`.
|
||||
# Removing pseudo/unsupported keys (quote_type, bracketSpacing, max_line_length) that
|
||||
# previously caused editor vs CLI confusion.
|
||||
[*]
|
||||
charset = utf-8
|
||||
indent_style = space
|
||||
@@ -7,14 +11,11 @@ indent_size = 2
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = false
|
||||
quote_type = single
|
||||
max_line_length = 100
|
||||
bracketSpacing = false
|
||||
|
||||
[*.md]
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
[*.yml]
|
||||
[*\.yml]
|
||||
indent_size = 2
|
||||
|
||||
[*.json]
|
||||
|
||||
22
.gitignore
vendored
22
.gitignore
vendored
@@ -114,7 +114,7 @@ firebase/.env
|
||||
!.elasticbeanstalk/*.cfg.yml
|
||||
!.elasticbeanstalk/*.global.yml
|
||||
logs/oAuthClient-log.log
|
||||
logs/*
|
||||
|
||||
|
||||
.node-persist/**
|
||||
|
||||
@@ -129,26 +129,6 @@ vitest-coverage/
|
||||
test-output.txt
|
||||
server/job/test/fixtures
|
||||
|
||||
# Keep .github ignored by default, but track Copilot instructions
|
||||
.github
|
||||
!.github/
|
||||
.github/*
|
||||
!.github/copilot-instructions.md
|
||||
_reference/ragmate/.ragmate.env
|
||||
docker_data
|
||||
/.cursorrules
|
||||
/AGENTS.md
|
||||
/AI_CONTEXT.md
|
||||
/CLAUDE.md
|
||||
/COPILOT.md
|
||||
/GEMINI.md
|
||||
/_reference/select-component-test-plan.md
|
||||
|
||||
/.cursorrules
|
||||
/AGENTS.md
|
||||
/AI_CONTEXT.md
|
||||
/CLAUDE.md
|
||||
/COPILOT.md
|
||||
/.github/copilot-instructions.md
|
||||
/GEMINI.md
|
||||
/_reference/select-component-test-plan.md
|
||||
|
||||
11
.prettierignore
Normal file
11
.prettierignore
Normal file
@@ -0,0 +1,11 @@
|
||||
# Folders & files to skip during formatting
|
||||
node_modules
|
||||
build
|
||||
dist
|
||||
dev-dist
|
||||
coverage
|
||||
logs
|
||||
*.log
|
||||
# Generated / compiled assets
|
||||
client/dev-dist
|
||||
client/dist
|
||||
10
.vscode/settings.json
vendored
10
.vscode/settings.json
vendored
@@ -39,5 +39,13 @@
|
||||
"timetickets",
|
||||
"touchtime"
|
||||
],
|
||||
"eslint.workingDirectories": ["./", "./client"]
|
||||
"eslint.workingDirectories": ["./", "./client"],
|
||||
// Formatting alignment: ensure VS Code uses project Prettier config
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
||||
"editor.formatOnSave": true,
|
||||
"[javascript]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
},
|
||||
// Disable eslint's fixAll on save if it causes style churn; turn back on once stylistic rules removed or using eslint-config-prettier
|
||||
"prettier.useEditorConfig": true
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ FROM amazonlinux:2023
|
||||
|
||||
# Install Git and Node.js (Amazon Linux 2023 uses the DNF package manager)
|
||||
RUN dnf install -y git \
|
||||
&& curl -sL https://rpm.nodesource.com/setup_24.x | bash - \
|
||||
&& curl -sL https://rpm.nodesource.com/setup_22.x | bash - \
|
||||
&& dnf install -y nodejs \
|
||||
&& dnf clean all
|
||||
|
||||
|
||||
@@ -1,346 +0,0 @@
|
||||
Fortellis Notes
|
||||
|
||||
Subscription ID
|
||||
|
||||
- Appears to give us a list of all dealerships we have access to, and `apiDmsInfo` contains the integrations that are enabled for that dealership.
|
||||
- Will likely need to filter based on the DMS ID or something?
|
||||
- Should store the whole subscription object. Contains department information needed in subsequent calls.
|
||||
|
||||
Department ID
|
||||
|
||||
- May have multiple departments. Appears that financial stuff goes to Accounting, History will go to Service.
|
||||
- TODO: How do we handle the multiple departments that may come up.
|
||||
|
||||
###Internal Questions
|
||||
|
||||
* Overview of the redis storing mechanism to cache this data.
|
||||
*
|
||||
|
||||
# GL Wip Posting
|
||||
|
||||
## Org Helper Return Data
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"acctgLgnID": "DEVWB-A",
|
||||
"applCode": "V",
|
||||
"coID": "77",
|
||||
"companyName": "TEST SYS C187092 DEVWB",
|
||||
"lgnDesc": "DEV WRITE BACK VMS",
|
||||
"logon": "DEVWB-V"
|
||||
},
|
||||
{
|
||||
"acctgLgnID": "DEVWB-A",
|
||||
"applCode": "F",
|
||||
"coID": "77",
|
||||
"companyName": "TEST SYS C187092 DEVWB",
|
||||
"lgnDesc": "DEV WRITE BACK F&I SALES",
|
||||
"logon": "DEVWB-FI"
|
||||
},
|
||||
{
|
||||
"acctgLgnID": "DEVWB-A",
|
||||
"applCode": "CS",
|
||||
"coID": "77",
|
||||
"companyName": "TEST SYS C187092 DEVWB",
|
||||
"lgnDesc": "DEV WRITE BACK SERVICE",
|
||||
"logon": "DEVWB-S"
|
||||
},
|
||||
{
|
||||
"acctgLgnID": "DEVWB-A",
|
||||
"applCode": "A",
|
||||
"coID": "77",
|
||||
"companyName": "TEST SYS C187092 DEVWB",
|
||||
"lgnDesc": "DEV WRITE BACK ACCTG",
|
||||
"logon": "DEVWB-A"
|
||||
},
|
||||
{
|
||||
"acctgLgnID": "DEVWB-A",
|
||||
"applCode": "SL",
|
||||
"coID": "77",
|
||||
"companyName": "TEST SYS C187092 DEVWB",
|
||||
"lgnDesc": "DEV WRTIE BACK SLS MGMT",
|
||||
"logon": "DEVWB-SL"
|
||||
},
|
||||
{
|
||||
"acctgLgnID": "DEVWB-A",
|
||||
"applCode": "O",
|
||||
"coID": "77",
|
||||
"companyName": "TEST SYS C187092 DEVWB",
|
||||
"lgnDesc": "DEV WRITE BACK PARTS",
|
||||
"logon": "DEVWB-I"
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
## Journal Helper Return Data
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "32",
|
||||
"jrnlName": "PARTS SALES",
|
||||
"jrnlType": "S",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "4",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "92",
|
||||
"jrnlName": "YTD ADJUSTMENTS",
|
||||
"jrnlType": "Y",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "3",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "12",
|
||||
"jrnlName": "FLEET SALES",
|
||||
"jrnlType": "S",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "9",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "57",
|
||||
"jrnlName": "CASH RECEIPTS (OPEN-ITEM)",
|
||||
"jrnlType": "R",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "1",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "93",
|
||||
"jrnlName": "SET UP HISTORY",
|
||||
"jrnlType": "H",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "10",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "88",
|
||||
"jrnlName": "F/S STATISCAL DATA",
|
||||
"jrnlType": "F",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "10",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "58",
|
||||
"jrnlName": "WARRANTY CREDITS",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "3",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "FC",
|
||||
"jrnlName": "FINANCE CHARGE",
|
||||
"jrnlType": "A",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "12",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "94",
|
||||
"jrnlName": "SET UP SCHEDULES",
|
||||
"jrnlType": "C",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "3",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "95",
|
||||
"jrnlName": "SET UP GENERAL LEDGER",
|
||||
"jrnlType": "B",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "3",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "20",
|
||||
"jrnlName": "USED VEHICLE SALES",
|
||||
"jrnlType": "S",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "9",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "60",
|
||||
"jrnlName": "CASH DISBURSEMENTS",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "2",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "30",
|
||||
"jrnlName": "SERVICE SALES",
|
||||
"jrnlType": "S",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "7",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "40",
|
||||
"jrnlName": "PAYROLL",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "11",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "15",
|
||||
"jrnlName": "DEALER TRADES",
|
||||
"jrnlType": "S",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "9",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "70",
|
||||
"jrnlName": "NEW VEHICLE PURCHASES",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "8",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "25",
|
||||
"jrnlName": "USED WHOLESALE",
|
||||
"jrnlType": "S",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "9",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "75",
|
||||
"jrnlName": "GENERAL PURCHASES",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "5",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "10",
|
||||
"jrnlName": "NEW VEHICLE SALES",
|
||||
"jrnlType": "S",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "9",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "80",
|
||||
"jrnlName": "GENERAL JOURNAL",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "3",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "11",
|
||||
"jrnlName": "WORK IN PROGRESS",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "10",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "56",
|
||||
"jrnlName": "CASH RECEIPTS (BALANCE FWD)",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "1",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "81",
|
||||
"jrnlName": "STANDARD ENTRIES",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "6",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "51",
|
||||
"jrnlName": "CASH RECEIPTS JOURNAL - EFT",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "10",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "61",
|
||||
"jrnlName": "CASH DISBURSMENTS -EFT",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "10",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
},
|
||||
{
|
||||
"companyNo": "77",
|
||||
"jrnlID": "71",
|
||||
"jrnlName": "USED VEHICLE PURCHASES",
|
||||
"jrnlType": "G",
|
||||
"intercoFlag": "0",
|
||||
"defaultDocType": "8",
|
||||
"errCode": "",
|
||||
"errMsg": ""
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
# Feedback
|
||||
|
||||
- Receiving bad request errors, with no details. API errors page doesn't indicate what's wrong for certain types of error codes.
|
||||
- API Error page works on a several minute delay.
|
||||
@@ -1,61 +0,0 @@
|
||||
# PATCH /integrations/parts-management/job/:id/status
|
||||
|
||||
Update (patch) the status of a job created under parts management. This endpoint is only available
|
||||
for jobs whose parent bodyshop has an `external_shop_id` (i.e., is provisioned for parts
|
||||
management).
|
||||
|
||||
## Endpoint
|
||||
|
||||
```
|
||||
PATCH /integrations/parts-management/job/:id/status
|
||||
```
|
||||
|
||||
- `:id` is the UUID of the job to update.
|
||||
|
||||
## Request Headers
|
||||
|
||||
- `Authorization`: (if required by your integration middleware)
|
||||
- `Content-Type: application/json`
|
||||
|
||||
## Request Body
|
||||
|
||||
Send a JSON object with the following field:
|
||||
|
||||
- `status` (string, required): The new status for the job.
|
||||
|
||||
Example:
|
||||
|
||||
```
|
||||
PATCH /integrations/parts-management/job/123e4567-e89b-12d3-a456-426614174000/status
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
"status": "IN_PROGRESS"
|
||||
}
|
||||
```
|
||||
|
||||
## Success Response
|
||||
|
||||
- **200 OK**
|
||||
- Returns the updated job object with the new status.
|
||||
|
||||
```
|
||||
{
|
||||
"id": "123e4567-e89b-12d3-a456-426614174000",
|
||||
"status": "IN_PROGRESS",
|
||||
...
|
||||
}
|
||||
```
|
||||
|
||||
## Error Responses
|
||||
|
||||
- **400 Bad Request**: Missing status field, or parent bodyshop does not have an `external_shop_id`.
|
||||
- **404 Not Found**: No job found with the given ID.
|
||||
- **500 Internal Server Error**: Unexpected error.
|
||||
|
||||
## Notes
|
||||
|
||||
- Only jobs whose parent bodyshop has an `external_shop_id` can be patched via this route.
|
||||
- Fields other than `status` will be ignored if included in the request body.
|
||||
- The route is protected by the same middleware as other parts management endpoints.
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
# PATCH /integrations/parts-management/provision/:id
|
||||
|
||||
Update (patch) select fields for a parts management bodyshop. Only available for shops that have an
|
||||
`external_shop_id` (i.e., are provisioned for parts management).
|
||||
|
||||
## Endpoint
|
||||
|
||||
```
|
||||
PATCH /integrations/parts-management/provision/:id
|
||||
```
|
||||
|
||||
- `:id` is the UUID of the bodyshop to update.
|
||||
|
||||
## Request Headers
|
||||
|
||||
- `Authorization`: (if required by your integration middleware)
|
||||
- `Content-Type: application/json`
|
||||
|
||||
## Request Body
|
||||
|
||||
Send a JSON object with one or more of the following fields to update:
|
||||
|
||||
- `shopname` (string)
|
||||
- `address1` (string)
|
||||
- `address2` (string, optional)
|
||||
- `city` (string)
|
||||
- `state` (string)
|
||||
- `zip_post` (string)
|
||||
- `country` (string)
|
||||
- `email` (string, shop's email, not user email)
|
||||
- `timezone` (string)
|
||||
- `phone` (string)
|
||||
- `logo_img_path` (string)
|
||||
|
||||
Any fields not included in the request body will remain unchanged.
|
||||
|
||||
## Example Request
|
||||
|
||||
```
|
||||
PATCH /integrations/parts-management/provision/123e4567-e89b-12d3-a456-426614174000
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
"shopname": "New Shop Name",
|
||||
"address1": "123 Main St",
|
||||
"city": "Springfield",
|
||||
"state": "IL",
|
||||
"zip_post": "62704",
|
||||
"country": "USA",
|
||||
"email": "shop@example.com",
|
||||
"timezone": "America/Chicago",
|
||||
"phone": "555-123-4567",
|
||||
"logo_img_path": "https://example.com/logo.png"
|
||||
}
|
||||
```
|
||||
|
||||
## Success Response
|
||||
|
||||
- **200 OK**
|
||||
- Returns the updated shop object with the patched fields.
|
||||
|
||||
```
|
||||
{
|
||||
"id": "123e4567-e89b-12d3-a456-426614174000",
|
||||
"shopname": "New Shop Name",
|
||||
...
|
||||
}
|
||||
```
|
||||
|
||||
## Error Responses
|
||||
|
||||
- **400 Bad Request**: No valid fields provided, or shop does not have an `external_shop_id`.
|
||||
- **404 Not Found**: No shop found with the given ID.
|
||||
- **500 Internal Server Error**: Unexpected error.
|
||||
|
||||
## Notes
|
||||
|
||||
- Only shops with an `external_shop_id` can be patched via this route.
|
||||
- Fields not listed above will be ignored if included in the request body.
|
||||
- The route is protected by the same middleware as other parts management endpoints.
|
||||
|
||||
@@ -1,236 +0,0 @@
|
||||
# Production Board Kanban - React 19 & Ant Design 6 Optimizations
|
||||
|
||||
## Overview
|
||||
This document outlines the optimizations made to the production board kanban components to leverage React 19's new compiler and Ant Design 6 capabilities.
|
||||
|
||||
## Key Optimizations Implemented
|
||||
|
||||
### 1. React Compiler Optimizations
|
||||
|
||||
#### Removed Manual Memoization
|
||||
The React 19 compiler automatically handles memoization, so we removed unnecessary `useMemo`, `useCallback`, and `memo()` wrappers:
|
||||
|
||||
**Files Updated:**
|
||||
|
||||
**Main Components:**
|
||||
- `production-board-kanban.component.jsx`
|
||||
- `production-board-kanban.container.jsx`
|
||||
- `production-board-kanban-card.component.jsx`
|
||||
- `production-board-kanban.statistics.jsx`
|
||||
|
||||
**Trello-Board Components:**
|
||||
- `trello-board/controllers/Board.jsx`
|
||||
- `trello-board/controllers/Lane.jsx`
|
||||
- `trello-board/controllers/BoardContainer.jsx`
|
||||
- `trello-board/components/ItemWrapper.jsx`
|
||||
|
||||
**Benefits:**
|
||||
- Cleaner, more readable code
|
||||
- Reduced bundle size
|
||||
- Better performance through compiler-optimized memoization
|
||||
- Fewer function closures and re-creations
|
||||
|
||||
### 2. Simplified State Management
|
||||
|
||||
#### Removed Unnecessary Deep Cloning
|
||||
**Before:**
|
||||
```javascript
|
||||
setBoardLanes((prevBoardLanes) => {
|
||||
const deepClonedData = cloneDeep(newBoardData);
|
||||
if (!isEqual(prevBoardLanes, deepClonedData)) {
|
||||
return deepClonedData;
|
||||
}
|
||||
return prevBoardLanes;
|
||||
});
|
||||
```
|
||||
|
||||
**After:**
|
||||
```javascript
|
||||
setBoardLanes(newBoardData);
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Removed lodash `cloneDeep` and `isEqual` dependencies from this component
|
||||
- React 19's compiler handles change detection efficiently
|
||||
- Reduced memory overhead
|
||||
- Faster state updates
|
||||
|
||||
### 3. Component Simplification
|
||||
|
||||
#### Removed `memo()` Wrapper
|
||||
**Before:**
|
||||
```javascript
|
||||
const EllipsesToolTip = memo(({ title, children, kiosk }) => {
|
||||
// component logic
|
||||
});
|
||||
EllipsesToolTip.displayName = "EllipsesToolTip";
|
||||
```
|
||||
|
||||
**After:**
|
||||
```javascript
|
||||
function EllipsesToolTip({ title, children, kiosk }) {
|
||||
// component logic
|
||||
}
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Compiler handles optimization automatically
|
||||
- No need for manual displayName assignment
|
||||
- Cleaner component definition
|
||||
|
||||
### 4. Optimized Computed Values
|
||||
|
||||
#### Replaced useMemo with Direct Calculations
|
||||
**Before:**
|
||||
```javascript
|
||||
const totalHrs = useMemo(() => {
|
||||
if (!cardSettings.totalHrs) return null;
|
||||
const total = calculateTotal(data, "labhrs", "mod_lb_hrs") + calculateTotal(data, "larhrs", "mod_lb_hrs");
|
||||
return parseFloat(total.toFixed(2));
|
||||
}, [data, cardSettings.totalHrs]);
|
||||
```
|
||||
|
||||
**After:**
|
||||
```javascript
|
||||
const totalHrs = cardSettings.totalHrs
|
||||
? parseFloat((calculateTotal(data, "labhrs", "mod_lb_hrs") + calculateTotal(data, "larhrs", "mod_lb_hrs")).toFixed(2))
|
||||
: null;
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Compiler automatically memoizes when needed
|
||||
- More concise code
|
||||
- Better readability
|
||||
|
||||
### 5. Improved Card Rendering
|
||||
|
||||
#### Simplified Employee Lookups
|
||||
**Before:**
|
||||
```javascript
|
||||
const { employee_body, employee_prep, employee_refinish, employee_csr } = useMemo(() => {
|
||||
return {
|
||||
employee_body: metadata?.employee_body && findEmployeeById(employees, metadata.employee_body),
|
||||
employee_prep: metadata?.employee_prep && findEmployeeById(employees, metadata.employee_prep),
|
||||
// ...
|
||||
};
|
||||
}, [metadata, employees]);
|
||||
```
|
||||
|
||||
**After:**
|
||||
```javascript
|
||||
const employee_body = metadata?.employee_body && findEmployeeById(employees, metadata.employee_body);
|
||||
const employee_prep = metadata?.employee_prep && findEmployeeById(employees, metadata.employee_prep);
|
||||
// ...
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Direct assignments are cleaner
|
||||
- Compiler optimizes automatically
|
||||
- Easier to debug
|
||||
|
||||
### 6. Optimized Trello-Board Controllers
|
||||
|
||||
#### BoardContainer Optimizations
|
||||
- Removed `useCallback` from `wireEventBus`, `onDragStart`, and `onLaneDrag`
|
||||
- Removed lodash `isEqual` for drag position comparison (uses direct comparison)
|
||||
- Simplified event binding logic
|
||||
|
||||
#### Lane Component Optimizations
|
||||
- Removed `useCallback` from `toggleLaneCollapsed`, `renderDraggable`, `renderDroppable`, and `renderDragContainer`
|
||||
- Direct function definitions for all render methods
|
||||
- Compiler handles render optimization automatically
|
||||
|
||||
#### Board Component Optimizations
|
||||
- Removed `useMemo` for orientation style selection
|
||||
- Removed `useMemo` for grid item width calculation
|
||||
- Direct conditional assignment for styles
|
||||
|
||||
## React 19 Compiler Benefits
|
||||
|
||||
The React 19 compiler provides automatic optimizations:
|
||||
|
||||
1. **Automatic Memoization**: Intelligently memoizes component outputs and computed values
|
||||
2. **Smart Re-rendering**: Only re-renders components when props actually change
|
||||
3. **Optimized Closures**: Reduces unnecessary closure creation
|
||||
4. **Better Dead Code Elimination**: Removes unused code paths more effectively
|
||||
|
||||
## Ant Design 6 Compatibility
|
||||
|
||||
### Current Layout Approach
|
||||
The current implementation uses `VirtuosoGrid` for vertical layouts, which provides:
|
||||
- Virtual scrolling for performance
|
||||
- Responsive grid layout
|
||||
- Drag-and-drop support
|
||||
|
||||
### Potential Masonry Enhancement (Future Consideration)
|
||||
While Ant Design 6 doesn't have a built-in Masonry component, the current grid layout can be enhanced with CSS Grid or a third-party masonry library if needed. The current implementation already provides:
|
||||
- Flexible card sizing (small, medium, large)
|
||||
- Responsive grid columns
|
||||
- Efficient virtual scrolling
|
||||
|
||||
**Note:** The VirtuosoGrid approach is more performant for large datasets due to virtualization, making it preferable over a traditional masonry layout for this use case.
|
||||
|
||||
## Third-Party Library Considerations
|
||||
|
||||
### DND Library (Drag and Drop)
|
||||
The `trello-board/dnd` directory contains a vendored drag-and-drop library that uses `use-memo-one` for memoization. **We intentionally did not modify this library** because:
|
||||
- It's third-party code that should be updated at the source
|
||||
- It uses a specialized memoization library (`use-memo-one`) for drag-and-drop performance
|
||||
- Modifying it could introduce bugs or break drag-and-drop functionality
|
||||
- The library's internal memoization is specifically tuned for DND operations
|
||||
|
||||
## Performance Improvements
|
||||
|
||||
### Measured Benefits:
|
||||
1. **Bundle Size**: Reduced by removing lodash deep clone/equal operations from main component
|
||||
2. **Memory Usage**: Lower memory footprint with direct state updates
|
||||
3. **Render Performance**: Compiler-optimized re-renders
|
||||
4. **Code Maintainability**: Cleaner, more readable code
|
||||
|
||||
### Optimization Statistics:
|
||||
- **Removed hooks**: 25+ useMemo/useCallback hooks across components
|
||||
- **Removed memo wrappers**: 2 (EllipsesToolTip, ItemWrapper)
|
||||
- **Lines of code reduced**: ~150+ lines of memoization boilerplate
|
||||
|
||||
### Virtual Scrolling
|
||||
The components continue to leverage `Virtuoso` and `VirtuosoGrid` for optimal performance with large card lists:
|
||||
- Only renders visible cards
|
||||
- Maintains scroll position during updates
|
||||
- Handles thousands of cards efficiently
|
||||
|
||||
## Testing Recommendations
|
||||
|
||||
1. **Visual Regression Testing**: Ensure card layout and interactions work correctly
|
||||
2. **Performance Testing**: Measure render times with large datasets
|
||||
3. **Drag-and-Drop Testing**: Verify drag-and-drop functionality remains intact
|
||||
4. **Responsive Testing**: Test on various screen sizes
|
||||
5. **Filter Testing**: Ensure all filters work correctly with optimized code
|
||||
6. **Memory Profiling**: Verify reduced memory usage with React DevTools Profiler
|
||||
|
||||
## Migration Notes
|
||||
|
||||
### Breaking Changes
|
||||
None - All optimizations are internal and maintain the same component API.
|
||||
|
||||
### Backward Compatibility
|
||||
The components remain fully compatible with existing usage patterns.
|
||||
|
||||
## Future Enhancement Opportunities
|
||||
|
||||
1. **CSS Grid Masonry**: Consider CSS Grid masonry when widely supported
|
||||
2. **Animation Improvements**: Leverage React 19's improved transition APIs
|
||||
3. **Concurrent Features**: Explore React 19's concurrent rendering for smoother UX
|
||||
4. **Suspense Integration**: Consider wrapping async operations with Suspense boundaries
|
||||
5. **DND Library Update**: Monitor for React 19-compatible drag-and-drop libraries
|
||||
|
||||
## Conclusion
|
||||
|
||||
These optimizations modernize the production board kanban for React 19 while maintaining all functionality. The React Compiler handles memoization intelligently, allowing for cleaner, more maintainable code while achieving better performance. The trello-board directory has been fully optimized except for the vendored DND library, which should remain unchanged until an official React 19-compatible update is available.
|
||||
|
||||
---
|
||||
|
||||
**Last Updated**: January 2026
|
||||
**React Version**: 19.2.3
|
||||
**Ant Design Version**: 6.2.0
|
||||
**Files Optimized**: 8 custom components + controllers
|
||||
**DND Library**: Intentionally preserved (use-memo-one based)
|
||||
@@ -1,593 +0,0 @@
|
||||
# React 19 & Ant Design 6 Upgrade - Deprecation Fixes Report
|
||||
|
||||
## Overview
|
||||
This document outlines all deprecations fixed during the upgrade from React 18 to React 19 and Ant Design 5 to Ant Design 6 in the branch `feature/IO-3499-React-19` compared to `origin/master-AIO`.
|
||||
|
||||
---
|
||||
|
||||
## 1. Core Dependency Updates
|
||||
|
||||
### React & React DOM
|
||||
- **Upgraded from:** React ^18.3.1 → React ^19.2.4
|
||||
- **Upgraded from:** React DOM ^18.3.1 → React DOM ^19.2.4
|
||||
- **Impact:** Enabled React 19 compiler optimizations and new concurrent features
|
||||
|
||||
### Ant Design
|
||||
- **Upgraded from:** Ant Design ^5.28.1 → ^6.2.2
|
||||
- **Upgraded from:** @ant-design/icons ^5.6.1 → ^6.1.0
|
||||
- **Impact:** Access to Ant Design 6 improvements and API changes
|
||||
|
||||
### Apollo GraphQL
|
||||
- **@apollo/client:** ^3.13.9 → ^4.1.3
|
||||
- **apollo-link-logger:** ^2.0.1 → ^3.0.0
|
||||
- **graphql-ws:** ^6.0.7 (added for WebSocket subscriptions)
|
||||
- **Impact:** Major version upgrade with breaking changes to import paths and API
|
||||
|
||||
### React Ecosystem Libraries
|
||||
- **react-router-dom:** ^6.30.0 → ^7.13.0
|
||||
- **react-i18next:** ^15.7.3 → ^16.5.4
|
||||
- **react-grid-layout:** 1.3.4 → ^2.2.2
|
||||
- **@testing-library/react:** ^16.3.1 → ^16.3.2
|
||||
- **styled-components:** ^6.2.0 → ^6.3.8
|
||||
|
||||
### Build Tools
|
||||
- **Vite:** ^7.3.1 (maintained, peer dependencies updated)
|
||||
- **vite-plugin-babel:** ^1.3.2 → ^1.4.1
|
||||
- **vite-plugin-node-polyfills:** ^0.24.0 → ^0.25.0
|
||||
- **vitest:** ^3.2.4 → ^4.0.18
|
||||
|
||||
### Monitoring & Analytics
|
||||
- **@sentry/react:** ^9.43.0 → ^10.38.0
|
||||
- **@sentry/cli:** ^2.58.2 → ^3.1.0
|
||||
- **@sentry/vite-plugin:** ^4.6.1 → ^4.8.0
|
||||
- **logrocket:** ^9.0.2 → ^12.0.0
|
||||
- **posthog-js:** ^1.315.1 → ^1.336.4
|
||||
- **@amplitude/analytics-browser:** ^2.33.1 → ^2.34.0
|
||||
|
||||
### Other Key Dependencies
|
||||
- **axios:** ^1.13.2 → ^1.13.4
|
||||
- **env-cmd:** ^10.1.0 → ^11.0.0
|
||||
- **i18next:** ^25.7.4 → ^25.8.0
|
||||
- **libphonenumber-js:** ^1.12.33 → ^1.12.36
|
||||
- **lightningcss:** ^1.30.2 → ^1.31.1
|
||||
- **@fingerprintjs/fingerprintjs:** ^4.6.1 → ^5.0.1
|
||||
- **@firebase/app:** ^0.14.6 → ^0.14.7
|
||||
- **@firebase/firestore:** ^4.9.3 → ^4.10.0
|
||||
|
||||
### Infrastructure
|
||||
- **Node.js:** 22.x → 24.x (Dockerfile updated)
|
||||
|
||||
---
|
||||
|
||||
## 2. React 19 Compiler Optimizations
|
||||
|
||||
### Manual Memoization Removed
|
||||
|
||||
React 19's new compiler automatically optimizes components, making manual memoization unnecessary and potentially counterproductive.
|
||||
|
||||
#### 2.1 `useMemo` Hook Removals
|
||||
|
||||
**Example - Job Watchers:**
|
||||
```javascript
|
||||
// BEFORE
|
||||
const jobWatchers = useMemo(() => (watcherData?.job_watchers ? [...watcherData.job_watchers] : []), [watcherData]);
|
||||
|
||||
// AFTER
|
||||
// Do NOT clone arrays; keep referential stability for React Compiler and to reduce rerenders.
|
||||
const jobWatchers = watcherData?.job_watchers ?? EMPTY_ARRAY;
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Eliminates unnecessary array cloning
|
||||
- Maintains referential stability for React Compiler
|
||||
- Reduces re-renders
|
||||
- Cleaner, more readable code
|
||||
|
||||
**Files Affected:**
|
||||
- Multiple kanban components
|
||||
- Production board components
|
||||
- Job management components
|
||||
|
||||
#### 2.2 `useCallback` Hook Removals
|
||||
|
||||
**Example - Card Lookup Function:**
|
||||
```javascript
|
||||
// BEFORE
|
||||
const getCardByID = useCallback((data, cardId) => {
|
||||
for (const lane of data.lanes) {
|
||||
for (const card of lane.cards) {
|
||||
// ... logic
|
||||
}
|
||||
}
|
||||
}, [/* dependencies */]);
|
||||
|
||||
// AFTER
|
||||
const getCardByID = (data, cardId) => {
|
||||
for (const lane of data.lanes) {
|
||||
for (const card of lane.cards) {
|
||||
// ... logic
|
||||
}
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- React 19 compiler automatically optimizes function references
|
||||
- Reduced complexity in component code
|
||||
- No need to manage dependency arrays
|
||||
|
||||
**Files Affected:**
|
||||
- production-board-kanban.component.jsx
|
||||
- production-board-kanban.container.jsx
|
||||
- Multiple board controller components
|
||||
|
||||
#### 2.3 `React.memo()` Wrapper Removals
|
||||
|
||||
**Example - EllipsesToolTip Component:**
|
||||
```javascript
|
||||
// BEFORE
|
||||
const EllipsesToolTip = memo(({ title, children, kiosk }) => {
|
||||
if (kiosk || !title) {
|
||||
return <div className="ellipses no-select">{children}</div>;
|
||||
}
|
||||
return (
|
||||
<Tooltip title={title}>
|
||||
<div className="ellipses no-select">{children}</div>
|
||||
</Tooltip>
|
||||
);
|
||||
});
|
||||
EllipsesToolTip.displayName = "EllipsesToolTip";
|
||||
|
||||
// AFTER
|
||||
function EllipsesToolTip({ title, children, kiosk }) {
|
||||
if (kiosk || !title) {
|
||||
return <div className="ellipses no-select">{children}</div>;
|
||||
}
|
||||
return (
|
||||
<Tooltip title={title}>
|
||||
<div className="ellipses no-select">{children}</div>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Compiler handles optimization automatically
|
||||
- No need for manual displayName assignment
|
||||
- Standard function syntax is cleaner
|
||||
|
||||
**Files Affected:**
|
||||
- production-board-kanban-card.component.jsx
|
||||
- EllipsesToolTip components
|
||||
- Various utility components
|
||||
|
||||
---
|
||||
|
||||
## 3. State Management Optimizations
|
||||
|
||||
### Deep Cloning Elimination
|
||||
|
||||
React 19's compiler efficiently handles change detection, eliminating the need for manual deep cloning.
|
||||
|
||||
**Example - Board Lanes State Update:**
|
||||
```javascript
|
||||
// BEFORE
|
||||
setBoardLanes((prevBoardLanes) => {
|
||||
const deepClonedData = cloneDeep(newBoardData);
|
||||
if (!isEqual(prevBoardLanes, deepClonedData)) {
|
||||
return deepClonedData;
|
||||
}
|
||||
return prevBoardLanes;
|
||||
});
|
||||
|
||||
// AFTER
|
||||
setBoardLanes(newBoardData);
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Removed lodash dependencies (`cloneDeep`, `isEqual`) from components
|
||||
- Reduced memory overhead
|
||||
- Faster state updates
|
||||
- React 19's compiler handles change detection efficiently
|
||||
|
||||
---
|
||||
|
||||
## 4. Import Cleanup
|
||||
|
||||
### React Import Simplifications
|
||||
|
||||
**Example - Removed Unnecessary Hook Imports:**
|
||||
```javascript
|
||||
// BEFORE
|
||||
import { useMemo, useState, useEffect, useCallback } from "react";
|
||||
|
||||
// AFTER
|
||||
import { useState, useEffect } from "react";
|
||||
```
|
||||
|
||||
Multiple files had their React imports streamlined by removing `useMemo`, `useCallback`, and `memo` imports that are no longer needed.
|
||||
|
||||
---
|
||||
|
||||
## 5. Apollo Client 4.x Migration
|
||||
|
||||
### Import Path Changes
|
||||
|
||||
Apollo Client 4.x requires React-specific imports to come from `@apollo/client/react` instead of the main package.
|
||||
|
||||
**Example - Hook Imports:**
|
||||
```javascript
|
||||
// BEFORE (Apollo Client 3.x)
|
||||
import { useQuery, useMutation, useLazyQuery } from "@apollo/client";
|
||||
import { ApolloProvider } from "@apollo/client";
|
||||
import { useApolloClient } from "@apollo/client";
|
||||
|
||||
// AFTER (Apollo Client 4.x)
|
||||
import { useQuery, useMutation, useLazyQuery } from "@apollo/client/react";
|
||||
import { ApolloProvider } from "@apollo/client/react";
|
||||
import { useApolloClient } from "@apollo/client/react";
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Better tree-shaking for non-React Apollo Client usage
|
||||
- Clearer separation between core and React-specific functionality
|
||||
- Reduced bundle size for React-only applications
|
||||
|
||||
**Files Affected:**
|
||||
- All components using Apollo hooks (50+ files)
|
||||
- Main app provider component
|
||||
- GraphQL container components
|
||||
|
||||
### `useLazyQuery` API Changes
|
||||
|
||||
The return value destructuring pattern for `useLazyQuery` changed in Apollo Client 4.x.
|
||||
|
||||
**Example - Query Function Extraction:**
|
||||
```javascript
|
||||
// BEFORE (Apollo Client 3.x)
|
||||
const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, {
|
||||
variables: { jobids: [context.jobid] },
|
||||
skip: !context?.jobid
|
||||
});
|
||||
|
||||
// AFTER (Apollo Client 4.x)
|
||||
const [loadRoAndOwnerByJobPks, { data, loading: queryLoading, error: queryError, refetch, called }] = useLazyQuery(
|
||||
QUERY_RO_AND_OWNER_BY_JOB_PKS
|
||||
);
|
||||
|
||||
// Call the query function explicitly when needed
|
||||
useEffect(() => {
|
||||
if (context?.jobid) {
|
||||
loadRoAndOwnerByJobPks({ variables: { jobids: [context.jobid] } });
|
||||
}
|
||||
}, [context?.jobid, loadRoAndOwnerByJobPks]);
|
||||
```
|
||||
|
||||
**Key Changes:**
|
||||
- **Query function must be destructured**: Previously ignored with `,` now must be named
|
||||
- **Options moved to function call**: `variables` and other options passed when calling the query function
|
||||
- **`loading` renamed**: More consistent with `useQuery` hook naming
|
||||
- **`called` property added**: Track if the query has been executed at least once
|
||||
- **No more `skip` option**: Logic moved to conditional query execution
|
||||
|
||||
**Benefits:**
|
||||
- More explicit control over when queries execute
|
||||
- Better alignment with `useQuery` API patterns
|
||||
- Clearer code showing query execution timing
|
||||
|
||||
**Files Affected:**
|
||||
- card-payment-modal.component.jsx
|
||||
- bill-form.container.jsx
|
||||
- Multiple job and payment components
|
||||
|
||||
---
|
||||
|
||||
## 6. forwardRef Pattern Migration
|
||||
|
||||
React 19 simplifies ref handling by allowing `ref` to be passed as a regular prop, eliminating the need for `forwardRef` in most cases.
|
||||
|
||||
### forwardRef Wrapper Removal
|
||||
|
||||
**Example - Component Signature Change:**
|
||||
```javascript
|
||||
// BEFORE
|
||||
import { forwardRef } from "react";
|
||||
|
||||
const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps }, ref) => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<Select
|
||||
ref={ref}
|
||||
options={generateOptions(options, allowRemoved, t)}
|
||||
disabled={disabled}
|
||||
{...restProps}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default forwardRef(BillLineSearchSelect);
|
||||
|
||||
// AFTER
|
||||
const BillLineSearchSelect = ({ options, disabled, allowRemoved, ref, ...restProps }) => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<Select
|
||||
ref={ref}
|
||||
options={generateOptions(options, allowRemoved, t)}
|
||||
disabled={disabled}
|
||||
{...restProps}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default BillLineSearchSelect;
|
||||
```
|
||||
|
||||
**Key Changes:**
|
||||
- **`ref` as regular prop**: Moved from second parameter to first parameter as a regular prop
|
||||
- **No `forwardRef` import needed**: Removed from React imports
|
||||
- **No `forwardRef` wrapper**: Export component directly
|
||||
- **Same ref behavior**: Works identically from parent component perspective
|
||||
|
||||
**Benefits:**
|
||||
- Simpler component API (single parameter instead of two)
|
||||
- Reduced boilerplate code
|
||||
- Better TypeScript inference
|
||||
- More intuitive for developers
|
||||
|
||||
**Components Migrated:**
|
||||
- BillLineSearchSelect
|
||||
- ContractStatusComponent
|
||||
- CourtesyCarFuelComponent
|
||||
- CourtesyCarReadinessComponent
|
||||
- CourtesyCarStatusComponent
|
||||
- EmployeeTeamSearchSelect
|
||||
- FormInputNumberCalculator
|
||||
- FormItemCurrency
|
||||
- FormItemEmail
|
||||
- 10+ additional form components
|
||||
|
||||
---
|
||||
|
||||
## 7. React.lazy Import Cleanup
|
||||
|
||||
React 19 makes `React.lazy` usage more seamless, and in some cases lazy imports were removed where they were no longer beneficial.
|
||||
|
||||
**Example - Lazy Import Removal:**
|
||||
```javascript
|
||||
// BEFORE
|
||||
import { lazy, Suspense, useEffect, useRef, useState } from "react";
|
||||
|
||||
const LazyComponent = lazy(() => import('./HeavyComponent'));
|
||||
|
||||
// AFTER
|
||||
import { Suspense, useEffect, useRef, useState } from "react";
|
||||
|
||||
// Lazy loading handled differently or component loaded directly
|
||||
```
|
||||
|
||||
**Context:**
|
||||
- Some components had lazy imports removed where the loading behavior wasn't needed
|
||||
- `Suspense` boundaries maintained for actual lazy-loaded components
|
||||
- React 19 improves Suspense integration
|
||||
|
||||
**Files Affected:**
|
||||
- Multiple route components
|
||||
- Dashboard components
|
||||
- Heavy data visualization components
|
||||
|
||||
---
|
||||
|
||||
## 8. StrictMode Integration
|
||||
|
||||
React 19's StrictMode was explicitly added to help catch potential issues during development.
|
||||
|
||||
**Addition:**
|
||||
```javascript
|
||||
import { StrictMode } from "react";
|
||||
|
||||
root.render(
|
||||
<StrictMode>
|
||||
<App />
|
||||
</StrictMode>
|
||||
);
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Detects unexpected side effects
|
||||
- Warns about deprecated APIs
|
||||
- Validates React 19 best practices
|
||||
- Double-invokes effects in development to catch issues
|
||||
|
||||
**Impact:**
|
||||
- Helps ensure components work correctly with React 19 compiler
|
||||
- Catches potential issues with state management
|
||||
- Comment added: "This handles React StrictMode double-mounting"
|
||||
|
||||
---
|
||||
|
||||
## 9. React 19 New Hooks (Added Documentation)
|
||||
|
||||
The upgrade includes documentation for React 19's new concurrent hooks:
|
||||
|
||||
### `useFormStatus`
|
||||
Track form submission state for better UX during async operations.
|
||||
|
||||
### `useOptimistic`
|
||||
Implement optimistic UI updates that rollback on failure.
|
||||
|
||||
### `useActionState`
|
||||
Manage server actions with pending states and error handling.
|
||||
|
||||
---
|
||||
|
||||
## 10. ESLint Configuration Updates
|
||||
|
||||
### React Compiler Plugin Added
|
||||
|
||||
**Addition to eslint.config.js:**
|
||||
```javascript
|
||||
plugins: {
|
||||
"react-compiler": pluginReactCompiler
|
||||
},
|
||||
rules: {
|
||||
"react-compiler/react-compiler": "error"
|
||||
}
|
||||
```
|
||||
|
||||
**Purpose:**
|
||||
- Enforces React 19 compiler best practices
|
||||
- Warns about patterns that prevent compiler optimizations
|
||||
- Ensures code is compatible with automatic optimizations
|
||||
|
||||
---
|
||||
|
||||
## 11. Testing Library Updates
|
||||
|
||||
### @testing-library/react
|
||||
- **Upgraded:** ^16.3.1 → ^16.3.2
|
||||
- **Impact:** React 19 compatibility maintained
|
||||
- Tests continue to work with updated React APIs
|
||||
|
||||
---
|
||||
|
||||
## 12. Peer Dependencies Updates
|
||||
|
||||
Multiple packages updated their peer dependency requirements to support React 19:
|
||||
|
||||
**Examples:**
|
||||
```json
|
||||
// BEFORE
|
||||
"peerDependencies": {
|
||||
"react": ">=16.9.0",
|
||||
"react-dom": ">=16.9.0"
|
||||
}
|
||||
|
||||
// AFTER
|
||||
"peerDependencies": {
|
||||
"react": ">=18.0.0",
|
||||
"react-dom": ">=18.0.0"
|
||||
}
|
||||
```
|
||||
|
||||
**Affected Packages:**
|
||||
- Multiple internal and external dependencies
|
||||
- Ensures ecosystem compatibility with React 19
|
||||
|
||||
---
|
||||
|
||||
## 13. Ant Design 6 Changes
|
||||
|
||||
### Icon Package Update
|
||||
- @ant-design/icons upgraded from ^5.6.1 to ^6.1.0
|
||||
- Icon imports remain compatible (no breaking changes in usage patterns)
|
||||
|
||||
### Component API Compatibility
|
||||
- Existing Ant Design component usage remains largely compatible
|
||||
- Form.Item, Button, Modal, Table, and other components work with existing code
|
||||
- No major API breaking changes required in application code
|
||||
|
||||
---
|
||||
|
||||
## 14. Validation & Quality Assurance
|
||||
|
||||
Based on the optimization summary included in the changes:
|
||||
|
||||
### Deprecations Verified as Fixed ✓
|
||||
- **propTypes:** None found (already removed or using TypeScript)
|
||||
- **defaultProps:** None found (using default parameters instead)
|
||||
- **ReactDOM.render:** Already using createRoot
|
||||
- **componentWillMount/Receive/Update:** No legacy lifecycle methods found
|
||||
- **String refs:** Migrated to ref objects and useRef hooks
|
||||
|
||||
### Performance Improvements
|
||||
- Cleaner, more readable code
|
||||
- Reduced bundle size (removed unnecessary memoization wrappers)
|
||||
- Better performance through compiler-optimized memoization
|
||||
- Fewer function closures and re-creations
|
||||
- Reduced memory overhead from eliminated deep cloning
|
||||
|
||||
---
|
||||
|
||||
## Summary Statistics
|
||||
|
||||
### Dependencies Updated
|
||||
- **Core:** 3 major updates (React, Ant Design, Apollo Client)
|
||||
- **GraphQL:** 2 packages (Apollo Client 3→4, apollo-link-logger 2→3)
|
||||
- **Ecosystem:** 10+ related libraries (router, i18next, grid layout, etc.)
|
||||
- **Build Tools:** 3 plugins/tools (Vite plugins, vitest)
|
||||
- **Monitoring:** 6 packages (Sentry, LogRocket, PostHog, Amplitude)
|
||||
- **Infrastructure:** Node.js 22 → 24
|
||||
|
||||
### Code Patterns Modernized
|
||||
- **useMemo removals:** 15+ instances across multiple files
|
||||
- **useCallback removals:** 10+ instances
|
||||
- **memo() wrapper removals:** 5+ components
|
||||
- **Deep clone eliminations:** Multiple state management simplifications
|
||||
- **Import cleanups:** Dozens of simplified import statements
|
||||
- **Apollo import migrations:** 50+ files updated to `/react` imports
|
||||
- **forwardRef removals:** 15+ components migrated to direct ref props
|
||||
- **useLazyQuery updates:** Multiple query patterns updated for Apollo 4.x API
|
||||
- **lazy import cleanups:** Several unnecessary lazy imports removed
|
||||
- **StrictMode integration:** Added to development builds
|
||||
|
||||
### Files Impacted
|
||||
- **Production board kanban components:** Compiler optimization removals
|
||||
- **Trello-board controllers and components:** Memoization removals
|
||||
- **Job management components:** State management simplifications
|
||||
- **All GraphQL components:** Apollo Client 4.x import migrations (50+ files)
|
||||
- **Form components:** forwardRef pattern migrations (15+ components)
|
||||
- **Payment components:** useLazyQuery API updates
|
||||
- **Various utility components:** Import cleanups
|
||||
- **Build configuration files:** ESLint React compiler plugin
|
||||
- **Docker infrastructure:** Node.js 22→24 upgrade
|
||||
- **App root:** StrictMode integration
|
||||
- **Package manifests:** 30+ dependency upgrades
|
||||
|
||||
---
|
||||
|
||||
## Recommendations for Future Development
|
||||
|
||||
1. **Avoid Manual Memoization:** Let React 19 compiler handle optimization automatically
|
||||
2. **Use ESLint React Compiler Plugin:** Catch patterns that prevent optimizations
|
||||
3. **Maintain Referential Stability:** Use constant empty arrays/objects instead of creating new ones
|
||||
4. **Leverage New React 19 Hooks:** Use `useOptimistic`, `useFormStatus`, and `useActionState` for better UX
|
||||
5. **Monitor Compiler Warnings:** Address any compiler optimization warnings during development
|
||||
6. **Apollo Client 4.x Imports:** Always import React hooks from `@apollo/client/react`
|
||||
7. **Ref as Props:** Use `ref` as a regular prop instead of `forwardRef` wrapper
|
||||
8. **useLazyQuery Pattern:** Extract query function and call explicitly rather than using `skip` option
|
||||
9. **StrictMode Aware:** Ensure components handle double-mounting in development properly
|
||||
10. **Keep Dependencies Updated:** Monitor for peer dependency compatibility as ecosystem evolves
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
This comprehensive upgrade successfully modernizes the codebase across multiple dimensions:
|
||||
|
||||
### Major Achievements
|
||||
1. **React 19 Migration:** Leveraged new compiler optimizations by removing manual memoization
|
||||
2. **Apollo Client 4.x:** Updated all GraphQL operations to new import patterns and APIs
|
||||
3. **Ant Design 6:** Maintained UI consistency while gaining access to latest features
|
||||
4. **forwardRef Elimination:** Simplified 15+ components by using refs as regular props
|
||||
5. **Dependency Modernization:** Updated 30+ packages including monitoring, build tools, and ecosystem libraries
|
||||
6. **Infrastructure Upgrade:** Node.js 24.x support for latest runtime features
|
||||
|
||||
### Code Quality Improvements
|
||||
- **Cleaner code:** Removed unnecessary wrappers and boilerplate
|
||||
- **Better performance:** Compiler-optimized rendering without manual hints
|
||||
- **Reduced bundle size:** Removed lodash cloning, unnecessary lazy imports, and redundant memoization
|
||||
- **Improved maintainability:** Simpler patterns that are easier to understand and modify
|
||||
- **Enhanced DX:** ESLint integration catches optimization blockers during development
|
||||
|
||||
### Migration Completeness
|
||||
✅ All React 18→19 deprecations addressed
|
||||
✅ All Apollo Client 3→4 breaking changes handled
|
||||
✅ All Ant Design 5→6 updates applied
|
||||
✅ All monitoring libraries updated to latest versions
|
||||
✅ StrictMode integration for development safety
|
||||
✅ Comprehensive testing library compatibility maintained
|
||||
|
||||
**No breaking changes to application functionality** - The upgrade maintains backward compatibility in behavior while providing forward-looking improvements in implementation.
|
||||
@@ -1,468 +0,0 @@
|
||||
# React 19 Features Guide
|
||||
|
||||
## Overview
|
||||
This guide covers the new React 19 features available in our codebase and provides practical examples for implementing them.
|
||||
|
||||
---
|
||||
|
||||
## 1. New Hooks for Forms
|
||||
|
||||
### `useFormStatus` - Track Form Submission State
|
||||
|
||||
**What it does:** Provides access to the current form's submission status without manual state management.
|
||||
|
||||
**Use Case:** Show loading states on submit buttons, disable inputs during submission.
|
||||
|
||||
**Example:**
|
||||
```jsx
|
||||
import { useFormStatus } from 'react';
|
||||
|
||||
function SubmitButton() {
|
||||
const { pending } = useFormStatus();
|
||||
|
||||
return (
|
||||
<button type="submit" disabled={pending}>
|
||||
{pending ? 'Saving...' : 'Save'}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
function JobForm({ onSave }) {
|
||||
return (
|
||||
<form action={onSave}>
|
||||
<input name="jobNumber" />
|
||||
<SubmitButton />
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- No manual `useState` for loading states
|
||||
- Automatic re-renders when form status changes
|
||||
- Better separation of concerns (button doesn't need form state)
|
||||
|
||||
---
|
||||
|
||||
### `useOptimistic` - Instant UI Updates
|
||||
|
||||
**What it does:** Updates UI immediately while async operations complete in the background.
|
||||
|
||||
**Use Case:** Comments, notes, status updates - anything where you want instant feedback.
|
||||
|
||||
**Example:**
|
||||
```jsx
|
||||
import { useState, useOptimistic } from 'react';
|
||||
|
||||
function JobNotes({ jobId, initialNotes }) {
|
||||
const [notes, setNotes] = useState(initialNotes);
|
||||
const [optimisticNotes, addOptimisticNote] = useOptimistic(
|
||||
notes,
|
||||
(current, newNote) => [...current, newNote]
|
||||
);
|
||||
|
||||
async function handleAddNote(formData) {
|
||||
const text = formData.get('note');
|
||||
const tempNote = { id: Date.now(), text, pending: true };
|
||||
|
||||
// Show immediately
|
||||
addOptimisticNote(tempNote);
|
||||
|
||||
// Save to server
|
||||
const saved = await saveNote(jobId, text);
|
||||
setNotes([...notes, saved]);
|
||||
}
|
||||
|
||||
return (
|
||||
<form action={handleAddNote}>
|
||||
<textarea name="note" />
|
||||
<button type="submit">Add Note</button>
|
||||
<ul>
|
||||
{optimisticNotes.map(note => (
|
||||
<li key={note.id} style={{ opacity: note.pending ? 0.5 : 1 }}>
|
||||
{note.text}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Perceived performance improvement
|
||||
- Better UX - users see changes instantly
|
||||
- Automatic rollback on error (if implemented)
|
||||
|
||||
---
|
||||
|
||||
### `useActionState` - Complete Form State Management
|
||||
|
||||
**What it does:** Manages async form submissions with built-in loading, error, and success states.
|
||||
|
||||
**Use Case:** Form validation, API submissions, complex form workflows.
|
||||
|
||||
**Example:**
|
||||
```jsx
|
||||
import { useActionState } from 'react';
|
||||
|
||||
async function createContract(prevState, formData) {
|
||||
const data = {
|
||||
customerId: formData.get('customerId'),
|
||||
vehicleId: formData.get('vehicleId'),
|
||||
};
|
||||
|
||||
try {
|
||||
const result = await fetch('/api/contracts', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
});
|
||||
|
||||
if (!result.ok) {
|
||||
return { error: 'Failed to create contract', data: null };
|
||||
}
|
||||
|
||||
return { error: null, data: await result.json() };
|
||||
} catch (err) {
|
||||
return { error: err.message, data: null };
|
||||
}
|
||||
}
|
||||
|
||||
function ContractForm() {
|
||||
const [state, submitAction, isPending] = useActionState(
|
||||
createContract,
|
||||
{ error: null, data: null }
|
||||
);
|
||||
|
||||
return (
|
||||
<form action={submitAction}>
|
||||
<input name="customerId" required />
|
||||
<input name="vehicleId" required />
|
||||
|
||||
<button type="submit" disabled={isPending}>
|
||||
{isPending ? 'Creating...' : 'Create Contract'}
|
||||
</button>
|
||||
|
||||
{state.error && <div className="error">{state.error}</div>}
|
||||
{state.data && <div className="success">Contract #{state.data.id} created!</div>}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Replaces multiple `useState` calls
|
||||
- Built-in pending state
|
||||
- Cleaner error handling
|
||||
- Type-safe with TypeScript
|
||||
|
||||
---
|
||||
|
||||
## 2. Actions API
|
||||
|
||||
The Actions API simplifies form submissions and async operations by using the native `action` prop on forms.
|
||||
|
||||
### Traditional Approach (React 18):
|
||||
```jsx
|
||||
function OldForm() {
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState(null);
|
||||
|
||||
async function handleSubmit(e) {
|
||||
e.preventDefault();
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
|
||||
try {
|
||||
const formData = new FormData(e.target);
|
||||
await saveData(formData);
|
||||
} catch (err) {
|
||||
setError(err.message);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit}>
|
||||
{/* form fields */}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
### Modern Approach (React 19):
|
||||
```jsx
|
||||
import { useActionState } from 'react';
|
||||
|
||||
function NewForm() {
|
||||
const [state, formAction, isPending] = useActionState(async (_, formData) => {
|
||||
return await saveData(formData);
|
||||
}, null);
|
||||
|
||||
return (
|
||||
<form action={formAction}>
|
||||
{/* form fields */}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. Practical Implementation Examples
|
||||
|
||||
### Example 1: Owner/Customer Form with Optimistic UI
|
||||
|
||||
```jsx
|
||||
import { useOptimistic, useActionState } from 'react';
|
||||
import { Form, Input, Button } from 'antd';
|
||||
|
||||
function OwnerFormModern({ owner, onSave }) {
|
||||
const [optimisticOwner, setOptimisticOwner] = useOptimistic(
|
||||
owner,
|
||||
(current, updates) => ({ ...current, ...updates })
|
||||
);
|
||||
|
||||
const [state, submitAction, isPending] = useActionState(
|
||||
async (_, formData) => {
|
||||
const updates = {
|
||||
name: formData.get('name'),
|
||||
phone: formData.get('phone'),
|
||||
email: formData.get('email'),
|
||||
};
|
||||
|
||||
// Show changes immediately
|
||||
setOptimisticOwner(updates);
|
||||
|
||||
// Save to server
|
||||
try {
|
||||
await onSave(updates);
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
},
|
||||
{ success: null }
|
||||
);
|
||||
|
||||
return (
|
||||
<form action={submitAction}>
|
||||
<Form.Item label="Name">
|
||||
<Input name="name" defaultValue={optimisticOwner.name} />
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item label="Phone">
|
||||
<Input name="phone" defaultValue={optimisticOwner.phone} />
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item label="Email">
|
||||
<Input name="email" defaultValue={optimisticOwner.email} />
|
||||
</Form.Item>
|
||||
|
||||
<Button type="primary" htmlType="submit" loading={isPending}>
|
||||
{isPending ? 'Saving...' : 'Save Owner'}
|
||||
</Button>
|
||||
|
||||
{state.error && <div className="error">{state.error}</div>}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
### Example 2: Job Status Update with useFormStatus
|
||||
|
||||
```jsx
|
||||
import { useFormStatus } from 'react';
|
||||
|
||||
function JobStatusButton({ status }) {
|
||||
const { pending } = useFormStatus();
|
||||
|
||||
return (
|
||||
<button disabled={pending}>
|
||||
{pending ? 'Updating...' : `Mark as ${status}`}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
function JobStatusForm({ jobId, currentStatus }) {
|
||||
async function updateStatus(formData) {
|
||||
const newStatus = formData.get('status');
|
||||
await fetch(`/api/jobs/${jobId}/status`, {
|
||||
method: 'PATCH',
|
||||
body: JSON.stringify({ status: newStatus }),
|
||||
});
|
||||
}
|
||||
|
||||
return (
|
||||
<form action={updateStatus}>
|
||||
<input type="hidden" name="status" value="IN_PROGRESS" />
|
||||
<JobStatusButton status="In Progress" />
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. Third-Party Library Compatibility
|
||||
|
||||
### ✅ Fully Compatible (Already in use)
|
||||
|
||||
1. **Ant Design 6.2.0**
|
||||
- ✅ Full React 19 support out of the box
|
||||
- ✅ No patches or workarounds needed
|
||||
- 📝 Note: Ant Design 6 was built with React 19 in mind
|
||||
|
||||
2. **React-Redux 9.2.0**
|
||||
- ✅ Full React 19 support
|
||||
- ✅ All hooks (`useSelector`, `useDispatch`) work correctly
|
||||
- 📝 Tip: Continue using hooks over `connect()` HOC
|
||||
|
||||
3. **Apollo Client 4.0.13**
|
||||
- ✅ Compatible with React 19
|
||||
- ✅ `useQuery`, `useMutation` work correctly
|
||||
- 📝 Note: Supports React 19's concurrent features
|
||||
|
||||
4. **React Router 7.12.0**
|
||||
- ✅ Full React 19 support
|
||||
- ✅ All navigation hooks compatible
|
||||
- ✅ Future flags enabled for optimal performance
|
||||
|
||||
### Integration Notes
|
||||
|
||||
All our major dependencies are already compatible with React 19:
|
||||
- No additional patches needed
|
||||
- No breaking changes in current code
|
||||
- All hooks and patterns continue to work
|
||||
|
||||
---
|
||||
|
||||
## 5. Migration Strategy
|
||||
|
||||
### Gradual Adoption Approach
|
||||
|
||||
**Phase 1: Learn** (Current)
|
||||
- Review this guide
|
||||
- Understand new hooks and patterns
|
||||
- Identify good candidates for migration
|
||||
|
||||
**Phase 2: Pilot** (Recommended)
|
||||
- Start with new features/forms
|
||||
- Try `useActionState` in one new form
|
||||
- Measure developer experience improvement
|
||||
|
||||
**Phase 3: Refactor** (Optional)
|
||||
- Gradually update high-traffic forms
|
||||
- Add optimistic UI to user-facing features
|
||||
- Simplify complex form state management
|
||||
|
||||
### Good Candidates for React 19 Features
|
||||
|
||||
1. **Forms with Complex Loading States**
|
||||
- Contract creation
|
||||
- Job creation/editing
|
||||
- Owner/Vehicle forms
|
||||
- → Use `useActionState`
|
||||
|
||||
2. **Instant Feedback Features**
|
||||
- Adding job notes
|
||||
- Status updates
|
||||
- Comments/messages
|
||||
- → Use `useOptimistic`
|
||||
|
||||
3. **Submit Buttons**
|
||||
- Any form button that needs loading state
|
||||
- → Use `useFormStatus`
|
||||
|
||||
### Don't Rush to Refactor
|
||||
|
||||
**Keep using current patterns for:**
|
||||
- Ant Design Form components (already excellent)
|
||||
- Redux for global state
|
||||
- Apollo Client for GraphQL
|
||||
- Existing working code
|
||||
|
||||
**Only refactor when:**
|
||||
- Building new features
|
||||
- Fixing bugs in forms
|
||||
- Simplifying overly complex state management
|
||||
|
||||
---
|
||||
|
||||
## 6. Performance Improvements in React 19
|
||||
|
||||
### Automatic Optimizations
|
||||
|
||||
React 19 includes built-in compiler optimizations that automatically improve performance:
|
||||
|
||||
1. **Automatic Memoization**
|
||||
- Less need for `useMemo` and `useCallback`
|
||||
- Components automatically optimize re-renders
|
||||
|
||||
2. **Improved Concurrent Rendering**
|
||||
- Better handling of heavy operations
|
||||
- Smoother UI during data loading
|
||||
|
||||
3. **Enhanced Suspense**
|
||||
- Better loading states
|
||||
- Improved streaming SSR
|
||||
|
||||
**What this means for us:**
|
||||
- Existing code may run faster without changes
|
||||
- Future code will be easier to write
|
||||
- Less manual optimization needed
|
||||
|
||||
---
|
||||
|
||||
## 7. Resources
|
||||
|
||||
### Official Documentation
|
||||
- [React 19 Release Notes](https://react.dev/blog/2024/12/05/react-19)
|
||||
- [useActionState](https://react.dev/reference/react/useActionState)
|
||||
- [useFormStatus](https://react.dev/reference/react-dom/hooks/useFormStatus)
|
||||
- [useOptimistic](https://react.dev/reference/react/useOptimistic)
|
||||
|
||||
### Migration Guides
|
||||
- [React 18 to 19 Upgrade Guide](https://react.dev/blog/2024/04/25/react-19-upgrade-guide)
|
||||
- [Actions API Documentation](https://react.dev/reference/react/useActionState)
|
||||
|
||||
### Community Resources
|
||||
- [React 19 Features Tutorial](https://www.freecodecamp.org/news/react-19-actions-simpliy-form-submission-and-loading-states/)
|
||||
- [Practical Examples](https://blog.logrocket.com/react-useactionstate/)
|
||||
|
||||
---
|
||||
|
||||
## 8. Summary
|
||||
|
||||
### Current Status
|
||||
✅ **All dependencies compatible with React 19**
|
||||
- Ant Design 6.2.0 ✓
|
||||
- React-Redux 9.2.0 ✓
|
||||
- Apollo Client 4.0.13 ✓
|
||||
- React Router 7.12.0 ✓
|
||||
|
||||
### New Features Available
|
||||
🎯 **Ready to use in new code:**
|
||||
- `useFormStatus` - Track form submission state
|
||||
- `useOptimistic` - Instant UI updates
|
||||
- `useActionState` - Complete form state management
|
||||
- Actions API - Cleaner form handling
|
||||
|
||||
### Recommendations
|
||||
1. ✅ **No immediate action required** - Everything works
|
||||
2. 🎯 **Start using new features in new code** - Especially forms
|
||||
3. 📚 **Learn gradually** - No need to refactor everything
|
||||
4. 🚀 **Enjoy performance improvements** - Automatic optimizations active
|
||||
|
||||
---
|
||||
|
||||
## Questions or Need Help?
|
||||
|
||||
Feel free to:
|
||||
- Try examples in a branch first
|
||||
- Ask the team for code reviews
|
||||
- Share patterns that work well
|
||||
- Document new patterns you discover
|
||||
|
||||
**Happy coding with React 19! 🎉**
|
||||
@@ -1,382 +0,0 @@
|
||||
# React 19 Migration - Complete Summary
|
||||
|
||||
**Date:** January 13, 2026
|
||||
**Project:** Bodyshop Client Application
|
||||
**Status:** ✅ Complete
|
||||
|
||||
---
|
||||
|
||||
## Migration Overview
|
||||
|
||||
Successfully upgraded from React 18 to React 19 with zero breaking changes and minimal code
|
||||
modifications.
|
||||
|
||||
---
|
||||
|
||||
## Changes Made
|
||||
|
||||
### 1. Package Updates
|
||||
|
||||
| Package | Before | After |
|
||||
|------------------|--------|------------|
|
||||
| react | 18.3.1 | **19.2.3** |
|
||||
| react-dom | 18.3.1 | **19.2.3** |
|
||||
| react-router-dom | 6.30.3 | **7.12.0** |
|
||||
|
||||
**Updated Files:**
|
||||
|
||||
- `package.json`
|
||||
- `package-lock.json`
|
||||
|
||||
### 2. Code Changes
|
||||
|
||||
**File:** `src/index.jsx`
|
||||
|
||||
Added React Router v7 future flags to enable optimal performance:
|
||||
|
||||
```javascript
|
||||
const router = sentryCreateBrowserRouter(
|
||||
createRoutesFromElements(<Route path="*" element={<AppContainer/>}/>),
|
||||
{
|
||||
future: {
|
||||
v7_startTransition: true, // Smooth transitions
|
||||
v7_relativeSplatPath: true, // Correct splat path resolution
|
||||
},
|
||||
}
|
||||
);
|
||||
```
|
||||
|
||||
**Why:** These flags enable React Router v7's enhanced transition behavior and fix relative path
|
||||
resolution in splat routes (`path="*"`).
|
||||
|
||||
### 3. Documentation Created
|
||||
|
||||
Created comprehensive guides for the team:
|
||||
|
||||
1. **REACT_19_FEATURES_GUIDE.md** (12KB)
|
||||
- Overview of new React 19 hooks
|
||||
- Practical examples for our codebase
|
||||
- Third-party library compatibility check
|
||||
- Migration strategy and recommendations
|
||||
|
||||
2. **REACT_19_MODERNIZATION_EXAMPLES.md** (10KB)
|
||||
- Before/after code comparisons
|
||||
- Real-world examples from our codebase
|
||||
- Step-by-step modernization checklist
|
||||
- Best practices for gradual adoption
|
||||
|
||||
---
|
||||
|
||||
## Verification Results
|
||||
|
||||
### ✅ Build
|
||||
|
||||
- **Status:** Success
|
||||
- **Time:** 42-48 seconds
|
||||
- **Warnings:** None (only Sentry auth token warnings - expected)
|
||||
- **Output:** 238 files, 7.6 MB precached
|
||||
|
||||
### ✅ Tests
|
||||
|
||||
- **Unit Tests:** 5/5 passing
|
||||
- **Duration:** ~5 seconds
|
||||
- **Status:** All green
|
||||
|
||||
### ✅ Linting
|
||||
|
||||
- **Status:** Clean
|
||||
- **Errors:** 0
|
||||
- **Warnings:** 0
|
||||
|
||||
### ✅ Code Analysis
|
||||
|
||||
- **String refs:** None found ✓
|
||||
- **defaultProps:** None found ✓
|
||||
- **Legacy context:** None found ✓
|
||||
- **ReactDOM.render:** Already using createRoot ✓
|
||||
|
||||
---
|
||||
|
||||
## Third-Party Library Compatibility
|
||||
|
||||
All major dependencies are fully compatible with React 19:
|
||||
|
||||
### ✅ Ant Design 6.2.0
|
||||
|
||||
- **Status:** Full support, no patches needed
|
||||
- **Notes:** Version 6 was built with React 19 in mind
|
||||
- **Action Required:** None
|
||||
|
||||
### ✅ React-Redux 9.2.0
|
||||
|
||||
- **Status:** Full compatibility
|
||||
- **Notes:** All hooks work correctly
|
||||
- **Action Required:** None
|
||||
|
||||
### ✅ Apollo Client 4.0.13
|
||||
|
||||
- **Status:** Compatible
|
||||
- **Notes:** Supports React 19 concurrent features
|
||||
- **Action Required:** None
|
||||
|
||||
### ✅ React Router 7.12.0
|
||||
|
||||
- **Status:** Fully compatible
|
||||
- **Notes:** Future flags enabled for optimal performance
|
||||
- **Action Required:** None
|
||||
|
||||
---
|
||||
|
||||
## New Features Available
|
||||
|
||||
React 19 introduces several powerful new features now available in our codebase:
|
||||
|
||||
### 1. `useFormStatus`
|
||||
|
||||
**Purpose:** Track form submission state without manual state management
|
||||
|
||||
**Use Case:** Show loading states on buttons, disable during submission
|
||||
|
||||
**Complexity:** Low - drop-in replacement for manual loading states
|
||||
|
||||
### 2. `useOptimistic`
|
||||
|
||||
**Purpose:** Update UI instantly while async operations complete
|
||||
|
||||
**Use Case:** Comments, notes, status updates - instant user feedback
|
||||
|
||||
**Complexity:** Medium - requires understanding of optimistic UI patterns
|
||||
|
||||
### 3. `useActionState`
|
||||
|
||||
**Purpose:** Complete async form state management (loading, error, success)
|
||||
|
||||
**Use Case:** Form submissions, API calls, complex workflows
|
||||
|
||||
**Complexity:** Medium - replaces multiple useState calls
|
||||
|
||||
### 4. Actions API
|
||||
|
||||
**Purpose:** Simpler form handling with native `action` prop
|
||||
|
||||
**Use Case:** Any form submission or async operation
|
||||
|
||||
**Complexity:** Low to Medium - cleaner than traditional onSubmit
|
||||
|
||||
---
|
||||
|
||||
## Performance Improvements
|
||||
|
||||
React 19 includes automatic performance optimizations:
|
||||
|
||||
- ✅ **Automatic Memoization** - Less need for useMemo/useCallback
|
||||
- ✅ **Improved Concurrent Rendering** - Smoother UI during heavy operations
|
||||
- ✅ **Enhanced Suspense** - Better loading states
|
||||
- ✅ **Compiler Optimizations** - Automatic code optimization
|
||||
|
||||
**Impact:** Existing code may run faster without any changes.
|
||||
|
||||
---
|
||||
|
||||
## Recommendations
|
||||
|
||||
### Immediate (No Action Required)
|
||||
|
||||
- ✅ Migration is complete
|
||||
- ✅ All code works as-is
|
||||
- ✅ Performance improvements are automatic
|
||||
|
||||
### Short Term (Optional - For New Code)
|
||||
|
||||
1. **Read the Documentation**
|
||||
- Review `REACT_19_FEATURES_GUIDE.md`
|
||||
- Understand new hooks and patterns
|
||||
|
||||
2. **Try in New Features**
|
||||
- Use `useActionState` in new forms
|
||||
- Experiment with `useOptimistic` for notes/comments
|
||||
- Use `useFormStatus` for submit buttons
|
||||
|
||||
3. **Share Knowledge**
|
||||
- Discuss patterns in code reviews
|
||||
- Share what works well
|
||||
- Document team preferences
|
||||
|
||||
### Long Term (Optional - Gradual Refactoring)
|
||||
|
||||
1. **High-Traffic Forms**
|
||||
- Add optimistic UI to frequently-used features
|
||||
- Simplify complex loading state management
|
||||
|
||||
2. **New Features**
|
||||
- Default to React 19 patterns for new code
|
||||
- Build examples for the team
|
||||
|
||||
3. **Team Training**
|
||||
- Share learnings
|
||||
- Update coding standards
|
||||
- Create internal patterns library
|
||||
|
||||
---
|
||||
|
||||
## What NOT to Do
|
||||
|
||||
❌ **Don't rush to refactor everything**
|
||||
|
||||
- Current code works perfectly
|
||||
- Ant Design forms are already excellent
|
||||
- Only refactor when there's clear benefit
|
||||
|
||||
❌ **Don't force new patterns**
|
||||
|
||||
- Some forms work better with traditional patterns
|
||||
- Complex Ant Design forms should stay as-is
|
||||
- Use new features where they make sense
|
||||
|
||||
❌ **Don't break working code**
|
||||
|
||||
- If it ain't broke, don't fix it
|
||||
- New features are additive, not replacements
|
||||
- Migration is about gradual improvement
|
||||
|
||||
---
|
||||
|
||||
## Success Metrics
|
||||
|
||||
### Migration Quality: A+
|
||||
|
||||
- ✅ Zero breaking changes
|
||||
- ✅ Zero deprecation warnings
|
||||
- ✅ All tests passing
|
||||
- ✅ Build successful
|
||||
- ✅ Linting clean
|
||||
|
||||
### Code Health: Excellent
|
||||
|
||||
- ✅ Already using React 18+ APIs
|
||||
- ✅ No deprecated patterns
|
||||
- ✅ Modern component structure
|
||||
- ✅ Good separation of concerns
|
||||
|
||||
### Future Readiness: High
|
||||
|
||||
- ✅ All dependencies compatible
|
||||
- ✅ Ready for React 19 features
|
||||
- ✅ No technical debt blocking adoption
|
||||
- ✅ Clear migration path documented
|
||||
|
||||
---
|
||||
|
||||
## Timeline
|
||||
|
||||
| Date | Action | Status |
|
||||
|--------------|-----------------------|------------|
|
||||
| Jan 13, 2026 | Package updates | ✅ Complete |
|
||||
| Jan 13, 2026 | Future flags added | ✅ Complete |
|
||||
| Jan 13, 2026 | Build verification | ✅ Complete |
|
||||
| Jan 13, 2026 | Test verification | ✅ Complete |
|
||||
| Jan 13, 2026 | Documentation created | ✅ Complete |
|
||||
| Jan 13, 2026 | Console warning fixed | ✅ Complete |
|
||||
|
||||
**Total Time:** ~1 hour
|
||||
**Issues Encountered:** 0
|
||||
**Rollback Required:** No
|
||||
|
||||
---
|
||||
|
||||
## Team Next Steps
|
||||
|
||||
### For Developers
|
||||
|
||||
1. ✅ Pull latest changes
|
||||
2. 📚 Read `REACT_19_FEATURES_GUIDE.md`
|
||||
3. 🎯 Try new patterns in next feature
|
||||
4. 💬 Share feedback with team
|
||||
|
||||
### For Team Leads
|
||||
|
||||
1. ✅ Review documentation
|
||||
2. 📋 Discuss adoption strategy in next standup
|
||||
3. 🎯 Identify good pilot features
|
||||
4. 📊 Track developer experience improvements
|
||||
|
||||
### For QA
|
||||
|
||||
1. ✅ No regression testing needed
|
||||
2. ✅ All existing tests pass
|
||||
3. 🎯 Watch for new features using React 19 patterns
|
||||
4. 📝 Document any issues (none expected)
|
||||
|
||||
---
|
||||
|
||||
## Support Resources
|
||||
|
||||
### Internal Documentation
|
||||
|
||||
- [React 19 Features Guide](REACT_19_FEATURES_GUIDE.md)
|
||||
- [Modernization Examples](REACT_19_MODERNIZATION_EXAMPLES.md)
|
||||
- This summary document
|
||||
|
||||
### Official React Documentation
|
||||
|
||||
- [React 19 Release Notes](https://react.dev/blog/2024/12/05/react-19)
|
||||
- [Migration Guide](https://react.dev/blog/2024/04/25/react-19-upgrade-guide)
|
||||
- [New Hooks Reference](https://react.dev/reference/react)
|
||||
|
||||
### Community Resources
|
||||
|
||||
- [LogRocket Guide](https://blog.logrocket.com/react-useactionstate/)
|
||||
- [FreeCodeCamp Tutorial](https://www.freecodecamp.org/news/react-19-actions-simpliy-form-submission-and-loading-states/)
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
The migration to React 19 was **successful, seamless, and non-disruptive**.
|
||||
|
||||
### Key Achievements
|
||||
|
||||
- ✅ Zero downtime
|
||||
- ✅ Zero breaking changes
|
||||
- ✅ Zero code refactoring required
|
||||
- ✅ Enhanced features available
|
||||
- ✅ Automatic performance improvements
|
||||
|
||||
### Why It Went Smoothly
|
||||
|
||||
1. **Codebase was already modern**
|
||||
- Using ReactDOM.createRoot
|
||||
- No deprecated APIs
|
||||
- Good patterns in place
|
||||
|
||||
2. **Dependencies were ready**
|
||||
- All libraries React 19 compatible
|
||||
- No version conflicts
|
||||
- Smooth upgrade path
|
||||
|
||||
3. **React 19 is backward compatible**
|
||||
- New features are additive
|
||||
- Old patterns still work
|
||||
- Gradual adoption possible
|
||||
|
||||
**Status: Ready for Production** ✅
|
||||
|
||||
---
|
||||
|
||||
## Questions?
|
||||
|
||||
If you have questions about:
|
||||
|
||||
- Using new React 19 features
|
||||
- Migrating specific components
|
||||
- Best practices for patterns
|
||||
- Code review guidance
|
||||
|
||||
Feel free to:
|
||||
|
||||
- Check the documentation
|
||||
- Ask in team chat
|
||||
- Create a POC/branch
|
||||
- Request code review
|
||||
|
||||
**Happy coding with React 19!** 🎉🚀
|
||||
@@ -1,375 +0,0 @@
|
||||
# React 19 Form Modernization Example
|
||||
|
||||
This document shows a practical example of how existing forms in our codebase could be simplified
|
||||
using React 19 features.
|
||||
|
||||
---
|
||||
|
||||
## Example: Sign-In Form Modernization
|
||||
|
||||
### Current Implementation (React 18 Pattern)
|
||||
|
||||
```jsx
|
||||
// Current approach using Redux, manual state management
|
||||
function SignInComponent({emailSignInStart, loginLoading, signInError}) {
|
||||
const [form] = Form.useForm();
|
||||
|
||||
const handleFinish = (values) => {
|
||||
const {email, password} = values;
|
||||
emailSignInStart(email, password);
|
||||
};
|
||||
|
||||
return (
|
||||
<Form form={form} onFinish={handleFinish}>
|
||||
<Form.Item name="email" rules={[{required: true, type: 'email'}]}>
|
||||
<Input prefix={<UserOutlined/>} placeholder="Email"/>
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item name="password" rules={[{required: true}]}>
|
||||
<Input.Password prefix={<LockOutlined/>} placeholder="Password"/>
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item>
|
||||
<Button type="primary" htmlType="submit" loading={loginLoading} block>
|
||||
{loginLoading ? 'Signing in...' : 'Sign In'}
|
||||
</Button>
|
||||
</Form.Item>
|
||||
|
||||
{signInError && <AlertComponent type="error" message={signInError}/>}
|
||||
</Form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
**Characteristics:**
|
||||
|
||||
- ✅ Works well with Ant Design
|
||||
- ✅ Good separation with Redux
|
||||
- ⚠️ Loading state managed in Redux
|
||||
- ⚠️ Error state managed in Redux
|
||||
- ⚠️ Multiple state slices for one operation
|
||||
|
||||
---
|
||||
|
||||
### Modern Alternative (React 19 Pattern)
|
||||
|
||||
**Option 1: Keep Ant Design + Add useActionState for cleaner Redux actions**
|
||||
|
||||
```jsx
|
||||
import {useActionState} from 'react';
|
||||
import {Form, Input, Button} from 'antd';
|
||||
import {UserOutlined, LockOutlined} from '@ant-design/icons';
|
||||
|
||||
function SignInModern() {
|
||||
const [form] = Form.useForm();
|
||||
|
||||
// Wrap your Redux action with useActionState
|
||||
const [state, submitAction, isPending] = useActionState(
|
||||
async (prevState, formData) => {
|
||||
try {
|
||||
// Call your Redux action
|
||||
await emailSignInAsync(
|
||||
formData.get('email'),
|
||||
formData.get('password')
|
||||
);
|
||||
return {error: null, success: true};
|
||||
} catch (error) {
|
||||
return {error: error.message, success: false};
|
||||
}
|
||||
},
|
||||
{error: null, success: false}
|
||||
);
|
||||
|
||||
return (
|
||||
<Form
|
||||
form={form}
|
||||
onFinish={(values) => {
|
||||
// Convert Ant Design form values to FormData
|
||||
const formData = new FormData();
|
||||
formData.append('email', values.email);
|
||||
formData.append('password', values.password);
|
||||
submitAction(formData);
|
||||
}}
|
||||
>
|
||||
<Form.Item name="email" rules={[{required: true, type: 'email'}]}>
|
||||
<Input prefix={<UserOutlined/>} placeholder="Email"/>
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item name="password" rules={[{required: true}]}>
|
||||
<Input.Password prefix={<LockOutlined/>} placeholder="Password"/>
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item>
|
||||
<Button type="primary" htmlType="submit" loading={isPending} block>
|
||||
{isPending ? 'Signing in...' : 'Sign In'}
|
||||
</Button>
|
||||
</Form.Item>
|
||||
|
||||
{state.error && <AlertComponent type="error" message={state.error}/>}
|
||||
</Form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
|
||||
- ✅ Loading state is local (no Redux slice needed)
|
||||
- ✅ Error handling is simpler
|
||||
- ✅ Still works with Ant Design validation
|
||||
- ✅ Less Redux boilerplate
|
||||
|
||||
---
|
||||
|
||||
**Option 2: Native HTML Form + React 19 (for simpler use cases)**
|
||||
|
||||
```jsx
|
||||
import {useActionState} from 'react';
|
||||
import {signInWithEmailAndPassword} from '@firebase/auth';
|
||||
import {auth} from '../../firebase/firebase.utils';
|
||||
|
||||
function SimpleSignIn() {
|
||||
const [state, formAction, isPending] = useActionState(
|
||||
async (prevState, formData) => {
|
||||
const email = formData.get('email');
|
||||
const password = formData.get('password');
|
||||
|
||||
try {
|
||||
await signInWithEmailAndPassword(auth, email, password);
|
||||
return {error: null};
|
||||
} catch (error) {
|
||||
return {error: error.message};
|
||||
}
|
||||
},
|
||||
{error: null}
|
||||
);
|
||||
|
||||
return (
|
||||
<form action={formAction} className="sign-in-form">
|
||||
<input
|
||||
type="email"
|
||||
name="email"
|
||||
placeholder="Email"
|
||||
required
|
||||
/>
|
||||
|
||||
<input
|
||||
type="password"
|
||||
name="password"
|
||||
placeholder="Password"
|
||||
required
|
||||
/>
|
||||
|
||||
<button type="submit" disabled={isPending}>
|
||||
{isPending ? 'Signing in...' : 'Sign In'}
|
||||
</button>
|
||||
|
||||
{state.error && <div className="error">{state.error}</div>}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
|
||||
- ✅ Minimal code
|
||||
- ✅ No form library needed
|
||||
- ✅ Built-in HTML5 validation
|
||||
- ⚠️ Less feature-rich than Ant Design
|
||||
|
||||
---
|
||||
|
||||
## Recommendation for Our Codebase
|
||||
|
||||
### Keep Current Pattern When:
|
||||
|
||||
1. Using complex Ant Design form features (nested forms, dynamic fields, etc.)
|
||||
2. Form state needs to be in Redux for other reasons
|
||||
3. Form is working well and doesn't need changes
|
||||
|
||||
### Consider React 19 Pattern When:
|
||||
|
||||
1. Creating new simple forms
|
||||
2. Form only needs local state
|
||||
3. Want to reduce Redux boilerplate
|
||||
4. Building optimistic UI features
|
||||
|
||||
---
|
||||
|
||||
## Real-World Example: Job Note Adding
|
||||
|
||||
Let's look at a more practical example for our domain:
|
||||
|
||||
### Adding Job Notes with Optimistic UI
|
||||
|
||||
```jsx
|
||||
import {useOptimistic, useActionState} from 'react';
|
||||
import {Form, Input, Button, List} from 'antd';
|
||||
|
||||
function JobNotesModern({jobId, initialNotes}) {
|
||||
const [notes, setNotes] = useState(initialNotes);
|
||||
|
||||
// Optimistic UI for instant feedback
|
||||
const [optimisticNotes, addOptimisticNote] = useOptimistic(
|
||||
notes,
|
||||
(currentNotes, newNote) => [newNote, ...currentNotes]
|
||||
);
|
||||
|
||||
// Form submission with loading state
|
||||
const [state, submitAction, isPending] = useActionState(
|
||||
async (prevState, formData) => {
|
||||
const noteText = formData.get('note');
|
||||
|
||||
// Show note immediately (optimistic)
|
||||
const tempNote = {
|
||||
id: `temp-${Date.now()}`,
|
||||
text: noteText,
|
||||
createdAt: new Date().toISOString(),
|
||||
pending: true,
|
||||
};
|
||||
addOptimisticNote(tempNote);
|
||||
|
||||
try {
|
||||
// Save to server
|
||||
const response = await fetch(`/api/jobs/${jobId}/notes`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({text: noteText}),
|
||||
});
|
||||
|
||||
const savedNote = await response.json();
|
||||
|
||||
// Update with real note
|
||||
setNotes(prev => [savedNote, ...prev]);
|
||||
|
||||
return {error: null, success: true};
|
||||
} catch (error) {
|
||||
// Optimistic note will disappear on next render
|
||||
return {error: error.message, success: false};
|
||||
}
|
||||
},
|
||||
{error: null, success: false}
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="job-notes">
|
||||
<Form onFinish={(values) => {
|
||||
const formData = new FormData();
|
||||
formData.append('note', values.note);
|
||||
submitAction(formData);
|
||||
}}>
|
||||
<Form.Item name="note" rules={[{required: true}]}>
|
||||
<Input.TextArea
|
||||
placeholder="Add a note..."
|
||||
rows={3}
|
||||
/>
|
||||
</Form.Item>
|
||||
|
||||
<Button type="primary" htmlType="submit" loading={isPending}>
|
||||
{isPending ? 'Adding...' : 'Add Note'}
|
||||
</Button>
|
||||
|
||||
{state.error && <div className="error">{state.error}</div>}
|
||||
</Form>
|
||||
|
||||
<List
|
||||
dataSource={optimisticNotes}
|
||||
renderItem={note => (
|
||||
<List.Item style={{opacity: note.pending ? 0.5 : 1}}>
|
||||
<List.Item.Meta
|
||||
title={note.text}
|
||||
description={new Date(note.createdAt).toLocaleString()}
|
||||
/>
|
||||
{note.pending && <span className="badge">Saving...</span>}
|
||||
</List.Item>
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
**User Experience:**
|
||||
|
||||
1. User types note and clicks "Add Note"
|
||||
2. Note appears instantly (optimistic)
|
||||
3. Note is grayed out with "Saving..." badge
|
||||
4. Once saved, note becomes solid and badge disappears
|
||||
5. If error, note disappears and error shows
|
||||
|
||||
**Benefits:**
|
||||
|
||||
- ⚡ Instant feedback (feels faster)
|
||||
- 🎯 Clear visual indication of pending state
|
||||
- ✅ Automatic error handling
|
||||
- 🧹 Clean, readable code
|
||||
|
||||
---
|
||||
|
||||
## Migration Checklist
|
||||
|
||||
When modernizing a form to React 19 patterns:
|
||||
|
||||
### Step 1: Analyze Current Form
|
||||
|
||||
- [ ] Does it need Redux state? (Multi-component access?)
|
||||
- [ ] How complex is the validation?
|
||||
- [ ] Does it benefit from optimistic UI?
|
||||
- [ ] Is it a good candidate for modernization?
|
||||
|
||||
### Step 2: Choose Pattern
|
||||
|
||||
- [ ] Keep Ant Design + useActionState (complex forms)
|
||||
- [ ] Native HTML + Actions (simple forms)
|
||||
- [ ] Add useOptimistic (instant feedback needed)
|
||||
|
||||
### Step 3: Implement
|
||||
|
||||
- [ ] Create new branch
|
||||
- [ ] Update component
|
||||
- [ ] Test loading states
|
||||
- [ ] Test error states
|
||||
- [ ] Test success flow
|
||||
|
||||
### Step 4: Review
|
||||
|
||||
- [ ] Code is cleaner/simpler?
|
||||
- [ ] No loss of functionality?
|
||||
- [ ] Better UX?
|
||||
- [ ] Team understands pattern?
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
React 19's new features are **additive** - they give us new tools without breaking existing
|
||||
patterns.
|
||||
|
||||
**Recommended Approach:**
|
||||
|
||||
1. ✅ Keep current forms working as-is
|
||||
2. 🎯 Try React 19 patterns in NEW forms first
|
||||
3. 📚 Learn by doing in low-risk features
|
||||
4. 🔄 Gradually adopt where it makes sense
|
||||
|
||||
**Don't:**
|
||||
|
||||
- ❌ Rush to refactor everything
|
||||
- ❌ Break working code
|
||||
- ❌ Force patterns where they don't fit
|
||||
|
||||
**Do:**
|
||||
|
||||
- ✅ Experiment with new features
|
||||
- ✅ Share learnings with team
|
||||
- ✅ Use where it improves code
|
||||
- ✅ Enjoy better DX (Developer Experience)!
|
||||
|
||||
---
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. Review the main [REACT_19_FEATURES_GUIDE.md](REACT_19_FEATURES_GUIDE.md)
|
||||
2. Try `useActionState` in one new form
|
||||
3. Share feedback with the team
|
||||
4. Consider optimistic UI for high-traffic features
|
||||
|
||||
Happy coding! 🚀
|
||||
@@ -1,251 +0,0 @@
|
||||
# React Grid Layout Migration Guide
|
||||
|
||||
## Current Status: Legacy API (v2.2.2)
|
||||
|
||||
### What Changed
|
||||
- **Package Version**: 1.3.4 → 2.2.2
|
||||
- **API Strategy**: Using legacy compatibility layer
|
||||
|
||||
### Migration Completed ✅
|
||||
|
||||
#### Changes Made:
|
||||
```javascript
|
||||
// Before (v1.3.4):
|
||||
import { Responsive, WidthProvider } from "react-grid-layout";
|
||||
|
||||
// After (v2.2.2 with legacy API):
|
||||
import { Responsive, WidthProvider } from "react-grid-layout/legacy";
|
||||
```
|
||||
|
||||
#### Files Updated:
|
||||
- `src/components/dashboard-grid/dashboard-grid.component.jsx`
|
||||
|
||||
#### Why Legacy API?
|
||||
The v2.x release introduces a completely new hooks-based API with breaking changes. The legacy API provides 100% backward compatibility, allowing us to:
|
||||
- ✅ Get bug fixes and security updates
|
||||
- ✅ Maintain existing functionality without code rewrites
|
||||
- ✅ Plan migration to new API incrementally
|
||||
|
||||
---
|
||||
|
||||
## Future: Migration to New v2 API
|
||||
|
||||
When ready to fully migrate to the modern v2 API, follow this guide:
|
||||
|
||||
### Breaking Changes in v2
|
||||
|
||||
1. **Width Provider Removed**
|
||||
- Old: `WidthProvider(Responsive)`
|
||||
- New: Use `useContainerWidth` hook
|
||||
|
||||
2. **Props Restructured**
|
||||
- Old: Flat props structure
|
||||
- New: Grouped configs (`gridConfig`, `dragConfig`, `resizeConfig`)
|
||||
|
||||
3. **Layout Prop Required**
|
||||
- Old: Could use `data-grid` attribute
|
||||
- New: Must provide `layout` prop explicitly
|
||||
|
||||
4. **Compaction Changes**
|
||||
- Old: `verticalCompact` prop
|
||||
- New: `compactor` prop with pluggable algorithms
|
||||
|
||||
### Migration Steps
|
||||
|
||||
#### Step 1: Replace WidthProvider with useContainerWidth hook
|
||||
|
||||
**Before:**
|
||||
```javascript
|
||||
const ResponsiveReactGridLayout = WidthProvider(Responsive);
|
||||
|
||||
return (
|
||||
<ResponsiveReactGridLayout
|
||||
className="layout"
|
||||
breakpoints={GRID_BREAKPOINTS}
|
||||
cols={GRID_COLS}
|
||||
layouts={state.layouts}
|
||||
onLayoutChange={handleLayoutChange}
|
||||
>
|
||||
{children}
|
||||
</ResponsiveReactGridLayout>
|
||||
);
|
||||
```
|
||||
|
||||
**After:**
|
||||
```javascript
|
||||
import ReactGridLayout, { useContainerWidth, verticalCompactor } from 'react-grid-layout';
|
||||
|
||||
function DashboardGridComponent({ currentUser }) {
|
||||
const { width, containerRef, mounted } = useContainerWidth();
|
||||
|
||||
return (
|
||||
<div ref={containerRef}>
|
||||
{mounted && (
|
||||
<ReactGridLayout
|
||||
width={width}
|
||||
layout={state.layout}
|
||||
gridConfig={{
|
||||
cols: 12,
|
||||
rowHeight: 30,
|
||||
margin: [10, 10]
|
||||
}}
|
||||
dragConfig={{
|
||||
enabled: true,
|
||||
handle: '.drag-handle' // optional
|
||||
}}
|
||||
resizeConfig={{
|
||||
enabled: true
|
||||
}}
|
||||
compactor={verticalCompactor}
|
||||
onLayoutChange={handleLayoutChange}
|
||||
>
|
||||
{children}
|
||||
</ReactGridLayout>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
#### Step 2: Update Responsive Layouts
|
||||
|
||||
For responsive behavior, manage breakpoints manually:
|
||||
|
||||
```javascript
|
||||
function DashboardGridComponent() {
|
||||
const { width, containerRef, mounted } = useContainerWidth();
|
||||
const [currentBreakpoint, setCurrentBreakpoint] = useState('lg');
|
||||
|
||||
useEffect(() => {
|
||||
if (width > 1200) setCurrentBreakpoint('lg');
|
||||
else if (width > 996) setCurrentBreakpoint('md');
|
||||
else if (width > 768) setCurrentBreakpoint('sm');
|
||||
else if (width > 480) setCurrentBreakpoint('xs');
|
||||
else setCurrentBreakpoint('xxs');
|
||||
}, [width]);
|
||||
|
||||
const currentLayout = state.layouts[currentBreakpoint] || state.layout;
|
||||
const currentCols = GRID_COLS[currentBreakpoint];
|
||||
|
||||
return (
|
||||
<div ref={containerRef}>
|
||||
{mounted && (
|
||||
<ReactGridLayout
|
||||
width={width}
|
||||
layout={currentLayout}
|
||||
gridConfig={{
|
||||
cols: currentCols,
|
||||
rowHeight: 30
|
||||
}}
|
||||
// ... other props
|
||||
>
|
||||
{children}
|
||||
</ReactGridLayout>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
#### Step 3: Update Child Components
|
||||
|
||||
The `data-grid` attribute still works, but explicitly managing layout is preferred:
|
||||
|
||||
**Before:**
|
||||
```javascript
|
||||
<div
|
||||
key={item.i}
|
||||
data-grid={{
|
||||
...item,
|
||||
minH,
|
||||
minW
|
||||
}}
|
||||
>
|
||||
{content}
|
||||
</div>
|
||||
```
|
||||
|
||||
**After (Preferred):**
|
||||
```javascript
|
||||
// Manage layout in parent state
|
||||
const layout = state.items.map(item => ({
|
||||
i: item.i,
|
||||
x: item.x,
|
||||
y: item.y,
|
||||
w: item.w,
|
||||
h: item.h,
|
||||
minW: componentList[item.i]?.minW || 1,
|
||||
minH: componentList[item.i]?.minH || 1
|
||||
}));
|
||||
|
||||
// Children just need keys
|
||||
<div key={item.i}>
|
||||
{content}
|
||||
</div>
|
||||
```
|
||||
|
||||
#### Step 4: Update Styles (if needed)
|
||||
|
||||
The CSS classes remain mostly the same, but check the new documentation for any changes.
|
||||
|
||||
### Benefits of New API
|
||||
|
||||
- 🚀 **Better Performance**: Optimized rendering with hooks
|
||||
- 📦 **TypeScript Support**: Full type definitions included
|
||||
- 🎯 **Better API**: More intuitive props organization
|
||||
- 🔧 **Extensibility**: Pluggable compactors and strategies
|
||||
- 📱 **Modern React**: Uses hooks pattern
|
||||
|
||||
### Testing Checklist
|
||||
|
||||
When migrating to new API:
|
||||
|
||||
- [ ] Grid items render correctly
|
||||
- [ ] Drag functionality works
|
||||
- [ ] Resize functionality works
|
||||
- [ ] Responsive breakpoints work
|
||||
- [ ] Layout persistence works
|
||||
- [ ] Add/remove components works
|
||||
- [ ] Min/max constraints respected
|
||||
- [ ] Performance is acceptable
|
||||
- [ ] No console errors or warnings
|
||||
|
||||
### Resources
|
||||
|
||||
- [React Grid Layout v2 Documentation](https://github.com/react-grid-layout/react-grid-layout)
|
||||
- [Migration Guide](https://www.npmjs.com/package/react-grid-layout)
|
||||
- [Examples](https://github.com/react-grid-layout/react-grid-layout/tree/master/examples)
|
||||
|
||||
---
|
||||
|
||||
## Current Implementation Notes
|
||||
|
||||
### Component Structure
|
||||
- **File**: `src/components/dashboard-grid/dashboard-grid.component.jsx`
|
||||
- **Styles**: `src/components/dashboard-grid/dashboard-grid.styles.scss`
|
||||
- **Pattern**: Responsive grid with dynamic component loading
|
||||
|
||||
### Key Features Used
|
||||
- ✅ Responsive layouts with breakpoints
|
||||
- ✅ Drag and drop
|
||||
- ✅ Resize handles
|
||||
- ✅ Layout persistence to database
|
||||
- ✅ Dynamic component add/remove
|
||||
- ✅ Min/max size constraints
|
||||
|
||||
### Configuration
|
||||
```javascript
|
||||
const GRID_BREAKPOINTS = { lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 };
|
||||
const GRID_COLS = { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 };
|
||||
```
|
||||
|
||||
### Performance Considerations
|
||||
- Layout changes debounced via database updates
|
||||
- Memoized dashboard queries to prevent re-fetches
|
||||
- Memoized menu items and layout keys
|
||||
|
||||
---
|
||||
|
||||
**Last Updated**: 2026-01-13
|
||||
**Current Version**: react-grid-layout@2.2.2 (legacy API)
|
||||
**Target Version**: react-grid-layout@2.2.2 (new API) - Future migration
|
||||
@@ -1,278 +0,0 @@
|
||||
# Reynolds RCI – Implementation Notes for “Rome”
|
||||
|
||||
---
|
||||
|
||||
## TL;DR (What you need to wire up)
|
||||
|
||||
* **Protocol:** HTTPS (Reynolds will call our web service; we call theirs as per interface specs).
|
||||
* **Auth:** Username/Password and/or client certs. **No IP allowlisting** (explicitly disallowed).
|
||||
* **Envs to set:** test/prod endpoints, basic credentials, Reynolds test dealer/store/branch, and contacts.
|
||||
* **Milestones:** Comms test → Integration tests → Certification tests → Pilot → GCA (national release).
|
||||
* **Operational:** Support and deployment requests go through Reynolds PA/DC and DIS after go-live.
|
||||
|
||||
---
|
||||
|
||||
## Endpoints & Credentials (from Welcome Kit)
|
||||
|
||||
> These are **Reynolds** ERA/POWER RCI Receive endpoints for vendor “Rome”. Keep in a secure secret store.
|
||||
|
||||
| Environment | URL | Login | Password |
|
||||
| ----------- | -------------------------------------------------------- | ------ | -------------- |
|
||||
| **TEST** | `https://b2b-test.reyrey.com/Sync/RCI/Rome/Receive.ashx` | `Rome` | `p7Q7RLXwO8IB` |
|
||||
| **PROD** | `https://b2b.reyrey.com/Sync/RCI/Rome/Receive.ashx` | `Rome` | `93+?4x=SK6aq` |
|
||||
|
||||
* The kit also lists **Reynolds Test System identifiers** you’ll need for test payloads:
|
||||
|
||||
* Dealer Number: `PPERASV02000000`
|
||||
* Store `05` · Branch `03`
|
||||
* **Security:** “Security authentication should be accomplished via username/password credentials and/or use of security certificates. **IP whitelisting is not permitted.**”
|
||||
|
||||
---
|
||||
|
||||
## Our App Configuration (env/secret template)
|
||||
|
||||
Create `apps/server/.env.reynolds` (or equivalent in your secret manager):
|
||||
|
||||
```dotenv
|
||||
# --- Reynolds RCI (Rome) ---
|
||||
REY_RCIVENDOR_TAG=Rome
|
||||
|
||||
# Endpoints
|
||||
REY_RCI_TEST_URL=https://b2b-test.reyrey.com/Sync/RCI/Rome/Receive.ashx
|
||||
REY_RCI_PROD_URL=https://b2b.reyrey.com/Sync/RCI/Rome/Receive.ashx
|
||||
|
||||
# Basic credentials (store in secret manager)
|
||||
REY_RCI_TEST_LOGIN=Rome
|
||||
REY_RCI_TEST_PASSWORD=p7Q7RLXwO8I
|
||||
REY_RCI_PROD_LOGIN=Rome
|
||||
REY_RCI_PROD_PASSWORD=93+?4x=SK6aq
|
||||
|
||||
# Reynolds test dealer context
|
||||
REY_TEST_DEALER_NUMBER=PPERASV02000000
|
||||
REY_TEST_STORE=05
|
||||
REY_TEST_BRANCH=03
|
||||
|
||||
# Optional mTLS if provided later
|
||||
REY_RCI_CLIENT_CERT_PATH=
|
||||
REY_RCI_CLIENT_KEY_PATH=
|
||||
REY_RCI_CLIENT_KEY_PASSPHRASE=
|
||||
|
||||
# Notification & support (internal)
|
||||
IMEX_REYNOLDS_ALERT_DL=devops@imex.online
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## HTTP Call Pattern (client) – minimal example
|
||||
|
||||
> Exact payload formats come from the ERA/POWER interface specs (not in this kit). Use these stubs to wire transport & auth now; plug actual SOAP/XML later.
|
||||
|
||||
### Node/axios example
|
||||
|
||||
```js
|
||||
import axios from "axios";
|
||||
|
||||
export function makeReynoldsClient({ baseURL, username, password, cert, key, passphrase }) {
|
||||
return axios.create({
|
||||
baseURL,
|
||||
timeout: 30000,
|
||||
httpsAgent: cert && key
|
||||
? new (await import("https")).Agent({ cert, key, passphrase, rejectUnauthorized: true })
|
||||
: undefined,
|
||||
auth: { username, password }, // Basic Auth
|
||||
headers: {
|
||||
"Content-Type": "text/xml; charset=utf-8",
|
||||
"Accept": "text/xml"
|
||||
},
|
||||
// Optional: idempotency keys, tracing, etc.
|
||||
});
|
||||
}
|
||||
|
||||
// Usage (TEST):
|
||||
const client = makeReynoldsClient({
|
||||
baseURL: process.env.REY_RCI_TEST_URL,
|
||||
username: process.env.REY_RCI_TEST_LOGIN,
|
||||
password: process.env.REY_RCI_TEST_PASSWORD
|
||||
});
|
||||
|
||||
// Send a placeholder SOAP/XML envelope per the interface spec:
|
||||
export async function sendTestEnvelope(xml) {
|
||||
const { data, status } = await client.post("", xml);
|
||||
return { status, data };
|
||||
}
|
||||
```
|
||||
|
||||
### cURL smoke test (transport only)
|
||||
|
||||
```bash
|
||||
curl -u "Rome:p7Q7RLXwO8I" \
|
||||
-H "Content-Type: text/xml; charset=utf-8" \
|
||||
-d @envelopes/sample.xml \
|
||||
"https://b2b-test.reyrey.com/Sync/RCI/Rome/Receive.ashx"
|
||||
```
|
||||
|
||||
> Replace `@envelopes/sample.xml` with your valid envelope from the spec.
|
||||
|
||||
---
|
||||
|
||||
## Communications Test – What we must prove
|
||||
|
||||
* Our app can **establish HTTPS** and **authenticate** (Basic and/or certs).
|
||||
* We can **send a valid envelope** (even a trivial “ping” per spec) and receive success/failure.
|
||||
* Reynolds can **hit our callback** (if applicable) over HTTPS with our credentials/certs.
|
||||
* **No IP allowlisting** dependencies. Log end-to-end request/response with redaction.
|
||||
* Ensure **latest RCI web service application** is deployed on our side before test.
|
||||
|
||||
### Internal checklist (devops)
|
||||
|
||||
* [ ] Secrets stored in vault; not in repo
|
||||
* [ ] Timeouts set (≥30s as in kit examples)
|
||||
* [ ] TLS min version 1.2; strong ciphers
|
||||
* [ ] Request/response logging with PII masking
|
||||
* [ ] Retries/backoff for 5xx & network errors
|
||||
* [ ] Alerting on non-2xx spikes (Pager/Slack)
|
||||
* [ ] Synthetic canary hitting **TEST** URL hourly
|
||||
|
||||
---
|
||||
|
||||
## Testing Phases & Expectations
|
||||
|
||||
### Integration Testing
|
||||
|
||||
* Align on **high-level scenarios** + required **test cases** with Reynolds PA.
|
||||
* Use **Reynolds Test System** identifiers in test payloads (dealer/store/branch above).
|
||||
|
||||
### Certification Testing
|
||||
|
||||
* Demonstrate **end-to-end** functionality “without issue.”
|
||||
* After sign-off, PA coordinates move to **pilot**.
|
||||
|
||||
---
|
||||
|
||||
## Deployment & Pilot Process
|
||||
|
||||
* **Pilot orders**: initiated after certification; DC generates **RCI-1/CRCI-1** forms for signature.
|
||||
* We must **pre-validate existing customers** against Reynolds numbers; we confirm accuracy.
|
||||
* Maintain a list of **authorized signers** (officer-signed form required).
|
||||
* **EULA on file** is required to permit data sharing to us per **RIA**.
|
||||
* Dealer is notified by RCI Deployment when setup completes.
|
||||
|
||||
**Operational contact points:**
|
||||
|
||||
* **Deployment requests:** email `rci_deployment@reyrey.com`.
|
||||
* **Support after install:** Reynolds Data Integration Support (DIS) 1-866-341-8111.
|
||||
|
||||
---
|
||||
|
||||
## GCA (National Release) & Marketing
|
||||
|
||||
* After successful pilots: **GCA date** set; certification letter & logo kit sent to us.
|
||||
* RCI website updated to show **Certified** status.
|
||||
* Any **press releases or marketing** about certification must be sent to Reynolds BDM for review/approval.
|
||||
|
||||
* BDM (from kit): **Amanda Gorney** – `Amanda_Gorney@reyrey.com` – 937-485-1775.
|
||||
|
||||
---
|
||||
|
||||
## Support, Billing, Audit, Re-Certification
|
||||
|
||||
* **Support split:** We support **our app**; Reynolds supports **integration components & ERA**.
|
||||
* **Billing:** Support invoices monthly; installation invoices weekly; **MyBilling** portal available.
|
||||
* **Audit:** Periodic audits of customer lists and EULA status.
|
||||
* **Re-certification triggers:** new integrated product, major release, **or** after **24 months** elapsed.
|
||||
|
||||
---
|
||||
|
||||
## Project Roles (from kit – fill in ours)
|
||||
|
||||
**Reynolds:** Product Analyst: *Tim Konicek* – `Tim_Konicek@reyrey.com` – 937-485-8447
|
||||
**Reynolds:** Deployment Coordinator (DC): *(introduced during deployment)*
|
||||
**ImEX/Rome:**
|
||||
|
||||
* Primary: *<name/email/phone>*
|
||||
* Project Lead: *<name/email/phone>*
|
||||
* Technical Support DL (for Reynolds TAC): *<email(s)>*
|
||||
* Notification DL (for RIH incident emails): *<email(s)>*
|
||||
|
||||
---
|
||||
|
||||
## Internal SOPs (add to runbooks)
|
||||
|
||||
1. **Before Comms Test**
|
||||
|
||||
* [ ] Deploy latest RCI web service app build.
|
||||
* [ ] Configure secrets + TLS.
|
||||
* [ ] Verify outbound HTTPS egress to Reynolds test host.
|
||||
|
||||
2. **During Comms Test**
|
||||
|
||||
* [ ] Send minimal valid envelope; capture `HTTP status` + response body.
|
||||
* [ ] Record request IDs/correlation IDs for Reynolds.
|
||||
|
||||
3. **Before Certification**
|
||||
|
||||
* [ ] Execute full test matrix mapped to spec features.
|
||||
* [ ] Produce **evidence pack** (logs, payloads, results).
|
||||
|
||||
4. **Pilot Readiness**
|
||||
|
||||
* [ ] Provide customer list in Reynolds template; validate dealer/store/branch.
|
||||
* [ ] Submit authorized signers form (officer-signed).
|
||||
* [ ] Confirm EULA on file per RIA.
|
||||
|
||||
---
|
||||
|
||||
## What’s **not** in this PDF (and where we’ll plug it)
|
||||
|
||||
* **ERA/POWER Interface Specs & XSDs**: message shapes, operations, and field-level definitions are referenced but **not included** here; they’ll define the actual SOAP actions and XML payloads we must send/receive.
|
||||
* Once you provide those PDFs/XSDs, I’ll:
|
||||
|
||||
* Extract all **XSDs** into `/schemas/reynolds/*.xsd`.
|
||||
* Generate **sample envelopes** in `/envelopes/`.
|
||||
* Add **validator scripts** and **TypeScript types** (xml-js / xsd-ts).
|
||||
* Flesh out **per-operation** client wrappers and test cases.
|
||||
|
||||
> This Welcome Kit is primarily process + environment + contacts + endpoints; XSD creation isn’t applicable yet because the file doesn’t contain schemas.
|
||||
|
||||
---
|
||||
|
||||
## Appendices
|
||||
|
||||
### A. Example Secret Mounts (Docker Compose)
|
||||
|
||||
```yaml
|
||||
services:
|
||||
api:
|
||||
image: imex/api:latest
|
||||
environment:
|
||||
REY_RCI_TEST_URL: ${REY_RCI_TEST_URL}
|
||||
REY_RCI_TEST_LOGIN: ${REY_RCI_TEST_LOGIN}
|
||||
REY_RCI_TEST_PASSWORD: ${REY_RCI_TEST_PASSWORD}
|
||||
REY_TEST_DEALER_NUMBER: ${REY_TEST_DEALER_NUMBER}
|
||||
REY_TEST_STORE: ${REY_TEST_STORE}
|
||||
REY_TEST_BRANCH: ${REY_TEST_BRANCH}
|
||||
secrets:
|
||||
- rey_rci_prod_login
|
||||
- rey_rci_prod_password
|
||||
secrets:
|
||||
rey_rci_prod_login:
|
||||
file: ./secrets/rey_rci_prod_login.txt
|
||||
rey_rci_prod_password:
|
||||
file: ./secrets/rey_rci_prod_password.txt
|
||||
```
|
||||
|
||||
### B. Monitoring Metrics to Add
|
||||
|
||||
* `reynolds_http_requests_total{env,code}`
|
||||
* `reynolds_http_latency_ms_bucket{env}`
|
||||
* `reynolds_errors_total{env,reason}`
|
||||
* `reynolds_auth_failures_total{env}`
|
||||
* `reynolds_payload_validation_failures_total{message_type}`
|
||||
|
||||
---
|
||||
|
||||
**Source:** *Convenient Brands RCI Welcome Kit (11/30/2022)* – process, contacts, credentials, endpoints, testing & deployment notes.
|
||||
|
||||
---
|
||||
|
||||
*Ready for the next PDF. When you share the interface spec/XSDs, I’ll generate the concrete XML/XSDs, sample envelopes, and the typed client helpers.*
|
||||
@@ -1,214 +0,0 @@
|
||||
# Rome Create Body Shop Management – Repair Order Interface
|
||||
|
||||
*(Implementation Guide & Extracted XSDs – Version 1.5, Jan 2016)*
|
||||
|
||||
---
|
||||
|
||||
## 📘 Overview
|
||||
|
||||
This document defines the **“Rome Create Body Shop Management Repair Order”** integration between *Rome* (third-party vendor) and the **Reynolds & Reynolds DMS** via **RCI / RIH** web services. It includes mapping specs, event flow, and XSD schemas for both **request** and **response** payloads.
|
||||
|
||||
---
|
||||
|
||||
## 1. Purpose & Scope
|
||||
|
||||
**Purpose:**
|
||||
Provide the XML interface details needed to create Body Shop Management Repair Orders in the Reynolds DMS from a third-party application.
|
||||
|
||||
**Scope:**
|
||||
|
||||
* Transaction occurs over Reynolds’ **Web Service ProcessMessage** endpoint (HTTPS).
|
||||
* Uses **Create Body Shop Repair Order Request/Response Schemas** (Appendix C & D).
|
||||
* The DMS processes the incoming request and returns either **Success (RO #, timestamp)** or **Failure (status code + message)**.
|
||||
|
||||
---
|
||||
|
||||
## 2. Transport & Business Requirements
|
||||
|
||||
| Requirement | Description |
|
||||
| --------------------- | --------------------------------------------------------------------------------------------------- |
|
||||
| **Web Service** | Must conform to *Reynolds Web Service Requirements Specification*. |
|
||||
| **Endpoints** | Separate **Test** and **Production** URLs with unique credentials. |
|
||||
| **Transport Method** | HTTPS POST to `ProcessMessage` with XML body. |
|
||||
| **Response Codes** | Standard HTTP 2xx / 4xx per [RFC 2616 §10](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html). |
|
||||
| **Synchronous** | Request → Immediate HTTP Response (Success or Failure). |
|
||||
| **Schema Validation** | All payloads must validate against provided XSDs. |
|
||||
|
||||
---
|
||||
|
||||
## 3. Trigger Points
|
||||
|
||||
* Rome posts an **unsolicited Create Repair Order request** to Reynolds RIH.
|
||||
* RIH/DMS responds synchronously with:
|
||||
|
||||
* **Success:** `DMSRoNo` and timestamp.
|
||||
* **Failure:** `StatusCode` and `GenTransStatus` text.
|
||||
|
||||
---
|
||||
|
||||
## 4. Request Structure (`rey_RomeCreateBSMRepairOrderReq`)
|
||||
|
||||
### High-Level Schema Elements
|
||||
|
||||
| Element | Type | Description |
|
||||
| ----------------- | --------------------- | ------------------------------------------------------------ |
|
||||
| `ApplicationArea` | `ApplicationAreaType` | Metadata – sender, creation time, destination. |
|
||||
| `RoRecord` | `RoRecordType` | Core repair order content (customer, vehicle, jobs, parts…). |
|
||||
|
||||
---
|
||||
|
||||
### 4.1 `ApplicationAreaType`
|
||||
|
||||
| Field | Example | Description |
|
||||
| --------------------------------------------- | ------------------------------- | ------------------------------------- |
|
||||
| `Sender.Component` | `"Rome"` | Identifies vendor. |
|
||||
| `Sender.Task` | `"BSMRO"` | Transaction type. |
|
||||
| `ReferenceId` | `"Insert"` | Literal value. |
|
||||
| `CreatorNameCode` / `SenderNameCode` | `"RCI"` | Identifies RCI as integration source. |
|
||||
| `CreationDateTime` | `2024-10-07T21:36:45Z` | Dealer local timestamp. |
|
||||
| `BODId` | `GUID` | Unique transaction identifier. |
|
||||
| `Destination.DestinationNameCode` | `"RR"` | Always Reynolds. |
|
||||
| `DealerNumber` / `StoreNumber` / `AreaNumber` | `PPERASV02000000` / `05` / `03` | Target routing in DMS. |
|
||||
|
||||
---
|
||||
|
||||
### 4.2 `RoRecordType`
|
||||
|
||||
| Section | Description |
|
||||
| --------- | --------------------------------------------------------------------- |
|
||||
| `Rogen` | General header (Customer #, Advisor #, VIN, Mileage, Estimates, Tax). |
|
||||
| `Rolabor` | Labor operations (op codes, hours, rates, CCC statements, amounts). |
|
||||
| `Ropart` | Parts ordered by job (OSD part details, cost/sale values). |
|
||||
| `Rogog` | Gas/Oil/Grease and misc line items (BreakOut, ItemType, Amounts). |
|
||||
| `Romisc` | Miscellaneous charges (Misc codes and amounts). |
|
||||
|
||||
---
|
||||
|
||||
### 4.3 Key Business Validations
|
||||
|
||||
* **CustNo** must exist in DMS.
|
||||
* **AdvNo** must be active.
|
||||
* **VIN** must be associated to Customer.
|
||||
* **DeptType = "B"** (Body Shop).
|
||||
* **OpCode** must exist or = `ALL` / `INTERNAL`.
|
||||
* **Tax Flags:** `T` = Taxable, `N` = Non-Taxable.
|
||||
* **PayType:** `Cust` / `Warr` / `Intr`.
|
||||
* **BreakOut:** Valid GOG code in system.
|
||||
* **AddDeleteFlag:** `A` or `D`.
|
||||
|
||||
---
|
||||
|
||||
## 5. Response Structure (`rey_RomeCreateBSMRepairOrderResp`)
|
||||
|
||||
| Element | Type | Description |
|
||||
| ----------------- | --------------------------------------------------------------------- | ------------------------- |
|
||||
| `ApplicationArea` | Metadata (Sender = ERA, Destination = Rome). | |
|
||||
| `GenTransStatus` | Global status element: `Status="Success" | "Failure"`, `StatusCode`. |
|
||||
| `RoRecordStatus` | Per-record status attributes (date, time, RO numbers, error message). | |
|
||||
|
||||
### Example
|
||||
|
||||
```xml
|
||||
<rey_RomeCreateBSMRepairOrderResp revision="1.0">
|
||||
<ApplicationArea>
|
||||
<Sender>
|
||||
<Component>ERA</Component>
|
||||
<Task>BSMRO</Task>
|
||||
<CreatorNameCode>RR</CreatorNameCode>
|
||||
<SenderNameCode>RR</SenderNameCode>
|
||||
</Sender>
|
||||
<CreationDateTime>2025-10-07T14:40:00Z</CreationDateTime>
|
||||
<BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
|
||||
<Destination><DestinationNameCode>Rome</DestinationNameCode></Destination>
|
||||
</ApplicationArea>
|
||||
<GenTransStatus Status="Success" StatusCode="0"/>
|
||||
<RoRecordStatus Status="Success" Date="2025-10-07" Time="14:40"
|
||||
OutsdRoNo="27200" DMSRoNo="54387"/>
|
||||
</rey_RomeCreateBSMRepairOrderResp>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 6. Return Codes (Appendix E)
|
||||
|
||||
| Code | Meaning |
|
||||
| ------ | ------------------------------------------ |
|
||||
| `0` | **SUCCESS** |
|
||||
| `3` | RECORD LOCKED |
|
||||
| `10` | REQUIRED RECORD NOT FOUND |
|
||||
| `202` | VALIDATION ERROR |
|
||||
| `402` | CUSTOMER DOES NOT EXIST |
|
||||
| `506` | MILEAGE MUST BE GREATER THAN LAST |
|
||||
| `507` | MAXIMUM NUMBER OF ROs EXCEEDED |
|
||||
| `513` | VIN MUST BE ADDED BEFORE RO CAN BE CREATED |
|
||||
| `515` | TAG NUMBER ALREADY EXISTS |
|
||||
| `600` | ADD/DELETE FLAG MUST BE A OR D |
|
||||
| `1100` | INVALID XML DATA STREAM |
|
||||
| `9999` | UNDEFINED ERROR |
|
||||
|
||||
---
|
||||
|
||||
## 7. Integration Flow
|
||||
|
||||
1. Rome system creates XML conforming to `rey_RomeCreateBSMRepairOrderReq.xsd`.
|
||||
2. POST to RIH `ProcessMessage` endpoint (HTTPS, Basic Auth).
|
||||
3. RIH validates XSD + auth → forwards to DMS.
|
||||
4. DMS creates RO record.
|
||||
5. RIH returns `rey_RomeCreateBSMRepairOrderResp` with Success/Failure.
|
||||
|
||||
---
|
||||
|
||||
## 8. File Deliverables
|
||||
|
||||
Place these files in your repository:
|
||||
|
||||
```
|
||||
/schemas/reynolds/rome-create-bsm-repair-order/
|
||||
│
|
||||
├── rey_RomeCreateBSMRepairOrderReq.xsd
|
||||
├── rey_RomeCreateBSMRepairOrderResp.xsd
|
||||
└── README.md (this document)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 🧩 `rey_RomeCreateBSMRepairOrderReq.xsd`
|
||||
|
||||
Full XSD defining `ApplicationAreaType`, `RoRecordType`, and sub-structures (Rogen, Rolabor, Ropart, Rogog, Romisc).
|
||||
All attributes and enumerations have been preserved exactly from Appendix C.
|
||||
|
||||
*(A complete machine-ready XSD file has been extracted for you and can be provided on request as a separate `.xsd` attachment.)*
|
||||
|
||||
---
|
||||
|
||||
### 🧩 `rey_RomeCreateBSMRepairOrderResp.xsd`
|
||||
|
||||
Defines `GenTransStatusType` and `RoRecordStatusType` for the synchronous response.
|
||||
Attributes include `Status`, `StatusCode`, `Date`, `Time`, `OutsdRoNo`, `DMSRoNo`, and `ErrorMessage`.
|
||||
|
||||
---
|
||||
|
||||
## 9. Implementation Notes for ImEX/Rome System
|
||||
|
||||
* **XSD Validation:** Use `libxml2`, `xmlschema`, or `fast-xml-parser` to validate before POST.
|
||||
* **BODId (GUID):** Generate on every transaction; use as correlation ID for logging.
|
||||
* **Timestamps:** Use dealer local time → convert to UTC for storage.
|
||||
* **Error Handling:** Map Reynolds `StatusCode` to our enum and surface meaningful messages.
|
||||
* **Retries:** Idempotent on `BODId`; safe to retry on timeouts or HTTP 5xx.
|
||||
* **Logging:** Store both request and response XML with masked PII.
|
||||
* **Testing:** Use dealer # `PPERASV02000000`, store `05`, branch `03` in sandbox payloads.
|
||||
* **Schema Evolution:** Appendix history indicates v1.5 removed `PartDetail` and added `BreakOut` / `JobTotalHrs`. Ensure our schema copy matches v1.5.
|
||||
|
||||
---
|
||||
|
||||
## ✅ Next Step
|
||||
|
||||
You now have:
|
||||
|
||||
* All mappings and validations to construct the **Create Repair Order request**.
|
||||
* Full **XSD schemas** for request and response.
|
||||
* **Error codes and business rules** to integrate into Rome’s middleware.
|
||||
|
||||
---
|
||||
|
||||
Would you like me to output both XSDs (`rey_RomeCreateBSMRepairOrderReq.xsd` and `rey_RomeCreateBSMRepairOrderResp.xsd`) as ready-to-save files next?
|
||||
@@ -1,222 +0,0 @@
|
||||
# Rome Technologies – Customer Insert Interface
|
||||
|
||||
*(Implementation Guide & Extracted XSDs – Version 1.2, April 2020)*
|
||||
|
||||
---
|
||||
|
||||
## 📘 Overview
|
||||
|
||||
This interface allows **Rome Technologies** to create new customers inside the **Reynolds & Reynolds DMS** via the **Reynolds Certified Interface (RCI)**.
|
||||
The DMS validates and inserts the record, returning a **Customer ID** if successful.
|
||||
|
||||
---
|
||||
|
||||
## 1. Purpose & Scope
|
||||
|
||||
* **Purpose :** Provide XML schemas and mapping for inserting new customer records into the DMS.
|
||||
* **Scope :** The DMS generates a customer number when all required data fields are valid.
|
||||
|
||||
* The transaction uses Reynolds’ standard `ProcessMessage` web-service operation over HTTPS.
|
||||
* Both **Test** and **Production** endpoints are supplied with distinct credentials.
|
||||
|
||||
---
|
||||
|
||||
## 2. Transport & Event Requirements
|
||||
|
||||
| Property | Requirement |
|
||||
| ------------------ | ----------------------------------------------------------------------------------------- |
|
||||
| **Protocol** | HTTPS POST to `/ProcessMessage` (SOAP envelope). |
|
||||
| **Auth** | Basic Auth (username / password) — unique per environment. |
|
||||
| **Content-Type** | `text/xml; charset=utf-8` |
|
||||
| **Response Codes** | Standard HTTP per [RFC 2616 §10](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html). |
|
||||
| **Schemas** | `rey_RomeCustomerInsertReq.xsd`, `rey_RomeCustomerInsertResp.xsd`. |
|
||||
| **Synchronous** | Immediate HTTP 2xx or SOAP Fault. |
|
||||
| **Return Data** | `DMSRecKey`, `StatusCode`, and optional error message. |
|
||||
|
||||
---
|
||||
|
||||
## 3. Business Activity
|
||||
|
||||
**Event :** “Customer Insert”
|
||||
|
||||
* Creates a **new Customer** in the DMS.
|
||||
* The DMS assigns a **Customer Number** if all validations pass.
|
||||
* Errors yield status codes and messages from Appendix E.
|
||||
|
||||
---
|
||||
|
||||
## 4. Trigger Points & Flow
|
||||
|
||||
1. Rome posts `rey_RomeCustomerInsertReq` XML to Reynolds RIH.
|
||||
2. RIH validates schema + auth → forwards to DMS.
|
||||
3. DMS creates customer record → returns response object.
|
||||
4. Response contains `Status="Success"` and `DMSRecKey`, or `Status="Failure"` with `TransStatus` text.
|
||||
|
||||
### Sequence Diagram (Conceptual)
|
||||
|
||||
```
|
||||
Rome → RIH/DMS: ProcessMessage (InsertCustomer)
|
||||
RIH → Rome: rey_RomeCustomerResponse (Success/Failure)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. Request Structure (`rey_RomeCustomerInsertReq`)
|
||||
|
||||
### High-Level Elements
|
||||
|
||||
| Element | Type | Purpose |
|
||||
| ----------------- | --------------------- | ---------------------------------------------------------------- |
|
||||
| `ApplicationArea` | `ApplicationAreaType` | Metadata — sender, destination, timestamps. |
|
||||
| `CustRecord` | `CustRecordType` | Customer data block (contact info, personal data, DMS metadata). |
|
||||
|
||||
---
|
||||
|
||||
### 5.1 ApplicationAreaType
|
||||
|
||||
| Field | Example | Notes |
|
||||
| --------------------------------- | -------------------------------------- | --------------------------- |
|
||||
| `Sender.Component` | `"Rome"` | Vendor identifier. |
|
||||
| `Sender.Task` | `"CU"` | Transaction code. |
|
||||
| `ReferenceId` | `"Insert"` | Always literal. |
|
||||
| `CreationDateTime` | `2025-10-07T10:23:45` | Dealer local time. |
|
||||
| `BODId` | `ef097f3a-01b2-1eca-b12a-80048cbb74f3` | Unique GUID for tracking. |
|
||||
| `Destination.DestinationNameCode` | `"RR"` | Target system. |
|
||||
| `DealerNumber` | `PPERASV02000000` | Performance Path system id. |
|
||||
| `StoreNumber` | `05` | Zero-padded. |
|
||||
| `AreaNumber` | `03` | Branch number. |
|
||||
|
||||
---
|
||||
|
||||
### 5.2 CustRecordType → `ContactInfo`
|
||||
|
||||
| Field | Example | Validation |
|
||||
| -------------- | ---------------------- | ------------------------------------------------------------ |
|
||||
| `IBFlag` | `I` | I = Individual, B = Business (required). |
|
||||
| `LastName` | `Allen` | Required. |
|
||||
| `FirstName` | `Brian` | Required if Individual. |
|
||||
| `Addr1` | `101 Main St` | Required. |
|
||||
| `City` | `Dayton` | Required. |
|
||||
| `State` | `OH` | Cannot coexist with `Country`. |
|
||||
| `Zip` | `45454` | Valid ZIP or postal. |
|
||||
| `Phone.Type` | `H` | H/B/C/F/P/U/O (Home/Business/Cell/Fax/Pager/Unlisted/Other). |
|
||||
| `Phone.Num` | `9874565875` | Digits only. |
|
||||
| `Email.MailTo` | `customer@example.com` | Optional. |
|
||||
|
||||
---
|
||||
|
||||
### 5.3 CustPersonal Block
|
||||
|
||||
| Field | Example | Notes |
|
||||
| ----------------------- | --------------------------- | ------------------------ |
|
||||
| `Gender` | `M` | Must be M or F. |
|
||||
| `BirthDate.date` | `1970-01-01` | Type = P/O. |
|
||||
| `SSNum.ssn` | `254785986` | 9-digit numeric. |
|
||||
| `DriverInfo.LicNum` | `HU987458` | License Number. |
|
||||
| `DriverInfo.LicState` | `OH` | 2-letter state. |
|
||||
| `DriverInfo.LicExpDate` | `2026-07-27` | Expiration date. |
|
||||
| `EmployerName` | `Bill and Teds Exotic Fish` | Optional. |
|
||||
| `OptOut` | `Y/N` | Marketing opt-out. |
|
||||
| `OptOutUse` | `Y/N/null` | Canada-only use consent. |
|
||||
|
||||
---
|
||||
|
||||
### 5.4 DMSCustInfo Block
|
||||
|
||||
| Attribute | Example | Description |
|
||||
| ------------------- | ---------- | ----------------- |
|
||||
| `TaxExemptNum` | `QWE15654` | Optional. |
|
||||
| `SalesTerritory` | `1231` | Optional. |
|
||||
| `DeliveryRoute` | `1231` | Optional. |
|
||||
| `SalesmanNum` | `7794` | Sales rep code. |
|
||||
| `LastContactMethod` | `phone` | Optional text. |
|
||||
| `Followup.Type` | `P/M/E` | Phone/Mail/Email. |
|
||||
| `Followup.Value` | `Y/N` | Consent flag. |
|
||||
|
||||
---
|
||||
|
||||
## 6. Response Structure (`rey_RomeCustomerResponse`)
|
||||
|
||||
| Element | Description |
|
||||
| ----------------- | ---------------------------------------------------------------------------------------- |
|
||||
| `ApplicationArea` | Metadata (Sender = ERA or POWER, Task = CU). |
|
||||
| `TransStatus` | Text node with optional error message. Attributes = `StatusCode`, `Status`, `DMSRecKey`. |
|
||||
| `Status` values | `"Success"` or `"Failure"`. |
|
||||
| `StatusCode` | Numeric code from Appendix E. |
|
||||
| `DMSRecKey` | Generated Customer Number (e.g., `123456`). |
|
||||
|
||||
---
|
||||
|
||||
### Example Success Response
|
||||
|
||||
```xml
|
||||
<rey_RomeCustomerResponse revision="1.0">
|
||||
<ApplicationArea>
|
||||
<Sender>
|
||||
<Component>ERA</Component>
|
||||
<Task>CU</Task>
|
||||
<CreatorNameCode>RR</CreatorNameCode>
|
||||
<SenderNameCode>RR</SenderNameCode>
|
||||
<DealerNumber>PPERASV02000000</DealerNumber>
|
||||
<StoreNumber>05</StoreNumber>
|
||||
<AreaNumber>03</AreaNumber>
|
||||
</Sender>
|
||||
<CreationDateTime>2025-10-07T14:30:00</CreationDateTime>
|
||||
<BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
|
||||
<Destination><DestinationNameCode>RCI</DestinationNameCode></Destination>
|
||||
</ApplicationArea>
|
||||
<TransStatus Status="Success" StatusCode="0" DMSRecKey="123456"/>
|
||||
</rey_RomeCustomerResponse>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 7. Return Codes (Subset)
|
||||
|
||||
| Code | Meaning |
|
||||
| ---- | ------------------------- |
|
||||
| 0 | SUCCESS |
|
||||
| 3 | RECORD LOCKED |
|
||||
| 10 | REQUIRED RECORD NOT FOUND |
|
||||
| 202 | VALIDATION ERROR |
|
||||
| 400 | CUSTOMER ALREADY EXISTS |
|
||||
| 401 | NAME LENGTH > 35 CHARS |
|
||||
| 402 | CUSTOMER DOES NOT EXIST |
|
||||
| 9999 | UNDEFINED ERROR |
|
||||
|
||||
---
|
||||
|
||||
## 8. Implementation Notes (for ImEX/Rome Backend)
|
||||
|
||||
* **Validate XML** against the provided XSD before posting.
|
||||
* **Generate GUID** (BODId) for each request and store with logs.
|
||||
* **Log Request/Response** payloads (mask PII).
|
||||
* **Handle duplicate customers** gracefully (`400` code).
|
||||
* **Map DMSRecKey → local customer table** on success.
|
||||
* **Retries:** idempotent on `BODId`; safe to retry 5xx or timeouts.
|
||||
* **Alerting:** notify on `StatusCode ≠ 0`.
|
||||
|
||||
---
|
||||
|
||||
## 9. Extracted Files
|
||||
|
||||
```
|
||||
/schemas/reynolds/rome-customer-insert/
|
||||
├── rey_RomeCustomerInsertReq.xsd
|
||||
├── rey_RomeCustomerInsertResp.xsd
|
||||
└── README.md (this document)
|
||||
```
|
||||
|
||||
|
||||
---
|
||||
|
||||
## ✅ Next Steps
|
||||
|
||||
1. Integrate `InsertCustomer` into your Reynolds connector module.
|
||||
2. Validate XML using the above schemas.
|
||||
3. Log and map responses into your CRM / body-shop customer table.
|
||||
4. Prepare test suite for codes 0, 202, 400, 402, 9999.
|
||||
|
||||
---
|
||||
|
||||
*Source : Rome Technologies Customer Insert Specification v1.2 (Apr 2020) – Reynolds & Reynolds Certified Interface Documentation.*
|
||||
@@ -1,186 +0,0 @@
|
||||
# Rome – Customer Update (v1.2, Apr 2020) — Full Synapse for Implementation
|
||||
|
||||
## What this interface does (in one line)
|
||||
|
||||
Updates an **existing DMS customer** in ERA/POWER via RCI/RIH; requires a valid **`NameRecId`**; synchronous XML over HTTPS; validated against provided XSDs; returns a status and optional DMS key.
|
||||
|
||||
---
|
||||
|
||||
## Transport & envelope
|
||||
|
||||
* **Client:** Your service calls Reynolds RIH `ProcessMessage` (SOAP wrapper with XML payload).
|
||||
* **Environments:** Separate **test** and **production** endpoints, each with **unique credentials**.
|
||||
* **Protocol:** HTTPS; RIH returns standard HTTP codes (see RFC2616 §10) and SOAP Faults on error.
|
||||
* **Schemas:** Implement against **Update Customer Request/Response** XSDs (Appendix C/D).
|
||||
|
||||
---
|
||||
|
||||
## Business activity & trigger
|
||||
|
||||
* **Activity:** Update an **existing** customer record; DMS applies changes and returns status.
|
||||
* **Trigger:** Third-party posts unsolicited **Customer Update** for a specific **system/store/branch**.
|
||||
* **Hard requirement:** A valid **`NameRecId`** identifies the target DMS customer.
|
||||
|
||||
---
|
||||
|
||||
## Request payload structure (`rey_RomeCustomerUpdateReq`)
|
||||
|
||||
Top-level:
|
||||
|
||||
* `ApplicationArea` → metadata (sender/task/creation time/BODId/destination routing).
|
||||
* `CustRecord` → data blocks to update.
|
||||
|
||||
### `ApplicationArea`
|
||||
|
||||
* **`Sender.Component`** = `"Rome"`, **`Sender.Task`** = `"CU"`, **`ReferenceId`** = `"Update"`.
|
||||
* **`CreationDateTime`**: dealer local time, ISO-like `YYYY-MM-DD'T'HH:mm:ss`.
|
||||
* **`BODId`**: GUID, required for correlation; RIH uses this for tracking.
|
||||
* **`Destination`**: `DestinationNameCode="RR"`, plus `DealerNumber`, `StoreNumber`, `AreaNumber` (zero-fill allowed) and optional `DealerCountry`.
|
||||
|
||||
### `CustRecord`
|
||||
|
||||
* Attributes: `CustCateg` (`R|W|I`, default `R`), `CreatedBy`.
|
||||
* Children (each optional; include only what you intend to update):
|
||||
|
||||
* **`ContactInfo`**:
|
||||
|
||||
* **Required for targeting**: `NameRecId` (8-digit ERA / 9-digit POWER).
|
||||
* Optional name fields (`LastName`, `FirstName`, `MidName`, `Salut`, `Suffix`).
|
||||
* Repeating: `Address` (Type=`P|B`; `Addr1/2`, `City`, `State` **or** `Country`, `Zip`, `County`).
|
||||
|
||||
* **Rule:** State and Country **cannot both be present** (ERA); if State provided, Country is nulled.
|
||||
* Repeating: `Phone` (Type=`H|B|C|F|P|U|O`, `Num`, `Ext`), single `Email.MailTo`.
|
||||
* **`CustPersonal`**: attributes `Gender (M/F in POWER)`, `OtherName`, `AnniversaryDate`, `EmployerName/Phone`, `Occupation`, `OptOut (Y/N)`, `OptOutUse (Y/N|null, Canada-only)`; repeating `DriverInfo` (Type=`P|O`, `LicNum`, `LicState`, `LicExpDate`).
|
||||
* **`DMSCustInfo`**: attrs `TaxExemptNum`, `SalesTerritory`, `DeliveryRoute`, `SalesmanNum`, `LastContactMethod`; repeating `Followup` (Type=`P|M|E`, `Value=Y|N`).
|
||||
|
||||
**Most important constraints**
|
||||
|
||||
* You **must** supply `ContactInfo@NameRecId`.
|
||||
* If you send **State**, do **not** send **Country** (ERA rule).
|
||||
* Many elements are attribute-driven (flat attribute sets over tiny wrapper elements).
|
||||
|
||||
---
|
||||
|
||||
## Response payload (`rey_RomeCustomerResponse`)
|
||||
|
||||
* `ApplicationArea`: Sender (`ERA` or `POWER`), Task=`CU`, dealer routing, `BODId`, `Destination.DestinationNameCode="RCI"`.
|
||||
* `TransStatus` (mixed content):
|
||||
|
||||
* Attributes: `Status="Success|Failure"`, `StatusCode` (numeric), `DMSRecKey` (customer number).
|
||||
* Text node: optional error message text.
|
||||
|
||||
---
|
||||
|
||||
## Return codes you should handle (subset)
|
||||
|
||||
* **0** Success
|
||||
* **3** Record locked
|
||||
* **10** Required record not found
|
||||
* **201** Required data missing
|
||||
* **202** Validation error
|
||||
* **212** No updates submitted
|
||||
* **400** Customer already exists
|
||||
* **402** Customer does not exist
|
||||
* **403** Customer record in use
|
||||
* **9999** Undefined error
|
||||
|
||||
---
|
||||
|
||||
## Implementation checklist (ImEX/Rome)
|
||||
|
||||
### Request build
|
||||
|
||||
* Generate **`BODId`** per request; propagate as correlation id through logs/metrics.
|
||||
* Populate **routing** (`DealerNumber`, `StoreNumber`, `AreaNumber`) from the test/prod context.
|
||||
* Ensure **`NameRecId`** is present and valid before sending.
|
||||
* Include **only** the fields you intend to update.
|
||||
|
||||
### Validation & transport
|
||||
|
||||
* **XSD-validate** before POST (fast-fail on client side).
|
||||
* POST over HTTPS with Basic Auth (per Welcome Kit), SOAP envelope → `ProcessMessage`.
|
||||
* Treat timeouts/5xx as transient; retry with idempotency keyed by `BODId`.
|
||||
|
||||
### Response handling
|
||||
|
||||
* Parse `TransStatus@Status` / `@StatusCode`; map to your domain enum.
|
||||
* If `Status="Success"`, upsert any returned `DMSRecKey` into your mapping tables.
|
||||
* If `Failure`, surface `TransStatus` text and code; apply policy (retry vs manual review).
|
||||
|
||||
### Logging & observability
|
||||
|
||||
* Store redacted request/response XML; index by `BODId`, `DealerNumber`, `StoreNumber`, `NameRecId`.
|
||||
* Metrics: request count/latency, error count by `StatusCode`, schema-validation failures.
|
||||
|
||||
---
|
||||
|
||||
## Example skeletons
|
||||
|
||||
### Request (minimal update by `NameRecId`)
|
||||
|
||||
```xml
|
||||
<rey_RomeCustomerUpdateReq revision="1.0" xmlns="http://www.starstandards.org/STAR">
|
||||
<ApplicationArea>
|
||||
<Sender>
|
||||
<Component>Rome</Component>
|
||||
<Task>CU</Task>
|
||||
<ReferenceId>Update</ReferenceId>
|
||||
</Sender>
|
||||
<CreationDateTime>2025-10-07T14:45:00</CreationDateTime>
|
||||
<BODId>GUID-HERE</BODId>
|
||||
<Destination>
|
||||
<DestinationNameCode>RR</DestinationNameCode>
|
||||
<DealerNumber>PPERASV02000000</DealerNumber>
|
||||
<StoreNumber>05</StoreNumber>
|
||||
<AreaNumber>03</AreaNumber>
|
||||
</Destination>
|
||||
</ApplicationArea>
|
||||
<CustRecord CustCateg="R" CreatedBy="ImEX">
|
||||
<ContactInfo NameRecId="51207" LastName="Allen" FirstName="Brian">
|
||||
<Address Type="P" Addr1="101 Main St" City="Dayton" State="OH" Zip="45454"/>
|
||||
<Phone Type="H" Num="9874565875"/>
|
||||
<Email MailTo="brian.allen@example.com"/>
|
||||
</ContactInfo>
|
||||
<CustPersonal Gender="M" EmployerName="Bill and Teds Exotic Fish"/>
|
||||
<DMSCustInfo SalesmanNum="7794">
|
||||
<Followup Type="P" Value="Y"/>
|
||||
</DMSCustInfo>
|
||||
</CustRecord>
|
||||
</rey_RomeCustomerUpdateReq>
|
||||
```
|
||||
|
||||
|
||||
|
||||
### Response (success)
|
||||
|
||||
```xml
|
||||
<rey_RomeCustomerResponse revision="1.0" xmlns="http://www.starstandards.org/STAR">
|
||||
<ApplicationArea>
|
||||
<Sender>
|
||||
<Component>ERA</Component>
|
||||
<Task>CU</Task>
|
||||
<DealerNumber>PPERASV02000000</DealerNumber>
|
||||
<StoreNumber>05</StoreNumber>
|
||||
<AreaNumber>03</AreaNumber>
|
||||
</Sender>
|
||||
<CreationDateTime>2025-10-07T14:45:02</CreationDateTime>
|
||||
<BODId>GUID-HERE</BODId>
|
||||
<Destination><DestinationNameCode>RCI</DestinationNameCode></Destination>
|
||||
</ApplicationArea>
|
||||
<TransStatus Status="Success" StatusCode="0" DMSRecKey="123456"/>
|
||||
</rey_RomeCustomerResponse>
|
||||
```
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Test cases to script
|
||||
|
||||
1. **Happy path**: valid `NameRecId`, minimal update → `StatusCode=0`.
|
||||
2. **Record locked**: simulate concurrent change → `StatusCode=3`.
|
||||
3. **No updates**: send no changing fields → `StatusCode=212`.
|
||||
4. **Validation error**: bad phone/state/country combination → `StatusCode=202`.
|
||||
5. **Customer missing**: bad `NameRecId` → `StatusCode=402`.
|
||||
6. **Transport fault**: network/timeout; verify retry with same `BODId`.
|
||||
|
||||
@@ -1,216 +0,0 @@
|
||||
# Rome – Get Advisors (v1.2, Sept 2015) — Full Synapse for Implementation
|
||||
|
||||
## Overview
|
||||
|
||||
### Purpose
|
||||
|
||||
Provides a **request/response** interface to **retrieve advisor information** from the Reynolds & Reynolds DMS (ERA or POWER).
|
||||
The integration follows the standard **Reynolds Certified Interface (RCI)** model using SOAP/HTTPS transport and XML payloads validated against XSDs.
|
||||
|
||||
|
||||
### Scope
|
||||
|
||||
* The **Third-Party Vendor** (your system) issues a `Get Advisors` request to the DMS.
|
||||
* The DMS responds synchronously with matching advisor records based on request criteria.
|
||||
* Designed for **on-demand queries**, not for bulk advisor extractions.
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Transport & Technical Requirements
|
||||
|
||||
* **Transport:** HTTPS SOAP using the RCI `ProcessMessage` endpoint.
|
||||
* **Environments:** Separate test and production endpoints with unique credentials.
|
||||
* **Response Codes:** Standard HTTP responses per [RFC 2616 §10](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html).
|
||||
* **Schemas:** Implementations must conform to the **Get Advisors Request** and **Response** XSDs (Appendices C and D).
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Business Activity
|
||||
|
||||
The **Get Advisors** transaction retrieves one or more advisors filtered by `DepartmentType` and/or `AdvisorNumber`.
|
||||
Typical use case: populating dropdowns or assigning an advisor to a repair order.
|
||||
|
||||
Do **not** use this endpoint for mass extraction — it’s intended for real-time lookups only.
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Request Mapping (`rey_RomeGetAdvisorsReq`)
|
||||
|
||||
### Structure
|
||||
|
||||
| Element | Description | Required | Example |
|
||||
| ----------------- | ---------------------------------------------------------- | ----------------------- | ------- |
|
||||
| `ApplicationArea` | Standard metadata (sender, creation time, routing) | Yes | — |
|
||||
| `AdvisorInfo` | Criteria block with department and optional advisor number | Yes | — |
|
||||
| `@revision` | Schema revision attribute | Optional, default `1.0` | `1.0` |
|
||||
|
||||
### Key Elements
|
||||
|
||||
#### ApplicationArea
|
||||
|
||||
* **`BODId`** – Unique GUID (tracking identifier).
|
||||
* **`CreationDateTime`** – `yyyy-MM-ddThh:mm:ssZ` (dealer local time).
|
||||
* **`Sender.Component`** – `"Rome"`.
|
||||
* **`Sender.Task`** – `"CU"`.
|
||||
* **`Sender.ReferenceId`** – `"Query"`.
|
||||
* **`Sender.CreatorNameCode`** – `"RCI"`.
|
||||
* **`Sender.SenderNameCode`** – `"RCI"`.
|
||||
* **`Destination.DestinationNameCode`** – `"RR"`.
|
||||
* **`Destination.DealerNumber`** – 15-char DMS system ID (e.g. `123456789012345`).
|
||||
* **`Destination.StoreNumber`** – 2-digit ERA or 6-digit POWER store code.
|
||||
* **`Destination.AreaNumber`** – 2-digit ERA or 6-digit POWER branch code.
|
||||
|
||||
|
||||
#### AdvisorInfo
|
||||
|
||||
| Attribute | Required | Example | Notes |
|
||||
| ---------------- | -------- | ------- | -------------------------------------- |
|
||||
| `AdvisorNumber` | No | `401` | Optional filter for a specific advisor |
|
||||
| `DepartmentType` | Yes | `B` | “B” = Bodyshop |
|
||||
|
||||
---
|
||||
|
||||
## Response Mapping (`rey_RomeGetAdvisorsResp`)
|
||||
|
||||
### Structure
|
||||
|
||||
| Element | Description | Example |
|
||||
| ----------------- | --------------------------- | ------------------ |
|
||||
| `ApplicationArea` | Metadata returned from DMS | — |
|
||||
| `GenTransStatus` | Overall transaction status | `Status="Success"` |
|
||||
| `Advisor` | Advisor record (may repeat) | — |
|
||||
|
||||
### Advisor Element
|
||||
|
||||
| Field | Example | Notes |
|
||||
| --------------- | ------- | ------------------ |
|
||||
| `AdvisorNumber` | `157` | ERA Advisor ID |
|
||||
| `FirstName` | `John` | Advisor first name |
|
||||
| `LastName` | `Smith` | Advisor last name |
|
||||
|
||||
### Transaction Status
|
||||
|
||||
| Attribute | Possible Values | Description |
|
||||
| ------------ | --------------------- | ---------------------------- |
|
||||
| `Status` | `Success` | `Failure` | Outcome of the request |
|
||||
| `StatusCode` | Numeric | Return code (see Appendix E) |
|
||||
|
||||
If no advisors match, the response includes an empty `AdvisorNumber` and `StatusCode = 213 (NO MATCHING RECORDS)`.
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Return Codes (subset)
|
||||
|
||||
| Code | Meaning |
|
||||
| ------ | --------------------------- |
|
||||
| `0` | Success |
|
||||
| `3` | Record locked |
|
||||
| `10` | Required record not found |
|
||||
| `201` | Required data missing |
|
||||
| `202` | Validation error |
|
||||
| `213` | No matching records found |
|
||||
| `400` | Get Advisors already exists |
|
||||
| `402` | Advisor does not exist |
|
||||
| `403` | Advisor record in use |
|
||||
| `9999` | Undefined error |
|
||||
| | |
|
||||
|
||||
---
|
||||
|
||||
## Implementation Guidelines
|
||||
|
||||
### Request Construction
|
||||
|
||||
* Always include `ApplicationArea` → `BODId`, `CreationDateTime`, `Sender`, and `Destination`.
|
||||
* `DepartmentType` is **mandatory**.
|
||||
* `AdvisorNumber` optional filter.
|
||||
* Generate a new GUID per request.
|
||||
* Match date/time to dealer local timezone.
|
||||
|
||||
### Response Handling
|
||||
|
||||
* Parse `GenTransStatus@Status` and `@StatusCode`.
|
||||
* On success, map advisors into your system.
|
||||
* On failure, use `StatusCode` and text node for error reporting.
|
||||
* If no advisors found, handle gracefully with empty result list.
|
||||
|
||||
### Validation
|
||||
|
||||
* Validate outbound XML against `rey_RomeGetAdvisorsReq.xsd`.
|
||||
* Validate inbound XML against `rey_RomeGetAdvisorsResp.xsd`.
|
||||
|
||||
---
|
||||
|
||||
## Example XMLs
|
||||
|
||||
### Request
|
||||
|
||||
```xml
|
||||
<rey_RomeGetAdvisorsReq revision="1.0" xmlns="http://www.starstandards.org/STAR">
|
||||
<ApplicationArea>
|
||||
<BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
|
||||
<CreationDateTime>2025-10-07T16:00:00Z</CreationDateTime>
|
||||
<Sender>
|
||||
<Component>Rome</Component>
|
||||
<Task>CU</Task>
|
||||
<ReferenceId>Query</ReferenceId>
|
||||
<CreatorNameCode>RCI</CreatorNameCode>
|
||||
<SenderNameCode>RCI</SenderNameCode>
|
||||
</Sender>
|
||||
<Destination>
|
||||
<DestinationNameCode>RR</DestinationNameCode>
|
||||
<DealerNumber>PPERASV02000000</DealerNumber>
|
||||
<StoreNumber>05</StoreNumber>
|
||||
<AreaNumber>03</AreaNumber>
|
||||
</Destination>
|
||||
</ApplicationArea>
|
||||
<AdvisorInfo DepartmentType="B"/>
|
||||
</rey_RomeGetAdvisorsReq>
|
||||
```
|
||||
|
||||
### Response
|
||||
|
||||
```xml
|
||||
<rey_RomeGetAdvisorsResp revision="1.0" xmlns="http://www.starstandards.org/STAR">
|
||||
<ApplicationArea>
|
||||
<BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
|
||||
<CreationDateTime>2025-10-07T16:00:01Z</CreationDateTime>
|
||||
<Sender>
|
||||
<Component>Rome</Component>
|
||||
<Task>CU</Task>
|
||||
<ReferenceId>Update</ReferenceId>
|
||||
<CreatorNameCode>RCI</CreatorNameCode>
|
||||
<SenderNameCode>RCI</SenderNameCode>
|
||||
</Sender>
|
||||
<Destination>
|
||||
<DestinationNameCode>RCI</DestinationNameCode>
|
||||
<DealerNumber>PPERASV02000000</DealerNumber>
|
||||
<StoreNumber>05</StoreNumber>
|
||||
<AreaNumber>03</AreaNumber>
|
||||
</Destination>
|
||||
</ApplicationArea>
|
||||
<GenTransStatus Status="Success" StatusCode="0"/>
|
||||
<Advisor>
|
||||
<AdvisorNumber>157</AdvisorNumber>
|
||||
<FirstName>John</FirstName>
|
||||
<LastName>Smith</LastName>
|
||||
</Advisor>
|
||||
</rey_RomeGetAdvisorsResp>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Integration Checklist for ImEX/Rome
|
||||
|
||||
* ✅ Map internal “Bodyshop Advisors” table → ERA Advisor IDs.
|
||||
* ✅ Use `DepartmentType="B"` for bodyshop context.
|
||||
* ✅ Cache responses short-term (e.g., 15 minutes) to minimize load.
|
||||
* ✅ Log all `BODId` ↔ Status ↔ ReturnCode triplets for audit.
|
||||
* ✅ Ensure XSD validation before and after transmission.
|
||||
|
||||
---
|
||||
|
||||
@@ -1,218 +0,0 @@
|
||||
# Rome – Get Part (v1.2, Sept 2015) — Full Synapse for Implementation
|
||||
|
||||
## Overview
|
||||
|
||||
### Purpose
|
||||
|
||||
The **Get Part** interface allows third-party systems (like ImEX/Rome) to query the **Reynolds & Reynolds DMS (ERA or POWER)** for **parts information** linked to a repair order (RO).
|
||||
It is a **synchronous request/response** transaction sent via RCI’s `ProcessMessage` web service using HTTPS + SOAP.
|
||||
|
||||
---
|
||||
|
||||
## Transport & Technical Requirements
|
||||
|
||||
* **Transport Protocol:** HTTPS (SOAP-based `ProcessMessage` call)
|
||||
* **Security:** Each environment (test and production) has unique credentials.
|
||||
* **Response Codes:** Uses standard HTTP codes (per RFC 2616 §10).
|
||||
* **Schemas:** Defined in Appendices C (Request) and D (Response) — validated XML.
|
||||
* **Interface Type:** Synchronous; not for bulk or historical part data retrieval.
|
||||
|
||||
---
|
||||
|
||||
## Business Activity
|
||||
|
||||
### What it does
|
||||
|
||||
Fetches part data associated with a specific **Repair Order (RO)** from the DMS.
|
||||
You supply an `RoNumber`, and the DMS returns details like **part number, description, quantities, price, and cost**.
|
||||
|
||||
### Typical Use Case
|
||||
|
||||
* Your application requests part data for a repair order.
|
||||
* The DMS returns the current parts list for that RO.
|
||||
|
||||
### Limitation
|
||||
|
||||
⚠️ Not designed for mass extraction — one RO at a time only.
|
||||
|
||||
---
|
||||
|
||||
## Request Mapping (`rey_RomeGetPartsReq`)
|
||||
|
||||
### Structure
|
||||
|
||||
| Element | Description | Required | Example |
|
||||
| ----------------- | -------------------------------- | -------------------------- | ------------------ |
|
||||
| `ApplicationArea` | Header with routing and metadata | Yes | — |
|
||||
| `RoInfo` | Contains the RO number | Yes | `RoNumber="12345"` |
|
||||
| `@revision` | Version of schema | Optional (default `"1.0"`) | — |
|
||||
|
||||
---
|
||||
|
||||
### ApplicationArea
|
||||
|
||||
| Element | Example | Description |
|
||||
| --------------------------------- | -------------------------------------- | ----------------------- |
|
||||
| `BODId` | `ef097f3a-01b2-1eca-b12a-80048cbb74f3` | Unique transaction GUID |
|
||||
| `CreationDateTime` | `2025-10-07T16:45:00Z` | Local time of dealer |
|
||||
| `Sender.Component` | `"Rome"` | Sending application |
|
||||
| `Sender.Task` | `"RCT"` | Literal |
|
||||
| `Sender.ReferenceId` | `"Query"` | Literal |
|
||||
| `Sender.CreatorNameCode` | `"RCI"` | Literal |
|
||||
| `Sender.SenderNameCode` | `"RCI"` | Literal |
|
||||
| `Destination.DestinationNameCode` | `"RR"` | Literal |
|
||||
| `Destination.DealerNumber` | `PPERASV02000000` | DMS routing ID |
|
||||
| `Destination.StoreNumber` | `05` | ERA store code |
|
||||
| `Destination.AreaNumber` | `03` | ERA branch code |
|
||||
|
||||
---
|
||||
|
||||
### RoInfo
|
||||
|
||||
| Attribute | Required | Example | Description |
|
||||
| ---------- | -------- | ------- | --------------------------------------------------- |
|
||||
| `RoNumber` | Yes | `12345` | The repair order number for which to retrieve parts |
|
||||
|
||||
---
|
||||
|
||||
## Response Mapping (`rey_RomeGetPartsResp`)
|
||||
|
||||
### Structure
|
||||
|
||||
| Element | Description | Multiplicity |
|
||||
| ----------------- | ---------------------------- | ------------ |
|
||||
| `ApplicationArea` | Standard header | 1 |
|
||||
| `GenTransStatus` | Transaction status block | 1 |
|
||||
| `RoParts` | The returned parts record(s) | 1..N |
|
||||
|
||||
---
|
||||
|
||||
### RoParts Elements
|
||||
|
||||
| Element | Example | Description |
|
||||
| ----------------- | ---------- | ---------------------------------------- |
|
||||
| `PartNumber` | `FO12345` | Part number |
|
||||
| `PartDescription` | `Gasket` | Description |
|
||||
| `QuantityOrdered` | `2` | Quantity ordered |
|
||||
| `QuantityShipped` | `2` | Quantity shipped |
|
||||
| `Price` | `35.00` | Retail price |
|
||||
| `Cost` | `25.00` | Dealer cost |
|
||||
| `ProcessedFlag` | `Y` or `N` | Indicates whether part processed into RO |
|
||||
| `AddOrDelete` | `A` or `D` | Whether the part was added or deleted |
|
||||
|
||||
> **Note:** A `ProcessedFlag` of `"N"` indicates a part was added via the API but not yet finalized in ERA Program 2525 (not sold). These parts are “echoed” back so the client does not mistake them for deleted ones.
|
||||
|
||||
---
|
||||
|
||||
## Transaction Status (`GenTransStatus`)
|
||||
|
||||
| Attribute | Possible Values | Example | Description |
|
||||
| ------------ | -------------------- | ---------------------------- | ---------------------- |
|
||||
| `Status` | `Success`, `Failure` | `"Success"` | Indicates outcome |
|
||||
| `StatusCode` | Integer | `"0"` | Numeric status code |
|
||||
| Text Node | Optional | `"No matching record found"` | Human-readable message |
|
||||
|
||||
---
|
||||
|
||||
## Return Codes (subset)
|
||||
|
||||
| Code | Meaning |
|
||||
| ------ | ------------------------- |
|
||||
| `0` | Success |
|
||||
| `3` | Record locked |
|
||||
| `10` | Required record not found |
|
||||
| `201` | Required data missing |
|
||||
| `202` | Validation error |
|
||||
| `519` | No part available |
|
||||
| `9999` | Undefined error |
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Example XMLs
|
||||
|
||||
### Request
|
||||
|
||||
```xml
|
||||
<rey_RomeGetPartsReq revision="1.0" xmlns="http://www.starstandards.org/STAR">
|
||||
<ApplicationArea>
|
||||
<BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
|
||||
<CreationDateTime>2025-10-07T16:00:00Z</CreationDateTime>
|
||||
<Sender>
|
||||
<Component>Rome</Component>
|
||||
<Task>RCT</Task>
|
||||
<ReferenceId>Query</ReferenceId>
|
||||
<CreatorNameCode>RCI</CreatorNameCode>
|
||||
<SenderNameCode>RCI</SenderNameCode>
|
||||
</Sender>
|
||||
<Destination>
|
||||
<DestinationNameCode>RR</DestinationNameCode>
|
||||
<DealerNumber>PPERASV02000000</DealerNumber>
|
||||
<StoreNumber>05</StoreNumber>
|
||||
<AreaNumber>03</AreaNumber>
|
||||
</Destination>
|
||||
</ApplicationArea>
|
||||
<RoInfo RoNumber="12345"/>
|
||||
</rey_RomeGetPartsReq>
|
||||
```
|
||||
|
||||
### Response
|
||||
|
||||
```xml
|
||||
<rey_RomeGetPartsResp revision="1.0" xmlns="http://www.starstandards.org/STAR">
|
||||
<ApplicationArea>
|
||||
<BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
|
||||
<CreationDateTime>2025-10-07T16:00:01Z</CreationDateTime>
|
||||
<Sender>
|
||||
<Component>RCT</Component>
|
||||
<Task>RCT</Task>
|
||||
<ReferenceId>Update</ReferenceId>
|
||||
<CreatorNameCode>RCI</CreatorNameCode>
|
||||
<SenderNameCode>RCI</SenderNameCode>
|
||||
</Sender>
|
||||
<Destination>
|
||||
<DestinationNameCode>RR</DestinationNameCode>
|
||||
<DealerNumber>PPERASV02000000</DealerNumber>
|
||||
<StoreNumber>05</StoreNumber>
|
||||
<AreaNumber>03</AreaNumber>
|
||||
</Destination>
|
||||
</ApplicationArea>
|
||||
<GenTransStatus Status="Success" StatusCode="0"/>
|
||||
<RoParts>
|
||||
<PartNumber>FO12345</PartNumber>
|
||||
<PartDescription>Gasket</PartDescription>
|
||||
<QuantityOrdered>2</QuantityOrdered>
|
||||
<QuantityShipped>2</QuantityShipped>
|
||||
<Price>35.00</Price>
|
||||
<Cost>25.00</Cost>
|
||||
<ProcessedFlag>Y</ProcessedFlag>
|
||||
<AddOrDelete>A</AddOrDelete>
|
||||
</RoParts>
|
||||
</rey_RomeGetPartsResp>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Implementation Notes for ImEX/Rome
|
||||
|
||||
✅ **Request**
|
||||
|
||||
* Always include `RoNumber`.
|
||||
* `BODId` must be a unique GUID.
|
||||
* Set correct DMS routing (dealer/store/branch).
|
||||
* Validate against XSD before sending.
|
||||
|
||||
✅ **Response**
|
||||
|
||||
* Parse `GenTransStatus.Status` and `StatusCode`.
|
||||
* If `519` (no part available), handle gracefully.
|
||||
* `ProcessedFlag="N"` parts should not be treated as active.
|
||||
* Cache parts data locally for quick access.
|
||||
|
||||
✅ **Error Handling**
|
||||
|
||||
* Log `BODId`, `StatusCode`, and XML payloads.
|
||||
* Retry transient network errors; not logical ones (e.g., 519, 10).
|
||||
|
||||
---
|
||||
@@ -1,84 +0,0 @@
|
||||
## 🧩 **Rome Service Vehicle Insert — Developer Integration Summary**
|
||||
|
||||
### **Purpose & Scope**
|
||||
|
||||
This interface allows third-party systems (like your Rome middleware) to insert a new *Service Vehicle* record into the Reynolds & Reynolds DMS.
|
||||
The DMS will validate the provided vehicle and customer data, create the record if valid, and respond with a status of `Success` or `Failure`.
|
||||
|
||||
---
|
||||
|
||||
### **Core Workflow**
|
||||
|
||||
1. **POST** a SOAP request to the Reynolds endpoint (`ProcessMessage`).
|
||||
2. Include the XML payload structured as `rey_RomeServVehicleInsertRequest`.
|
||||
3. Receive `rey_RomeServVehicleInsertResponse` with:
|
||||
|
||||
* Transmission status (`GenTransStatus`),
|
||||
* Optional `StatusCode` from the return codes table (Appendix E).
|
||||
|
||||
---
|
||||
|
||||
### **Request (`rey_RomeServVehicleInsertRequest`)**
|
||||
|
||||
**Sections:**
|
||||
|
||||
* **ApplicationArea**
|
||||
|
||||
* Metadata such as `CreationDateTime`, `BODId`, and sender/destination details.
|
||||
* **Vehicle**
|
||||
|
||||
* Basic vehicle identity fields (`Vin`, `VehicleMake`, `VehicleYear`, etc.).
|
||||
* Sub-element `VehicleDetail` for mechanical attributes (`Aircond`, `EngineConfig`, etc.).
|
||||
* **VehicleServInfo**
|
||||
|
||||
* Operational context: stock ID, customer number, advisor, warranty, production dates, etc.
|
||||
* Includes sub-elements:
|
||||
|
||||
* `VehExtWarranty` (contract #, expiration date/mileage)
|
||||
* `Advisor` → `ContactInfo` (NameRecId)
|
||||
|
||||
**Required core fields**
|
||||
|
||||
* `Vin` (validated via `GEVINVAL`)
|
||||
* `VehicleMake`, `VehicleYear`, `ModelDesc`, `Carline`
|
||||
* `CustomerNo` (must pre-exist)
|
||||
* `SalesmanNo` (valid advisor)
|
||||
* `InServiceDate` ≤ current date
|
||||
* `TeamCode` – must exist in `MECHANICS` file
|
||||
|
||||
---
|
||||
|
||||
### **Response (`rey_RomeServVehicleInsertResponse`)**
|
||||
|
||||
**Elements:**
|
||||
|
||||
* `ApplicationArea` – mirrors request metadata.
|
||||
* `GenTransStatus` – attributes:
|
||||
|
||||
* `Status` = `Success` | `Failure`
|
||||
* `StatusCode` = numeric code (see Appendix E)
|
||||
|
||||
---
|
||||
|
||||
### **Error Codes (Appendix E Highlights)**
|
||||
|
||||
| Code | Meaning |
|
||||
| ------ | ----------------------------------------------------- |
|
||||
| `0` | Success |
|
||||
| `300` | Vehicle already exists |
|
||||
| `301` | Invalid make or ownership not established |
|
||||
| `502` | Advisor was terminated |
|
||||
| `506` | Mileage must be greater than last mileage |
|
||||
| `513` | VIN must be added to ERA2 before an RO can be created |
|
||||
| `9999` | Undefined error |
|
||||
|
||||
---
|
||||
|
||||
### **Implementation Notes**
|
||||
|
||||
* Endpoint authentication and URL differ between **test** and **production**.
|
||||
* Ensure all date fields follow format `MM/DD/YYYYThh:mm:ssZ(EST)` (local dealer time).
|
||||
* Use `GUID` for `BODId` to ensure message traceability.
|
||||
* Validate VIN before submission; rejected VINs halt insertion.
|
||||
|
||||
---
|
||||
@@ -1,59 +0,0 @@
|
||||
# Rome – Search Customer Service Vehicle Combined (v1.1, May 2015) — Full Synapse
|
||||
|
||||
**What it does:** one-shot search that returns **customer identity + all matching service vehicles** based on exactly **one** of the permitted search patterns (e.g., `NameRecId`, `FullName`, `Phone`, `Partial VIN`, `Stock #`, `License #`, or `FullName/LName + Model triple`). Results include customer contact info and each vehicle’s details and service metadata.
|
||||
|
||||
## Transport
|
||||
|
||||
* **SOAP/HTTPS** to RCI `ProcessMessage`, separate **test** and **prod** endpoints/credentials.
|
||||
* Standard HTTP response codes; XML payloads validate against request/response XSDs.
|
||||
|
||||
## Trigger & allowed search modes
|
||||
|
||||
Pick **exactly one** of these (no mixing):
|
||||
|
||||
1. `Last Name + Partial VIN`
|
||||
2. `Full Name + Partial VIN`
|
||||
3. `Last Name + Phone`
|
||||
4. `Full Name + Phone`
|
||||
5. `Full Name` (alone)
|
||||
6. `NameRecId` (alone)
|
||||
7. `Phone` (alone)
|
||||
8. `Phone + Partial VIN`
|
||||
9. `Last Name + (Make, Model, Year)`
|
||||
10. `Full Name + (Make, Model, Year)`
|
||||
11. `Vehicle Stock #` (alone)
|
||||
12. `Vehicle License #` (alone)
|
||||
13. `Partial or Full VIN` (alone)
|
||||
Business customers only match with `NameRecId`, `Phone`, `Stock #`, `License #`, `Phone+Partial VIN`, or `Partial/Full VIN`.
|
||||
|
||||
## Request (`rey_RomeCustServVehCombReq`)
|
||||
|
||||
* **`ApplicationArea`**: `Sender` (Component=`Rome`, Task=`CVC`, CreatorNameCode=`RCI`, SenderNameCode=`RCI`), `CreationDateTime` (`yyyy-mm-ddThh:mm:ssZ`), optional `BODId` (GUID), `Destination` (DestinationNameCode=`RR`, plus dealer/store/area routing).
|
||||
* **`CustServVehCombReq`**:
|
||||
|
||||
* `QueryData`: one of `LName`, `FullName(FName,LName,MName)`, `NameRecId(CustIdStart)`, `Phone(Num)`, `PartVIN(Vin)`, `StkNo(VehId)`, `LicenseNum(LicNo)`; optional `MaxRecs` (≤ 50).
|
||||
* `VehData`: `MakePfx` (2-char make), `Model` (carline/description match), `Year` (2 or 4).
|
||||
* `OtherCriteria` present but “not used”.
|
||||
|
||||
## Response (`rey_RomeCustServVehComb`)
|
||||
|
||||
* **`ApplicationArea`** (Sender typically `RR`, Task=`CVC`, etc.) and **`TransStatus`** with `Status`=`Success|Failure`, `StatusCode` (numeric), and optional message text.
|
||||
* **`CustServVehComb`** records (0..n), each with:
|
||||
|
||||
* **`NameContactId`**: `NameId` (`IBFlag` `I|B`, individual or business name + optional `NameRecId`), plus repeating `Address`, `ContactOptions`, `Phone`, `Email`.
|
||||
* **`ServVehicle`** (0..n): `Vehicle` (VIN, Make, Year, Model, Carline, color, detail attrs), and `VehicleServInfo` (attributes for StockID, CustomerNo, Service history fields; children: `VehExtWarranty`, `Advisor.ContactInfo@NameRecId`, `VehServComments*`).
|
||||
|
||||
## Return codes (subset)
|
||||
|
||||
* `0` Success; `201` Required data missing; `202` Validation error; `213` No matching records; `9999` Undefined error. (Use `TransStatus@StatusCode` + text to decide UX.)
|
||||
|
||||
## Implementation checklist
|
||||
|
||||
* Build one of the **allowed** queries; if multiple criteria are supplied, RCI treats it as invalid.
|
||||
* Generate **`BODId`** GUID per call; log it for tracing.
|
||||
* Fill **routing** (`DealerNumber`, `StoreNumber`, `AreaNumber`) for the target store/branch.
|
||||
* Enforce `MaxRecs` (default is 1; if >1 results and `MaxRecs` omitted, API returns “multiple exist” error).
|
||||
* XSD-validate request/response; map `TransStatus` to domain errors; return empty list on `213`.
|
||||
|
||||
---
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
# Rome – Update Body Shop Management Repair Order (v1.6, Jan 2016) — Full Synapse
|
||||
|
||||
**Purpose**
|
||||
This interface allows a Body Shop Management (BSM) system to update an existing *Repair Order (RO)* in the Reynolds & Reynolds DMS. It covers updates to general RO details, labor operations, parts, GOG (gas, oil, grease) items, and miscellaneous charges .
|
||||
|
||||
---
|
||||
|
||||
## 🧩 Core Workflow
|
||||
|
||||
1. **BSM System → RCI Gateway → Reynolds DMS**
|
||||
|
||||
* BSM sends a SOAP/XML request (`rey_RomeUpdateBSMRepairOrderReq`) to RCI.
|
||||
* DMS validates and processes the update.
|
||||
* DMS replies with `rey_RomeUpdateBSMRepairOrderResp`.
|
||||
|
||||
2. **Supported updates**
|
||||
|
||||
* Comments, tax codes, and estimate type.
|
||||
* Labor operation details (e.g., billing rates, opcodes).
|
||||
* Parts (add, delete, modify).
|
||||
* GOG and Misc items with financial attributes.
|
||||
|
||||
---
|
||||
|
||||
## 🧱 Request Structure — `rey_RomeUpdateBSMRepairOrderReq`
|
||||
|
||||
| Section | Description | |
|
||||
| ------------------- | ---------------------------------------------------------------------------- | -------------------------------------------------------------- |
|
||||
| **ApplicationArea** | Identifies sender (`Rome/RCI`), creation time, and destination dealer/store. | |
|
||||
| **RoRecord** | Main data payload, with attribute `FinalUpdate="Y | N"`. Includes general, labor, part, GOG, and misc subsections. |
|
||||
|
||||
### RoRecord subsections
|
||||
|
||||
* **Rogen:** Header data — `RoNo`, `CustNo`, `TagNo`, mileage, and optional `RoCommentInfo`, `EstimateInfo`, and `TaxCodeInfo`.
|
||||
* **Rolabor:** One or more `OpCodeLaborInfo` nodes containing:
|
||||
|
||||
* `OpCode`, `JobNo`, and pay type flags (`Cust`, `Intr`, `Warr`).
|
||||
* Nested `BillTimeRateHrs`, `CCCStmts` (Cause/Complaint/Correction), and `RoAmts` (billing amounts).
|
||||
* **Ropart:** Job-linked `PartInfoByJob` with `OSDPartDetail` items.
|
||||
* **Rogog:** “Gas/Oil/Grease” lines (`AllGogOpCodeInfo` → `AllGogLineItmInfo`).
|
||||
* **Romisc:** Miscellaneous charge sections (`MiscOpCodeInfo` → `MiscLineItmInfo`).
|
||||
|
||||
---
|
||||
|
||||
## 📤 Response Structure — `rey_RomeUpdateBSMRepairOrderResp`
|
||||
|
||||
| Element | Description | |
|
||||
| ------------------- | ---------------------------------------------------------------------------------------- | --------------------------------- |
|
||||
| **ApplicationArea** | Mirrors the request metadata (sender now `ERA/RR`). | |
|
||||
| **GenTransStatus** | `Status="Success | Failure"`and numeric`StatusCode`. |
|
||||
| **RoRecordStatus** | Attributes include `Status`, `Date`, `Time`, `OutsdRoNo`, `DMSRoNo`, and `ErrorMessage`. | |
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ Key Return Codes
|
||||
|
||||
| Code | Meaning |
|
||||
| ------ | ---------------------- |
|
||||
| `0` | Success |
|
||||
| `300` | RO not found |
|
||||
| `301` | Invalid RO number |
|
||||
| `501` | Invalid tax code |
|
||||
| `503` | Invalid opcode |
|
||||
| `9999` | Undefined system error |
|
||||
|
||||
---
|
||||
|
||||
## 🧩 Implementation Notes
|
||||
|
||||
* **FinalUpdate="Y"** signals the RO is finalized in the DMS.
|
||||
* The DMS uses **RO#, Dealer#, and Store#** to locate the target record.
|
||||
* **JobNo** groups labor and parts within the same operation.
|
||||
* Monetary and tax fields are sent as strings (DMS expects implicit decimal).
|
||||
* Every RO update must be uniquely identified by a **BODId** (GUID).
|
||||
* Validation failures trigger a response with `Status="Failure"` and `ErrorMessage` populated.
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -17,5 +17,4 @@ TEST_PASSWORD="test123"
|
||||
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
|
||||
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
|
||||
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
|
||||
VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
|
||||
VITE_APP_ENABLE_RESPONSIVE_TABLE_FILTERING=false
|
||||
VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
|
||||
@@ -19,5 +19,4 @@ TEST_PASSWORD="test123"
|
||||
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
|
||||
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
|
||||
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
|
||||
VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78
|
||||
VITE_APP_ENABLE_RESPONSIVE_TABLE_FILTERING=false
|
||||
VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78
|
||||
@@ -16,4 +16,4 @@ VITE_APP_INSTANCE=IMEX
|
||||
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
|
||||
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
|
||||
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
|
||||
VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
|
||||
VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
|
||||
3
client/.gitignore
vendored
3
client/.gitignore
vendored
@@ -13,6 +13,3 @@ playwright/.cache/
|
||||
# Sentry Config File
|
||||
.sentryclirc
|
||||
/dev-dist
|
||||
|
||||
# Local environment overrides (not version controlled)
|
||||
.env.development.local.overrides
|
||||
|
||||
@@ -1,17 +1,10 @@
|
||||
import globals from "globals";
|
||||
import pluginJs from "@eslint/js";
|
||||
import pluginReact from "eslint-plugin-react";
|
||||
import pluginReactCompiler from "eslint-plugin-react-compiler";
|
||||
|
||||
/** @type {import("eslint").Linter.Config[]} */
|
||||
export default [
|
||||
{ ignores: [
|
||||
"node_modules/**",
|
||||
"dist/**",
|
||||
"build/**",
|
||||
"dev-dist/**",
|
||||
"**/trello-board/dnd/**" // Exclude third-party DnD library
|
||||
] },
|
||||
{ ignores: ["node_modules/**", "dist/**", "build/**", "dev-dist/**"] },
|
||||
{
|
||||
files: ["**/*.{js,mjs,cjs,jsx}"]
|
||||
},
|
||||
@@ -28,13 +21,5 @@ export default [
|
||||
"react/no-children-prop": 0 // Disable react/no-children-prop rule
|
||||
}
|
||||
},
|
||||
pluginReact.configs.flat["jsx-runtime"],
|
||||
{
|
||||
plugins: {
|
||||
"react-compiler": pluginReactCompiler
|
||||
},
|
||||
rules: {
|
||||
"react-compiler/react-compiler": "error"
|
||||
}
|
||||
}
|
||||
pluginReact.configs.flat["jsx-runtime"]
|
||||
];
|
||||
|
||||
7108
client/package-lock.json
generated
7108
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -8,104 +8,100 @@
|
||||
"private": true,
|
||||
"proxy": "http://localhost:4000",
|
||||
"dependencies": {
|
||||
"@amplitude/analytics-browser": "^2.35.3",
|
||||
"@amplitude/analytics-browser": "^2.23.5",
|
||||
"@ant-design/pro-layout": "^7.22.6",
|
||||
"@apollo/client": "^4.1.6",
|
||||
"@dnd-kit/core": "^6.3.1",
|
||||
"@dnd-kit/modifiers": "^9.0.0",
|
||||
"@dnd-kit/sortable": "^10.0.0",
|
||||
"@dnd-kit/utilities": "^3.2.2",
|
||||
"@apollo/client": "^3.13.9",
|
||||
"@emotion/is-prop-valid": "^1.4.0",
|
||||
"@fingerprintjs/fingerprintjs": "^5.0.1",
|
||||
"@firebase/analytics": "^0.10.19",
|
||||
"@firebase/app": "^0.14.8",
|
||||
"@firebase/auth": "^1.12.0",
|
||||
"@firebase/firestore": "^4.11.0",
|
||||
"@fingerprintjs/fingerprintjs": "^4.6.1",
|
||||
"@firebase/analytics": "^0.10.17",
|
||||
"@firebase/app": "^0.14.2",
|
||||
"@firebase/auth": "^1.10.8",
|
||||
"@firebase/firestore": "^4.9.1",
|
||||
"@firebase/messaging": "^0.12.22",
|
||||
"@jsreport/browser-client": "^3.1.0",
|
||||
"@reduxjs/toolkit": "^2.11.2",
|
||||
"@sentry/cli": "^3.2.2",
|
||||
"@sentry/react": "^10.40.0",
|
||||
"@sentry/vite-plugin": "^4.9.1",
|
||||
"@splitsoftware/splitio-react": "^2.6.1",
|
||||
"@tanem/react-nprogress": "^5.0.63",
|
||||
"antd": "^6.3.1",
|
||||
"apollo-link-logger": "^3.0.0",
|
||||
"@reduxjs/toolkit": "^2.9.0",
|
||||
"@sentry/cli": "^2.53.0",
|
||||
"@sentry/react": "^9.43.0",
|
||||
"@sentry/vite-plugin": "^4.3.0",
|
||||
"@splitsoftware/splitio-react": "^2.3.1",
|
||||
"@tanem/react-nprogress": "^5.0.53",
|
||||
"antd": "^5.27.3",
|
||||
"apollo-link-logger": "^2.0.1",
|
||||
"apollo-link-sentry": "^4.4.0",
|
||||
"autosize": "^6.0.1",
|
||||
"axios": "^1.13.5",
|
||||
"axios": "^1.11.0",
|
||||
"classnames": "^2.5.1",
|
||||
"css-box-model": "^1.2.1",
|
||||
"dayjs": "^1.11.19",
|
||||
"dayjs-business-days2": "^1.3.2",
|
||||
"dayjs": "^1.11.18",
|
||||
"dayjs-business-days2": "^1.3.0",
|
||||
"dinero.js": "^1.9.1",
|
||||
"dotenv": "^17.3.1",
|
||||
"env-cmd": "^11.0.0",
|
||||
"dotenv": "^17.2.2",
|
||||
"env-cmd": "^10.1.0",
|
||||
"exifr": "^7.1.3",
|
||||
"graphql": "^16.13.0",
|
||||
"graphql-ws": "^6.0.7",
|
||||
"i18next": "^25.8.13",
|
||||
"i18next-browser-languagedetector": "^8.2.1",
|
||||
"graphql": "^16.11.0",
|
||||
"i18next": "^25.5.2",
|
||||
"i18next-browser-languagedetector": "^8.2.0",
|
||||
"immutability-helper": "^3.1.1",
|
||||
"libphonenumber-js": "^1.12.38",
|
||||
"lightningcss": "^1.31.1",
|
||||
"logrocket": "^12.0.0",
|
||||
"markerjs2": "^2.32.7",
|
||||
"libphonenumber-js": "^1.12.15",
|
||||
"logrocket": "^9.0.2",
|
||||
"markerjs2": "^2.32.6",
|
||||
"memoize-one": "^6.0.0",
|
||||
"normalize-url": "^8.1.1",
|
||||
"normalize-url": "^8.0.2",
|
||||
"object-hash": "^3.0.0",
|
||||
"phone": "^3.1.71",
|
||||
"posthog-js": "^1.355.0",
|
||||
"phone": "^3.1.67",
|
||||
"posthog-js": "^1.261.7",
|
||||
"prop-types": "^15.8.1",
|
||||
"query-string": "^9.3.1",
|
||||
"query-string": "^9.2.2",
|
||||
"raf-schd": "^4.0.3",
|
||||
"react": "^19.2.4",
|
||||
"react": "^18.3.1",
|
||||
"react-big-calendar": "^1.19.4",
|
||||
"react-color": "^2.19.3",
|
||||
"react-cookie": "^8.0.1",
|
||||
"react-dom": "^19.2.4",
|
||||
"lightningcss": "^1.30.1",
|
||||
"react-dom": "^18.3.1",
|
||||
"react-drag-listview": "^2.0.0",
|
||||
"react-grid-gallery": "^1.0.1",
|
||||
"react-grid-layout": "^2.2.2",
|
||||
"react-i18next": "^16.5.4",
|
||||
"react-grid-layout": "1.3.4",
|
||||
"react-i18next": "^15.7.3",
|
||||
"react-icons": "^5.5.0",
|
||||
"react-image-lightbox": "^5.1.4",
|
||||
"react-markdown": "^10.1.0",
|
||||
"react-number-format": "^5.4.3",
|
||||
"react-popopo": "^2.1.9",
|
||||
"react-product-fruits": "^2.2.62",
|
||||
"react-product-fruits": "^2.2.61",
|
||||
"react-redux": "^9.2.0",
|
||||
"react-resizable": "^3.1.3",
|
||||
"react-router-dom": "^7.13.1",
|
||||
"react-resizable": "^3.0.5",
|
||||
"react-router-dom": "^6.30.0",
|
||||
"react-sticky": "^6.0.3",
|
||||
"react-virtuoso": "^4.18.1",
|
||||
"recharts": "^3.7.0",
|
||||
"react-virtuoso": "^4.14.0",
|
||||
"recharts": "^2.15.2",
|
||||
"redux": "^5.0.1",
|
||||
"redux-actions": "^3.0.3",
|
||||
"redux-persist": "^6.0.0",
|
||||
"redux-saga": "^1.4.2",
|
||||
"redux-saga": "^1.3.0",
|
||||
"redux-state-sync": "^3.1.4",
|
||||
"reselect": "^5.1.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"sass": "^1.97.3",
|
||||
"socket.io-client": "^4.8.3",
|
||||
"styled-components": "^6.3.11",
|
||||
"sass": "^1.92.0",
|
||||
"socket.io-client": "^4.8.1",
|
||||
"styled-components": "^6.1.19",
|
||||
"subscriptions-transport-ws": "^0.11.0",
|
||||
"use-memo-one": "^1.1.3",
|
||||
"vite-plugin-ejs": "^1.7.0",
|
||||
"web-vitals": "^5.1.0"
|
||||
"web-vitals": "^3.5.2"
|
||||
},
|
||||
"scripts": {
|
||||
"postinstall": "echo 'when updating react-big-calendar, remember to check to localizer in the calendar wrapper'",
|
||||
"analyze": "source-map-explorer 'build/static/js/*.js'",
|
||||
"start": "vite",
|
||||
"build": "vite build",
|
||||
"build:dev:imex": "dotenvx run --env-file=.env.development.imex --env-file=.env.development.local.overrides -- vite build",
|
||||
"build:dev:rome": "dotenvx run --env-file=.env.development.rome --env-file=.env.development.local.overrides -- vite build",
|
||||
"build:test:imex": "dotenvx run --env-file=.env.test.imex -- vite build",
|
||||
"build:test:rome": "dotenvx run --env-file=.env.test.rome -- vite build",
|
||||
"build:production:imex": "env-cmd -f .env.production.imex vite build",
|
||||
"build:production:rome": "env-cmd -f .env.production.rome vite build",
|
||||
"start:imex": "dotenvx run --env-file=.env.development.imex --env-file=.env.development.local.overrides -- vite",
|
||||
"start:rome": "dotenvx run --env-file=.env.development.rome --env-file=.env.development.local.overrides -- vite",
|
||||
"preview:imex": "dotenvx run --env-file=.env.development.imex --env-file=.env.development.local.overrides -- vite preview",
|
||||
"preview:rome": "dotenvx run --env-file=.env.development.rome --env-file=.env.development.local.overrides -- vite preview",
|
||||
"build": "dotenvx run --env-file=.env.development.imex -- vite build",
|
||||
"start:imex": "dotenvx run --env-file=.env.development.imex -- vite",
|
||||
"start:rome": "dotenvx run --env-file=.env.development.rome -- vite",
|
||||
"preview:imex": "dotenvx run --env-file=.env.development.imex -- vite preview",
|
||||
"preview:rome": "dotenvx run --env-file=.env.development.rome -- vite preview",
|
||||
"build:test:imex": "env-cmd -f .env.test.imex npm run build",
|
||||
"build:test:rome": "env-cmd -f .env.test.rome npm run build",
|
||||
"build:production:imex": "env-cmd -f .env.production.imex npm run build",
|
||||
"build:production:rome": "env-cmd -f .env.production.rome npm run build",
|
||||
"madge": "madge --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular .",
|
||||
"eulaize": "node src/utils/eulaize.js",
|
||||
"test:unit": "vitest run",
|
||||
@@ -137,40 +133,39 @@
|
||||
"@rollup/rollup-linux-x64-gnu": "4.6.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ant-design/icons": "^6.1.0",
|
||||
"@ant-design/icons": "^6.0.0",
|
||||
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
|
||||
"@babel/preset-react": "^7.28.5",
|
||||
"@dotenvx/dotenvx": "^1.52.0",
|
||||
"@babel/preset-react": "^7.27.1",
|
||||
"@dotenvx/dotenvx": "^1.49.0",
|
||||
"@emotion/babel-plugin": "^11.13.5",
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@eslint/js": "^9.39.2",
|
||||
"@playwright/test": "^1.58.2",
|
||||
"@eslint/js": "^9.33.0",
|
||||
"@playwright/test": "^1.55.0",
|
||||
"@sentry/webpack-plugin": "^4.1.1",
|
||||
"@testing-library/dom": "^10.4.1",
|
||||
"@testing-library/jest-dom": "^6.9.1",
|
||||
"@testing-library/react": "^16.3.2",
|
||||
"@vitejs/plugin-react": "^5.1.4",
|
||||
"babel-plugin-react-compiler": "^1.0.0",
|
||||
"browserslist": "^4.28.1",
|
||||
"@testing-library/jest-dom": "^6.8.0",
|
||||
"@testing-library/react": "^16.3.0",
|
||||
"@vitejs/plugin-react": "^4.6.0",
|
||||
"browserslist": "^4.25.3",
|
||||
"browserslist-to-esbuild": "^2.1.1",
|
||||
"chalk": "^5.6.2",
|
||||
"eslint": "^9.39.2",
|
||||
"chalk": "^5.6.0",
|
||||
"eslint": "^9.33.0",
|
||||
"eslint-plugin-react": "^7.37.5",
|
||||
"eslint-plugin-react-compiler": "^19.1.0-rc.2",
|
||||
"globals": "^17.3.0",
|
||||
"jsdom": "^28.1.0",
|
||||
"memfs": "^4.56.10",
|
||||
"globals": "^15.15.0",
|
||||
"jsdom": "^26.0.0",
|
||||
"memfs": "^4.36.3",
|
||||
"os-browserify": "^0.3.0",
|
||||
"playwright": "^1.58.2",
|
||||
"playwright": "^1.55.0",
|
||||
"react-error-overlay": "^6.1.0",
|
||||
"redux-logger": "^3.0.6",
|
||||
"source-map-explorer": "^2.5.3",
|
||||
"vite": "^7.3.1",
|
||||
"vite-plugin-babel": "^1.5.1",
|
||||
"vite": "^7.1.3",
|
||||
"vite-plugin-babel": "^1.3.2",
|
||||
"vite-plugin-eslint": "^1.8.1",
|
||||
"vite-plugin-node-polyfills": "^0.25.0",
|
||||
"vite-plugin-pwa": "^1.2.0",
|
||||
"vite-plugin-node-polyfills": "^0.24.0",
|
||||
"vite-plugin-pwa": "^1.0.3",
|
||||
"vite-plugin-style-import": "^2.0.0",
|
||||
"vitest": "^4.0.18",
|
||||
"workbox-window": "^7.4.0"
|
||||
"vitest": "^3.2.4",
|
||||
"workbox-window": "^7.3.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,184 +0,0 @@
|
||||
import { ApolloProvider } from "@apollo/client/react";
|
||||
import * as Sentry from "@sentry/react";
|
||||
import { SplitFactoryProvider, useSplitClient } from "@splitsoftware/splitio-react";
|
||||
import { ConfigProvider, Grid } from "antd";
|
||||
import enLocale from "antd/es/locale/en_US";
|
||||
import { useEffect, useMemo } from "react";
|
||||
import { CookiesProvider } from "react-cookie";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
|
||||
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";
|
||||
|
||||
// Base Split configuration
|
||||
const config = {
|
||||
core: {
|
||||
authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
|
||||
key: "anon"
|
||||
}
|
||||
};
|
||||
|
||||
function SplitClientProvider({ children }) {
|
||||
const imexshopid = useSelector((state) => state.user.imexshopid);
|
||||
const splitClient = useSplitClient({ key: imexshopid || "anon" });
|
||||
|
||||
useEffect(() => {
|
||||
if (import.meta.env.DEV && splitClient && imexshopid) {
|
||||
console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
|
||||
}
|
||||
}, [splitClient, imexshopid]);
|
||||
|
||||
return children;
|
||||
}
|
||||
|
||||
function AppContainer() {
|
||||
const { t } = useTranslation();
|
||||
const dispatch = useDispatch();
|
||||
|
||||
const currentUser = useSelector(selectCurrentUser);
|
||||
const isDarkMode = useSelector(selectDarkMode);
|
||||
const screens = Grid.useBreakpoint();
|
||||
const isPhone = !screens.md;
|
||||
const isUltraWide = Boolean(screens.xxxl);
|
||||
|
||||
const theme = useMemo(() => {
|
||||
const baseTheme = getTheme(isDarkMode);
|
||||
|
||||
return {
|
||||
...baseTheme,
|
||||
token: {
|
||||
...(baseTheme.token || {}),
|
||||
screenXXXL: 2160
|
||||
},
|
||||
components: {
|
||||
...(baseTheme.components || {}),
|
||||
Table: {
|
||||
...(baseTheme.components?.Table || {}),
|
||||
cellFontSizeSM: isPhone ? 12 : 13,
|
||||
cellFontSizeMD: isPhone ? 13 : isUltraWide ? 15 : 14,
|
||||
cellFontSize: isUltraWide ? 15 : 14,
|
||||
cellPaddingInlineSM: isPhone ? 8 : 10,
|
||||
cellPaddingInlineMD: isPhone ? 10 : 14,
|
||||
cellPaddingInline: isUltraWide ? 20 : 16,
|
||||
cellPaddingBlockSM: isPhone ? 8 : 10,
|
||||
cellPaddingBlockMD: isPhone ? 10 : 12,
|
||||
cellPaddingBlock: isUltraWide ? 14 : 12,
|
||||
selectionColumnWidth: isPhone ? 44 : 52
|
||||
}
|
||||
}
|
||||
};
|
||||
}, [isDarkMode, isPhone, isUltraWide]);
|
||||
|
||||
const antdInput = useMemo(() => ({ autoComplete: "new-password" }), []);
|
||||
const antdTable = useMemo(() => ({ scroll: { x: "max-content" } }), []);
|
||||
const antdPagination = useMemo(
|
||||
() => ({
|
||||
showSizeChanger: !isPhone,
|
||||
totalBoundaryShowSizeChanger: 100
|
||||
}),
|
||||
[isPhone]
|
||||
);
|
||||
|
||||
const antdForm = useMemo(
|
||||
() => ({
|
||||
validateMessages: {
|
||||
required: t("general.validation.required", { label: "${label}" })
|
||||
}
|
||||
}),
|
||||
[t]
|
||||
);
|
||||
|
||||
// Global seamless logout listener with redirect to /signin
|
||||
useEffect(() => {
|
||||
const handleSeamlessLogout = (event) => {
|
||||
if (event.data?.type !== "seamlessLogoutRequest") return;
|
||||
|
||||
// Only accept messages from the parent window
|
||||
if (event.source !== window.parent) return;
|
||||
|
||||
const targetOrigin = event.origin || "*";
|
||||
|
||||
if (currentUser?.authorized !== true) {
|
||||
window.parent?.postMessage({ type: "seamlessLogoutResponse", status: "already_logged_out" }, targetOrigin);
|
||||
return;
|
||||
}
|
||||
|
||||
dispatch(signOutStart());
|
||||
window.parent?.postMessage({ type: "seamlessLogoutResponse", status: "logged_out" }, targetOrigin);
|
||||
};
|
||||
|
||||
window.addEventListener("message", handleSeamlessLogout);
|
||||
return () => {
|
||||
window.removeEventListener("message", handleSeamlessLogout);
|
||||
};
|
||||
}, [dispatch, currentUser?.authorized]);
|
||||
|
||||
// Update data-theme attribute (no cleanup to avoid transient style churn)
|
||||
useEffect(() => {
|
||||
document.documentElement.dataset.theme = isDarkMode ? "dark" : "light";
|
||||
}, [isDarkMode]);
|
||||
|
||||
// Sync darkMode with localStorage
|
||||
useEffect(() => {
|
||||
const uid = currentUser?.uid;
|
||||
|
||||
if (!uid) {
|
||||
dispatch(setDarkMode(false));
|
||||
return;
|
||||
}
|
||||
|
||||
const key = `dark-mode-${uid}`;
|
||||
const raw = localStorage.getItem(key);
|
||||
|
||||
if (raw == null) {
|
||||
dispatch(setDarkMode(false));
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
dispatch(setDarkMode(Boolean(JSON.parse(raw))));
|
||||
} catch {
|
||||
dispatch(setDarkMode(false));
|
||||
}
|
||||
}, [currentUser?.uid, dispatch]);
|
||||
|
||||
// Persist darkMode
|
||||
useEffect(() => {
|
||||
const uid = currentUser?.uid;
|
||||
if (!uid) return;
|
||||
|
||||
localStorage.setItem(`dark-mode-${uid}`, JSON.stringify(isDarkMode));
|
||||
}, [isDarkMode, currentUser?.uid]);
|
||||
|
||||
return (
|
||||
<CookiesProvider>
|
||||
<ApolloProvider client={client}>
|
||||
<ConfigProvider
|
||||
input={antdInput}
|
||||
locale={enLocale}
|
||||
theme={theme}
|
||||
form={antdForm}
|
||||
table={antdTable}
|
||||
pagination={antdPagination}
|
||||
componentSize={isPhone ? "small" : isUltraWide ? "large" : "middle"}
|
||||
popupOverflow="viewport"
|
||||
>
|
||||
<GlobalLoadingBar />
|
||||
<SplitFactoryProvider config={config}>
|
||||
<SplitClientProvider>
|
||||
<App />
|
||||
</SplitClientProvider>
|
||||
</SplitFactoryProvider>
|
||||
</ConfigProvider>
|
||||
</ApolloProvider>
|
||||
</CookiesProvider>
|
||||
);
|
||||
}
|
||||
|
||||
export default Sentry.withProfiler(AppContainer);
|
||||
@@ -1,4 +1,4 @@
|
||||
import { ApolloProvider } from "@apollo/client/react";
|
||||
import { ApolloProvider } from "@apollo/client";
|
||||
import * as Sentry from "@sentry/react";
|
||||
import { SplitFactoryProvider, useSplitClient } from "@splitsoftware/splitio-react";
|
||||
import { ConfigProvider } from "antd";
|
||||
@@ -6,12 +6,12 @@ import enLocale from "antd/es/locale/en_US";
|
||||
import { useEffect, useMemo } from "react";
|
||||
import { CookiesProvider } from "react-cookie";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import { connect, useSelector } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
|
||||
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,109 +20,75 @@ import getTheme from "./themeProvider";
|
||||
const config = {
|
||||
core: {
|
||||
authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
|
||||
key: "anon"
|
||||
key: "anon" // Default key, overridden dynamically by SplitClientProvider
|
||||
}
|
||||
};
|
||||
|
||||
// Custom provider to manage the Split client key based on imexshopid from Redux
|
||||
function SplitClientProvider({ children }) {
|
||||
const imexshopid = useSelector((state) => state.user.imexshopid);
|
||||
const splitClient = useSplitClient({ key: imexshopid || "anon" });
|
||||
|
||||
const imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
|
||||
const splitClient = useSplitClient({ key: imexshopid || "anon" }); // Use imexshopid or fallback to "anon"
|
||||
useEffect(() => {
|
||||
if (import.meta.env.DEV && splitClient && imexshopid) {
|
||||
if (splitClient && imexshopid) {
|
||||
console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
|
||||
}
|
||||
}, [splitClient, imexshopid]);
|
||||
|
||||
return children;
|
||||
}
|
||||
|
||||
function AppContainer() {
|
||||
const mapDispatchToProps = (dispatch) => ({
|
||||
setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode))
|
||||
});
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
currentUser: selectCurrentUser
|
||||
});
|
||||
|
||||
function AppContainer({ currentUser, setDarkMode }) {
|
||||
const { t } = useTranslation();
|
||||
const dispatch = useDispatch();
|
||||
|
||||
const currentUser = useSelector(selectCurrentUser);
|
||||
const isDarkMode = useSelector(selectDarkMode);
|
||||
|
||||
const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);
|
||||
|
||||
const antdInput = useMemo(() => ({ autoComplete: "new-password" }), []);
|
||||
|
||||
const antdForm = useMemo(
|
||||
() => ({
|
||||
validateMessages: {
|
||||
required: t("general.validation.required", { label: "${label}" })
|
||||
}
|
||||
}),
|
||||
[t]
|
||||
);
|
||||
|
||||
// Global seamless logout listener with redirect to /signin
|
||||
// Update data-theme attribute when dark mode changes
|
||||
useEffect(() => {
|
||||
const handleSeamlessLogout = (event) => {
|
||||
if (event.data?.type !== "seamlessLogoutRequest") return;
|
||||
|
||||
// Only accept messages from the parent window
|
||||
if (event.source !== window.parent) return;
|
||||
|
||||
const targetOrigin = event.origin || "*";
|
||||
|
||||
if (currentUser?.authorized !== true) {
|
||||
window.parent?.postMessage({ type: "seamlessLogoutResponse", status: "already_logged_out" }, targetOrigin);
|
||||
return;
|
||||
}
|
||||
|
||||
dispatch(signOutStart());
|
||||
window.parent?.postMessage({ type: "seamlessLogoutResponse", status: "logged_out" }, targetOrigin);
|
||||
};
|
||||
|
||||
window.addEventListener("message", handleSeamlessLogout);
|
||||
return () => {
|
||||
window.removeEventListener("message", handleSeamlessLogout);
|
||||
};
|
||||
}, [dispatch, currentUser?.authorized]);
|
||||
|
||||
// Update data-theme attribute (no cleanup to avoid transient style churn)
|
||||
useEffect(() => {
|
||||
document.documentElement.dataset.theme = isDarkMode ? "dark" : "light";
|
||||
document.documentElement.setAttribute("data-theme", isDarkMode ? "dark" : "light");
|
||||
return () => document.documentElement.removeAttribute("data-theme");
|
||||
}, [isDarkMode]);
|
||||
|
||||
// Sync darkMode with localStorage
|
||||
// Sync Redux darkMode with localStorage on user change
|
||||
useEffect(() => {
|
||||
const uid = currentUser?.uid;
|
||||
|
||||
if (!uid) {
|
||||
dispatch(setDarkMode(false));
|
||||
return;
|
||||
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
|
||||
}
|
||||
} else {
|
||||
setDarkMode(false);
|
||||
}
|
||||
}, [currentUser?.uid]);
|
||||
|
||||
const key = `dark-mode-${uid}`;
|
||||
const raw = localStorage.getItem(key);
|
||||
|
||||
if (raw == null) {
|
||||
dispatch(setDarkMode(false));
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
dispatch(setDarkMode(Boolean(JSON.parse(raw))));
|
||||
} catch {
|
||||
dispatch(setDarkMode(false));
|
||||
}
|
||||
}, [currentUser?.uid, dispatch]);
|
||||
|
||||
// Persist darkMode
|
||||
// Persist darkMode to localStorage when it or user changes
|
||||
useEffect(() => {
|
||||
const uid = currentUser?.uid;
|
||||
if (!uid) return;
|
||||
|
||||
localStorage.setItem(`dark-mode-${uid}`, JSON.stringify(isDarkMode));
|
||||
if (currentUser?.uid) {
|
||||
localStorage.setItem(`dark-mode-${currentUser.uid}`, JSON.stringify(isDarkMode));
|
||||
}
|
||||
}, [isDarkMode, currentUser?.uid]);
|
||||
|
||||
return (
|
||||
<CookiesProvider>
|
||||
<ApolloProvider client={client}>
|
||||
<ConfigProvider input={antdInput} locale={enLocale} theme={theme} form={antdForm}>
|
||||
<ConfigProvider
|
||||
input={{ autoComplete: "new-password" }}
|
||||
locale={enLocale}
|
||||
theme={theme}
|
||||
form={{
|
||||
validateMessages: {
|
||||
required: t("general.validation.required", { label: "${label}" })
|
||||
}
|
||||
}}
|
||||
>
|
||||
<GlobalLoadingBar />
|
||||
<SplitFactoryProvider config={config}>
|
||||
<SplitClientProvider>
|
||||
@@ -135,4 +101,4 @@ function AppContainer() {
|
||||
);
|
||||
}
|
||||
|
||||
export default Sentry.withProfiler(AppContainer);
|
||||
export default Sentry.withProfiler(connect(mapStateToProps, mapDispatchToProps)(AppContainer));
|
||||
|
||||
@@ -1,184 +0,0 @@
|
||||
import { ApolloProvider } from "@apollo/client/react";
|
||||
import * as Sentry from "@sentry/react";
|
||||
import { SplitFactoryProvider, useSplitClient } from "@splitsoftware/splitio-react";
|
||||
import { ConfigProvider, Grid } from "antd";
|
||||
import enLocale from "antd/es/locale/en_US";
|
||||
import { useEffect, useMemo } from "react";
|
||||
import { CookiesProvider } from "react-cookie";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
|
||||
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";
|
||||
|
||||
// Base Split configuration
|
||||
const config = {
|
||||
core: {
|
||||
authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
|
||||
key: "anon"
|
||||
}
|
||||
};
|
||||
|
||||
function SplitClientProvider({ children }) {
|
||||
const imexshopid = useSelector((state) => state.user.imexshopid);
|
||||
const splitClient = useSplitClient({ key: imexshopid || "anon" });
|
||||
|
||||
useEffect(() => {
|
||||
if (import.meta.env.DEV && splitClient && imexshopid) {
|
||||
console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
|
||||
}
|
||||
}, [splitClient, imexshopid]);
|
||||
|
||||
return children;
|
||||
}
|
||||
|
||||
function AppContainer() {
|
||||
const { t } = useTranslation();
|
||||
const dispatch = useDispatch();
|
||||
|
||||
const currentUser = useSelector(selectCurrentUser);
|
||||
const isDarkMode = useSelector(selectDarkMode);
|
||||
const screens = Grid.useBreakpoint();
|
||||
const isPhone = !screens.md;
|
||||
const isUltraWide = Boolean(screens.xxxl);
|
||||
|
||||
const theme = useMemo(() => {
|
||||
const baseTheme = getTheme(isDarkMode);
|
||||
|
||||
return {
|
||||
...baseTheme,
|
||||
token: {
|
||||
...(baseTheme.token || {}),
|
||||
screenXXXL: 2160
|
||||
},
|
||||
components: {
|
||||
...(baseTheme.components || {}),
|
||||
Table: {
|
||||
...(baseTheme.components?.Table || {}),
|
||||
cellFontSizeSM: isPhone ? 12 : 13,
|
||||
cellFontSizeMD: isPhone ? 13 : isUltraWide ? 15 : 14,
|
||||
cellFontSize: isUltraWide ? 15 : 14,
|
||||
cellPaddingInlineSM: isPhone ? 8 : 10,
|
||||
cellPaddingInlineMD: isPhone ? 10 : 14,
|
||||
cellPaddingInline: isUltraWide ? 20 : 16,
|
||||
cellPaddingBlockSM: isPhone ? 8 : 10,
|
||||
cellPaddingBlockMD: isPhone ? 10 : 12,
|
||||
cellPaddingBlock: isUltraWide ? 14 : 12,
|
||||
selectionColumnWidth: isPhone ? 44 : 52
|
||||
}
|
||||
}
|
||||
};
|
||||
}, [isDarkMode, isPhone, isUltraWide]);
|
||||
|
||||
const antdInput = useMemo(() => ({ autoComplete: "new-password" }), []);
|
||||
const antdTable = useMemo(() => ({ scroll: { x: "max-content" } }), []);
|
||||
const antdPagination = useMemo(
|
||||
() => ({
|
||||
showSizeChanger: !isPhone,
|
||||
totalBoundaryShowSizeChanger: 100
|
||||
}),
|
||||
[isPhone]
|
||||
);
|
||||
|
||||
const antdForm = useMemo(
|
||||
() => ({
|
||||
validateMessages: {
|
||||
required: t("general.validation.required", { label: "${label}" })
|
||||
}
|
||||
}),
|
||||
[t]
|
||||
);
|
||||
|
||||
// Global seamless logout listener with redirect to /signin
|
||||
useEffect(() => {
|
||||
const handleSeamlessLogout = (event) => {
|
||||
if (event.data?.type !== "seamlessLogoutRequest") return;
|
||||
|
||||
// Only accept messages from the parent window
|
||||
if (event.source !== window.parent) return;
|
||||
|
||||
const targetOrigin = event.origin || "*";
|
||||
|
||||
if (currentUser?.authorized !== true) {
|
||||
window.parent?.postMessage({ type: "seamlessLogoutResponse", status: "already_logged_out" }, targetOrigin);
|
||||
return;
|
||||
}
|
||||
|
||||
dispatch(signOutStart());
|
||||
window.parent?.postMessage({ type: "seamlessLogoutResponse", status: "logged_out" }, targetOrigin);
|
||||
};
|
||||
|
||||
window.addEventListener("message", handleSeamlessLogout);
|
||||
return () => {
|
||||
window.removeEventListener("message", handleSeamlessLogout);
|
||||
};
|
||||
}, [dispatch, currentUser?.authorized]);
|
||||
|
||||
// Update data-theme attribute (no cleanup to avoid transient style churn)
|
||||
useEffect(() => {
|
||||
document.documentElement.dataset.theme = isDarkMode ? "dark" : "light";
|
||||
}, [isDarkMode]);
|
||||
|
||||
// Sync darkMode with localStorage
|
||||
useEffect(() => {
|
||||
const uid = currentUser?.uid;
|
||||
|
||||
if (!uid) {
|
||||
dispatch(setDarkMode(false));
|
||||
return;
|
||||
}
|
||||
|
||||
const key = `dark-mode-${uid}`;
|
||||
const raw = localStorage.getItem(key);
|
||||
|
||||
if (raw == null) {
|
||||
dispatch(setDarkMode(false));
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
dispatch(setDarkMode(Boolean(JSON.parse(raw))));
|
||||
} catch {
|
||||
dispatch(setDarkMode(false));
|
||||
}
|
||||
}, [currentUser?.uid, dispatch]);
|
||||
|
||||
// Persist darkMode
|
||||
useEffect(() => {
|
||||
const uid = currentUser?.uid;
|
||||
if (!uid) return;
|
||||
|
||||
localStorage.setItem(`dark-mode-${uid}`, JSON.stringify(isDarkMode));
|
||||
}, [isDarkMode, currentUser?.uid]);
|
||||
|
||||
return (
|
||||
<CookiesProvider>
|
||||
<ApolloProvider client={client}>
|
||||
<ConfigProvider
|
||||
input={antdInput}
|
||||
locale={enLocale}
|
||||
theme={theme}
|
||||
form={antdForm}
|
||||
table={antdTable}
|
||||
pagination={antdPagination}
|
||||
componentSize={isPhone ? "small" : isUltraWide ? "large" : "middle"}
|
||||
popupOverflow="viewport"
|
||||
>
|
||||
<GlobalLoadingBar />
|
||||
<SplitFactoryProvider config={config}>
|
||||
<SplitClientProvider>
|
||||
<App />
|
||||
</SplitClientProvider>
|
||||
</SplitFactoryProvider>
|
||||
</ConfigProvider>
|
||||
</ApolloProvider>
|
||||
</CookiesProvider>
|
||||
);
|
||||
}
|
||||
|
||||
export default Sentry.withProfiler(AppContainer);
|
||||
@@ -100,7 +100,14 @@ export function App({
|
||||
if (currentUser.authorized && bodyshop) {
|
||||
client.setAttribute("imexshopid", bodyshop.imexshopid);
|
||||
|
||||
if (client.getTreatment("LogRocket_Tracking") === "on") {
|
||||
if (
|
||||
client.getTreatment("LogRocket_Tracking") === "on" ||
|
||||
window.location.hostname ===
|
||||
InstanceRenderMgr({
|
||||
imex: "beta.imex.online",
|
||||
rome: "beta.romeonline.io"
|
||||
})
|
||||
) {
|
||||
console.log("LR Start");
|
||||
LogRocket.init(
|
||||
InstanceRenderMgr({
|
||||
@@ -131,7 +138,7 @@ export function App({
|
||||
);
|
||||
}
|
||||
|
||||
if (!isPartsEntry && currentEula && !currentUser.eulaIsAccepted) {
|
||||
if (currentEula && !currentUser.eulaIsAccepted) {
|
||||
return <Eula />;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
@use "react-big-calendar/lib/sass/styles" as rbc;
|
||||
|
||||
:root {
|
||||
--table-stripe-bg: #f4f4f4; /* Light mode table stripe */
|
||||
--menu-divider-color: #74695c; /* Light mode menu divider */
|
||||
@@ -213,6 +211,9 @@
|
||||
--svg-background: #FFF; /* Dark mode SVG background */
|
||||
}
|
||||
|
||||
// Global Styles
|
||||
@import "react-big-calendar/lib/sass/styles";
|
||||
|
||||
.ant-menu-item-divider {
|
||||
border-bottom: 1px solid var(--menu-divider-color) !important;
|
||||
}
|
||||
@@ -425,87 +426,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
.dms-equal-height-col {
|
||||
display: flex; // make the Col a flex container
|
||||
}
|
||||
|
||||
/* If the direct child is an AntD Card, make it fill the column */
|
||||
.dms-equal-height-col > .ant-card {
|
||||
flex: 1 1 auto;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/* Optional: if you want the card body to fill vertically too */
|
||||
.dms-equal-height-col > .ant-card .ant-card-body {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/* DMS top panels: prevent card/table overflow into adjacent column at desktop+zoom */
|
||||
.dms-top-panel-col {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.dms-top-panel-col > .ant-card {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.dms-top-panel-col > .ant-card .ant-card-body {
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.dms-top-panel-col .ant-table-wrapper,
|
||||
.dms-top-panel-col .ant-tabs,
|
||||
.dms-top-panel-col .ant-tabs-content,
|
||||
.dms-top-panel-col .ant-tabs-tabpane {
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
//.rbc-time-header-gutter {
|
||||
// padding: 0;
|
||||
//}
|
||||
|
||||
///* globally allow shrink inside table cells */
|
||||
//.prod-list-table .ant-table-cell,
|
||||
//.prod-list-table .ant-table-cell > * {
|
||||
// min-width: 0;
|
||||
//}
|
||||
//
|
||||
///* common AntD offenders */
|
||||
//.prod-list-table > .ant-table-cell .ant-space,
|
||||
//.ant-table-cell .ant-space-item {
|
||||
// min-width: 0;
|
||||
//}
|
||||
//
|
||||
///* Keep your custom header content on the left, push AntD sorter to the far right */
|
||||
//.prod-list-table .ant-table-column-sorters {
|
||||
// display: flex !important;
|
||||
// align-items: center;
|
||||
// width: 100%;
|
||||
//}
|
||||
//
|
||||
//.prod-list-table .ant-table-column-title {
|
||||
// flex: 1 1 auto;
|
||||
// min-width: 0; /* allows ellipsis to work */
|
||||
//}
|
||||
//
|
||||
//.prod-list-table .ant-table-column-sorter {
|
||||
// margin-left: auto;
|
||||
// flex: 0 0 auto;
|
||||
//}
|
||||
|
||||
|
||||
.global-search-autocomplete-fix {
|
||||
// This is the extra value render that causes the “duplicate text”
|
||||
.ant-select-selection-item {
|
||||
position: absolute !important;
|
||||
left: -10000px !important;
|
||||
pointer-events: none !important;
|
||||
}
|
||||
}
|
||||
//}
|
||||
|
||||
@@ -68,7 +68,7 @@ const currentTheme = import.meta.env.DEV ? devTheme : prodTheme;
|
||||
|
||||
const getTheme = (isDarkMode) => ({
|
||||
algorithm: isDarkMode ? darkAlgorithm : defaultAlgorithm,
|
||||
...defaultsDeep({}, currentTheme, defaultTheme(isDarkMode))
|
||||
...defaultsDeep(currentTheme, defaultTheme)
|
||||
});
|
||||
|
||||
export default getTheme;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Card, Checkbox, Input, Space } from "antd";
|
||||
import { Card, Checkbox, Input, Space, Table } from "antd";
|
||||
import queryString from "query-string";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -16,7 +16,6 @@ import PayableExportAll from "../payable-export-all-button/payable-export-all-bu
|
||||
import PayableExportButton from "../payable-export-button/payable-export-button.component";
|
||||
import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
|
||||
import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import useLocalStorage from "./../../utils/useLocalStorage";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
@@ -170,22 +169,15 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
|
||||
refetch={refetch}
|
||||
/>
|
||||
{bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
|
||||
<Input
|
||||
value={state.search}
|
||||
onChange={handleSearch}
|
||||
placeholder={t("general.labels.search")}
|
||||
allowClear
|
||||
enterButton
|
||||
/>
|
||||
<Input value={state.search} onChange={handleSearch} placeholder={t("general.labels.search")} allowClear />
|
||||
</Space>
|
||||
}
|
||||
>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
loading={loading}
|
||||
dataSource={dataSource}
|
||||
pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
|
||||
pagination={{ position: "top", pageSize: exportPageLimit }}
|
||||
columns={columns}
|
||||
mobileColumnKeys={["vendorname", "invoice_number", "ro_number", "total", "actions"]}
|
||||
rowKey="id"
|
||||
onChange={handleTableChange}
|
||||
rowSelection={{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Card, Input, Space } from "antd";
|
||||
import { Card, Input, Space, Table } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
@@ -17,7 +17,6 @@ import PaymentExportButton from "../payment-export-button/payment-export-button.
|
||||
import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
|
||||
import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
|
||||
import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop
|
||||
@@ -183,22 +182,15 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
|
||||
refetch={refetch}
|
||||
/>
|
||||
{bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
|
||||
<Input
|
||||
value={state.search}
|
||||
onChange={handleSearch}
|
||||
placeholder={t("general.labels.search")}
|
||||
allowClear
|
||||
enterButton
|
||||
/>
|
||||
<Input value={state.search} onChange={handleSearch} placeholder={t("general.labels.search")} allowClear />
|
||||
</Space>
|
||||
}
|
||||
>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
loading={loading}
|
||||
dataSource={dataSource}
|
||||
pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
|
||||
pagination={{ position: "top", pageSize: exportPageLimit }}
|
||||
columns={columns}
|
||||
mobileColumnKeys={["ro_number", "date", "owner", "amount", "actions"]}
|
||||
rowKey="id"
|
||||
onChange={handleTableChange}
|
||||
rowSelection={{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Button, Card, Input, Space } from "antd";
|
||||
import { Button, Card, Input, Space, Table } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
@@ -17,7 +17,6 @@ import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-butto
|
||||
import JobMarkSelectedExported from "../jobs-mark-selected-exported/jobs-mark-selected-exported";
|
||||
import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
|
||||
import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop
|
||||
@@ -181,7 +180,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
|
||||
<Card
|
||||
extra={
|
||||
<Space wrap>
|
||||
{!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && !bodyshop.rr_dealerid && (
|
||||
{!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && (
|
||||
<>
|
||||
<JobMarkSelectedExported
|
||||
jobIds={selectedJobs}
|
||||
@@ -199,23 +198,21 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
{bodyshop.accountingconfig?.qbo && <QboAuthorizeComponent />}
|
||||
{bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
|
||||
<Input.Search
|
||||
value={state.search}
|
||||
onChange={handleSearch}
|
||||
placeholder={t("general.labels.search")}
|
||||
allowClear
|
||||
enterButton
|
||||
/>
|
||||
</Space>
|
||||
}
|
||||
>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
loading={loading}
|
||||
dataSource={dataSource}
|
||||
pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
|
||||
pagination={{ position: "top", pageSize: exportPageLimit }}
|
||||
columns={columns}
|
||||
mobileColumnKeys={["ro_number", "status", "owner", "clm_total", "actions"]}
|
||||
rowKey="id"
|
||||
onChange={handleTableChange}
|
||||
rowSelection={{
|
||||
|
||||
@@ -4,27 +4,27 @@ import AlertComponent from "./alert.component";
|
||||
|
||||
describe("AlertComponent", () => {
|
||||
it("renders with default props", () => {
|
||||
render(<AlertComponent title="Default Alert" />);
|
||||
render(<AlertComponent message="Default Alert" />);
|
||||
expect(screen.getByText("Default Alert")).toBeInTheDocument();
|
||||
expect(screen.getByRole("alert")).toHaveClass("ant-alert");
|
||||
});
|
||||
|
||||
it("applies type prop correctly", () => {
|
||||
render(<AlertComponent title="Success Alert" type="success" />);
|
||||
render(<AlertComponent message="Success Alert" type="success" />);
|
||||
const alert = screen.getByRole("alert");
|
||||
expect(screen.getByText("Success Alert")).toBeInTheDocument();
|
||||
expect(alert).toHaveClass("ant-alert-success");
|
||||
});
|
||||
|
||||
it("displays description when provided", () => {
|
||||
render(<AlertComponent title="Error Alert" description="Something went wrong" type="error" />);
|
||||
render(<AlertComponent message="Error Alert" description="Something went wrong" type="error" />);
|
||||
expect(screen.getByText("Error Alert")).toBeInTheDocument();
|
||||
expect(screen.getByText("Something went wrong")).toBeInTheDocument();
|
||||
expect(screen.getByRole("alert")).toHaveClass("ant-alert-error");
|
||||
});
|
||||
|
||||
it("is closable and shows icon when props are set", () => {
|
||||
render(<AlertComponent title="Warning Alert" type="warning" showIcon closable />);
|
||||
render(<AlertComponent message="Warning Alert" type="warning" showIcon closable />);
|
||||
expect(screen.getByText("Warning Alert")).toBeInTheDocument();
|
||||
expect(screen.getByRole("button", { name: /close/i })).toBeInTheDocument(); // Close button
|
||||
});
|
||||
|
||||
@@ -28,19 +28,19 @@ export function AllocationsAssignmentComponent({
|
||||
<div>
|
||||
<Select
|
||||
id="employeeSelector"
|
||||
showSearch={{
|
||||
optionFilterProp: "label",
|
||||
filterOption: (input, option) => option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
||||
}}
|
||||
showSearch
|
||||
style={{ width: 200 }}
|
||||
placeholder="Select a person"
|
||||
optionFilterProp="children"
|
||||
onChange={onChange}
|
||||
options={bodyshop.employees.map((emp) => ({
|
||||
value: emp.id,
|
||||
key: emp.id,
|
||||
label: `${emp.first_name} ${emp.last_name}`
|
||||
}))}
|
||||
/>
|
||||
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
|
||||
>
|
||||
{bodyshop.employees.map((emp) => (
|
||||
<Select.Option value={emp.id} key={emp.id}>
|
||||
{`${emp.first_name} ${emp.last_name}`}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
<InputNumber
|
||||
defaultValue={assignment.hours}
|
||||
placeholder={t("joblines.fields.mod_lb_hrs")}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useState } from "react";
|
||||
import AllocationsAssignmentComponent from "./allocations-assignment.component";
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||
@@ -19,15 +19,15 @@ export default function AllocationsAssignmentContainer({ jobLineId, hours, refet
|
||||
const handleAssignment = () => {
|
||||
insertAllocation({ variables: { alloc: { ...assignment } } })
|
||||
.then(() => {
|
||||
notification.success({
|
||||
title: t("allocations.successes.save")
|
||||
notification["success"]({
|
||||
message: t("allocations.successes.save")
|
||||
});
|
||||
visibilityState[1](false);
|
||||
if (refetch) refetch();
|
||||
})
|
||||
.catch((error) => {
|
||||
notification.error({
|
||||
title: t("employees.errors.saving", { message: error.message })
|
||||
notification["error"]({
|
||||
message: t("employees.errors.saving", { message: error.message })
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
@@ -30,18 +30,19 @@ export default connect(
|
||||
const popContent = (
|
||||
<div>
|
||||
<Select
|
||||
showSearch={{
|
||||
optionFilterProp: "label",
|
||||
filterOption: (input, option) => option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
||||
}}
|
||||
showSearch
|
||||
style={{ width: 200 }}
|
||||
placeholder="Select a person"
|
||||
optionFilterProp="children"
|
||||
onChange={onChange}
|
||||
options={bodyshop.employees.map((emp) => ({
|
||||
value: emp.id,
|
||||
label: `${emp.first_name} ${emp.last_name}`
|
||||
}))}
|
||||
/>
|
||||
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
|
||||
>
|
||||
{bodyshop.employees.map((emp) => (
|
||||
<Select.Option value={emp.id} key={emp.id}>
|
||||
{`${emp.first_name} ${emp.last_name}`}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
|
||||
<Button type="primary" disabled={!assignment.employeeid} onClick={handleAssignment}>
|
||||
Assign
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useState } from "react";
|
||||
import AllocationsBulkAssignment from "./allocations-bulk-assignment.component";
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||
@@ -25,8 +25,8 @@ export default function AllocationsBulkAssignmentContainer({ jobLines, refetch }
|
||||
}, []);
|
||||
|
||||
insertAllocation({ variables: { alloc: allocs } }).then(() => {
|
||||
notification.success({
|
||||
title: t("employees.successes.save")
|
||||
notification["success"]({
|
||||
message: t("employees.successes.save")
|
||||
});
|
||||
visibilityState[1](false);
|
||||
if (refetch) refetch();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { DELETE_ALLOCATION } from "../../graphql/allocations.queries";
|
||||
import AllocationsLabelComponent from "./allocations-employee-label.component";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -13,13 +13,13 @@ export default function AllocationsLabelContainer({ allocation, refetch }) {
|
||||
e.preventDefault();
|
||||
deleteAllocation({ variables: { id: allocation.id } })
|
||||
.then(() => {
|
||||
notification.success({
|
||||
title: t("allocations.successes.deleted")
|
||||
notification["success"]({
|
||||
message: t("allocations.successes.deleted")
|
||||
});
|
||||
if (refetch) refetch();
|
||||
})
|
||||
.catch(() => {
|
||||
notification.error({ title: t("allocations.errors.deleting") });
|
||||
notification["error"]({ message: t("allocations.errors.deleting") });
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useState } from "react";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Table } from "antd";
|
||||
import { alphaSort } from "../../utils/sorters";
|
||||
import { DateTimeFormatter } from "../../utils/DateFormatter";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -62,12 +62,11 @@ export default function AuditTrailListComponent({ loading, data }) {
|
||||
};
|
||||
|
||||
return (
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
{...formItemLayout}
|
||||
loading={loading}
|
||||
pagination={{ placement: "top", defaultPageSize: pageLimit }}
|
||||
pagination={{ position: "top", defaultPageSize: pageLimit }}
|
||||
columns={columns}
|
||||
mobileColumnKeys={[" created", "operation", " old_val", "useremail"]}
|
||||
rowKey="id"
|
||||
dataSource={data}
|
||||
onChange={handleTableChange}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import AuditTrailListComponent from "./audit-trail-list.component";
|
||||
import { useQuery } from "@apollo/client/react";
|
||||
import { useQuery } from "@apollo/client";
|
||||
import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
|
||||
import AlertComponent from "../alert/alert.component";
|
||||
import { logImEXEvent } from "../../firebase/firebase.utils";
|
||||
@@ -17,7 +17,7 @@ export default function AuditTrailListContainer({ recordId }) {
|
||||
return (
|
||||
<div>
|
||||
{error ? (
|
||||
<AlertComponent type="error" title={error.message} />
|
||||
<AlertComponent type="error" message={error.message} />
|
||||
) : (
|
||||
<Row gutter={[16, 16]}>
|
||||
<Card>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Table } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DateTimeFormatter } from "../../utils/DateFormatter";
|
||||
@@ -47,12 +47,11 @@ export default function EmailAuditTrailListComponent({ loading, data }) {
|
||||
};
|
||||
|
||||
return (
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
{...formItemLayout}
|
||||
loading={loading}
|
||||
pagination={{ placement: "top", defaultPageSize: pageLimit }}
|
||||
pagination={{ position: "top", defaultPageSize: pageLimit }}
|
||||
columns={columns}
|
||||
mobileColumnKeys={[" created", "useremail"]}
|
||||
rowKey="id"
|
||||
dataSource={data}
|
||||
onChange={handleTableChange}
|
||||
|
||||
@@ -52,9 +52,6 @@ export default function BillCmdReturnsTableComponent({ form, returnLoading, retu
|
||||
{fields.map((field, index) => (
|
||||
<tr key={field.key}>
|
||||
<td>
|
||||
<Form.Item hidden key={`${index}id`} name={[field.name, "id"]}>
|
||||
<ReadOnlyFormItemComponent />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
// label={t("joblines.fields.line_desc")}
|
||||
key={`${index}line_desc`}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { DeleteFilled } from "@ant-design/icons";
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { Button, Popconfirm } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -44,7 +44,7 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
|
||||
});
|
||||
|
||||
if (!result.errors) {
|
||||
notification.success({ title: t("bills.successes.deleted") });
|
||||
notification["success"]({ message: t("bills.successes.deleted") });
|
||||
insertAuditTrail({
|
||||
jobid: jobid,
|
||||
operation: AuditTrailMapping.billdeleted(bill.invoice_number),
|
||||
@@ -57,14 +57,14 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
|
||||
const error = JSON.stringify(result.errors);
|
||||
|
||||
if (error.toLowerCase().includes("inventory_billid_fkey")) {
|
||||
notification.error({
|
||||
title: t("bills.errors.deleting", {
|
||||
notification["error"]({
|
||||
message: t("bills.errors.deleting", {
|
||||
error: t("bills.errors.existinginventoryline")
|
||||
})
|
||||
});
|
||||
} else {
|
||||
notification.error({
|
||||
title: t("bills.errors.deleting", {
|
||||
notification["error"]({
|
||||
message: t("bills.errors.deleting", {
|
||||
error: JSON.stringify(result.errors)
|
||||
})
|
||||
});
|
||||
@@ -77,7 +77,13 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
|
||||
return (
|
||||
<RbacWrapper action="bills:delete" noauth={<></>}>
|
||||
<Popconfirm disabled={bill.exported} onConfirm={handleDelete} title={t("bills.labels.deleteconfirm")}>
|
||||
<Button icon={<DeleteFilled />} disabled={bill.exported} loading={loading} />
|
||||
<Button
|
||||
disabled={bill.exported}
|
||||
// onClick={handleDelete}
|
||||
loading={loading}
|
||||
>
|
||||
<DeleteFilled />
|
||||
</Button>
|
||||
</Popconfirm>
|
||||
</RbacWrapper>
|
||||
);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { PageHeader } from "@ant-design/pro-layout";
|
||||
import { useMutation, useQuery } from "@apollo/client/react";
|
||||
import { useMutation, useQuery } from "@apollo/client";
|
||||
import { Button, Divider, Form, Popconfirm, Space } from "antd";
|
||||
import queryString from "query-string";
|
||||
import { useState } from "react";
|
||||
@@ -56,7 +56,7 @@ export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
|
||||
const handleSave = () => {
|
||||
//It's got a previously deducted bill line!
|
||||
if (
|
||||
data?.bills_by_pk?.billlines.filter((b) => b.deductedfromlbr).length > 0 ||
|
||||
data.bills_by_pk.billlines.filter((b) => b.deductedfromlbr).length > 0 ||
|
||||
form.getFieldValue("billlines").filter((b) => b.deductedfromlbr).length > 0
|
||||
)
|
||||
setOpen(true);
|
||||
@@ -84,7 +84,7 @@ export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
|
||||
//Find bill lines that were deleted.
|
||||
const deletedJobLines = [];
|
||||
|
||||
data?.bills_by_pk?.billlines.forEach((a) => {
|
||||
data.bills_by_pk.billlines.forEach((a) => {
|
||||
const matchingRecord = billlines.find((b) => b.id === a.id);
|
||||
if (!matchingRecord) {
|
||||
deletedJobLines.push(a);
|
||||
@@ -148,11 +148,11 @@ export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
|
||||
setUpdateLoading(false);
|
||||
};
|
||||
|
||||
if (error) return <AlertComponent title={error.message} type="error" />;
|
||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||
if (!search.billid) return <></>; //<div>{t("bills.labels.noneselected")}</div>;
|
||||
|
||||
const exported = data?.bills_by_pk && data?.bills_by_pk?.exported;
|
||||
const isinhouse = data?.bills_by_pk && data?.bills_by_pk?.isinhouse;
|
||||
const exported = data?.bills_by_pk && data.bills_by_pk.exported;
|
||||
const isinhouse = data?.bills_by_pk && data.bills_by_pk.isinhouse;
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -160,7 +160,7 @@ export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
|
||||
{data && (
|
||||
<>
|
||||
<PageHeader
|
||||
title={data && `${data?.bills_by_pk?.invoice_number} - ${data?.bills_by_pk?.vendor?.name}`}
|
||||
title={data && `${data.bills_by_pk.invoice_number} - ${data.bills_by_pk.vendor.name}`}
|
||||
extra={
|
||||
<Space>
|
||||
<BillDetailEditReturn data={data} />
|
||||
@@ -189,18 +189,18 @@ export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
|
||||
/>
|
||||
<Form form={form} onFinish={handleFinish} initialValues={transformData(data)} layout="vertical">
|
||||
<BillFormContainer form={form} billEdit disabled={exported} disableInHouse={isinhouse} />
|
||||
<Divider titlePlacement="left">{t("general.labels.media")}</Divider>
|
||||
<Divider orientation="left">{t("general.labels.media")}</Divider>
|
||||
{bodyshop.uselocalmediaserver ? (
|
||||
<JobsDocumentsLocalGallery
|
||||
job={{ id: data ? data?.bills_by_pk?.jobid : null }}
|
||||
invoice_number={data ? data?.bills_by_pk?.invoice_number : null}
|
||||
vendorid={data ? data?.bills_by_pk?.vendorid : null}
|
||||
job={{ id: data ? data.bills_by_pk.jobid : null }}
|
||||
invoice_number={data ? data.bills_by_pk.invoice_number : null}
|
||||
vendorid={data ? data.bills_by_pk.vendorid : null}
|
||||
/>
|
||||
) : (
|
||||
<JobDocumentsGallery
|
||||
jobId={data ? data?.bills_by_pk?.jobid : null}
|
||||
jobId={data ? data.bills_by_pk.jobid : null}
|
||||
billId={search.billid}
|
||||
documentsList={data ? data?.bills_by_pk?.documents : []}
|
||||
documentsList={data ? data.bills_by_pk.documents : []}
|
||||
billsCallback={refetch}
|
||||
/>
|
||||
)}
|
||||
@@ -212,7 +212,7 @@ export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
|
||||
}
|
||||
|
||||
const transformData = (data) => {
|
||||
return data?.bills_by_pk
|
||||
return data
|
||||
? {
|
||||
...data.bills_by_pk,
|
||||
|
||||
|
||||
@@ -28,20 +28,6 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
|
||||
const { t } = useTranslation();
|
||||
const [form] = Form.useForm();
|
||||
const [open, setOpen] = useState(false);
|
||||
const initialValues =
|
||||
data && data.bills_by_pk
|
||||
? {
|
||||
...data.bills_by_pk,
|
||||
billlines: (data.bills_by_pk.billlines || []).map((bl) => {
|
||||
const oem = bl.oem_partno || (bl.jobline && bl.jobline.oem_partno) || "";
|
||||
const alt = bl.alt_partno || (bl.jobline && bl.jobline.alt_partno) || "";
|
||||
return {
|
||||
...bl,
|
||||
oem_partno: `${oem || ""} ${alt ? `(${alt})` : ""}`.trim()
|
||||
};
|
||||
})
|
||||
}
|
||||
: undefined;
|
||||
|
||||
const handleFinish = ({ billlines }) => {
|
||||
const selectedLines = billlines.filter((l) => l.selected).map((l) => l.id);
|
||||
@@ -62,7 +48,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
|
||||
// db_price: i.actual_price,
|
||||
act_price: i.actual_price,
|
||||
cost: i.actual_cost,
|
||||
part_qty: i.quantity,
|
||||
quantity: i.quantity,
|
||||
joblineid: i.joblineid,
|
||||
oem_partno: i.jobline && i.jobline.oem_partno,
|
||||
part_type: i.jobline && i.jobline.part_type
|
||||
@@ -88,9 +74,8 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
|
||||
destroyOnHidden
|
||||
title={t("bills.actions.return")}
|
||||
onOk={() => form.submit()}
|
||||
width={700}
|
||||
>
|
||||
<Form initialValues={initialValues} onFinish={handleFinish} form={form}>
|
||||
<Form initialValues={data?.bills_by_pk} onFinish={handleFinish} form={form}>
|
||||
<Form.List name={["billlines"]}>
|
||||
{(fields) => {
|
||||
return (
|
||||
@@ -110,20 +95,15 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
|
||||
/>
|
||||
</td>
|
||||
<td>{t("billlines.fields.line_desc")}</td>
|
||||
<td>{t("billlines.fields.oem_partno")}</td>
|
||||
<td style={{ textAlign: "right" }}>{t("billlines.fields.quantity")}</td>
|
||||
<td style={{ textAlign: "right" }}>{t("billlines.fields.actual_price")}</td>
|
||||
<td style={{ textAlign: "right" }}>{t("billlines.fields.actual_cost")}</td>
|
||||
<td>{t("billlines.fields.quantity")}</td>
|
||||
<td>{t("billlines.fields.actual_price")}</td>
|
||||
<td>{t("billlines.fields.actual_cost")}</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{fields.map((field, index) => (
|
||||
<tr key={field.key}>
|
||||
<td>
|
||||
{/* Hidden field to preserve the id */}
|
||||
<Form.Item name={[field.name, "id"]} hidden>
|
||||
<input type="hidden" />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
// label={t("joblines.fields.selected")}
|
||||
key={`${index}selected`}
|
||||
@@ -143,15 +123,6 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
|
||||
</Form.Item>
|
||||
</td>
|
||||
<td>
|
||||
<Form.Item
|
||||
// label={t("joblines.fields.oem_partno")}
|
||||
key={`${index}jobline.oem_partno`}
|
||||
name={[field.name, "oem_partno"]}
|
||||
>
|
||||
<ReadOnlyFormItemComponent />
|
||||
</Form.Item>
|
||||
</td>
|
||||
<td style={{ textAlign: "right" }}>
|
||||
<Form.Item
|
||||
// label={t("joblines.fields.quantity")}
|
||||
key={`${index}quantity`}
|
||||
@@ -160,7 +131,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
|
||||
<ReadOnlyFormItemComponent />
|
||||
</Form.Item>
|
||||
</td>
|
||||
<td style={{ textAlign: "right" }}>
|
||||
<td>
|
||||
<Form.Item
|
||||
// label={t("joblines.fields.actual_price")}
|
||||
key={`${index}actual_price`}
|
||||
@@ -169,7 +140,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
|
||||
<ReadOnlyFormItemComponent type="currency" />
|
||||
</Form.Item>
|
||||
</td>
|
||||
<td style={{ textAlign: "right" }}>
|
||||
<td>
|
||||
<Form.Item
|
||||
// label={t("joblines.fields.actual_cost")}
|
||||
key={`${index}actual_cost`}
|
||||
|
||||
@@ -7,8 +7,10 @@ export default function BillDetailEditcontainer() {
|
||||
const search = queryString.parse(useLocation().search);
|
||||
const history = useNavigate();
|
||||
|
||||
const screens = Grid.useBreakpoint();
|
||||
|
||||
const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
|
||||
.filter((screen) => !!screen[1])
|
||||
.slice(-1)[0];
|
||||
|
||||
const bpoints = {
|
||||
xs: "100%",
|
||||
sm: "100%",
|
||||
@@ -17,18 +19,11 @@ export default function BillDetailEditcontainer() {
|
||||
xl: "90%",
|
||||
xxl: "90%"
|
||||
};
|
||||
|
||||
let drawerPercentage = "100%";
|
||||
if (screens.xxl) drawerPercentage = bpoints.xxl;
|
||||
else if (screens.xl) drawerPercentage = bpoints.xl;
|
||||
else if (screens.lg) drawerPercentage = bpoints.lg;
|
||||
else if (screens.md) drawerPercentage = bpoints.md;
|
||||
else if (screens.sm) drawerPercentage = bpoints.sm;
|
||||
else if (screens.xs) drawerPercentage = bpoints.xs;
|
||||
const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
|
||||
|
||||
return (
|
||||
<Drawer
|
||||
size={drawerPercentage}
|
||||
width={drawerPercentage}
|
||||
onClose={() => {
|
||||
delete search.billid;
|
||||
history({ search: queryString.stringify(search) });
|
||||
|
||||
@@ -1,203 +0,0 @@
|
||||
import { Button, Tag, Modal, Typography } from "antd";
|
||||
import axios from "axios";
|
||||
import { useState } from "react";
|
||||
import { FaWandMagicSparkles } from "react-icons/fa6";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { useNotification } from "../../contexts/Notifications/notificationContext";
|
||||
import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
billEnterModal: selectBillEnterModal,
|
||||
bodyshop: selectBodyshop
|
||||
});
|
||||
|
||||
function BillEnterAiScan({
|
||||
billEnterModal,
|
||||
bodyshop,
|
||||
pollingIntervalRef,
|
||||
setPollingIntervalRef,
|
||||
form,
|
||||
fileInputRef,
|
||||
scanLoading,
|
||||
setScanLoading,
|
||||
setIsAiScan
|
||||
}) {
|
||||
const notification = useNotification();
|
||||
const { t } = useTranslation();
|
||||
const [showBetaModal, setShowBetaModal] = useState(false);
|
||||
const BETA_ACCEPTANCE_KEY = "ai_scan_beta_acceptance";
|
||||
const handleBetaAcceptance = () => {
|
||||
localStorage.setItem(BETA_ACCEPTANCE_KEY, "true");
|
||||
setShowBetaModal(false);
|
||||
fileInputRef.current?.click();
|
||||
};
|
||||
|
||||
const checkBetaAcceptance = () => {
|
||||
const hasAccepted = localStorage.getItem(BETA_ACCEPTANCE_KEY);
|
||||
if (hasAccepted) {
|
||||
fileInputRef.current?.click();
|
||||
} else {
|
||||
setShowBetaModal(true);
|
||||
}
|
||||
};
|
||||
|
||||
// Polling function for multipage PDF status
|
||||
const pollJobStatus = async (textractJobId) => {
|
||||
try {
|
||||
const { data } = await axios.get(`/ai/bill-ocr/status/${textractJobId}`);
|
||||
|
||||
if (data.status === "COMPLETED") {
|
||||
// Stop polling
|
||||
if (pollingIntervalRef.current) {
|
||||
clearInterval(pollingIntervalRef.current);
|
||||
setPollingIntervalRef(null);
|
||||
}
|
||||
setScanLoading(false);
|
||||
|
||||
// Update form with the extracted data
|
||||
if (data?.data?.billForm) {
|
||||
form.setFieldsValue(data.data.billForm);
|
||||
await form.validateFields(["billlines"], { recursive: true });
|
||||
notification.success({
|
||||
title: t("bills.labels.ai.scancomplete")
|
||||
});
|
||||
}
|
||||
} else if (data.status === "FAILED") {
|
||||
// Stop polling on failure
|
||||
if (pollingIntervalRef.current) {
|
||||
clearInterval(pollingIntervalRef.current);
|
||||
setPollingIntervalRef(null);
|
||||
}
|
||||
setScanLoading(false);
|
||||
|
||||
notification.error({
|
||||
title: t("bills.labels.ai.scanfailed"),
|
||||
description: data.error || ""
|
||||
});
|
||||
}
|
||||
// If status is IN_PROGRESS, continue polling
|
||||
} catch (error) {
|
||||
// Stop polling on error
|
||||
if (pollingIntervalRef.current) {
|
||||
clearInterval(pollingIntervalRef.current);
|
||||
setPollingIntervalRef(null);
|
||||
}
|
||||
setScanLoading(false);
|
||||
|
||||
notification.error({
|
||||
title: t("bills.labels.ai.scanfailed"),
|
||||
description: error.response?.data?.message || error.message || "Failed to check scan status"
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<input
|
||||
ref={fileInputRef}
|
||||
type="file"
|
||||
accept="image/*,application/pdf"
|
||||
style={{ display: "none" }}
|
||||
onChange={async (e) => {
|
||||
const file = e.target.files?.[0];
|
||||
if (file) {
|
||||
setScanLoading(true);
|
||||
setIsAiScan(true);
|
||||
const formdata = new FormData();
|
||||
formdata.append("billScan", file);
|
||||
formdata.append("jobid", form.getFieldValue("jobid") || billEnterModal.context.job?.id);
|
||||
formdata.append("bodyshopid", bodyshop.id);
|
||||
formdata.append("partsorderid", billEnterModal.context.parts_order?.id);
|
||||
|
||||
try {
|
||||
const { data, status } = await axios.post("/ai/bill-ocr", formdata);
|
||||
|
||||
// Add the scanned file to the upload field
|
||||
const currentUploads = form.getFieldValue("upload") || [];
|
||||
form.setFieldValue("upload", [
|
||||
...currentUploads,
|
||||
{
|
||||
uid: `ai-scan-${Date.now()}`,
|
||||
name: file.name,
|
||||
originFileObj: file,
|
||||
status: "done"
|
||||
}
|
||||
]);
|
||||
if (status === 202) {
|
||||
// Multipage PDF - start polling
|
||||
notification.info({
|
||||
title: t("bills.labels.ai.scanstarted"),
|
||||
description: t("bills.labels.ai.multipage")
|
||||
});
|
||||
|
||||
//Workaround needed to bypass react-compiler error about manipulating refs in child components. Refactor may be needed in the future to clean this up.
|
||||
setPollingIntervalRef(
|
||||
setInterval(() => {
|
||||
pollJobStatus(data.textractJobId);
|
||||
}, 3000)
|
||||
);
|
||||
|
||||
// Initial poll
|
||||
pollJobStatus(data.textractJobId);
|
||||
} else if (status === 200) {
|
||||
// Single page - immediate response
|
||||
setScanLoading(false);
|
||||
|
||||
form.setFieldsValue(data.data.billForm);
|
||||
await form.validateFields(["billlines"], { recursive: true });
|
||||
|
||||
notification.success({
|
||||
title: t("bills.labels.ai.scancomplete")
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
setScanLoading(false);
|
||||
notification.error({
|
||||
title: t("bills.labels.ai.scanfailed"),
|
||||
description: error.response?.data?.message || error.message || t("bills.labels.ai.generic_failure")
|
||||
});
|
||||
}
|
||||
}
|
||||
// Reset the input so the same file can be selected again
|
||||
e.target.value = "";
|
||||
}}
|
||||
/>
|
||||
|
||||
<Button onClick={checkBetaAcceptance} icon={<FaWandMagicSparkles />} loading={scanLoading} disabled={scanLoading}>
|
||||
{scanLoading ? t("bills.labels.ai.processing") : t("bills.labels.ai.scan")}
|
||||
<Tag color="red">{t("general.labels.beta")}</Tag>
|
||||
</Button>
|
||||
|
||||
<Modal
|
||||
title={t("bills.labels.ai.disclaimer_title")}
|
||||
open={showBetaModal}
|
||||
onOk={handleBetaAcceptance}
|
||||
onCancel={() => setShowBetaModal(false)}
|
||||
okText={t("bills.labels.ai.accept_and_continue")}
|
||||
cancelText={t("general.actions.cancel")}
|
||||
>
|
||||
{
|
||||
//This is explicitly not translated.
|
||||
}
|
||||
<Typography.Text>
|
||||
This AI scanning feature is currently in <strong>beta</strong>. While it can accelerate data entry, you{" "}
|
||||
<strong>must carefully review all extracted results</strong> for accuracy.
|
||||
</Typography.Text>
|
||||
<Typography.Text>The AI may make mistakes or miss information. Always verify:</Typography.Text>
|
||||
<ul>
|
||||
<li>All line items and quantities</li>
|
||||
<li>Prices and totals</li>
|
||||
<li>Part numbers and descriptions</li>
|
||||
<li>Any other critical invoice details</li>
|
||||
</ul>
|
||||
<Typography.Text>
|
||||
By continuing, you acknowledge that you will review and verify all AI-generated data before posting.
|
||||
</Typography.Text>
|
||||
</Modal>
|
||||
</>
|
||||
);
|
||||
}
|
||||
export default connect(mapStateToProps, null)(BillEnterAiScan);
|
||||
@@ -1,12 +1,11 @@
|
||||
import { useApolloClient, useMutation } from "@apollo/client/react";
|
||||
import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
|
||||
import { useApolloClient, useMutation } from "@apollo/client";
|
||||
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
||||
import { Button, Checkbox, Form, Modal, Space } from "antd";
|
||||
import _ from "lodash";
|
||||
import { useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
|
||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||
import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
|
||||
import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
|
||||
@@ -22,12 +21,11 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
|
||||
import { TemplateList } from "../../utils/TemplateConstants";
|
||||
import confirmDialog from "../../utils/asyncConfirm";
|
||||
import useLocalStorage from "../../utils/useLocalStorage";
|
||||
import BillEnterAiScan from "../bill-enter-ai-scan/bill-enter-ai-scan.component.jsx";
|
||||
import BillFormContainer from "../bill-form/bill-form.container";
|
||||
import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
|
||||
import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
|
||||
import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
|
||||
import { handleUpload } from "../documents-upload/documents-upload.utility";
|
||||
import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
billEnterModal: selectBillEnterModal,
|
||||
@@ -51,20 +49,15 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
const [updatePartsOrderLines] = useMutation(MUTATION_MARK_RETURN_RECEIVED);
|
||||
const [updateInventoryLines] = useMutation(UPDATE_INVENTORY_LINES);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [scanLoading, setScanLoading] = useState(false);
|
||||
const [isAiScan, setIsAiScan] = useState(false);
|
||||
const client = useApolloClient();
|
||||
const [generateLabel, setGenerateLabel] = useLocalStorage("enter_bill_generate_label", false);
|
||||
const notification = useNotification();
|
||||
const fileInputRef = useRef(null);
|
||||
const pollingIntervalRef = useRef(null);
|
||||
const formTopRef = useRef(null);
|
||||
|
||||
const {
|
||||
treatments: { Enhanced_Payroll, Imgproxy, Bill_OCR_AI }
|
||||
} = useTreatmentsWithConfig({
|
||||
treatments: { Enhanced_Payroll, Imgproxy }
|
||||
} = useSplitTreatments({
|
||||
attributes: {},
|
||||
names: ["Enhanced_Payroll", "Imgproxy", "Bill_OCR_AI"],
|
||||
names: ["Enhanced_Payroll", "Imgproxy"],
|
||||
splitKey: bodyshop.imexshopid
|
||||
});
|
||||
|
||||
@@ -119,8 +112,6 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
create_ppc,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
original_actual_price,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
confidence,
|
||||
...restI
|
||||
} = i;
|
||||
|
||||
@@ -213,8 +204,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
}
|
||||
});
|
||||
if (jobUpdate.errors) {
|
||||
notification.error({
|
||||
title: t("jobs.errors.saving", {
|
||||
notification["error"]({
|
||||
message: t("jobs.errors.saving", {
|
||||
message: JSON.stringify(jobUpdate.errors)
|
||||
})
|
||||
});
|
||||
@@ -232,8 +223,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
if (r2.errors) {
|
||||
setLoading(false);
|
||||
setEnterAgain(false);
|
||||
notification.error({
|
||||
title: t("parts_orders.errors.updating", {
|
||||
notification["error"]({
|
||||
message: t("parts_orders.errors.updating", {
|
||||
message: JSON.stringify(r2.errors)
|
||||
})
|
||||
});
|
||||
@@ -243,8 +234,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
if (r1.errors) {
|
||||
setLoading(false);
|
||||
setEnterAgain(false);
|
||||
notification.error({
|
||||
title: t("bills.errors.creating", {
|
||||
notification["error"]({
|
||||
message: t("bills.errors.creating", {
|
||||
message: JSON.stringify(r1.errors)
|
||||
})
|
||||
});
|
||||
@@ -263,8 +254,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
if (r2.errors) {
|
||||
setLoading(false);
|
||||
setEnterAgain(false);
|
||||
notification.error({
|
||||
title: t("inventory.errors.updating", {
|
||||
notification["error"]({
|
||||
message: t("inventory.errors.updating", {
|
||||
message: JSON.stringify(r2.errors)
|
||||
})
|
||||
});
|
||||
@@ -351,8 +342,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
}
|
||||
///////////////////////////
|
||||
setLoading(false);
|
||||
notification.success({
|
||||
title: t("bills.successes.created")
|
||||
notification["success"]({
|
||||
message: t("bills.successes.created")
|
||||
});
|
||||
|
||||
if (generateLabel) {
|
||||
@@ -386,7 +377,6 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
vendorid: values.vendorid,
|
||||
billlines: []
|
||||
});
|
||||
setIsAiScan(false);
|
||||
// form.resetFields();
|
||||
} else {
|
||||
toggleModalVisible();
|
||||
@@ -397,22 +387,10 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
const handleCancel = () => {
|
||||
const r = window.confirm(t("general.labels.cancel"));
|
||||
if (r === true) {
|
||||
// Clean up polling on cancel
|
||||
if (pollingIntervalRef.current) {
|
||||
clearInterval(pollingIntervalRef.current);
|
||||
pollingIntervalRef.current = null;
|
||||
}
|
||||
setScanLoading(false);
|
||||
setIsAiScan(false);
|
||||
toggleModalVisible();
|
||||
}
|
||||
};
|
||||
|
||||
//Workaround needed to bypass react-compiler error about manipulating refs in child components. Refactor may be needed in the future to clean this up.
|
||||
const setPollingIntervalRef = (func) => {
|
||||
pollingIntervalRef.current = func;
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (enterAgain) form.submit();
|
||||
}, [enterAgain, form]);
|
||||
@@ -422,44 +400,12 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
form.setFieldsValue(formValues);
|
||||
} else {
|
||||
form.resetFields();
|
||||
// Clean up polling on modal close
|
||||
if (pollingIntervalRef.current) {
|
||||
clearInterval(pollingIntervalRef.current);
|
||||
pollingIntervalRef.current = null;
|
||||
}
|
||||
setScanLoading(false);
|
||||
setIsAiScan(false);
|
||||
}
|
||||
}, [billEnterModal.open, form, formValues]);
|
||||
|
||||
// Cleanup on unmount
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
if (pollingIntervalRef.current) {
|
||||
clearInterval(pollingIntervalRef.current);
|
||||
pollingIntervalRef.current = null;
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<Modal
|
||||
title={
|
||||
<Space size="large">
|
||||
{t("bills.labels.new")}
|
||||
{Bill_OCR_AI.treatment === "on" && (
|
||||
<BillEnterAiScan
|
||||
fileInputRef={fileInputRef}
|
||||
form={form}
|
||||
pollingIntervalRef={pollingIntervalRef}
|
||||
setPollingIntervalRef={setPollingIntervalRef}
|
||||
scanLoading={scanLoading}
|
||||
setScanLoading={setScanLoading}
|
||||
setIsAiScan={setIsAiScan}
|
||||
/>
|
||||
)}
|
||||
</Space>
|
||||
}
|
||||
title={t("bills.labels.new")}
|
||||
width={"98%"}
|
||||
open={billEnterModal.open}
|
||||
okText={t("general.actions.save")}
|
||||
@@ -500,25 +446,11 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
|
||||
autoComplete={"off"}
|
||||
layout="vertical"
|
||||
form={form}
|
||||
onFinishFailed={(errorInfo) => {
|
||||
onFinishFailed={() => {
|
||||
setEnterAgain(false);
|
||||
// Scroll to the top of the form to show validation errors
|
||||
if (errorInfo.errorFields && errorInfo.errorFields.length > 0) {
|
||||
setTimeout(() => {
|
||||
formTopRef.current?.scrollIntoView({ behavior: "smooth", block: "start" });
|
||||
}, 100);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<div ref={formTopRef}>
|
||||
<RbacWrapper action="bills:enter">
|
||||
<BillFormContainer
|
||||
form={form}
|
||||
isAiScan={isAiScan}
|
||||
disableInvNumber={billEnterModal.context.disableInvNumber}
|
||||
/>
|
||||
</RbacWrapper>
|
||||
</div>
|
||||
<BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
|
||||
</Form>
|
||||
</Modal>
|
||||
);
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Form, Input } from "antd";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Form, Input, Table } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import CurrencyFormatter from "../../utils/CurrencyFormatter";
|
||||
@@ -109,14 +108,7 @@ export default function BillFormLinesExtended({ lineData, discount, form, respon
|
||||
<Form.Item noStyle name="billlineskeys">
|
||||
<button onClick={() => console.log(form.getFieldsValue())}>form</button>
|
||||
<Input onChange={(e) => setSearch(e.target.value)} allowClear />
|
||||
<ResponsiveTable
|
||||
pagination={false}
|
||||
size="small"
|
||||
columns={columns}
|
||||
mobileColumnKeys={["line_desc", "oem_partno", "part_type", "act_price"]}
|
||||
rowKey="id"
|
||||
dataSource={data}
|
||||
/>
|
||||
<Table pagination={false} size="small" columns={columns} rowKey="id" dataSource={data} />
|
||||
</Form.Item>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ import { createStructuredSelector } from "reselect";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
||||
import CiecaSelect from "../../utils/Ciecaselect";
|
||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop
|
||||
@@ -32,7 +31,6 @@ export function BillFormItemsExtendedFormItem({
|
||||
if (!value)
|
||||
return (
|
||||
<Button
|
||||
icon={<PlusCircleFilled />}
|
||||
onClick={() => {
|
||||
const values = form.getFieldsValue("billlineskeys");
|
||||
|
||||
@@ -46,7 +44,7 @@ export function BillFormItemsExtendedFormItem({
|
||||
quantity: record.part_qty || 1,
|
||||
actual_price: record.act_price,
|
||||
cost_center: record.part_type
|
||||
? bodyshopHasDmsKey(bodyshop)
|
||||
? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
|
||||
? record.part_type
|
||||
: responsibilityCenters.defaults && (responsibilityCenters.defaults.costs[record.part_type] || null)
|
||||
: null
|
||||
@@ -54,7 +52,9 @@ export function BillFormItemsExtendedFormItem({
|
||||
}
|
||||
});
|
||||
}}
|
||||
/>
|
||||
>
|
||||
<PlusCircleFilled />
|
||||
</Button>
|
||||
);
|
||||
|
||||
return (
|
||||
@@ -99,22 +99,20 @@ export function BillFormItemsExtendedFormItem({
|
||||
}}
|
||||
</Form.Item>
|
||||
<Form.Item label={t("billlines.fields.cost_center")} name={["billlineskeys", record.id, "cost_center"]}>
|
||||
<Select
|
||||
showSearch
|
||||
style={{ minWidth: "3rem" }}
|
||||
disabled={disabled}
|
||||
options={
|
||||
bodyshopHasDmsKey(bodyshop)
|
||||
? CiecaSelect(true, false)
|
||||
: responsibilityCenters.costs.map((item) => ({ value: item.name, label: item.name }))
|
||||
}
|
||||
/>
|
||||
<Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
|
||||
{bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
|
||||
? CiecaSelect(true, false)
|
||||
: responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item label={t("billlines.fields.location")} name={["billlineskeys", record.id, "location"]}>
|
||||
<Select
|
||||
disabled={disabled}
|
||||
options={bodyshop.md_parts_locations.map((loc) => ({ value: loc, label: loc }))}
|
||||
/>
|
||||
<Select disabled={disabled}>
|
||||
{bodyshop.md_parts_locations.map((loc, idx) => (
|
||||
<Select.Option key={idx} value={loc}>
|
||||
{loc}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("billlines.fields.deductedfromlbr")}
|
||||
@@ -138,10 +136,22 @@ export function BillFormItemsExtendedFormItem({
|
||||
]}
|
||||
name={["billlineskeys", record.id, "lbr_adjustment", "mod_lbr_ty"]}
|
||||
>
|
||||
<Select
|
||||
allowClear
|
||||
options={CiecaSelect(false, true)}
|
||||
/>
|
||||
<Select allowClear>
|
||||
<Select.Option value="LAA">{t("joblines.fields.lbr_types.LAA")}</Select.Option>
|
||||
<Select.Option value="LAB">{t("joblines.fields.lbr_types.LAB")}</Select.Option>
|
||||
<Select.Option value="LAD">{t("joblines.fields.lbr_types.LAD")}</Select.Option>
|
||||
<Select.Option value="LAE">{t("joblines.fields.lbr_types.LAE")}</Select.Option>
|
||||
<Select.Option value="LAF">{t("joblines.fields.lbr_types.LAF")}</Select.Option>
|
||||
<Select.Option value="LAG">{t("joblines.fields.lbr_types.LAG")}</Select.Option>
|
||||
<Select.Option value="LAM">{t("joblines.fields.lbr_types.LAM")}</Select.Option>
|
||||
<Select.Option value="LAR">{t("joblines.fields.lbr_types.LAR")}</Select.Option>
|
||||
<Select.Option value="LAS">{t("joblines.fields.lbr_types.LAS")}</Select.Option>
|
||||
<Select.Option value="LAU">{t("joblines.fields.lbr_types.LAU")}</Select.Option>
|
||||
<Select.Option value="LA1">{t("joblines.fields.lbr_types.LA1")}</Select.Option>
|
||||
<Select.Option value="LA2">{t("joblines.fields.lbr_types.LA2")}</Select.Option>
|
||||
<Select.Option value="LA3">{t("joblines.fields.lbr_types.LA3")}</Select.Option>
|
||||
<Select.Option value="LA4">{t("joblines.fields.lbr_types.LA4")}</Select.Option>
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("jobs.labels.adjustmentrate")}
|
||||
@@ -185,7 +195,6 @@ export function BillFormItemsExtendedFormItem({
|
||||
</Form.Item>
|
||||
|
||||
<Button
|
||||
icon={<MinusCircleFilled />}
|
||||
onClick={() => {
|
||||
const values = form.getFieldsValue("billlineskeys");
|
||||
|
||||
@@ -197,7 +206,9 @@ export function BillFormItemsExtendedFormItem({
|
||||
}
|
||||
});
|
||||
}}
|
||||
/>
|
||||
>
|
||||
<MinusCircleFilled />
|
||||
</Button>
|
||||
</Space>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import Icon, { UploadOutlined } from "@ant-design/icons";
|
||||
import { useApolloClient } from "@apollo/client/react";
|
||||
import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
|
||||
import { useApolloClient } from "@apollo/client";
|
||||
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
||||
import { Alert, Divider, Form, Input, Select, Space, Statistic, Switch, Upload } from "antd";
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -8,15 +8,12 @@ import { MdOpenInNew } from "react-icons/md";
|
||||
import { connect } from "react-redux";
|
||||
import { Link } from "react-router-dom";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||
import { CHECK_BILL_INVOICE_NUMBER } from "../../graphql/bills.queries";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import dayjs from "../../utils/day";
|
||||
import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
|
||||
import InstanceRenderManager from "../../utils/instanceRenderMgr";
|
||||
import AlertComponent from "../alert/alert.component";
|
||||
import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
|
||||
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
|
||||
import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
|
||||
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
||||
import JobSearchSelect from "../job-search-select/job-search-select.component";
|
||||
@@ -24,6 +21,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
|
||||
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
|
||||
import BillFormLines from "./bill-form.lines.component";
|
||||
import { CalculateBillTotal } from "./bill-form.totals.utility";
|
||||
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop
|
||||
@@ -44,18 +42,15 @@ export function BillFormComponent({
|
||||
loadOutstandingReturns,
|
||||
loadInventory,
|
||||
preferredMake,
|
||||
disableInHouse,
|
||||
isAiScan
|
||||
disableInHouse
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const client = useApolloClient();
|
||||
const [discount, setDiscount] = useState(0);
|
||||
const notification = useNotification();
|
||||
const jobIdFormWatch = Form.useWatch("jobid", form);
|
||||
|
||||
const {
|
||||
treatments: { Extended_Bill_Posting, ClosingPeriod }
|
||||
} = useTreatmentsWithConfig({
|
||||
} = useSplitTreatments({
|
||||
attributes: {},
|
||||
names: ["Extended_Bill_Posting", "ClosingPeriod"],
|
||||
splitKey: bodyshop.imexshopid
|
||||
@@ -114,7 +109,7 @@ export function BillFormComponent({
|
||||
}
|
||||
|
||||
if (vendorId === bodyshop.inhousevendorid && !billEdit) {
|
||||
loadInventory({ variables: {} });
|
||||
loadInventory();
|
||||
}
|
||||
}, [
|
||||
form,
|
||||
@@ -127,27 +122,10 @@ export function BillFormComponent({
|
||||
bodyshop.inhousevendorid
|
||||
]);
|
||||
|
||||
useEffect(() => {
|
||||
// When the jobid is set by AI scan, we need to reload the lines. This prevents having to hoist the apollo query.
|
||||
if (jobIdFormWatch !== null) {
|
||||
if (form.getFieldValue("jobid") !== null && form.getFieldValue("jobid") !== undefined) {
|
||||
loadLines({ variables: { id: form.getFieldValue("jobid") } });
|
||||
if (form.getFieldValue("vendorid") !== null && form.getFieldValue("vendorid") !== undefined) {
|
||||
loadOutstandingReturns({
|
||||
variables: {
|
||||
jobId: form.getFieldValue("jobid"),
|
||||
vendorId: form.getFieldValue("vendorid")
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}, [jobIdFormWatch, form]);
|
||||
|
||||
return (
|
||||
<div>
|
||||
<FormFieldsChanged form={form} />
|
||||
<Form.Item hidden name="isinhouse" valuePropName="checked">
|
||||
<Form.Item style={{ display: "none" }} name="isinhouse" valuePropName="checked">
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
<LayoutFormRow grow>
|
||||
@@ -214,7 +192,7 @@ export function BillFormComponent({
|
||||
<Alert
|
||||
key={iou.id}
|
||||
type="warning"
|
||||
title={
|
||||
message={
|
||||
<Space>
|
||||
{t("bills.labels.iouexists")}
|
||||
<Link target="_blank" rel="noopener noreferrer" to={`/manage/jobs/${iou.id}?tab=repairdata`}>
|
||||
@@ -349,12 +327,13 @@ export function BillFormComponent({
|
||||
</Form.Item>
|
||||
{!billEdit && (
|
||||
<Form.Item label={t("bills.fields.allpartslocation")} name="location">
|
||||
<Select
|
||||
style={{ width: "10rem" }}
|
||||
disabled={disabled}
|
||||
allowClear
|
||||
options={bodyshop.md_parts_locations.map((loc) => ({ value: loc, label: loc }))}
|
||||
/>
|
||||
<Select style={{ width: "10rem" }} disabled={disabled} allowClear>
|
||||
{bodyshop.md_parts_locations.map((loc, idx) => (
|
||||
<Select.Option key={idx} value={loc}>
|
||||
{loc}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
)}
|
||||
</LayoutFormRow>
|
||||
@@ -375,7 +354,7 @@ export function BillFormComponent({
|
||||
<Form.Item span={3} label={t("bills.fields.local_tax_rate")} name="local_tax_rate">
|
||||
<CurrencyInput min={0} />
|
||||
</Form.Item>
|
||||
{bodyshopHasDmsKey(bodyshop) ? (
|
||||
{bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
|
||||
<Form.Item span={2} label={t("bills.labels.federal_tax_exempt")} name="federal_tax_exempt">
|
||||
<Switch onChange={handleFederalTaxExemptSwitchToggle} />
|
||||
</Form.Item>
|
||||
@@ -393,19 +372,9 @@ export function BillFormComponent({
|
||||
"local_tax_rate"
|
||||
]);
|
||||
let totals;
|
||||
if (!!values.total && !!values.billlines && values.billlines.length > 0) {
|
||||
try {
|
||||
totals = CalculateBillTotal(values);
|
||||
} catch (error) {
|
||||
notification.error({
|
||||
title: t("bills.errors.calculating_totals"),
|
||||
message: error.message || t("bills.errors.calculating_totals_generic"),
|
||||
key: "bill_totals_calculation_error"
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (totals) {
|
||||
if (!!values.total && !!values.billlines && values.billlines.length > 0)
|
||||
totals = CalculateBillTotal(values);
|
||||
if (totals)
|
||||
return (
|
||||
// TODO: Align is not correct
|
||||
// eslint-disable-next-line react/no-unknown-property
|
||||
@@ -443,26 +412,23 @@ export function BillFormComponent({
|
||||
/>
|
||||
<Statistic
|
||||
title={t("bills.labels.discrepancy")}
|
||||
styles={{
|
||||
content: {
|
||||
color: totals.discrepancy.getAmount() === 0 ? "green" : "red"
|
||||
}
|
||||
valueStyle={{
|
||||
color: totals.discrepancy.getAmount() === 0 ? "green" : "red"
|
||||
}}
|
||||
value={totals.discrepancy.toFormat()}
|
||||
precision={2}
|
||||
/>
|
||||
</Space>
|
||||
{form.getFieldValue("is_credit_memo") ? (
|
||||
<AlertComponent type="warning" title={t("bills.labels.enteringcreditmemo")} />
|
||||
<AlertComponent type="warning" message={t("bills.labels.enteringcreditmemo")} />
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
return null;
|
||||
}}
|
||||
</Form.Item>
|
||||
</LayoutFormRow>
|
||||
<Divider titlePlacement="left">{t("bills.labels.bill_lines")}</Divider>
|
||||
<Divider orientation="left">{t("bills.labels.bill_lines")}</Divider>
|
||||
|
||||
{Extended_Bill_Posting.treatment === "on" ? (
|
||||
<BillFormLinesExtended
|
||||
@@ -480,10 +446,9 @@ export function BillFormComponent({
|
||||
responsibilityCenters={responsibilityCenters}
|
||||
disabled={disabled}
|
||||
billEdit={billEdit}
|
||||
isAiScan={isAiScan}
|
||||
/>
|
||||
)}
|
||||
<Divider titlePlacement="left" style={{ display: billEdit ? "none" : null }}>
|
||||
<Divider orientation="left" style={{ display: billEdit ? "none" : null }}>
|
||||
{t("documents.labels.upload")}
|
||||
</Divider>
|
||||
<Form.Item
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useLazyQuery, useQuery } from "@apollo/client/react";
|
||||
import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
|
||||
import { useLazyQuery, useQuery } from "@apollo/client";
|
||||
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
|
||||
@@ -15,10 +15,10 @@ const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop
|
||||
});
|
||||
|
||||
export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableInvNumber, disableInHouse,isAiScan }) {
|
||||
export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableInvNumber, disableInHouse }) {
|
||||
const {
|
||||
treatments: { Simple_Inventory }
|
||||
} = useTreatmentsWithConfig({
|
||||
} = useSplitTreatments({
|
||||
attributes: {},
|
||||
names: ["Simple_Inventory"],
|
||||
splitKey: bodyshop && bodyshop.imexshopid
|
||||
@@ -50,7 +50,6 @@ export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableI
|
||||
loadOutstandingReturns={loadOutstandingReturns}
|
||||
loadInventory={loadInventory}
|
||||
preferredMake={lineData ? lineData.jobs_by_pk.v_make_desc : null}
|
||||
isAiScan={isAiScan}
|
||||
/>
|
||||
{!billEdit && <BillCmdReturnsTableComponent form={form} returnLoading={returnLoading} returnData={returnData} />}
|
||||
{Simple_Inventory.treatment === "on" && (
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,87 +0,0 @@
|
||||
import { Progress, Space, Tag, Tooltip } from "antd";
|
||||
import { useTranslation } from "react-i18next";
|
||||
const parseConfidence = (confidenceStr) => {
|
||||
if (!confidenceStr || typeof confidenceStr !== "string") return null;
|
||||
|
||||
const match = confidenceStr.match(/T([\d.]+)\s*-\s*O([\d.]+)\s*-\s*J([\d.]+)/);
|
||||
if (!match) return null;
|
||||
|
||||
return {
|
||||
total: parseFloat(match[1]),
|
||||
ocr: parseFloat(match[2]),
|
||||
jobMatch: parseFloat(match[3])
|
||||
};
|
||||
};
|
||||
|
||||
const getConfidenceColor = (value) => {
|
||||
if (value >= 80) return "green";
|
||||
if (value >= 60) return "orange";
|
||||
if (value >= 40) return "gold";
|
||||
return "red";
|
||||
};
|
||||
|
||||
const ConfidenceDisplay = ({ rowValue: { confidence, actual_price, actual_cost } }) => {
|
||||
const { t } = useTranslation();
|
||||
const parsed = parseConfidence(confidence);
|
||||
const parsed_actual_price = parseFloat(actual_price);
|
||||
const parsed_actual_cost = parseFloat(actual_cost);
|
||||
if (!parsed) {
|
||||
return <span style={{ color: "#959595", fontSize: "0.85em" }}>N/A</span>;
|
||||
}
|
||||
|
||||
const { total, ocr, jobMatch } = parsed;
|
||||
const color = getConfidenceColor(total);
|
||||
|
||||
return (
|
||||
<Tooltip
|
||||
title={
|
||||
<div style={{ padding: "4px 0" }}>
|
||||
<div style={{ marginBottom: 8, fontWeight: 600 }}>{t("bills.labels.ai.confidence.breakdown")}</div>
|
||||
<div style={{ marginBottom: 4 }}>
|
||||
<strong>{t("bills.labels.ai.confidence.overall")}:</strong> {total.toFixed(1)}%
|
||||
<Progress
|
||||
percent={total}
|
||||
size="small"
|
||||
strokeColor={getConfidenceColor(total)}
|
||||
showInfo={false}
|
||||
style={{ marginTop: 2 }}
|
||||
/>
|
||||
</div>
|
||||
<div style={{ marginBottom: 4 }}>
|
||||
<strong>{t("bills.labels.ai.confidence.ocr")}:</strong> {ocr.toFixed(1)}%
|
||||
<Progress
|
||||
percent={ocr}
|
||||
size="small"
|
||||
strokeColor={getConfidenceColor(ocr)}
|
||||
showInfo={false}
|
||||
style={{ marginTop: 2 }}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<strong>{t("bills.labels.ai.confidence.match")}:</strong> {jobMatch.toFixed(1)}%
|
||||
<Progress
|
||||
percent={jobMatch}
|
||||
size="small"
|
||||
strokeColor={getConfidenceColor(jobMatch)}
|
||||
showInfo={false}
|
||||
style={{ marginTop: 2 }}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<Space size="small">
|
||||
{!parsed_actual_cost || !parsed_actual_price || parsed_actual_cost === 0 || parsed_actual_price === 0 ? (
|
||||
<Tag color="red" style={{ margin: 0, cursor: "help", userSelect: "none" }}>
|
||||
{t("bills.labels.ai.confidence.missing_data")}
|
||||
</Tag>
|
||||
) : null}
|
||||
<Tag color={color} style={{ margin: 0, cursor: "help", userSelect: "none" }}>
|
||||
{total.toFixed(0)}%
|
||||
</Tag>
|
||||
</Space>
|
||||
</Tooltip>
|
||||
);
|
||||
};
|
||||
|
||||
export default ConfidenceDisplay;
|
||||
@@ -1,27 +1,27 @@
|
||||
import { Select } from "antd";
|
||||
import { forwardRef } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import InstanceRenderMgr from "../../utils/instanceRenderMgr";
|
||||
|
||||
const BillLineSearchSelect = ({ options, disabled, allowRemoved, ref, ...restProps }) => {
|
||||
const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps }, ref) => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<Select
|
||||
disabled={disabled}
|
||||
ref={ref}
|
||||
showSearch={{
|
||||
filterOption: (inputValue, option) => {
|
||||
return (
|
||||
(option.line_desc && option.line_desc.toLowerCase().includes(inputValue.toLowerCase())) ||
|
||||
(option.oem_partno && option.oem_partno.toLowerCase().includes(inputValue.toLowerCase())) ||
|
||||
(option.alt_partno && option.alt_partno.toLowerCase().includes(inputValue.toLowerCase())) ||
|
||||
(option.act_price && option.act_price.toString().startsWith(inputValue.toString()))
|
||||
);
|
||||
}
|
||||
}}
|
||||
showSearch
|
||||
popupMatchSelectWidth={true}
|
||||
optionLabelProp={"name"}
|
||||
// optionFilterProp="line_desc"
|
||||
filterOption={(inputValue, option) => {
|
||||
return (
|
||||
(option.line_desc && option.line_desc.toLowerCase().includes(inputValue.toLowerCase())) ||
|
||||
(option.oem_partno && option.oem_partno.toLowerCase().includes(inputValue.toLowerCase())) ||
|
||||
(option.alt_partno && option.alt_partno.toLowerCase().includes(inputValue.toLowerCase())) ||
|
||||
(option.act_price && option.act_price.toString().startsWith(inputValue.toString()))
|
||||
);
|
||||
}}
|
||||
notFoundContent={"Removed."}
|
||||
options={[
|
||||
{ value: "noline", label: t("billlines.labels.other"), name: t("billlines.labels.other") },
|
||||
@@ -39,32 +39,30 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ref, ...restPro
|
||||
style: {
|
||||
...(item.removed ? { textDecoration: "line-through" } : {})
|
||||
},
|
||||
name: generateLineName(item),
|
||||
label: generateLineName(item)
|
||||
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>
|
||||
)
|
||||
}))
|
||||
]}
|
||||
{...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 BillLineSearchSelect;
|
||||
export default forwardRef(BillLineSearchSelect);
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { gql } from "@apollo/client";
|
||||
|
||||
import { gql, useMutation } from "@apollo/client";
|
||||
import { Button } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -62,12 +60,12 @@ export function BillMarkExportedButton({ currentUser, bodyshop, authLevel, bill
|
||||
});
|
||||
|
||||
if (!result.errors) {
|
||||
notification.success({
|
||||
title: t("bills.successes.markexported")
|
||||
notification["success"]({
|
||||
message: t("bills.successes.markexported")
|
||||
});
|
||||
} else {
|
||||
notification.error({
|
||||
title: t("bills.errors.saving", {
|
||||
notification["error"]({
|
||||
message: t("bills.errors.saving", {
|
||||
error: JSON.stringify(result.errors)
|
||||
})
|
||||
});
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { gql } from "@apollo/client";
|
||||
import { gql, useMutation } from "@apollo/client";
|
||||
import { Button } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -44,12 +43,12 @@ export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
|
||||
});
|
||||
|
||||
if (!result.errors) {
|
||||
notification.success({
|
||||
title: t("bills.successes.reexport")
|
||||
notification["success"]({
|
||||
message: t("bills.successes.reexport")
|
||||
});
|
||||
} else {
|
||||
notification.error({
|
||||
title: t("bills.errors.saving", {
|
||||
notification["error"]({
|
||||
message: t("bills.errors.saving", {
|
||||
error: JSON.stringify(result.errors)
|
||||
})
|
||||
});
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { FileAddFilled } from "@ant-design/icons";
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { Button, Tooltip } from "antd";
|
||||
import { t } from "i18next";
|
||||
import dayjs from "./../../utils/day";
|
||||
@@ -17,137 +17,121 @@ const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop,
|
||||
currentUser: selectCurrentUser
|
||||
});
|
||||
const mapDispatchToProps = () => ({});
|
||||
const mapDispatchToProps = () => ({
|
||||
//setUserLanguage: language => dispatch(setUserLanguage(language))
|
||||
});
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(BilllineAddInventory);
|
||||
|
||||
export function BilllineAddInventory({ currentUser, bodyshop, billline, disabled, jobid }) {
|
||||
const [loading, setLoading] = useState(false);
|
||||
const qs = queryString.parse(useLocation().search);
|
||||
const billid = qs?.billid != null ? String(qs.billid) : null;
|
||||
|
||||
const { billid } = queryString.parse(useLocation().search);
|
||||
const [insertInventoryLine] = useMutation(INSERT_INVENTORY_AND_CREDIT);
|
||||
const notification = useNotification();
|
||||
|
||||
const inventoryCount = billline?.inventories?.length ?? 0;
|
||||
const quantity = billline?.quantity ?? 0;
|
||||
|
||||
const addToInventory = async () => {
|
||||
if (loading) return;
|
||||
|
||||
// Defensive: row identity can transiently desync during remove/add reindexing.
|
||||
if (!billline) {
|
||||
notification.error({
|
||||
title: t("inventory.errors.inserting", { error: "Bill line is missing (please try again)." })
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
const taxes = billline?.applicable_taxes ?? {};
|
||||
const cm = {
|
||||
vendorid: bodyshop.inhousevendorid,
|
||||
invoice_number: "ih",
|
||||
jobid: jobid,
|
||||
isinhouse: true,
|
||||
is_credit_memo: true,
|
||||
date: dayjs().format("YYYY-MM-DD"),
|
||||
federal_tax_rate: bodyshop.bill_tax_rates.federal_tax_rate,
|
||||
state_tax_rate: bodyshop.bill_tax_rates.state_tax_rate,
|
||||
local_tax_rate: bodyshop.bill_tax_rates.local_tax_rate,
|
||||
total: 0,
|
||||
billlines: [
|
||||
{
|
||||
actual_price: billline.actual_price,
|
||||
actual_cost: billline.actual_cost,
|
||||
quantity: billline.quantity,
|
||||
line_desc: billline.line_desc,
|
||||
cost_center: billline.cost_center,
|
||||
deductedfromlbr: billline.deductedfromlbr,
|
||||
applicable_taxes: {
|
||||
local: taxes.local,
|
||||
state: taxes.state,
|
||||
federal: taxes.federal
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
//Check to make sure there are no existing items already in the inventory.
|
||||
|
||||
cm.total = CalculateBillTotal(cm).enteredTotal.getAmount() / 100;
|
||||
|
||||
const insertResult = await insertInventoryLine({
|
||||
variables: {
|
||||
joblineId: billline.joblineid === "noline" ? billline.id : billline.joblineid,
|
||||
joblineStatus: bodyshop.md_order_statuses.default_returned,
|
||||
inv: {
|
||||
shopid: bodyshop.id,
|
||||
billlineid: billline.id,
|
||||
actual_price: billline.actual_price,
|
||||
actual_cost: billline.actual_cost,
|
||||
quantity: billline.quantity,
|
||||
line_desc: billline.line_desc
|
||||
},
|
||||
cm: { ...cm, billlines: { data: cm.billlines } },
|
||||
pol: {
|
||||
returnfrombill: billid,
|
||||
vendorid: bodyshop.inhousevendorid,
|
||||
deliver_by: dayjs().format("YYYY-MM-DD"),
|
||||
parts_order_lines: {
|
||||
data: [
|
||||
{
|
||||
line_desc: billline.line_desc,
|
||||
act_price: billline.actual_price,
|
||||
cost: billline.actual_cost,
|
||||
quantity: billline.quantity,
|
||||
job_line_id: billline.joblineid === "noline" ? null : billline.joblineid,
|
||||
part_type: billline.jobline && billline.jobline.part_type,
|
||||
cm_received: true
|
||||
}
|
||||
]
|
||||
},
|
||||
order_date: "2022-06-01",
|
||||
orderedby: currentUser.email,
|
||||
jobid: jobid,
|
||||
user_email: currentUser.email,
|
||||
return: true,
|
||||
status: "Ordered"
|
||||
const cm = {
|
||||
vendorid: bodyshop.inhousevendorid,
|
||||
invoice_number: "ih",
|
||||
jobid: jobid,
|
||||
isinhouse: true,
|
||||
is_credit_memo: true,
|
||||
date: dayjs().format("YYYY-MM-DD"),
|
||||
federal_tax_rate: bodyshop.bill_tax_rates.federal_tax_rate,
|
||||
state_tax_rate: bodyshop.bill_tax_rates.state_tax_rate,
|
||||
local_tax_rate: bodyshop.bill_tax_rates.local_tax_rate,
|
||||
total: 0,
|
||||
billlines: [
|
||||
{
|
||||
actual_price: billline.actual_price,
|
||||
actual_cost: billline.actual_cost,
|
||||
quantity: billline.quantity,
|
||||
line_desc: billline.line_desc,
|
||||
cost_center: billline.cost_center,
|
||||
deductedfromlbr: billline.deductedfromlbr,
|
||||
applicable_taxes: {
|
||||
local: billline.applicable_taxes.local,
|
||||
state: billline.applicable_taxes.state,
|
||||
federal: billline.applicable_taxes.federal
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
cm.total = CalculateBillTotal(cm).enteredTotal.getAmount() / 100;
|
||||
|
||||
const insertResult = await insertInventoryLine({
|
||||
variables: {
|
||||
joblineId: billline.joblineid === "noline" ? billline.id : billline.joblineid, //This will return null as there will be no jobline that has the id of the bill line.
|
||||
//Unfortunately, we can't send null as the GQL syntax validation fails.
|
||||
joblineStatus: bodyshop.md_order_statuses.default_returned,
|
||||
inv: {
|
||||
shopid: bodyshop.id,
|
||||
billlineid: billline.id,
|
||||
actual_price: billline.actual_price,
|
||||
actual_cost: billline.actual_cost,
|
||||
quantity: billline.quantity,
|
||||
line_desc: billline.line_desc
|
||||
},
|
||||
refetchQueries: ["QUERY_BILL_BY_PK"]
|
||||
});
|
||||
cm: { ...cm, billlines: { data: cm.billlines } }, //Fix structure for apollo insert.
|
||||
pol: {
|
||||
returnfrombill: billid,
|
||||
vendorid: bodyshop.inhousevendorid,
|
||||
deliver_by: dayjs().format("YYYY-MM-DD"),
|
||||
parts_order_lines: {
|
||||
data: [
|
||||
{
|
||||
line_desc: billline.line_desc,
|
||||
|
||||
if (!insertResult?.errors?.length) {
|
||||
notification.success({
|
||||
title: t("inventory.successes.inserted")
|
||||
});
|
||||
} else {
|
||||
notification.error({
|
||||
title: t("inventory.errors.inserting", {
|
||||
error: JSON.stringify(insertResult.errors)
|
||||
})
|
||||
});
|
||||
}
|
||||
} catch (err) {
|
||||
notification.error({
|
||||
title: t("inventory.errors.inserting", {
|
||||
error: err?.message || String(err)
|
||||
act_price: billline.actual_price,
|
||||
cost: billline.actual_cost,
|
||||
quantity: billline.quantity,
|
||||
job_line_id: billline.joblineid === "noline" ? null : billline.joblineid,
|
||||
part_type: billline.jobline && billline.jobline.part_type,
|
||||
cm_received: true
|
||||
}
|
||||
]
|
||||
},
|
||||
order_date: "2022-06-01",
|
||||
orderedby: currentUser.email,
|
||||
jobid: jobid,
|
||||
user_email: currentUser.email,
|
||||
return: true,
|
||||
status: "Ordered"
|
||||
}
|
||||
},
|
||||
refetchQueries: ["QUERY_BILL_BY_PK"]
|
||||
});
|
||||
|
||||
if (!insertResult.errors) {
|
||||
notification.open({
|
||||
type: "success",
|
||||
message: t("inventory.successes.inserted")
|
||||
});
|
||||
} else {
|
||||
notification.open({
|
||||
type: "error",
|
||||
message: t("inventory.errors.inserting", {
|
||||
error: JSON.stringify(insertResult.errors)
|
||||
})
|
||||
});
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
|
||||
setLoading(false);
|
||||
};
|
||||
|
||||
return (
|
||||
<Tooltip title={t("inventory.actions.addtoinventory")}>
|
||||
<Button
|
||||
icon={<FileAddFilled />}
|
||||
loading={loading}
|
||||
disabled={disabled || inventoryCount >= quantity}
|
||||
disabled={disabled || billline?.inventories?.length >= billline.quantity}
|
||||
onClick={addToInventory}
|
||||
>
|
||||
{inventoryCount > 0 && <div>({inventoryCount} in inv)</div>}
|
||||
<FileAddFilled />
|
||||
{billline?.inventories?.length > 0 && <div>({billline?.inventories?.length} in inv)</div>}
|
||||
</Button>
|
||||
</Tooltip>
|
||||
);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { EditFilled, SyncOutlined } from "@ant-design/icons";
|
||||
import { Button, Card, Checkbox, Input, Space } from "antd";
|
||||
import { Button, Card, Checkbox, Input, Space, Table } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { FaTasks } from "react-icons/fa";
|
||||
@@ -18,7 +18,6 @@ import BillDetailEditReturnComponent from "../bill-detail-edit/bill-detail-edit-
|
||||
import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
|
||||
import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
|
||||
import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
@@ -85,14 +84,15 @@ export function BillsListTableComponent({
|
||||
}
|
||||
});
|
||||
}}
|
||||
icon={<FaTasks />}
|
||||
/>
|
||||
|
||||
>
|
||||
<FaTasks />
|
||||
</Button>
|
||||
<BillDeleteButton bill={record} jobid={job.id} />
|
||||
<BillDetailEditReturnComponent
|
||||
data={{ bills_by_pk: { ...record, jobid: job.id, job: job } }}
|
||||
disabled={record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid || jobRO}
|
||||
/>
|
||||
|
||||
{record.isinhouse && (
|
||||
<PrintWrapperComponent
|
||||
templateObject={{
|
||||
@@ -190,7 +190,9 @@ export function BillsListTableComponent({
|
||||
title={t("bills.labels.bills")}
|
||||
extra={
|
||||
<Space wrap>
|
||||
<Button onClick={() => refetch()} icon={<SyncOutlined />} />
|
||||
<Button onClick={() => refetch()}>
|
||||
<SyncOutlined />
|
||||
</Button>
|
||||
{job && job.converted ? (
|
||||
<>
|
||||
<Button
|
||||
@@ -233,18 +235,16 @@ export function BillsListTableComponent({
|
||||
e.preventDefault();
|
||||
setSearchText(e.target.value);
|
||||
}}
|
||||
enterButton
|
||||
/>
|
||||
</Space>
|
||||
}
|
||||
>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
loading={billsQuery.loading}
|
||||
scroll={{
|
||||
x: true // y: "50rem"
|
||||
}}
|
||||
columns={columns}
|
||||
mobileColumnKeys={["vendorname", "invoice_number", "date", "total", "actions"]}
|
||||
rowKey="id"
|
||||
dataSource={hasBillsAccess ? filteredBills : []}
|
||||
onChange={handleTableChange}
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
import { useState } from "react";
|
||||
import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
|
||||
import { useQuery } from "@apollo/client/react";
|
||||
import { useQuery } from "@apollo/client";
|
||||
import queryString from "query-string";
|
||||
import { useLocation, useNavigate } from "react-router-dom";
|
||||
import { Input } from "antd";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Input, Table } from "antd";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { alphaSort } from "../../utils/sorters";
|
||||
import AlertComponent from "../alert/alert.component";
|
||||
@@ -68,7 +67,7 @@ export default function BillsVendorsList() {
|
||||
setState({ ...state, search: e.target.value });
|
||||
};
|
||||
|
||||
if (error) return <AlertComponent title={error.message} type="error" />;
|
||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||
|
||||
const dataSource = state.search
|
||||
? data.vendors.filter(
|
||||
@@ -80,7 +79,7 @@ export default function BillsVendorsList() {
|
||||
: (data && data.vendors) || [];
|
||||
|
||||
return (
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
loading={loading}
|
||||
title={() => {
|
||||
return (
|
||||
@@ -90,9 +89,8 @@ export default function BillsVendorsList() {
|
||||
);
|
||||
}}
|
||||
dataSource={dataSource}
|
||||
pagination={{ placement: "top" }}
|
||||
pagination={{ position: "top" }}
|
||||
columns={columns}
|
||||
mobileColumnKeys={["name", "cost_center", "city"]}
|
||||
rowKey="id"
|
||||
onChange={handleTableChange}
|
||||
rowSelection={{
|
||||
|
||||
@@ -8,7 +8,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import GlobalSearch from "../global-search/global-search.component";
|
||||
import GlobalSearchOs from "../global-search/global-search-os.component";
|
||||
import "./breadcrumbs.styles.scss";
|
||||
import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
|
||||
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
breadcrumbs: selectBreadcrumbs,
|
||||
@@ -19,7 +19,7 @@ const mapStateToProps = createStructuredSelector({
|
||||
export function BreadCrumbs({ breadcrumbs, bodyshop, isPartsEntry }) {
|
||||
const {
|
||||
treatments: { OpenSearch }
|
||||
} = useTreatmentsWithConfig({
|
||||
} = useSplitTreatments({
|
||||
attributes: {},
|
||||
names: ["OpenSearch"],
|
||||
splitKey: bodyshop?.imexshopid
|
||||
|
||||
@@ -41,7 +41,9 @@ export default function CABCpvrtCalculator({ disabled, form }) {
|
||||
|
||||
return (
|
||||
<Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
|
||||
<Button disabled={disabled} onClick={() => setVisibility(true)} icon={<CalculatorFilled />} />
|
||||
<Button disabled={disabled} onClick={() => setVisibility(true)}>
|
||||
<CalculatorFilled />
|
||||
</Button>
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
import { CopyFilled, DeleteFilled } from "@ant-design/icons";
|
||||
import { useLazyQuery, useMutation } from "@apollo/client/react";
|
||||
import { useLazyQuery, useMutation } from "@apollo/client";
|
||||
import { Button, Card, Col, Form, Input, message, Row, Space, Spin, Statistic } from "antd";
|
||||
import axios from "axios";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { INSERT_PAYMENT_RESPONSE, QUERY_RO_AND_OWNER_BY_JOB_PKS } from "../../graphql/payment_response.queries";
|
||||
import { getCurrentUser, logImEXEvent } from "../../firebase/firebase.utils";
|
||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||
import { insertAuditTrail } from "../../redux/application/application.actions";
|
||||
import { toggleModalVisible } from "../../redux/modals/modals.actions";
|
||||
import { selectCardPayment } from "../../redux/modals/modals.selectors";
|
||||
@@ -16,6 +14,8 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
||||
import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
|
||||
import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
|
||||
import { getCurrentUser, logImEXEvent } from "../../firebase/firebase.utils";
|
||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
cardPaymentModal: selectCardPayment,
|
||||
@@ -46,64 +46,15 @@ const CardPaymentModalComponent = ({
|
||||
|
||||
const [form] = Form.useForm();
|
||||
const [paymentLink, setPaymentLink] = useState();
|
||||
const isMountedRef = useRef(true);
|
||||
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
|
||||
const { t } = useTranslation();
|
||||
const notification = useNotification();
|
||||
|
||||
const [loadRoAndOwnerByJobPks, { data, loading: queryLoading, error: queryError, refetch, called }] = useLazyQuery(
|
||||
QUERY_RO_AND_OWNER_BY_JOB_PKS,
|
||||
{
|
||||
fetchPolicy: "network-only",
|
||||
}
|
||||
);
|
||||
|
||||
const safeRefetchRoAndOwner = useCallback(
|
||||
(vars) => {
|
||||
// First run: execute the lazy query
|
||||
if (!called) return loadRoAndOwnerByJobPks({ variables: vars });
|
||||
// Subsequent runs: refetch expects the variables object directly (not { variables: ... })
|
||||
return refetch(vars);
|
||||
},
|
||||
[called, loadRoAndOwnerByJobPks, refetch]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
isMountedRef.current = false;
|
||||
};
|
||||
}, []);
|
||||
|
||||
const setLoadingSafe = useCallback((value) => {
|
||||
if (isMountedRef.current) setLoading(value);
|
||||
}, []);
|
||||
|
||||
// Watch form payments so we can query jobs when all jobids are filled (without side effects during render)
|
||||
const payments = Form.useWatch(["payments"], form);
|
||||
|
||||
const jobids = useMemo(() => {
|
||||
if (!Array.isArray(payments) || payments.length === 0) return [];
|
||||
return payments.map((p) => p?.jobid).filter(Boolean);
|
||||
}, [payments]);
|
||||
|
||||
const allJobIdsFilled = useMemo(() => {
|
||||
if (!Array.isArray(payments) || payments.length === 0) return false;
|
||||
return payments.every((p) => !!p?.jobid);
|
||||
}, [payments]);
|
||||
|
||||
const lastJobidsKeyRef = useRef("");
|
||||
|
||||
useEffect(() => {
|
||||
if (!allJobIdsFilled) return;
|
||||
|
||||
const nextKey = jobids.join("|");
|
||||
if (!nextKey || nextKey === lastJobidsKeyRef.current) return;
|
||||
|
||||
lastJobidsKeyRef.current = nextKey;
|
||||
safeRefetchRoAndOwner({ jobids });
|
||||
}, [allJobIdsFilled, jobids, safeRefetchRoAndOwner]);
|
||||
const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, {
|
||||
variables: { jobids: [context.jobid] },
|
||||
skip: !context?.jobid
|
||||
});
|
||||
|
||||
const collectIPayFields = () => {
|
||||
const iPayFields = document.querySelectorAll(".ipayfield");
|
||||
@@ -117,84 +68,55 @@ const CardPaymentModalComponent = ({
|
||||
const SetIntellipayCallbackFunctions = () => {
|
||||
console.log("*** Set IntelliPay callback functions.");
|
||||
|
||||
const isLikelyUserCancel = (response) => {
|
||||
const reason = String(response?.declinereason ?? "").toLowerCase();
|
||||
// Heuristics: adjust if IntelliPay gives you a known cancel code/message
|
||||
return (
|
||||
reason.includes("cancel") ||
|
||||
reason.includes("canceled") ||
|
||||
reason.includes("closed") ||
|
||||
// many gateways won't have a paymentid if user cancels before submitting
|
||||
!response?.paymentid
|
||||
);
|
||||
};
|
||||
|
||||
window.intellipay.runOnClose(() => {
|
||||
// This is the path for Cancel / X
|
||||
try {
|
||||
// If IntelliPay uses this flag, clear it so initialize() won't reopen unexpectedly
|
||||
window.intellipay.isAutoOpen = false;
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
|
||||
// Optional: if IntelliPay needs re-init after close, uncomment:
|
||||
// try { window.intellipay.initialize?.(); } catch {}
|
||||
|
||||
setLoadingSafe(false);
|
||||
//window.intellipay.initialize();
|
||||
});
|
||||
|
||||
window.intellipay.runOnApproval(() => {
|
||||
// keep your existing behavior
|
||||
//2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
|
||||
//Add a slight delay to allow the refetch to properly get the data.
|
||||
setTimeout(() => {
|
||||
if (actions?.refetch) actions.refetch();
|
||||
setLoadingSafe(false);
|
||||
setLoading(false);
|
||||
toggleModalVisible();
|
||||
}, 750);
|
||||
});
|
||||
|
||||
window.intellipay.runOnNonApproval(async (response) => {
|
||||
try {
|
||||
// If cancel is reported as "non-approval", don't record it as a failed payment
|
||||
if (isLikelyUserCancel(response)) return;
|
||||
// Mutate unsuccessful payment
|
||||
|
||||
const { payments } = form.getFieldsValue();
|
||||
|
||||
await insertPaymentResponse({
|
||||
variables: {
|
||||
paymentResponse: payments.map((payment) => ({
|
||||
amount: payment.amount,
|
||||
bodyshopid: bodyshop.id,
|
||||
jobid: payment.jobid,
|
||||
declinereason: response.declinereason,
|
||||
ext_paymentid: response.paymentid?.toString?.() ?? null,
|
||||
successful: false,
|
||||
response
|
||||
}))
|
||||
}
|
||||
});
|
||||
|
||||
payments.forEach((payment) =>
|
||||
insertAuditTrail({
|
||||
const { payments } = form.getFieldsValue();
|
||||
await insertPaymentResponse({
|
||||
variables: {
|
||||
paymentResponse: payments.map((payment) => ({
|
||||
amount: payment.amount,
|
||||
bodyshopid: bodyshop.id,
|
||||
jobid: payment.jobid,
|
||||
operation: AuditTrailMapping.failedpayment(),
|
||||
type: "failedpayment"
|
||||
})
|
||||
);
|
||||
} finally {
|
||||
// IMPORTANT: always clear loading, even on errors
|
||||
setLoadingSafe(false);
|
||||
}
|
||||
declinereason: response.declinereason,
|
||||
ext_paymentid: response.paymentid.toString(),
|
||||
successful: false,
|
||||
response
|
||||
}))
|
||||
}
|
||||
});
|
||||
|
||||
payments.forEach((payment) =>
|
||||
insertAuditTrail({
|
||||
jobid: payment.jobid,
|
||||
operation: AuditTrailMapping.failedpayment(),
|
||||
type: "failedpayment"
|
||||
})
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
const handleIntelliPayCharge = async () => {
|
||||
setLoading(true);
|
||||
// Validate
|
||||
//Validate
|
||||
try {
|
||||
await form.validateFields();
|
||||
} catch {
|
||||
setLoadingSafe(false);
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -212,9 +134,7 @@ const CardPaymentModalComponent = ({
|
||||
});
|
||||
|
||||
if (window.intellipay) {
|
||||
// Use Function constructor instead of eval for security (still executes dynamic code but safer)
|
||||
// IntelliPay provides initialization code that must be executed
|
||||
Function(response.data)();
|
||||
eval(response.data);
|
||||
pollForIntelliPay(() => {
|
||||
SetIntellipayCallbackFunctions();
|
||||
window.intellipay.autoOpen();
|
||||
@@ -225,26 +145,26 @@ const CardPaymentModalComponent = ({
|
||||
document.documentElement.appendChild(node);
|
||||
pollForIntelliPay(() => {
|
||||
SetIntellipayCallbackFunctions();
|
||||
|
||||
window.intellipay.isAutoOpen = true;
|
||||
window.intellipay.initialize();
|
||||
});
|
||||
}
|
||||
} catch {
|
||||
notification.error({
|
||||
title: t("job_payments.notifications.error.openingip")
|
||||
notification.open({
|
||||
type: "error",
|
||||
message: t("job_payments.notifications.error.openingip")
|
||||
});
|
||||
setLoadingSafe(false);
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleIntelliPayChargeShortLink = async () => {
|
||||
setLoading(true);
|
||||
// Validate
|
||||
//Validate
|
||||
try {
|
||||
await form.validateFields();
|
||||
} catch {
|
||||
setLoadingSafe(false);
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -267,12 +187,13 @@ const CardPaymentModalComponent = ({
|
||||
await navigator.clipboard.writeText(response.data.shorUrl);
|
||||
message.success(t("general.actions.copied"));
|
||||
}
|
||||
setLoadingSafe(false);
|
||||
setLoading(false);
|
||||
} catch {
|
||||
notification.error({
|
||||
title: t("job_payments.notifications.error.openingip")
|
||||
notification.open({
|
||||
type: "error",
|
||||
message: t("job_payments.notifications.error.openingip")
|
||||
});
|
||||
setLoadingSafe(false);
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -327,20 +248,40 @@ const CardPaymentModalComponent = ({
|
||||
)}
|
||||
</Form.List>
|
||||
|
||||
{/* Hidden IntelliPay fields driven by watched payments + query result. IMPORTANT: no refetch() here (avoid side effects during render). */}
|
||||
<Input
|
||||
className="ipayfield"
|
||||
data-ipayname="account"
|
||||
type="hidden"
|
||||
value={data?.jobs?.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null}
|
||||
/>
|
||||
<Input
|
||||
className="ipayfield"
|
||||
data-ipayname="email"
|
||||
type="hidden"
|
||||
value={data?.jobs?.length > 0 ? (data.jobs.find((j) => j.ownr_ea)?.ownr_ea ?? null) : null}
|
||||
/>
|
||||
|
||||
<Form.Item
|
||||
shouldUpdate={(prevValues, curValues) =>
|
||||
prevValues.payments?.map((p) => p?.jobid + p?.amount).join() !==
|
||||
curValues.payments?.map((p) => p?.jobid + p?.amount).join()
|
||||
}
|
||||
>
|
||||
{() => {
|
||||
//If all of the job ids have been fileld in, then query and update the IP field.
|
||||
const { payments } = form.getFieldsValue();
|
||||
if (payments?.length > 0 && payments?.filter((p) => p?.jobid).length === payments?.length) {
|
||||
refetch({ jobids: payments.map((p) => p.jobid) });
|
||||
}
|
||||
return (
|
||||
<>
|
||||
<Input
|
||||
className="ipayfield"
|
||||
data-ipayname="account"
|
||||
type="hidden"
|
||||
value={
|
||||
payments && data && data.jobs.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null
|
||||
}
|
||||
/>
|
||||
<Input
|
||||
className="ipayfield"
|
||||
data-ipayname="email"
|
||||
type="hidden"
|
||||
value={
|
||||
payments && data && data.jobs.length > 0 ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea : null
|
||||
}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}}
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
shouldUpdate={(prevValues, curValues) =>
|
||||
prevValues.payments?.map((p) => p?.amount).join() !== curValues.payments?.map((p) => p?.amount).join()
|
||||
@@ -375,7 +316,7 @@ const CardPaymentModalComponent = ({
|
||||
>
|
||||
{t("job_payments.buttons.proceedtopayment")}
|
||||
</Button>
|
||||
<Space orientation="vertical" align="center">
|
||||
<Space direction="vertical" align="center">
|
||||
<Button
|
||||
type="primary"
|
||||
// data-ipayname="submit"
|
||||
@@ -392,7 +333,6 @@ const CardPaymentModalComponent = ({
|
||||
}}
|
||||
</Form.Item>
|
||||
</Form>
|
||||
|
||||
{paymentLink && (
|
||||
<Space
|
||||
style={{ cursor: "pointer", float: "right" }}
|
||||
@@ -406,12 +346,6 @@ const CardPaymentModalComponent = ({
|
||||
<CopyFilled />
|
||||
</Space>
|
||||
)}
|
||||
|
||||
{queryError ? (
|
||||
<div style={{ marginTop: 12 }}>
|
||||
<span style={{ color: "red" }}>{queryError.message}</span>
|
||||
</div>
|
||||
) : null}
|
||||
</Spin>
|
||||
</Card>
|
||||
);
|
||||
@@ -419,10 +353,10 @@ const CardPaymentModalComponent = ({
|
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(CardPaymentModalComponent);
|
||||
|
||||
// Poll for window.IntelliPay.fixAmount for 5 seconds. If it doesn't come up, just try anyways to force the possible error.
|
||||
//Poll for window.IntelliPay.fixAmount for 5 seconds. If it doesn't come up, just try anyways to force the possible error.
|
||||
function pollForIntelliPay(callbackFunction) {
|
||||
const timeout = 5000;
|
||||
const interval = 150;
|
||||
const interval = 150; // Poll every 100 milliseconds
|
||||
const startTime = Date.now();
|
||||
|
||||
function checkFixAmount() {
|
||||
@@ -432,7 +366,7 @@ function pollForIntelliPay(callbackFunction) {
|
||||
}
|
||||
|
||||
if (Date.now() - startTime >= timeout) {
|
||||
console.log("Stopped polling IntelliPay after 5 seconds. Attempting to set functions anyways.");
|
||||
console.log("Stopped polling IntelliPay after 10 seconds. Attemping to set functions anyways.");
|
||||
callbackFunction();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { useApolloClient } from "@apollo/client/react";
|
||||
import { useApolloClient } from "@apollo/client";
|
||||
import { getToken } from "@firebase/messaging";
|
||||
import axios from "axios";
|
||||
import { useEffect } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { messaging, requestForToken } from "../../firebase/firebase.utils";
|
||||
import ChatPopupComponent from "../chat-popup/chat-popup.component";
|
||||
import "./chat-affix.styles.scss";
|
||||
@@ -9,19 +10,14 @@ import { registerMessagingHandlers, unregisterMessagingHandlers } from "./regist
|
||||
import { useSocket } from "../../contexts/SocketIO/useSocket.js";
|
||||
|
||||
export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
|
||||
const { t } = useTranslation();
|
||||
const client = useApolloClient();
|
||||
const { socket } = useSocket();
|
||||
|
||||
const messagingServicesId = bodyshop?.messagingservicesid;
|
||||
const bodyshopId = bodyshop?.id;
|
||||
const imexshopid = bodyshop?.imexshopid;
|
||||
|
||||
const messagingEnabled = Boolean(messagingServicesId);
|
||||
|
||||
useEffect(() => {
|
||||
if (!messagingEnabled) return;
|
||||
if (!bodyshop?.messagingservicesid) return;
|
||||
|
||||
(async () => {
|
||||
async function SubscribeToTopicForFCMNotification() {
|
||||
try {
|
||||
await requestForToken();
|
||||
await axios.post("/notifications/subscribe", {
|
||||
@@ -29,42 +25,30 @@ export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
|
||||
vapidKey: import.meta.env.VITE_APP_FIREBASE_PUBLIC_VAPID_KEY
|
||||
}),
|
||||
type: "messaging",
|
||||
imexshopid
|
||||
imexshopid: bodyshop.imexshopid
|
||||
});
|
||||
} catch (error) {
|
||||
console.log("Error attempting to subscribe to messaging topic: ", error);
|
||||
}
|
||||
})();
|
||||
}, [messagingEnabled, imexshopid]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!socket) return;
|
||||
if (!messagingEnabled) return;
|
||||
if (!bodyshopId) return;
|
||||
|
||||
if (!socket.connected) {
|
||||
unregisterMessagingHandlers({ socket });
|
||||
return;
|
||||
}
|
||||
|
||||
// Prevent duplicate listeners if this effect runs more than once.
|
||||
unregisterMessagingHandlers({ socket });
|
||||
SubscribeToTopicForFCMNotification();
|
||||
|
||||
registerMessagingHandlers({
|
||||
socket,
|
||||
client,
|
||||
currentUser,
|
||||
bodyshop
|
||||
});
|
||||
// Register WebSocket handlers
|
||||
if (socket?.connected) {
|
||||
registerMessagingHandlers({ socket, client, currentUser, bodyshop, t });
|
||||
|
||||
return () => unregisterMessagingHandlers({ socket });
|
||||
}, [socket, messagingEnabled, bodyshopId, client, currentUser?.email, bodyshop]);
|
||||
return () => {
|
||||
unregisterMessagingHandlers({ socket });
|
||||
};
|
||||
}
|
||||
}, [bodyshop, socket, t, client]);
|
||||
|
||||
if (!messagingEnabled) return null;
|
||||
if (!bodyshop?.messagingservicesid) return <></>;
|
||||
|
||||
return (
|
||||
<div className={`chat-affix ${chatVisible ? "chat-affix-open" : ""}`}>
|
||||
{messagingEnabled ? <ChatPopupComponent /> : null}
|
||||
{bodyshop?.messagingservicesid ? <ChatPopupComponent /> : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -13,241 +13,68 @@ const logLocal = (message, ...args) => {
|
||||
}
|
||||
};
|
||||
|
||||
const safeIsoNow = () => new Date().toISOString();
|
||||
const isSystemMsid = (msid) => typeof msid === "string" && msid.startsWith("SYS_");
|
||||
|
||||
const normalizeConversationForList = (raw, { isoutbound, isSystem } = {}) => {
|
||||
const c = raw || {};
|
||||
const id = c.id;
|
||||
|
||||
return {
|
||||
__typename: "conversations",
|
||||
id,
|
||||
phone_num: c.phone_num ?? null,
|
||||
updated_at: c.updated_at ?? safeIsoNow(),
|
||||
unreadcnt: typeof c.unreadcnt === "number" ? c.unreadcnt : 0,
|
||||
archived: c.archived ?? false,
|
||||
label: c.label ?? null,
|
||||
|
||||
job_conversations: Array.isArray(c.job_conversations)
|
||||
? c.job_conversations.map((jc) => {
|
||||
const job = jc?.job || {};
|
||||
const jobId = jc?.jobid ?? job?.id ?? null;
|
||||
|
||||
return {
|
||||
__typename: "job_conversations",
|
||||
jobid: jobId,
|
||||
conversationid: jc?.conversationid ?? id ?? null,
|
||||
job: {
|
||||
__typename: "jobs",
|
||||
id: jobId,
|
||||
ro_number: job?.ro_number ?? null,
|
||||
ownr_fn: job?.ownr_fn ?? null,
|
||||
ownr_ln: job?.ownr_ln ?? null,
|
||||
ownr_co_nm: job?.ownr_co_nm ?? null
|
||||
}
|
||||
};
|
||||
})
|
||||
: [],
|
||||
|
||||
messages_aggregate: c.messages_aggregate || {
|
||||
__typename: "messages_aggregate",
|
||||
aggregate: {
|
||||
__typename: "messages_aggregate_fields",
|
||||
count: isoutbound || isSystem ? 0 : 1
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
const CONVERSATION_LIST_ITEM_FRAGMENT = gql`
|
||||
fragment _ConversationListItem on conversations {
|
||||
id
|
||||
phone_num
|
||||
updated_at
|
||||
unreadcnt
|
||||
archived
|
||||
label
|
||||
job_conversations {
|
||||
jobid
|
||||
conversationid
|
||||
job {
|
||||
id
|
||||
ro_number
|
||||
ownr_fn
|
||||
ownr_ln
|
||||
ownr_co_nm
|
||||
}
|
||||
}
|
||||
messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
|
||||
aggregate {
|
||||
count
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const normalizeMessageForCache = (raw, fallbackConversationId) => {
|
||||
const m = raw || {};
|
||||
|
||||
return {
|
||||
__typename: "messages",
|
||||
id: m.id,
|
||||
conversationid: m.conversationid ?? m.conversation?.id ?? fallbackConversationId,
|
||||
|
||||
status: m.status ?? null,
|
||||
text: m.text ?? "",
|
||||
is_system: typeof m.is_system === "boolean" ? m.is_system : false,
|
||||
isoutbound: typeof m.isoutbound === "boolean" ? m.isoutbound : false,
|
||||
image: typeof m.image === "boolean" ? m.image : false,
|
||||
image_path: m.image_path ?? null,
|
||||
userid: m.userid ?? null,
|
||||
created_at: m.created_at ?? safeIsoNow(),
|
||||
read: typeof m.read === "boolean" ? m.read : false
|
||||
};
|
||||
};
|
||||
|
||||
const isConversationDetailsCached = (client, conversationId) => {
|
||||
try {
|
||||
return !!client.cache.readQuery({
|
||||
query: GET_CONVERSATION_DETAILS,
|
||||
variables: { conversationId }
|
||||
})?.conversations_by_pk;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const conversationDetailsCached = (client, conversationId) => {
|
||||
try {
|
||||
const res = client.cache.readQuery({
|
||||
query: GET_CONVERSATION_DETAILS,
|
||||
variables: { conversationId }
|
||||
});
|
||||
return !!res?.conversations_by_pk;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const messageEntityCached = (client, messageId) => {
|
||||
const cacheId = client.cache.identify({ __typename: "messages", id: messageId });
|
||||
if (!cacheId) return false;
|
||||
|
||||
try {
|
||||
client.cache.readFragment({
|
||||
id: cacheId,
|
||||
fragment: gql`
|
||||
fragment _MsgExists on messages {
|
||||
id
|
||||
}
|
||||
`
|
||||
});
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const enrichConversation = (conversation, { isoutbound, isSystem }) => ({
|
||||
// Utility function to enrich conversation data
|
||||
const enrichConversation = (conversation, isOutbound) => ({
|
||||
...conversation,
|
||||
updated_at: conversation.updated_at || safeIsoNow(),
|
||||
unreadcnt: typeof conversation.unreadcnt === "number" ? conversation.unreadcnt : 0,
|
||||
archived: conversation.archived ?? false,
|
||||
label: conversation.label ?? null,
|
||||
updated_at: conversation.updated_at || new Date().toISOString(),
|
||||
unreadcnt: conversation.unreadcnt || 0,
|
||||
archived: conversation.archived || false,
|
||||
label: conversation.label || null,
|
||||
job_conversations: conversation.job_conversations || [],
|
||||
messages_aggregate: conversation.messages_aggregate || {
|
||||
__typename: "messages_aggregate",
|
||||
aggregate: {
|
||||
__typename: "messages_aggregate_fields",
|
||||
count: isoutbound || isSystem ? 0 : 1
|
||||
count: isOutbound ? 0 : 1
|
||||
}
|
||||
},
|
||||
__typename: "conversations"
|
||||
});
|
||||
|
||||
const upsertConversationIntoOffsetZeroList = (client, conversationObj, { isoutbound, isSystem } = {}) => {
|
||||
const normalized = normalizeConversationForList(conversationObj, { isoutbound, isSystem });
|
||||
if (!normalized?.id) return;
|
||||
|
||||
const convCacheId = client.cache.identify(normalized);
|
||||
if (!convCacheId) return;
|
||||
|
||||
client.cache.writeFragment({
|
||||
id: convCacheId,
|
||||
fragment: CONVERSATION_LIST_ITEM_FRAGMENT,
|
||||
data: normalized
|
||||
});
|
||||
|
||||
client.cache.modify({
|
||||
id: "ROOT_QUERY",
|
||||
fields: {
|
||||
conversations(existing = [], { args, readField }) {
|
||||
if (!args || args.offset !== 0) return existing;
|
||||
|
||||
const archivedEq = args?.where?.archived?._eq;
|
||||
if (archivedEq === true) return existing;
|
||||
|
||||
const without = existing.filter((c) => readField("id", c) !== normalized.id);
|
||||
return [{ __ref: convCacheId }, ...without];
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
// Can be uncommonted to test the playback of the notification sound
|
||||
// window.testTone = () => {
|
||||
// const notificationSound = new Audio(newMessageSound);
|
||||
// notificationSound.play().catch((error) => {
|
||||
// console.error("Error playing notification sound:", error);
|
||||
// });
|
||||
// };
|
||||
|
||||
export const registerMessagingHandlers = ({ socket, client, currentUser, bodyshop }) => {
|
||||
if (!(socket && client)) return;
|
||||
|
||||
// Coalesce unread refetches (avoid spamming during bursts)
|
||||
let unreadRefetchInFlight = null;
|
||||
const refetchUnreadCount = () => {
|
||||
if (unreadRefetchInFlight) return;
|
||||
|
||||
unreadRefetchInFlight = client
|
||||
.refetchQueries({
|
||||
include: ["UNREAD_CONVERSATION_COUNT"]
|
||||
})
|
||||
.catch(() => {
|
||||
// best-effort
|
||||
})
|
||||
.finally(() => {
|
||||
unreadRefetchInFlight = null;
|
||||
});
|
||||
};
|
||||
|
||||
const handleNewMessageSummary = async (message) => {
|
||||
const { conversationId, newConversation, existingConversation, isoutbound, msid, updated_at } = message;
|
||||
const isSystem = isSystemMsid(msid);
|
||||
const { conversationId, newConversation, existingConversation, isoutbound } = message;
|
||||
|
||||
const isNewMessageSoundEnabled = (clientInstance) => {
|
||||
// True only when DB value is strictly true; falls back to true on cache miss
|
||||
const isNewMessageSoundEnabled = (client) => {
|
||||
try {
|
||||
const email = currentUser?.email;
|
||||
if (!email) return true;
|
||||
const res = clientInstance.readQuery({
|
||||
if (!email) return true; // default allow if we can't resolve user
|
||||
const res = client.readQuery({
|
||||
query: QUERY_ACTIVE_ASSOCIATION_SOUND,
|
||||
variables: { email }
|
||||
});
|
||||
const flag = res?.associations?.[0]?.new_message_sound;
|
||||
return flag === true;
|
||||
return flag === true; // strictly true => enabled
|
||||
} catch {
|
||||
// If the query hasn't been seeded in cache yet, default ON
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });
|
||||
|
||||
const queryVariables = { offset: 0 };
|
||||
|
||||
if (!isoutbound) {
|
||||
// Play notification sound for new inbound message (scoped to bodyshop)
|
||||
if (isLeaderTab(bodyshop.id) && isNewMessageSoundEnabled(client)) {
|
||||
playNewMessageSound(bodyshop.id);
|
||||
}
|
||||
|
||||
// Real-time badge update for affix (best-effort, coalesced)
|
||||
if (!isSystem) {
|
||||
refetchUnreadCount();
|
||||
}
|
||||
}
|
||||
|
||||
if (!existingConversation && conversationId) {
|
||||
// Attempt to read from the cache to determine if this is actually a new conversation
|
||||
try {
|
||||
const cachedConversation = client.cache.readFragment({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
@@ -259,54 +86,75 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
|
||||
});
|
||||
|
||||
if (cachedConversation) {
|
||||
logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", { conversationId });
|
||||
return handleNewMessageSummary({ ...message, existingConversation: true });
|
||||
logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", {
|
||||
conversationId
|
||||
});
|
||||
return handleNewMessageSummary({
|
||||
...message,
|
||||
existingConversation: true
|
||||
});
|
||||
}
|
||||
} catch {
|
||||
// Cache miss is normal
|
||||
logLocal("handleNewMessageSummary - Cache miss", { conversationId });
|
||||
}
|
||||
}
|
||||
|
||||
// Handle new conversation
|
||||
if (!existingConversation && newConversation?.phone_num) {
|
||||
logLocal("handleNewMessageSummary - New Conversation", newConversation);
|
||||
|
||||
try {
|
||||
upsertConversationIntoOffsetZeroList(client, newConversation, { isoutbound, isSystem });
|
||||
const queryResults = client.cache.readQuery({
|
||||
query: CONVERSATION_LIST_QUERY,
|
||||
variables: queryVariables
|
||||
});
|
||||
|
||||
const existingConversations = queryResults?.conversations || [];
|
||||
const enrichedConversation = enrichConversation(newConversation, isoutbound);
|
||||
|
||||
if (!existingConversations.some((conv) => conv.id === enrichedConversation.id)) {
|
||||
client.cache.modify({
|
||||
id: "ROOT_QUERY",
|
||||
fields: {
|
||||
conversations(existingConversations = []) {
|
||||
return [enrichedConversation, ...existingConversations];
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error updating cache for new conversation:", error);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (existingConversation && conversationId) {
|
||||
// Handle existing conversation
|
||||
if (existingConversation) {
|
||||
try {
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
fields: {
|
||||
updated_at: () => updated_at || safeIsoNow(),
|
||||
updated_at: () => new Date().toISOString(),
|
||||
archived: () => false,
|
||||
|
||||
messages_aggregate(cached = null) {
|
||||
if (isoutbound || isSystem) return cached;
|
||||
|
||||
const currentCount = cached?.aggregate?.count ?? 0;
|
||||
return {
|
||||
__typename: "messages_aggregate",
|
||||
aggregate: {
|
||||
__typename: "messages_aggregate_fields",
|
||||
count: currentCount + 1
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
unreadcnt(cached) {
|
||||
if (isoutbound || isSystem) return cached;
|
||||
const n = typeof cached === "number" ? cached : 0;
|
||||
return n + 1;
|
||||
messages_aggregate(cached = { aggregate: { count: 0 } }) {
|
||||
const currentCount = cached.aggregate?.count || 0;
|
||||
if (!isoutbound) {
|
||||
return {
|
||||
__typename: "messages_aggregate",
|
||||
aggregate: {
|
||||
__typename: "messages_aggregate_fields",
|
||||
count: currentCount + 1
|
||||
}
|
||||
};
|
||||
}
|
||||
return cached;
|
||||
}
|
||||
}
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error updating cache for existing conversation:", error);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -318,78 +166,88 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
|
||||
|
||||
logLocal("handleNewMessageDetailed - Start", message);
|
||||
|
||||
if (!conversationId || !isConversationDetailsCached(client, conversationId)) return;
|
||||
|
||||
try {
|
||||
const normalized = normalizeMessageForCache(newMessage, conversationId);
|
||||
// Check if the conversation exists in the cache
|
||||
const queryResults = client.cache.readQuery({
|
||||
query: GET_CONVERSATION_DETAILS,
|
||||
variables: { conversationId }
|
||||
});
|
||||
|
||||
const messageCacheId = client.cache.identify(normalized);
|
||||
if (!messageCacheId) {
|
||||
console.warn("handleNewMessageDetailed - Could not identify message for cache", {
|
||||
conversationId,
|
||||
newMessageId: newMessage?.id
|
||||
});
|
||||
if (!queryResults?.conversations_by_pk) {
|
||||
console.warn("Conversation not found in cache:", { conversationId });
|
||||
return;
|
||||
}
|
||||
|
||||
client.cache.writeFragment({
|
||||
id: messageCacheId,
|
||||
fragment: gql`
|
||||
fragment _IncomingMessage on messages {
|
||||
id
|
||||
conversationid
|
||||
status
|
||||
text
|
||||
is_system
|
||||
isoutbound
|
||||
image
|
||||
image_path
|
||||
userid
|
||||
created_at
|
||||
read
|
||||
}
|
||||
`,
|
||||
data: normalized
|
||||
});
|
||||
|
||||
// Append the new message to the conversation's message list using cache.modify
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
fields: {
|
||||
messages(existing = [], { readField }) {
|
||||
const already = existing.some((ref) => readField("id", ref) === normalized.id);
|
||||
if (already) return existing;
|
||||
return [...existing, { __ref: messageCacheId }];
|
||||
},
|
||||
updated_at() {
|
||||
return normalized.created_at || safeIsoNow();
|
||||
messages(existingMessages = []) {
|
||||
return [...existingMessages, newMessage];
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
logLocal("handleNewMessageDetailed - Message appended successfully", { conversationId });
|
||||
logLocal("handleNewMessageDetailed - Message appended successfully", {
|
||||
conversationId,
|
||||
newMessage
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error updating conversation messages in cache:", error);
|
||||
}
|
||||
};
|
||||
|
||||
const handleMessageChanged = (message) => {
|
||||
if (!message?.id) return;
|
||||
if (!message) {
|
||||
logLocal("handleMessageChanged - No message provided", message);
|
||||
return;
|
||||
}
|
||||
|
||||
logLocal("handleMessageChanged - Start", message);
|
||||
|
||||
if (!messageEntityCached(client, message.id)) return;
|
||||
|
||||
try {
|
||||
const msgCacheId = client.cache.identify({ __typename: "messages", id: message.id });
|
||||
|
||||
client.cache.modify({
|
||||
id: msgCacheId,
|
||||
id: client.cache.identify({ __typename: "conversations", id: message.conversationid }),
|
||||
fields: {
|
||||
status(existing) {
|
||||
return message.type === "status-changed" ? (message.status ?? existing) : existing;
|
||||
},
|
||||
text(existing) {
|
||||
return message.type === "text-updated" ? (message.text ?? existing) : existing;
|
||||
messages(existingMessages = [], { readField }) {
|
||||
return existingMessages.map((messageRef) => {
|
||||
// Check if this is the message to update
|
||||
if (readField("id", messageRef) === message.id) {
|
||||
const currentStatus = readField("status", messageRef);
|
||||
|
||||
// Handle known types of message changes
|
||||
switch (message.type) {
|
||||
case "status-changed":
|
||||
// Prevent overwriting if the current status is already "delivered"
|
||||
if (currentStatus === "delivered") {
|
||||
logLocal("handleMessageChanged - Status already delivered, skipping update", {
|
||||
messageId: message.id
|
||||
});
|
||||
return messageRef;
|
||||
}
|
||||
|
||||
// Update the status field
|
||||
return {
|
||||
...messageRef,
|
||||
status: message.status
|
||||
};
|
||||
|
||||
case "text-updated":
|
||||
// Handle changes to the message text
|
||||
return {
|
||||
...messageRef,
|
||||
text: message.text
|
||||
};
|
||||
|
||||
default:
|
||||
// Log a warning for unhandled message types
|
||||
logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
|
||||
return messageRef;
|
||||
}
|
||||
}
|
||||
|
||||
return messageRef;
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -404,140 +262,149 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
|
||||
};
|
||||
|
||||
const handleConversationChanged = async (data) => {
|
||||
if (!data?.conversationId) return;
|
||||
|
||||
const {
|
||||
conversationId,
|
||||
type,
|
||||
job_conversations,
|
||||
messageIds,
|
||||
messageIdsMarkedRead,
|
||||
lastUnreadMessageId,
|
||||
unreadCount,
|
||||
...fields
|
||||
} = data;
|
||||
if (!data) {
|
||||
logLocal("handleConversationChanged - No data provided", data);
|
||||
return;
|
||||
}
|
||||
|
||||
const { conversationId, type, job_conversations, messageIds, ...fields } = data;
|
||||
logLocal("handleConversationChanged - Start", data);
|
||||
|
||||
const updatedAt = safeIsoNow();
|
||||
const detailsCached = conversationDetailsCached(client, conversationId);
|
||||
const updatedAt = new Date().toISOString();
|
||||
|
||||
const updateConversationList = (newConversation) => {
|
||||
try {
|
||||
const existingList = client.cache.readQuery({
|
||||
query: CONVERSATION_LIST_QUERY,
|
||||
variables: { offset: 0 }
|
||||
});
|
||||
|
||||
const updatedList = existingList?.conversations
|
||||
? [newConversation, ...existingList.conversations.filter((conv) => conv.id !== newConversation.id)]
|
||||
: [newConversation]; // Prevent duplicates
|
||||
|
||||
client.cache.writeQuery({
|
||||
query: CONVERSATION_LIST_QUERY,
|
||||
variables: { offset: 0 },
|
||||
data: {
|
||||
conversations: updatedList
|
||||
}
|
||||
});
|
||||
|
||||
logLocal("handleConversationChanged - Conversation list updated successfully", newConversation);
|
||||
} catch (error) {
|
||||
console.error("Error updating conversation list in the cache:", error);
|
||||
}
|
||||
};
|
||||
|
||||
// Handle specific types
|
||||
try {
|
||||
switch (type) {
|
||||
case "conversation-marked-read": {
|
||||
refetchUnreadCount();
|
||||
|
||||
if (detailsCached && Array.isArray(messageIds)) {
|
||||
messageIds.forEach((id) => {
|
||||
if (!messageEntityCached(client, id)) return;
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "messages", id }),
|
||||
fields: { read: () => true }
|
||||
});
|
||||
case "conversation-marked-read":
|
||||
if (conversationId && messageIds?.length > 0) {
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
fields: {
|
||||
messages(existingMessages = [], { readField }) {
|
||||
return existingMessages.map((message) => {
|
||||
if (messageIds.includes(readField("id", message))) {
|
||||
return { ...message, read: true };
|
||||
}
|
||||
return message;
|
||||
});
|
||||
},
|
||||
messages_aggregate: () => ({
|
||||
__typename: "messages_aggregate",
|
||||
aggregate: { __typename: "messages_aggregate_fields", count: 0 }
|
||||
})
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
fields: {
|
||||
messages_aggregate: () => ({
|
||||
__typename: "messages_aggregate",
|
||||
aggregate: { __typename: "messages_aggregate_fields", count: 0 }
|
||||
}),
|
||||
unreadcnt: () => 0,
|
||||
updated_at: () => updatedAt
|
||||
}
|
||||
});
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case "conversation-marked-unread": {
|
||||
refetchUnreadCount();
|
||||
|
||||
const safeUnreadCount = typeof unreadCount === "number" ? unreadCount : 1;
|
||||
const idsMarkedRead = Array.isArray(messageIdsMarkedRead) ? messageIdsMarkedRead : [];
|
||||
|
||||
if (detailsCached) {
|
||||
idsMarkedRead.forEach((id) => {
|
||||
if (!messageEntityCached(client, id)) return;
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "messages", id }),
|
||||
fields: { read: () => true }
|
||||
});
|
||||
});
|
||||
|
||||
if (lastUnreadMessageId && messageEntityCached(client, lastUnreadMessageId)) {
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "messages", id: lastUnreadMessageId }),
|
||||
fields: { read: () => false }
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
fields: {
|
||||
updated_at: () => updatedAt,
|
||||
messages_aggregate: () => ({
|
||||
__typename: "messages_aggregate",
|
||||
aggregate: {
|
||||
__typename: "messages_aggregate_fields",
|
||||
count: safeUnreadCount
|
||||
}
|
||||
}),
|
||||
unreadcnt: () => safeUnreadCount
|
||||
}
|
||||
});
|
||||
|
||||
case "conversation-created":
|
||||
updateConversationList({ ...fields, job_conversations, updated_at: updatedAt });
|
||||
break;
|
||||
}
|
||||
|
||||
case "conversation-created": {
|
||||
// New conversation likely implies new unread inbound message(s)
|
||||
refetchUnreadCount();
|
||||
|
||||
const conv = enrichConversation(
|
||||
{ id: conversationId, job_conversations, ...fields, updated_at: updatedAt },
|
||||
{ isoutbound: false, isSystem: false }
|
||||
);
|
||||
upsertConversationIntoOffsetZeroList(client, conv);
|
||||
break;
|
||||
}
|
||||
|
||||
case "conversation-unarchived":
|
||||
case "conversation-archived": {
|
||||
// Keep unread badge correct even if archiving affects counts
|
||||
refetchUnreadCount();
|
||||
case "conversation-archived":
|
||||
try {
|
||||
const listQueryVariables = { offset: 0 };
|
||||
const detailsQueryVariables = { conversationId };
|
||||
|
||||
await client.refetchQueries({
|
||||
include: [CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS]
|
||||
});
|
||||
// Check if conversation details exist in the cache
|
||||
const detailsExist = !!client.cache.readQuery({
|
||||
query: GET_CONVERSATION_DETAILS,
|
||||
variables: detailsQueryVariables
|
||||
});
|
||||
|
||||
// Refetch conversation list
|
||||
await client.refetchQueries({
|
||||
include: [CONVERSATION_LIST_QUERY, ...(detailsExist ? [GET_CONVERSATION_DETAILS] : [])],
|
||||
variables: [
|
||||
{ query: CONVERSATION_LIST_QUERY, variables: listQueryVariables },
|
||||
...(detailsExist
|
||||
? [
|
||||
{
|
||||
query: GET_CONVERSATION_DETAILS,
|
||||
variables: detailsQueryVariables
|
||||
}
|
||||
]
|
||||
: [])
|
||||
]
|
||||
});
|
||||
|
||||
logLocal("handleConversationChanged - Refetched queries after state change", {
|
||||
conversationId,
|
||||
type
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error refetching queries after conversation state change:", error);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case "tag-added": {
|
||||
const formattedJobConversations = (job_conversations || []).map((jc) => ({
|
||||
// Ensure `job_conversations` is properly formatted
|
||||
const formattedJobConversations = job_conversations.map((jc) => ({
|
||||
__typename: "job_conversations",
|
||||
jobid: jc.jobid || jc.job?.id,
|
||||
conversationid: conversationId,
|
||||
job: {
|
||||
job: jc.job || {
|
||||
__typename: "jobs",
|
||||
id: jc.job?.id,
|
||||
ro_number: jc.job?.ro_number,
|
||||
ownr_co_nm: jc.job?.ownr_co_nm,
|
||||
ownr_fn: jc.job?.ownr_fn,
|
||||
ownr_ln: jc.job?.ownr_ln
|
||||
id: data.selectedJob.id,
|
||||
ro_number: data.selectedJob.ro_number,
|
||||
ownr_co_nm: data.selectedJob.ownr_co_nm,
|
||||
ownr_fn: data.selectedJob.ownr_fn,
|
||||
ownr_ln: data.selectedJob.ownr_ln
|
||||
}
|
||||
}));
|
||||
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
fields: {
|
||||
job_conversations(existing = [], { readField }) {
|
||||
const seen = new Set(existing.map((x) => readField("jobid", x)).filter(Boolean));
|
||||
const incoming = formattedJobConversations.filter((x) => x.jobid && !seen.has(x.jobid));
|
||||
return [...existing, ...incoming];
|
||||
job_conversations: (existing = []) => {
|
||||
// Ensure no duplicates based on both `conversationid` and `jobid`
|
||||
const existingLinks = new Set(
|
||||
existing.map((jc) => {
|
||||
const jobId = client.cache.readFragment({
|
||||
id: client.cache.identify(jc),
|
||||
fragment: gql`
|
||||
fragment JobConversationLinkAdded on job_conversations {
|
||||
jobid
|
||||
conversationid
|
||||
}
|
||||
`
|
||||
})?.jobid;
|
||||
return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
|
||||
})
|
||||
);
|
||||
|
||||
const newItems = formattedJobConversations.filter((jc) => {
|
||||
const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
|
||||
return !existingLinks.has(uniqueLink);
|
||||
});
|
||||
|
||||
return [...existing, ...newItems];
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -545,31 +412,46 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
|
||||
break;
|
||||
}
|
||||
|
||||
case "tag-removed": {
|
||||
const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
|
||||
case "tag-removed":
|
||||
try {
|
||||
const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
|
||||
|
||||
// Evict the specific cache entry for job_conversations
|
||||
client.cache.evict({
|
||||
id: conversationCacheId,
|
||||
fieldName: "job_conversations"
|
||||
});
|
||||
|
||||
// Garbage collect evicted entries
|
||||
client.cache.gc();
|
||||
|
||||
logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
|
||||
conversationId,
|
||||
type
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
|
||||
}
|
||||
|
||||
client.cache.evict({
|
||||
id: conversationCacheId,
|
||||
fieldName: "job_conversations"
|
||||
});
|
||||
client.cache.gc();
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
default:
|
||||
logLocal("handleConversationChanged - Unhandled type", { type });
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
fields: Object.fromEntries(
|
||||
Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
|
||||
)
|
||||
fields: {
|
||||
...Object.fromEntries(
|
||||
Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
|
||||
)
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error handling conversation changes:", { type, error });
|
||||
}
|
||||
};
|
||||
|
||||
// Existing handler for phone number opt-out
|
||||
const handlePhoneNumberOptedOut = async (data) => {
|
||||
const { bodyshopid, phone_number } = data;
|
||||
logLocal("handlePhoneNumberOptedOut - Start", data);
|
||||
@@ -579,18 +461,22 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
|
||||
id: "ROOT_QUERY",
|
||||
fields: {
|
||||
phone_number_opt_out(existing = [], { readField }) {
|
||||
const exists = existing.some(
|
||||
const phoneNumberExists = existing.some(
|
||||
(ref) => readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid
|
||||
);
|
||||
if (exists) return existing;
|
||||
|
||||
if (phoneNumberExists) {
|
||||
logLocal("handlePhoneNumberOptedOut - Phone number already in cache", { phone_number, bodyshopid });
|
||||
return existing;
|
||||
}
|
||||
|
||||
const newOptOut = {
|
||||
__typename: "phone_number_opt_out",
|
||||
id: `temporary-${phone_number}-${Date.now()}`,
|
||||
bodyshopid,
|
||||
phone_number,
|
||||
created_at: safeIsoNow(),
|
||||
updated_at: safeIsoNow()
|
||||
created_at: new Date().toISOString(),
|
||||
updated_at: new Date().toISOString()
|
||||
};
|
||||
|
||||
return [...existing, newOptOut];
|
||||
@@ -605,36 +491,46 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
|
||||
args: { bodyshopid, search: phone_number }
|
||||
});
|
||||
client.cache.gc();
|
||||
|
||||
logLocal("handlePhoneNumberOptedOut - Cache updated successfully", data);
|
||||
} catch (error) {
|
||||
console.error("Error updating cache for phone number opt-out:", error);
|
||||
logLocal("handlePhoneNumberOptedOut - Error", { error: error.message });
|
||||
}
|
||||
};
|
||||
|
||||
// New handler for phone number opt-in
|
||||
const handlePhoneNumberOptedIn = async (data) => {
|
||||
const { bodyshopid, phone_number } = data;
|
||||
logLocal("handlePhoneNumberOptedIn - Start", data);
|
||||
|
||||
try {
|
||||
// Update the Apollo cache for GET_PHONE_NUMBER_OPT_OUTS by removing the phone number
|
||||
client.cache.modify({
|
||||
id: "ROOT_QUERY",
|
||||
fields: {
|
||||
phone_number_opt_out(existing = [], { readField }) {
|
||||
// Filter out the phone number from the opt-out list
|
||||
return existing.filter(
|
||||
(ref) => !(readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid)
|
||||
);
|
||||
}
|
||||
},
|
||||
broadcast: true
|
||||
broadcast: true // Trigger UI updates
|
||||
});
|
||||
|
||||
// Evict the cache entry to force a refetch on next query
|
||||
client.cache.evict({
|
||||
id: "ROOT_QUERY",
|
||||
fieldName: "phone_number_opt_out",
|
||||
args: { bodyshopid, search: phone_number }
|
||||
});
|
||||
client.cache.gc();
|
||||
|
||||
logLocal("handlePhoneNumberOptedIn - Cache updated successfully", data);
|
||||
} catch (error) {
|
||||
console.error("Error updating cache for phone number opt-in:", error);
|
||||
logLocal("handlePhoneNumberOptedIn - Error", { error: error.message });
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { Button } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
@@ -11,8 +11,8 @@ import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-displ
|
||||
import _ from "lodash";
|
||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
||||
import "./chat-conversation-list.styles.scss";
|
||||
import { useQuery } from "@apollo/client/react";
|
||||
import { GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS } from "../../graphql/phone-number-opt-out.queries.js";
|
||||
import { useQuery } from "@apollo/client";
|
||||
import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries.js";
|
||||
import { phone } from "phone";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
@@ -29,26 +29,13 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
|
||||
const { t } = useTranslation();
|
||||
const [, forceUpdate] = useState(false);
|
||||
|
||||
const phoneNumbers = useMemo(() => {
|
||||
return (conversationList || [])
|
||||
.map((item) => {
|
||||
try {
|
||||
const p = phone(item.phone_num, "CA")?.phoneNumber;
|
||||
return p ? p.replace(/^\+1/, "") : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
})
|
||||
.filter(Boolean);
|
||||
}, [conversationList]);
|
||||
|
||||
const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS, {
|
||||
const phoneNumbers = conversationList.map((item) => phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, ""));
|
||||
const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
|
||||
variables: {
|
||||
bodyshopid: bodyshop?.id,
|
||||
bodyshopid: bodyshop.id,
|
||||
phone_numbers: phoneNumbers
|
||||
},
|
||||
skip: !bodyshop?.id || phoneNumbers.length === 0,
|
||||
skip: !conversationList.length,
|
||||
fetchPolicy: "cache-and-network"
|
||||
});
|
||||
|
||||
@@ -71,31 +58,21 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
|
||||
return _.orderBy(conversationList, ["updated_at"], ["desc"]);
|
||||
}, [conversationList]);
|
||||
|
||||
const renderConversation = (index) => {
|
||||
const renderConversation = (index, t) => {
|
||||
const item = sortedConversationList[index];
|
||||
|
||||
const normalizedPhone = (() => {
|
||||
try {
|
||||
return phone(item.phone_num, "CA")?.phoneNumber?.replace(/^\+1/, "") || "";
|
||||
} catch {
|
||||
return "";
|
||||
}
|
||||
})();
|
||||
|
||||
const hasOptOutEntry = normalizedPhone ? optOutMap.has(normalizedPhone) : false;
|
||||
|
||||
const normalizedPhone = phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
|
||||
const hasOptOutEntry = optOutMap.has(normalizedPhone);
|
||||
const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
|
||||
const cardContentLeft =
|
||||
item.job_conversations.length > 0
|
||||
? item.job_conversations.map((j, idx) => <Tag key={idx}>{j.job.ro_number}</Tag>)
|
||||
: null;
|
||||
|
||||
const names = <>{_.uniq(item.job_conversations.map((j) => OwnerNameDisplayFunction(j.job)))}</>;
|
||||
const cardTitle = (
|
||||
<>
|
||||
{item.label && <Tag color="blue">{item.label}</Tag>}
|
||||
{item.job_conversations.length > 0 ? (
|
||||
<Space orientation="vertical">{names}</Space>
|
||||
<Space direction="vertical">{names}</Space>
|
||||
) : (
|
||||
<Space>
|
||||
<PhoneFormatter>{item.phone_num}</PhoneFormatter>
|
||||
@@ -103,10 +80,9 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
|
||||
)}
|
||||
</>
|
||||
);
|
||||
|
||||
const cardExtra = (
|
||||
<>
|
||||
<Badge count={item.messages_aggregate?.aggregate?.count || 0} />
|
||||
<Badge count={item.messages_aggregate.aggregate.count} />
|
||||
{hasOptOutEntry && (
|
||||
<Tooltip title={t("consent.text_body")}>
|
||||
<Tag color="red" icon={<ExclamationCircleOutlined />}>
|
||||
@@ -116,7 +92,6 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
|
||||
)}
|
||||
</>
|
||||
);
|
||||
|
||||
const getCardStyle = () =>
|
||||
item.id === selectedConversation
|
||||
? { backgroundColor: "var(--card-selected-bg)" }
|
||||
@@ -128,9 +103,25 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
|
||||
onClick={() => setSelectedConversation(item.id)}
|
||||
className={`chat-list-item ${item.id === selectedConversation ? "chat-list-selected-conversation" : ""}`}
|
||||
>
|
||||
<Card style={getCardStyle()} variant="outlined" size="small" extra={cardExtra} title={cardTitle}>
|
||||
<div style={{ display: "inline-block", width: "70%", textAlign: "left" }}>{cardContentLeft}</div>
|
||||
<div style={{ display: "inline-block", width: "30%", textAlign: "right" }}>{cardContentRight}</div>
|
||||
<Card style={getCardStyle()} variant={true} size="small" extra={cardExtra} title={cardTitle}>
|
||||
<div
|
||||
style={{
|
||||
display: "inline-block",
|
||||
width: "70%",
|
||||
textAlign: "left"
|
||||
}}
|
||||
>
|
||||
{cardContentLeft}
|
||||
</div>
|
||||
<div
|
||||
style={{
|
||||
display: "inline-block",
|
||||
width: "30%",
|
||||
textAlign: "right"
|
||||
}}
|
||||
>
|
||||
{cardContentRight}
|
||||
</div>
|
||||
</Card>
|
||||
</List.Item>
|
||||
);
|
||||
@@ -140,7 +131,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
|
||||
<div className="chat-list-container">
|
||||
<Virtuoso
|
||||
data={sortedConversationList}
|
||||
itemContent={(index) => renderConversation(index)}
|
||||
itemContent={(index) => renderConversation(index, t)}
|
||||
style={{ height: "100%", width: "100%" }}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { Tag } from "antd";
|
||||
import { Link } from "react-router-dom";
|
||||
import { logImEXEvent } from "../../firebase/firebase.utils";
|
||||
|
||||
@@ -5,24 +5,24 @@ import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conv
|
||||
import ChatLabelComponent from "../chat-label/chat-label.component";
|
||||
import ChatPrintButton from "../chat-print-button/chat-print-button.component";
|
||||
import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
|
||||
import ChatMarkUnreadButton from "../chat-mark-unread-button/chat-mark-unread-button.component";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { connect } from "react-redux";
|
||||
|
||||
export function ChatConversationTitle({ conversation, onMarkUnread, markUnreadDisabled, markUnreadLoading }) {
|
||||
const mapStateToProps = createStructuredSelector({});
|
||||
|
||||
const mapDispatchToProps = () => ({});
|
||||
|
||||
export function ChatConversationTitle({ conversation }) {
|
||||
return (
|
||||
<Space className="chat-title" wrap>
|
||||
<PhoneNumberFormatter>{conversation?.phone_num}</PhoneNumberFormatter>
|
||||
|
||||
<ChatLabelComponent conversation={conversation} />
|
||||
<ChatPrintButton conversation={conversation} />
|
||||
|
||||
<ChatConversationTitleTags jobConversations={conversation?.job_conversations || []} />
|
||||
<ChatTagRoContainer conversation={conversation || []} />
|
||||
|
||||
<ChatMarkUnreadButton disabled={markUnreadDisabled} loading={markUnreadLoading} onMarkUnread={onMarkUnread} />
|
||||
|
||||
<ChatArchiveButton conversation={conversation} />
|
||||
</Space>
|
||||
);
|
||||
}
|
||||
|
||||
export default ChatConversationTitle;
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationTitle);
|
||||
|
||||
@@ -19,15 +19,13 @@ export function ChatConversationComponent({
|
||||
conversation,
|
||||
messages,
|
||||
handleMarkConversationAsRead,
|
||||
handleMarkLastMessageAsUnread,
|
||||
markingAsUnreadInProgress,
|
||||
canMarkUnread
|
||||
bodyshop
|
||||
}) {
|
||||
const [loading, error] = subState;
|
||||
|
||||
if (conversation?.archived) return null;
|
||||
if (loading) return <LoadingSkeleton />;
|
||||
if (error) return <AlertComponent title={error.message} type="error" />;
|
||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -35,12 +33,7 @@ export function ChatConversationComponent({
|
||||
onMouseDown={handleMarkConversationAsRead}
|
||||
onKeyDown={handleMarkConversationAsRead}
|
||||
>
|
||||
<ChatConversationTitle
|
||||
conversation={conversation}
|
||||
onMarkUnread={handleMarkLastMessageAsUnread}
|
||||
markUnreadDisabled={!canMarkUnread}
|
||||
markUnreadLoading={markingAsUnreadInProgress}
|
||||
/>
|
||||
<ChatConversationTitle conversation={conversation} bodyshop={bodyshop} />
|
||||
<ChatMessageListComponent messages={messages} />
|
||||
<ChatSendMessage conversation={conversation} />
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { useApolloClient, useQuery, useSubscription } from "@apollo/client/react";
|
||||
import { gql } from "@apollo/client";
|
||||
import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
|
||||
import axios from "axios";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
|
||||
@@ -19,8 +18,8 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
const client = useApolloClient();
|
||||
const { socket } = useSocket();
|
||||
const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
|
||||
const [markingAsUnreadInProgress, setMarkingAsUnreadInProgress] = useState(false);
|
||||
|
||||
// Fetch conversation details
|
||||
const {
|
||||
loading: convoLoading,
|
||||
error: convoError,
|
||||
@@ -28,23 +27,24 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
} = useQuery(GET_CONVERSATION_DETAILS, {
|
||||
variables: { conversationId: selectedConversation },
|
||||
fetchPolicy: "network-only",
|
||||
nextFetchPolicy: "network-only",
|
||||
skip: !selectedConversation
|
||||
nextFetchPolicy: "network-only"
|
||||
});
|
||||
|
||||
const conversation = convoData?.conversations_by_pk;
|
||||
|
||||
// Subscription for conversation updates (used when socket is NOT connected)
|
||||
// Subscription for conversation updates
|
||||
useSubscription(CONVERSATION_SUBSCRIPTION_BY_PK, {
|
||||
skip: socket?.connected || !selectedConversation,
|
||||
skip: socket?.connected,
|
||||
variables: { conversationId: selectedConversation },
|
||||
onData: ({ data: subscriptionResult, client }) => {
|
||||
// Extract the messages array from the result
|
||||
const messages = subscriptionResult?.data?.messages;
|
||||
if (!messages || messages.length === 0) return;
|
||||
if (!messages || messages.length === 0) {
|
||||
console.warn("No messages found in subscription result.");
|
||||
return;
|
||||
}
|
||||
|
||||
messages.forEach((message) => {
|
||||
const messageRef = client.cache.identify(message);
|
||||
|
||||
// Write the new message to the cache
|
||||
client.cache.writeFragment({
|
||||
id: messageRef,
|
||||
fragment: gql`
|
||||
@@ -64,6 +64,7 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
data: message
|
||||
});
|
||||
|
||||
// Update the conversation cache to include the new message
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: selectedConversation }),
|
||||
fields: {
|
||||
@@ -81,28 +82,6 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Best-effort badge update:
|
||||
* This assumes your list query uses messages_aggregate.aggregate.count as UNREAD inbound count.
|
||||
* If it’s total messages, rename/create a dedicated unread aggregate in the list query and update that field instead.
|
||||
*/
|
||||
const setConversationUnreadCountBestEffort = useCallback(
|
||||
(conversationId, unreadCount) => {
|
||||
if (!conversationId) return;
|
||||
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "conversations", id: conversationId }),
|
||||
fields: {
|
||||
messages_aggregate(existing) {
|
||||
if (!existing?.aggregate) return existing;
|
||||
return { ...existing, aggregate: { ...existing.aggregate, count: unreadCount } };
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
[client.cache]
|
||||
);
|
||||
|
||||
const updateCacheWithReadMessages = useCallback(
|
||||
(conversationId, messageIds) => {
|
||||
if (!conversationId || !messageIds?.length) return;
|
||||
@@ -110,34 +89,13 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
messageIds.forEach((messageId) => {
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "messages", id: messageId }),
|
||||
fields: { read: () => true }
|
||||
fields: {
|
||||
read: () => true
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
setConversationUnreadCountBestEffort(conversationId, 0);
|
||||
},
|
||||
[client.cache, setConversationUnreadCountBestEffort]
|
||||
);
|
||||
|
||||
const applyUnreadStateWithMaxOneUnread = useCallback(
|
||||
({ conversationId, lastUnreadMessageId, messageIdsMarkedRead = [], unreadCount = 1 }) => {
|
||||
if (!conversationId || !lastUnreadMessageId) return;
|
||||
|
||||
messageIdsMarkedRead.forEach((id) => {
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "messages", id }),
|
||||
fields: { read: () => true }
|
||||
});
|
||||
});
|
||||
|
||||
client.cache.modify({
|
||||
id: client.cache.identify({ __typename: "messages", id: lastUnreadMessageId }),
|
||||
fields: { read: () => false }
|
||||
});
|
||||
|
||||
setConversationUnreadCountBestEffort(conversationId, unreadCount);
|
||||
},
|
||||
[client.cache, setConversationUnreadCountBestEffort]
|
||||
[client.cache]
|
||||
);
|
||||
|
||||
// WebSocket event handlers
|
||||
@@ -145,25 +103,20 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
if (!socket?.connected) return;
|
||||
|
||||
const handleConversationChange = (data) => {
|
||||
if (data?.type === "conversation-marked-read") {
|
||||
updateCacheWithReadMessages(data.conversationId, data.messageIds);
|
||||
}
|
||||
|
||||
if (data?.type === "conversation-marked-unread") {
|
||||
applyUnreadStateWithMaxOneUnread({
|
||||
conversationId: data.conversationId,
|
||||
lastUnreadMessageId: data.lastUnreadMessageId,
|
||||
messageIdsMarkedRead: data.messageIdsMarkedRead,
|
||||
unreadCount: data.unreadCount
|
||||
});
|
||||
if (data.type === "conversation-marked-read") {
|
||||
const { conversationId, messageIds } = data;
|
||||
updateCacheWithReadMessages(conversationId, messageIds);
|
||||
}
|
||||
};
|
||||
|
||||
socket.on("conversation-changed", handleConversationChange);
|
||||
return () => socket.off("conversation-changed", handleConversationChange);
|
||||
}, [socket, updateCacheWithReadMessages, applyUnreadStateWithMaxOneUnread]);
|
||||
|
||||
// Join/leave conversation via WebSocket
|
||||
return () => {
|
||||
socket.off("conversation-changed", handleConversationChange);
|
||||
};
|
||||
}, [socket, updateCacheWithReadMessages]);
|
||||
|
||||
// Join and leave conversation via WebSocket
|
||||
useEffect(() => {
|
||||
if (!socket?.connected || !selectedConversation || !bodyshop?.id) return;
|
||||
|
||||
@@ -180,21 +133,15 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
};
|
||||
}, [socket, bodyshop, selectedConversation]);
|
||||
|
||||
const inboundNonSystemMessages = useMemo(() => {
|
||||
const msgs = conversation?.messages || [];
|
||||
return msgs
|
||||
.filter((m) => m && !m.isoutbound && !m.is_system)
|
||||
.slice()
|
||||
.sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
|
||||
}, [conversation?.messages]);
|
||||
|
||||
const canMarkUnread = inboundNonSystemMessages.length > 0;
|
||||
|
||||
// Mark conversation as read
|
||||
const handleMarkConversationAsRead = async () => {
|
||||
if (!conversation || markingAsReadInProgress) return;
|
||||
if (!convoData || markingAsReadInProgress) return;
|
||||
|
||||
const conversation = convoData.conversations_by_pk;
|
||||
if (!conversation) return;
|
||||
|
||||
const unreadMessageIds = conversation.messages
|
||||
?.filter((message) => !message.read && !message.isoutbound && !message.is_system)
|
||||
?.filter((message) => !message.read && !message.isoutbound)
|
||||
.map((message) => message.id);
|
||||
|
||||
if (unreadMessageIds?.length > 0) {
|
||||
@@ -215,48 +162,12 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
}
|
||||
};
|
||||
|
||||
const handleMarkLastMessageAsUnread = async () => {
|
||||
if (!conversation || markingAsUnreadInProgress) return;
|
||||
if (!bodyshop?.id || !bodyshop?.imexshopid) return;
|
||||
|
||||
const lastInbound = inboundNonSystemMessages[inboundNonSystemMessages.length - 1];
|
||||
if (!lastInbound?.id) return;
|
||||
|
||||
setMarkingAsUnreadInProgress(true);
|
||||
try {
|
||||
const res = await axios.post("/sms/markLastMessageUnread", {
|
||||
conversationId: conversation.id,
|
||||
imexshopid: bodyshop.imexshopid,
|
||||
bodyshopid: bodyshop.id
|
||||
});
|
||||
|
||||
const payload = res?.data || {};
|
||||
if (payload.lastUnreadMessageId) {
|
||||
applyUnreadStateWithMaxOneUnread({
|
||||
conversationId: conversation.id,
|
||||
lastUnreadMessageId: payload.lastUnreadMessageId,
|
||||
messageIdsMarkedRead: payload.messageIdsMarkedRead || [],
|
||||
unreadCount: typeof payload.unreadCount === "number" ? payload.unreadCount : 1
|
||||
});
|
||||
} else {
|
||||
setConversationUnreadCountBestEffort(conversation.id, 0);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error marking last message unread:", error.message);
|
||||
} finally {
|
||||
setMarkingAsUnreadInProgress(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<ChatConversationComponent
|
||||
subState={[convoLoading, convoError]}
|
||||
conversation={conversation || {}}
|
||||
messages={conversation?.messages || []}
|
||||
conversation={convoData?.conversations_by_pk || {}}
|
||||
messages={convoData?.conversations_by_pk?.messages || []}
|
||||
handleMarkConversationAsRead={handleMarkConversationAsRead}
|
||||
handleMarkLastMessageAsUnread={handleMarkLastMessageAsUnread}
|
||||
markingAsUnreadInProgress={markingAsUnreadInProgress}
|
||||
canMarkUnread={canMarkUnread}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { PlusOutlined } from "@ant-design/icons";
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { Input, Spin, Tag, Tooltip } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -33,8 +33,8 @@ export function ChatLabel({ conversation, bodyshop }) {
|
||||
variables: { id: conversation.id, label: value }
|
||||
});
|
||||
if (response.errors) {
|
||||
notification.error({
|
||||
title: t("messages.errors.updatinglabel", {
|
||||
notification["error"]({
|
||||
message: t("messages.errors.updatinglabel", {
|
||||
error: JSON.stringify(response.errors)
|
||||
})
|
||||
});
|
||||
@@ -50,8 +50,8 @@ export function ChatLabel({ conversation, bodyshop }) {
|
||||
setEditing(false);
|
||||
}
|
||||
} catch (error) {
|
||||
notification.error({
|
||||
title: t("messages.errors.updatinglabel", {
|
||||
notification["error"]({
|
||||
message: t("messages.errors.updatinglabel", {
|
||||
error: JSON.stringify(error)
|
||||
})
|
||||
});
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
import { Button, Tooltip } from "antd";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
export default function ChatMarkUnreadButton({ disabled, loading, onMarkUnread }) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<Tooltip title={t("messaging.labels.mark_unread")}>
|
||||
<Button
|
||||
size="small"
|
||||
className="unread-button"
|
||||
type="primary"
|
||||
children={t("messaging.labels.mark_unread")}
|
||||
loading={loading}
|
||||
disabled={disabled}
|
||||
onMouseDown={(e) => e.stopPropagation()} // prevent parent mark-read handler
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onMarkUnread?.();
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { PictureFilled } from "@ant-design/icons";
|
||||
import { useQuery } from "@apollo/client/react";
|
||||
import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
|
||||
import { useQuery } from "@apollo/client";
|
||||
import { useSplitTreatments } from "@splitsoftware/splitio-react";
|
||||
import { Badge, Popover } from "antd";
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -28,7 +28,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
|
||||
const [open, setOpen] = useState(false);
|
||||
const {
|
||||
treatments: { Imgproxy }
|
||||
} = useTreatmentsWithConfig({
|
||||
} = useSplitTreatments({
|
||||
attributes: {},
|
||||
names: ["Imgproxy"],
|
||||
splitKey: bodyshop && bodyshop.imexshopid
|
||||
@@ -40,11 +40,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
|
||||
variables: {
|
||||
jobId: conversation.job_conversations[0]?.jobid
|
||||
},
|
||||
skip:
|
||||
!open ||
|
||||
!conversation.job_conversations ||
|
||||
conversation.job_conversations.length === 0 ||
|
||||
bodyshop.uselocalmediaserver
|
||||
skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
|
||||
});
|
||||
|
||||
const handleVisibleChange = (change) => {
|
||||
@@ -52,8 +48,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
// Instead of wiping the array (which holds media objects), just clear selection flags
|
||||
setSelectedMedia((prev) => prev.map((m) => ({ ...m, isSelected: false })));
|
||||
setSelectedMedia([]);
|
||||
}, [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.
|
||||
@@ -63,7 +58,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
|
||||
const content = (
|
||||
<div className="media-selector-content">
|
||||
{loading && <LoadingSpinner />}
|
||||
{error && <AlertComponent title={error.message} type="error" />}
|
||||
{error && <AlertComponent message={error.message} type="error" />}
|
||||
{selectedMedia.filter((s) => s.isSelected).length >= 10 ? (
|
||||
<div className="error-message">{t("messaging.labels.maxtenimages")}</div>
|
||||
) : null}
|
||||
@@ -80,7 +75,6 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
|
||||
<JobDocumentsLocalGalleryExternal
|
||||
externalMediaState={[selectedMedia, setSelectedMedia]}
|
||||
jobId={conversation.job_conversations[0]?.jobid}
|
||||
context="chat"
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
@@ -96,7 +90,6 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
|
||||
<JobDocumentsLocalGalleryExternal
|
||||
externalMediaState={[selectedMedia, setSelectedMedia]}
|
||||
jobId={conversation.job_conversations[0]?.jobid}
|
||||
context="chat"
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
@@ -117,7 +110,6 @@ 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}>
|
||||
|
||||
@@ -10,11 +10,6 @@
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.unread-button {
|
||||
height: 20px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.chat-title {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
@@ -1,83 +1,49 @@
|
||||
import { Button } from "antd";
|
||||
import parsePhoneNumber from "libphonenumber-js";
|
||||
import { useCallback, useMemo } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { openChatByPhone } from "../../redux/messaging/messaging.actions";
|
||||
import PhoneNumberFormatter from "../../utils/PhoneFormatter";
|
||||
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
|
||||
import { useSocket } from "../../contexts/SocketIO/useSocket.js";
|
||||
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
|
||||
import PhoneNumberFormatter from "../../utils/PhoneFormatter";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop,
|
||||
searchingForConversation
|
||||
searchingForConversation: searchingForConversation
|
||||
});
|
||||
|
||||
const mapDispatchToProps = (dispatch) => ({
|
||||
openChatByPhone: (payload) => dispatch(openChatByPhone(payload))
|
||||
openChatByPhone: (phone) => dispatch(openChatByPhone(phone))
|
||||
});
|
||||
|
||||
export function ChatOpenButton({ bodyshop, searchingForConversation, phone, type, jobid, openChatByPhone }) {
|
||||
export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
|
||||
const { t } = useTranslation();
|
||||
const { socket } = useSocket();
|
||||
const notification = useNotification();
|
||||
|
||||
if (!phone) return null;
|
||||
if (!phone) return <></>;
|
||||
|
||||
const messagingEnabled = Boolean(bodyshop?.messagingservicesid);
|
||||
if (!bodyshop.messagingservicesid) return <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>;
|
||||
|
||||
const parsed = useMemo(() => {
|
||||
if (!messagingEnabled) return null;
|
||||
try {
|
||||
return parsePhoneNumber(phone, "CA") || null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}, [messagingEnabled, phone]);
|
||||
|
||||
const isValid = Boolean(parsed?.isValid?.() && parsed.isValid());
|
||||
const clickable = messagingEnabled && !searchingForConversation && isValid;
|
||||
|
||||
const onClick = useCallback(
|
||||
(e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
if (!messagingEnabled) return;
|
||||
if (searchingForConversation) return;
|
||||
|
||||
if (!isValid) {
|
||||
notification.error({ title: t("messaging.error.invalidphone") });
|
||||
return;
|
||||
}
|
||||
|
||||
openChatByPhone({
|
||||
phone_num: parsed.formatInternational(),
|
||||
jobid,
|
||||
socket
|
||||
});
|
||||
},
|
||||
[messagingEnabled, searchingForConversation, isValid, parsed, jobid, socket, openChatByPhone, notification, t]
|
||||
);
|
||||
|
||||
const content = <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>;
|
||||
|
||||
// If not clickable, render plain formatted text (no link styling)
|
||||
if (!clickable) return content;
|
||||
|
||||
// Clickable: render as a link-styled button (best for a “command”)
|
||||
return (
|
||||
<Button
|
||||
type="link"
|
||||
onClick={onClick}
|
||||
className="chat-open-button-link"
|
||||
aria-label={t("messaging.actions.openchat") || "Open chat"}
|
||||
<a
|
||||
href="# "
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
const p = parsePhoneNumber(phone, "CA");
|
||||
if (searchingForConversation) return; //This is to prevent finding the same thing twice.
|
||||
if (p && p.isValid()) {
|
||||
openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid, socket });
|
||||
} else {
|
||||
notification["error"]({ message: t("messaging.error.invalidphone") });
|
||||
}
|
||||
}}
|
||||
>
|
||||
{content}
|
||||
</Button>
|
||||
<PhoneNumberFormatter>{phone}</PhoneNumberFormatter>
|
||||
</a>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
|
||||
import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client/react";
|
||||
import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client";
|
||||
import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
@@ -15,73 +15,44 @@ import LoadingSpinner from "../loading-spinner/loading-spinner.component";
|
||||
|
||||
import "./chat-popup.styles.scss";
|
||||
import { useSocket } from "../../contexts/SocketIO/useSocket.js";
|
||||
import { selectDarkMode } from "../../redux/application/application.selectors.js";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
selectedConversation: selectSelectedConversation,
|
||||
chatVisible: selectChatVisible,
|
||||
isDarkMode: selectDarkMode
|
||||
chatVisible: selectChatVisible
|
||||
});
|
||||
|
||||
const mapDispatchToProps = (dispatch) => ({
|
||||
toggleChatVisible: () => dispatch(toggleChatVisible())
|
||||
});
|
||||
|
||||
export function ChatPopupComponent({ chatVisible, selectedConversation, toggleChatVisible, isDarkMode }) {
|
||||
export function ChatPopupComponent({ chatVisible, selectedConversation, toggleChatVisible }) {
|
||||
const { t } = useTranslation();
|
||||
const { socket } = useSocket();
|
||||
const client = useApolloClient();
|
||||
|
||||
// When socket is connected, we do NOT poll (socket should push updates).
|
||||
// When disconnected, we poll as a fallback.
|
||||
const [pollInterval, setPollInterval] = useState(0);
|
||||
const { socket } = useSocket();
|
||||
const client = useApolloClient(); // Apollo Client instance for cache operations
|
||||
|
||||
// Ensure conversations query runs once on initial page load (component mount).
|
||||
const hasLoadedConversationsOnceRef = useRef(false);
|
||||
|
||||
// Preserve the last known unread aggregate count so the badge doesn't "vanish"
|
||||
// when UNREAD_CONVERSATION_COUNT gets skipped after socket connects.
|
||||
const [unreadAggregateCount, setUnreadAggregateCount] = useState(0);
|
||||
|
||||
// Lazy query for conversations (executed manually)
|
||||
const [getConversations, { loading, data, refetch, called }] = useLazyQuery(CONVERSATION_LIST_QUERY, {
|
||||
// Lazy query for conversations
|
||||
const [getConversations, { loading, data, refetch }] = useLazyQuery(CONVERSATION_LIST_QUERY, {
|
||||
fetchPolicy: "network-only",
|
||||
nextFetchPolicy: "network-only",
|
||||
skip: !chatVisible,
|
||||
...(pollInterval > 0 ? { pollInterval } : {})
|
||||
});
|
||||
|
||||
// Query for unread count when chat is not visible and socket is not connected.
|
||||
// (Once socket connects, we stop this query; we keep the last known value in state.)
|
||||
const { data: unreadData, error: unreadError } = useQuery(UNREAD_CONVERSATION_COUNT, {
|
||||
// Query for unread count when chat is not visible
|
||||
const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
|
||||
fetchPolicy: "network-only",
|
||||
nextFetchPolicy: "network-only",
|
||||
skip: chatVisible || socket?.connected,
|
||||
pollInterval: socket?.connected ? 0 : 60 * 1000
|
||||
pollInterval: 60 * 1000 // TODO: This is a fix for now, should be coming from sockets
|
||||
});
|
||||
|
||||
// Handle unread count updates in useEffect
|
||||
useEffect(() => {
|
||||
if (unreadData) {
|
||||
const nextCount = unreadData?.messages_aggregate?.aggregate?.count;
|
||||
if (typeof nextCount === "number") setUnreadAggregateCount(nextCount);
|
||||
}
|
||||
}, [unreadData]);
|
||||
|
||||
// Handle unread count errors in useEffect
|
||||
useEffect(() => {
|
||||
if (unreadError) {
|
||||
// Keep last known count; do not force badge to zero on transient failures
|
||||
console.warn("UNREAD_CONVERSATION_COUNT failed:", unreadError?.message || unreadError);
|
||||
}
|
||||
}, [unreadError]);
|
||||
|
||||
// Socket connection status -> polling strategy for CONVERSATION_LIST_QUERY
|
||||
// Socket connection status
|
||||
useEffect(() => {
|
||||
const handleSocketStatus = () => {
|
||||
if (socket?.connected) {
|
||||
setPollInterval(0); // skip polling if socket connected
|
||||
setPollInterval(15 * 60 * 1000); // 15 minutes
|
||||
} else {
|
||||
setPollInterval(60 * 1000); // fallback polling if disconnected
|
||||
setPollInterval(60 * 1000); // 60 seconds
|
||||
}
|
||||
};
|
||||
|
||||
@@ -100,33 +71,19 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
|
||||
};
|
||||
}, [socket]);
|
||||
|
||||
// Run conversations query exactly once on initial load (component mount)
|
||||
// Fetch conversations when chat becomes visible
|
||||
useEffect(() => {
|
||||
if (hasLoadedConversationsOnceRef.current) return;
|
||||
if (chatVisible)
|
||||
getConversations({
|
||||
variables: {
|
||||
offset: 0
|
||||
}
|
||||
}).catch((err) => {
|
||||
console.error(`Error fetching conversations: ${(err, err.message || "")}`);
|
||||
});
|
||||
}, [chatVisible, getConversations]);
|
||||
|
||||
hasLoadedConversationsOnceRef.current = true;
|
||||
|
||||
getConversations({ variables: { offset: 0 } }).catch((err) => {
|
||||
// Ignore abort errors (they're expected when component unmounts)
|
||||
if (err?.name !== "AbortError") {
|
||||
console.error(`Error fetching conversations: ${err?.message || ""}`, err);
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
||||
const handleManualRefresh = async () => {
|
||||
try {
|
||||
if (called && typeof refetch === "function") {
|
||||
await refetch({ offset: 0 });
|
||||
} else {
|
||||
await getConversations({ variables: { offset: 0 } });
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(`Error refreshing conversations: ${err?.message || ""}`, err);
|
||||
}
|
||||
};
|
||||
|
||||
// Get unread count from the cache (preferred). Fallback to preserved aggregate count.
|
||||
// Get unread count from the cache
|
||||
const unreadCount = (() => {
|
||||
try {
|
||||
const cachedData = client.readQuery({
|
||||
@@ -134,23 +91,18 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
|
||||
variables: { offset: 0 }
|
||||
});
|
||||
|
||||
const conversations = cachedData?.conversations;
|
||||
|
||||
if (!Array.isArray(conversations) || conversations.length === 0) {
|
||||
return unreadAggregateCount;
|
||||
if (!cachedData?.conversations) {
|
||||
return unreadData?.messages_aggregate?.aggregate?.count;
|
||||
}
|
||||
|
||||
const hasUnreadCounts = conversations.some((c) => c?.messages_aggregate?.aggregate?.count != null);
|
||||
if (!hasUnreadCounts) {
|
||||
return unreadAggregateCount;
|
||||
}
|
||||
|
||||
return conversations.reduce((total, conversation) => {
|
||||
const unread = conversation?.messages_aggregate?.aggregate?.count || 0;
|
||||
// Aggregate unread message count
|
||||
return cachedData.conversations.reduce((total, conversation) => {
|
||||
const unread = conversation.messages_aggregate?.aggregate?.count || 0;
|
||||
return total + unread;
|
||||
}, 0);
|
||||
} catch {
|
||||
return unreadAggregateCount;
|
||||
} catch (error) {
|
||||
console.warn("Unread count not found in cache:", error);
|
||||
return 0; // Fallback if not in cache
|
||||
}
|
||||
})();
|
||||
|
||||
@@ -158,19 +110,16 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
|
||||
<Badge count={unreadCount}>
|
||||
<Card size="small">
|
||||
{chatVisible ? (
|
||||
<div className={`chat-popup ${isDarkMode ? "chat-popup--dark" : "chat-popup--light"}`}>
|
||||
<div className="chat-popup">
|
||||
<Space align="center">
|
||||
<Typography.Title level={4}>{t("messaging.labels.messaging")}</Typography.Title>
|
||||
<ChatNewConversation />
|
||||
<Tooltip title={t("messaging.labels.recentonly")}>
|
||||
<InfoCircleOutlined />
|
||||
</Tooltip>
|
||||
|
||||
<SyncOutlined style={{ cursor: "pointer" }} onClick={handleManualRefresh} />
|
||||
|
||||
<SyncOutlined style={{ cursor: "pointer" }} onClick={() => refetch()} />
|
||||
{!socket?.connected && <Tag color="yellow">{t("messaging.labels.nopush")}</Tag>}
|
||||
</Space>
|
||||
|
||||
<ShrinkOutlined
|
||||
onClick={() => toggleChatVisible()}
|
||||
style={{ position: "absolute", right: ".5rem", top: ".5rem" }}
|
||||
|
||||
@@ -26,11 +26,3 @@
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
.chat-popup--dark {
|
||||
color-scheme: dark;
|
||||
}
|
||||
|
||||
.chat-popup--light {
|
||||
color-scheme: light;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import { selectIsSending, selectMessage } from "../../redux/messaging/messaging.
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
|
||||
import ChatPresetsComponent from "../chat-presets/chat-presets.component";
|
||||
import { useQuery } from "@apollo/client/react";
|
||||
import { useQuery } from "@apollo/client";
|
||||
import { phone } from "phone";
|
||||
import { GET_PHONE_NUMBER_OPT_OUT } from "../../graphql/phone-number-opt-out.queries";
|
||||
|
||||
@@ -68,13 +68,13 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
|
||||
};
|
||||
|
||||
return (
|
||||
<Space orientation="vertical" style={{ width: "100%" }} size="middle">
|
||||
<Space direction="vertical" style={{ width: "100%" }} size="middle">
|
||||
{isOptedOut && (
|
||||
<Tooltip title={t("consent.text_body")}>
|
||||
<Alert
|
||||
showIcon={true}
|
||||
icon={<ExclamationCircleOutlined />}
|
||||
title={t("messaging.errors.no_consent")}
|
||||
message={t("messaging.errors.no_consent")}
|
||||
type="error"
|
||||
/>
|
||||
</Tooltip>
|
||||
|
||||
@@ -10,21 +10,21 @@ export default function ChatTagRoComponent({ roOptions, loading, handleSearch, h
|
||||
<Space>
|
||||
<div style={{ width: "15rem" }}>
|
||||
<Select
|
||||
showSearch={{
|
||||
filterOption: false,
|
||||
onSearch: handleSearch
|
||||
}}
|
||||
showSearch
|
||||
autoFocus
|
||||
popupMatchSelectWidth
|
||||
placeholder={t("general.labels.search")}
|
||||
filterOption={false}
|
||||
onSearch={handleSearch}
|
||||
onSelect={handleInsertTag}
|
||||
notFoundContent={loading ? <LoadingOutlined /> : <Empty />}
|
||||
options={roOptions.map((item, idx) => ({
|
||||
key: item.id || idx,
|
||||
value: item.id || idx,
|
||||
label: ` ${item.ro_number || ""} | ${OwnerNameDisplayFunction(item)}`
|
||||
}))}
|
||||
/>
|
||||
>
|
||||
{roOptions.map((item, idx) => (
|
||||
<Select.Option key={item.id || idx}>
|
||||
{` ${item.ro_number || ""} | ${OwnerNameDisplayFunction(item)}`}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</div>
|
||||
{loading ? <LoadingOutlined /> : null}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { PlusOutlined } from "@ant-design/icons";
|
||||
import { useLazyQuery, useMutation } from "@apollo/client/react";
|
||||
import { useLazyQuery, useMutation } from "@apollo/client";
|
||||
import { Tag } from "antd";
|
||||
import _ from "lodash";
|
||||
import { useState } from "react";
|
||||
@@ -28,13 +28,13 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
|
||||
|
||||
const executeSearch = (v) => {
|
||||
logImEXEvent("messaging_search_job_tag", { searchTerm: v });
|
||||
loadRo({ variables: v }).catch((e) => console.error("Error in ChatTagRoContainer executeSearch:", e));
|
||||
loadRo(v).catch((e) => console.error("Error in ChatTagRoContainer executeSearch:", e));
|
||||
};
|
||||
|
||||
const debouncedExecuteSearch = _.debounce(executeSearch, 500);
|
||||
|
||||
const handleSearch = (value) => {
|
||||
debouncedExecuteSearch({ search: value });
|
||||
debouncedExecuteSearch({ variables: { search: value } });
|
||||
};
|
||||
|
||||
const [insertTag] = useMutation(INSERT_CONVERSATION_TAG, {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Card, Input } from "antd";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Card, Input, Table } from "antd";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { alphaSort } from "../../utils/sorters";
|
||||
@@ -100,15 +99,13 @@ export default function ContractsCarsComponent({ loading, data, selectedCarId, h
|
||||
placeholder={t("general.labels.search")}
|
||||
value={state.search}
|
||||
onChange={(e) => setState({ ...state, search: e.target.value })}
|
||||
enterButton
|
||||
/>
|
||||
}
|
||||
>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
loading={loading}
|
||||
pagination={{ placement: "top" }}
|
||||
pagination={{ position: "top" }}
|
||||
columns={columns}
|
||||
mobileColumnKeys={["status", "fleetnumber", "readiness", "year"]}
|
||||
rowKey="id"
|
||||
dataSource={filteredData}
|
||||
onChange={handleTableChange}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useQuery } from "@apollo/client/react";
|
||||
import { useQuery } from "@apollo/client";
|
||||
import dayjs from "../../utils/day";
|
||||
import { QUERY_AVAILABLE_CC } from "../../graphql/courtesy-car.queries";
|
||||
import AlertComponent from "../alert/alert.component";
|
||||
@@ -24,7 +24,7 @@ export default function ContractCarsContainer({ selectedCarState, form }) {
|
||||
});
|
||||
};
|
||||
|
||||
if (error) return <AlertComponent title={error.message} type="error" />;
|
||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||
return (
|
||||
<ContractCarsComponent
|
||||
handleSelect={handleSelect}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useMutation } from "@apollo/client/react";
|
||||
import { useMutation } from "@apollo/client";
|
||||
import { Button, Form, InputNumber, Popover, Radio, Select, Space } from "antd";
|
||||
import axios from "axios";
|
||||
import dayjs from "../../utils/day";
|
||||
@@ -133,9 +133,6 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
|
||||
ownr_ln: contract.job.owner.ownr_ln,
|
||||
ownr_co_nm: contract.job.owner.ownr_co_nm,
|
||||
ownr_ph1: contract.job.owner.ownr_ph1,
|
||||
ownr_ph2: contract.job.owner.ownr_ph2,
|
||||
ownr_ph1_ty: contract.job.owner.ownr_ph1_ty,
|
||||
ownr_ph2_ty: contract.job.owner.ownr_ph2_ty,
|
||||
ownr_ea: contract.job.owner.ownr_ea,
|
||||
v_model_desc: contract.job.vehicle && contract.job.vehicle.v_model_desc,
|
||||
v_model_yr: contract.job.vehicle && contract.job.vehicle.v_model_yr,
|
||||
@@ -256,10 +253,6 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
|
||||
}
|
||||
};
|
||||
|
||||
if (currentUser?.email) {
|
||||
newJob.created_user_email = currentUser.email;
|
||||
}
|
||||
|
||||
//Calcualte the new job totals.
|
||||
|
||||
const newTotals = (
|
||||
@@ -278,14 +271,14 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
|
||||
});
|
||||
|
||||
if (result.errors) {
|
||||
notification.error({
|
||||
title: t("jobs.errors.inserting", {
|
||||
notification["error"]({
|
||||
message: t("jobs.errors.inserting", {
|
||||
message: JSON.stringify(result.errors)
|
||||
})
|
||||
});
|
||||
} else {
|
||||
notification.success({
|
||||
title: t("jobs.successes.created"),
|
||||
notification["success"]({
|
||||
message: t("jobs.successes.created"),
|
||||
onClick: () => {
|
||||
history.push(`/manage/jobs/${result.data.insert_jobs.returning[0].id}`);
|
||||
}
|
||||
@@ -309,13 +302,13 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
|
||||
}
|
||||
]}
|
||||
>
|
||||
<Select
|
||||
options={bodyshop.md_ins_cos.map((s) => ({
|
||||
key: s.name,
|
||||
value: s.name,
|
||||
label: s.name
|
||||
}))}
|
||||
/>
|
||||
<Select>
|
||||
{bodyshop.md_ins_cos.map((s) => (
|
||||
<Select.Option key={s.name} value={s.name}>
|
||||
{s.name}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name={"class"}
|
||||
@@ -327,13 +320,13 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
|
||||
}
|
||||
]}
|
||||
>
|
||||
<Select
|
||||
options={bodyshop.md_classes.map((s) => ({
|
||||
key: s,
|
||||
value: s,
|
||||
label: s
|
||||
}))}
|
||||
/>
|
||||
<Select>
|
||||
{bodyshop.md_classes.map((s) => (
|
||||
<Select.Option key={s} value={s}>
|
||||
{s}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("contracts.labels.convertform.applycleanupcharge")}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useLazyQuery } from "@apollo/client/react";
|
||||
import { useLazyQuery } from "@apollo/client";
|
||||
import { Button } from "antd";
|
||||
import { useEffect } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -30,8 +30,8 @@ export default function ContractCreateJobPrefillComponent({ jobId, form }) {
|
||||
}, [data, form]);
|
||||
|
||||
if (error) {
|
||||
notification.error({
|
||||
title: t("contracts.errors.fetchingjobinfo", {
|
||||
notification["error"]({
|
||||
message: t("contracts.errors.fetchingjobinfo", {
|
||||
error: JSON.stringify(error)
|
||||
})
|
||||
});
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { WarningFilled } from "@ant-design/icons";
|
||||
import { Card, Form, Input, InputNumber, Space } from "antd";
|
||||
import { Form, Input, InputNumber, Space } from "antd";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DateFormatter } from "../../utils/DateFormatter";
|
||||
import dayjs from "../../utils/day";
|
||||
@@ -19,9 +19,9 @@ import ContractFormJobPrefill from "./contract-form-job-prefill.component";
|
||||
export default function ContractFormComponent({ form, create = false, selectedJobState, selectedCar }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<Card>
|
||||
<>
|
||||
{!create && <FormFieldsChanged form={form} />}
|
||||
<LayoutFormRow noDivider={true}>
|
||||
<LayoutFormRow>
|
||||
{!create && (
|
||||
<Form.Item
|
||||
label={t("contracts.fields.status")}
|
||||
@@ -67,7 +67,7 @@ export default function ContractFormComponent({ form, create = false, selectedJo
|
||||
.isBefore(dayjs(form.getFieldValue("scheduledreturn")));
|
||||
if (insuranceOver)
|
||||
return (
|
||||
<Space orientation="vertical" style={{ color: "tomato" }}>
|
||||
<Space direction="vertical" style={{ color: "tomato" }}>
|
||||
<span>
|
||||
<WarningFilled style={{ marginRight: ".3rem" }} />
|
||||
{t("contracts.labels.insuranceexpired")}
|
||||
@@ -107,7 +107,7 @@ export default function ContractFormComponent({ form, create = false, selectedJo
|
||||
.isSameOrBefore(dayjs(form.getFieldValue("scheduledreturn")));
|
||||
if (mileageOver || dueForService)
|
||||
return (
|
||||
<Space orientation="vertical" style={{ color: "tomato" }}>
|
||||
<Space direction="vertical" style={{ color: "tomato" }}>
|
||||
<span>
|
||||
<WarningFilled style={{ marginRight: ".3rem" }} />
|
||||
{t("contracts.labels.cardueforservice")}
|
||||
@@ -310,6 +310,6 @@ export default function ContractFormComponent({ form, create = false, selectedJo
|
||||
<InputNumber precision={2} />
|
||||
</Form.Item>
|
||||
</LayoutFormRow>
|
||||
</Card>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Card, Input } from "antd";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Card, Input, Table } from "antd";
|
||||
import { useMemo, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { alphaSort } from "../../utils/sorters";
|
||||
@@ -124,15 +123,17 @@ export default function ContractsJobsComponent({ loading, data, selectedJob, han
|
||||
placeholder={t("general.labels.search")}
|
||||
value={state.search}
|
||||
onChange={(e) => setState({ ...state, search: e.target.value })}
|
||||
enterButton
|
||||
/>
|
||||
}
|
||||
>
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
loading={loading}
|
||||
pagination={{ placement: "top", defaultPageSize: pageLimit, defaultCurrent: defaultCurrent }}
|
||||
pagination={{
|
||||
position: "top",
|
||||
defaultPageSize: pageLimit,
|
||||
defaultCurrent: defaultCurrent
|
||||
}}
|
||||
columns={columns}
|
||||
mobileColumnKeys={["ro_number", "owner", "status", "vehicle", "plate_no"]}
|
||||
rowKey="id"
|
||||
dataSource={filteredData}
|
||||
onChange={handleTableChange}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useQuery } from "@apollo/client/react";
|
||||
import { useQuery } from "@apollo/client";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
|
||||
@@ -26,7 +26,7 @@ export function ContractJobsContainer({ selectedJobState, bodyshop }) {
|
||||
setSelectedJob(record.id);
|
||||
};
|
||||
|
||||
if (error) return <AlertComponent title={error.message} type="error" />;
|
||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||
return (
|
||||
<ContractJobsComponent
|
||||
handleSelect={handleSelect}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { forwardRef, useEffect, useState } from "react";
|
||||
import { Select } from "antd";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
const ContractStatusComponent = ({ value, onChange, ref }) => {
|
||||
const { Option } = Select;
|
||||
|
||||
const ContractStatusComponent = ({ value, onChange }) => {
|
||||
const [option, setOption] = useState(value);
|
||||
const { t } = useTranslation();
|
||||
|
||||
@@ -14,19 +16,16 @@ const ContractStatusComponent = ({ value, onChange, ref }) => {
|
||||
|
||||
return (
|
||||
<Select
|
||||
ref={ref}
|
||||
value={option}
|
||||
style={{ width: 100 }}
|
||||
style={{
|
||||
width: 100
|
||||
}}
|
||||
onChange={setOption}
|
||||
options={[
|
||||
{ value: "contracts.status.new", label: t("contracts.status.new") },
|
||||
{ value: "contracts.status.out", label: t("contracts.status.out") },
|
||||
{ value: "contracts.status.returned", label: t("contracts.status.out") }
|
||||
]}
|
||||
/>
|
||||
>
|
||||
<Option value="contracts.status.new">{t("contracts.status.new")}</Option>
|
||||
<Option value="contracts.status.out">{t("contracts.status.out")}</Option>
|
||||
<Option value="contracts.status.returned">{t("contracts.status.returned")}</Option>
|
||||
</Select>
|
||||
);
|
||||
};
|
||||
|
||||
ContractStatusComponent.displayName = "ContractStatusComponent";
|
||||
|
||||
export default ContractStatusComponent;
|
||||
export default forwardRef(ContractStatusComponent);
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useLazyQuery } from "@apollo/client/react";
|
||||
import { Button, Form, Modal } from "antd";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { useLazyQuery } from "@apollo/client";
|
||||
import { Button, Form, Modal, Table } from "antd";
|
||||
import { useEffect } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
@@ -64,8 +63,8 @@ export function ContractsFindModalContainer({ contractFinderModal, toggleModalVi
|
||||
<Button onClick={() => form.submit()} type="primary" loading={loading}>
|
||||
{t("general.labels.search")}
|
||||
</Button>
|
||||
{error && <AlertComponent type="error" title={JSON.stringify(error)} />}
|
||||
<ResponsiveTable
|
||||
{error && <AlertComponent type="error" message={JSON.stringify(error)} />}
|
||||
<Table
|
||||
loading={loading}
|
||||
columns={[
|
||||
{
|
||||
@@ -125,7 +124,6 @@ export function ContractsFindModalContainer({ contractFinderModal, toggleModalVi
|
||||
render: (text, record) => <DateTimeFormatter>{record.actualreturn}</DateTimeFormatter>
|
||||
}
|
||||
]}
|
||||
mobileColumnKeys={["agreementnumber", "job.ro_number", "driver_ln", "status"]}
|
||||
rowKey="id"
|
||||
dataSource={data?.cccontracts}
|
||||
/>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user