Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.

fix: updates apps on cluster, when removing all device intercepts #360

Merged
nxtcoder17 merged 1 commit into from
Aug 22, 2024
Merged

fix: updates apps on cluster, when removing all device intercepts #360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions apps/console/internal/domain/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,14 @@ func (d *domain) RemoveDeviceIntercepts(ctx ResourceContext, deviceName string)
fc.AppSpecInterceptEnabled: false,
}

_, err := d.appRepo.PatchById(ctx, apps[i].Id, patchForUpdate)
up, err := d.appRepo.PatchById(ctx, apps[i].Id, patchForUpdate)
if err != nil {
return errors.NewE(err)
}

if err := d.applyApp(ctx, up); err != nil {
return errors.NewE(err)
}
}

return nil
Expand All @@ -286,14 +290,13 @@ func (d *domain) OnAppUpdateMessage(ctx ResourceContext, app entities.App, statu
if xApp == nil {
return errors.Newf("no apps found")
}

recordVersion, err := d.MatchRecordVersion(app.Annotations, xApp.RecordVersion)
if err != nil {
return errors.NewE(err)
}

uapp, err := d.appRepo.PatchById(
ctx,
xApp.Id,
uapp, err := d.appRepo.PatchById(ctx, xApp.Id,
common.PatchForSyncFromAgent(&app, recordVersion, status, common.PatchOpts{
MessageTimestamp: opts.MessageTimestamp,
}))
Expand Down