IO-2258 Scoreboard Chart

Add in target paint and body to the overall calculation to bump the start value up to the target instead of zero.

client/package.json

@@ -51,7 +51,6 @@
     "react-i18next": "^12.2.0",
     "react-icons": "^4.7.1",
     "react-image-lightbox": "^5.1.4",
-    "react-intersection-observer": "^9.4.3",
     "react-number-format": "^5.1.3",
     "react-redux": "^8.0.5",
     "react-resizable": "^3.0.4",

client/src/components/chat-conversation-list/chat-conversation-list.component.jsx

@@ -1,5 +1,5 @@
 import { Badge, List, Tag } from "antd";
-import React, { useEffect } from "react";
+import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setSelectedConversation } from "../../redux/messaging/messaging.actions";
@@ -7,8 +7,6 @@ import { selectSelectedConversation } from "../../redux/messaging/messaging.sele
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { List as VirtualizedList, AutoSizer } from "react-virtualized";
-
 import "./chat-conversation-list.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
@@ -20,79 +18,59 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setSelectedConversation(conversationId)),
 });
 
-function ChatConversationListComponent({
+export function ChatConversationListComponent({
   conversationList,
   selectedConversation,
   setSelectedConversation,
-  loadMoreConversations,
 }) {
-  const rowRenderer = ({ index, key, style }) => {
-    const item = conversationList[index];
-
-    return (
-      <List.Item
-        key={key}
-        onClick={() => setSelectedConversation(item.id)}
-        className={`chat-list-item ${
-          item.id === selectedConversation
-            ? "chat-list-selected-conversation"
-            : null
-        }`}
-        style={style}
-      >
-        <div sryle={{ display: "inline-block" }}>
-          {item.label && <div className="chat-name">{item.label}</div>}
-          {item.job_conversations.length > 0 ? (
-            <div className="chat-name">
-              {item.job_conversations.map((j, idx) => (
-                <div key={idx}>
-                  <OwnerNameDisplay ownerObject={j.job} />
-                </div>
-              ))}
-            </div>
-          ) : (
-            <PhoneFormatter>{item.phone_num}</PhoneFormatter>
-          )}
-        </div>
-        <div sryle={{ display: "inline-block" }}>
-          <div>
-            {item.job_conversations.length > 0
-              ? item.job_conversations.map((j, idx) => (
-                  <Tag key={idx} className="ro-number-tag">
-                    {j.job.ro_number}
-                  </Tag>
-                ))
-              : null}
-          </div>
-          <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
-        </div>
-        <Badge count={item.messages_aggregate.aggregate.count || 0} />
-      </List.Item>
-    );
-  };
-
   return (
     <div className="chat-list-container">
-      <AutoSizer>
-        {({ height, width }) => (
-          <VirtualizedList
-            height={height}
-            width={width}
-            rowCount={conversationList.length}
-            rowHeight={60}
-            rowRenderer={rowRenderer}
-            onScroll={({ scrollTop, scrollHeight, clientHeight }) => {
-              if (scrollTop + clientHeight === scrollHeight) {
-                loadMoreConversations();
-              }
-            }}
-          />
+      <List
+        bordered
+        dataSource={conversationList}
+        renderItem={(item) => (
+          <List.Item
+            key={item.id}
+            onClick={() => setSelectedConversation(item.id)}
+            className={`chat-list-item ${
+              item.id === selectedConversation
+                ? "chat-list-selected-conversation"
+                : null
+            }`}
+          >
+            <div sryle={{ display: "inline-block" }}>
+              {item.label && <div className="chat-name">{item.label}</div>}
+              {item.job_conversations.length > 0 ? (
+                <div className="chat-name">
+                  {item.job_conversations.map((j, idx) => (
+                    <div key={idx}>
+                      <OwnerNameDisplay ownerObject={j.job} />
+                    </div>
+                  ))}
+                </div>
+              ) : (
+                <PhoneFormatter>{item.phone_num}</PhoneFormatter>
+              )}
+            </div>
+            <div sryle={{ display: "inline-block" }}>
+              <div>
+                {item.job_conversations.length > 0
+                  ? item.job_conversations.map((j, idx) => (
+                      <Tag key={idx} className="ro-number-tag">
+                        {j.job.ro_number}
+                      </Tag>
+                    ))
+                  : null}
+              </div>
+              <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
+            </div>
+            <Badge count={item.messages_aggregate.aggregate.count || 0} />
+          </List.Item>
         )}
-      </AutoSizer>
+      />
     </div>
   );
 }
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps

client/src/components/chat-conversation-list/chat-conversation-list.styles.scss

@@ -3,9 +3,8 @@
 }
 .chat-list-container {
   flex: 1;
-  overflow: hidden;
+  overflow: auto;
   height: 100%;
-  border: 1px solid gainsboro;
 }
 
 .chat-list-item {
@@ -22,6 +21,4 @@
   .ro-number-tag {
     align-self: baseline;
   }
-  padding: 12px 24px;
-  border-bottom: 1px solid gainsboro;
 }

client/src/components/chat-popup/chat-popup.component.jsx

@@ -4,15 +4,14 @@ import {
   ShrinkOutlined,
   SyncOutlined,
 } from "@ant-design/icons";
-import { useLazyQuery, useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import {
   CONVERSATION_LIST_QUERY,
-  CONVERSATION_LIST_SUBSCRIPTION,
   UNREAD_CONVERSATION_COUNT,
 } from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
@@ -48,13 +47,12 @@ export function ChatPopupComponent({
     ...(pollInterval > 0 ? { pollInterval } : {}),
   });
 
-  const [getConversations, { loading, data, refetch, fetchMore }] =
-    useLazyQuery(CONVERSATION_LIST_QUERY, {
-      fetchPolicy: "network-only",
-      nextFetchPolicy: "network-only",
-      skip: !chatVisible,
-      ...(pollInterval > 0 ? { pollInterval } : {}),
-    });
+  const { loading, data, refetch, called } = useQuery(CONVERSATION_LIST_QUERY, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    skip: !chatVisible,
+    ...(pollInterval > 0 ? { pollInterval } : {}),
+  });
 
   const fcmToken = sessionStorage.getItem("fcmtoken");
 
@@ -67,22 +65,15 @@ export function ChatPopupComponent({
   }, [fcmToken]);
 
   useEffect(() => {
-    if (chatVisible)
-      getConversations({
-        variables: {
-          offset: 0,
-        },
-      });
-  }, [chatVisible, getConversations]);
+    if (called && chatVisible) refetch();
+  }, [chatVisible, called, refetch]);
 
-  const loadMoreConversations = useCallback(() => {
-    if (data)
-      fetchMore({
-        variables: {
-          offset: data.conversations.length,
-        },
-      });
-  }, [data, fetchMore]);
+  // const unreadCount = data
+  //   ? data.conversations.reduce(
+  //       (acc, val) => val.messages_aggregate.aggregate.count + acc,
+  //       0
+  //     )
+  //   : 0;
 
   const unreadCount = unreadData?.messages_aggregate.aggregate.count || 0;
 
@@ -119,7 +110,6 @@ export function ChatPopupComponent({
                 ) : (
                   <ChatConversationListComponent
                     conversationList={data ? data.conversations : []}
-                    loadMoreConversations={loadMoreConversations}
                   />
                 )}
               </Col>

client/src/components/payment-modal/payment-modal.container.jsx

@@ -52,7 +52,7 @@ function PaymentModalContainer({
     const { useStripe, sendby, ...paymentObj } = values;
 
     setLoading(true);
-
+    let updatedPayment; //Moved up from if statement for greater scope.
     try {
       if (!context || (context && !context.id)) {
         const newPayment = await insertPayment({
@@ -87,7 +87,7 @@ function PaymentModalContainer({
           );
         }
       } else {
-        const updatedPayment = await updatePayment({
+        updatedPayment = await updatePayment({
           variables: {
             paymentId: context.id,
             payment: paymentObj,
@@ -101,7 +101,11 @@ function PaymentModalContainer({
         }
       }
 
-      if (actions.refetch) actions.refetch();
+      if (actions.refetch)
+        actions.refetch(
+          updatedPayment && updatedPayment.data.update_payments.returning[0]
+        );
+
       if (enterAgain) {
         const prev = form.getFieldsValue(["date"]);
 

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -169,7 +169,20 @@ export function PaymentsListPaginated({
                 apolloResults = data.payments_by_pk;
               }
               setPaymentContext({
-                actions: { refetch: refetch },
+                actions: {
+                  refetch: apolloResults
+                    ? (updatedRecord) => {
+                        setOpenSearchResults((results) =>
+                          results.map((result) => {
+                            if (result.id !== record.id) {
+                              return result;
+                            }
+                            return updatedRecord;
+                          })
+                        );
+                      }
+                    : refetch,
+                },
                 context: apolloResults ? apolloResults : record,
               });
             }}

client/src/components/print-center-jobs/print-center-jobs.component.jsx

@@ -29,7 +29,10 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
     })
     .filter(
       (temp) =>
-        !temp.regions || (temp.regions && temp.regions[bodyshop.region_config])
+        !temp.regions ||
+        (temp.regions && temp.regions[bodyshop.region_config]) ||
+        (temp.regions &&
+          bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
     );
 
   const filteredJobsReportsList =

client/src/components/scoreboard-chart/scoreboard-chart.component.jsx

@@ -1,5 +1,6 @@
-import Dinero from "dinero.js";
 import { Card } from "antd";
+import Dinero from "dinero.js";
+import _ from "lodash";
 import moment from "moment";
 import React from "react";
 import { connect } from "react-redux";
@@ -18,7 +19,6 @@ import {
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util";
-import _ from "lodash";
 import CustomTooltip from "./chart-custom-tooltip";
 
 const graphProps = {
@@ -71,7 +71,9 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
           bodyshop.scoreboard_target.dailyBodyTarget +
             bodyshop.scoreboard_target.dailyPaintTarget,
           val
-        ),
+        ) +
+          bodyshop.scoreboard_target.dailyBodyTarget +
+          bodyshop.scoreboard_target.dailyPaintTarget,
         1
       ),
       accHrs: _.round(

client/src/graphql/conversations.queries.js

@@ -1,5 +1,36 @@
 import { gql } from "@apollo/client";
 
+// export const CONVERSATION_LIST_SUBSCRIPTION = gql`
+//   subscription CONVERSATION_LIST_SUBSCRIPTION {
+//     conversations(
+//       order_by: { updated_at: desc }
+//       limit: 50
+//       where: { archived: { _eq: false } }
+//     ) {
+//       phone_num
+//       id
+//       updated_at
+//       unreadcnt
+//       messages_aggregate(
+//         where: { read: { _eq: false }, isoutbound: { _eq: false } }
+//       ) {
+//         aggregate {
+//           count
+//         }
+//       }
+//       job_conversations {
+//         job {
+//           id
+//           ro_number
+//           ownr_fn
+//           ownr_ln
+//           ownr_co_nm
+//         }
+//       }
+//     }
+//   }
+// `;
+
 export const UNREAD_CONVERSATION_COUNT = gql`
   query UNREAD_CONVERSATION_COUNT {
     messages_aggregate(
@@ -13,11 +44,10 @@ export const UNREAD_CONVERSATION_COUNT = gql`
 `;
 
 export const CONVERSATION_LIST_QUERY = gql`
-  query CONVERSATION_LIST_QUERY($offset: Int!) {
+  query CONVERSATION_LIST_QUERY {
     conversations(
       order_by: { updated_at: desc }
       limit: 50
-      offset: $offset
       where: { archived: { _eq: false } }
     ) {
       phone_num

client/src/graphql/payments.queries.js

@@ -16,19 +16,15 @@ export const QUERY_ALL_PAYMENTS_PAGINATED = gql`
     $limit: Int
     $order: [payments_order_by!]!
   ) {
-    payments(
-      offset: $offset
-      limit: $limit
-      order_by: $order
-    ) {
+    payments(offset: $offset, limit: $limit, order_by: $order) {
       id
+      amount
       created_at
-      jobid
-      paymentnum
       date
+      exportedat
+      jobid
       job {
         id
-        ro_number
         ownerid
         ownr_co_nm
         ownr_fn
@@ -39,15 +35,14 @@ export const QUERY_ALL_PAYMENTS_PAGINATED = gql`
           ownr_fn
           ownr_ln
         }
+        ro_number
       }
-      transactionid
       memo
-      type
-      amount
-      stripeid
-      exportedat
-      stripeid
       payer
+      paymentnum
+      stripeid
+      transactionid
+      type
     }
     payments_aggregate {
       aggregate {
@@ -62,16 +57,31 @@ export const UPDATE_PAYMENT = gql`
     update_payments(where: { id: { _eq: $paymentId } }, _set: $payment) {
       returning {
         id
-        transactionid
-        memo
-        type
         amount
-        stripeid
+        created_at
+        date
         exportedat
-        stripeid
+        jobid
+        job {
+          id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
+          ro_number
+        }
+        memo
         payer
         paymentnum
-        date
+        stripeid
+        transactionid
+        type
       }
     }
   }
@@ -85,17 +95,31 @@ export const UPDATE_PAYMENTS = gql`
     update_payments(where: { id: { _in: $paymentIdList } }, _set: $payment) {
       returning {
         id
-        exportedat
-        transactionid
-        memo
-        type
         amount
-        stripeid
+        created_at
+        date
         exportedat
-        stripeid
+        jobid
+        job {
+          id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
+          ro_number
+        }
+        memo
         payer
         paymentnum
-        date
+        stripeid
+        transactionid
+        type
       }
     }
   }
@@ -115,36 +139,35 @@ export const QUERY_JOB_PAYMENT_TOTALS = gql`
   }
 `;
 
-
-export const QUERY_PAYMENT_BY_ID = gql`query QUERY_PAYMENT_BY_ID($paymentId: uuid!) {
-  payments_by_pk(id: $paymentId) {
-    id
-    created_at
-    jobid
-    paymentnum
-    date
-    job {
+export const QUERY_PAYMENT_BY_ID = gql`
+  query QUERY_PAYMENT_BY_ID($paymentId: uuid!) {
+    payments_by_pk(id: $paymentId) {
       id
-      ro_number
-      ownerid
-      ownr_co_nm
-      ownr_fn
-      ownr_ln
-      owner {
+      amount
+      created_at
+      exportedat
+      date
+      jobid
+      job {
         id
+        ownerid
         ownr_co_nm
         ownr_fn
         ownr_ln
+        owner {
+          id
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+        }
+        ro_number
       }
+      memo
+      payer
+      paymentnum
+      stripeid
+      transactionid
+      type
     }
-    transactionid
-    memo
-    type
-    amount
-    stripeid
-    exportedat
-    stripeid
-    payer
   }
-}
-`
+`;

client/src/utils/GraphQLClient.js

@@ -3,10 +3,7 @@ import { setContext } from "@apollo/client/link/context";
 import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http";
 import { RetryLink } from "@apollo/client/link/retry";
 import { WebSocketLink } from "@apollo/client/link/ws";
-import {
-  getMainDefinition,
-  offsetLimitPagination,
-} from "@apollo/client/utilities";
+import { getMainDefinition } from "@apollo/client/utilities";
 //import { split } from "apollo-link";
 import apolloLogger from "apollo-link-logger";
 //import axios from "axios";
@@ -143,15 +140,7 @@ middlewares.push(
   )
 );
 
-const cache = new InMemoryCache({
-  typePolicies: {
-    Query: {
-      fields: {
-        conversations: offsetLimitPagination(),
-      },
-    },
-  },
-});
+const cache = new InMemoryCache({});
 
 const client = new ApolloClient({
   link: ApolloLink.from(middlewares),

client/src/utils/TemplateConstants.js

@@ -7,22 +7,24 @@ export const EmailSettings = {
 
 export const TemplateList = (type, context) => {
   //const { bodyshop } = store.getState().user;
-
   return {
     //If there's no type or the type is job, send it back.
     ...(!type || type === "job"
       ? {
           casl_authorization: {
             title: i18n.t("printcenter.jobs.casl_authorization"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.casl_authorization"),
             key: "casl_authorization",
             disabled: false,
             group: "authorization",
+            regions: {
+              CA: true,
+            },
           },
           fippa_authorization: {
             title: i18n.t("printcenter.jobs.fippa_authorization"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.fippa_authorization"),
             key: "fippa_authorization",
             disabled: false,
@@ -30,7 +32,7 @@ export const TemplateList = (type, context) => {
           },
           diagnostic_authorization: {
             title: i18n.t("printcenter.jobs.diagnostic_authorization"),
-            description: "Diagnostic Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.diagnostic_authorization"),
             key: "diagnostic_authorization",
             disabled: false,
@@ -38,7 +40,7 @@ export const TemplateList = (type, context) => {
           },
           mechanical_authorization: {
             title: i18n.t("printcenter.jobs.mechanical_authorization"),
-            description: "Diagnostic Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.mechanical_authorization"),
             key: "mechanical_authorization",
             disabled: false,
@@ -46,7 +48,7 @@ export const TemplateList = (type, context) => {
           },
           appointment_reminder: {
             title: i18n.t("printcenter.jobs.appointment_reminder"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.appointment_reminder"),
             key: "appointment_reminder",
             disabled: false,
@@ -54,7 +56,7 @@ export const TemplateList = (type, context) => {
           },
           estimate_followup: {
             title: i18n.t("printcenter.jobs.estimate_followup"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.estimate_followup"),
             key: "estimate_followup",
             disabled: false,
@@ -62,7 +64,7 @@ export const TemplateList = (type, context) => {
           },
           express_repair_checklist: {
             title: i18n.t("printcenter.jobs.express_repair_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.express_repair_checklist"),
             key: "express_repair_checklist",
             disabled: false,
@@ -70,7 +72,7 @@ export const TemplateList = (type, context) => {
           },
           glass_express_checklist: {
             title: i18n.t("printcenter.jobs.glass_express_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.glass_express_checklist"),
             key: "glass_express_checklist",
             disabled: false,
@@ -78,7 +80,7 @@ export const TemplateList = (type, context) => {
           },
           stolen_recovery_checklist: {
             title: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
             key: "stolen_recovery_checklist",
             disabled: false,
@@ -86,7 +88,7 @@ export const TemplateList = (type, context) => {
           },
           vehicle_check_in: {
             title: i18n.t("printcenter.jobs.vehicle_check_in"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.vehicle_check_in"),
             key: "vehicle_check_in",
             disabled: false,
@@ -94,7 +96,7 @@ export const TemplateList = (type, context) => {
           },
           parts_order_history: {
             title: i18n.t("printcenter.jobs.parts_order_history"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.parts_order_history"),
             key: "parts_order_history",
             disabled: false,
@@ -102,7 +104,7 @@ export const TemplateList = (type, context) => {
           },
           job_notes: {
             title: i18n.t("printcenter.jobs.job_notes"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.job_notes"),
             key: "job_notes",
             disabled: false,
@@ -110,7 +112,7 @@ export const TemplateList = (type, context) => {
           },
           ro_with_description: {
             title: i18n.t("printcenter.jobs.ro_with_description"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.ro_with_description"),
             key: "ro_with_description",
             disabled: false,
@@ -118,7 +120,7 @@ export const TemplateList = (type, context) => {
           },
           window_tag: {
             title: i18n.t("printcenter.jobs.window_tag"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.window_tag"),
             key: "window_tag",
             disabled: false,
@@ -126,7 +128,7 @@ export const TemplateList = (type, context) => {
           },
           supplement_request: {
             title: i18n.t("printcenter.jobs.supplement_request"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.supplement_request"),
             key: "supplement_request",
             disabled: false,
@@ -134,7 +136,7 @@ export const TemplateList = (type, context) => {
           },
           estimate: {
             title: i18n.t("printcenter.jobs.estimate"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.estimate"),
             key: "estimate",
             disabled: false,
@@ -142,7 +144,7 @@ export const TemplateList = (type, context) => {
           },
           parts_list: {
             title: i18n.t("printcenter.jobs.parts_list"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.parts_list"),
             key: "parts_list",
             disabled: false,
@@ -150,7 +152,7 @@ export const TemplateList = (type, context) => {
           },
           coversheet_portrait: {
             title: i18n.t("printcenter.jobs.coversheet_portrait"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.coversheet_portrait"),
             key: "coversheet_portrait",
             disabled: false,
@@ -158,7 +160,7 @@ export const TemplateList = (type, context) => {
           },
           coversheet_landscape: {
             title: i18n.t("printcenter.jobs.coversheet_landscape"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.coversheet_landscape"),
             key: "coversheet_landscape",
             disabled: false,
@@ -166,7 +168,7 @@ export const TemplateList = (type, context) => {
           },
           key_tag: {
             title: i18n.t("printcenter.jobs.key_tag"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.key_tag"),
             key: "key_tag",
             disabled: false,
@@ -174,7 +176,7 @@ export const TemplateList = (type, context) => {
           },
           paint_grid: {
             title: i18n.t("printcenter.jobs.paint_grid"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.paint_grid"),
             key: "paint_grid",
             disabled: false,
@@ -182,7 +184,7 @@ export const TemplateList = (type, context) => {
           },
           worksheet_by_line_number: {
             title: i18n.t("printcenter.jobs.worksheet_by_line_number"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.worksheet_by_line_number"),
             key: "worksheet_by_line_number",
             disabled: false,
@@ -192,7 +194,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_type"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_type"
             ),
@@ -202,7 +204,7 @@ export const TemplateList = (type, context) => {
           },
           worksheet_sorted_by_operation: {
             title: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
             key: "worksheet_sorted_by_operation",
             disabled: false,
@@ -212,7 +214,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
@@ -224,7 +226,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
@@ -234,7 +236,7 @@ export const TemplateList = (type, context) => {
           },
           payments_by_job: {
             title: i18n.t("printcenter.jobs.payments_by_job"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.payments_by_job"),
             key: "payments_by_job",
             disabled: false,
@@ -242,7 +244,7 @@ export const TemplateList = (type, context) => {
           },
           final_invoice: {
             title: i18n.t("printcenter.jobs.final_invoice"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.final_invoice"),
             key: "final_invoice",
             disabled: false,
@@ -250,7 +252,7 @@ export const TemplateList = (type, context) => {
           },
           payment_request: {
             title: i18n.t("printcenter.jobs.payment_request"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.payment_request"),
             key: "payment_request",
             disabled: false,
@@ -258,7 +260,7 @@ export const TemplateList = (type, context) => {
           },
           invoice_total_payable: {
             title: i18n.t("printcenter.jobs.invoice_total_payable"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.invoice_total_payable"),
             key: "invoice_total_payable",
             disabled: false,
@@ -266,7 +268,7 @@ export const TemplateList = (type, context) => {
           },
           invoice_customer_payable: {
             title: i18n.t("printcenter.jobs.invoice_customer_payable"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.invoice_customer_payable"),
             key: "invoice_customer_payable",
             disabled: false,
@@ -274,7 +276,7 @@ export const TemplateList = (type, context) => {
           },
           ro_totals: {
             title: i18n.t("printcenter.jobs.ro_totals"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.ro_totals"),
             key: "ro_totals",
             disabled: false,
@@ -282,7 +284,7 @@ export const TemplateList = (type, context) => {
           },
           job_costing_ro: {
             title: i18n.t("printcenter.jobs.job_costing_ro"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.job_costing_ro"),
             key: "job_costing_ro",
             disabled: false,
@@ -290,7 +292,7 @@ export const TemplateList = (type, context) => {
           },
           purchases_by_ro_detail: {
             title: i18n.t("printcenter.jobs.purchases_by_ro_detail"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.purchases_by_ro_detail"),
             key: "purchases_by_ro_detail",
             disabled: false,
@@ -298,7 +300,7 @@ export const TemplateList = (type, context) => {
           },
           purchases_by_ro_summary: {
             title: i18n.t("printcenter.jobs.purchases_by_ro_summary"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.purchases_by_ro_summary"),
             key: "purchases_by_ro_summary",
             disabled: false,
@@ -306,7 +308,7 @@ export const TemplateList = (type, context) => {
           },
           filing_coversheet_portrait: {
             title: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
             key: "filing_coversheet_portrait",
             disabled: false,
@@ -314,7 +316,7 @@ export const TemplateList = (type, context) => {
           },
           filing_coversheet_landscape: {
             title: i18n.t("printcenter.jobs.filing_coversheet_landscape"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.filing_coversheet_landscape"),
             key: "filing_coversheet_landscape",
             disabled: false,
@@ -322,7 +324,7 @@ export const TemplateList = (type, context) => {
           },
           qc_sheet: {
             title: i18n.t("printcenter.jobs.qc_sheet"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.qc_sheet"),
             key: "qc_sheet",
             disabled: false,
@@ -330,7 +332,7 @@ export const TemplateList = (type, context) => {
           },
           vehicle_delivery_check: {
             title: i18n.t("printcenter.jobs.vehicle_delivery_check"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.vehicle_delivery_check"),
             key: "vehicle_delivery_check",
             disabled: false,
@@ -338,7 +340,7 @@ export const TemplateList = (type, context) => {
           },
           guarantee: {
             title: i18n.t("printcenter.jobs.guarantee"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.guarantee"),
             key: "guarantee",
             disabled: false,
@@ -346,7 +348,7 @@ export const TemplateList = (type, context) => {
           },
           csi_invitation: {
             title: i18n.t("printcenter.jobs.csi_invitation"),
-            description: "CSI invite",
+            description: "",
             key: "csi_invitation",
             subject: i18n.t("printcenter.jobs.csi_invitation"),
             disabled: false,
@@ -354,7 +356,7 @@ export const TemplateList = (type, context) => {
           },
           window_tag_sublet: {
             title: i18n.t("printcenter.jobs.window_tag_sublet"),
-            description: "Window Tag Sublet",
+            description: "",
             key: "window_tag_sublet",
             subject: i18n.t("printcenter.jobs.window_tag_sublet"),
             disabled: false,
@@ -362,7 +364,7 @@ export const TemplateList = (type, context) => {
           },
           thank_you_ro: {
             title: i18n.t("printcenter.jobs.thank_you_ro"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "thank_you_ro",
             subject: i18n.t("printcenter.jobs.thank_you_ro"),
             disabled: false,
@@ -370,7 +372,7 @@ export const TemplateList = (type, context) => {
           },
           parts_label_single: {
             title: i18n.t("printcenter.jobs.parts_label_single"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "parts_label_single",
             subject: i18n.t("printcenter.jobs.parts_label_single"),
             disabled: false,
@@ -379,7 +381,7 @@ export const TemplateList = (type, context) => {
           },
           envelope_return_address: {
             title: i18n.t("printcenter.jobs.envelope_return_address"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.envelope_return_address"),
             key: "envelope_return_address",
             disabled: false,
@@ -388,7 +390,7 @@ export const TemplateList = (type, context) => {
           },
           sgi_certificate_of_repairs: {
             title: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "sgi_certificate_of_repairs",
             subject: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
             disabled: false,
@@ -399,7 +401,7 @@ export const TemplateList = (type, context) => {
           },
           sgi_windshield_auth: {
             title: i18n.t("printcenter.jobs.sgi_windshield_auth"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "sgi_windshield_auth",
             subject: i18n.t("printcenter.jobs.sgi_windshield_auth"),
             disabled: false,
@@ -410,7 +412,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_final_acct_sheet: {
             title: i18n.t("printcenter.jobs.mpi_final_acct_sheet"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "mpi_final_acct_sheet",
             subject: i18n.t("printcenter.jobs.mpi_final_acct_sheet"),
             disabled: false,
@@ -421,7 +423,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_eglass_auth: {
             title: i18n.t("printcenter.jobs.mpi_eglass_auth"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "mpi_eglass_auth",
             subject: i18n.t("printcenter.jobs.mpi_eglass_auth"),
             disabled: false,
@@ -432,7 +434,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_animal_checklist: {
             title: i18n.t("printcenter.jobs.mpi_animal_checklist"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "mpi_animal_checklist",
             subject: i18n.t("printcenter.jobs.mpi_animal_checklist"),
             disabled: false,
@@ -443,7 +445,7 @@ export const TemplateList = (type, context) => {
           },
           ab_proof_of_loss: {
             title: i18n.t("printcenter.jobs.ab_proof_of_loss"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "ab_proof_of_loss",
             subject: i18n.t("printcenter.jobs.ab_proof_of_loss"),
             disabled: false,
@@ -454,7 +456,7 @@ export const TemplateList = (type, context) => {
           },
           // parts_label_multi: {
           //   title: i18n.t("printcenter.jobs.parts_label_multi"),
-          //   description: "Thank You Letter by RO",
+          //   description: "",
           //   key: "parts_label_multi",
           //   subject: i18n.t("printcenter.jobs.parts_label_multi"),
           //   disabled: false,
@@ -462,7 +464,7 @@ export const TemplateList = (type, context) => {
           // },
           iou_form: {
             title: i18n.t("printcenter.jobs.iou_form"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.iou_form"),
             key: "iou_form",
             disabled: false,
@@ -470,7 +472,7 @@ export const TemplateList = (type, context) => {
           },
           lag_time_ro: {
             title: i18n.t("printcenter.jobs.lag_time_ro"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.lag_time_ro"),
             key: "lag_time_ro",
             disabled: false,
@@ -478,7 +480,7 @@ export const TemplateList = (type, context) => {
           },
           rental_reservation: {
             title: i18n.t("printcenter.jobs.rental_reservation"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.rental_reservation"),
             key: "rental_reservation",
             disabled: false,
@@ -486,7 +488,7 @@ export const TemplateList = (type, context) => {
           },
           timetickets_ro: {
             title: i18n.t("printcenter.jobs.timetickets_ro"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.timetickets_ro"),
             key: "timetickets_ro",
             disabled: false,
@@ -494,7 +496,7 @@ export const TemplateList = (type, context) => {
           },
           dms_posting_sheet: {
             title: i18n.t("printcenter.jobs.dms_posting_sheet"),
-            description: "DMS Posting Sheet",
+            description: "",
             subject: i18n.t("printcenter.jobs.dms_posting_sheet"),
             key: "dms_posting_sheet",
             disabled: false,
@@ -506,39 +508,39 @@ export const TemplateList = (type, context) => {
       ? {
           special_thirdpartypayer: {
             title: i18n.t("printcenter.jobs.thirdpartypayer"),
-            description: "CSI invite",
+            description: "",
             key: "special_thirdpartypayer",
             disabled: false,
           },
           folder_label_multiple: {
             title: i18n.t("printcenter.jobs.folder_label_multiple"),
-            description: "Folder Label Multiple",
+            description: "",
             key: "folder_label_multiple",
             disabled: false,
           },
           parts_label_multiple: {
             title: i18n.t("printcenter.jobs.parts_label_multiple"),
-            description: "Parts Label Multiple",
+            description: "",
             key: "parts_label_multiple",
             disabled: false,
           },
           parts_invoice_label_single: {
             title: i18n.t("printcenter.jobs.parts_invoice_label_single"),
-            description: "Parts Label Multiple",
+            description: "",
             key: "parts_invoice_label_single",
             disabled: false,
             ignoreCustomMargins: true,
           },
           csi_invitation_action: {
             title: i18n.t("printcenter.jobs.csi_invitation_action"),
-            description: "CSI invite",
+            description: "",
             key: "csi_invitation_action",
             subject: i18n.t("printcenter.jobs.csi_invitation_action"),
             disabled: false,
           },
           individual_job_note: {
             title: i18n.t("printcenter.jobs.individual_job_note"),
-            description: "CSI invite",
+            description: "",
             key: "individual_job_note",
             subject: i18n.t("printcenter.jobs.individual_job_note", {
               ro_number: (context && context.ro_number) || "",
@@ -551,7 +553,7 @@ export const TemplateList = (type, context) => {
       ? {
           appointment_confirmation: {
             title: i18n.t("printcenter.appointments.appointment_confirmation"),
-            description: "Appointment Confirmation",
+            description: "",
             subject: i18n.t(
               "printcenter.appointments.appointment_confirmation"
             ),
@@ -564,7 +566,7 @@ export const TemplateList = (type, context) => {
       ? {
           parts_order: {
             title: i18n.t("printcenter.jobs.parts_order"),
-            description: "Parts Order",
+            description: "",
             key: "parts_order",
             subject: i18n.t("printcenter.subjects.jobs.parts_order", {
               ro_number: context && context.job && context.job.ro_number,
@@ -578,7 +580,7 @@ export const TemplateList = (type, context) => {
           },
           sublet_order: {
             title: i18n.t("printcenter.jobs.sublet_order"),
-            description: "Parts Order",
+            description: "",
             key: "sublet_order",
             subject: i18n.t("printcenter.subjects.jobs.sublet_order", {
               ro_number: context && context.job && context.job.ro_number,
@@ -593,7 +595,7 @@ export const TemplateList = (type, context) => {
           parts_return_slip: {
             title: i18n.t("printcenter.jobs.parts_return_slip"),
             subject: i18n.t("printcenter.jobs.parts_return_slip"),
-            description: "Parts Return",
+            description: "",
             key: "parts_return_slip",
             disabled: false,
           },
@@ -603,7 +605,7 @@ export const TemplateList = (type, context) => {
       ? {
           payment_receipt: {
             title: i18n.t("printcenter.jobs.payment_receipt"),
-            description: "Payment Receipt",
+            description: "",
             subject: i18n.t("printcenter.jobs.payment_receipt"),
             key: "payment_receipt",
             disabled: false,
@@ -1891,7 +1893,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
@@ -1900,7 +1902,7 @@ export const TemplateList = (type, context) => {
           },
           courtesy_car_terms: {
             title: i18n.t("printcenter.courtesycarcontract.courtesy_car_terms"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_terms"
             ),
@@ -1911,7 +1913,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_impound"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_impound"
             ),
@@ -1926,7 +1928,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_inventory"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_inventory"
             ),
@@ -1939,7 +1941,7 @@ export const TemplateList = (type, context) => {
       ? {
           inhouse_invoice: {
             title: i18n.t("printcenter.bills.inhouse_invoice"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.bills.inhouse_invoice"),
             key: "inhouse_invoice",
             disabled: false,
@@ -1950,7 +1952,7 @@ export const TemplateList = (type, context) => {
       ? {
           // timetickets: {
           //   title: i18n.t("printcenter.timetickets.timetickets"),
-          //   description: "Est Detail",
+          //   description: "",
           //   subject: `${i18n.t("printcenter.timetickets.timetickets")} - ${
           //     context && context.job && context.job.ro_number
           //   }`,
@@ -1963,14 +1965,14 @@ export const TemplateList = (type, context) => {
       ? {
           purchases_by_vendor_detailed: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
             key: "purchases_by_vendor_detailed",
             disabled: false,
           },
           purchases_by_vendor_summary: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
             key: "purchases_by_vendor_summary",
             disabled: false,
@@ -2043,21 +2045,21 @@ export const TemplateList = (type, context) => {
       ? {
           ca_bc_etf_table: {
             title: i18n.t("printcenter.payments.ca_bc_etf_table"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.payments.ca_bc_etf_table"),
             key: "ca_bc_etf_table",
             disabled: false,
           },
           exported_payroll: {
             title: i18n.t("printcenter.payments.exported_payroll"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.payments.exported_payroll"),
             key: "exported_payroll",
             disabled: false,
           },
           attendance_detail_csv: {
             title: i18n.t("printcenter.special.attendance_detail_csv"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.special.attendance_detail_csv"),
             key: "attendance_detail_csv",
             disabled: false,

client/yarn.lock

@@ -11168,11 +11168,6 @@ react-image-lightbox@^5.1.4:
     prop-types "^15.7.2"
     react-modal "^3.11.1"
 
-react-intersection-observer@^9.4.3:
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.4.3.tgz#ec84ce0c25cad548075130ea045ac5c7adf908f3"
-  integrity sha512-WNRqMQvKpupr6MzecAQI0Pj0+JQong307knLP4g/nBex7kYfIaZsPpXaIhKHR+oV8z+goUbH9e10j6lGRnTzlQ==
-
 react-is@^16.10.2, react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"

server/data/autohouse.js

@@ -265,20 +265,20 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         }${job.est_ct_fn ? job.est_ct_fn : ""}`,
       },
       CustomerInformation: {
-        FirstName: job.ownr_fn || "",
-        LastName: job.ownr_ln || "",
-        Street: job.ownr_addr1 || "",
-        City: job.ownr_city || "",
-        State: job.ownr_st || "",
+        FirstName: "",
+        LastName: "",
+        Street: "",
+        City: "",
+        State: "",
         Zip: (job.ownr_zip && job.ownr_zip.substring(0, 3)) || "",
-        Phone1: job.ownr_ph1 || "",
+        Phone1: "",
         Phone2: null,
         Phone2Extension: null,
         Phone3: null,
         Phone3Extension: null,
         FileComments: null,
         Source: null,
-        Email: job.ownr_ea || "",
+        Email: "",
         RetWhsl: null,
         Cat: null,
         InsuredorClaimantFlag: null,
@@ -762,7 +762,12 @@ const CreateCosts = (job) => {
   }, {});
 
   //If the hourly rates for job costing are set, add them in.
-  if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mapa) {
+  if (
+    job.bodyshop.jc_hourly_rates &&
+    (job.bodyshop.jc_hourly_rates.mapa ||
+      typeof job.bodyshop.jc_hourly_rates.mapa === "number" ||
+      isNaN(job.bodyshop.jc_hourly_rates.mapa) === false)
+  ) {
     if (
       !billTotalsByCostCenters[
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA

server/job/job-costing.js

@@ -612,7 +612,12 @@ function GenerateCostingData(job) {
 
   //If the hourly rates for job costing are set, add them in.
 
-  if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mapa) {
+  if (
+    job.bodyshop.jc_hourly_rates &&
+    (job.bodyshop.jc_hourly_rates.mapa ||
+      typeof job.bodyshop.jc_hourly_rates.mapa === "number" ||
+      isNaN(job.bodyshop.jc_hourly_rates.mapa) === false)
+  ) {
     if (
       !billTotalsByCostCenters.additionalCosts[
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
@@ -626,7 +631,9 @@ function GenerateCostingData(job) {
         billTotalsByCostCenters.additionalCosts[
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ] = Dinero({
-          amount: Math.round((job.mixdata[0] && job.mixdata[0].totalliquidcost || 0) * 100)
+          amount: Math.round(
+            ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) * 100
+          ),
         });
       } else {
         billTotalsByCostCenters.additionalCosts[

yarn.lock

@@ -4312,9 +4312,14 @@ tslib@^1.11.1:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.1, tslib@^2.1.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
-  integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
+
+tslib@^2.3.1, tslib@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
+  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
+  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
 
 tslib@^2.3.1, tslib@^2.5.0:
   version "2.5.0"