From 1e547f181530e5ff79bc9d0df5495775ca81bb20 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Mon, 28 Jun 2021 17:22:41 -0700 Subject: [PATCH] Upsize global search bar. --- .../breadcrumbs/breadcrumbs.component.jsx | 44 ++++++++++--------- .../global-search/global-search.component.jsx | 14 +++--- .../redux/application/application.sagas.js | 3 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/client/src/components/breadcrumbs/breadcrumbs.component.jsx b/client/src/components/breadcrumbs/breadcrumbs.component.jsx index 9ad6c7fdb..ed3331da1 100644 --- a/client/src/components/breadcrumbs/breadcrumbs.component.jsx +++ b/client/src/components/breadcrumbs/breadcrumbs.component.jsx @@ -1,5 +1,5 @@ import { HomeFilled } from "@ant-design/icons"; -import { Breadcrumb } from "antd"; +import { Breadcrumb, Row, Col } from "antd"; import React from "react"; import { connect } from "react-redux"; import { Link } from "react-router-dom"; @@ -14,27 +14,29 @@ const mapStateToProps = createStructuredSelector({ export function BreadCrumbs({ breadcrumbs }) { return ( -
- - - - - - - {breadcrumbs.map((item) => - item.link ? ( - - {item.label} - - ) : ( - {item.label} - ) - )} - -
+ + + + + + + + + {breadcrumbs.map((item) => + item.link ? ( + + {item.label} + + ) : ( + {item.label} + ) + )} + + + -
-
+ + ); } export default connect(mapStateToProps, null)(BreadCrumbs); diff --git a/client/src/components/global-search/global-search.component.jsx b/client/src/components/global-search/global-search.component.jsx index cd146ffe3..0e5ddf8c8 100644 --- a/client/src/components/global-search/global-search.component.jsx +++ b/client/src/components/global-search/global-search.component.jsx @@ -37,7 +37,7 @@ export default function GlobalSearch() { value: job.ro_number, label: ( - }> + }> {job.ro_number || t("general.labels.na")} {`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${ job.ownr_co_nm || "" @@ -62,7 +62,7 @@ export default function GlobalSearch() { }`, label: ( - }> + }> {`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${ owner.ownr_co_nm || "" }`} @@ -85,7 +85,7 @@ export default function GlobalSearch() { } ${vehicle.v_model_desc || ""}`, label: ( - }> + }> {`${vehicle.v_model_yr || ""} ${ vehicle.v_make_desc || "" @@ -107,7 +107,7 @@ export default function GlobalSearch() { value: `${payment.job.ro_number} ${payment.payer} ${payment.amount}`, label: ( - }> + }> {payment.job.ro_number} {payment.job.memo} {payment.job.amount} @@ -126,7 +126,7 @@ export default function GlobalSearch() { value: `${bill.invoice_number} - ${bill.vendor.name}`, label: ( - }> + }> {bill.invoice_number} {bill.vendor.name} {bill.date} @@ -146,7 +146,7 @@ export default function GlobalSearch() { }`, label: ( - }> + }> {`${pb.firstname || ""} ${pb.lastname || ""} ${ pb.company || "" }`} @@ -165,8 +165,6 @@ export default function GlobalSearch() { return ( { + //Add all of the jobs currently in production to the buckets so that we have a starting point. const bucketId = CheckJobBucket(buckets, item); if (bucketId) { load.productionTotal[bucketId].count =