pending data-testid added (#1849)

* pending data-testid added * data-testid added for sort icons & save as new verion modal * data-testid updated
AOT-Technologies · Jan 22, 2024 · 50754f8 · 50754f8
1 parent 436b774
commit 50754f8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 4 deletions.
diff --git a/forms-flow-web/src/components/Application/ApplicationTable.js b/forms-flow-web/src/components/Application/ApplicationTable.js
@@ -189,12 +189,14 @@ const ApplicationTable = () => {
                 {t("Id")}{" "}
                 {isAscending && sortBy === "id" ? (
                   <i
+                    data-testid="submission-id-desc-sort-icon"
                     onClick={() => updateSort("desc", "id")}
                     className="fa-sharp fa-solid fa-arrow-down-1-9 cursor-pointer"
                     title={t("Descending")}
                   />
                 ) : (
                   <i
+                    data-testid="submission-id-asc-sort-icon"
                     onClick={() => updateSort("asc", "id")}
                     className="fa-sharp fa-solid fa-arrow-down-9-1 cursor-pointer"
                     title={t("Ascending")}
@@ -205,12 +207,14 @@ const ApplicationTable = () => {
                 {t("Form Title")}{" "}
                 {isAscending && sortBy === "applicationName" ? (
                   <i
+                    data-testid="submission-title-desc-sort-icon"
                     onClick={() => updateSort("desc", "applicationName")}
                     className="fa-sharp fa-solid fa-arrow-down-a-z cursor-pointer"
                     title={t("Descending")}
                   />
                 ) : (
                   <i
+                    data-testid="submission-title-asc-sort-icon"
                     onClick={() => updateSort("asc", "applicationName")}
                     className="fa-sharp fa-solid fa-arrow-down-z-a cursor-pointer"
                     title={t("Ascending")}
@@ -221,12 +225,14 @@ const ApplicationTable = () => {
                 {t("Status")}
                 {isAscending && sortBy === "applicationStatus" ? (
                   <i
+                    data-testid="submission-status-desc-sort-icon"
                     onClick={() => updateSort("desc", "applicationStatus")}
                     className="fa-sharp fa-solid fa-arrow-down-a-z  ms-2 cursor-pointer"
                     title={t("Descending")}
                   />
                 ) : (
                   <i
+                    data-testid="submission-status-asc-sort-icon"
                     onClick={() => updateSort("asc", "applicationStatus")}
                     className="fa-sharp fa-solid fa-arrow-down-z-a  ms-2 cursor-pointer"
                     title={t("Ascending")}
@@ -237,12 +243,14 @@ const ApplicationTable = () => {
                 {t("Last Modified")}
                 {isAscending && sortBy === "modified" ? (
                   <i
+                    data-testid="submission-modified-desc-sort-icon"
                     onClick={() => updateSort("desc", "modified")}
                     className="fa-sharp fa-solid fa-arrow-down-1-9  ms-2 cursor-pointer"
                     title={t("Descending")}
                   />
                 ) : (
                   <i
+                    data-testid="submission-modified-asc-sort-icon"
                     onClick={() => updateSort("asc", "modified")}
                     className="fa-sharp fa-solid fa-arrow-down-9-1  ms-2 cursor-pointer"
                     title={t("Ascending")}

diff --git a/forms-flow-web/src/components/Draft/DraftTable.js b/forms-flow-web/src/components/Draft/DraftTable.js
@@ -137,12 +137,14 @@ const DraftTable = () => {
                   {t("Id")}{" "}
                   {isAscending && sortBy === "id" ? (
                     <i
+                      data-testid="draft-id-desc-sort-icon"
                       onClick={() => updateSort("desc", "id")}
                       className="fa-sharp fa-solid fa-arrow-down-1-9 cursor-pointer"
                       title={t("Descending")}
                     />
                   ) : (
                     <i
+                      data-testid="draft-id-asc-sort-icon"
                       onClick={() => updateSort("asc", "id")}
                       className="fa-sharp fa-solid fa-arrow-down-9-1 cursor-pointer"
                       title={t("Ascending")}
@@ -153,12 +155,14 @@ const DraftTable = () => {
                   {t("Title")}
                   {isAscending && sortBy === "DraftName" ? (
                     <i
+                      data-testid="draft-title-desc-sort-icon"
                       onClick={() => updateSort("desc", "DraftName")}
                       className="fa-sharp fa-solid fa-arrow-down-a-z cursor-pointer"
                       title={t("Descending")}                      
                     />
                   ) : (
                     <i
+                      data-testid="draft-title-asc-sort-icon"
                       onClick={() => updateSort("asc", "DraftName")}
                       className="fa-sharp fa-solid fa-arrow-down-z-a cursor-pointer"
                       title={t("Ascending")}
@@ -169,12 +173,14 @@ const DraftTable = () => {
                   {t("Last Modified")}{" "}
                   {isAscending && sortBy === "modified" ? (
                     <i
+                      data-testid="draft-modified-desc-sort-icon"
                       onClick={() => updateSort("desc", "modified")}
                       className="fa-sharp fa-solid fa-arrow-down-1-9  ms-2 cursor-pointer"
                       title={t("Descending")}
                     />
                   ) : (
                     <i
+                      data-testid="draft-modified-asc-sort-icon"
                       onClick={() => updateSort("asc", "modified")}
                       className="fa-sharp fa-solid fa-arrow-down-9-1  ms-2 cursor-pointer"
                       title={t("Ascending")}

diff --git a/forms-flow-web/src/components/Form/Item/SaveAsNewVersionConfirmationModal.js b/forms-flow-web/src/components/Form/Item/SaveAsNewVersionConfirmationModal.js
@@ -9,6 +9,7 @@ const SaveAsNewVersionConfirmationModal = ({modalOpen,handleModalChange,onConfir
     show={modalOpen}
     size="md"
     aria-labelledby="example-custom-modal-styling-title"
+    data-testid="save-as-version-modal"
   >
     <Modal.Header>
       <div>
@@ -25,6 +26,7 @@ const SaveAsNewVersionConfirmationModal = ({modalOpen,handleModalChange,onConfir
             handleModalChange();
           }}
           aria-label="Close"
+          data-testid="save-as-version-modal-close-button"
         >
         </button>
       </div>
@@ -41,8 +43,15 @@ const SaveAsNewVersionConfirmationModal = ({modalOpen,handleModalChange,onConfir
     </Modal.Body>
     <Modal.Footer>
       <div className='d-flex justify-content-end'>
-      <button type="button" className="btn btn-link text-dark" onClick={()=>{handleModalChange();}}>{t("Cancel")}</button>
-      <button className='btn btn-primary' onClick={()=>{onConfirm();}}>{t("Continue")}</button>
+          <button
+            type="button"
+            className="btn btn-link text-dark"
+            data-testid="save-as-version-modal-cancel-button"
+            onClick={() => { handleModalChange(); }}>{t("Cancel")}</button>
+          <button
+            className='btn btn-primary'
+            data-testid="save-as-version-modal-continue-button"
+            onClick={() => { onConfirm(); }}>{t("Continue")}</button>
       </div>
     </Modal.Footer>
   </Modal>

diff --git a/forms-flow-web/src/components/Form/Item/View.js b/forms-flow-web/src/components/Form/Item/View.js
@@ -368,7 +368,11 @@ const View = React.memo((props) => {
             onConfirm={props.onConfirm}
           ></SubmissionError>
           {isAuthenticated ? (
-            <Link title={t("Back to Form List")} to={`${redirectUrl}form`}>
+            <Link
+              title={t("Back to Form List")}
+              to={`${redirectUrl}form`}
+              data-testid="back-to-form-list"
+            >
               <i className="fa fa-chevron-left fa-lg me-2" />
             </Link>
           ) : null}

diff --git a/forms-flow-web/src/components/Form/Stepper.js b/forms-flow-web/src/components/Form/Stepper.js
@@ -366,6 +366,7 @@ class StepperPage extends PureComponent {
             <Link
               to={`${this.state.redirectUrl}form`}
               title={t("Back to Form List")}
+              data-testid="back-to-form-list"
             >
               <i className="fa fa-chevron-left fa-lg m-2" />
             </Link>

diff --git a/forms-flow-web/src/components/Form/constants/ClientTable.js b/forms-flow-web/src/components/Form/constants/ClientTable.js
@@ -149,6 +149,7 @@ function ClientTable() {
                     <span>
                       {isAscending ? (
                         <i
+                          data-testid="form-desc-sort-icon"
                           className="fa fa-sort-alpha-asc ms-2"
                           onClick={() => {
                             updateSort("desc");
@@ -162,6 +163,7 @@ function ClientTable() {
                         ></i>
                       ) : (
                         <i
+                          data-testid="form-asc-sort-icon"
                           className="fa fa-sort-alpha-desc ms-2"
                           onClick={() => {
                             updateSort("asc");

diff --git a/forms-flow-web/src/components/Form/constants/FormTable.js b/forms-flow-web/src/components/Form/constants/FormTable.js
@@ -195,6 +195,7 @@ function FormTable() {
                     <span>
                       {isAscending ? (
                         <i
+                          data-testid="form-desc-sort-icon"
                           className="fa fa-sort-alpha-asc ms-2 mt-1"
                           onClick={() => {
                             updateSort("desc");
@@ -208,6 +209,7 @@ function FormTable() {
                         ></i>
                       ) : (
                         <i
+                          data-testid="form-asc-sort-icon"
                           className="fa fa-sort-alpha-desc ms-2 mt-1"
                           onClick={() => {
                             updateSort("asc");

diff --git a/forms-flow-web/src/containers/Confirm.js b/forms-flow-web/src/containers/Confirm.js
@@ -15,7 +15,7 @@ const Confirm = React.memo((props) => {
 
   return (
     <>
-      <Modal show={modalOpen}>
+      <Modal data-testid="delete-modal" show={modalOpen}>
         <Modal.Header>
           <Modal.Title>{t("Delete Confirmation")}</Modal.Title>
         </Modal.Header>