Merge branch 'develop' into feature-2834/move-required-permission-to-services

Author: ocielliottc

web-ui/package.json

@@ -99,7 +99,7 @@
     "react-test-renderer": "^18.2.0",
     "typescript": "^5.4.5",
     "typescript-eslint": "^7.7.1",
-    "vite": "^5.2.14",
+    "vite": "^5.4.12",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.6.0",
     "vitest-fetch-mock": "^0.2.2"

web-ui/src/api/birthdayanniversary.js

@@ -11,7 +11,11 @@ export const getAnniversaries = async (months, cookie) => {
       url: `${anniversaryReportUrl}?month=${month}`,
       headers: { 'X-CSRF-Header': cookie, Accept: 'application/json' }
     });
-    results.push(...res.payload.data);
+    if (res.error) {
+      console.error(res.error);
+    } else {
+      results.push(...res.payload.data);
+    }
   }
   return results;
 };

web-ui/src/components/team-results/TeamsActions.jsx

@@ -34,7 +34,6 @@ const TeamsActions = ({ isOpen, onOpen }) => {
             if (data) {
               dispatch({ type: ADD_TEAM, payload: data });
             }
-            handleClose();
           }
         }}
         headerText="Add A New Team"

web-ui/src/context/selectors.js

@@ -170,6 +170,10 @@ export const selectHasAdministerKudosPermission = hasPermission(
   'CAN_ADMINISTER_KUDOS'
 );
 
+export const selectHasCreateKudosPermission = hasPermission(
+  'CAN_CREATE_KUDOS'
+);
+
 export const selectHasDeleteMembersPermission = hasPermission(
   'CAN_DELETE_ORGANIZATION_MEMBERS'
 );
@@ -198,6 +202,10 @@ export const selectCanViewCheckinsPermission = hasPermission(
   'CAN_VIEW_CHECKINS'
 );
 
+export const selectCanUpdateCheckinsPermission = hasPermission(
+  'CAN_UPDATE_CHECKINS'
+);
+
 export const selectCanEditSkills = hasPermission(
   'CAN_EDIT_SKILLS'
 );

web-ui/src/pages/CheckinsPage.jsx

@@ -14,6 +14,7 @@ import {
   selectProfile,
   selectCheckinsForMember,
   selectCanViewCheckinsPermission,
+  selectCanUpdateCheckinsPermission,
   selectCanViewPrivateNotesPermission,
 } from '../context/selectors';
 import { getCheckins, createNewCheckin } from '../context/thunks';
