Merge pull request #124 from DaleMcGrew/Dale_WCC_Nov13c-2025

Added statusOfferDecisionNeededSetFalse to TaskDefinition interface. Added "file-saver" and "react-papaparse" to package.json for WV-2083.

Author: DaleMcGrew

package-lock.json

@@ -67,10 +67,12 @@
     "eslint-webpack-plugin": "^2.4.3",
     "express": "^5.0.0-beta.3",
     "file-loader": "^6.2.0",
+    "file-saver": "^2.0.5",
     "html-webpack-plugin": "^5.6.0",
     "jsdom": "^23.0.1",
     "mocha": "^10.2.0",
     "pre-commit": "^1.0.10",
+    "react-papaparse": "^4.4.0",
     "terser-webpack-plugin": "^5.1.2",
     "unused-webpack-plugin": "^2.4.0",
     "webpack": "^5.99.8",

package.json

@@ -237,7 +237,7 @@ const TeamsActionBar = () => {
               }, 100);
             }}
           >
-            Expand all
+            Expand all
           </SpanWithLinkStyle>
         </ActionBarItem>
         <ActionBarItem>
@@ -252,7 +252,7 @@ const TeamsActionBar = () => {
               }, 100);
             }}
           >
-            Collapse all
+            Collapse&nbsp;all
           </SpanWithLinkStyle>
         </ActionBarItem>
       </ActionBarSection>
