Converted selectActiveOrInactiveProfile to a standard selector

Author: mkimberlin

web-ui/src/context/selectors.js

@@ -1,7 +1,7 @@
 import { createSelector } from 'reselect';
 
 export const selectMemberProfiles = state => state.memberProfiles || [];
-export const selectTerminatedMembers = state => state.terminatedMembers;
+export const selectTerminatedMembers = state => state.terminatedMembers || [];
 export const selectMemberSkills = state => state.memberSkills || [];
 export const selectSkills = state => state.skills || [];
 export const selectTeamMembers = state => state.teamMembers;
@@ -327,15 +327,12 @@ export const selectProfile = createSelector(
   (profileMap, profileId) => profileMap[profileId]
 );
 
-export const selectActiveOrInactiveProfile = (state, profileId) => {
-  // See if the profile is active, return it if so.
-  const sender = selectProfile(state, profileId);
-  if (sender) return sender;
-
-  // The profile is inactive or does not exist.  Check terminated members.
-  const terminatedMap = selectProfileMapForTerminatedMembers(state);
-  return terminatedMap[profileId];
-};
+export const selectActiveOrInactiveProfile = createSelector(
+  selectProfileMap,
+  selectProfileMapForTerminatedMembers,
+  (state, profileId) => profileId,
+  (profileMap, termedProfileMap, profileId) => profileMap[profileId] || termedProfileMap[profileId]
+);
 
 export const selectSkill = createSelector(
   selectSkills,

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

@@ -20,7 +20,8 @@ import {
   selectSupervisorHierarchyIds,
   selectSubordinates,
   selectIsSubordinateOfCurrentUser,
-  selectHasReportPermission
+  selectHasReportPermission,
+  selectActiveOrInactiveProfile
 } from './selectors';
 
 describe('Selectors', () => {
@@ -1525,4 +1526,76 @@ describe('Selectors', () => {
 
     expect(selectHasReportPermission(testState)).toBe(false);
   });
+
+  it('selectActiveOrInactiveProfile should a profile if active or inactive', () => {
+    const activeTestMember = {
+      id: 1,
+      bioText: 'foo',
+      employeeId: 11,
+      name: 'A Person',
+      firstName: 'A',
+      lastName: 'PersonA',
+      location: 'St Louis',
+      title: 'engineer',
+      workEmail: '[email protected]',
+      pdlId: 9,
+      startDate: [2012, 9, 29],
+    };
+    const inactiveTestMember = {
+      id: 2,
+      bioText: 'foo',
+      employeeId: 12,
+      name: 'B Person',
+      firstName: 'B',
+      lastName: 'PersonB',
+      location: 'St Louis',
+      title: 'engineer',
+      workEmail: '[email protected]',
+      pdlId: 9,
+      startDate: [2012, 9, 29],
+      terminationDate: [2013, 9, 29],
+    };
+    /** @type MemberProfile[] */
+    const testActiveMemberProfiles = [
+      activeTestMember,
+      {
+        id: 3,
+        bioText: 'foo',
+        employeeId: 13,
+        name: 'C Person',
+        firstName: 'C',
+        lastName: 'PersonC',
+        location: 'St Louis',
+        title: 'engineer',
+        workEmail: '[email protected]',
+        pdlId: 9,
+        startDate: [2012, 9, 29],
+      }
+    ];
+    /** @type MemberProfile[] */
+    const testInactiveMemberProfiles = [
+      inactiveTestMember,
+      {
+        id: 4,
+        bioText: 'foo',
+        employeeId: 13,
+        name: 'D Person',
+        firstName: 'D',
+        lastName: 'PersonD',
+        location: 'St Louis',
+        title: 'engineer',
+        workEmail: '[email protected]',
+        pdlId: 9,
+        startDate: [2012, 9, 29],
+        terminationDate: [2013, 9, 29],
+      }
+    ];
+    const testState = {
+      memberProfiles: testActiveMemberProfiles,
+      terminatedMembers: testInactiveMemberProfiles,
+    };
+
+    expect(selectActiveOrInactiveProfile(testState, activeTestMember.id)).toEqual(activeTestMember);
+    expect(selectActiveOrInactiveProfile(testState, inactiveTestMember.id)).toEqual(inactiveTestMember);
+  });
 });