2024-11-22 - allow edit of ext-recip

Author: Luch76

server/src/main/java/com/objectcomputing/checkins/services/feedback_external_recipient/FeedbackExternalRecipientController.java

@@ -51,20 +51,16 @@ public HttpResponse<FeedbackExternalRecipientResponseDTO> save(@Body @Valid @Not
     }
 
     /**
-     * Mark a feedback request external recipient as inactive
+     * Update a feedback request external recipient
      *
-     * @param id {@link UUID} ID of the external-recipient
-     * @return {@link HttpResponse}
+     * @param feedbackExternalRecipientUpdateDTO {@link FeedbackExternalRecipientCreateDTO} New feedback-req external recipient to create
+     * @return {@link FeedbackExternalRecipient}
      */
-    @Put("/inactivate/{id}")
-    public HttpResponse<?> inactivate(UUID id) {
-        FeedbackExternalRecipient feedbackExternalRecipient = feedbackExternalRecipientServices.getById(id);
-        if (feedbackExternalRecipient == null) {
-            throw new BadArgException("Invalid external recipient ID");
-        }
-        feedbackExternalRecipient.setInactive(true);
-        feedbackExternalRecipientServices.update(feedbackExternalRecipient);
-        return HttpResponse.ok();
+    @Put
+    public HttpResponse<FeedbackExternalRecipientResponseDTO> update(@Body @Valid @NotNull FeedbackExternalRecipientUpdateDTO feedbackExternalRecipientUpdateDTO) {
+        FeedbackExternalRecipient savedFeedbackExternalRecipient = feedbackExternalRecipientServices.update(feedbackExternalRecipientUpdateDTO);
+        return HttpResponse.created(fromEntity(savedFeedbackExternalRecipient))
+                .headers(headers -> headers.location(URI.create("/feedback_external_recipient/" + savedFeedbackExternalRecipient.getId())));
     }
 
     /**

server/src/main/java/com/objectcomputing/checkins/services/feedback_external_recipient/FeedbackExternalRecipientServices.java

@@ -7,7 +7,7 @@
 public interface FeedbackExternalRecipientServices {
     FeedbackExternalRecipient save(FeedbackExternalRecipient feedbackExternalRecipient);
 
-    FeedbackExternalRecipient update(FeedbackExternalRecipient feedbackExternalRecipient);
+    FeedbackExternalRecipient update(FeedbackExternalRecipientUpdateDTO feedbackExternalRecipientUpdateDTO);
 
     FeedbackExternalRecipient getById(UUID id);
 

server/src/main/java/com/objectcomputing/checkins/services/feedback_external_recipient/FeedbackExternalRecipientServicesImpl.java

@@ -21,8 +21,16 @@ public FeedbackExternalRecipient save(FeedbackExternalRecipient feedbackExternal
     }
 
     @Override
-    public FeedbackExternalRecipient update(FeedbackExternalRecipient feedbackExternalRecipient) {
-        return feedbackExternalRecipientRepository.update(feedbackExternalRecipient);
+    public FeedbackExternalRecipient update(FeedbackExternalRecipientUpdateDTO feedbackExternalRecipientUpdateDTO) {
+        FeedbackExternalRecipient feedbackExternalRecipientExisting = getById(feedbackExternalRecipientUpdateDTO.getId());
+
+        feedbackExternalRecipientExisting.setCompanyName(feedbackExternalRecipientUpdateDTO.getCompanyName());
+        feedbackExternalRecipientExisting.setEmail(feedbackExternalRecipientUpdateDTO.getEmail());
+        feedbackExternalRecipientExisting.setFirstName(feedbackExternalRecipientUpdateDTO.getFirstName());
+        feedbackExternalRecipientExisting.setLastName(feedbackExternalRecipientUpdateDTO.getLastName());
+        feedbackExternalRecipientExisting.setInactive(feedbackExternalRecipientUpdateDTO.getInactive());
+
+        return feedbackExternalRecipientRepository.update(feedbackExternalRecipientExisting);
     }
 
     @Override

web-ui/src/api/feedback.js

@@ -311,3 +311,16 @@ export const putExternalRecipientInactivate = async (externalRecipientId, cookie
     }
   });
 };
+
+export const putExternalRecipient = async (externalRecipient, cookie) => {
+  return resolve({
+    method: 'PUT',
+    url: `${feedbackExternalRecipientsURL}`,
+    data: externalRecipient,
+    headers: {
+      'X-CSRF-Header': cookie,
+      Accept: 'application/json',
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  });
+};

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

@@ -132,33 +132,11 @@ const FeedbackExternalRecipientCard = ({
                 >
                   {recipientProfile?.email}
                 </a>
-                <br />
+                <br/>
                 Company: {recipientProfile?.companyName}
+                <br/>
+                Status: { recipientProfile?.inactive ? 'Inactive' : 'Active' }
               </Typography>
-              <Select
-                  label="Status"
-                  name="inactive"
-                  value={recipientProfile?.inactive ? 'Inactive' : 'Active'}
-                  onChange={(e) => {
-                    e.stopPropagation();
-                    onEditHandle({ ...recipientProfile, inactive: e.target.value === 'Inactive' });
-                  }}
-                  fullWidth
-                  margin="normal"
-                  disabled={true}
-                  sx={{
-                    fontSize: '0.75rem',
-                    '& .MuiSelect-select': {
-                      padding: '4px 8px',
-                    },
-                    '& .MuiMenuItem-root': {
-                      fontSize: '0.75rem',
-                    },
-                  }}
-              >
-                <MenuItem value="Active">Active</MenuItem>
-                <MenuItem value="Inactive">Inactive</MenuItem>
-              </Select>
               <Button onClick={(e) => {
                   e.stopPropagation();
                   handleEditOpen();

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

@@ -5,9 +5,9 @@ import { AppContext } from '../../context/AppContext';
 import {
     selectProfile, selectCsrfToken, selectCurrentUser, selectNormalizedMembers,
 } from '../../context/selectors';
-import {putExternalRecipientInactivate, getExternalRecipients} from '../../api/feedback';
+import {putExternalRecipientInactivate, getExternalRecipients, putExternalRecipient} from '../../api/feedback';
 import Typography from '@mui/material/Typography';
-import { TextField, Grid, InputAdornment } from '@mui/material';
+import {TextField, Grid, InputAdornment, FormControlLabel, Switch} from '@mui/material';
 import { Search } from '@mui/icons-material';
 import PropTypes from 'prop-types';
 import './FeedbackExternalRecipientSelector.css';
@@ -56,14 +56,15 @@ const propTypes = {
 };
 
 const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery, addExternalRecipientId }) => {
-  const { state, dispatch } = useContext(AppContext);
-  const csrf = selectCsrfToken(state);
-  const userProfile = selectCurrentUser(state);
-  const { id } = userProfile;
-  const searchTextUpdated = useRef(false);
-  const hasRenewedFromURL = useRef(false);
-  const [searchText, setSearchText] = useState('');
-  const [externalRecipients, setExternalRecipients] = useState([]);
+    const { state, dispatch } = useContext(AppContext);
+    const csrf = selectCsrfToken(state);
+    const userProfile = selectCurrentUser(state);
+    const { id } = userProfile;
+    const searchTextUpdated = useRef(false);
+    const hasRenewedFromURL = useRef(false);
+    const [searchText, setSearchText] = useState('');
+    const [externalRecipients, setExternalRecipients] = useState([]);
+    const [activeRecords, setActiveRecords] = useState(true);
 
 
     useEffect(() => {
@@ -159,7 +160,35 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery, a
     };
 
     async function externalRecipientEdit(externalRecipient) {
-        console.log("FeedbackExternalRecipientSelector, externalRecipientEdit, externalRecipient: ", externalRecipient);
+        let externalRecipientsCopy = [...externalRecipients];
+        let indexArray = externalRecipientsCopy.findIndex(externalRecipientFind => externalRecipientFind.id === externalRecipient.id);
+
+        try {
+            const response = await putExternalRecipient(externalRecipient, csrf);
+            if (response && !response.error) {
+                externalRecipientsCopy[indexArray] = response.data.payload;
+                hasRenewedFromURL.current = false;
+                setExternalRecipients(externalRecipientsCopy);
+            } else {
+                const errorMessage = 'Failed to inactivate recipient';
+                dispatch({
+                    type: UPDATE_TOAST,
+                    payload: {
+                        severity: 'error',
+                        toast: errorMessage
+                    }
+                });
+            }
+        } catch (error) {
+            const errorMessage = ("An error occurred while inactivating the recipient: ", error);
+            dispatch({
+                type: UPDATE_TOAST,
+                payload: {
+                    severity: 'error',
+                    toast: errorMessage
+                }
+            });
+        }
     }
 
     async function externalRecipientInactivate(id) {
@@ -308,6 +337,18 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery, a
                         >
                             <HelpOutlineIcon style={{ color: 'gray', marginLeft: '10px' }} />
                         </Tooltip>
+                        <FormControlLabel
+                            control={
+                                <Switch
+                                    checked={activeRecords}
+                                    onChange={event => {
+                                        const { checked } = event.target;
+                                        setActiveRecords(checked);
+                                    }}
+                                />
+                            }
+                            label="Active Records Only"
+                        />
                     </div>
                 </Grid>
             </Grid>
@@ -319,7 +360,7 @@ const FeedbackExternalRecipientSelector = ({ changeQuery, fromQuery, forQuery, a
                             .filter(
                                 profile =>
                                     !fromQuery ||
-                                    (!fromQuery.includes(profile.id) && profile.id !== forQuery && !!!profile.inactive)
+                                    (!fromQuery.includes(profile.id) && profile.id !== forQuery && ((!!!profile.inactive && activeRecords) || !activeRecords))
                             )
                             .map((profile, index) => (
                                 <FeedbackExternalRecipientCard