Merge branch 'master' into grioux/changeCAPWATCHdownloadTime

packages/client/src/pages/admin/pages/EmailList.tsx

@@ -17,7 +17,7 @@
  * along with EvMPlus.org.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Member, Maybe, Either, areMembersTheSame, getFullMemberName } from 'common-lib';
+import { Member, Maybe, Either, areMembersTheSame, getFullMemberName, CAPMember } from 'common-lib';
 import * as React from 'react';
 import Button from '../../../components/Button';
 import { InputProps } from '../../../components/form-inputs/Input';
@@ -308,6 +308,21 @@ export default class EmailList extends Page<PageProps, EmailListState> {
 		const currentSortFunction = sortFunctions[this.state.sortFunction];
 
 		const getSelector = (state: EmailListUIState & EmailListLoadedState): JSX.Element => {
+			const displayMember = (val: CAPMember): React.ReactChild => {
+				if (val.type === 'CAPNHQMember') {
+					const expires = +new Date(val.expirationDate);
+
+					if (expires < Date.now()) {
+						return <span style={{ color: 'red' }}>{ getFullMemberName(val) }</span>;
+					}
+
+					if (expires < Date.now() + 1000 * 60 * 60 * 24 * 30) {
+						return <span style={{ color: 'orange' }}>{ getFullMemberName(val) }</span>;
+					}
+				}
+				return getFullMemberName(val);
+			};
+
 			const selectorProps: Omit<
 				SelectorPropsMultiple<Member, any[]>,
 				'filters' | 'onFilterValuesChange' | 'filterValues'
@@ -322,7 +337,7 @@ export default class EmailList extends Page<PageProps, EmailListState> {
 						visibleItems: newVisibleItems,
 					}),
 				overflow: 750,
-				displayValue: getFullMemberName,
+				displayValue: displayMember,
 			};
 
 			return !state.displayAdvanced ? (