{visible && (
- {state.filters && state.filters.length > 0 && (
-
-
- {(fields, {add, remove, move}) => {
- return (
-
- {fields.map((field, index) => (
-
-
-
-
-
-
-
-
- {
- () => {
- const name = form.getFieldValue(['filters', field.name, "field"]);
- const type = state.filters.find(f => f.name === name)?.type;
-
- return
-
- }
- }
-
-
-
-
-
- {
- () => {
- const name = form.getFieldValue(['filters', field.name, "field"]);
- const type = state.filters.find(f => f.name === name)?.type;
-
- return
- {type === 'number' ?
- {
- form.setFieldsValue({[field.name]: {value: parseInt(value)}});
- }}
- />
- :
- {
- form.setFieldsValue({[field.name]: {value: value.toString()}});
- }}
- />
- }
-
- }
- }
-
-
-
-
- {
- remove(field.name);
- }}
- />
-
-
-
- ))}
-
-
-
-
- );
- }}
-
-
-
+ {filters.length > 0 && (
+
)}
- {state.sorters && state.sorters.length > 0 && (
-
-
- {(fields, {add, remove, move}) => {
- return (
-
- Sorters
- {fields.map((field, index) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- remove(field.name);
- }}
- />
-
-
-
- ))}
-
-
-
-
- );
- }}
-
-
+ {sorters.length > 0 && (
+
)}
)}
diff --git a/client/src/components/report-center-modal/report-center-modal-utils.js b/client/src/components/report-center-modal/report-center-modal-utils.js
new file mode 100644
index 000000000..2f9fc5e87
--- /dev/null
+++ b/client/src/components/report-center-modal/report-center-modal-utils.js
@@ -0,0 +1,121 @@
+import {uniqBy} from "lodash";
+
+/**
+ * Get value from path
+ * @param obj
+ * @param path
+ * @returns {*}
+ */
+const getValueFromPath = (obj, path) => path.split('.').reduce((prev, curr) => prev?.[curr], obj);
+
+/**
+ * Valid internal reflections
+ * Note: This is intended for future functionality
+ * @type {{special: string[], bodyshop: [{name: string, type: string}]}}
+ */
+const VALID_INTERNAL_REFLECTIONS = {
+ bodyshop: [
+ {
+ name: 'md_ro_statuses.statuses',
+ type: 'kv-to-v'
+ }
+ ],
+};
+
+/**
+ * Generate options
+ * @param bodyshop
+ * @param path
+ * @param labelPath
+ * @param valuePath
+ * @returns {{label: *, value: *}[]}
+ */
+const generateOptionsFromObject = (bodyshop, path, labelPath, valuePath) => {
+ const options = getValueFromPath(bodyshop, path);
+ return uniqBy(Object.values(options).map((value) => ({
+ label: value[labelPath],
+ value: value[valuePath],
+ })), 'value');
+}
+
+/**
+ * Generate special reflections
+ * @param bodyshop
+ * @param finalPath
+ * @returns {{label: *, value: *}[]|{label: *, value: *}[]|{label: string, value: *}[]|*[]}
+ */
+const generateSpecialReflections = (bodyshop, finalPath) => {
+ switch (finalPath) {
+ case 'cost_centers':
+ return generateOptionsFromObject(bodyshop, 'md_responsibility_centers.costs', 'name', 'name');
+ // Special case because Categories is an Array, not an Object.
+ case 'categories':
+ const catOptions = getValueFromPath(bodyshop, 'md_categories');
+ return uniqBy(catOptions.map((value) => ({
+ label: value,
+ value: value,
+ })), 'value');
+ case 'insurance_companies':
+ return generateOptionsFromObject(bodyshop, 'md_ins_cos', 'name', 'name');
+ case 'employee_teams':
+ return generateOptionsFromObject(bodyshop, 'employee_teams', 'name', 'id');
+ // Special case because Employees uses a concatenation of first_name and last_name
+ case 'employees':
+ const employeesOptions = getValueFromPath(bodyshop, 'employees');
+ return uniqBy(Object.values(employeesOptions).map((value) => ({
+ label: `${value.first_name} ${value.last_name}`,
+ value: value.id,
+ })), 'value');
+ case 'last_names':
+ return generateOptionsFromObject(bodyshop, 'employees', 'last_name', 'last_name');
+ case 'first_names':
+ return generateOptionsFromObject(bodyshop, 'employees', 'first_name', 'first_name');
+ case 'job_statuses':
+ const statusOptions = getValueFromPath(bodyshop, 'md_ro_statuses.statuses');
+ return Object.values(statusOptions).map((value) => ({
+ label: value,
+ value
+ }));
+ default:
+ console.error('Invalid Special reflection provided by Report Filters');
+ return [];
+ }
+}
+
+/**
+ * Generate bodyshop reflections
+ * @param bodyshop
+ * @param finalPath
+ * @returns {{label: *, value: *}[]|*[]}
+ */
+const generateBodyshopReflections = (bodyshop, finalPath) => {
+ const options = getValueFromPath(bodyshop, finalPath);
+ const reflectionRenderer = VALID_INTERNAL_REFLECTIONS.bodyshop.find(reflection => reflection.name === finalPath);
+ if (reflectionRenderer?.type === 'kv-to-v') {
+ return Object.values(options).map((value) => ({
+ label: value,
+ value
+ }));
+ }
+ return [];
+}
+
+/**
+ * Generate internal reflections based on the path and bodyshop
+ * @param bodyshop
+ * @param upperPath
+ * @param finalPath
+ * @returns {{label: *, value: *}[]|[]|{label: *, value: *}[]|{label: string, value: *}[]|{label: *, value: *}[]|*[]}
+ */
+const generateInternalReflections = ({bodyshop, upperPath, finalPath}) => {
+ switch (upperPath) {
+ case 'special':
+ return generateSpecialReflections(bodyshop, finalPath);
+ case 'bodyshop':
+ return generateBodyshopReflections(bodyshop, finalPath);
+ default:
+ return [];
+ }
+};
+
+export {generateInternalReflections,}
\ No newline at end of file
diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx
index 51e268465..3e835e88f 100644
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -16,9 +16,11 @@ import EmployeeSearchSelect from "../employee-search-select/employee-search-sele
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
import "./report-center-modal.styles.scss";
import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
+import {selectBodyshop} from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
reportCenterModal: selectReportCenter,
+ bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -28,7 +30,7 @@ export default connect(
mapDispatchToProps
)(ReportCenterModalComponent);
-export function ReportCenterModalComponent({reportCenterModal}) {
+export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
const [form] = Form.useForm();
const [search, setSearch] = useState("");
@@ -64,7 +66,7 @@ export function ReportCenterModalComponent({reportCenterModal}) {
const end = values.dates ? values.dates[1] : null;
const {id} = values;
- await GenerateDocument(
+ const templateConfig =
{
name: values.key,
variables: {
@@ -81,7 +83,14 @@ export function ReportCenterModalComponent({reportCenterModal}) {
},
filters: values.filters,
sorters: values.sorters,
- },
+ };
+
+ if (_.isString(values.defaultSorters) && !_.isEmpty(values.defaultSorters)) {
+ templateConfig.defaultSorters = JSON.parse(values.defaultSorters);
+ }
+
+ await GenerateDocument(
+ templateConfig,
{
to: values.to,
subject: Templates[values.key]?.subject,
@@ -119,6 +128,7 @@ export function ReportCenterModalComponent({reportCenterModal}) {
onChange={(e) => setSearch(e.target.value)}
value={search}
/>
+
-
+
{() => {
const key = form.getFieldValue("key");
diff --git a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
index 1d20ea88d..a26beadd6 100644
--- a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
+++ b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
@@ -1,5 +1,6 @@
import {useMutation} from "@apollo/client";
-import {Button, Card, Dropdown, Form, InputNumber, notification} from "antd";
+import {Button, Card, Dropdown, Form, InputNumber, notification, Space,} from "antd";
+import dayjs from "../../utils/day";
import React, {useState} from "react";
import {useTranslation} from "react-i18next";
import {UPDATE_SCOREBOARD_ENTRY} from "../../graphql/scoreboard.queries";
@@ -13,6 +14,7 @@ export default function ScoreboardEntryEdit({entry}) {
const handleFinish = async (values) => {
setLoading(true);
+ values.date = dayjs(values.date).format("YYYY-MM-DD");
const result = await updateScoreboardentry({
variables: {sbId: entry.id, sbInput: values},
});
@@ -82,13 +84,14 @@ export default function ScoreboardEntryEdit({entry}) {
>
-
+
+
)
diff --git a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
index 7799a5473..fa00ace09 100644
--- a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
+++ b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
@@ -1,3 +1,4 @@
+import {SyncOutlined} from "@ant-design/icons";
import {useQuery} from "@apollo/client";
import {Button, Card, Input, Modal, Space, Table, Typography} from "antd";
import React, {useState} from "react";
@@ -5,12 +6,13 @@ import {useTranslation} from "react-i18next";
import {Link} from "react-router-dom";
import {QUERY_SCOREBOARD_PAGINATED} from "../../graphql/scoreboard.queries";
import {DateFormatter} from "../../utils/DateFormatter";
+import {pageLimit} from "../../utils/config";
+import {alphaSort, dateSort} from "../../utils/sorters";
import AlertComponent from "../alert/alert.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {OwnerNameDisplayFunction,} from "../owner-name-display/owner-name-display.component";
import ScoreboardEntryEdit from "../scoreboard-entry-edit/scoreboard-entry-edit.component";
import ScoreboardRemoveButton from "../scoreboard-remove-button/scorebard-remove-button.component";
-import {SyncOutlined} from "@ant-design/icons";
-import {pageLimit} from "../../utils/config";
+
export default function ScoreboardJobsList({scoreBoardlist}) {
const {t} = useTranslation();
@@ -45,7 +47,7 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
title: t("jobs.fields.ro_number"),
dataIndex: "ro_number",
key: "ro_number",
- render: (text, record) => (
+ sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), render: (text, record) => (
{record.job.ro_number || t("general.labels.na")}
@@ -55,8 +57,11 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
title: t("jobs.fields.owner"),
dataIndex: "owner",
key: "owner",
- ellipsis: true,
-
+ ellipsis: true, sorter: (a, b) =>
+ alphaSort(
+ OwnerNameDisplayFunction(a.job),
+ OwnerNameDisplayFunction(b.job)
+ ),
render: (text, record) => ,
},
{
@@ -64,7 +69,15 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
dataIndex: "vehicle",
key: "vehicle",
ellipsis: true,
- render: (text, record) => (
+ sorter: (a, b) =>
+ alphaSort(
+ `${a.job.v_model_yr || ""} ${a.job.v_make_desc || ""} ${
+ a.job.v_model_desc || ""
+ }`,
+ `${b.job.v_model_yr || ""} ${b.job.v_make_desc || ""} ${
+ b.job.v_model_desc || ""
+ }`
+ ), render: (text, record) => (
{`${record.job.v_model_yr || ""} ${
record.job.v_make_desc || ""
} ${record.job.v_model_desc || ""}`}
@@ -74,17 +87,20 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
title: t("scoreboard.fields.date"),
dataIndex: "date",
key: "date",
+ sorter: (a, b) => dateSort(a.date, b.date),
render: (text, record) => {record.date},
},
- {
- title: t("scoreboard.fields.painthrs"),
- dataIndex: "painthrs",
- key: "painthrs",
- },
{
title: t("scoreboard.fields.bodyhrs"),
dataIndex: "bodyhrs",
key: "bodyhrs",
+ sorter: (a, b) => Number(a.bodyhrs) - Number(b.bodyhrs),
+ },
+ {
+ title: t("scoreboard.fields.painthrs"),
+ dataIndex: "painthrs",
+ key: "painthrs",
+ sorter: (a, b) => Number(a.painthrs) - Number(b.painthrs),
},
{
title: t("general.labels.actions"),
@@ -105,11 +121,9 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
open={state.open}
destroyOnClose
width="80%"
+ closable={false}
cancelButtonProps={{style: {display: "none"}}}
- onOk={() => {
- setState((state) => ({...state, open: false}));
- }}
- onCancel={() =>
+ onOk={() =>
setState((state) => ({
...state,
open: false,
@@ -161,9 +175,7 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
diff --git a/client/src/graphql/courtesy-car.queries.js b/client/src/graphql/courtesy-car.queries.js
index 0edc2df78..4793e5473 100644
--- a/client/src/graphql/courtesy-car.queries.js
+++ b/client/src/graphql/courtesy-car.queries.js
@@ -22,6 +22,7 @@ export const QUERY_AVAILABLE_CC = gql`
]
status: { _eq: "courtesycars.status.in" }
}
+ order_by: { fleetnumber: asc }
) {
color
dailycost
@@ -29,6 +30,7 @@ export const QUERY_AVAILABLE_CC = gql`
fleetnumber
fuel
id
+ insuranceexpires
make
mileage
model
@@ -57,7 +59,7 @@ export const CHECK_CC_FLEET_NUMBER = gql`
`;
export const QUERY_ALL_CC = gql`
query QUERY_ALL_CC {
- courtesycars {
+ courtesycars(order_by: { fleetnumber: asc }) {
color
created_at
dailycost
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 56932ce7a..50463c401 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -747,6 +747,7 @@
"driverinformation": "Driver's Information",
"findcontract": "Find Contract",
"findermodal": "Contract Finder",
+ "insuranceexpired": "The courtesy car insurance expires before the car is expected to return.",
"noteconvertedfrom": "R.O. created from converted Courtesy Car Contract {{agreementnumber}}.",
"populatefromjob": "Populate from Job",
"rates": "Contract Rates",
@@ -874,6 +875,7 @@
"labels": {
"bodyhrs": "Body Hrs",
"dollarsinproduction": "Dollars in Production",
+ "phone": "Phone",
"prodhrs": "Production Hrs",
"refhrs": "Refinish Hrs"
},
@@ -889,8 +891,10 @@
"productiondollars": "Total Dollars in Production",
"productionhours": "Total Hours in Production",
"projectedmonthlysales": "Projected Monthly Sales",
- "scheduledintoday": "Sheduled In Today: {{date}}",
- "scheduledouttoday": "Sheduled Out Today: {{date}}"
+ "scheduledindate": "Sheduled In Today: {{date}}",
+ "scheduledintoday": "Sheduled In Today",
+ "scheduledoutdate": "Sheduled Out Today: {{date}}",
+ "scheduledouttoday": "Sheduled Out Today"
}
},
"dms": {
@@ -2614,6 +2618,11 @@
"advanced_filters_hide": "Hide",
"advanced_filters_filters": "Filters",
"advanced_filters_sorters": "Sorters",
+ "advanced_filters_filter_field": "Field",
+ "advanced_filters_sorter_field": "Field",
+ "advanced_filters_sorter_direction": "Direction",
+ "advanced_filters_filter_operator": "Operator",
+ "advanced_filters_filter_value": "Value",
"dates": "Dates",
"employee": "Employee",
"filterson": "Filters on {{object}}: {{field}}",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 2c7d5d4b5..f511c3dee 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -747,6 +747,7 @@
"driverinformation": "",
"findcontract": "",
"findermodal": "",
+ "insuranceexpired": "",
"noteconvertedfrom": "",
"populatefromjob": "",
"rates": "",
@@ -874,6 +875,7 @@
"labels": {
"bodyhrs": "",
"dollarsinproduction": "",
+ "phone": "",
"prodhrs": "",
"refhrs": ""
},
@@ -889,7 +891,9 @@
"productiondollars": "",
"productionhours": "",
"projectedmonthlysales": "",
+ "scheduledindate": "",
"scheduledintoday": "",
+ "scheduledoutdate": "",
"scheduledouttoday": ""
}
},
@@ -2614,6 +2618,11 @@
"advanced_filters_hide": "",
"advanced_filters_filters": "",
"advanced_filters_sorters": "",
+ "advanced_filters_filter_field": "",
+ "advanced_filters_sorter_field": "",
+ "advanced_filters_sorter_direction": "",
+ "advanced_filters_filter_operator": "",
+ "advanced_filters_filter_value": "",
"dates": "",
"employee": "",
"filterson": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 969b1772f..19007b8e1 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -747,6 +747,7 @@
"driverinformation": "",
"findcontract": "",
"findermodal": "",
+ "insuranceexpired": "",
"noteconvertedfrom": "",
"populatefromjob": "",
"rates": "",
@@ -874,6 +875,7 @@
"labels": {
"bodyhrs": "",
"dollarsinproduction": "",
+ "phone": "",
"prodhrs": "",
"refhrs": ""
},
@@ -889,7 +891,9 @@
"productiondollars": "",
"productionhours": "",
"projectedmonthlysales": "",
+ "scheduledindate": "",
"scheduledintoday": "",
+ "scheduledoutdate": "",
"scheduledouttoday": ""
}
},
@@ -2614,6 +2618,11 @@
"advanced_filters_hide": "",
"advanced_filters_filters": "",
"advanced_filters_sorters": "",
+ "advanced_filters_filter_field": "",
+ "advanced_filters_sorter_field": "",
+ "advanced_filters_sorter_direction": "",
+ "advanced_filters_filter_operator": "",
+ "advanced_filters_filter_value": "",
"dates": "",
"employee": "",
"filterson": "",
diff --git a/client/src/utils/DatePickerRanges.js b/client/src/utils/DatePickerRanges.js
index 6287c8750..4ec222552 100644
--- a/client/src/utils/DatePickerRanges.js
+++ b/client/src/utils/DatePickerRanges.js
@@ -57,6 +57,16 @@ const range = [
label: 'Last 90 Days',
value: [dayjs().add(-90, "day"), dayjs()],
}
-]
+];
+
+if (process.env.NODE_ENV === "development") {
+ range.push({
+ label: 'Last Year',
+ value: [
+ dayjs().subtract(1, "year"),
+ dayjs(),
+ ]
+ })
+}
export default range;
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 075cade83..b342bd1b7 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -9,7 +9,8 @@ import {store} from "../redux/store";
import client from "../utils/GraphQLClient";
import cleanAxios from "./CleanAxios";
import {TemplateList} from "./TemplateConstants";
-import {applyFilters, applySorters, parseQuery, printQuery, wrapFiltersInAnd} from "./graphQLmodifier";
+import {generateTemplate} from "./graphQLmodifier";
+
const server = process.env.REACT_APP_REPORTS_SERVER_URL;
jsreport.serverUrl = server;
@@ -74,7 +75,10 @@ export default async function RenderTemplate(
headerpath: `/${bodyshop.imexshopid}/header.html`,
footerpath: `/${bodyshop.imexshopid}/footer.html`,
bodyshop: bodyshop,
+ filters: templateObject?.filters,
+ sorters: templateObject?.sorters,
offset: bodyshop.timezone, //dayjs().utcOffset(),
+ defaultSorters: templateObject?.defaultSorters,
},
};
@@ -402,9 +406,12 @@ const fetchContextData = async (templateObject, jsrAuth) => {
// console.log('Unmodified Query');
// console.dir(templateQueryToExecute);
+ const hasFilters = templateObject?.filters?.length > 0;
+ const hasSorters = templateObject?.sorters?.length > 0;
+ const hasDefaultSorters = templateObject?.defaultSorters?.length > 0;
// We have no template filters or sorters, so we can just execute the query and return the data
- if ((!templateObject?.filters && !templateObject?.filters?.length && !templateObject?.sorters && !templateObject?.sorters?.length)) {
+ if (!hasFilters && !hasSorters && !hasDefaultSorters) {
let contextData = {};
if (templateQueryToExecute) {
const {data} = await client.query({
@@ -416,36 +423,11 @@ const fetchContextData = async (templateObject, jsrAuth) => {
return {contextData, useShopSpecificTemplate};
}
- // Parse the query and apply the filters and sorters
- const ast = parseQuery(templateQueryToExecute);
-
- let filterFields = [];
-
- if (templateObject?.filters && templateObject?.filters?.length) {
- applyFilters(ast, templateObject.filters, filterFields);
- wrapFiltersInAnd(ast, filterFields);
- }
-
- if (templateObject?.sorters && templateObject?.sorters?.length) {
- applySorters(ast, templateObject.sorters);
- }
-
- const finalQuery = printQuery(ast);
-
- // commented out for future revision debugging
- // console.log('Modified Query');
- // console.log(finalQuery);
-
- let contextData = {};
- if (templateQueryToExecute) {
- const {data} = await client.query({
- query: gql(finalQuery),
- variables: {...templateObject.variables},
- });
- contextData = data;
- }
-
- return {contextData, useShopSpecificTemplate};
+ return await generateTemplate(
+ templateQueryToExecute,
+ templateObject,
+ useShopSpecificTemplate
+ );
};
//export const displayTemplateInWindow = (html) => {
diff --git a/client/src/utils/graphQLmodifier.js b/client/src/utils/graphQLmodifier.js
index 141f83ddd..77aa14036 100644
--- a/client/src/utils/graphQLmodifier.js
+++ b/client/src/utils/graphQLmodifier.js
@@ -1,4 +1,6 @@
import {Kind, parse, print, visit} from "graphql";
+import client from "./GraphQLClient";
+import {gql} from "@apollo/client";
const STRING_OPERATORS = [
{value: "_eq", label: "equals"},
@@ -16,8 +18,26 @@ const NUMBER_OPERATORS = [
{value: "_gte", label: "greater than or equal"},
{value: "_lte", label: "less than or equal"}
];
+const ORDER_BY_OPERATORS = [
+ {value: "asc", label: "ascending"},
+ {value: "desc", label: "descending"}
+];
-export function getOperatorsByType(type = 'string') {
+/**
+ * Get the available operators for filtering
+ * @returns {[{label: string, value: string},{label: string, value: string}]}
+ */
+export function getOrderOperatorsByType() {
+ return ORDER_BY_OPERATORS;
+}
+
+
+/**
+ * Get the available operators for filtering
+ * @param type
+ * @returns {[{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},null]}
+ */
+export function getWhereOperatorsByType(type = 'string') {
const operators = {
string: STRING_OPERATORS,
number: NUMBER_OPERATORS
@@ -45,6 +65,51 @@ export function printQuery(query) {
return print(query);
}
+/**
+ * Generate a template based on the query and object
+ * @param templateQueryToExecute
+ * @param templateObject
+ * @param useShopSpecificTemplate
+ * @returns {Promise<{contextData: {}, useShopSpecificTemplate}>}
+ */
+export async function generateTemplate(templateQueryToExecute, templateObject, useShopSpecificTemplate) {
+ // Advanced Filtering and Sorting modifications start here
+
+ // Parse the query and apply the filters and sorters
+ const ast = parseQuery(templateQueryToExecute);
+
+ let filterFields = [];
+
+ if (templateObject?.filters && templateObject?.filters?.length) {
+ applyFilters(ast, templateObject.filters, filterFields);
+ wrapFiltersInAnd(ast, filterFields);
+ }
+
+ if (templateObject?.sorters && templateObject?.sorters?.length) {
+ applySorters(ast, templateObject.sorters);
+ } else if (templateObject?.defaultSorters && templateObject?.defaultSorters?.length) {
+ applySorters(ast, templateObject.defaultSorters);
+ }
+
+ const finalQuery = printQuery(ast);
+
+ // commented out for future revision debugging
+ // console.log('Modified Query');
+ // console.log(finalQuery);
+
+ let contextData = {};
+ if (templateQueryToExecute) {
+ const {data} = await client.query({
+ query: gql(finalQuery),
+ variables: {...templateObject.variables},
+ });
+ contextData = data;
+ }
+
+ return {contextData, useShopSpecificTemplate};
+}
+
+
/**
* Apply sorters to the AST
* @param ast
@@ -262,7 +327,6 @@ export function applyFilters(ast, filters) {
});
}
-
/**
* Get the GraphQL kind for a value
* @param value
diff --git a/package-lock.json b/package-lock.json
index b8a47e838..d42c79012 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,9 +9,9 @@
"version": "0.0.1",
"license": "UNLICENSED",
"dependencies": {
- "@aws-sdk/client-secrets-manager": "^3.513.0",
- "@aws-sdk/client-ses": "^3.513.0",
- "@aws-sdk/credential-provider-node": "^3.513.0",
+ "@aws-sdk/client-secrets-manager": "^3.515.0",
+ "@aws-sdk/client-ses": "^3.515.0",
+ "@aws-sdk/credential-provider-node": "^3.515.0",
"@opensearch-project/opensearch": "^2.5.0",
"aws4": "^1.12.0",
"axios": "^1.6.5",
@@ -23,7 +23,7 @@
"cors": "2.8.5",
"csrf": "^3.1.0",
"dinero.js": "^1.9.1",
- "dotenv": "^16.4.4",
+ "dotenv": "^16.4.5",
"express": "^4.18.2",
"firebase-admin": "^12.0.0",
"graphql": "^16.8.1",
@@ -31,7 +31,7 @@
"graylog2": "^0.2.1",
"inline-css": "^4.0.2",
"intuit-oauth": "^4.0.0",
- "json-2-csv": "^5.0.1",
+ "json-2-csv": "^5.2.0",
"lodash": "^4.17.21",
"moment": "^2.30.1",
"moment-timezone": "^0.5.45",
@@ -39,13 +39,13 @@
"node-mailjet": "^6.0.5",
"node-persist": "^4.0.1",
"node-quickbooks": "^2.0.43",
- "nodemailer": "^6.9.9",
+ "nodemailer": "^6.9.10",
"phone": "^3.1.42",
"rimraf": "^5.0.5",
"soap": "^1.0.0",
"socket.io": "^4.7.4",
"ssh2-sftp-client": "^10.0.3",
- "stripe": "^14.16.0",
+ "stripe": "^14.18.0",
"twilio": "^4.22.0",
"uuid": "^9.0.1",
"xml2js": "^0.6.2",
@@ -152,24 +152,24 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@aws-sdk/client-secrets-manager": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.513.0.tgz",
- "integrity": "sha512-6ZDYjjPqiF59Tm01wz9AqOUiZxcuDKFHvW0Vs2ugx/OoffEkguXdyYKieyykuUEFFT+Qh9oP38v/mQNRhRubEA==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.515.0.tgz",
+ "integrity": "sha512-YO7SVh0mQ55COP5LcKsXE+o6wsOBBn3beAqKDZIBdjXho5rNhTdvbtaGTiaZmv0ALtu7TxtPVixhbDE0y1QseA==",
"dependencies": {
"@aws-crypto/sha256-browser": "3.0.0",
"@aws-crypto/sha256-js": "3.0.0",
- "@aws-sdk/client-sts": "3.513.0",
+ "@aws-sdk/client-sts": "3.515.0",
"@aws-sdk/core": "3.513.0",
- "@aws-sdk/credential-provider-node": "3.513.0",
- "@aws-sdk/middleware-host-header": "3.511.0",
- "@aws-sdk/middleware-logger": "3.511.0",
- "@aws-sdk/middleware-recursion-detection": "3.511.0",
- "@aws-sdk/middleware-user-agent": "3.511.0",
- "@aws-sdk/region-config-resolver": "3.511.0",
- "@aws-sdk/types": "3.511.0",
- "@aws-sdk/util-endpoints": "3.511.0",
- "@aws-sdk/util-user-agent-browser": "3.511.0",
- "@aws-sdk/util-user-agent-node": "3.511.0",
+ "@aws-sdk/credential-provider-node": "3.515.0",
+ "@aws-sdk/middleware-host-header": "3.515.0",
+ "@aws-sdk/middleware-logger": "3.515.0",
+ "@aws-sdk/middleware-recursion-detection": "3.515.0",
+ "@aws-sdk/middleware-user-agent": "3.515.0",
+ "@aws-sdk/region-config-resolver": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
+ "@aws-sdk/util-endpoints": "3.515.0",
+ "@aws-sdk/util-user-agent-browser": "3.515.0",
+ "@aws-sdk/util-user-agent-node": "3.515.0",
"@smithy/config-resolver": "^2.1.1",
"@smithy/core": "^1.3.2",
"@smithy/fetch-http-handler": "^2.4.1",
@@ -196,39 +196,31 @@
"@smithy/util-retry": "^2.1.1",
"@smithy/util-utf8": "^2.1.1",
"tslib": "^2.5.0",
- "uuid": "^8.3.2"
+ "uuid": "^9.0.1"
},
"engines": {
"node": ">=14.0.0"
}
},
- "node_modules/@aws-sdk/client-secrets-manager/node_modules/uuid": {
- "version": "8.3.2",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
- "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
- "bin": {
- "uuid": "dist/bin/uuid"
- }
- },
"node_modules/@aws-sdk/client-ses": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/client-ses/-/client-ses-3.513.0.tgz",
- "integrity": "sha512-9pvzyCZGVO283OPAdUkSC4QPY7Sfk9jNqs0gzLQvqM1FggjS1jc6vbMqBcRCte87fXkSPyLo0IEX/kaMH4dEMQ==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-ses/-/client-ses-3.515.0.tgz",
+ "integrity": "sha512-X51TvcpqJ83ZOSUa/efWl+cj3cXBF6fCb2iNghjRD2McDvzGKoiR+Zaoy05doPdh/GZ7azTBqX0qKRIyUj//wg==",
"dependencies": {
"@aws-crypto/sha256-browser": "3.0.0",
"@aws-crypto/sha256-js": "3.0.0",
- "@aws-sdk/client-sts": "3.513.0",
+ "@aws-sdk/client-sts": "3.515.0",
"@aws-sdk/core": "3.513.0",
- "@aws-sdk/credential-provider-node": "3.513.0",
- "@aws-sdk/middleware-host-header": "3.511.0",
- "@aws-sdk/middleware-logger": "3.511.0",
- "@aws-sdk/middleware-recursion-detection": "3.511.0",
- "@aws-sdk/middleware-user-agent": "3.511.0",
- "@aws-sdk/region-config-resolver": "3.511.0",
- "@aws-sdk/types": "3.511.0",
- "@aws-sdk/util-endpoints": "3.511.0",
- "@aws-sdk/util-user-agent-browser": "3.511.0",
- "@aws-sdk/util-user-agent-node": "3.511.0",
+ "@aws-sdk/credential-provider-node": "3.515.0",
+ "@aws-sdk/middleware-host-header": "3.515.0",
+ "@aws-sdk/middleware-logger": "3.515.0",
+ "@aws-sdk/middleware-recursion-detection": "3.515.0",
+ "@aws-sdk/middleware-user-agent": "3.515.0",
+ "@aws-sdk/region-config-resolver": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
+ "@aws-sdk/util-endpoints": "3.515.0",
+ "@aws-sdk/util-user-agent-browser": "3.515.0",
+ "@aws-sdk/util-user-agent-node": "3.515.0",
"@smithy/config-resolver": "^2.1.1",
"@smithy/core": "^1.3.2",
"@smithy/fetch-http-handler": "^2.4.1",
@@ -263,22 +255,22 @@
}
},
"node_modules/@aws-sdk/client-sso": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.513.0.tgz",
- "integrity": "sha512-621Aj/KrgvKJXXViatb3zM+TdM3n+lodmMbSm+FH37RqYoj36s5FgmXan3Ebu9WBu1lUzKm+a3ZyRWVces52uQ==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.515.0.tgz",
+ "integrity": "sha512-4oGBLW476zmkdN98lAns3bObRNO+DLOfg4MDUSR6l6GYBV/zGAtoy2O/FhwYKgA2L5h2ZtElGopLlk/1Q0ePLw==",
"dependencies": {
"@aws-crypto/sha256-browser": "3.0.0",
"@aws-crypto/sha256-js": "3.0.0",
"@aws-sdk/core": "3.513.0",
- "@aws-sdk/middleware-host-header": "3.511.0",
- "@aws-sdk/middleware-logger": "3.511.0",
- "@aws-sdk/middleware-recursion-detection": "3.511.0",
- "@aws-sdk/middleware-user-agent": "3.511.0",
- "@aws-sdk/region-config-resolver": "3.511.0",
- "@aws-sdk/types": "3.511.0",
- "@aws-sdk/util-endpoints": "3.511.0",
- "@aws-sdk/util-user-agent-browser": "3.511.0",
- "@aws-sdk/util-user-agent-node": "3.511.0",
+ "@aws-sdk/middleware-host-header": "3.515.0",
+ "@aws-sdk/middleware-logger": "3.515.0",
+ "@aws-sdk/middleware-recursion-detection": "3.515.0",
+ "@aws-sdk/middleware-user-agent": "3.515.0",
+ "@aws-sdk/region-config-resolver": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
+ "@aws-sdk/util-endpoints": "3.515.0",
+ "@aws-sdk/util-user-agent-browser": "3.515.0",
+ "@aws-sdk/util-user-agent-node": "3.515.0",
"@smithy/config-resolver": "^2.1.1",
"@smithy/core": "^1.3.2",
"@smithy/fetch-http-handler": "^2.4.1",
@@ -311,23 +303,23 @@
}
},
"node_modules/@aws-sdk/client-sso-oidc": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.513.0.tgz",
- "integrity": "sha512-DyncBVOR5aENL6vOeHPllIAwWUaDZdj1aRKVWiNECG4LuuwwjASX0wFLxTRe/4al3Ugob0OLqsrgC2hd59BLJA==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.515.0.tgz",
+ "integrity": "sha512-zACa8LNlPUdlNUBqQRf5a3MfouLNtcBfm84v2c8M976DwJrMGONPe1QjyLLsD38uESQiXiVQRruj/b000iMXNw==",
"dependencies": {
"@aws-crypto/sha256-browser": "3.0.0",
"@aws-crypto/sha256-js": "3.0.0",
- "@aws-sdk/client-sts": "3.513.0",
+ "@aws-sdk/client-sts": "3.515.0",
"@aws-sdk/core": "3.513.0",
- "@aws-sdk/middleware-host-header": "3.511.0",
- "@aws-sdk/middleware-logger": "3.511.0",
- "@aws-sdk/middleware-recursion-detection": "3.511.0",
- "@aws-sdk/middleware-user-agent": "3.511.0",
- "@aws-sdk/region-config-resolver": "3.511.0",
- "@aws-sdk/types": "3.511.0",
- "@aws-sdk/util-endpoints": "3.511.0",
- "@aws-sdk/util-user-agent-browser": "3.511.0",
- "@aws-sdk/util-user-agent-node": "3.511.0",
+ "@aws-sdk/middleware-host-header": "3.515.0",
+ "@aws-sdk/middleware-logger": "3.515.0",
+ "@aws-sdk/middleware-recursion-detection": "3.515.0",
+ "@aws-sdk/middleware-user-agent": "3.515.0",
+ "@aws-sdk/region-config-resolver": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
+ "@aws-sdk/util-endpoints": "3.515.0",
+ "@aws-sdk/util-user-agent-browser": "3.515.0",
+ "@aws-sdk/util-user-agent-node": "3.515.0",
"@smithy/config-resolver": "^2.1.1",
"@smithy/core": "^1.3.2",
"@smithy/fetch-http-handler": "^2.4.1",
@@ -359,26 +351,26 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "@aws-sdk/credential-provider-node": "^3.513.0"
+ "@aws-sdk/credential-provider-node": "^3.515.0"
}
},
"node_modules/@aws-sdk/client-sts": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.513.0.tgz",
- "integrity": "sha512-reWhX5CO+XZhT8xIdDPnEws0KQNBuvcSY2W7niSPVYfq1mOLkQgYenP/sC/TyvnNuZDzgcmJQdbdAKHuZvMuUQ==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.515.0.tgz",
+ "integrity": "sha512-ScYuvaIDgip3atOJIA1FU2n0gJkEdveu1KrrCPathoUCV5zpK8qQmO/n+Fj/7hKFxeKdFbB+4W4CsJWYH94nlg==",
"dependencies": {
"@aws-crypto/sha256-browser": "3.0.0",
"@aws-crypto/sha256-js": "3.0.0",
"@aws-sdk/core": "3.513.0",
- "@aws-sdk/middleware-host-header": "3.511.0",
- "@aws-sdk/middleware-logger": "3.511.0",
- "@aws-sdk/middleware-recursion-detection": "3.511.0",
- "@aws-sdk/middleware-user-agent": "3.511.0",
- "@aws-sdk/region-config-resolver": "3.511.0",
- "@aws-sdk/types": "3.511.0",
- "@aws-sdk/util-endpoints": "3.511.0",
- "@aws-sdk/util-user-agent-browser": "3.511.0",
- "@aws-sdk/util-user-agent-node": "3.511.0",
+ "@aws-sdk/middleware-host-header": "3.515.0",
+ "@aws-sdk/middleware-logger": "3.515.0",
+ "@aws-sdk/middleware-recursion-detection": "3.515.0",
+ "@aws-sdk/middleware-user-agent": "3.515.0",
+ "@aws-sdk/region-config-resolver": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
+ "@aws-sdk/util-endpoints": "3.515.0",
+ "@aws-sdk/util-user-agent-browser": "3.515.0",
+ "@aws-sdk/util-user-agent-node": "3.515.0",
"@smithy/config-resolver": "^2.1.1",
"@smithy/core": "^1.3.2",
"@smithy/fetch-http-handler": "^2.4.1",
@@ -411,7 +403,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "@aws-sdk/credential-provider-node": "^3.513.0"
+ "@aws-sdk/credential-provider-node": "^3.515.0"
}
},
"node_modules/@aws-sdk/core": {
@@ -431,11 +423,11 @@
}
},
"node_modules/@aws-sdk/credential-provider-env": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.511.0.tgz",
- "integrity": "sha512-4VUsnLRox8YzxnZwnFrfZM4bL5KKLhsjjjX7oiuLyzFkhauI4HFYt7rTB8YNGphpqAg/Wzw5DBZfO3Bw1iR1HA==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.515.0.tgz",
+ "integrity": "sha512-45vxdyqhTAaUMERYVWOziG3K8L2TV9G4ryQS/KZ84o7NAybE9GMdoZRVmGHAO7mJJ1wQiYCM/E+i5b3NW9JfNA==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/property-provider": "^2.1.1",
"@smithy/types": "^2.9.1",
"tslib": "^2.5.0"
@@ -445,11 +437,11 @@
}
},
"node_modules/@aws-sdk/credential-provider-http": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.511.0.tgz",
- "integrity": "sha512-y83Gt8GPpgMe/lMFxIq+0G2rbzLTC6lhrDocHUzqcApLD6wet8Esy2iYckSRlJgYY+qsVAzpLrSMtt85DwRPTw==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.515.0.tgz",
+ "integrity": "sha512-Ba6FXK77vU4WyheiamNjEuTFmir0eAXuJGPO27lBaA8g+V/seXGHScsbOG14aQGDOr2P02OPwKGZrWWA7BFpfQ==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/fetch-http-handler": "^2.4.1",
"@smithy/node-http-handler": "^2.3.1",
"@smithy/property-provider": "^2.1.1",
@@ -464,16 +456,16 @@
}
},
"node_modules/@aws-sdk/credential-provider-ini": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.513.0.tgz",
- "integrity": "sha512-J9FAmTVHm9RsXxXluXCmJ+crkZPDpdNQhiVrbmPPq989lfr0u33rf1aKFMF5AyHNcNEWeAYKKBQwJJkcsxStIA==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.515.0.tgz",
+ "integrity": "sha512-ouDlNZdv2TKeVEA/YZk2+XklTXyAAGdbWnl4IgN9ItaodWI+lZjdIoNC8BAooVH+atIV/cZgoGTGQL7j2TxJ9A==",
"dependencies": {
- "@aws-sdk/client-sts": "3.513.0",
- "@aws-sdk/credential-provider-env": "3.511.0",
- "@aws-sdk/credential-provider-process": "3.511.0",
- "@aws-sdk/credential-provider-sso": "3.513.0",
- "@aws-sdk/credential-provider-web-identity": "3.513.0",
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/client-sts": "3.515.0",
+ "@aws-sdk/credential-provider-env": "3.515.0",
+ "@aws-sdk/credential-provider-process": "3.515.0",
+ "@aws-sdk/credential-provider-sso": "3.515.0",
+ "@aws-sdk/credential-provider-web-identity": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/credential-provider-imds": "^2.2.1",
"@smithy/property-provider": "^2.1.1",
"@smithy/shared-ini-file-loader": "^2.3.1",
@@ -485,17 +477,17 @@
}
},
"node_modules/@aws-sdk/credential-provider-node": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.513.0.tgz",
- "integrity": "sha512-Cp6tYUJ+g8zJxI8vE0A9W6AxRLq3iR2zGGKsrPLNmZkUaHoVaJiNEd+2nL9RwCqDRve+N+Sh3mbZrLiqh3DO6A==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.515.0.tgz",
+ "integrity": "sha512-Y4kHSpbxksiCZZNcvsiKUd8Fb2XlyUuONEwqWFNL82ZH6TCCjBGS31wJQCSxBHqYcOL3tiORUEJkoO7uS30uQA==",
"dependencies": {
- "@aws-sdk/credential-provider-env": "3.511.0",
- "@aws-sdk/credential-provider-http": "3.511.0",
- "@aws-sdk/credential-provider-ini": "3.513.0",
- "@aws-sdk/credential-provider-process": "3.511.0",
- "@aws-sdk/credential-provider-sso": "3.513.0",
- "@aws-sdk/credential-provider-web-identity": "3.513.0",
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/credential-provider-env": "3.515.0",
+ "@aws-sdk/credential-provider-http": "3.515.0",
+ "@aws-sdk/credential-provider-ini": "3.515.0",
+ "@aws-sdk/credential-provider-process": "3.515.0",
+ "@aws-sdk/credential-provider-sso": "3.515.0",
+ "@aws-sdk/credential-provider-web-identity": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/credential-provider-imds": "^2.2.1",
"@smithy/property-provider": "^2.1.1",
"@smithy/shared-ini-file-loader": "^2.3.1",
@@ -507,11 +499,11 @@
}
},
"node_modules/@aws-sdk/credential-provider-process": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.511.0.tgz",
- "integrity": "sha512-88hLUPqcTwjSubPS+34ZfmglnKeLny8GbmZsyllk96l26PmDTAqo5RScSA8BWxL0l5pRRWGtcrFyts+oibHIuQ==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.515.0.tgz",
+ "integrity": "sha512-pSjiOA2FM63LHRKNDvEpBRp80FVGT0Mw/gzgbqFXP+sewk0WVonYbEcMDTJptH3VsLPGzqH/DQ1YL/aEIBuXFQ==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/property-provider": "^2.1.1",
"@smithy/shared-ini-file-loader": "^2.3.1",
"@smithy/types": "^2.9.1",
@@ -522,13 +514,13 @@
}
},
"node_modules/@aws-sdk/credential-provider-sso": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.513.0.tgz",
- "integrity": "sha512-q9rRwRWVut97+hnc0Yt77tGeKoPLLDpKKVpVGC6e+EQHlXM4H6oq2VGLgXYJPA9HpMJ3t5zmmgHxEafYeFZo+w==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.515.0.tgz",
+ "integrity": "sha512-j7vUkiSmuhpBvZYoPTRTI4ePnQbiZMFl6TNhg9b9DprC1zHkucsZnhRhqjOVlrw/H6J4jmcPGcHHTZ5WQNI5xQ==",
"dependencies": {
- "@aws-sdk/client-sso": "3.513.0",
- "@aws-sdk/token-providers": "3.513.0",
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/client-sso": "3.515.0",
+ "@aws-sdk/token-providers": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/property-provider": "^2.1.1",
"@smithy/shared-ini-file-loader": "^2.3.1",
"@smithy/types": "^2.9.1",
@@ -539,12 +531,12 @@
}
},
"node_modules/@aws-sdk/credential-provider-web-identity": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.513.0.tgz",
- "integrity": "sha512-0EZUQhbDaV3jxvIjcWEGiGmioFS0vEvUxaJrMgeRLUo9njZfLZ4VaEMsqPnZ9rMz2w9CxfpDeObEQlDzYeGRgA==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.515.0.tgz",
+ "integrity": "sha512-66+2g4z3fWwdoGReY8aUHvm6JrKZMTRxjuizljVmMyOBttKPeBYXvUTop/g3ZGUx1f8j+C5qsGK52viYBvtjuQ==",
"dependencies": {
- "@aws-sdk/client-sts": "3.513.0",
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/client-sts": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/property-provider": "^2.1.1",
"@smithy/types": "^2.9.1",
"tslib": "^2.5.0"
@@ -554,11 +546,11 @@
}
},
"node_modules/@aws-sdk/middleware-host-header": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.511.0.tgz",
- "integrity": "sha512-DbBzQP/6woSHR/+g9dHN3YiYaLIqFw9u8lQFMxi3rT3hqITFVYLzzXtEaHjDD6/is56pNT84CIKbyJ6/gY5d1Q==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.515.0.tgz",
+ "integrity": "sha512-I1MwWPzdRKM1luvdDdjdGsDjNVPhj9zaIytEchjTY40NcKOg+p2evLD2y69ozzg8pyXK63r8DdvDGOo9QPuh0A==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/protocol-http": "^3.1.1",
"@smithy/types": "^2.9.1",
"tslib": "^2.5.0"
@@ -568,11 +560,11 @@
}
},
"node_modules/@aws-sdk/middleware-logger": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.511.0.tgz",
- "integrity": "sha512-EYU9dBlJXvQcCsM2Tfgi0NQoXrqovfDv/fDy8oGJgZFrgNuHDti8tdVVxeJTUJNEAF67xlDl5o+rWEkKthkYGQ==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.515.0.tgz",
+ "integrity": "sha512-qXomJzg2m/5seQOxHi/yOXOKfSjwrrJSmEmfwJKJyQgdMbBcjz3Cz0H/1LyC6c5hHm6a/SZgSTzDAbAoUmyL+Q==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/types": "^2.9.1",
"tslib": "^2.5.0"
},
@@ -581,11 +573,11 @@
}
},
"node_modules/@aws-sdk/middleware-recursion-detection": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.511.0.tgz",
- "integrity": "sha512-PlNPCV/6zpDVdNx1K69xDTh/wPNU4WyP4qa6hUo2/+4/PNG5HI9xbCWtpb4RjhdTRw6qDtkBNcPICHbtWx5aHg==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.515.0.tgz",
+ "integrity": "sha512-dokHLbTV3IHRIBrw9mGoxcNTnQsjlm7TpkJhPdGT9T4Mq399EyQo51u6IsVMm07RXLl2Zw7u+u9p+qWBFzmFRA==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/protocol-http": "^3.1.1",
"@smithy/types": "^2.9.1",
"tslib": "^2.5.0"
@@ -595,12 +587,12 @@
}
},
"node_modules/@aws-sdk/middleware-user-agent": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.511.0.tgz",
- "integrity": "sha512-eLs+CxP2QCXh3tCGYCdAml3oyWj8MSIwKbH+8rKw0k/5vmY1YJDBy526whOxx61ivhz2e0muuijN4X5EZZ2Pnw==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.515.0.tgz",
+ "integrity": "sha512-nOqZjGA/GkjuJ5fUshec9Fv6HFd7ovOTxMJbw3MfAhqXuVZ6dKF41lpVJ4imNsgyFt3shUg9WDY8zGFjlYMB3g==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
- "@aws-sdk/util-endpoints": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
+ "@aws-sdk/util-endpoints": "3.515.0",
"@smithy/protocol-http": "^3.1.1",
"@smithy/types": "^2.9.1",
"tslib": "^2.5.0"
@@ -610,11 +602,11 @@
}
},
"node_modules/@aws-sdk/region-config-resolver": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.511.0.tgz",
- "integrity": "sha512-RzBLSNaRd4iEkQyEGfiSNvSnWU/x23rsiFgA9tqYFA0Vqx7YmzSWC8QBUxpwybB8HkbbL9wNVKQqTbhI3mYneQ==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.515.0.tgz",
+ "integrity": "sha512-RIRx9loxMgEAc/r1wPfnfShOuzn4RBi8pPPv6/jhhITEeMnJe6enAh2k5y9DdiVDDgCWZgVFSv0YkAIfzAFsnQ==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/node-config-provider": "^2.2.1",
"@smithy/types": "^2.9.1",
"@smithy/util-config-provider": "^2.2.1",
@@ -626,12 +618,12 @@
}
},
"node_modules/@aws-sdk/token-providers": {
- "version": "3.513.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.513.0.tgz",
- "integrity": "sha512-S27iFzj3dVRw1q+xLtqTGZOfYG95OwvTN7crvS2daqSYfcWN+dhEPzQJdDvGaAnAI45bWm8rppH/EYzrlxeZoA==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.515.0.tgz",
+ "integrity": "sha512-MQuf04rIcTXqwDzmyHSpFPF1fKEzRl64oXtCRUF3ddxTdK6wxXkePfK6wNCuL+GEbEcJAoCtIGIRpzGPJvQjHA==",
"dependencies": {
- "@aws-sdk/client-sso-oidc": "3.513.0",
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/client-sso-oidc": "3.515.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/property-provider": "^2.1.1",
"@smithy/shared-ini-file-loader": "^2.3.1",
"@smithy/types": "^2.9.1",
@@ -642,9 +634,9 @@
}
},
"node_modules/@aws-sdk/types": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.511.0.tgz",
- "integrity": "sha512-P03ufufxmkvd7nO46oOeEqYIMPJ8qMCKxAsfJk1JBVPQ1XctVntbail4/UFnrnzij8DTl4Mk/D62uGo7+RolXA==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.515.0.tgz",
+ "integrity": "sha512-B3gUpiMlpT6ERaLvZZ61D0RyrQPsFYDkCncLPVkZOKkCOoFU46zi1o6T5JcYiz8vkx1q9RGloQ5exh79s5pU/w==",
"dependencies": {
"@smithy/types": "^2.9.1",
"tslib": "^2.5.0"
@@ -654,11 +646,11 @@
}
},
"node_modules/@aws-sdk/util-endpoints": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.511.0.tgz",
- "integrity": "sha512-J/5hsscJkg2pAOdLx1YKlyMCk5lFRxRxEtup9xipzOxVBlqOIE72Tuu31fbxSlF8XzO/AuCJcZL4m1v098K9oA==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.515.0.tgz",
+ "integrity": "sha512-UJi+jdwcGFV/F7d3+e2aQn5yZOVpDiAgfgNhPnEtgV0WozJ5/ZUeZBgWvSc/K415N4A4D/9cbBc7+I+35qzcDQ==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/types": "^2.9.1",
"@smithy/util-endpoints": "^1.1.1",
"tslib": "^2.5.0"
@@ -679,22 +671,22 @@
}
},
"node_modules/@aws-sdk/util-user-agent-browser": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.511.0.tgz",
- "integrity": "sha512-5LuESdwtIcA10aHcX7pde7aCIijcyTPBXFuXmFlDTgm/naAayQxelQDpvgbzuzGLgePf8eTyyhDKhzwPZ2EqiQ==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.515.0.tgz",
+ "integrity": "sha512-pTWQb0JCafTmLHLDv3Qqs/nAAJghcPdGQIBpsCStb0YEzg3At/dOi2AIQ683yYnXmeOxLXJDzmlsovfVObJScw==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/types": "^2.9.1",
"bowser": "^2.11.0",
"tslib": "^2.5.0"
}
},
"node_modules/@aws-sdk/util-user-agent-node": {
- "version": "3.511.0",
- "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.511.0.tgz",
- "integrity": "sha512-UopdlRvYY5mxlS4wwFv+QAWL6/T302wmoQj7i+RY+c/D3Ej3PKBb/mW3r2wEOgZLJmPpeeM1SYMk+rVmsW1rqw==",
+ "version": "3.515.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.515.0.tgz",
+ "integrity": "sha512-A/KJ+/HTohHyVXLH+t/bO0Z2mPrQgELbQO8tX+B2nElo8uklj70r5cT7F8ETsI9oOy+HDVpiL5/v45ZgpUOiPg==",
"dependencies": {
- "@aws-sdk/types": "3.511.0",
+ "@aws-sdk/types": "3.515.0",
"@smithy/node-config-provider": "^2.2.1",
"@smithy/types": "^2.9.1",
"tslib": "^2.5.0"
@@ -3018,9 +3010,9 @@
}
},
"node_modules/dotenv": {
- "version": "16.4.4",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.4.tgz",
- "integrity": "sha512-XvPXc8XAQThSjAbY6cQ/9PcBXmFoWuw1sQ3b8HqUCR6ziGXjkTi//kB9SWa2UwqlgdAIuRqAa/9hVljzPehbYg==",
+ "version": "16.4.5",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+ "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
"engines": {
"node": ">=12"
},
@@ -4367,9 +4359,9 @@
"integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
},
"node_modules/json-2-csv": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/json-2-csv/-/json-2-csv-5.0.1.tgz",
- "integrity": "sha512-rP9ChyMskS0angbvFdQ43SwEe72mEvqcY1/V2OeukQWxtlreUuZWhMlTdWjtd4L6kJxq+HPFTI06yqLvZiEVIA==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/json-2-csv/-/json-2-csv-5.2.0.tgz",
+ "integrity": "sha512-C+XmSKRCS7zSTENm7Ha/lhLkO2ZE+fcSNC2kLiWSEGKy6ZwRCG2KakMJj0bvyfy2U8oZY+KFoU8F1isCgpUBYg==",
"dependencies": {
"deeks": "3.0.2",
"doc-path": "4.0.2"
@@ -4915,9 +4907,9 @@
}
},
"node_modules/nodemailer": {
- "version": "6.9.9",
- "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.9.tgz",
- "integrity": "sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==",
+ "version": "6.9.10",
+ "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.10.tgz",
+ "integrity": "sha512-qtoKfGFhvIFW5kLfrkw2R6Nm6Ur4LNUMykyqu6n9BRKJuyQrqEGwdXXUAbwWEKt33dlWUGXb7rzmJP/p4+O+CA==",
"engines": {
"node": ">=6.0.0"
}
@@ -6314,9 +6306,9 @@
}
},
"node_modules/stripe": {
- "version": "14.16.0",
- "resolved": "https://registry.npmjs.org/stripe/-/stripe-14.16.0.tgz",
- "integrity": "sha512-1gOr2LzafWV84cPIO5Md/QPh4XVPLKULVuRpBVOV3Plq3seiHmg/eeOktX+hDl8jpNZuORHYaUJGrNqrABLwdg==",
+ "version": "14.18.0",
+ "resolved": "https://registry.npmjs.org/stripe/-/stripe-14.18.0.tgz",
+ "integrity": "sha512-yLqKPqYgGJbMxrQiE4+i2i00ZVA2NRIZbZ1rejzj5XR3F3Uc+1iy9QE133knZudhVGMw367b8vTpB8D9pYMETw==",
"dependencies": {
"@types/node": ">=8.1.0",
"qs": "^6.11.0"
diff --git a/package.json b/package.json
index c1dd793ed..4243c00fc 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
"start": "node server.js"
},
"dependencies": {
- "@aws-sdk/client-secrets-manager": "^3.513.0",
- "@aws-sdk/client-ses": "^3.513.0",
- "@aws-sdk/credential-provider-node": "^3.513.0",
+ "@aws-sdk/client-secrets-manager": "^3.515.0",
+ "@aws-sdk/client-ses": "^3.515.0",
+ "@aws-sdk/credential-provider-node": "^3.515.0",
"@opensearch-project/opensearch": "^2.5.0",
"aws4": "^1.12.0",
"axios": "^1.6.5",
@@ -32,7 +32,7 @@
"cors": "2.8.5",
"csrf": "^3.1.0",
"dinero.js": "^1.9.1",
- "dotenv": "^16.4.4",
+ "dotenv": "^16.4.5",
"express": "^4.18.2",
"firebase-admin": "^12.0.0",
"graphql": "^16.8.1",
@@ -40,7 +40,7 @@
"graylog2": "^0.2.1",
"inline-css": "^4.0.2",
"intuit-oauth": "^4.0.0",
- "json-2-csv": "^5.0.1",
+ "json-2-csv": "^5.2.0",
"lodash": "^4.17.21",
"moment": "^2.30.1",
"moment-timezone": "^0.5.45",
@@ -48,13 +48,13 @@
"node-mailjet": "^6.0.5",
"node-persist": "^4.0.1",
"node-quickbooks": "^2.0.43",
- "nodemailer": "^6.9.9",
+ "nodemailer": "^6.9.10",
"phone": "^3.1.42",
"rimraf": "^5.0.5",
"soap": "^1.0.0",
"socket.io": "^4.7.4",
"ssh2-sftp-client": "^10.0.3",
- "stripe": "^14.16.0",
+ "stripe": "^14.18.0",
"twilio": "^4.22.0",
"uuid": "^9.0.1",
"xml2js": "^0.6.2",
diff --git a/server/job/job-costing.js b/server/job/job-costing.js
index 4e7b40dc7..5ffd81584 100644
--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -45,7 +45,6 @@ async function JobCostingMulti(req, res) {
logger.log("job-costing-multi-start", "DEBUG", req.user.email, jobids, null);
-
try {
const resp = await client
.setHeaders({Authorization: BearerToken})