Skip to content

Fix org creation and workflow deletion issue #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LalitDeore wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix org creation and workflow deletion issue #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdac2d3
skip adding support users to other orgs
LalitDeore Apr 10, 2026
925d152
remove workflow from frontend when deleted
LalitDeore Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions db-connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6818,7 +6818,7 @@ func fixUserOrg(ctx context.Context, user *User) *User {
}
}

if !found {
if !found && !user.SupportAccess {
user.Orgs = append(user.Orgs, user.ActiveOrg.Id)
}

Expand Down Expand Up @@ -6856,8 +6856,11 @@ func fixUserOrg(ctx context.Context, user *User) *User {

if userFound {
org.Users[orgIndex] = innerUser
} else {
} else if !user.SupportAccess {
org.Users = append(org.Users, innerUser)
} else {
log.Printf("[DEBUG] Skipping org.Users update for support user %s (%s) in org %s — not an official member", user.Username, user.Id, orgId)
return
}

err = SetOrg(ctx, *org, org.Id)
Expand Down
4 changes: 1 addition & 3 deletions shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13049,7 +13049,6 @@ func HandleCreateSubOrg(resp http.ResponseWriter, request *http.Request) {
Id: orgId,
})

DeleteCache(ctx, fmt.Sprintf("%s_childorgs", parentOrg.Id))
DeleteCache(ctx, fmt.Sprintf("Organizations_%s", parentOrg.Id))

err = SetOrg(ctx, *parentOrg, parentOrg.Id)
Expand Down Expand Up @@ -13093,7 +13092,6 @@ func HandleCreateSubOrg(resp http.ResponseWriter, request *http.Request) {
newOrg.Users = append(newOrg.Users, loopUser)
}

DeleteCache(ctx, fmt.Sprintf("%s_childorgs", newOrg.Id))
err = SetOrg(ctx, newOrg, newOrg.Id)
if err != nil {
log.Printf("[WARNING] Failed setting new org %s: %s", newOrg.Id, err)
Expand Down Expand Up @@ -32659,7 +32657,7 @@ func HandleDeleteOrg(resp http.ResponseWriter, request *http.Request) {

parentOrg.ChildOrgs = newChildOrg

suborgCacheKey := fmt.Sprintf("%s_childorgs", parentOrg.Id)
suborgCacheKey := fmt.Sprintf("%s__childorgs", parentOrg.Id)
DeleteCache(ctx, suborgCacheKey)
DeleteCache(ctx, fmt.Sprintf("Organizations_%s", subOrg.Id))
parentOrg.SyncUsage.MultiTenant.Counter = int64(len(newChildOrg)) + 1
Expand Down
Loading