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

Merged in feature/IO-3499-React-19 (pull request #2864)

Browse Source 
feature/IO-3499-React-19 Checkpoint
This commit is contained in:
Dave Richer
2026-01-21 22:28:38 +00:00
parent 151598c563 f5a618319a
commit 538dcce78a
5 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@@ -252,11 +252,11 @@ jobs:
name: Execute migration
command: |
curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
hasura migrate apply --endpoint https://db.test.imex.online/ --admin-secret << parameters.secret >>
sleep 15
hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
hasura metadata apply --endpoint https://db.test.imex.online/ --admin-secret << parameters.secret >>
sleep 30
hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
hasura metadata reload --endpoint https://db.test.imex.online/ --admin-secret << parameters.secret >>
- jira/notify:
environment: Test (ImEX) - Hasura
environment_type: testing

6
client/.env.test.imex
View File

@@ -1,5 +1,5 @@
VITE_APP_GRAPHQL_ENDPOINT=https://db.test.bodyshop.app/v1/graphql
VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.bodyshop.app/v1/graphql
VITE_APP_GRAPHQL_ENDPOINT=https://db.test.imex.online/v1/graphql
VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.imex.online/v1/graphql
VITE_APP_GA_CODE=231099835
VITE_APP_FIREBASE_CONFIG={ "apiKey":"AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c", "authDomain":"imex-test.firebaseapp.com", "projectId":"imex-test", "storageBucket":"imex-test.appspot.com", "messagingSenderId":"991923618608", "appId":"1:991923618608:web:633437569cdad78299bef5", "measurementId":"G-TW0XLZEH18"}
VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
@@ -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

15
client/src/components/production-list-columns/production-list-columns.comment.component.jsx
View File

@@ -43,11 +43,7 @@ export default function ProductionListColumnComment({ record }) {
};
const content = (
<div
style={{ width: "30em" }}
onMouseDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
<div style={{ width: "30em" }} onMouseDown={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}>
<Input.TextArea
rows={5}
value={note}
@@ -67,14 +63,7 @@ export default function ProductionListColumnComment({ record }) {
);
return (
<Popover
onOpenChange={handleOpenChange}
open={open}
content={content}
trigger="click"
fresh
getPopupContainer={(trigger) => trigger.parentElement}
>
<Popover onOpenChange={handleOpenChange} open={open} content={content} trigger="click" fresh>
<div
style={{
width: "100%",

9
client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
View File

@@ -92,14 +92,7 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
);
return (
<Popover
onOpenChange={handleOpenChange}
open={open}
content={content}
trigger="click"
fresh
getPopupContainer={(trigger) => trigger.parentElement}
>
<Popover onOpenChange={handleOpenChange} open={open} content={content} trigger="click" fresh>
<div
style={{
width: "100%",

6
client/src/utils/GraphQLClient.js
View File

@@ -180,6 +180,11 @@ const cache = new InMemoryCache({
},
Query: {
fields: {
job_watchers: {
merge(_existing, incoming) {
return incoming;
}
},
conversations: {
keyArgs: ["where", "order_by"],
merge(existing = [], incoming = [], { args, readField }) {
@@ -200,7 +205,6 @@ const cache = new InMemoryCache({
});
}
},
notifications: {
// Keep "respect the current query filter" behavior (i.e., don't union with existing),
// but dedupe within the incoming page/list so UI doesn't flicker with duplicates.