{/* {hideBodyButton} */}
diff --git a/frontend/src/components/SearchData.jsx b/frontend/src/components/SearchData.jsx
index 89ab2050..6e619652 100644
--- a/frontend/src/components/SearchData.jsx
+++ b/frontend/src/components/SearchData.jsx
@@ -47,7 +47,7 @@ const chipStyle = {
const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
const SearchData = props => {
- const { serverside, globalUrl, userdata, setModalOpen, modalOpen } = props
+ const { serverside, globalUrl, userdata, searchBarModalOpen, setSearchBarModalOpen } = props
let navigate = useNavigate();
const borderRadius = 3
const node = useRef()
@@ -56,8 +56,8 @@ const SearchData = props => {
const [value, setValue] = useState("");
const handleLinkClick = () => {
- if (modalOpen) {
- setModalOpen(false); // Assuming setModalOpen is defined correctly
+ if (searchBarModalOpen) {
+ setSearchBarModalOpen(false); // Assuming setModalOpen is defined correctly
} else {
console.log("Condition not met, staying on the same page");
}
@@ -95,7 +95,7 @@ const SearchData = props => {
const trimmedValue = inputValue.trim();
if (trimmedValue !== '') {
navigate(`/search?q=${trimmedValue}`, { state: trimmedValue, replace: true });
- setModalOpen(false);
+ setSearchBarModalOpen(false);
}
}
};
@@ -249,7 +249,7 @@ const SearchData = props => {
{
//console.log("CLICK")
setSearchOpen(true)
- setModalOpen(false)
+ setSearchBarModalOpen(false)
aa('init', {
appId: searchClient.appId,
apiKey: searchClient.transporter.queryParameters["x-algolia-api-key"]
@@ -498,7 +498,7 @@ const SearchData = props => {
return (
{
setSearchOpen(true)
- setModalOpen(false)
+ setSearchBarModalOpen(false)
aa('init', {
appId: searchClient.appId,
apiKey: searchClient.transporter.queryParameters["x-algolia-api-key"]
@@ -702,7 +702,7 @@ const SearchData = props => {
console.log("CLICK")
setSearchOpen(true)
- setModalOpen(false)
+ setSearchBarModalOpen(false)
}}>
{
setMouseHoverIndex(index)
diff --git a/frontend/src/components/Searchfield.jsx b/frontend/src/components/Searchfield.jsx
index 6b3c50ae..83fb7675 100644
--- a/frontend/src/components/Searchfield.jsx
+++ b/frontend/src/components/Searchfield.jsx
@@ -1,9 +1,11 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useContext } from 'react';
import theme from '../theme.jsx';
import { useNavigate, Link, useParams } from "react-router-dom";
import SearchBox from "../components/SearchData.jsx";
+import { Context } from '../Context/contextApi.js';
+
import {
Chip,
IconButton,
@@ -45,20 +47,22 @@ const chipStyle = {
const SearchField = props => {
const { serverside, userdata, isMobile, isLoaded, globalUrl, isHeader, isLoggedIn, small, rounded } = props
+ const {searchBarModalOpen, setSearchBarModalOpen} = useContext(Context);
+
let navigate = useNavigate();
const borderRadius = 3
const node = useRef()
const [searchOpen, setSearchOpen] = useState(false)
- const [modalOpen, setModalOpen] = React.useState(false);
+ // const [modalOpen, setModalOpen] = React.useState(false);
const [oldPath, setOldPath] = useState("")
const [value, setValue] = useState("");
useEffect(() => {
Mousetrap.bind(['command+k', 'ctrl+k'], () => {
- setModalOpen(true);
+ setSearchBarModalOpen(true);
return false; // Prevent the default action
});
Mousetrap.bind(['esc'], () => {
- setModalOpen(false);
+ setSearchBarModalOpen(false);
return false; // Prevent the default action
});
@@ -72,9 +76,9 @@ const SearchField = props => {
// console.log("key:", dataValue.key),
//console.log("value:",dataValue.value),
- {/*executionData !== undefined && executionData !== null && executionData !== {} && executionData.status !== undefined && (answer === undefined || answer === null) ?
-
-
- Status
-
-
- {executionData.status}
-
-
- : null*/}
+
- {/*
-
- Results: {executionData.results.length}/{executionData.workflow.actions.length}
-
- */}
-
- {executionData.result !== undefined && executionData.result !== null && executionData.result.length > 0 ?
+ {validate.valid === false ?
{
overflowY: "auto",
}}
>
- {executionData.result}
+ {validate.result}
- : null}
+ :
+
{
+ return collapseField(jsonField)
+ }}
+ displayArrayKey={false}
+ enableClipboard={(copy) => {
+ //handleReactJsonClipboard(copy);
+ }}
+ displayDataTypes={false}
+ onSelect={(select) => {
+ //HandleJsonCopy(validate.result, select, "exec");
+ }}
+ name={false}
+ />
+ }
-
{workflow.input_markdown !== undefined && workflow.input_markdown !== null && workflow.input_markdown.length > 0 ?
{
return (
- {question.name}
{multiChoiceOptions.length > 1 ?
-
}
+
+ Forms are in Beta. Form submissions data includes your Organization's unique ID while logged in, or a unique identifier for your browser otherwise. Your input will be automatically sanitized.
+
-
+ {selectedOrganization !== undefined && selectedOrganization !== null ?
+
+
+
+ {selectedOrganization.name}
+
+
+
+ : null}
+
+ {forms !== undefined && forms !== null && forms.length > 0 ?
+
+ {forms.map((form, formIndex) => {
+ if (form.id === undefined || form.id === null) {
+ return null
+ }
+
+ return (
+
+ {
+ navigate(`/forms/${form.id}`)
+ getWorkflow(form.id, sourceNode)
+ }}
+ currentWorkflowId={workflow.id}
+ />
+
+ {/*
+
+ */}
+
+ )
+ })}
+
+ :
+
+ No forms loaded
+
+ }
+
+
{loadedCheck}
+ {formSidebar}
)
}
diff --git a/frontend/src/views/SetAuthentication.jsx b/frontend/src/views/SetAuthentication.jsx
index 0015deda..cbcda6dd 100755
--- a/frontend/src/views/SetAuthentication.jsx
+++ b/frontend/src/views/SetAuthentication.jsx
@@ -3,6 +3,8 @@ import React, { useState } from "react";
import { Typography, CircularProgress } from "@mui/material";
import theme from '../theme.jsx';
+import { red, } from "../views/AngularWorkflow.jsx"
+
const SetAuthentication = (props) => {
const { globalUrl } = props;
@@ -300,7 +302,7 @@ const SetAuthentication = (props) => {
}
return (
-
+
{
variant="h6"
style={{ marginLeft: "auto", marginRight: "auto", marginTop: 50}}
>
- {!finished ? (
+ {!finished ?
failed ?
null :
- ) : (
- "Done - this window should close within 3 seconds."
- )}
-
- {failed ? "Failed setup. Error: " : ""} {response}
+ :
+ failed ?
+ null
+ :
+ "Done - this window should close within 3 seconds."
+ }
+
+
+ {failed ? "Failed auth. Error: " : ""} {response}
- {failed ? "If the error persists, try to use fewer scopes. Contact our support at support@shuffler.io if you need further assistance. You may close this window." : ""}
+ {failed ? "If the error persists, try to use fewer scopes. Contact support@shuffler.io if you need further assistance, and include the current URL and a screenshot. You may now close this window." : ""}
);
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index a17b08ed..00eca27b 100755
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -417,7 +417,37 @@ const chipStyle = {
color: "white",
};
+export const collapseField = (field) => {
+ if (field === undefined || field === null) {
+ return true
+ }
+
+ if (field.name === "headers" || field.name === "cookies") {
+ return true
+ }
+
+ if (field.type === "array") {
+ return true
+ }
+
+ // If more than 10 keys in object, collapse
+ if (field.type === "object") {
+ if (Object.keys(field.src).length > 7) {
+ return true
+ }
+ }
+
+ return false
+}
+
export const validateJson = (showResult) => {
+ if (showResult === undefined || showResult === null) {
+ return {
+ valid: false,
+ result: "",
+ }
+ }
+
if (typeof showResult === 'string') {
showResult = showResult.split(" False").join(" false")
showResult = showResult.split(" True").join(" true")
@@ -645,24 +675,21 @@ const Workflows = (props) => {
}
setGettingStartedItems(activeFiltered)
- //const doneFiltered = activeFiltered.filter((item) => item.done === true)
- //if (doneFiltered.length > 0) {
- // console.log("DONE: ", doneFiltered)
- //}
-
- const sidebar = localStorage.getItem(sidebarKey);
- if (sidebar === null || sidebar === undefined) {
- console.log("No sidebar defined")
-
- localStorage.setItem(sidebarKey, "open");
- setDrawerOpen(true)
- } else {
+ /*
+ const sidebar = localStorage.getItem(sidebarKey)
+ if (sidebar === null || sidebar === undefined) {
+ console.log("No sidebar defined")
+
+ localStorage.setItem(sidebarKey, "open");
+ setDrawerOpen(true)
+ } else {
if (sidebar === "open") {
- setDrawerOpen(true)
+ setDrawerOpen(true)
} else {
- setDrawerOpen(false)
+ setDrawerOpen(false)
}
}
+ */
}
}
@@ -976,7 +1003,7 @@ const Workflows = (props) => {
onClick={() => {
console.log("Editing: ", editingWorkflow);
if (selectedWorkflowId) {
- deleteWorkflow(selectedWorkflowId);
+ deleteWorkflow(selectedWorkflowId)
setTimeout(() => {
getAvailableWorkflows();
}, 1000);
@@ -1877,7 +1904,7 @@ const Workflows = (props) => {
toast("Failed deleting workflow. Do you have access?");
} else {
if (bulk !== true) {
- toast("Deleted workflow " + id);
+ toast(`Deleted workflow ${id}. Child Workflows in Suborgs were also removed.`)
}
}
@@ -2063,6 +2090,8 @@ const Workflows = (props) => {
{"Create Form"}
+
+
-
-
+
+
+
+
+