Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat partner link #112

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Feat partner link #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf2fb9
chore: ensure consistent loader postion in save button
VinayakRugvedi Jul 29, 2024
7fc98fe
chore: disable text selection upon partner row double click
VinayakRugvedi Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/components/projectEdit/partnersForm.js
View file
Open in desktop
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
View file
Open in desktop
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
Loading