removed embedding

Author: annahileta

client/src/components/TriggerForm/TriggerForm.jsx

@@ -8,7 +8,7 @@ import { ROUTE, TemplateType } from '../../constants.js';
 import { api } from '../../api';
 import { openPopupWindow, closePopupWindow, updateWorkflowDefinitions } from '../../store/actions';
 
-const TriggerForm = ({ workflowId, templateType, triggerType }) => {
+const TriggerForm = ({ workflowId, templateType }) => {
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const isPopupOpened = useSelector(state => state.popup.isOpened);
@@ -106,24 +106,20 @@ const TriggerForm = ({ workflowId, templateType, triggerType }) => {
     const { data: triggeredWorkflow } = await api.workflows.triggerWorkflow(workflowId, templateType, body);
     setWorkflowInstanceUrl(triggeredWorkflow.workflowInstanceUrl);
 
-    if(triggerType === "Url") {
-      navigate(`${ROUTE.TRIGGERFORM}/${workflowId}?type=${templateType}&triggerType=${triggerType}&triggerUrl=${triggeredWorkflow.workflowInstanceUrl}`)
-    } else {
-      // Update workflowDefinitions. "...workflow" creates new workflow-object to avoid mutation in redux
-      const updatedWorkflowDefinitions = workflows.map(w => {
-        if (w.id !== workflowId) return { ...w };
-
-        return {
-          ...w,
-          instanceId: triggeredWorkflow.instanceId,
-          isTriggered: true,
-        };
-      });
-
-      dispatch(updateWorkflowDefinitions(updatedWorkflowDefinitions));
-      setDataSending(false);
-      dispatch(openPopupWindow());
-    }
+    // Update workflowDefinitions. "...workflow" creates new workflow-object to avoid mutation in redux
+    const updatedWorkflowDefinitions = workflows.map(w => {
+      if (w.id !== workflowId) return { ...w };
+
+      return {
+        ...w,
+        instanceId: triggeredWorkflow.instanceId,
+        isTriggered: true,
+      };
+    });
+
+    dispatch(updateWorkflowDefinitions(updatedWorkflowDefinitions));
+    setDataSending(false);
+    dispatch(openPopupWindow());
   };
 
   if (!relevantFormFields.length)

client/src/components/WorkflowList/WorkflowList.jsx

@@ -48,7 +48,7 @@ const WorkflowList = ({ items, interactionType, isLoading }) => {
               </div>
 
               {interactionType === WorkflowItemsInteractionType.TRIGGER && (
-                <button className={styles.cell3} onClick={() => navigate(`${ROUTE.TRIGGERFORM}/${item.id}?type=${item.type}&triggerType=${item.triggerType}`)}>
+                <button className={styles.cell3} onClick={() => navigate(`${ROUTE.TRIGGERFORM}/${item.id}?type=${item.type}`)}>
                   {textContent.buttons.triggerWorkflow}
                 </button>
               )}

client/src/pages/TriggerWorkflow/TriggerWorkflow.jsx

@@ -41,15 +41,13 @@ const TriggerWorkflow = () => {
               id: definition.id,
               name: definition.name,
               type: "-",
-              triggerType: definition.triggerType
             };
           }
 
           return {
             id: definition.id,
             name: `${TemplateType[foundKey]?.name}`,
             type: TemplateType[foundKey]?.type,
-            triggerType: definition.triggerType
           };
         })
         .filter(definition => !!definition);

client/src/pages/TriggerWorkflowForm/TriggerWorkflowForm.jsx

@@ -15,29 +15,6 @@ const TriggerWorkflowForm = () => {
   const location = useLocation();
   const searchParams = new URLSearchParams(location.search);
   const type = searchParams.get('type');
-  const triggerType = searchParams.get('triggerType');
-  const triggerUrl = searchParams.get('triggerUrl');
-
-  if(triggerUrl !== null){
-    return (
-      <div className="page-box">
-        <Header />
-        <div className={styles.contentContainer}>
-          <WorkflowDescription
-            title={textContent.pageTitles.completeWorkflow}
-            behindTheScenesComponent={<TriggerBehindTheScenes />}
-            backRoute={ROUTE.TRIGGER}
-          />
-
-          <div className={styles.formContainer}>
-            <iframe src={triggerUrl} width="800" height="600">
-            </iframe>
-          </div>
-        </div>
-        <Footer withContent={false} />
-      </div>
-    );
-  }
 
   return (
     <div className="page-box">
@@ -48,7 +25,7 @@ const TriggerWorkflowForm = () => {
           behindTheScenesComponent={<TriggerBehindTheScenes />}
           backRoute={ROUTE.TRIGGER}
         />
-        <TriggerForm workflowId={workflowId} templateType={type} triggerType={triggerType} />
+        <TriggerForm workflowId={workflowId} templateType={type} />
       </div>
       <Footer withContent={false} />
     </div>