save work

Signed-off-by: fayi-da <[email protected]>

Author: fayi-da

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/FrontendIntegrationTest.scala

@@ -177,7 +177,7 @@ trait FrontendTestCommon extends TestCommon with WebBrowser with CustomMatchers
   val options: FirefoxOptions =
     new FirefoxOptions()
       .setLogLevel(FirefoxDriverLogLevel.DEBUG)
-      .addArguments("-headless")
+  // .addArguments("-headless")
   options.setCapability("webSocketUrl", true: Any);
 
   protected val webDrivers: mutable.Map[String, WebDriverType] = mutable.Map.empty
@@ -300,6 +300,7 @@ trait FrontendTestCommon extends TestCommon with WebBrowser with CustomMatchers
     // We process all browsers in parallel, for faster test termination.
     webDrivers.values.toList.parTraverse { webDriver =>
       Future {
+        com.digitalasset.canton.concurrent.Threading.sleep(30000)
         webDriver.quit()
       }
     }.futureValue

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/SvFrontendIntegrationTest.scala

@@ -24,6 +24,7 @@ import org.openqa.selenium.By
 import org.openqa.selenium.support.ui.Select
 import org.slf4j.event.Level
 
+import scala.jdk.CollectionConverters.*
 import java.util.Optional
 
 class SvFrontendIntegrationTest
@@ -308,6 +309,171 @@ class SvFrontendIntegrationTest
       }
     }
 
+    def createProposal(action: String, effectiveAtThreshold: Boolean = true)(
+        extraFormOps: WebDriverType => Unit
+    )(implicit
+        env: SpliceTestConsoleEnvironment
+    ) = {
+      val requestReasonUrl = "https://new-proposal-url.com/"
+      val requestReasonBody = "This is a summary of the proposal"
+      val thresholdDeadline = "2034-07-12 00:12"
+      val effectiveDate = "2034-07-13 00:12"
+
+      withFrontEnd("sv1") { implicit webDriver =>
+        val previousInflightProposalsSize = getInflightProposals().size
+        previousInflightProposalsSize shouldBe 0
+        // logger.debug(s"tesco at definition previousInflightProposalsSize: $previousInflightProposalsSize")
+
+        actAndCheck(
+          "sv1 operator can login and browse to the governance tab", {
+            go to s"http://localhost:$sv1UIPort/governance-beta"
+            loginOnCurrentPage(sv1UIPort, sv1Backend.config.ledgerApiUser)
+          },
+        )(
+          "sv1 can navigate to the create proposal page",
+          _ => {
+            val initiateProposalButton = find(id("initiate-proposal-button"))
+            clue("initiate proposal button is visible") {
+              // eventuallySucceeds() {
+              initiateProposalButton should not be empty
+
+              click on id("initiate-proposal-button")
+              // }
+            }
+
+            clue("Select an Action page is visible") {
+              find(id("select-action")) should not be empty
+            }
+
+            clickOn(id("select-action"))
+
+            eventually() {
+              val actionItem = webDriver.findElement(By.cssSelector(s"[data-testid='$action']"))
+              actionItem.click()
+            }
+
+            webDriver.findElement(By.tagName("body")).click()
+
+            val nextButton = webDriver.findElement(By.cssSelector(s"[data-testid='next-button']"))
+            nextButton.click()
+
+            find(id("offboard-sv-action")) should not be empty
+
+          },
+        )
+
+        actAndCheck(
+          "sv1 operator can create a new proposal", {
+
+            setThresholdDeadline("sv1", thresholdDeadline, "offboard-sv-expiry-date-field")
+
+            if (effectiveAtThreshold) {
+              inside(find(id("effective-at-threshold-radio"))) { case Some(element) =>
+                element.underlying.click()
+              }
+            } else {
+              setEffectiveDate2("sv1", effectiveDate)
+            }
+
+            inside(find(id("offboard-sv-summary"))) { case Some(element) =>
+              element.underlying.sendKeys(requestReasonBody)
+            }
+
+            inside(find(id("offboard-sv-url"))) { case Some(element) =>
+              element.underlying.sendKeys(requestReasonUrl)
+            }
+
+            extraFormOps(webDriver)
+
+            clickVoteRequestSubmitButtonOnceEnabled2()
+          },
+        )(
+          "sv1 can see the new proposal",
+          _ => {
+            // find(id("inflight-proposals-section-title")) should not be empty
+
+            val currentInflightProposals = getInflightProposals()
+            currentInflightProposals.size shouldBe previousInflightProposalsSize + 1
+
+            clue("click the new proposal") {
+              // println(s"tesco currentinflight: ${currentInflightProposals.asScala.head}")
+              val link = webDriver
+                .findElement(By.cssSelector("[data-testid='inflight-proposals-row-link']"))
+              // webDriver.executeScript("arguments[0].scrollIntoView(true);", link)
+              // Not sure why this is the only way to make it work but hewre we are.
+              webDriver.executeScript("arguments[0].click();", link)
+
+              // link.click()
+              // webDriver.executeScript("arguments[0].click();", link)
+              // currentInflightProposals.asScala.head.click()
+            }
+          },
+        )
+
+      }
+
+      withFrontEnd("sv2") { implicit webDriver =>
+        val (_, reviewButton) = actAndCheck(
+          "sv2 operator can login and browse to the governance page", {
+            go to s"http://localhost:$sv2UIPort/governance-beta"
+            loginOnCurrentPage(sv2UIPort, sv2Backend.config.ledgerApiUser)
+          },
+        )(
+          "sv2 can see the new vote request",
+          _ => {
+            eventuallySucceeds() {
+              val actionsRequired = getActionRequiredElems()
+              actionsRequired.size shouldBe 1
+
+              webDriver.executeScript("arguments[0].click();", actionsRequired.asScala.head)
+            }
+            // actionsRequired.asScala.head.click()
+
+            inside(find(id("your-vote-reason-input"))) { case Some(element) =>
+              element.underlying.sendKeys("A sample reason")
+            }
+
+            inside(find(id("your-vote-url-input"))) { case Some(element) =>
+              element.underlying.sendKeys("https://my-splice-vote-url.com")
+            }
+
+            webDriver.findElement(By.cssSelector(s"[data-testid='your-vote-accept']")).click()
+
+            eventuallyClickOn(id("submit-vote-button"))
+
+            clue("wait for the vote submission success message") {
+              eventuallySucceeds() {
+                inside(find(xpath("//*[@data-testid='vote-submission-success']"))) {
+                  case Some(element) =>
+                    element.text shouldBe "Vote successfully updated!"
+                }
+              }
+            }
+          },
+        )
+      }
+
+      withFrontEnd("sv1") { implicit webDriver =>
+        clue("sv1 operator can see the new vote from sv2") {
+          val sv2PartyId = sv2Backend.getDsoInfo().svParty.toProtoPrimitive
+          val votes =
+            webDriver.findElements(By.cssSelector("[data-testid='proposal-details-vote']"))
+          votes.size shouldBe 1
+
+          val voterInput = votes.asScala.head
+            .findElement(
+              By.cssSelector("[data-testid='proposal-details-voter-party-id-input']")
+            )
+          voterInput.getAttribute("value") shouldBe sv2PartyId
+        }
+
+      // actAndCheck(
+      //   "sv1 operator can see the vote request detail", {
+      //   },
+      // )("", _ => {})
+      }
+    }
+
     def testCreateAndVoteDsoRulesAction(action: String, effectiveAtThreshold: Boolean = true)(
         fillUpForm: WebDriverType => Unit
     )(validateRequestedActionInModal: WebDriverType => Unit)(implicit
@@ -564,6 +730,24 @@ class SvFrontendIntegrationTest
       }
     }
 
