From 39b8ecf78529239ec97183269da37a189d5d39cb Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 2 Jun 2023 09:38:54 -0700 Subject: [PATCH 1/2] IO-2313 Remove part type for secondary CCC lines. --- .../jobs-available-table/jobs-available-table.container.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx index 0341ee839..0a8241cd0 100644 --- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx +++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx @@ -560,6 +560,7 @@ async function ResolveCCCLineIssues(estData, bodyshop) { ); estData.joblines.data[nonRefLineIndex + 1] = { ...estData.joblines.data[nonRefLineIndex + 1], + part_type: null, act_price: 0, db_price: 0, prt_dsmk_p: 0, From e6c44ec52a579663c964fdfa1d809f8f65a466b2 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 2 Jun 2023 09:43:46 -0700 Subject: [PATCH 2/2] Resolve CI issues. --- .../time-ticket-list/time-ticket-list.component.jsx | 1 - .../time-ticket-task-modal.component.jsx | 7 ++++--- .../time-tickets-commit-toggle.component.jsx | 7 ++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx index 8f5cbba90..edb95ef13 100644 --- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx @@ -1,6 +1,5 @@ import { EditFilled } from "@ant-design/icons"; import { Button, Card, Checkbox, Space, Table } from "antd"; -import Dinero from "dinero.js"; import moment from "moment"; import React, { useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx index 8608a26da..9156a8380 100644 --- a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx +++ b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx @@ -23,7 +23,6 @@ import JobSearchSelectComponent from "../job-search-select/job-search-select.com import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility"; import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component"; import TimeTicketsTasksPresets from "../time-ticket-tasks-presets/time-ticket-tasks-presets.component"; -import LayoutFormRow from "../layout-form-row/layout-form-row.component"; const mapStateToProps = createStructuredSelector({ //currentUser: selectCurrentUser @@ -55,7 +54,6 @@ export function TimeTicketTaskModalComponent({ calculateTimeTickets={calculateTimeTickets} /> - {bodyshop?.md_tasks_presets?.use_approvals && ( - + )} diff --git a/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx b/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx index 9a85f6507..331a646c3 100644 --- a/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx +++ b/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx @@ -5,15 +5,12 @@ import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; -import { - UPDATE_TIME_TICKET, - UPDATE_TIME_TICKETS, -} from "../../graphql/timetickets.queries"; +import { UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries"; +import { setModalContext } from "../../redux/modals/modals.actions"; import { selectBodyshop, selectCurrentUser, } from "../../redux/user/user.selectors"; -import { setModalContext } from "../../redux/modals/modals.actions"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop,