Skip to content

Commit 1b43786

Browse files
Luch76Luch76
committed
2024-11-04 - external-recips page
1 parent 096eab9 commit 1b43786

File tree

5 files changed

+27
-50
lines changed

5 files changed

+27
-50
lines changed

‎server/src/main/java/com/objectcomputing/checkins/services/feedback_external_recipient/FeedbackExternalRecipient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class FeedbackExternalRecipient {
5959

6060
@Column(name = "company_name")
6161
@ColumnTransformer(
62-
read = "pgp_sym_decrypt(lastName::bytea,'${aes.key}')",
62+
read = "pgp_sym_decrypt(company_name::bytea,'${aes.key}')",
6363
write = "pgp_sym_encrypt(?,'${aes.key}') "
6464
)
6565
@Schema(description = "company of the feedback external recipient")

‎web-ui/src/components/feedback_external_recipient_card/FeedbackExternalRecipientCard.jsx‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ const StyledBox = styled(Box)({
6161
const FeedbackExternalRecipientCard = ({
6262
recipientProfile,
6363
selected,
64-
reason = null,
6564
onClick
6665
}) => {
6766
const { state } = useContext(AppContext);
@@ -85,24 +84,7 @@ const FeedbackExternalRecipientCard = ({
8584
</CheckCircleIcon>
8685
) : null
8786
}
88-
subheader={
89-
<Typography color="textSecondary" component="h3">
90-
{recipientProfile?.title}
91-
</Typography>
92-
}
9387
disableTypography
94-
avatar={
95-
!recipientProfile?.terminationDate ? (
96-
<Avatar
97-
className="large"
98-
src={getAvatarURL(recipientProfile?.email)}
99-
/>
100-
) : (
101-
<Avatar className="large">
102-
<PriorityHighIcon />
103-
</Avatar>
104-
)
105-
}
10688
/>
10789
<CardContent>
10890
<Container fixed className="info-container">
@@ -115,31 +97,15 @@ const FeedbackExternalRecipientCard = ({
11597
{recipientProfile?.email}
11698
</a>
11799
<br />
118-
Location: {recipientProfile?.location}
119-
<br />
120-
Supervisor: {supervisorProfile?.name}
121-
<br />
122-
PDL: {pdlProfile?.name}
100+
Company: {recipientProfile?.companyName}
123101
<br />
124102
</Typography>
125-
{reason && (
126-
<div className="reason">
127-
<Divider variant="middle" className={classes.divider} />
128-
<Typography
129-
id="rec_reason"
130-
name="rec_reason"
131-
component="p"
132-
className={classes.recommendationText}
133-
>
134-
{reason}
135-
</Typography>
136-
</div>
137-
)}
138103
</Container>
139104
</CardContent>
140105
</Card>
141106
</StyledBox>
142107
);
108+
143109
};
144110

145111
export default FeedbackExternalRecipientCard;

‎web-ui/src/components/feedback_external_recipient_selector/FeedbackExternalRecipientSelector.jsx‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
8383
}
8484
searchTextUpdated.current = true;
8585
}
86-
}, [searchText, profiles, fromQuery, state, userProfile, normalizedMembers]);
86+
}
87+
, [searchText, profiles, fromQuery, state, userProfile, normalizedMembers])
88+
;
8789

8890
useEffect(() => {
8991
function bindFromURL() {
@@ -93,20 +95,18 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
9395
fromQuery !== undefined
9496
) {
9597
let profileCopy = profiles;
98+
console.log("FeedbackExternalRecipientSelector, bindFromURL, profiles: ", profiles);
99+
console.log("FeedbackExternalRecipientSelector, bindFromURL, fromQuery: ", fromQuery);
96100
if (typeof fromQuery === 'string') {
97101
let newProfile = { id: fromQuery };
98-
if (
99-
profiles.filter(member => member.id === newProfile.id).length === 0
100-
) {
102+
console.log("FeedbackExternalRecipientSelector, bindFromURL, newProfile: ", newProfile);
103+
if (profiles.filter(member => member.id === newProfile.id).length === 0) {
101104
profileCopy.push(newProfile);
102105
}
103106
} else if (Array.isArray(fromQuery)) {
104107
for (let i = 0; i < fromQuery.length; ++i) {
105108
let newProfile = { id: fromQuery[i] };
106-
if (
107-
profiles.filter(member => member.id === newProfile.id).length ===
108-
0
109-
) {
109+
if (profiles.filter(member => member.id === newProfile.id).length === 0) {
110110
profileCopy.push(newProfile);
111111
}
112112
}
@@ -116,7 +116,7 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
116116
}
117117
}
118118

119-
async function getSuggestions() {
119+
async function getExternalRecipientsForSelector() {
120120
if (forQuery === undefined || forQuery === null) {
121121
return;
122122
}
@@ -128,7 +128,7 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
128128
}
129129

130130
if (csrf && (searchText === '' || searchText.length === 0)) {
131-
getSuggestions().then(res => {
131+
getExternalRecipientsForSelector().then(res => {
132132
bindFromURL();
133133
if (res !== undefined && res !== null) {
134134
let filteredProfileCopy = profiles.filter(member => {
@@ -137,13 +137,17 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
137137
});
138138
});
139139
let newProfiles = filteredProfileCopy.concat(res);
140+
console.log("FeedbackExternalRecipientSelector, getExternalRecipientsForSelector, newProfiles: ", newProfiles);
140141
setProfiles(newProfiles);
141142
}
142143
});
143144
} // eslint-disable-next-line react-hooks/exhaustive-deps
144-
}, [id, csrf, searchText]);
145+
}, [id, csrf, searchText])
146+
;
145147

146148
const cardClickHandler = id => {
149+
console.log("FeedbackExternalRecipientSelector, cardClickHandler, id: ", id);
150+
console.log("FeedbackExternalRecipientSelector, cardClickHandler, fromQuery: ", fromQuery);
147151
if (!Array.isArray(fromQuery)) {
148152
fromQuery = fromQuery ? [fromQuery] : [];
149153
}
@@ -240,8 +244,7 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
240244
.map(profile => (
241245
<FeedbackExternalRecipientCard
242246
key={profile.id}
243-
recipientProfile={selectProfile(state, profile.id)}
244-
reason={profile?.reason ? profile.reason : null}
247+
recipientProfile={profile}
245248
onClick={() => cardClickHandler(profile.id)}
246249
/>
247250
))}
@@ -252,6 +255,9 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery })
252255
</div>
253256
</StyledGrid>
254257
);
258+
259+
//recipientProfile={selectProfile(state, profile.id)}
260+
255261
};
256262

257263
FeedbackExternalRecipientSelector.propTypes = propTypes;

‎web-ui/src/components/feedback_recipient_selector/FeedbackRecipientSelector.jsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,16 @@ const FeedbackRecipientSelector = ({ changeQuery, fromQuery, forQuery }) => {
138138
});
139139
});
140140
let newProfiles = filteredProfileCopy.concat(res);
141+
console.log("FeedbackRecipientSelector, getSuggestions, newProfiles: ", newProfiles);
141142
setProfiles(newProfiles);
142143
}
143144
});
144145
} // eslint-disable-next-line react-hooks/exhaustive-deps
145146
}, [id, csrf, searchText]);
146147

147148
const cardClickHandler = id => {
149+
console.log("FeedbackRecipientSelector, cardClickHandler, id: ", id);
150+
console.log("FeedbackRecipientSelector, cardClickHandler, fromQuery: ", fromQuery);
148151
if (!Array.isArray(fromQuery)) {
149152
fromQuery = fromQuery ? [fromQuery] : [];
150153
}

‎web-ui/src/context/selectors.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,14 @@ export const selectTerminatedMemberIds = createSelector(
246246
export const selectProfileMap = createSelector(
247247
selectCurrentMembers,
248248
currentMembers => {
249+
console.log("selectors, currentMembers 01, currentMembers: ", currentMembers);
249250
if (currentMembers && currentMembers.length) {
250251
currentMembers = currentMembers.reduce((mappedById, member) => {
251252
mappedById[member.id] = member;
252253
return mappedById;
253254
}, {});
254255
}
256+
console.log("selectors, currentMembers 02, currentMembers: ", currentMembers);
255257
return currentMembers;
256258
}
257259
);

0 commit comments

Comments
 (0)