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

Fixed URL parsing issue in app builds

Browse Source
This commit is contained in:
frikky
2021-08-02 14:55:52 +02:00
parent 542303a766
commit c75975d7bd
6 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/go.mod
+2 -2
View File
@@ -2,7 +2,7 @@ module shuffle
go 1.13
replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
@@ -22,7 +22,7 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect
github.com/frikky/kin-openapi v0.39.0
github.com/frikky/shuffle-shared v0.0.76
github.com/frikky/shuffle-shared v0.0.78
github.com/fsouza/go-dockerclient v1.7.2
github.com/ghodss/yaml v1.0.0
github.com/go-git/go-billy/v5 v5.0.0
backend/go-app/main.go
+1 -3
View File
@@ -993,8 +993,6 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
Role: userInfo.ActiveOrg.Role,
Image: org.Image,
}
userInfo.ActiveOrg.Users = []shuffle.UserMini{}
}
userInfo.ActiveOrg.Users = []shuffle.UserMini{}
@@ -4078,7 +4076,7 @@ func runInitEs(ctx context.Context) {
for _, org := range activeOrgs {
if !org.CloudSync {
log.Printf("[WARNING] Skipping org %s because sync isn't set (1).", org.Id)
log.Printf("[WARNING] Skipping org syncCheck for %s because sync isn't set (1).", org.Id)
continue
}
docker-compose.yml
+1 -1
View File
@@ -16,7 +16,7 @@ services:
depends_on:
- backend
backend:
build: ./backend
#build: ./backend
image: ghcr.io/frikky/shuffle-backend:nightly
container_name: shuffle-backend
hostname: ${BACKEND_HOSTNAME}
frontend/src/components/Header.js
+1 -1
View File
@@ -84,10 +84,10 @@ const Header = props => {
return response.json();
}).then(function(responseJson) {
if (responseJson.success !== undefined && responseJson.success) {
alert.success("Successfully changed active organization - refreshing!")
setTimeout(() => {
window.location.reload()
}, 2000)
alert.success("Successfully changed active organization - refreshing!")
} else {
alert.error("Failed changing org: ", responseJson.reason)
}
frontend/src/views/AngularWorkflow.jsx
+1 -1
View File
@@ -3483,7 +3483,7 @@ const AngularWorkflow = (props) => {
}
const stopSchedule = (trigger, triggerindex) => {
alert.info("Stopping schedule")
//alert.info("Stopping schedule")
fetch(globalUrl+"/api/v1/workflows/"+props.match.params.key+"/schedule/"+trigger.id, {
method: 'DELETE',
headers: {
frontend/src/views/Workflows.jsx
+25 -15
View File
@@ -1067,26 +1067,36 @@ const Workflows = (props) => {
}
var parsedName = data.name
if (parsedName !== undefined && parsedName !== null && parsedName.length > 25) {
parsedName = parsedName.slice(0,26)+".."
if (parsedName !== undefined && parsedName !== null && parsedName.length > 22) {
parsedName = parsedName.slice(0,23)+".."
}
const actions = data.actions !== null ? data.actions.length : 0
const [triggers, schedules, webhooks, subflows] = getWorkflowMeta(data)
const imagesize = 22
const foundOrg = userdata.orgs.find(org => org.id === data["org_id"])
//position: "absolute", bottom: 5, right: -5,
const imageStyle = {width: imagesize, height: imagesize, pointerEvents: "none", marginRight: 10, marginLeft: data.creator_org !== undefined && data.creator_org.length > 0 ? 20 : 0, borderRadius: 10, border: foundOrg.id === userdata.active_org.id ? `4px solid ${boxColor}` : null, cursor: "pointer", marginRight: 10, }
var image = ""
var orgName = ""
var orgId = ""
if (userdata.orgs !== undefined) {
const foundOrg = userdata.orgs.find(org => org.id === data["org_id"])
if (foundOrg !== undefined && foundOrg !== null) {
//position: "absolute", bottom: 5, right: -5,
const imageStyle = {width: imagesize, height: imagesize, pointerEvents: "none", marginRight: 10, marginLeft: data.creator_org !== undefined && data.creator_org.length > 0 ? 20 : 0, borderRadius: 10, border: foundOrg.id === userdata.active_org.id ? `3px solid ${boxColor}` : null, cursor: "pointer", marginRight: 10, }
//<Tooltip title={`Org: ${foundOrg.name}`} placement="bottom">
const image = foundOrg.image === "" ?
<img alt={foundOrg.name} src={theme.palette.defaultImage} style={imageStyle} />
:
<img alt={foundOrg.name} src={foundOrg.image} style={imageStyle} onClick={() => {
//setFilteredWorkflows(newWorkflows)
}}/>
//<Tooltip title={`Org: ${foundOrg.name}`} placement="bottom">
image = foundOrg.image === "" ?
<img alt={foundOrg.name} src={theme.palette.defaultImage} style={imageStyle} />
:
<img alt={foundOrg.name} src={foundOrg.image} style={imageStyle} onClick={() => {
//setFilteredWorkflows(newWorkflows)
}}/>
orgName = foundOrg.name
orgId = foundOrg.id
}
}
return (
<Grid item xs={4} style={{padding: "12px 10px 12px 10px",}}>
@@ -1094,10 +1104,10 @@ const Workflows = (props) => {
<div style={{position: "absolute", bottom: 1, left: 1, height: 12, width: 12, backgroundColor: boxColor, borderRadius: "0 100px 0 0",}} />
<Grid item style={{display: "flex", flexDirection: "column", width: "100%"}}>
<Grid item style={{display: "flex", maxHeight: 34,}}>
<Tooltip title={`Org "${foundOrg.name}"`} placement="bottom">
<Tooltip title={`Org "${orgName}"`} placement="bottom">
<div styl={{cursor: "pointer"}} onClick={() => {
addFilter(foundOrg.id)
//setFilters(["Org "+foundOrg.name])
addFilter(orgId)
//setFilters(["Org "+orgName])
//setFilteredWorkflows(newWorkflows)
}}>
{image}