Updated compose file
This commit is contained in:
+2
-2
@@ -2,7 +2,7 @@ version: '3'
|
|||||||
services:
|
services:
|
||||||
frontend:
|
frontend:
|
||||||
#build: ./frontend
|
#build: ./frontend
|
||||||
image: ghcr.io/frikky/shuffle-frontend:0.8.92
|
image: ghcr.io/frikky/shuffle-frontend:0.8.93
|
||||||
container_name: shuffle-frontend
|
container_name: shuffle-frontend
|
||||||
hostname: shuffle-frontend
|
hostname: shuffle-frontend
|
||||||
ports:
|
ports:
|
||||||
@@ -17,7 +17,7 @@ services:
|
|||||||
- backend
|
- backend
|
||||||
backend:
|
backend:
|
||||||
#build: ./backend
|
#build: ./backend
|
||||||
image: ghcr.io/frikky/shuffle-backend:0.8.92
|
image: ghcr.io/frikky/shuffle-backend:0.8.93
|
||||||
container_name: shuffle-backend
|
container_name: shuffle-backend
|
||||||
hostname: ${BACKEND_HOSTNAME}
|
hostname: ${BACKEND_HOSTNAME}
|
||||||
# Here for debugging:
|
# Here for debugging:
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
"cytoscape-grid-guide": "~2.1.2",
|
"cytoscape-grid-guide": "~2.1.2",
|
||||||
"cytoscape-node-html-label": "^1.1.5",
|
"cytoscape-node-html-label": "^1.1.5",
|
||||||
"cytoscape-panzoom": "^2.5.2",
|
"cytoscape-panzoom": "^2.5.2",
|
||||||
|
"cytoscape-popper": "^2.0.0",
|
||||||
"cytoscape-undo-redo": "^1.3.2",
|
"cytoscape-undo-redo": "^1.3.2",
|
||||||
"d3": "~4.10.0",
|
"d3": "~4.10.0",
|
||||||
"dotenv": "^6.1.0",
|
"dotenv": "^6.1.0",
|
||||||
|
|||||||
@@ -39,7 +39,12 @@ const inputColor = "#383B40"
|
|||||||
cytoscape.use(edgehandles);
|
cytoscape.use(edgehandles);
|
||||||
cytoscape.use(clipboard);
|
cytoscape.use(clipboard);
|
||||||
cytoscape.use(undoRedo);
|
cytoscape.use(undoRedo);
|
||||||
cytoscape.use( cxtmenu );
|
cytoscape.use(cxtmenu);
|
||||||
|
|
||||||
|
// Adds specific text to items
|
||||||
|
//import popper from 'cytoscape-popper';
|
||||||
|
//cytoscape.use(popper);
|
||||||
|
|
||||||
|
|
||||||
// https://stackoverflow.com/questions/19014250/rerender-view-on-browser-resize-with-react
|
// https://stackoverflow.com/questions/19014250/rerender-view-on-browser-resize-with-react
|
||||||
function useWindowSize() {
|
function useWindowSize() {
|
||||||
@@ -2462,6 +2467,42 @@ const AngularWorkflow = (props) => {
|
|||||||
cy.on('drag', 'node', (e) => onNodeDrag(e, selectedAction))
|
cy.on('drag', 'node', (e) => onNodeDrag(e, selectedAction))
|
||||||
cy.on('free', 'node', (e) => onNodeDragStop(e, selectedAction))
|
cy.on('free', 'node', (e) => onNodeDragStop(e, selectedAction))
|
||||||
|
|
||||||
|
//let popper2 = cy.popper({
|
||||||
|
// content: () => {
|
||||||
|
// let div = document.createElement('div');
|
||||||
|
//
|
||||||
|
// div.innerHTML = 'Popper content'
|
||||||
|
//
|
||||||
|
// document.body.appendChild(div)
|
||||||
|
//
|
||||||
|
// return div
|
||||||
|
// },
|
||||||
|
// renderedPosition: () => ({ x: 100, y: 200 }),
|
||||||
|
// popper: {} // my popper options here
|
||||||
|
//});
|
||||||
|
|
||||||
|
//let popper1 = cy.nodes()[0].popper({
|
||||||
|
// content: () => {
|
||||||
|
// let div = document.createElement('div')
|
||||||
|
//
|
||||||
|
// div.innerHTML = 'Popper content'
|
||||||
|
// document.body.appendChild(div)
|
||||||
|
//
|
||||||
|
// return div
|
||||||
|
// },
|
||||||
|
// popper: {} // my popper options here
|
||||||
|
//})
|
||||||
|
//let update = () => {
|
||||||
|
// popper.update()
|
||||||
|
//}
|
||||||
|
|
||||||
|
//let node = cy.nodes().first()
|
||||||
|
//node.on('position', update)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//cy.on('mouseover', 'node', () => $(targetElement).addClass('mouseover'));
|
//cy.on('mouseover', 'node', () => $(targetElement).addClass('mouseover'));
|
||||||
|
|
||||||
//cy.on('cxttapstart', 'node', (e) => edgeHandler.start(e.target))
|
//cy.on('cxttapstart', 'node', (e) => edgeHandler.start(e.target))
|
||||||
@@ -3397,7 +3438,7 @@ const AngularWorkflow = (props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (data.is_valid === false) {
|
if (data.is_valid === false) {
|
||||||
alert.error(data.name+" trigger isn't available yet")
|
alert.error(data.name+" requires hybrid version of Shuffle")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ const AppCreator = (props) => {
|
|||||||
const actionNonBodyRequest = ["GET", "HEAD", "DELETE", "CONNECT"]
|
const actionNonBodyRequest = ["GET", "HEAD", "DELETE", "CONNECT"]
|
||||||
const actionBodyRequest = ["POST", "PUT", "PATCH",]
|
const actionBodyRequest = ["POST", "PUT", "PATCH",]
|
||||||
//const authenticationOptions = ["No authentication", "API key", "Bearer auth", "Basic auth", "Oauth2"]
|
//const authenticationOptions = ["No authentication", "API key", "Bearer auth", "Basic auth", "Oauth2"]
|
||||||
const authenticationOptions = ["No authentication", "API key", "Bearer auth", "Basic auth"]
|
const authenticationOptions = ["No authentication", "API key", "Bearer auth", "Basic auth", "JWT"]
|
||||||
const apikeySelection = ["Header", "Query",]
|
const apikeySelection = ["Header", "Query",]
|
||||||
|
|
||||||
const [name, setName] = useState("");
|
const [name, setName] = useState("");
|
||||||
@@ -1263,7 +1263,12 @@ const AppCreator = (props) => {
|
|||||||
"scheme": "bearer",
|
"scheme": "bearer",
|
||||||
"bearerFormat": "UUID",
|
"bearerFormat": "UUID",
|
||||||
}
|
}
|
||||||
|
} else if (authenticationOption === "JWT") {
|
||||||
|
data.components.securitySchemes["BearerAuth"] = {
|
||||||
|
"type": "http",
|
||||||
|
"scheme": "bearer",
|
||||||
|
"bearerFormat": "JWT",
|
||||||
|
}
|
||||||
} else if (authenticationOption === "Basic auth") {
|
} else if (authenticationOption === "Basic auth") {
|
||||||
data.components.securitySchemes["BasicAuth"] = {
|
data.components.securitySchemes["BasicAuth"] = {
|
||||||
"type": "http",
|
"type": "http",
|
||||||
|
|||||||
Reference in New Issue
Block a user