Skip to content

Commit

Permalink
Merge pull request #2987 from MetaPhase-Consulting/TM-6053-Pub-Pos-Edit
Browse files Browse the repository at this point in the history
TM-6053-Pub-Pos-Edit-UI
  • Loading branch information
M00staff committed May 21, 2024
2 parents 6d9c24b + 8b73232 commit d2572d3
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/Components/PostPage/PostPage.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Route, Switch } from 'react-router-dom';
import PropTypes from 'prop-types';
import PublishablePositions from 'Components/PublishablePositions/PublishablePositions';
import AvailableBidderContainer from 'Components/AvailableBidder/AvailableBidderContainer';
import PositionManager from '../BureauPage/PositionManager';
import PositionManagerDetails from '../BureauPage/PositionManagerDetails';
Expand All @@ -19,6 +20,7 @@ const PostPage = props => {
<Route path="/profile/post/availablebidders" render={() => <AvailableBidderContainer isCDO={false} isPost />} />
<Route path="/profile/post/biddingtool/:id" render={() => <BiddingTool />} />
<Route path="/profile/post/biddingtool/" render={() => <BiddingTool />} />
<Route path="/profile/post/publishablepositions" render={() => <PublishablePositions viewType="post" />} />
</Switch>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,14 @@ exports[`ProfileMenuExpandedComponent matches snapshot when isGlossaryEditor is
search=""
title="Position Management"
/>
<withRouter(NavLink)
hidden={true}
iconName=" fa-newspaper-o"
key="Publishable Positions"
link="/profile/post/publishablepositions"
search=""
title="Publishable Positions"
/>
</withRouter(NavLink)>
<withRouter(NavLink)
expandedSection={
Expand Down Expand Up @@ -914,6 +922,14 @@ exports[`ProfileMenuExpandedComponent matches snapshot when user is bidcycle_adm
search=""
title="Position Management"
/>
<withRouter(NavLink)
hidden={true}
iconName=" fa-newspaper-o"
key="Publishable Positions"
link="/profile/post/publishablepositions"
search=""
title="Publishable Positions"
/>
</withRouter(NavLink)>
<withRouter(NavLink)
expandedSection={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const onRestore = (e) => {
};

const PublishablePositionCard = ({
data, onEditModeSearch, onSubmit, disableEdit,
data, onEditModeSearch, onSubmit, disableEdit, disableEditDetails,
additionalCallsLoading, onShowMorePP }) => {
// =============== Overview: View Mode ===============

Expand Down Expand Up @@ -154,6 +154,7 @@ const PublishablePositionCard = ({
<div className="position-form--input">
<label htmlFor="publishable-position-statuses">Publishable Status</label>
<select
disabled={disableEditDetails}
className="publishable-position-inputs"
id="publishable-position-statuses"
defaultValue={status}
Expand Down Expand Up @@ -187,6 +188,7 @@ const PublishablePositionCard = ({
id="exclude-checkbox"
label="Exclude Position from Bid Audit"
value={exclude}
disabled={disableEditDetails}
onCheckBoxClick={e => setExclude(e)}
/>
{DETO_RWA_FLAG() &&
Expand Down Expand Up @@ -333,6 +335,7 @@ PublishablePositionCard.propTypes = {
cycles: BID_CYCLES.isRequired,
onEditModeSearch: PropTypes.func,
onSubmit: PropTypes.func,
disableEditDetails: PropTypes.bool,
disableEdit: PropTypes.bool,
additionalCallsLoading: PropTypes.bool,
filters: PropTypes.shape({
Expand All @@ -344,6 +347,7 @@ PublishablePositionCard.propTypes = {
PublishablePositionCard.defaultProps = {
onEditModeSearch: EMPTY_FUNCTION,
onSubmit: EMPTY_FUNCTION,
disableEditDetails: false,
disableEdit: false,
additionalCallsLoading: false,
onShowMorePP: EMPTY_FUNCTION,
Expand Down
3 changes: 2 additions & 1 deletion src/Components/PublishablePositions/PublishablePositions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,8 @@ const PublishablePositions = ({ viewType }) => {
additionalCallsLoading={additionalDataIsLoading}
onEditModeSearch={editState =>
setEditMode(editState)}
disableEdit={editMode || (viewType === 'ao')}
disableEdit={editMode}
disableEditDetails={(viewType === 'bureau') || (viewType === 'post')}
onSubmit={editData => submitEdit(editData)}
filters={filters}
onShowMorePP={callAdditionalData}
Expand Down
9 changes: 9 additions & 0 deletions src/Constants/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,15 @@ export const GET_PROFILE_MENU = () => MenuConfig([
'post_user',
],
},
{
text: 'Publishable Positions',
route: '/profile/post/publishablepositions',
icon: ' fa-newspaper-o',
roles: [
'superuser',
'post_user',
],
},
checkFlag('flags.bidding_tool') ?
{
text: 'Bidding Tool',
Expand Down
4 changes: 4 additions & 0 deletions src/sass/_positionContent.scss
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@
}
}

.publishable-position-inputs:disabled {
cursor: not-allowed;
}

.position-form {
.position-form--heading {
display: flex;
Expand Down

0 comments on commit d2572d3

Please sign in to comment.