From eaa21309ff305feec57d7c82313e7cb45d94dd50 Mon Sep 17 00:00:00 2001
From: Ajay krishna <ajay.k@aot-technologies.com>
Date: Wed, 20 Mar 2024 17:40:27 +0530
Subject: [PATCH 1/2] modal added for delete filter and truncate addd for
 lengthy filter name

---
 .../components/Form/constants/FormTable.js    |  7 +-
 .../ServiceFlow/list/sort/CreateNewFilter.js  | 88 +++++++++++++++++--
 forms-flow-web/src/containers/TaskHead.js     |  9 +-
 3 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/forms-flow-web/src/components/Form/constants/FormTable.js b/forms-flow-web/src/components/Form/constants/FormTable.js
index 9da3d37135..1dcacdcb35 100644
--- a/forms-flow-web/src/components/Form/constants/FormTable.js
+++ b/forms-flow-web/src/components/Form/constants/FormTable.js
@@ -300,12 +300,15 @@ function FormTable() {
                         </button>
                       </td>
                       <td>
-                        <Dropdown data-testid={`designer-form-option-${e._id}`}>
+                        <Dropdown 
+                         data-testid={`designer-form-option-${e._id}`}
+                         data-bs-toggle="tooltip" 
+                         data-bs-placement="bottom"
+                         title={t("More options")}>
                           <Dropdown.Toggle
                             data-testid={`designer-form-option-toggle-${e._id}`}
                             as={CustomToggle}
                             id="dropdown-basic"
-                            title={t("More options")}
                             aria-describedby="More-options"
                           >
                             <i className="fa-solid fa-ellipsis"></i>
diff --git a/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js b/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
index 6bb84faf84..625e83528e 100644
--- a/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
+++ b/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
@@ -33,7 +33,14 @@ import TaskAttributeComponent from "./TaskAttributeComponent";
 import { toast } from "react-toastify";
 import { getUserRoles } from "../../../../apiManager/services/authorizationService";
 import { setUserGroups } from "../../../../actions/authorizationActions";
-import { Badge, ListGroup, OverlayTrigger, Popover } from "react-bootstrap";
+import {
+  Badge,
+  ListGroup,
+  OverlayTrigger,
+  Popover,
+  Modal,
+  Button,
+} from "react-bootstrap";
 import { trimFirstSlash } from "../../constants/taskConstants";
 import { cloneDeep, omitBy } from "lodash";
 import {
@@ -112,6 +119,8 @@ export default function CreateNewFilterDrawer({
   const { t } = useTranslation();
   const [modalShow, setModalShow] = useState(false);
   const [checkboxes, setCheckboxes] = useState(initialValueOfTaskAttribute);
+  const [showDeleteModal, setShowDeleteModal] = useState(false);
+  const [showAlert, setShowAlert] = useState(false);
 
   const fetchTasks = (resData) => {
     const reqParamData = {
@@ -543,6 +552,37 @@ export default function CreateNewFilterDrawer({
     setShowUndefinedVariable(showUndefinedVariable);
   };
 
+
+  const hideDeleteConfirmation = () => {
+    setShowDeleteModal(false);
+  };
+
+  const showDeleteConfirmation = () => {
+    setShowDeleteModal(true);
+    toggleDrawer();
+  };
+
+  const FilterDelete = () => {
+    hideDeleteConfirmation();
+    handleFilterDelete();
+  };
+
+  const textTruncate = (wordLength, targetLength, text) => {
+    return text?.length > wordLength
+      ? text.substring(0, targetLength) + "..."
+      : text;
+  };
+
+  const handleFilterName = (e) => {
+    const value = e.target.value;
+    setFilterName(value);
+    if (value.length >= 50) {
+      setShowAlert(true);
+    } else {
+      setShowAlert(false);
+    }
+  };
+
   const list = () => (
     <div role="presentation">
       <List>
@@ -560,13 +600,19 @@ export default function CreateNewFilterDrawer({
           <label htmlFor="filterName">{t("Filter Name")}</label>
           <input
             type="text"
-            className="form-control"
+            className={`form-control ${showAlert ? 'is-invalid' : ''}`}
             id="filterName"
             placeholder={t("Enter your text here")}
             value={filterName}
-            onChange={(e) => setFilterName(e.target.value)}
+            onChange={handleFilterName}
             title={t("Add fliter name")}
+            
           />
+          {showAlert && (
+          <p className="text-danger mt-2 fs-6">
+            {t("Filter name should be less than 50 characters")}
+          </p>
+        )}
         </div>
       </List>
 
@@ -835,8 +881,7 @@ export default function CreateNewFilterDrawer({
             <button
               className="btn btn-link text-danger cursor-pointer"
               onClick={() => {
-                toggleDrawer();
-                handleFilterDelete();
+                showDeleteConfirmation();
               }}
             >
               <Translation>{(t) => t("Delete Filter")}</Translation>
@@ -853,7 +898,7 @@ export default function CreateNewFilterDrawer({
             </button>
             <button
               className="btn btn-primary submitButton text-decoration-none truncate-size "
-              disabled={!permissions || !filterName}
+              disabled={!permissions || !filterName || filterName.length >= 50}
               onClick={() => {
                 handleSubmit();
               }}
@@ -921,6 +966,37 @@ export default function CreateNewFilterDrawer({
           {list()}
         </Drawer>
       </React.Fragment>
+
+      {/* Delete confirmation modal */}
+      <Modal show={showDeleteModal} onHide={hideDeleteConfirmation}>
+        <Modal.Header>
+          <Modal.Title>
+            <Translation>{(t) => t("Delete Confirmation")}</Translation>
+          </Modal.Title>
+        </Modal.Header>
+        <Modal.Body>
+        <Translation>{(t) => t("Are you sure to delete")}</Translation>
+          {" "}
+          <span className="fw-bold">
+            {filterName.includes(" ")
+              ? filterName
+              : textTruncate(40, 30, filterName)}
+          </span>{" "}
+        <Translation>{(t) => t("filter?")}</Translation>
+        </Modal.Body>
+        <Modal.Footer>
+          <Button
+            variant=""
+            className="btn-link text-dark"
+            onClick={hideDeleteConfirmation}
+          >
+          <Translation>{(t) => t("Cancel")}</Translation>
+          </Button>
+          <Button variant="danger" onClick={FilterDelete}>
+          <Translation>{(t) => t("Delete")}</Translation>
+          </Button>
+        </Modal.Footer>
+      </Modal>
     </div>
   );
 }
diff --git a/forms-flow-web/src/containers/TaskHead.js b/forms-flow-web/src/containers/TaskHead.js
index a5cfad6b35..5e69ce1f62 100644
--- a/forms-flow-web/src/containers/TaskHead.js
+++ b/forms-flow-web/src/containers/TaskHead.js
@@ -45,6 +45,12 @@ function TaskHead() {
 
   const count = isTaskListLoading ? "" : `(${itemCount})`;
 
+  const textTruncate = (wordLength, targetLength, text) => {
+    return text?.length > wordLength
+      ? text.substring(0, targetLength) + "..."
+      : text;
+  };
+
   return (
     <div>
       <div className="d-flex flex-md-row flex-column  align-items-md-center justify-content-between">
@@ -55,7 +61,8 @@ function TaskHead() {
                   <span className="h4 fw-bold">
                       <i className="fa fa-list-ul me-2" />
                     {selectedFilter?.name ?  
-                    `${selectedFilter?.name} ${count}` : filterListLoading() } 
+                    textTruncate(25, 23, `${selectedFilter?.name} ${count}`) :
+                    filterListLoading() } 
                   </span>
                 }
                 onClick={goToTask}

From 0bdfbb9b980ccb32b98abe2011c6589484a31655 Mon Sep 17 00:00:00 2001
From: Ajay krishna <ajay.k@aot-technologies.com>
Date: Fri, 22 Mar 2024 14:15:25 +0530
Subject: [PATCH 2/2] toggle drawer added while canceling the delete filter
 modal

---
 .../src/components/ServiceFlow/list/sort/CreateNewFilter.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js b/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
index 625e83528e..71b78c52a0 100644
--- a/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
+++ b/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
@@ -512,6 +512,11 @@ export default function CreateNewFilterDrawer({
     setOpenFilterDrawer(!openFilterDrawer);
   };
 
+  const deleteConfirmationModalToggleDrawer = () => {
+    setOpenFilterDrawer(!openFilterDrawer);
+  };
+
+
   const candidateGroups = useSelector(
     (state) => state.user?.userDetail?.groups || []
   );
@@ -555,6 +560,7 @@ export default function CreateNewFilterDrawer({
 
   const hideDeleteConfirmation = () => {
     setShowDeleteModal(false);
+    deleteConfirmationModalToggleDrawer();
   };
 
   const showDeleteConfirmation = () => {