+    "NEW UI: Offboard" in { implicit env =>
+      val sv3PartyId = sv3Backend.getDsoInfo().svParty.toProtoPrimitive
+
+      createProposal("SRARC_OffboardSv") { implicit webDriver =>
+        // eventually() {
+        find(id("offboard-sv-member-dropdown")) match {
+          case Some(element) => element.underlying.click()
+          case None =>
+            fail("Could not find offboard-sv-member-dropdown")
+        }
+
+        val memberSelect = webDriver.findElement(By.cssSelector(s"[data-value='$sv3PartyId']"))
+        memberSelect.click()
+        webDriver.findElement(By.tagName("body")).click()
+        // }
+      }
+    }
+
     "can create a valid SRARC_OffboardSv vote request and cast vote on it" in { implicit env =>
       val sv3PartyId = sv3Backend.getDsoInfo().svParty.toProtoPrimitive
       testCreateAndVoteDsoRulesAction("SRARC_OffboardSv") { webDriver =>
@@ -1141,6 +1325,14 @@ class SvFrontendIntegrationTest
       .getOrElse(0)
   }
 
+  def getInflightProposals()(implicit webDriver: WebDriverType) = {
+    webDriver.findElements(By.cssSelector("[data-testid='inflight-proposals-row-link']"))
+  }
+
+  def getActionRequiredElems()(implicit webDriver: WebDriverType) = {
+    webDriver.findElements(By.cssSelector("[data-testid='action-required-card-link']"))
+  }
+
   def getVoteRequestsRejectedSize()(implicit webDriver: WebDriverType) = {
     val tbodyRejected = find(id("sv-vote-results-rejected-table-body"))
     tbodyRejected

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/util/SvFrontendTestUtil.scala

@@ -2,6 +2,7 @@ package org.lfdecentralizedtrust.splice.util
 
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.TestCommon
 import org.lfdecentralizedtrust.splice.integration.tests.FrontendTestCommon
+import org.openqa.selenium.By
 import scala.concurrent.duration.DurationInt
 
 trait SvFrontendTestUtil extends TestCommon {
@@ -13,12 +14,24 @@ trait SvFrontendTestUtil extends TestCommon {
     setDateTime(party, "datetime-picker-vote-request-expiration", dateTime)
   }
 
+  def setThresholdDeadline(party: String, dateTime: String, id: String)(implicit
+      webDriver: WebDriverType
+  ) = {
+    setDateTime(party, id, dateTime)
+  }
+
   def setEffectiveDate(party: String, dateTime: String)(implicit
       webDriver: WebDriverType
   ) = {
     setDateTime(party, "datetime-picker-vote-request-effectivity", dateTime)
   }
 
+  def setEffectiveDate2(party: String, dateTime: String)(implicit
+      webDriver: WebDriverType
+  ) = {
+    setDateTime(party, "effective-date-field", dateTime)
+  }
+
   def setAmuletConfigDate(party: String, dateTime: String)(implicit
       webDriver: WebDriverType
   ) = {
@@ -42,4 +55,37 @@ trait SvFrontendTestUtil extends TestCommon {
       }
     }
   }
+
+  def clickVoteRequestSubmitButtonOnceEnabled2(
+      enabled: Boolean = true
+  )(implicit webDriver: WebDriverType) = {
+
+    // ensure all validations on the form are done
+    webDriver.findElement(By.tagName("body")).click()
+
+    def submitButton = find(id("submit-button"))
+
+    clue("wait for the review button to become clickable") {
+      eventually()(
+        submitButton.value.isEnabled shouldBe enabled
+      )
+    }
+
+    clue("click the review button and progress to review page") {
+      inside(find(xpath("//button[contains(text(), 'Review Proposal')]"))) {
+        case Some(button) =>
+          button.underlying.click()
+        case None =>
+          fail("Could not find review button")
+      }
+    }
+
+    clue("Submit form") {
+      eventuallySucceeds() {
+        val submitButton =
+          webDriver.findElement(By.xpath("//button[contains(text(), 'Submit Proposal')]"))
+        submitButton.click()
+      }
+    }
+  }
 }

apps/sv/frontend/src/__tests__/governance/governance-page.test.tsx

@@ -80,7 +80,7 @@ describe.skip('Governance Page', () => {
 
     await navigateToGovernancePage(user);
 
-    expect(() => screen.getAllByTestId('inflight-vote-requests-row')).toThrowError(
+    expect(() => screen.getAllByTestId('inflight-proposals-row')).toThrowError(
       /Unable to find an element/
     );
   });

apps/sv/frontend/src/components/beta/PageSectionHeader.tsx

@@ -14,7 +14,7 @@ const PageSectionHeader: React.FC<PageSectionHeaderProps> = ({
   'data-testid': testId,
 }) => (
   <Box sx={{ display: 'flex', alignItems: 'center', mb: 3 }}>
-    <Typography variant="h3" fontFamily="lato" fontSize={18} data-testid={`${testId}-title`}>
+    <Typography variant="h3" fontFamily="lato" fontSize={18} data-testid={`${testId}-title`} id={`${testId}-title`}>
       {title}
     </Typography>
     <Badge

apps/sv/frontend/src/components/form-components/EffectiveDateField.tsx

@@ -86,7 +86,7 @@ export const EffectiveDateField: React.FC<EffectiveDateFieldProps> = props => {
                   textField: {
                     fullWidth: true,
                     variant: 'outlined',
-                    id: `${id}-field`,
+                    id: `${id}-field effective-date-field`,
                     onBlur: field.handleBlur,
                     error: !field.state.meta.isValid,
                     helperText: field.state.meta.errors?.[0],
@@ -102,7 +102,7 @@ export const EffectiveDateField: React.FC<EffectiveDateFieldProps> = props => {
 
         <FormControlLabel
           value="threshold"
-          control={<Radio />}
+          control={<Radio id="effective-at-threshold-radio" />}
           label={
             <Box>
               <Typography>Make effective at threshold</Typography>

apps/sv/frontend/src/components/form-components/FormControls.tsx

@@ -52,6 +52,7 @@ export const FormControls: React.FC<FormControlsProps> = props => {
             type={'submit'}
             size="large"
             disabled={!canSubmit || isSubmitting}
+            id="submit-button"
             data-testid="submit-button"
           >
             {isSubmitting ? 'Submitting' : submitTitle}

apps/sv/frontend/src/components/form-components/ProposalSummaryField.tsx

@@ -38,6 +38,7 @@ export const ProposalSummaryField: React.FC<ProposalSummaryFieldProps> = props =
         error={!field.state.meta.isValid}
         helperText={field.state.meta.errors?.[0]}
         inputProps={{ 'data-testid': id }}
+        id={id}
       />
       <Typography variant="body2" sx={{ mt: 1 }} data-testid={`${id}-subtitle`}>
         {subtitle || PROPOSAL_SUMMARY_SUBTITLE}

apps/sv/frontend/src/components/form-components/TextField.tsx

@@ -39,6 +39,7 @@ export const TextField: React.FC<TextFieldProps> = props => {
         }
         onChange={e => field.handleChange(e.target.value)}
         inputProps={{ 'data-testid': id }}
+        id={id}
         {...muiTextFieldProps}
       />
       {subtitle && (

apps/sv/frontend/src/components/forms/SelectAction.tsx

@@ -105,6 +105,7 @@ export const SelectAction: React.FC = () => {
 
                     <Button
                       variant="contained"
+                      id="next-button"
                       data-testid="next-button"
                       type="submit"
                       disabled={!canSubmit}