marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'launch' into 1.2.0

Browse Source
This commit is contained in:
dhaval055
2023-01-25 11:10:34 +05:30
parent ef045bc5bd fb448b04ae
commit afcf95ef81
5 changed files with 581 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/push_nightly.sh
+65 -26
View File
@@ -2,40 +2,79 @@
# Done manually for now since GHCR isn't being pushed to easily with the current Github action CI. Nightly = Latest IF we run hotfixes on latest # Done manually for now since GHCR isn't being pushed to easily with the current Github action CI. Nightly = Latest IF we run hotfixes on latest
### Pull latest from ghcr CI/CD ### Pull latest from ghcr CI/CD
#docker pull ghcr.io/shuffle/shuffle-app_sdk:nightly docker pull ghcr.io/shuffle/shuffle-app_sdk:nightly
#docker pull ghcr.io/shuffle/shuffle-worker:nightly docker pull ghcr.io/shuffle/shuffle-worker:nightly
#docker pull ghcr.io/shuffle/shuffle-orborus:nightly docker pull ghcr.io/shuffle/shuffle-orborus:nightly
#docker pull ghcr.io/shuffle/shuffle-frontend:nightly docker pull ghcr.io/shuffle/shuffle-frontend:nightly
#docker pull ghcr.io/shuffle/shuffle-backend:nightly #docker pull ghcr.io/shuffle/shuffle-backend:nightly
#
### NIGHTLY releases
docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/frikky/shuffle-app_sdk:nightly
docker tag ghcr.io/shuffle/shuffle-worker:nightly ghcr.io/frikky/shuffle-worker:nightly
docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/frikky/shuffle-orborus:nightly
docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/frikky/shuffle-frontend:nightly
docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/frikky/shuffle-backend:nightly
docker push ghcr.io/frikky/shuffle-app_sdk:nightly
docker push ghcr.io/frikky/shuffle-worker:nightly
docker push ghcr.io/frikky/shuffle-orborus:nightly
docker push ghcr.io/frikky/shuffle-frontend:nightly
docker push ghcr.io/frikky/shuffle-backend:nightly
### LATEST releases: ### LATEST releases:
#docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/shuffle/shuffle-app_sdk:latest ## shuffle/shuffle
#docker tag ghcr.io/shuffle/shuffle-worker:nightly ghcr.io/shuffle/shuffle-worker:latest docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/shuffle/shuffle-app_sdk:latest
#docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/shuffle/shuffle-orborus:latest docker tag ghcr.io/shuffle/shuffle-worker:nightly ghcr.io/shuffle/shuffle-worker:latest
#docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/shuffle/shuffle-frontend:latest docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/shuffle/shuffle-orborus:latest
#docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/shuffle/shuffle-backend:latest docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/shuffle/shuffle-frontend:latest
# docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/shuffle/shuffle-backend:latest
#docker push ghcr.io/shuffle/shuffle-app_sdk:latest
#docker push ghcr.io/shuffle/shuffle-worker:latest docker push ghcr.io/shuffle/shuffle-app_sdk:latest
#docker push ghcr.io/shuffle/shuffle-orborus:latest docker push ghcr.io/shuffle/shuffle-worker:latest
#docker push ghcr.io/shuffle/shuffle-frontend:latest docker push ghcr.io/shuffle/shuffle-orborus:latest
#docker push ghcr.io/shuffle/shuffle-backend:latest docker push ghcr.io/shuffle/shuffle-frontend:latest
docker push ghcr.io/shuffle/shuffle-backend:latest
## frikky/shuffle
docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/frikky/shuffle-app_sdk:latest
docker tag ghcr.io/shuffle/shuffle-worker:nightly ghcr.io/frikky/shuffle-worker:latest
docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/frikky/shuffle-orborus:latest
docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/frikky/shuffle-frontend:latest
docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/frikky/shuffle-backend:latest
docker push ghcr.io/frikky/shuffle-app_sdk:latest
docker push ghcr.io/frikky/shuffle-worker:latest
docker push ghcr.io/frikky/shuffle-orborus:latest
docker push ghcr.io/frikky/shuffle-frontend:latest
docker push ghcr.io/frikky/shuffle-backend:latest
### 1.1.0 releases: ### 1.1.0 releases:
#docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/shuffle/shuffle-app_sdk:1.1.0 ## shuffle/shuffle
#docker tag ghcr.io/shuffle/shuffle-worker:nightly ghcr.io/shuffle/shuffle-worker:1.1.0 docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/shuffle/shuffle-app_sdk:1.1.0
#docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/shuffle/shuffle-orborus:1.1.0 docker tag ghcr.io/shuffle/shuffle-worker:nightly ghcr.io/shuffle/shuffle-worker:1.1.0
#docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/shuffle/shuffle-frontend:1.1.0 docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/shuffle/shuffle-orborus:1.1.0
#docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/shuffle/shuffle-backend:1.1.0 docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/shuffle/shuffle-frontend:1.1.0
# docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/shuffle/shuffle-backend:1.1.0
#docker push ghcr.io/shuffle/shuffle-app_sdk:1.1.0
#docker push ghcr.io/shuffle/shuffle-worker:1.1.0
#docker push ghcr.io/shuffle/shuffle-orborus:1.1.0
#docker push ghcr.io/shuffle/shuffle-frontend:1.1.0
#docker push ghcr.io/shuffle/shuffle-backend:1.1.0
docker push ghcr.io/shuffle/shuffle-app_sdk:1.1.0
docker push ghcr.io/shuffle/shuffle-worker:1.1.0
docker push ghcr.io/shuffle/shuffle-orborus:1.1.0
docker push ghcr.io/shuffle/shuffle-frontend:1.1.0
docker push ghcr.io/shuffle/shuffle-backend:1.1.0
## frikky/shuffle
docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/frikky/shuffle-app_sdk:1.1.0
docker tag ghcr.io/shuffle/shuffle-worker:nightly ghcr.io/frikky/shuffle-worker:1.1.0
docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/frikky/shuffle-orborus:1.1.0
docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/frikky/shuffle-frontend:1.1.0
docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/frikky/shuffle-backend:1.1.0
docker push ghcr.io/frikky/shuffle-app_sdk:1.1.0
docker push ghcr.io/frikky/shuffle-worker:1.1.0
docker push ghcr.io/frikky/shuffle-orborus:1.1.0
docker push ghcr.io/frikky/shuffle-frontend:1.1.0
docker push ghcr.io/frikky/shuffle-backend:1.1.0
### Manage worker-scale upload (Requires auth) ### Manage worker-scale upload (Requires auth)
# This is supposed to be unavailable, and only be downloadable by customers # This is supposed to be unavailable, and only be downloadable by customers
frontend/src/components/ConfigureWorkflow.jsx
+13 -9
View File
@@ -129,7 +129,7 @@ const ConfigureWorkflow = (props) => {
setFirstLoad(workflow.id) setFirstLoad(workflow.id)
const newactions = []; const newactions = [];
for (var key in workflow.actions) { for (let [key, keyval] in workflow.actions.entries()) {
const action = workflow.actions[key]; const action = workflow.actions[key];
var newaction = { var newaction = {
large_image: action.large_image, large_image: action.large_image,
@@ -175,7 +175,7 @@ const ConfigureWorkflow = (props) => {
) { ) {
// Check if configuration is filled or not // Check if configuration is filled or not
var filled = true; var filled = true;
for (var key in action.parameters) { for (let [key,keyval] in action.parameters.entries()) {
if (action.parameters[key].configuration) { if (action.parameters[key].configuration) {
//console.log("Found config: ", action.parameters[key]) //console.log("Found config: ", action.parameters[key])
if ( if (
@@ -216,7 +216,7 @@ const ConfigureWorkflow = (props) => {
if (newaction.must_authenticate) { if (newaction.must_authenticate) {
var authenticationOptions = []; var authenticationOptions = [];
for (var key in appAuthentication) { for (let [key,keyval] in appAuthentication.entries()) {
const auth = appAuthentication[key]; const auth = appAuthentication[key];
if (auth.app.name === app.name && auth.active) { if (auth.app.name === app.name && auth.active) {
//console.log("Found auth: ", auth) //console.log("Found auth: ", auth)
@@ -264,7 +264,8 @@ const ConfigureWorkflow = (props) => {
} }
} }
for (var key in workflow.workflow_variables) { if (workflow.workflow_variables !== undefined && workflow.workflow_variables !== null && workflow.workflow_variables.length !== 0) {
for (let [key,keyval] in workflow.workflow_variables.entries()) {
const variable = workflow.workflow_variables[key]; const variable = workflow.workflow_variables[key];
if ( if (
variable.value === undefined || variable.value === undefined ||
@@ -276,8 +277,10 @@ const ConfigureWorkflow = (props) => {
requiredVariables.push(variable); requiredVariables.push(variable);
} }
} }
}
for (var key in workflow.triggers) { if (workflow.triggers !== undefined && workflow.triggers !== null && workflow.triggers.length !== 0) {
for (let [key,keyval] in workflow.triggers.entries()) {
var trigger = workflow.triggers[key]; var trigger = workflow.triggers[key];
trigger.index = key; trigger.index = key;
@@ -299,7 +302,7 @@ const ConfigureWorkflow = (props) => {
} }
] ]
for (var subkey in tmpsteps) { for (let [subkey,subkeyval] in tmpsteps.entries()) {
newactions[foundindex].steps.push(tmpsteps[subkey]) newactions[foundindex].steps.push(tmpsteps[subkey])
} }
@@ -326,6 +329,7 @@ const ConfigureWorkflow = (props) => {
requiredTriggers.push(trigger); requiredTriggers.push(trigger);
} }
}
if ( if (
requiredTriggers.length === 0 && requiredTriggers.length === 0 &&
@@ -342,11 +346,11 @@ const ConfigureWorkflow = (props) => {
if (appAuthentication.length !== previousAuth.length) { if (appAuthentication.length !== previousAuth.length) {
var newactions = [] var newactions = []
for (var actionkey in requiredActions) { for (let [actionkey, actionkeyval] in requiredActions.entries()) {
var newaction = requiredActions[actionkey]; var newaction = requiredActions[actionkey];
const app = newaction.app; const app = newaction.app;
for (var key in appAuthentication) { for (let [key,keyval] in appAuthentication.entries()) {
const auth = appAuthentication[key]; const auth = appAuthentication[key];
// Does this account for all the different ones of the same? // Does this account for all the different ones of the same?
@@ -690,7 +694,7 @@ const ConfigureWorkflow = (props) => {
if (workflow.actions !== null) { if (workflow.actions !== null) {
//console.log(workflow.actions) //console.log(workflow.actions)
alert.info("Setting action to version "+action.update_version) alert.info("Setting action to version "+action.update_version)
for (var key in workflow.actions) { for (let [key,keyval] in workflow.actions.entries()) {
if (workflow.actions[key].app_name === action.app_name && workflow.actions[key].app_version === action.app_version) { if (workflow.actions[key].app_name === action.app_name && workflow.actions[key].app_version === action.app_version) {
workflow.actions[key].app_version = action.update_version workflow.actions[key].app_version = action.update_version
frontend/src/components/ParsedAction.jsx
+30 -30
View File
@@ -277,7 +277,7 @@ const ParsedAction = (props) => {
console.log("FOUNDACTION: ", foundAction); console.log("FOUNDACTION: ", foundAction);
if (foundAction !== null && foundAction !== undefined) { if (foundAction !== null && foundAction !== undefined) {
var foundparams = []; var foundparams = [];
for (var paramkey in foundAction.parameters) { for (let [paramkey,paramkeyval] in foundAction.parameters.entries()) {
const param = foundAction.parameters[paramkey]; const param = foundAction.parameters[paramkey];
const foundParam = selectedAction.parameters.find( const foundParam = selectedAction.parameters.find(
@@ -401,7 +401,7 @@ const ParsedAction = (props) => {
if (actionlist.length === 0) { if (actionlist.length === 0) {
// FIXME: Have previous execution values in here // FIXME: Have previous execution values in here
if (workflowExecutions.length > 0) { if (workflowExecutions.length > 0) {
for (var key in workflowExecutions) { for (let [key,keyval] in workflowExecutions.entries()) {
if ( if (
workflowExecutions[key].execution_argument === undefined || workflowExecutions[key].execution_argument === undefined ||
workflowExecutions[key].execution_argument === null || workflowExecutions[key].execution_argument === null ||
@@ -451,7 +451,7 @@ const ParsedAction = (props) => {
workflow.workflow_variables !== undefined && workflow.workflow_variables !== undefined &&
workflow.workflow_variables.length > 0 workflow.workflow_variables.length > 0
) { ) {
for (var key in workflow.workflow_variables) { for (let [key,keyval] in workflow.workflow_variables.entries()) {
const item = workflow.workflow_variables[key]; const item = workflow.workflow_variables[key];
actionlist.push({ actionlist.push({
type: "workflow_variable", type: "workflow_variable",
@@ -470,7 +470,7 @@ const ParsedAction = (props) => {
workflow.execution_variables !== undefined && workflow.execution_variables !== undefined &&
workflow.execution_variables.length > 0 workflow.execution_variables.length > 0
) { ) {
for (var key in workflow.execution_variables) { for (let [key,keyval] in workflow.execution_variables.entries()) {
const item = workflow.execution_variables[key]; const item = workflow.execution_variables[key];
actionlist.push({ actionlist.push({
type: "execution_variable", type: "execution_variable",
@@ -488,7 +488,7 @@ const ParsedAction = (props) => {
var parents = getParents(selectedAction); var parents = getParents(selectedAction);
if (parents.length > 1) { if (parents.length > 1) {
for (var key in parents) { for (let [key,keyval] in parents.entries()) {
const item = parents[key]; const item = parents[key];
if (item.label === "Execution Argument") { if (item.label === "Execution Argument") {
continue; continue;
@@ -500,7 +500,7 @@ const ParsedAction = (props) => {
if (workflowExecutions.length > 0) { if (workflowExecutions.length > 0) {
// Look for the ID // Look for the ID
const found = false; const found = false;
for (var key in workflowExecutions) { for (let [key,keyval] in workflowExecutions.entries()) {
if ( if (
workflowExecutions[key].results === undefined || workflowExecutions[key].results === undefined ||
workflowExecutions[key].results === null workflowExecutions[key].results === null
@@ -566,7 +566,7 @@ const ParsedAction = (props) => {
if (found !== null && found !== undefined) { if (found !== null && found !== undefined) {
var new_occurences = [] var new_occurences = []
for (var key in found) { for (let [key,keyval] in found.entries()) {
if (found[key][0] !== "\\") { if (found[key][0] !== "\\") {
new_occurences.push(found[key]) new_occurences.push(found[key])
} }
@@ -579,7 +579,7 @@ const ParsedAction = (props) => {
if (found !== null) { if (found !== null) {
try { try {
// When the found array is empty. // When the found array is empty.
for (var i = 0; i < found.length; i++) { for (let i = 0; i < found.length; i++) {
const variableSplit = found[i].split(".#") const variableSplit = found[i].split(".#")
if ((variableSplit.length-1) > 1) { if ((variableSplit.length-1) > 1) {
//console.log("Larger than 1: ", variableSplit) //console.log("Larger than 1: ", variableSplit)
@@ -589,7 +589,7 @@ const ParsedAction = (props) => {
} }
var foundSlice = false var foundSlice = false
for (var j = 0; j < actionlist.length; j++) { for (let j = 0; j < actionlist.length; j++) {
//console.log("ACTION: ", found[i], actionlist[j]) //console.log("ACTION: ", found[i], actionlist[j])
//console.log("ACTION :", found[i].split(".")[0].slice(1,).toLowerCase(), actionlist[j].autocomplete.toLowerCase()) //console.log("ACTION :", found[i].split(".")[0].slice(1,).toLowerCase(), actionlist[j].autocomplete.toLowerCase())
if(found[i].split(".")[0].slice(1,).toLowerCase() == actionlist[j].autocomplete.toLowerCase()){ if(found[i].split(".")[0].slice(1,).toLowerCase() == actionlist[j].autocomplete.toLowerCase()){
@@ -730,7 +730,7 @@ const ParsedAction = (props) => {
var curstring = ""; var curstring = "";
var record = false; var record = false;
for (var key in selectedActionParameters[count].value) { for (let [key,keyval] in selectedActionParameters[count].value.entries()) {
const item = selectedActionParameters[count].value[key]; const item = selectedActionParameters[count].value[key];
if (record) { if (record) {
curstring += item; curstring += item;
@@ -911,7 +911,7 @@ const ParsedAction = (props) => {
var curstring = "" var curstring = ""
var record = false var record = false
for (var key in selectedActionParameters[count].value) { for (let [key,keyval] in selectedActionParameters[count].value.entries()) {
const item = selectedActionParameters[count].value[key] const item = selectedActionParameters[count].value[key]
if (record) { if (record) {
curstring += item curstring += item
@@ -1187,7 +1187,7 @@ const ParsedAction = (props) => {
renderInput={(params) => { renderInput={(params) => {
if (params.inputProps !== undefined && params.inputProps !== null && params.inputProps.value !== undefined && params.inputProps.value !== null) { if (params.inputProps !== undefined && params.inputProps !== null && params.inputProps.value !== undefined && params.inputProps.value !== null) {
const prefixes = ["Post", "Put", "Patch"] const prefixes = ["Post", "Put", "Patch"]
for (var key in prefixes) { for (let [key,keyval] in prefixes.entries()) {
if (params.inputProps.value.startsWith(prefixes[key])) { if (params.inputProps.value.startsWith(prefixes[key])) {
params.inputProps.value = params.inputProps.value.replace(prefixes[key]+" ", "", -1) params.inputProps.value = params.inputProps.value.replace(prefixes[key]+" ", "", -1)
if (params.inputProps.value.length > 1) { if (params.inputProps.value.length > 1) {
@@ -1426,7 +1426,7 @@ const ParsedAction = (props) => {
setHideBody(!hideBody); setHideBody(!hideBody);
for (var key in selectedActionParameters) { for (let [key,keyval] in selectedActionParameters.entries()) {
var currentItem = selectedActionParameters[key]; var currentItem = selectedActionParameters[key];
if (currentItem.name === "ssl_verify") { if (currentItem.name === "ssl_verify") {
@@ -1472,10 +1472,10 @@ const ParsedAction = (props) => {
openApiHelperText = "OpenAPI spec: fill the following fields."; openApiHelperText = "OpenAPI spec: fill the following fields.";
//console.log("SHOULD ADD TO selectedActionParameters!: ", found, selectedActionParameters) //console.log("SHOULD ADD TO selectedActionParameters!: ", found, selectedActionParameters)
var changed = false; var changed = false;
for (var specKey in found) { for (let [specKey,specKeyVal] in found.entries()) {
const tmpitem = found[specKey]; const tmpitem = found[specKey];
var skip = false; var skip = false;
for (var innerkey in selectedActionParameters) { for (let [innerkey,innerkeyval] in selectedActionParameters.entries()) {
if (selectedActionParameters[innerkey].name === tmpitem) { if (selectedActionParameters[innerkey].name === tmpitem) {
skip = true; skip = true;
break; break;
@@ -1707,7 +1707,7 @@ const ParsedAction = (props) => {
var foundnewline = false var foundnewline = false
var allValues = [] var allValues = []
for (var key in splitdata) { for (let [key,keyval] in splitdata.entries()) {
const line = splitdata[key] const line = splitdata[key]
if (line === "") { if (line === "") {
foundnewline = true foundnewline = true
@@ -1777,7 +1777,7 @@ const ParsedAction = (props) => {
const tmpsplit = selectedActionParameters[count].value.split("\n") const tmpsplit = selectedActionParameters[count].value.split("\n")
var valsplit = [] var valsplit = []
var add_empty = false var add_empty = false
for (var key in tmpsplit) { for (let [key,keyval] in tmpsplit.entries()) {
if (tmpsplit[key] === "") { if (tmpsplit[key] === "") {
add_empty = true add_empty = true
continue continue
@@ -1792,7 +1792,7 @@ const ParsedAction = (props) => {
console.log("Split: ", valsplit) console.log("Split: ", valsplit)
var newarr = [] var newarr = []
for (var key in valsplit) { for (let [key,keyval] in valsplit.entries()) {
var line = valsplit[key] var line = valsplit[key]
if (key == index) { if (key == index) {
@@ -1832,7 +1832,7 @@ const ParsedAction = (props) => {
var tmpsplit = selectedActionParameters[count].value.split("\n") var tmpsplit = selectedActionParameters[count].value.split("\n")
var valsplit = [] var valsplit = []
var add_empty = false var add_empty = false
for (var key in tmpsplit) { for (let [key,keyval] in tmpsplit.entries()) {
if (tmpsplit[key] === "") { if (tmpsplit[key] === "") {
add_empty = true add_empty = true
continue continue
@@ -1847,7 +1847,7 @@ const ParsedAction = (props) => {
console.log("Split: ", valsplit) console.log("Split: ", valsplit)
var newarr = [] var newarr = []
for (var key in valsplit) { for (let [key,keyval] in valsplit.entries()) {
var line = valsplit[key] var line = valsplit[key]
if (key == index) { if (key == index) {
@@ -2094,7 +2094,7 @@ const ParsedAction = (props) => {
: "$" + values[0].autocomplete; : "$" + values[0].autocomplete;
toComplete = toComplete.toLowerCase().replaceAll(" ", "_"); toComplete = toComplete.toLowerCase().replaceAll(" ", "_");
for (var key in values) { for (let [key,keyval] in values.entries()) {
if (key == 0 || values[key].autocomplete.length === 0) { if (key == 0 || values[key].autocomplete.length === 0) {
continue; continue;
} }
@@ -2205,7 +2205,7 @@ const ParsedAction = (props) => {
workflow.triggers !== null && workflow.triggers !== null &&
workflow.triggers.length > 0 workflow.triggers.length > 0
) { ) {
for (var key in workflow.triggers) { for (let [key,keyval] in workflow.triggers.entries()) {
const item = workflow.triggers[key]; const item = workflow.triggers[key];
if (cy !== undefined) { if (cy !== undefined) {
@@ -2727,7 +2727,7 @@ const ParsedAction = (props) => {
if (workflowExecutions.length > 0) { if (workflowExecutions.length > 0) {
// Look for the ID // Look for the ID
const found = false; const found = false;
for (var key in workflowExecutions) { for (let [key,keyval] in workflowExecutions.entries()) {
if ( if (
workflowExecutions[key].results === undefined || workflowExecutions[key].results === undefined ||
workflowExecutions[key].results === null workflowExecutions[key].results === null
@@ -2971,8 +2971,8 @@ const ParsedAction = (props) => {
// //
// Should make it a function lol // Should make it a function lol
if (workflow.branches !== undefined && workflow.branches !== null) { if (workflow.branches !== undefined && workflow.branches !== null) {
for (var key in workflow.branches) { for (let [key,keyval] in workflow.branches.entries()) {
for (var subkey in workflow.branches[key].conditions) { for (let [subkey,subkeyval] in workflow.branches[key].conditions.entries()) {
const condition = workflow.branches[key].conditions[subkey] const condition = workflow.branches[key].conditions[subkey]
const sourceparam = condition.source const sourceparam = condition.source
const destinationparam = condition.destination const destinationparam = condition.destination
@@ -3080,12 +3080,12 @@ const ParsedAction = (props) => {
} }
} }
for (var key in workflow.actions) { for (let [key,keyval] in workflow.actions.entries()) {
if (workflow.actions[key].id === selectedAction.id) { if (workflow.actions[key].id === selectedAction.id) {
continue continue
} }
for (var subkey in workflow.actions[key].parameters) { for (let [subkey, subkeyval] in workflow.actions[key].parameters.entries()) {
const param = workflow.actions[key].parameters[subkey]; const param = workflow.actions[key].parameters[subkey];
if (!param.value.includes("$")) { if (!param.value.includes("$")) {
continue continue
@@ -3251,7 +3251,7 @@ const ParsedAction = (props) => {
selectedAction.selectedAuthentication = {}; selectedAction.selectedAuthentication = {};
selectedAction.authentication_id = ""; selectedAction.authentication_id = "";
for (var key in selectedAction.parameters) { for (let [key,keyval] in selectedAction.parameters.entries()) {
//console.log(selectedAction.parameters[key]) //console.log(selectedAction.parameters[key])
if (selectedAction.parameters[key].configuration) { if (selectedAction.parameters[key].configuration) {
selectedAction.parameters[key].value = ""; selectedAction.parameters[key].value = "";
@@ -3568,7 +3568,7 @@ const ParsedAction = (props) => {
if (method.length > 0 && data.description !== undefined && data.description !== null && data.description.includes("http")) { if (method.length > 0 && data.description !== undefined && data.description !== null && data.description.includes("http")) {
var extraUrl = "" var extraUrl = ""
const descSplit = data.description.split("\n") const descSplit = data.description.split("\n")
for (var line in descSplit) { for (let [line,lineval] in descSplit.entries()) {
if (descSplit[line].includes("http") && descSplit[line].includes("://")) { if (descSplit[line].includes("http") && descSplit[line].includes("://")) {
const urlsplit = descSplit[line].split("/") const urlsplit = descSplit[line].split("/")
try { try {
@@ -3629,7 +3629,7 @@ const ParsedAction = (props) => {
renderInput={(params) => { renderInput={(params) => {
if (params.inputProps !== undefined && params.inputProps !== null && params.inputProps.value !== undefined && params.inputProps.value !== null) { if (params.inputProps !== undefined && params.inputProps !== null && params.inputProps.value !== undefined && params.inputProps.value !== null) {
const prefixes = ["Post", "Put", "Patch"] const prefixes = ["Post", "Put", "Patch"]
for (var key in prefixes) { for (let [key,keyval] in prefixes.entries()) {
if (params.inputProps.value.startsWith(prefixes[key])) { if (params.inputProps.value.startsWith(prefixes[key])) {
params.inputProps.value = params.inputProps.value.replace(prefixes[key]+" ", "", -1) params.inputProps.value = params.inputProps.value.replace(prefixes[key]+" ", "", -1)
if (params.inputProps.value.length > 1) { if (params.inputProps.value.length > 1) {
frontend/src/views/AngularWorkflow.jsx
+448 -432
View File
File diff suppressed because it is too large Load Diff
frontend/src/views/AppCreator.jsx
+25 -25
View File
@@ -456,7 +456,7 @@ const AppCreator = (defaultprops) => {
} }
var newitem = data; var newitem = data;
for (var key in paramsplit) { for (let [key,keyval] in paramsplit.entries()) {
var tmpparam = paramsplit[key]; var tmpparam = paramsplit[key];
if (tmpparam === "#") { if (tmpparam === "#") {
continue; continue;
@@ -579,7 +579,7 @@ const AppCreator = (defaultprops) => {
console.log("Tags: ", data.tags) console.log("Tags: ", data.tags)
if (data.tags !== undefined && data.tags.length > 0) { if (data.tags !== undefined && data.tags.length > 0) {
var newtags = []; var newtags = [];
for (var key in data.tags) { for (let [key,keyval] in data.tags.entries()) {
if (data.tags[key].name.length > 50) { if (data.tags[key].name.length > 50) {
console.log( console.log(
"Skipping tag because it's too long: ", "Skipping tag because it's too long: ",
@@ -685,7 +685,7 @@ const AppCreator = (defaultprops) => {
const pathsplit = path.split("/"); const pathsplit = path.split("/");
var categoryindex = -1; var categoryindex = -1;
// Stupid way of finding a category/grouping // Stupid way of finding a category/grouping
for (var key in pathsplit) { for (let [key,keyval] in pathsplit.entries()) {
if (pathsplit[key].includes("_shuffle_replace_")) { if (pathsplit[key].includes("_shuffle_replace_")) {
const regex = /_shuffle_replace_\d/i; const regex = /_shuffle_replace_\d/i;
//console.log("NEW: ", //console.log("NEW: ",
@@ -750,9 +750,9 @@ const AppCreator = (defaultprops) => {
} }
//console.log("Data: ", data) //console.log("Data: ", data)
for (var subkey in methodvalue["requestBody"]["content"][ for (let [subkey,subkeyval] in methodvalue["requestBody"]["content"][
"application/json" "application/json"
]["schema"]["required"]) { ]["schema"]["required"].entries()) {
const tmpitem = const tmpitem =
methodvalue["requestBody"]["content"][ methodvalue["requestBody"]["content"][
"application/json" "application/json"
@@ -771,7 +771,7 @@ const AppCreator = (defaultprops) => {
); );
var newbody = {}; var newbody = {};
// Can handle default, required, description and type // Can handle default, required, description and type
for (var propkey in retRef.properties) { for (let [propkey,propkeyval] in retRef.properties.entries()) {
console.log("replace: ", propkey) console.log("replace: ", propkey)
const parsedkey = propkey.replaceAll(" ", "_").toLowerCase(); const parsedkey = propkey.replaceAll(" ", "_").toLowerCase();
@@ -810,9 +810,9 @@ const AppCreator = (defaultprops) => {
tmpobject[prop] = `\$\{${prop}\}`; tmpobject[prop] = `\$\{${prop}\}`;
} }
for (var subkey in methodvalue["requestBody"]["content"][ for (let [subkey,subkeyval] in methodvalue["requestBody"]["content"][
"application/xml" "application/xml"
]["schema"]["required"]) { ]["schema"]["required"].entries()) {
const tmpitem = const tmpitem =
methodvalue["requestBody"]["content"][ methodvalue["requestBody"]["content"][
"application/xml" "application/xml"
@@ -917,7 +917,7 @@ const AppCreator = (defaultprops) => {
parameter["type"] === "object" parameter["type"] === "object"
) { ) {
var newbody = {}; var newbody = {};
for (var propkey in parameter.properties) { for (let [propkey,propkeyval] in parameter.properties.entries()) {
console.log("propkey2: ", propkey) console.log("propkey2: ", propkey)
const parsedkey = propkey.replaceAll(" ", "_").toLowerCase(); const parsedkey = propkey.replaceAll(" ", "_").toLowerCase();
if (parameter.properties[propkey].type === undefined) { if (parameter.properties[propkey].type === undefined) {
@@ -1046,7 +1046,7 @@ const AppCreator = (defaultprops) => {
parameter["type"] === "object" parameter["type"] === "object"
) { ) {
var newbody = {}; var newbody = {};
for (var propkey in parameter.properties) { for (let [propkey,propkeyval] in parameter.properties.entries()) {
console.log("propkey3: ", propkey) console.log("propkey3: ", propkey)
const parsedkey = propkey.replaceAll(" ", "_").toLowerCase(); const parsedkey = propkey.replaceAll(" ", "_").toLowerCase();
if ( if (
@@ -1135,7 +1135,7 @@ const AppCreator = (defaultprops) => {
parameter["type"] === "object" parameter["type"] === "object"
) { ) {
var newbody = {}; var newbody = {};
for (var propkey in parameter.properties) { for (let [propkey,propkeyval] in parameter.properties.entries()) {
console.log("propkey4: ", propkey) console.log("propkey4: ", propkey)
const parsedkey = propkey.replaceAll(" ", "_").toLowerCase(); const parsedkey = propkey.replaceAll(" ", "_").toLowerCase();
if ( if (
@@ -1219,7 +1219,7 @@ const AppCreator = (defaultprops) => {
parameter["type"] === "object" parameter["type"] === "object"
) { ) {
var newbody = {}; var newbody = {};
for (var propkey in parameter.properties) { for (let [propkey,keyval] in parameter.properties.entries()) {
console.log("propkey5: ", propkey) console.log("propkey5: ", propkey)
const parsedkey = propkey const parsedkey = propkey
.replaceAll(" ", "_") .replaceAll(" ", "_")
@@ -1287,7 +1287,7 @@ const AppCreator = (defaultprops) => {
} }
} }
for (var key in methodvalue.parameters) { for (let [key,keyval] in methodvalue.parameters.entries()) {
const parameter = handleGetRef(methodvalue.parameters[key], data); const parameter = handleGetRef(methodvalue.parameters[key], data);
if (parameter.in === "query") { if (parameter.in === "query") {
var tmpaction = { var tmpaction = {
@@ -1334,7 +1334,7 @@ const AppCreator = (defaultprops) => {
if (Object.getOwnPropertyNames(wordlist).length === 0) { if (Object.getOwnPropertyNames(wordlist).length === 0) {
for (let [newpath, pathvalue] of Object.entries(data.paths)) { for (let [newpath, pathvalue] of Object.entries(data.paths)) {
const newpathsplit = newpath.split("/"); const newpathsplit = newpath.split("/");
for (var key in newpathsplit) { for (let [key,keyval] in newpathsplit.entries()) {
const pathitem = newpathsplit[key].toLowerCase(); const pathitem = newpathsplit[key].toLowerCase();
if (wordlist[pathitem] === undefined) { if (wordlist[pathitem] === undefined) {
wordlist[pathitem] = 1; wordlist[pathitem] = 1;
@@ -1351,7 +1351,7 @@ const AppCreator = (defaultprops) => {
const urlsplit = path.split("/"); const urlsplit = path.split("/");
if (urlsplit.length > 0) { if (urlsplit.length > 0) {
var curname = ""; var curname = "";
for (var key in urlsplit) { for (let [key,keyval] in urlsplit.entries()) {
var subpath = urlsplit[key]; var subpath = urlsplit[key];
if (wordlist[subpath] > 2 || subpath.length < 1) { if (wordlist[subpath] > 2 || subpath.length < 1) {
continue; continue;
@@ -1413,7 +1413,7 @@ const AppCreator = (defaultprops) => {
const regex = /{\w+}/g; const regex = /{\w+}/g;
const found = firstUrl.match(regex); const found = firstUrl.match(regex);
if (found !== null) { if (found !== null) {
for (var key in found) { for (let [key,keyval] in found.entries()) {
const item = found[key].slice(1, found[key].length - 1); const item = found[key].slice(1, found[key].length - 1);
const foundVar = data.servers[0].variables[item]; const foundVar = data.servers[0].variables[item];
if (foundVar["default"] !== undefined) { if (foundVar["default"] !== undefined) {
@@ -1683,7 +1683,7 @@ const AppCreator = (defaultprops) => {
if (newWorkflowTags.length > 0) { if (newWorkflowTags.length > 0) {
var newtags = []; var newtags = [];
for (var key in newWorkflowTags) { for (let [key,keyval] in newWorkflowTags.entries()) {
newtags.push({ name: newWorkflowTags[key] }); newtags.push({ name: newWorkflowTags[key] });
} }
@@ -1696,7 +1696,7 @@ const AppCreator = (defaultprops) => {
// Handles actions // Handles actions
var handledPaths = [] var handledPaths = []
for (var key in actions) { for (let [key,keyval] in actions.entries()) {
var item = JSON.parse(JSON.stringify(actions[key])) var item = JSON.parse(JSON.stringify(actions[key]))
if (item.errors.length > 0) { if (item.errors.length > 0) {
alert.error("Saving with error in action " + item.name); alert.error("Saving with error in action " + item.name);
@@ -1712,7 +1712,7 @@ const AppCreator = (defaultprops) => {
if (handledPaths.includes(pathjoin)) { if (handledPaths.includes(pathjoin)) {
// Max 100 of same lol // Max 100 of same lol
for (var i = 0; i < 100; i++) { for (let i = 0; i < 100; i++) {
item.url = item.url+"_shuffle_replace_"+i item.url = item.url+"_shuffle_replace_"+i
pathjoin = item.url+"_"+item.method.toLowerCase() pathjoin = item.url+"_"+item.method.toLowerCase()
@@ -1822,7 +1822,7 @@ const AppCreator = (defaultprops) => {
if (item.queries.length > 0) { if (item.queries.length > 0) {
var skipped = false; var skipped = false;
var querynames = [] var querynames = []
for (var querykey in item.queries) { for (let [querykey,querykeyval] in item.queries.entries()) {
const queryitem = item.queries[querykey]; const queryitem = item.queries[querykey];
if (queryitem === undefined || queryitem === null || queryitem.name === undefined || queryitem.name === null || queryitem.name === "") { if (queryitem === undefined || queryitem === null || queryitem.name === undefined || queryitem.name === null || queryitem.name === "") {
@@ -1923,7 +1923,7 @@ const AppCreator = (defaultprops) => {
//data.paths[item.url][item.method.toLowerCase()].parameters.push(newitem) //data.paths[item.url][item.method.toLowerCase()].parameters.push(newitem)
if (item.paths.length > 0) { if (item.paths.length > 0) {
for (querykey in item.paths) { for (let [querykey,querykeyval] in item.paths.entries()) {
const queryitem = item.paths[querykey]; const queryitem = item.paths[querykey];
if (queryitem.toLowerCase() == "url") { if (queryitem.toLowerCase() == "url") {
@@ -1958,7 +1958,7 @@ const AppCreator = (defaultprops) => {
const values = getCurrentPaths(item.url); const values = getCurrentPaths(item.url);
const paths = values[0]; const paths = values[0];
for (querykey in paths) { for (let [querykey,querykeyval] in paths.entries()) {
const queryitem = paths[querykey]; const queryitem = paths[querykey];
newitem = { newitem = {
in: "path", in: "path",
@@ -1996,7 +1996,7 @@ const AppCreator = (defaultprops) => {
// but it's the only way we can properly support e.g. GraphQL // but it's the only way we can properly support e.g. GraphQL
// with good examples // with good examples
var newbody = "" var newbody = ""
for (var key in item.body) { for (let [key,keyval] in item.body.entries()) {
if (item.body[key] === "$") { if (item.body[key] === "$") {
if (key > 0) { if (key > 0) {
//console.log("Found: ", item.body[key-1]) //console.log("Found: ", item.body[key-1])
@@ -2118,9 +2118,9 @@ const AppCreator = (defaultprops) => {
const required = false; const required = false;
const headersSplit = item.headers.split("\n"); const headersSplit = item.headers.split("\n");
for (var key in headersSplit) { for (let [key,keyval] in headersSplit.entries()) {
const header = headersSplit[key]; const header = headersSplit[key];
var key = ""; // var key = "";
var value = ""; var value = "";
if (header.length > 0 && header.includes("= ")) { if (header.length > 0 && header.includes("= ")) {
const headersplit = header.split("= "); const headersplit = header.split("= ");