Skip to content

Commit

Permalink
Disposition/menu entry (#3639)
Browse files Browse the repository at this point in the history
* Added check status logic when updating acq and related entities | psp-7006 (#3602)

* Added status checking to details, take, compensation and other acq file pages

* Updated backend and updated tests

* Fixed lint

* Refactored solver to be simpler

* Added tests

* Pr comments

* Added the sys-admin to edit acquisition fields

* CI: Bump version to v4.0.0-67.24

* Updated placeholder display (#3620)

* CI: Bump version to v4.0.0-67.25

* Added the disposition entry into the menu list

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
FuriousLlama and github-actions[bot] authored Dec 7, 2023
1 parent 538a6d0 commit 5a52cfe
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import clsx from 'classnames';
import { useContext, useState } from 'react';
import { FaBriefcase } from 'react-icons/fa';
import { MdChevronLeft, MdChevronRight, MdContactMail, MdHome } from 'react-icons/md';
import { TbArrowBounce } from 'react-icons/tb';
import { useHistory } from 'react-router-dom';

import { ReactComponent as AdminPanelSettings } from '@/assets/images/admin-panel-settings.svg';
Expand Down Expand Up @@ -57,6 +58,12 @@ export const SideNavBar = () => {
text="Leases & Licenses"
showText={expanded}
/>
<NavIcon
onClick={() => setTrayPage(SidebarContextType.DISPOSITION)}
icon={<TbArrowBounce size={24} color="white" fillOpacity={0} />}
text="Disposition"
showText={expanded}
/>
<NavIcon
onClick={() => setTrayPage(SidebarContextType.CONTACT)}
icon={<MdContactMail size={24} />}
Expand Down
3 changes: 3 additions & 0 deletions source/frontend/src/components/layout/SideNavBar/SideTray.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { AdminTools, LeaseAndLicenses, ResearchTray } from '@/components/layout'

import { AcquisitionTray } from './AcquisitionTray';
import { ContactTray } from './ContactTray';
import { DispositionTray } from './DispositionTray';
import { ProjectTray } from './ProjectTray';
import * as Styled from './styles';

Expand All @@ -16,6 +17,7 @@ export enum SidebarContextType {
RESEARCH = 'research',
CONTACT = 'contact',
ACQUISITION = 'acquisition',
DISPOSITION = 'disposition',
}

interface ISideTrayProps {
Expand Down Expand Up @@ -44,6 +46,7 @@ export const SideTray = ({ context, setContext }: ISideTrayProps) => {
[SidebarContextType.CONTACT, <ContactTray onLinkClick={handleFileSet} />],
[SidebarContextType.ACQUISITION, <AcquisitionTray onLinkClick={handleFileSet} />],
[SidebarContextType.PROJECT, <ProjectTray onLinkClick={() => setShow(false)} />],
[SidebarContextType.DISPOSITION, <DispositionTray onLinkClick={handleFileSet} />],
]);

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,51 @@ exports[`SideNavbar display and logic renders 1`] = `
</label>
</a>
</div>
<div
class="c2 nav-item"
data-testid="nav-tooltip-disposition"
>
<a
class="c3 nav-link"
href="#"
role="button"
>
<svg
color="white"
fill="none"
fill-opacity="0"
height="24"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
style="color: white;"
viewBox="0 0 24 24"
width="24"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M0 0h24v24H0z"
fill="none"
stroke="none"
/>
<path
d="M10 18h4"
/>
<path
d="M3 8a9 9 0 0 1 9 9v1l1.428 -4.285a12 12 0 0 1 6.018 -6.938l.554 -.277"
/>
<path
d="M15 6h5v5"
/>
</svg>
<label
class="c4"
>
Disposition
</label>
</a>
</div>
<svg
class="chevron"
fill="currentColor"
Expand Down

0 comments on commit 5a52cfe

Please sign in to comment.