Merge branch 'develop' into feature-2645/feedback-request-add-ability-to-request-feedback-from-external-source

Author: Luch76

docs/Gemfile.lock

@@ -251,8 +251,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rouge (3.30.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
@@ -266,7 +265,6 @@ GEM
       faraday (>= 0.17.3, < 3)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
-    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.1)

server/build.gradle

@@ -3,7 +3,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 plugins {
     id 'maven-publish'
     id("com.gradleup.shadow") version "8.3.2"
-    id("io.micronaut.application") version "4.4.2"
+    id("io.micronaut.application") version "4.4.3"
     id "jacoco"
 }
 

server/gradle.properties

@@ -1,2 +1,2 @@
-micronautVersion=4.6.2
+micronautVersion=4.6.3
 seleniumVersion=4.24.0

server/src/main/java/com/objectcomputing/checkins/services/volunteering/VolunteeringOrganization.java

@@ -44,7 +44,6 @@ public class VolunteeringOrganization {
     private String description;
 
     @Column(name = "website")
-    @NotBlank
     @Schema(description = "website for the volunteering organization")
     private String website;
 
@@ -59,4 +58,4 @@ public VolunteeringOrganization(String name, String description, String website)
     public VolunteeringOrganization(String name, String description, String website, boolean active) {
         this(null, name, description, website, active);
     }
-}
+}

server/src/main/java/com/objectcomputing/checkins/services/volunteering/VolunteeringOrganizationDTO.java

@@ -21,14 +21,13 @@ public class VolunteeringOrganizationDTO {
     @Schema(description = "description of the volunteering organization")
     private String description;
 
-    @NotBlank
     @Schema(description = "website for the volunteering organization")
     private String website;
 
     @Schema(description = "whether the Volunteering Organization is active")
     private Boolean active;
 
-    public VolunteeringOrganizationDTO(@NotBlank String name, @NotBlank String description, @NotBlank String website) {
+    public VolunteeringOrganizationDTO(@NotBlank String name, @NotBlank String description, String website) {
         this(name, description, website, true);
     }
 }

server/src/main/resources/db/common/V117__alter_volunteering_organization_website.sql

@@ -0,0 +1 @@
+ALTER TABLE volunteering_organization ALTER COLUMN website DROP NOT NULL

server/src/test/java/com/objectcomputing/checkins/services/volunteering/VolunteeringOrganizationControllerTest.java

@@ -148,16 +148,4 @@ void testCreateOrganizationWithoutDescription() {
         String body = e.getResponse().getBody(String.class).get();
         assertTrue(body.contains("organization.description: must not be blank"), body + " should contain 'organization.description: must not be blank'");
     }
-
-    @Test
-    void testCreateOrganizationWithoutWebsite() {
-        MemberProfile memberProfile = createADefaultMemberProfile();
-        String adminAuth = auth(memberProfile.getWorkEmail(), ADMIN_ROLE);
-        VolunteeringOrganizationDTO org = new VolunteeringOrganizationDTO("name", "description", null);
-
-        HttpClientResponseException e = assertThrows(HttpClientResponseException.class, () -> organizationClient.createOrganization(adminAuth, org));
-        assertEquals(HttpStatus.BAD_REQUEST, e.getStatus());
-        String body = e.getResponse().getBody(String.class).get();
-        assertTrue(body.contains("organization.website: must not be blank"), body + " should contain 'organization.website: must not be blank'");
-    }
 }

web-ui/package.json

@@ -46,8 +46,7 @@
     "react-swipeable-views": "^0.14.0",
     "recharts": "^2.12.4",
     "reselect": "^4.0.0",
