Skip to content

Commit

Permalink
Merge pull request #112 from naxa-developers/feat-partner-link
Browse files Browse the repository at this point in the history
Feat partner link
  • Loading branch information
prabinoid authored Jul 30, 2024
2 parents e63254a + 7fc98fe commit 8bd9f6b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/projectEdit/partnersForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export const PartnersForm = () => {
</div>

<Button
className={`${styleClasses.redButtonClass} br2`}
className={`${styleClasses.redButtonClass} br2 flex`}
style={{ height: '42px' }}
onClick={handleSave}
loading={savePartnerMutation.isLoading}
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/projectEdit/partnersListing.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@ export const Listing = ({ partnerIdToDetailsMapping }) => {
!isPending && !isRefetching && !isError && linkedPartners?.partnerships?.length === 0;

const tableContents = linkedPartners?.partnerships?.map((partner) => {
const [startDate, startDateString] = getDateObjectAndDateString(partner.startedOn)
const [startDate, startDateString] = getDateObjectAndDateString(partner.startedOn);

let endDateString = 'N/A',
endDate = null;
if (partner.endedOn) {
[endDate, endDateString] = getDateObjectAndDateString(partner.endedOn)
[endDate, endDateString] = getDateObjectAndDateString(partner.endedOn);
}

const isInactive = endDate && endDate < new Date();
Expand All @@ -184,6 +184,7 @@ export const Listing = ({ partnerIdToDetailsMapping }) => {
setSelectedPartner({ ...partner, startedOn: startDate, endedOn: endDate });
setActionType('edit');
}}
style={{ userSelect: 'none' }}
>
<td className="pv3 f5 pr3 bb b--black-20" id="edit-partner-action">
<span>{partnerIdToDetailsMapping[partner.partnerId]?.name}</span>
Expand Down

0 comments on commit 8bd9f6b

Please sign in to comment.