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

Author: Luch76

server/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.8.5"
+version "0.8.6"
 group "com.objectcomputing.checkins"
 
 repositories {

server/src/main/java/com/objectcomputing/checkins/services/reports/CompensationHistory.java

@@ -23,7 +23,8 @@ public class CompensationHistory extends CSVProcessor {
     public record Compensation(
             UUID memberId,
             LocalDate startDate,
-            float amount
+            String amount,
+            String totalComp
     ) {
     }
 
@@ -45,11 +46,13 @@ protected void loadImpl(MemberProfileRepository memberProfileRepository,
             if (date == null) {
               LOG.error("Unable to parse date: {}", startDate);
             } else {
+              String value = csvRecord.get("compensation");
               Compensation comp = new Compensation(
                       memberProfile.get().getId(),
                       date,
-                      Float.parseFloat(csvRecord.get("compensation")
-                                                .replaceAll("[^\\d\\.,]", "")));
+                      value == null ? null : value.replaceAll("[^\\d\\.,]", ""),
+                      csvRecord.get("totalComp")
+              );
               history.add(comp);
             }
           } else {

server/src/test/java/com/objectcomputing/checkins/services/reports/ReportDataControllerTest.java

@@ -185,9 +185,10 @@ void validateReportData(JsonNode node, MemberProfile user) {
 
     // Compensation History
     ArrayNode comp = (ArrayNode)node.get("compensationHistory");
-    assertEquals(5, comp.size());
+    assertEquals(10, comp.size());
     assertEquals(memberId, comp.get(0).get("memberId").asText());
     assertTrue(comp.get(0).get("amount").asDouble() > 0);
+    assertFalse(comp.get(9).get("totalComp").asText().isEmpty());
 
     // Current Information
     JsonNode curr = node.get("currentInformation");

server/src/test/java/com/objectcomputing/checkins/services/reports/data/compensationHistory.csv

@@ -1,11 +1,21 @@
-"emailAddress","startDate","compensation"
-"[email protected]","1/1/2024","100000.00"
-"[email protected]","1/1/2023","95000.00"
-"[email protected]","1/1/2022","90000.00"
-"[email protected]","1/1/2021","85000.00"
-"[email protected]","1/1/2020","80000.00"
-"[email protected]","2/1/2024","100000.00"
-"[email protected]","2/1/2023","95000.00"
-"[email protected]","2/1/2022","90000.00"
-"[email protected]","2/1/2021","85000.00"
-"[email protected]","2/1/2020","80000.00"
+"emailAddress","startDate","compensation","totalComp"
+"[email protected]","1/1/2024","100000.00",
+"[email protected]","1/1/2023","95000.00",
+"[email protected]","1/1/2022","90000.00",
+"[email protected]","1/1/2021","85000.00",
+"[email protected]","1/1/2020","80000.00",
+"[email protected]","2/1/2024","100000.00",
+"[email protected]","2/1/2023","95000.00",
+"[email protected]","2/1/2022","90000.00",
+"[email protected]","2/1/2021","85000.00",
+"[email protected]","2/1/2020","80000.00",
+"[email protected]","2024",,"103000.00"
+"[email protected]","2023",,"98000.00"
+"[email protected]","2022",,"93000.00"
+"[email protected]","2021",,"88000.00"
+"[email protected]","2020",,"83000.00"
+"[email protected]","2024",,"103000.00"
+"[email protected]","2023",,"98000.00"
+"[email protected]","2022",,"93000.00"
+"[email protected]","2021",,"88000.00"
+"[email protected]","2020",,"83000.00"

web-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-ui",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "private": true,
   "type": "module",
   "dependencies": {
@@ -89,7 +89,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-vitest": "^0.5.4",
     "globals": "^15.0.0",
-    "happy-dom": "^15.10.1",
+    "happy-dom": "^15.10.2",
     "jest-fetch-mock": "^3.0.3",
     "jsdom": "^24.0.0",
     "msw": "^2.2.13",

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

@@ -11,7 +11,8 @@ import {
   FormControlLabel,
   Modal,
   Switch,
-  TextField
+  TextField,
+  Checkbox,
 } from '@mui/material';
 import Autocomplete from '@mui/material/Autocomplete';
 import './EditGuildModal.css';
@@ -166,18 +167,19 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => {
             value={editedGuild.name ? editedGuild.name : ''}
             onChange={e => setGuild({ ...editedGuild, name: e.target.value })}
           />
-          {guild.id && <FormControlLabel
-            control={
-              <Switch
-                checked={editedGuild.active}
-                onChange={event => {
-                  const { checked } = event.target;
-                  setGuild({ ...editedGuild, active: checked });
-                }}
-              />
-            }
+          {guild.id && (<>
+          <Checkbox
+            id="guild-active-input"
             label="Active"
-          />}
+            variant="outlined"
+            className="halfWidth"
+            checked={editedGuild.active ? editedGuild.active : false}
+            onChange={event => {
+              const { checked } = event.target;
+              setGuild({ ...editedGuild, active: checked });
+            }}
+          /> Active
+          </>)}
         </div>
         <div>
           <FormControlLabel

web-ui/src/components/guild-results/EditGuildModal.spec.jsx

@@ -34,12 +34,14 @@ const testGuild = {
   guildMembers: [
     { id: 125, name: 'Guild Member' },
     { id: 126, name: 'Other Member' }
-  ]
+  ],
+  active: true,
 };
 
 const emptyGuild = {
   name: 'Test Guild',
-  description: 'A guild used for testing.'
+  description: 'A guild used for testing.',
+  active: true,
 };
 
 const currentUserProfile = {

web-ui/src/components/kudos_dialog/KudosDialog.jsx

@@ -29,7 +29,7 @@ import { AppContext } from '../../context/AppContext';
 import {
   selectCsrfToken,
   selectCurrentUser,
-  selectNormalizedTeams,
+  selectActiveTeams,
   selectOrderedCurrentMemberProfiles,
   selectProfile
 } from '../../context/selectors';
@@ -65,7 +65,7 @@ const KudosDialog = ({ open, recipient, teamId, onClose }) => {
   );
 
   const currentUser = selectCurrentUser(state);
-  const teams = selectNormalizedTeams(state, '');
+  const teams = selectActiveTeams(state);
   const memberProfiles = selectOrderedCurrentMemberProfiles(state);
 
   const handleSubmit = useCallback(() => {

web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.jsx

@@ -37,14 +37,14 @@ import { AppContext } from '../../../context/AppContext';
 import {
   selectCsrfToken,
   selectCurrentMembers,
-  selectGuilds,
+  selectActiveGuilds,
   selectMappedUserRoles,
   selectRoles,
   selectSkills,
   selectSubordinates,
   selectSupervisors,
   selectTeamMembersBySupervisorId,
-  selectTeams
+  selectActiveTeams,
 } from '../../../context/selectors';
 import { UPDATE_TOAST } from '../../../context/actions';
 import { getMembersByTeam } from '../../../api/team';
@@ -172,14 +172,14 @@ const MemberSelectorDialog = ({
     const getFilterOptions = () => {
       switch (filterType) {
         case FilterType.TEAM:
-          const teams = selectTeams(state);
+          const teams = selectActiveTeams(state);
           return {
             options: teams,
             label: team => team.name,
             equals: (team1, team2) => team1.id === team2.id
           };
         case FilterType.GUILD:
-          const guilds = selectGuilds(state);
+          const guilds = selectActiveGuilds(state);
           return {
             options: guilds,
             label: guild => guild.name,

web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx

@@ -39,7 +39,8 @@ const testGuild = {
   name: 'Test Guild',
   description: 'A guild used for testing.',
   guildLeads: [{ id: 124, name: managerProfile.name }],
-  guildMembers: []
+  guildMembers: [],
+  active: true,
 };
 
 const initialState = {