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

Bugfixes for workflows and executions

Browse Source
This commit is contained in:
frikky
2021-04-13 21:52:32 +02:00
parent 8648daa95b
commit 033124b6ec
7 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/ConfigureWorkflow.jsx
+1 -1
View File
@@ -81,7 +81,7 @@ const Workflow = (props) => {
"app": {},
}
const app = apps.find(app => app.name === action.app_name && (app.app_version === action.app_version || app.loop_versions.includes(action.app_version)))
const app = apps.find(app => app.name === action.app_name && (app.app_version === action.app_version || (app.loop_versions !== null && app.loop_versions.includes(action.app_version))))
if (app === undefined || app === null) {
console.log("App not found!")
frontend/src/views/Admin.jsx
+1 -1
View File
@@ -1111,7 +1111,7 @@ const Admin = (props) => {
const generateApikey = (user) => {
const userId = isCloud ? user.username : user.id
const userId = user.id
const data = { "user_id": userId }
fetch(globalUrl + "/api/v1/generateapikey", {
frontend/src/views/AngularWorkflow.jsx
+1 -2
View File
@@ -1326,8 +1326,7 @@ const AngularWorkflow = (props) => {
return
}
//console.log(apps)
const curapp = apps.find(a => a.name === curaction.app_name && (a.app_version === curaction.app_version || a.loop_versions.includes(curaction.app_version)))
const curapp = apps.find(a => a.name === curaction.app_name && ((a.app_version === curaction.app_version || (a.loop_versions !== null && a.loop_versions.includes(curaction.app_version)))))
if (!curapp || curapp === undefined) {
alert.error(`App ${curaction.app_name}:${curaction.app_version} not found. Is it activated?`)
frontend/src/views/Apps.jsx
+2 -2
View File
@@ -1461,7 +1461,7 @@ const Apps = (props) => {
style={{backgroundColor: inputColor}}
variant="outlined"
margin="normal"
defaultValue={userdata.active_org.defaults.app_download_repo !== undefined && userdata.active_org.defaults.app_download_repo.length > 0 ? userdata.active_org.defaults.app_download_repo : "https://github.com/frikky/shuffle-apps"}
defaultValue={"https://github.com/frikky/shuffle-apps"}
InputProps={{
style:{
color: "white",
@@ -1479,7 +1479,7 @@ const Apps = (props) => {
style={{backgroundColor: inputColor}}
variant="outlined"
margin="normal"
defaultValue={userdata.active_org.defaults.app_download_branch !== undefined && userdata.active_org.defaults.app_download_branch.length > 0 ? userdata.active_org.defaults.app_download_branch : downloadBranch}
defaultValue={downloadBranch}
InputProps={{
style:{
color: "white",
frontend/src/views/Workflows.jsx
+2 -2
View File
@@ -1802,7 +1802,7 @@ const Workflows = (props) => {
style={{backgroundColor: inputColor}}
variant="outlined"
margin="normal"
defaultValue={userdata.active_org.defaults.workflow_download_repo !== undefined && userdata.active_org.defaults.workflow_download_repo.length > 0 ? userdata.active_org.defaults.workflow_download_repo : downloadUrl}
defaultValue={downloadUrl}
InputProps={{
style:{
color: "white",
@@ -1821,7 +1821,7 @@ const Workflows = (props) => {
style={{backgroundColor: inputColor}}
variant="outlined"
margin="normal"
defaultValue={userdata.active_org.defaults.workflow_download_branch !== undefined && userdata.active_org.defaults.workflow_download_branch.length > 0 ? userdata.active_org.defaults.workflow_download_branch : downloadBranch}
defaultValue={downloadBranch}
InputProps={{
style:{
color: "white",