diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 2330a00c0..b41e75652 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -14530,6 +14530,27 @@ + + recent + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + schedule false diff --git a/client/src/components/breadcrumbs/breadcrumbs.component.jsx b/client/src/components/breadcrumbs/breadcrumbs.component.jsx index 9ce8d7af6..4d6f37ca5 100644 --- a/client/src/components/breadcrumbs/breadcrumbs.component.jsx +++ b/client/src/components/breadcrumbs/breadcrumbs.component.jsx @@ -1,41 +1,19 @@ -import { HomeFilled, ClockCircleFilled } from "@ant-design/icons"; -import { Breadcrumb, Menu, Dropdown } from "antd"; +import { HomeFilled } from "@ant-design/icons"; +import { Breadcrumb } from "antd"; import React from "react"; import { connect } from "react-redux"; import { Link } from "react-router-dom"; import { createStructuredSelector } from "reselect"; -import { - selectBreadcrumbs, - selectRecentItems, -} from "../../redux/application/application.selectors"; +import { selectBreadcrumbs } from "../../redux/application/application.selectors"; import "./breadcrumbs.styles.scss"; const mapStateToProps = createStructuredSelector({ breadcrumbs: selectBreadcrumbs, - recentItems: selectRecentItems, }); -export function BreadCrumbs({ breadcrumbs, recentItems }) { - const menu = ( - - {recentItems.map((i, idx) => ( - - {i.label} - - ))} - - ); - +export function BreadCrumbs({ breadcrumbs }) { return (
- - e.preventDefault()} /> - - diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx index 76258c5d9..bc2f59490 100644 --- a/client/src/components/header/header.component.jsx +++ b/client/src/components/header/header.component.jsx @@ -1,4 +1,5 @@ import Icon, { + ClockCircleFilled, CarFilled, DollarCircleFilled, FileAddFilled, @@ -23,10 +24,12 @@ import { } from "../../redux/user/user.selectors"; import "./header.styles.scss"; import GlobalSearch from "../global-search/global-search.component"; +import { selectRecentItems } from "../../redux/application/application.selectors"; const mapStateToProps = createStructuredSelector({ currentUser: selectCurrentUser, bodyshop: selectBodyshop, + recentItems: selectRecentItems, }); const mapDispatchToProps = (dispatch) => ({ @@ -71,6 +74,7 @@ function Header({ setInvoiceEnterContext, setTimeTicketContext, setPaymentContext, + recentItems, }) { const { t } = useTranslation(); const { Header } = Layout; @@ -283,6 +287,13 @@ function Header({ + }> + {recentItems.map((i, idx) => ( + + {i.label} + + ))} + diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index eb44e35de..70b4fcc47 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -876,6 +876,7 @@ "owners": "Owners", "productionboard": "Production Board", "productionlist": "Production - List", + "recent": "Recent Items", "schedule": "Schedule", "scoreboard": "Scoreboard", "search": { diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 3aa5bd19f..ef91a01d0 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -876,6 +876,7 @@ "owners": "propietarios", "productionboard": "", "productionlist": "", + "recent": "", "schedule": "Programar", "scoreboard": "", "search": { diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 8ad2afcc4..c7757988b 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -876,6 +876,7 @@ "owners": "Propriétaires", "productionboard": "", "productionlist": "", + "recent": "", "schedule": "Programme", "scoreboard": "", "search": {