@@ -267,7 +267,7 @@ const TeamsActionBar = () => {
         {viewerCanSeeOrDo(['canAddTeam'], viewerAccessRights) && (
           <ActionBarItem>
             <SpanWithLinkStyle onClick={() => addTeamClick()}>
-              Add team
+              Add&nbsp;team
             </SpanWithLinkStyle>
           </ActionBarItem>
         )}
@@ -312,10 +312,12 @@ const ViewingCount = styled('div')`
   color: ${DesignTokenColors.neutralUI400};
   font-size: .8em;
   padding-right: 15px;
+  white-space: nowrap;
 `;
 
 const DownloadStyled = styled(Download)`
-  font-size: 1.7em;
+  color: ${DesignTokenColors.neutral200};
+  font-size: 1.3em;
   padding-right: 15px;
 `;
 

src/js/components/Navigation/TeamsActionBar.jsx

@@ -30,7 +30,7 @@ const AddPersonForm = ({ classes }) => {  //  classes, teamId
   const locationInputRef = useRef('');
   const phoneNumberInputRef = useRef('');
   const statusOfferApprovedInputRef = useRef(false);
-  const statusOfferDecisionNeededInputRef = useRef(false);
+  const statusOfferDecisionNeededSetFalseInputRef = useRef(false);
   const statusOfferLetterSignedInputRef = useRef(false);
 
   useEffect(() => {  // Replaces onAppObservableStoreChange and will be called whenever the context value changes
@@ -56,7 +56,7 @@ const AddPersonForm = ({ classes }) => {  //  classes, teamId
       phoneNumber: phoneNumberInputRef.current.value,
       statusActive: true,
       statusOfferApproved: statusOfferApprovedInputRef.current.checked,
-      statusOfferDecisionNeeded: !statusOfferDecisionNeededInputRef.current.checked, // statusOfferDecisionNeeded reversed on purpose
+      statusOfferDecisionNeeded: !statusOfferDecisionNeededSetFalseInputRef.current.checked, // statusOfferDecisionNeeded reversed on purpose
       statusOfferLetterSigned: statusOfferLetterSignedInputRef.current.checked,
     };
     if (locationInputRef.current.value && locationInputRef.current.value.length) {
@@ -169,9 +169,9 @@ const AddPersonForm = ({ classes }) => {  //  classes, teamId
             <Checkbox
               className={classes.checkboxRoot}
               color="primary"
-              id="statusOfferDecisionNeededToBeSaved"
-              inputRef={statusOfferDecisionNeededInputRef}
-              name="statusOfferDecisionNeeded"
+              id="statusOfferDecisionNeededSetFalseToBeSaved"
+              inputRef={statusOfferDecisionNeededSetFalseInputRef}
+              name="statusOfferDecisionNeededSetFalse"
               onChange={() => updateSaveButton()}
             />
           )}

src/js/components/Person/AddPersonForm.jsx

@@ -74,7 +74,7 @@ const EditPersonForm = ({ classes }) => {
   const statusActiveInputRef = useRef(false);
   const statusAvailableForSpecialProjectsInputRef = useRef(false);
   const statusOfferApprovedInputRef = useRef(false);
-  const statusOfferDecisionNeededInputRef = useRef(false);
+  const statusOfferDecisionNeededSetFalseInputRef = useRef(false);
   const statusOfferLetterCreatedInputRef = useRef(false);
   const statusOfferLetterSignedInputRef = useRef(false);
   const statusOfferQuestionnaireAnsweredInputRef = useRef(false);
@@ -124,7 +124,7 @@ const EditPersonForm = ({ classes }) => {
       activePerson.jazzHrUrl = jazzHrUrlInputRef.current.value;
       activePerson.jobTitle = jobTitleInputRef.current.value;
       activePerson.statusOfferApproved = statusOfferApprovedInputRef.current.checked;
-      activePerson.statusOfferDecisionNeeded = !statusOfferDecisionNeededInputRef.current.checked; // statusOfferDecisionNeeded reversed on purpose
+      activePerson.statusOfferDecisionNeeded = !statusOfferDecisionNeededSetFalseInputRef.current.checked; // statusOfferDecisionNeeded reversed on purpose
       activePerson.statusOfferLetterCreated = statusOfferLetterCreatedInputRef.current.checked;
       activePerson.statusOfferLetterSigned = statusOfferLetterSignedInputRef.current.checked;
       activePerson.statusOfferQuestionnaireAnswered = statusOfferQuestionnaireAnsweredInputRef.current.checked;
@@ -362,9 +362,9 @@ const EditPersonForm = ({ classes }) => {
               checked={!activePerson.statusOfferDecisionNeeded}
               className={classes.checkboxRoot}
               color="primary"
-              id="statusOfferDecisionNeededToBeSaved"
-              inputRef={statusOfferDecisionNeededInputRef}
-              name="statusOfferDecisionNeeded"
+              id="statusOfferDecisionNeededSetFalseToBeSaved"
+              inputRef={statusOfferDecisionNeededSetFalseInputRef}
+              name="statusOfferDecisionNeededSetFalse"
               onChange={(event) => {
                 setActivePerson((prev) => ({
                   ...prev,

src/js/components/Person/EditPersonForm.jsx

@@ -96,7 +96,8 @@ const EmailOfficialManager = (
       setNewAccountNotification(
         `Hi${(firstNameToDisplay) && ` ${firstNameToDisplay}`}, I have just created your new Gmail-powered ${webAppConfig.ORGANIZATION_NAME} email account. Can you please verify you can sign in?
 Username: ${primaryEmail}
-Password (expires in 48 hours): ${password}`,
+Password (expires in 48 hours): ${password}
+Please note that we prefer that you keep your Slack account connected to your personal email address (as opposed to switching Slack to your new WeVote email address.)`,
       );
       setShowNewAccountNotification(true);
     } else {

src/js/components/Person/EmailOfficialManager.jsx

@@ -147,7 +147,7 @@ const PersonSummaryRowTripleDot = ({ person, teamId }) => {
               )}
             </PopoverViewDetailsText>
           )}
-          {(teamId > 0 && viewerCanSeeOrDo(['canRemoveTeamMemberAnyTeam'], viewerAccessRights)) && (
+          {(teamId > 0 && (viewerCanSeeOrDo(['canAddTeamMemberAnyTeam'], viewerAccessRights) || viewerCanSeeOrDo(['canRemoveTeamMemberAnyTeam'], viewerAccessRights))) && (
             <PopoverViewDetailsText>
               <StyledTypography onClick={() => removeTeamMemberClick(person)}>
                 Remove

src/js/components/Person/PersonSummaryRowTripleDot.jsx

@@ -34,6 +34,7 @@ export const DrawerHeaderAnimateDownOuterContainer = styled.div.attrs(({ scrolle
       box-shadow: ${standardBoxShadow('wide')};
     `}
 `;
+
 export const DrawerHeaderAnimateDownInnerContainer = styled('div')`
   display: flex;
   flex-direction: column;

src/js/components/Style/drawerLayoutStyles.js

@@ -35,6 +35,7 @@ const EditTaskDefinitionForm = ({ classes }) => {
   const [saveButtonActive, setSaveButtonActive] = useState(false);
   const [statusActive, setStatusActive] = useState(false);
   const [statusOfferApproved, setStatusOfferApproved] = useState(false);
+  const [statusOfferDecisionNeededSetFalse, setStatusOfferDecisionNeededSetFalse] = useState(false);
   const [statusOfferLetterCreated, setStatusOfferLetterCreated] = useState(false);
   const [statusOfferLetterSigned, setStatusOfferLetterSigned] = useState(false);
   const [statusOfferQuestionnaireAnswered, setStatusOfferQuestionnaireAnswered] = useState(false);
@@ -63,6 +64,7 @@ const EditTaskDefinitionForm = ({ classes }) => {
       setQuestionnaireId(taskDefinition.questionnaireId);
       setStatusActive(taskDefinition.statusActive);
       setStatusOfferApproved(taskDefinition.statusOfferApproved);
+      setStatusOfferDecisionNeededSetFalse(taskDefinition.statusOfferDecisionNeededSetFalse);
       setStatusOfferLetterCreated(taskDefinition.statusOfferLetterCreated);
       setStatusOfferLetterSigned(taskDefinition.statusOfferLetterSigned);
       setStatusOfferQuestionnaireAnswered(taskDefinition.statusOfferQuestionnaireAnswered);
@@ -81,6 +83,7 @@ const EditTaskDefinitionForm = ({ classes }) => {
       setQuestionnaireId('');
       setStatusActive(false);
       setStatusOfferApproved(false);
+      setStatusOfferDecisionNeededSetFalse(false);
       setStatusOfferLetterCreated(false);
       setStatusOfferLetterSigned(false);
       setStatusOfferQuestionnaireAnswered(false);
@@ -105,6 +108,7 @@ const EditTaskDefinitionForm = ({ classes }) => {
   }, []);
 
   const saveTaskDefinition = () => {
+    // console.log('Saving task definition statusOfferDecisionNeededSetFalse:', statusOfferDecisionNeededSetFalse);
     const requestParams = makeRequestParams({
       taskDefinitionId: taskDefinition ? taskDefinition.id : '-1',
       taskGroupId: taskGroup.taskGroupId,
@@ -115,6 +119,7 @@ const EditTaskDefinitionForm = ({ classes }) => {
       questionnaireId,
       statusActive,
       statusOfferApproved,
+      statusOfferDecisionNeededSetFalse,
       statusOfferLetterCreated,
       statusOfferLetterSigned,
       statusOfferQuestionnaireAnswered,
@@ -323,6 +328,23 @@ const EditTaskDefinitionForm = ({ classes }) => {
         <CustomizationTokensHeader>
           When this task marked completed, also update:
         </CustomizationTokensHeader>
+        <CheckboxLabel
+          classes={{ label: classes.checkboxLabel }}
+          control={(
+            <Checkbox
+              checked={statusOfferDecisionNeededSetFalse || false}
+              className={classes.checkboxRoot}
+              color="primary"
+              id="statusOfferDecisionNeededSetFalseToBeSaved"
+              name="statusOfferDecisionNeededSetFalse"
+              onChange={(event) => {
+                setStatusOfferDecisionNeededSetFalse(event.target.checked);
+                updateSaveButton(true);
+              }}
+            />
+          )}
+          label="Set Person.statusOfferDecisionNeeded to FALSE"
+        />
         <CheckboxLabel
           classes={{ label: classes.checkboxLabel }}
           control={(

src/js/components/Task/EditTaskDefinitionForm.jsx

@@ -213,13 +213,13 @@ const TeamHeader = (
             <ActionBarSection $borderRightOff={!officialEmailsToCopy && !personalEmailsToCopy}>
               <ActionBarItem>
                 <SpanWithLinkStyle onClick={() => { setExpandAllTeamMembers(true); setShowAllTeamMembers(true); }}>
-                  Expand all
+                  Expand&nbsp;all
                 </SpanWithLinkStyle>
               </ActionBarItem>
               {showAllTeamMembers && (
                 <ActionBarItem>
                   <SpanWithLinkStyle onClick={() => setExpandAllTeamMembers(false)}>
-                    Collapse all
+                    Collapse&nbsp;all
                   </SpanWithLinkStyle>
                 </ActionBarItem>
               )}