@@ -101,7 +102,7 @@ const CheckinsPage = () => {
   const handleClose = () => setOpen(false);
 
   const completeCheckin = async () => {
-    if (csrf) {
+    if (csrf && selectCanUpdateCheckinsPermission(state)) {
       const res = await updateCheckin(
         { ...currentCheckin, pdlId: selectedProfile.pdlId, completed: true },
         csrf

web-ui/src/pages/KudosPage.jsx

@@ -3,7 +3,11 @@ import { styled } from "@mui/material/styles";
 import { Button, Tab, Typography } from "@mui/material";
 import { TabContext, TabList, TabPanel } from "@mui/lab";
 import { AppContext } from "../context/AppContext";
-import { selectCsrfToken, selectCurrentUser } from "../context/selectors";
+import {
+  selectCsrfToken,
+  selectCurrentUser,
+  selectHasCreateKudosPermission,
+} from "../context/selectors";
 import { getReceivedKudos, getSentKudos } from "../api/kudos";
 import { UPDATE_TOAST } from "../context/actions";
 import KudosCard from "../components/kudos_card/KudosCard";
@@ -116,14 +120,14 @@ const KudosPage = () => {
           open={kudosDialogOpen}
           onClose={() => setKudosDialogOpen(false)}
         />
-        <Button
+        {selectHasCreateKudosPermission(state) && <Button
           className="kudos-dialog-open"
           variant="outlined"
           startIcon={<StarIcon />}
           onClick={() => setKudosDialogOpen(true)}
         >
           Give Kudos
-        </Button>
+        </Button>}
       </div>
       <TabContext value={kudosTab}>
         <div className="kudos-tab-container">

web-ui/src/pages/SkillReportPage.jsx

@@ -59,12 +59,12 @@ const SkillReportPage = props => {
     let memberSkillsFound;
     if (res && res.payload) {
       memberSkillsFound =
-        res.payload.data.teamMembers && !res.error
+        !res.error && res.payload.data.teamMembers
           ? res.payload.data.teamMembers
           : undefined;
     }
     // Filter out skills of terminated members
-    memberSkillsFound = memberSkillsFound.filter(memberSkill =>
+    memberSkillsFound = memberSkillsFound?.filter(memberSkill =>
       memberIds.includes(memberSkill.id)
     );
     if (memberSkillsFound && memberIds) {

web-ui/src/pages/TeamSkillReportPage.jsx

@@ -77,7 +77,7 @@ const TeamSkillReportPage = () => {
     let memberSkillsFound;
     if (res && res.payload) {
       memberSkillsFound =
-        res.payload.data.teamMembers && !res.error
+        !res.error && res.payload.data.teamMembers
           ? res.payload.data.teamMembers
           : undefined;
     }

web-ui/src/pages/ViewFeedbackPage.jsx

@@ -234,18 +234,20 @@ const ViewFeedbackPage = () => {
       //and associated template info together
       const templateReqs = [];
       const templateIds = [];
-      for (let i = 0; i < feedbackRequests.length; i++) {
-        if (!templateIds.includes(feedbackRequests[i].templateId)) {
-          templateIds.push(feedbackRequests[i].templateId);
-          templateReqs.push(getTemplateInfo(feedbackRequests[i].templateId));
+      if (feedbackRequests) {
+        for (let i = 0; i < feedbackRequests.length; i++) {
+          if (!templateIds.includes(feedbackRequests[i].templateId)) {
+            templateIds.push(feedbackRequests[i].templateId);
+            templateReqs.push(getTemplateInfo(feedbackRequests[i].templateId));
+          }
         }
       }
       let templates = await Promise.all(templateReqs);
       templates = templates.reduce((map, template) => {
         map[template.id] = template;
         return map;
       }, {});
-      feedbackRequests.forEach(request => {
+      feedbackRequests?.forEach(request => {
         request.templateInfo = templates[request.templateId];
       });
       return feedbackRequests;

web-ui/yarn.lock

@@ -8169,9 +8169,9 @@ unbox-primitive@^1.0.2:
     which-boxed-primitive "^1.0.2"
 
 undici@^6.19.5:
-  version "6.20.1"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-6.20.1.tgz#fbb87b1e2b69d963ff2d5410a40ffb4c9e81b621"
-  integrity sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==
+  version "6.21.1"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.1.tgz#336025a14162e6837e44ad7b819b35b6c6af0e05"
+  integrity sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==
 
 unicorn-magic@^0.1.0:
   version "0.1.0"
@@ -8361,10 +8361,10 @@ vite-tsconfig-paths@^4.3.2:
     globrex "^0.1.2"
     tsconfck "^3.0.3"
 
-vite@^5.0.0, vite@^5.2.12, vite@^5.2.14:
-  version "5.4.11"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.11.tgz#3b415cd4aed781a356c1de5a9ebafb837715f6e5"
-  integrity sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==
+vite@^5.0.0, vite@^5.2.12, vite@^5.4.12:
+  version "5.4.12"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.12.tgz#627d12ff06de3942557dfe8632fd712a12a072c7"
+  integrity sha512-KwUaKB27TvWwDJr1GjjWthLMATbGEbeWYZIbGZ5qFIsgPP3vWzLu4cVooqhm5/Z2SPDUMjyPVjTztm5tYKwQxA==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"