Merge pull request #2375 from abilpraju-aot/bugfix/editor-workflow

dmn style fixed,id issue fix,disable save flow fix
AOT-Technologies · Nov 25, 2024 · 0dce448 · 0dce448
2 parents 50524a8 + d47bd2f
commit 0dce448
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/forms-flow-web/src/components/Form/EditForm/FlowEdit.js b/forms-flow-web/src/components/Form/EditForm/FlowEdit.js
@@ -76,11 +76,11 @@ const FlowEdit = forwardRef(({ isPublished = false, CategoryType }, ref) => {
   const handleToggleHistoryModal = () => setShowHistoryModal(!showHistoryModal);
 
   const enableWorkflowChange = ()=>{
-    !isWorkflowChanged && setIsWorkflowChanged(true);
+    setIsWorkflowChanged(true);
   };
 
   const disableWorkflowChange = ()=>{
-    isWorkflowChanged && setIsWorkflowChanged(false);
+    setIsWorkflowChanged(false);
   };
 
   //handle discard changes

diff --git a/forms-flow-web/src/components/Modeler/DecisionTable.js b/forms-flow-web/src/components/Modeler/DecisionTable.js
@@ -186,7 +186,7 @@ const DecisionTable = React.memo(() => {
                     </th>
                     <th className="w-20" scope="col">
                       <SortableHeader
-                        columnKey="id"
+                        columnKey="processKey"
                         title="ID"
                         currentSort={currentDmnSort}
                         handleSort={handleSort}
@@ -208,16 +208,7 @@ const DecisionTable = React.memo(() => {
                         handleSort={handleSort}
                       />
                     </th>
-                    <th
-                      className="w-25"
-                      colSpan="4"
-                      aria-label="edit bpmn button "
-                    ></th>
-                    <th
-                      className="w-25"
-                      colSpan="4"
-                      aria-label="edit bpmn button "
-                    ></th>
+                    <th className="w-25" colSpan="4" aria-label="edit bpmn button "></th>
                   </tr>
                 </thead>
                 {dmn.length ?

diff --git a/forms-flow-web/src/components/Modeler/ProcessCreateEdit.js b/forms-flow-web/src/components/Modeler/ProcessCreateEdit.js
@@ -105,11 +105,13 @@ const ProcessCreateEdit = ({ type }) => {
   const [isPublishLoading, setIsPublishLoading] = useState(false);
   const [isReverted, setIsReverted] = useState(false);
   const [isWorkflowChanged, setIsWorkflowChanged] = useState(false);
+
   const isDataFetched = useRef();
   useEffect(() => {
     setIsPublished(processData.status === "Published");
   }, [processData]);
 
+
   const publishText = isPublished ? t("Unpublish") : t("Publish");
   const processName = processData.name;
   const fileName = (processName + Process.extension).replaceAll(" ", "");
@@ -164,11 +166,11 @@ const ProcessCreateEdit = ({ type }) => {
   const handleToggleHistoryModal = () => setHistoryModalShow(!historyModalShow);
 
   const enableWorkflowChange = ()=>{
-    !isWorkflowChanged && setIsWorkflowChanged(true);
+    setIsWorkflowChanged(true);
   };
 
   const disableWorkflowChange = ()=>{
-    isWorkflowChanged && setIsWorkflowChanged(false);
+    setIsWorkflowChanged(false);
   };
 
   useEffect(() => {