-    "styled-components": "^6.1.8",
-    "universal-cookie": "^4.0.4"
+    "styled-components": "^6.1.8"
   },
   "scripts": {
     "build-ladle": "ladle build",

web-ui/src/components/guild-results/GuildResults.jsx

@@ -113,8 +113,8 @@ const GuildResults = () => {
         </div>
       </div>
       <div className="guilds">
-        {guilds?.length
-          ? guilds?.map((guild, index) =>
+        {guilds
+          ? guilds.map((guild, index) =>
               guild.name.toLowerCase().includes(searchText.toLowerCase()) ? (
                 <GuildSummaryCard
                   key={`guild-summary-${guild.id}`}

web-ui/src/components/reviews/TeamMemberReview.jsx

@@ -20,9 +20,6 @@ import {
   Typography
 } from '@mui/material';
 import FeedbackSubmitForm from '../feedback_submit_form/FeedbackSubmitForm';
-import SelectUserModal from './SelectUserModal';
-import { cancelFeedbackRequest, updateFeedbackRequest } from '../../api/feedback';
-import { UPDATE_TOAST } from '../../context/actions';
 
 const propTypes = {
   selfReview: PropTypes.any,
@@ -97,27 +94,7 @@ const TeamMemberReview = ({
   const csrf = selectCsrfToken(state);
   const currentUser = selectCurrentUser(state);
   const theme = useTheme();
-  const [value, setValue] = useState(0);
-  const [init, setInit] = useState(true);
-  const [reassignOpen, setReassignOpen] = useState(false);
-  const [cancelOpen, setCancelOpen] = useState(false);
-
-  const handleOpenReassign = useCallback(
-    () => setReassignOpen(true),
-    [setReassignOpen]
-  );
-  const handleCloseReassign = useCallback(
-    () => setReassignOpen(false),
-    [setReassignOpen]
-  );
-  const handleOpenCancel = useCallback(
-    () => setCancelOpen(true),
-    [setCancelOpen]
-  );
-  const handleCloseCancel = useCallback(
-    () => setCancelOpen(false),
-    [setCancelOpen]
-  );
+  const [value, setValue] = useState(1);
 
   const review = reviews && reviews[value - 1];
   const recipient = selectProfile(state, review?.recipientId);
@@ -130,91 +107,9 @@ const TeamMemberReview = ({
     setValue(index);
   };
 
-  const handleCancelClick = useCallback(() => {
-    const cancelRequest = async () => {
-      const res = await cancelFeedbackRequest(review, csrf);
-      const cancellationResponse =
-        res && res.payload && res.payload.status === 200 && !res.error
-          ? res.payload.data
-          : null;
-      if (!cancellationResponse) {
-        window.snackDispatch({
-          type: UPDATE_TOAST,
-          payload: {
-            severity: 'error',
-            toast:
-              'There was an error cancelling the review. Please contact your administrator.'
-          }
-        });
-      }
-      return cancellationResponse;
-    };
-
-    handleCloseCancel();
-    if (csrf) {
-      cancelRequest().then(res => {
-        if (res) {
-          reloadReviews();
-          window.snackDispatch({
-            type: UPDATE_TOAST,
-            payload: {
-              severity: 'success',
-              toast: 'Review canceled'
-            }
-          });
-        }
-      });
-    }
-  }, [csrf, handleCloseCancel, review, reloadReviews]);
-
-  const handleReassign = useCallback(
-    assignee => {
-      const reassignRequest = async () => {
-        review.recipientId = assignee.id;
-        const res = await updateFeedbackRequest(review, csrf);
-        const updateResponse =
-          res && res.payload && res.payload.status === 200 && !res.error
-            ? res.payload.data
-            : null;
-        if (!updateResponse) {
-          window.snackDispatch({
-            type: UPDATE_TOAST,
-            payload: {
-              severity: 'error',
-              toast:
-                'There was an error reassigning the review. Please contact your administrator.'
-            }
-          });
-        }
-        return updateResponse;
-      };
-
-      handleCloseReassign();
-      if (csrf) {
-        reassignRequest().then(res => {
-          if (res) {
-            reloadReviews();
-            window.snackDispatch({
-              type: UPDATE_TOAST,
-              payload: {
-                severity: 'success',
-                toast: 'Review reassigned'
-              }
-            });
-          }
-        });
-      }
-    },
-    [csrf, handleCloseReassign, review, reloadReviews]
-  );
-
   let selfReviewIcon = <HourglassEmptyIcon />;
   if (selfReview && selfReview.status?.toUpperCase() === 'SUBMITTED') {
     selfReviewIcon = <CheckCircleIcon />;
-  } else if (init) {
-    // If there is no self-review, switch to the next tab.
-    setInit(false);
-    setValue(1);
   }
 
   return (
@@ -228,25 +123,21 @@ const TeamMemberReview = ({
             textColor="inherit"
             variant="fullWidth"
           >
-            {selfReview && selfReview.id && (<Tab
+            <Tab
               icon={selfReviewIcon}
               label={
                 memberProfile?.firstName
                   ? memberProfile?.firstName + "'s Self-Review"
                   : 'Self-Review'
               }
               {...a11yProps(0)}
-            />)}
+            />
             {reviews &&
-              reviews.map((review, index) => {
-                if (!review) {
-                  return (<></>);
-                }
+              reviews.filter(r => !!r).map((review, index) => {
                 const reviewer = review.recipientId == memberProfile?.id ?
                                  memberProfile :
                                  selectProfile(state, review.recipientId);
                 let label = reviewer?.firstName + "'s Review";
-
                 if (reviewer?.id === currentUser?.id) {
                   label = 'Your Review';
                 }
@@ -267,24 +158,20 @@ const TeamMemberReview = ({
           index={value}
           onChangeIndex={handleChangeIndex}
         >
-          {selfReview && selfReview.id && (
           <TabPanel value={value} index={0} dir={theme.direction}>
-            <FeedbackSubmitForm
-              requesteeName={
-                memberProfile?.firstName + ' ' + memberProfile?.lastName
-              }
-              requestId={selfReview?.id}
-              request={selfReview}
-              reviewOnly={true}
-            />
+            {selfReview?.id ? (
+              <FeedbackSubmitForm
+                requesteeName={
+                  memberProfile?.firstName + ' ' + memberProfile?.lastName
+                }
+                requestId={selfReview?.id}
+                request={selfReview}
+                reviewOnly={true}
+              />
+            ) : (<Typography variant="h4">Not Available</Typography>)}
           </TabPanel>
-          )}
           {reviews &&
-            reviews.map((review, index) => {
-              if (!review) {
-                return (<></>);
-              }
-
+            reviews.filter(r => !!r).map((review, index) => {
               const reviewer = selectProfile(state, review.recipientId);
               const requestee = selectProfile(state, review.requesteeId);
               const requesteeName = requestee?.name;
@@ -293,26 +180,6 @@ const TeamMemberReview = ({
 
               return (
                 <TabPanel value={value} index={index + 1} dir={theme.direction}>
-                  {review && review.status?.toUpperCase() !== 'SUBMITTED' && (
-                    <div className={classes.buttonRow}>
-                      <Button
-                        onClick={handleOpenCancel}
-                        className={classes.actionButtons}
-                        variant="outlined"
-                        color="secondary"
-                      >
-                        Cancel
-                      </Button>
-                      <Button
-                        onClick={handleOpenReassign}
-                        className={classes.actionButtons}
-                        variant="outlined"
-                        color="primary"
-                      >
-                        Reassign
-                      </Button>
-                    </div>
-                  )}
                   <FeedbackSubmitForm
                     requesteeName={requesteeName}
                     requestId={review.id}
@@ -323,39 +190,6 @@ const TeamMemberReview = ({
               );
             })}
         </SwipeableViews>
-        <SelectUserModal
-          userLabel="Reviewer"
-          open={reassignOpen}
-          onSelect={handleReassign}
-          onClose={handleCloseReassign}
-        />
-        <Modal open={cancelOpen} onClose={handleCloseCancel}>
-          <Card className="cancel-feedback-request-modal">
-            <CardHeader
-              title={
-                <Typography variant="h5" fontWeight="bold">
-                  Cancel Review
-                </Typography>
-              }
-            />
-            <CardContent>
-              <Typography variant="body1">
-                Are you sure you want to cancel the review sent to{' '}
-                <b>{recipient?.name}</b> on <b>{review?.sendDate}</b>? The
-                recipient will not be able to respond to this request once it is
-                canceled.
-              </Typography>
-            </CardContent>
-            <CardActions>
-              <Button color="secondary" onClick={handleCloseReassign}>
-                No, Keep Feedback Request
-              </Button>
-              <Button color="primary" onClick={handleCancelClick}>
-                Yes, Cancel Feedback Request
-              </Button>
-            </CardActions>
-          </Card>
-        </Modal>
       </Box>
     </Root>
   );