Synced 2.0 fixes for RC6

frontend/src/views/Apps2.jsx

@@ -59,7 +59,6 @@ const AppCard = ({ data, index, mouseHoverIndex, setMouseHoverIndex, globalUrl,
                   (userdata?.admin === "true" && userdata?.active_org?.id === data?.reference_org) || 
                   data?.contributors?.includes(userdata?.id)
 
-  console.log("appdata", data)
   const paperStyle = {
     backgroundColor: mouseHoverIndex === index ? "rgba(26, 26, 26, 1)" : "#212121",
     color: "rgba(241, 241, 241, 1)",

frontend/src/views/Docs.jsx

@@ -184,15 +184,15 @@ export const CodeHandler = (props) => {
     if (validate.valid === false) {
         // Check if https://shuffler.io in the url
         // if so, then we change it for the current url	
-        if (propvalue.includes("https://shuffler.io")) {
-            newprop = propvalue.replace("https://shuffler.io", window.location.origin)
-        }
+        if (propvalue.includes("https://shuffler.io/api")) {
+            newprop = propvalue.replace("https://shuffler.io/api", window.location.origin+"/api")
 
-        // Check if it contains Bearer APIKEY
-        // If so, replace apikey
-        //if (newprop.includes("Bearer APIKEY")) {
-        //	newprop = newprop.replace("Bearer APIKEY", "Bearer API
-        //}
+	
+			const foundurl = localStorage.getItem("globalUrl")
+			if (foundurl !== undefined && foundurl !== null && foundurl !== "") {
+				newprop = propvalue.replace("https://shuffler.io/api", foundurl+"/api")
+			}
+        }
     }
 
     // Need to check if it's singletick or multi

frontend/src/views/Workflows2.jsx

@@ -1187,32 +1187,32 @@ const Workflows2 = (props) => {
                     "",
                     data.status,
                 )
-                    .then((response) => {
-                        if (response !== undefined) {
-                            // SET THE FULL THING
-                            data.id = response.id;
+				.then((response) => {
+					if (response !== undefined) {
+						// SET THE FULL THING
+						data.id = response.id;
 
-                            // Actually create it
-                            setNewWorkflow(
-                                data.name,
-                                data.description,
-                                data.tags,
-                                data.default_return_value,
-                                data,
-                                false,
-                                [],
-                                "",
-                                data.status
-                            ).then((response) => {
-                                if (response !== undefined) {
-                                    toast(`Successfully imported ${data.name}`);
-                                }
-                            });
-                        }
-                    })
-                    .catch((error) => {
-                        toast("Import error: " + error.toString());
-                    });
+						// Actually create it
+						setNewWorkflow(
+							data.name,
+							data.description,
+							data.tags,
+							data.default_return_value,
+							data,
+							false,
+							[],
+							"",
+							data.status
+						).then((response) => {
+							if (response !== undefined) {
+								toast(`Successfully imported ${data.name}`);
+							}
+						});
+					}
+				})
+				.catch((error) => {
+					toast("Import error: " + error.toString());
+				});
             });
         } catch (e) {
             console.log("Error in dropzone: ", e);
@@ -2875,6 +2875,7 @@ const Workflows2 = (props) => {
         if (editingWorkflow.id !== undefined) {
             console.log("Building original workflow");
             method = "PUT";
+            //extraData = "/" + editingWorkflow.id + "?skip_save=true";
             extraData = "/" + editingWorkflow.id + "?skip_save=true";
             workflowdata = editingWorkflow;