Merge pull request #817 from ripe0x/edit-proposal-title

bug fixes: update proposalBySigs flow
nounsDAO · Nov 22, 2023 · f32274b · f32274b
2 parents 0da9ef7 + a7977e4
commit f32274b
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 17 deletions.
diff --git a/packages/nouns-webapp/src/pages/EditCandidate/index.tsx b/packages/nouns-webapp/src/pages/EditCandidate/index.tsx
@@ -245,7 +245,7 @@ const EditCandidatePage: React.FC<EditCandidateProps> = props => {
       proposalTransactions.map(({ calldata }) => calldata), // Calldatas
       `# ${titleValue}\n\n${bodyValue}`, // Description
       candidate.data?.slug, // Slug
-      0, // proposalIdToUpdate
+      candidate.data?.proposalIdToUpdate ? candidate.data?.proposalIdToUpdate : 0, // if candidate is an update to a proposal, use the proposalIdToUpdate number
       commitMessage,
       { value: hasVotes ? 0 : updateCandidateCost ?? 0 }, // Fee for non-nouners
     );

diff --git a/packages/nouns-webapp/src/pages/EditProposal/index.tsx b/packages/nouns-webapp/src/pages/EditProposal/index.tsx
@@ -81,6 +81,12 @@ const EditProposalPage: React.FC<EditProposalProps> = props => {
     proposal?.description && removeTitleFromDescription(proposal?.description, titleValue);
   const isProposedBySigners = proposal?.signers && proposal?.signers?.length > 0 ? true : false;
 
+  const candidateUpdateSlug = (slug: string) => {
+    // add random string to slug to make it unique
+    const randomString = Math.random().toString(36).substring(7);
+    return `${slug}-update-${randomString}`;
+  }
+
   const handleAddProposalAction = useCallback(
     (transactions: ProposalTransaction | ProposalTransaction[]) => {
       const transactionsArray = Array.isArray(transactions) ? transactions : [transactions];
@@ -158,19 +164,24 @@ const EditProposalPage: React.FC<EditProposalProps> = props => {
   const handleTitleInput = useCallback(
     (title: string) => {
       setTitleValue(title);
-      setSlug(
-        title
-          .toLowerCase()
-          .replace(/ /g, '-')
-          .replace(/[^\w-]+/g, ''),
-      );
+      if (isProposedBySigners && title === proposal?.title) {
+        // if title is edited, then reset to original, make sure the unique update slug gets passed
+        setSlug(candidateUpdateSlug(title));
+      } else {
+        setSlug(
+          title
+            .toLowerCase()
+            .replace(/ /g, '-')
+            .replace(/[^\w-]+/g, ''),
+        );
+      }
       if (title === proposal?.title) {
         setIsTitleEdited(false);
       } else {
         setIsTitleEdited(true);
       }
     },
-    [setTitleValue, setSlug, proposal?.title],
+    [setTitleValue, setSlug, proposal?.title, isProposedBySigners],
   );
 
   const handleBodyInput = useCallback(
@@ -358,6 +369,8 @@ const EditProposalPage: React.FC<EditProposalProps> = props => {
     }
   };
 
+
+
   // set initial values on page load
   useEffect(() => {
     if (
@@ -377,31 +390,38 @@ const EditProposalPage: React.FC<EditProposalProps> = props => {
           signature: txn.functionSig ?? '',
         };
       });
+      const slugValue = proposal.title.toLowerCase().replace(/ /g, '-').replace(/[^\w-]+/g, '');
       setTitleValue(proposal.title);
-      setSlug(
-        proposal.title
-          .toLowerCase()
-          .replace(/ /g, '-')
-          .replace(/[^\w-]+/g, ''),
-      );
+      if (isProposedBySigners) {
+        // new candidate will need to be created, which needs a unique slug, so add a random string to the slug here
+        setSlug(candidateUpdateSlug(slugValue));
+      } else {
+        setSlug(slugValue);
+      }
       setBodyValue(removeTitleFromDescription(proposal.description, proposal.title));
       setProposalTransactions(transactions);
       setOriginalTitleValue(proposal.title);
       setOriginalBodyValue(removeTitleFromDescription(proposal.description, proposal.title));
       setOriginalProposalTransactions(proposal.details);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [proposal]);
 
   const handleCreateNewCandidate = async () => {
+    if (!proposalTransactions?.length ||
+      !titleValue ||
+      !bodyValue ||
+      !slug ||
+      !props.match.params.id
+    ) return;
     await createProposalCandidate(
       proposalTransactions.map(({ address }) => address), // Targets
       proposalTransactions.map(({ value }) => value ?? '0'), // Values
       proposalTransactions.map(({ signature }) => signature), // Signatures
       proposalTransactions.map(({ calldata }) => calldata), // Calldatas
       `# ${titleValue}\n\n${bodyValue}`, // Description
       slug, // Slug
-      props.match.params.id, // proposalIdToUpdate - use 0 for new proposals
+      props.match.params.id, // use 0 for new proposals
       { value: availableVotes! > 0 ? 0 : createCandidateCost },
     );
   };
@@ -449,6 +469,18 @@ const EditProposalPage: React.FC<EditProposalProps> = props => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [createProposalCandidateState, setModal]);
 
+  const isFormInvalid = () => {
+    if (
+      !(isProposalEdited || isTransactionsEdited() || isDescriptionEdited()) ||
+      !proposalTransactions.length ||
+      titleValue === '' ||
+      bodyValue === '' ||
+      slug === ''
+    ) {
+      return true;
+    }
+    return false;
+  }
   if (!isProposer()) {
     return null;
   }
@@ -535,7 +567,7 @@ const EditProposalPage: React.FC<EditProposalProps> = props => {
           hasActiveOrPendingProposal={false} // not relevant for edit
           hasEnoughVote={isProposer() ? true : hasEnoughVote}
           isFormInvalid={
-            isProposalEdited || isTransactionsEdited() || isDescriptionEdited() ? false : true
+            isFormInvalid()
           }
           handleCreateProposal={
             isProposedBySigners ? handleCreateNewCandidate : handleUpdateProposal