From 51d49be16eb86d7a59ac83db622794e4f000117c Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Mon, 11 Apr 2022 13:17:14 -0700 Subject: [PATCH] IO-1661 Add parts order comments presets. --- bodyshop_translations.babel | 21 ++ client/package.json | 24 +-- .../parts-order-modal.component.jsx | 38 +++- .../parts-order-modal.container.jsx | 1 + .../shop-info/shop-info.general.component.jsx | 66 ++++++ client/src/graphql/bodyshop.queries.js | 2 + client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + client/yarn.lock | 194 +++++++++--------- hasura/metadata/tables.yaml | 2 + .../down.sql | 4 + .../up.sql | 2 + 13 files changed, 246 insertions(+), 111 deletions(-) create mode 100644 hasura/migrations/1649707170715_alter_table_public_bodyshops_add_column_md_parts_order_comment/down.sql create mode 100644 hasura/migrations/1649707170715_alter_table_public_bodyshops_add_column_md_parts_order_comment/up.sql diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 8bc43fc67..05f7d80d5 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -4860,6 +4860,27 @@ + + md_parts_order_comment + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + md_payment_types false diff --git a/client/package.json b/client/package.json index 7f0b87ffb..5f86ceec6 100644 --- a/client/package.json +++ b/client/package.json @@ -8,13 +8,13 @@ "@asseinfo/react-kanban": "^2.2.0", "@craco/craco": "^6.4.3", "@fingerprintjs/fingerprintjs": "^3.3.3", - "@sentry/react": "^6.19.3", - "@sentry/tracing": "^6.19.3", + "@sentry/react": "^6.19.6", + "@sentry/tracing": "^6.19.6", "@splitsoftware/splitio-react": "^1.3.1-rc.1", - "@stripe/react-stripe-js": "^1.7.0", - "@stripe/stripe-js": "^1.26.0", + "@stripe/react-stripe-js": "^1.7.1", + "@stripe/stripe-js": "^1.27.0", "@tanem/react-nprogress": "^4.0.12", - "antd": "^4.19.3", + "antd": "^4.19.5", "apollo-link-logger": "^2.0.0", "axios": "^0.26.1", "craco-less": "^1.20.0", @@ -25,16 +25,16 @@ "exifr": "^7.1.3", "firebase": "^9.6.10", "graphql": "^16.3.0", - "i18next": "^21.6.14", + "i18next": "^21.6.16", "i18next-browser-languagedetector": "^6.1.4", "jsoneditor": "^9.7.4", "jsreport-browser-client-dist": "^1.3.0", - "libphonenumber-js": "^1.9.50", + "libphonenumber-js": "^1.9.51", "logrocket": "^2.2.1", - "markerjs2": "^2.20.0", + "markerjs2": "^2.21.0", "moment-business-days": "^1.2.0", "moment-timezone": "^0.5.34", - "phone": "^3.1.14", + "phone": "^3.1.15", "preval.macro": "^5.0.0", "prop-types": "^15.8.1", "query-string": "^7.1.1", @@ -48,10 +48,10 @@ "react-drag-listview": "^0.1.9", "react-grid-gallery": "^0.5.5", "react-grid-layout": "^1.3.4", - "react-i18next": "^11.16.2", + "react-i18next": "^11.16.5", "react-icons": "^4.3.1", "react-number-format": "^4.9.1", - "react-redux": "^7.2.7", + "react-redux": "^7.2.8", "react-resizable": "^3.0.4", "react-router-dom": "^5.3.0", "react-scripts": "^4.0.3", @@ -64,7 +64,7 @@ "redux-saga": "^1.1.3", "redux-state-sync": "^3.1.2", "reselect": "^4.1.5", - "sass": "^1.49.10", + "sass": "^1.50.0", "socket.io-client": "^4.4.1", "styled-components": "^5.3.5", "subscriptions-transport-ws": "^0.11.0", diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx index 7c206f59e..8993a4654 100644 --- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx +++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx @@ -1,4 +1,4 @@ -import { DeleteFilled, WarningFilled } from "@ant-design/icons"; +import { DeleteFilled, WarningFilled, DownOutlined } from "@ant-design/icons"; import { useTreatments } from "@splitsoftware/splitio-react"; import { Divider, @@ -9,6 +9,8 @@ import { Space, Tag, Select, + Menu, + Dropdown, } from "antd"; import React from "react"; import { useTranslation } from "react-i18next"; @@ -39,6 +41,7 @@ export function PartsOrderModalComponent({ isReturn, preferredMake, job, + form, }) { const [sendType, setSendType] = sendTypeState; const { OEConnection } = useTreatments( @@ -52,6 +55,21 @@ export function PartsOrderModalComponent({ bodyshop.imexshopid ); const { t } = useTranslation(); + const handleClick = ({ item, key, keyPath }) => { + form.setFieldsValue({ comments: item.props.value }); + }; + + const menu = ( +
+ + {bodyshop.md_parts_order_comment.map((comment, idx) => ( + + {comment.label} + + ))} + +
+ ); return (
@@ -243,7 +261,23 @@ export function PartsOrderModalComponent({ ); }} - + + {t("parts_orders.fields.comments")} + + e.preventDefault()} + > + + + + + } + > ) : ( + + + {(fields, { add, remove, move }) => { + return ( +
+ {fields.map((field, index) => ( + + + + + + + + + + + { + remove(field.name); + }} + /> + + + + + ))} + + + +
+ ); + }} + +
); } diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js index e10d6e2f1..9d3b64c4f 100644 --- a/client/src/graphql/bodyshop.queries.js +++ b/client/src/graphql/bodyshop.queries.js @@ -104,6 +104,7 @@ export const QUERY_BODYSHOP = gql` ss_configuration md_from_emails last_name_first + md_parts_order_comment employees { user_email id @@ -205,6 +206,7 @@ export const UPDATE_SHOP = gql` ss_configuration md_from_emails last_name_first + md_parts_order_comment employees { id first_name diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 08aa0a9a1..e0977b2f4 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -301,6 +301,7 @@ "zip": "Zip/Postal Code" }, "md_jobline_presets": "Jobline Presets", + "md_parts_order_comment": "Parts Orders Comments", "md_payment_types": "Payment Types", "md_referral_sources": "Referral Sources", "messaginglabel": "Messaging Preset Label", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 6f2ebe631..d111a8350 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -301,6 +301,7 @@ "zip": "" }, "md_jobline_presets": "", + "md_parts_order_comment": "", "md_payment_types": "", "md_referral_sources": "", "messaginglabel": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index a86086bd1..5824ced68 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -301,6 +301,7 @@ "zip": "" }, "md_jobline_presets": "", + "md_parts_order_comment": "", "md_payment_types": "", "md_referral_sources": "", "messaginglabel": "", diff --git a/client/yarn.lock b/client/yarn.lock index efff31e0a..23cd3b5dc 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2094,14 +2094,14 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@sentry/browser@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.19.3.tgz#b4cfc6eba48d10a5fdf096c05ca11303354edb8b" - integrity sha512-E8UA6IN8z9hL6aGzOHUzqgNZiBwARkA89i8ncKB9QU1/+jl7598ZLziN4+uyPeZiRquEz8Ub7Ve1eacs1u+fbw== +"@sentry/browser@6.19.6": + version "6.19.6" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.19.6.tgz#75be467667fffa1f4745382fc7a695568609c634" + integrity sha512-V5QyY1cO1iuFCI78dOFbHV7vckbeQEPPq3a5dGSXlBQNYnd9Ec5xoxp5nRNpWQPOZ8/Ixt9IgRxdqVTkWib51g== dependencies: - "@sentry/core" "6.19.3" - "@sentry/types" "6.19.3" - "@sentry/utils" "6.19.3" + "@sentry/core" "6.19.6" + "@sentry/types" "6.19.6" + "@sentry/utils" "6.19.6" tslib "^1.9.3" "@sentry/cli@^1.73.0": @@ -2117,69 +2117,69 @@ proxy-from-env "^1.1.0" which "^2.0.2" -"@sentry/core@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.3.tgz#88268afc8c42716c455ad77bb4bed2bbf96abd83" - integrity sha512-RcGmYdkrE3VYBMl9Hgv4GKsC8FEVUdWYsfGIcT/btwP2YpBeUaTZl+1vV9r3Ncdl125LqzP5CKSj5otVxiEg6g== +"@sentry/core@6.19.6": + version "6.19.6" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.6.tgz#7d4649d0148b5d0be1358ab02e2f869bf7363e9a" + integrity sha512-biEotGRr44/vBCOegkTfC9rwqaqRKIpFljKGyYU6/NtzMRooktqOhjmjmItNCMRknArdeaQwA8lk2jcZDXX3Og== dependencies: - "@sentry/hub" "6.19.3" - "@sentry/minimal" "6.19.3" - "@sentry/types" "6.19.3" - "@sentry/utils" "6.19.3" + "@sentry/hub" "6.19.6" + "@sentry/minimal" "6.19.6" + "@sentry/types" "6.19.6" + "@sentry/utils" "6.19.6" tslib "^1.9.3" -"@sentry/hub@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.3.tgz#d555c83404f19ac9b68f336b051b8e7a9d75feb0" - integrity sha512-iYbkrxEZt6CrHP3U3r54MARVZSs3YHjAMUMOTlC16s/Amz1McwV95XtI3NJaqMhwzl7R5vbGrs3xOtLg1V1Uyw== +"@sentry/hub@6.19.6": + version "6.19.6" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.6.tgz#ada83ceca0827c49534edfaba018221bc1eb75e1" + integrity sha512-PuEOBZxvx3bjxcXmWWZfWXG+orojQiWzv9LQXjIgroVMKM/GG4QtZbnWl1hOckUj7WtKNl4hEGO2g/6PyCV/vA== dependencies: - "@sentry/types" "6.19.3" - "@sentry/utils" "6.19.3" + "@sentry/types" "6.19.6" + "@sentry/utils" "6.19.6" tslib "^1.9.3" -"@sentry/minimal@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.3.tgz#b9b7f0d7f0cd2341b243318668ac01458f9d7889" - integrity sha512-xy/6ThHK8B2NJT98nWrx6V9eVgUbzq2N/8lv5/QqrKsICjxx22TRC8Q6zPg/o7BYcrY5vpugSEbIeErTnyxHDA== +"@sentry/minimal@6.19.6": + version "6.19.6" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.6.tgz#b6cced3708e25d322039e68ebdf8fadfa445bf7d" + integrity sha512-T1NKcv+HTlmd8EbzUgnGPl4ySQGHWMCyZ8a8kXVMZOPDzphN3fVIzkYzWmSftCWp0rpabXPt9aRF2mfBKU+mAQ== dependencies: - "@sentry/hub" "6.19.3" - "@sentry/types" "6.19.3" + "@sentry/hub" "6.19.6" + "@sentry/types" "6.19.6" tslib "^1.9.3" -"@sentry/react@^6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.19.3.tgz#6b2bfb19faa55cf83af593a5778bb23cd2cf60a3" - integrity sha512-Zza1RX0+1tFCM1Hfq3Yl50cbc/ml0V/katw4aVZIU6+vEgvk5EuSFKU2LtblmJkpID7x6UwWz+1qgXumZPze6Q== +"@sentry/react@^6.19.6": + version "6.19.6" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.19.6.tgz#4c07168637bfcef4d6556a2c4548b74a61eaed87" + integrity sha512-RnWZ7clg1lRgf/JFNnTOs8ZPCv566E5CwFXXb6swyjPYUMcIn95XujDQU9SU4hXZ4qXd9BRvifxqyxvq0LMXNw== dependencies: - "@sentry/browser" "6.19.3" - "@sentry/minimal" "6.19.3" - "@sentry/types" "6.19.3" - "@sentry/utils" "6.19.3" + "@sentry/browser" "6.19.6" + "@sentry/minimal" "6.19.6" + "@sentry/types" "6.19.6" + "@sentry/utils" "6.19.6" hoist-non-react-statics "^3.3.2" tslib "^1.9.3" -"@sentry/tracing@^6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.19.3.tgz#dfdbd5019486c899bdf352b1152d5d253544ef70" - integrity sha512-3lyb4yCFH/ltEQSyKM96g2c74vvKIwByx8fLDS4FHYQQDXY+xPcs+zyK8L1Fs5PRFAUciEOK5TS9qwELom5K4w== +"@sentry/tracing@^6.19.6": + version "6.19.6" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.19.6.tgz#faa156886afe441730f03cf9ac9c4982044b7135" + integrity sha512-STZdlEtTBqRmPw6Vjkzi/1kGkGPgiX0zdHaSOhSeA2HXHwx7Wnfu7veMKxtKWdO+0yW9QZGYOYqp0GVf4Swujg== dependencies: - "@sentry/hub" "6.19.3" - "@sentry/minimal" "6.19.3" - "@sentry/types" "6.19.3" - "@sentry/utils" "6.19.3" + "@sentry/hub" "6.19.6" + "@sentry/minimal" "6.19.6" + "@sentry/types" "6.19.6" + "@sentry/utils" "6.19.6" tslib "^1.9.3" -"@sentry/types@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.3.tgz#94b19da68d4d23561efb1014f72968bcea85cd0c" - integrity sha512-jHhqxp8MIWSfOc3krorirTGKTEaSFO6XrAvi+2AZhr6gvOChwOgzgrN2ZqesJcZmgCsqWV21u3usSwYeRrjOJA== +"@sentry/types@6.19.6": + version "6.19.6" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.6.tgz#70513f9dca05d23d7ab9c2a6cb08d4db6763ca67" + integrity sha512-QH34LMJidEUPZK78l+Frt3AaVFJhEmIi05Zf8WHd9/iTt+OqvCHBgq49DDr1FWFqyYWm/QgW/3bIoikFpfsXyQ== -"@sentry/utils@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.3.tgz#0c3a3f0b86c12e3b079e56e37a44e62a1226043d" - integrity sha512-GdC9B/FK7qd0zItY43135bYbhuVSawE18bIrQDNuno8gTpDJ5OgShpTN9zR53AmMh16/lwKNnV3ZZjlpKcxuNw== +"@sentry/utils@6.19.6": + version "6.19.6" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.6.tgz#2ddc9ef036c3847084c43d0e5a55e4646bdf9021" + integrity sha512-fAMWcsguL0632eWrROp/vhPgI7sBj/JROWVPzpabwVkm9z3m1rQm6iLFn4qfkZL8Ozy6NVZPXOQ7EXmeU24byg== dependencies: - "@sentry/types" "6.19.3" + "@sentry/types" "6.19.6" tslib "^1.9.3" "@sentry/webpack-plugin@^1.18.8": @@ -2226,17 +2226,17 @@ shallowequal "^1.1.0" unfetch "^4.1.0" -"@stripe/react-stripe-js@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@stripe/react-stripe-js/-/react-stripe-js-1.7.0.tgz#83c993a09a903703205d556617f9729784a896c3" - integrity sha512-L20v8Jq0TDZFL2+y+uXD751t6q9SalSFkSYZpmZ2VWrGZGK7HAGfRQ804dzYSSr5fGenW6iz6y7U0YKfC/TK3g== +"@stripe/react-stripe-js@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@stripe/react-stripe-js/-/react-stripe-js-1.7.1.tgz#6e1db8f4a0eaf2193b153173d4aa7c38b681310d" + integrity sha512-GiUPoMo0xVvmpRD6JR9JAhAZ0W3ZpnYZNi0KE+91+tzrSFVpChKZbeSsJ5InlZhHFk9NckJCt1wOYBTqNsvt3A== dependencies: prop-types "^15.7.2" -"@stripe/stripe-js@^1.26.0": - version "1.26.0" - resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.26.0.tgz#45670924753c01e18d0544ea1f1067b474aaa96f" - integrity sha512-4R1vC75yKaCVFARW3bhelf9+dKt4NP4iZY/sIjGK7AAMBVvZ47eG74NvsAIUdUnhOXSWFMjdFWqv+etk5BDW4g== +"@stripe/stripe-js@^1.27.0": + version "1.27.0" + resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.27.0.tgz#ab0c82fa89fd40260de4414f69868b769e810550" + integrity sha512-SEiybUBu+tlsFKuzdFFydxxjkbrdzHo0tz/naYC5Dt9or/Ux2gcKJBPYQ4RmqQCNHFxgyNj6UYsclywwhe2inQ== "@surma/rollup-plugin-off-main-thread@^1.1.1": version "1.4.2" @@ -3187,10 +3187,10 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -antd@^4.19.3: - version "4.19.3" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.19.3.tgz#2b6bb938bda9850c797db59c8923f3c8a14a6693" - integrity sha512-q4oT2lIM0Fb60MfcdtjH6LFQcmo5MuM27PN3nJMsRG1FeiQ9n+OPFlkQSdtb0ZWFIFjTH3p0W02T6SbB2U7ChQ== +antd@^4.19.5: + version "4.19.5" + resolved "https://registry.yarnpkg.com/antd/-/antd-4.19.5.tgz#38d08f3e1391a7a69c2ca76f50968bb12ec2ac93" + integrity sha512-C4H/VJqlVO5iMvHZyiV27R8SbPs4jsOKCGPhDXIHUry/RnUCbMmVeQaPRfUIxSI1NbqDflsuQfevPtz1svyIlg== dependencies: "@ant-design/colors" "^6.0.0" "@ant-design/icons" "^4.7.0" @@ -3208,7 +3208,7 @@ antd@^4.19.3: rc-dialog "~8.6.0" rc-drawer "~4.4.2" rc-dropdown "~3.3.2" - rc-field-form "~1.24.0" + rc-field-form "~1.25.0" rc-image "~5.2.5" rc-input "~0.0.1-alpha.5" rc-input-number "~7.3.0" @@ -7399,10 +7399,10 @@ i18next-browser-languagedetector@^6.1.4: dependencies: "@babel/runtime" "^7.14.6" -i18next@^21.6.14: - version "21.6.14" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.6.14.tgz#2bc199fba7f4da44b5952d7df0a3814a6e5c3943" - integrity sha512-XL6WyD+xlwQwbieXRlXhKWoLb/rkch50/rA+vl6untHnJ+aYnkQ0YDZciTWE78PPhOpbi2gR0LTJCJpiAhA+uQ== +i18next@^21.6.16: + version "21.6.16" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.6.16.tgz#8cff8c3ba2ffaf8438a8c83fe284083f15cf3941" + integrity sha512-xJlzrVxG9CyAGsbMP1aKuiNr1Ed2m36KiTB7hjGMG2Zo4idfw3p9THUEu+GjBwIgEZ7F11ZbCzJcfv4uyfKNuw== dependencies: "@babel/runtime" "^7.17.2" @@ -8883,10 +8883,10 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -libphonenumber-js@^1.9.50: - version "1.9.50" - resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.50.tgz#f5028a2c4cc47a69d69a0de3629afad97a613712" - integrity sha512-cCzQPChw2XbordcO2LKiw5Htx5leHVfFk/EXkxNHqJfFo7Fndcb1kF5wPJpc316vCJhhikedYnVysMh3Sc7Ocw== +libphonenumber-js@^1.9.51: + version "1.9.51" + resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.51.tgz#c2529e391bdf68d1e60e283419f58c9ad4de4185" + integrity sha512-MGidRDs7s2nUybwrB/UjZT4nPXZPYQZQTu/sF3/O2v/DocmD8N6G+a9kwDt2qm7DaOo35XRt7hAIbYL+ml942Q== lie@~3.3.0: version "3.3.0" @@ -9165,10 +9165,10 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -markerjs2@^2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/markerjs2/-/markerjs2-2.20.0.tgz#400b83f8bbdcc2ac99aa3ae29a514fec1f1bebe9" - integrity sha512-uk5LEQsQJJ7brNW5xCSvUW3m+1IH/A6bj+ellbaQfmiYPVH7S8JMRUlu+QrAW8jX8UtCoKdBplS+mZEXGyNMpg== +markerjs2@^2.21.0: + version "2.21.0" + resolved "https://registry.yarnpkg.com/markerjs2/-/markerjs2-2.21.0.tgz#f2b4c524c058300709b54c0db2086569d00d9b1a" + integrity sha512-SC0/6VfT52laKWmnDQDKRqMREKhGzltJYWHaGFhoJza36IplFfrVRA1IYSPqHa5xKPApQmEn7fyNiSgfCi2VRA== material-colors@^1.2.1: version "1.2.6" @@ -10215,10 +10215,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -phone@^3.1.14: - version "3.1.14" - resolved "https://registry.yarnpkg.com/phone/-/phone-3.1.14.tgz#9fc3c0b662737395e1e0f758ecd344062e2b5137" - integrity sha512-VoeEXhHgNfvMqPE5QD6usnh+wZbCqbEUQcAqwNZkGXKfktjb6ISVEbWa85SiYxdrdzTQFj7GD0hpQNSEREBbJQ== +phone@^3.1.15: + version "3.1.15" + resolved "https://registry.yarnpkg.com/phone/-/phone-3.1.15.tgz#6d950005272626b6ab3a1cecb0ca2f4a5c558278" + integrity sha512-9p7uIFcuKB+lspsRNV+TfRJdG8Zm6rytFnuu+ScurXcvlJSDwJVpO5R5AFb0QaUvliMaeOkYdkHOSHjtHIRbeg== picocolors@^0.2.1: version "0.2.1" @@ -11383,10 +11383,10 @@ rc-dropdown@~3.3.2: rc-trigger "^5.0.4" rc-util "^5.17.0" -rc-field-form@~1.24.0: - version "1.24.0" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.24.0.tgz#2510a5c34713831ddcb412d4560be9057fc0dc5e" - integrity sha512-5beNBU5gEyi8YRYyqbTWSu5hO0jZQN0AWpY3U7TcllUKrDLcZZdRXuAOpyxJQcttWFs+UAFsbcRAUtnOGBjl7w== +rc-field-form@~1.25.0: + version "1.25.2" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.25.2.tgz#de418194b7aca2f1b6e0e059edd97b5cf624f68a" + integrity sha512-FXGScWibDlwIlKY15T1YOA7VTtMJwqxxXdDjHB56ZNx7wGbE4vK+Fe2zcymyakGZD0ej8NUP5LGr7qBVWaVpUQ== dependencies: "@babel/runtime" "^7.8.4" async-validator "^4.0.2" @@ -11900,10 +11900,10 @@ react-grid-layout@^1.3.4: react-draggable "^4.0.0" react-resizable "^3.0.4" -react-i18next@^11.16.2: - version "11.16.2" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.16.2.tgz#650b18c12a624057ee2651ba4b4a989b526be554" - integrity sha512-1iuZduvARUelL5ux663FvIoDZExwFO+9QtRAAt4uvs1/aun4cUZt8XBrVg7iiDgNls9cOSORAhE7Ri5KA9RMvg== +react-i18next@^11.16.5: + version "11.16.5" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.16.5.tgz#5258784b9b617c443811307072a434ec7447c70a" + integrity sha512-dkDN9suVU/jaD9A0xM4qNU9++LwgueWZn5XGTDEKTZeBgsd3q17ssTQXlSbEb0Gl0iLDdUKU7MrdjQjDc33ztA== dependencies: "@babel/runtime" "^7.14.5" html-escaper "^2.0.2" @@ -11977,10 +11977,10 @@ react-redux@^7.2.0: prop-types "^15.7.2" react-is "^17.0.2" -react-redux@^7.2.7: - version "7.2.7" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.7.tgz#f5edd4e4bc34ec8787451d77d16663abf12f8be9" - integrity sha512-kpstUHhXgT5HOLwzoRhDr3AWHO7H5mgTN5pX1H02OuoIMaZiOLYlul8vgan2WE8eEttAEMew8Npgzd3C6Asdow== +react-redux@^7.2.8: + version "7.2.8" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.8.tgz#a894068315e65de5b1b68899f9c6ee0923dd28de" + integrity sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw== dependencies: "@babel/runtime" "^7.15.4" "@types/react-redux" "^7.1.20" @@ -12729,10 +12729,10 @@ sass-loader@^10.0.5: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.49.10: - version "1.49.10" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.10.tgz#7b83cee0f03bbba443111b3f94944fde2b0c7a6b" - integrity sha512-w37zfWJwKu4I78U4z63u1mmgoncq+v3iOB4yzQMPyAPVHHawaQSnu9C9ysGQnZEhW609jkcLioJcMCqm75JMdg== +sass@^1.50.0: + version "1.50.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.50.0.tgz#3e407e2ebc53b12f1e35ce45efb226ea6063c7c8" + integrity sha512-cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 43f0d4f61..698067c69 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -844,6 +844,7 @@ - md_notes_presets - md_order_statuses - md_parts_locations + - md_parts_order_comment - md_payment_types - md_rbac - md_referral_sources @@ -928,6 +929,7 @@ - md_notes_presets - md_order_statuses - md_parts_locations + - md_parts_order_comment - md_payment_types - md_rbac - md_referral_sources diff --git a/hasura/migrations/1649707170715_alter_table_public_bodyshops_add_column_md_parts_order_comment/down.sql b/hasura/migrations/1649707170715_alter_table_public_bodyshops_add_column_md_parts_order_comment/down.sql new file mode 100644 index 000000000..83ad59052 --- /dev/null +++ b/hasura/migrations/1649707170715_alter_table_public_bodyshops_add_column_md_parts_order_comment/down.sql @@ -0,0 +1,4 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- alter table "public"."bodyshops" add column "md_parts_order_comment" jsonb +-- not null default jsonb_build_array(); diff --git a/hasura/migrations/1649707170715_alter_table_public_bodyshops_add_column_md_parts_order_comment/up.sql b/hasura/migrations/1649707170715_alter_table_public_bodyshops_add_column_md_parts_order_comment/up.sql new file mode 100644 index 000000000..a0ac40ce4 --- /dev/null +++ b/hasura/migrations/1649707170715_alter_table_public_bodyshops_add_column_md_parts_order_comment/up.sql @@ -0,0 +1,2 @@ +alter table "public"."bodyshops" add column "md_parts_order_comment" jsonb + not null default jsonb_build_array();