Skip to content
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

Reverted change to model merging during update #1474

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Reverted change to model merging during update #1474

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
3 changes: 2 additions & 1 deletion backend/src/services/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Validator } from 'jsonschema'
import _ from 'lodash'

import authentication from '../connectors/authentication/index.js'
import { ModelAction, ModelActionKeys } from '../connectors/authorisation/actions.js'
Expand Down Expand Up @@ -320,7 +321,7 @@ export async function updateModel(user: UserInterface, modelId: string, modelDif
throw Forbidden(auth.info, { userDn: user.dn })
}

Object.assign(model, modelDiff)
_.mergeWith(model, modelDiff, (a, b) => (_.isArray(b) ? b : undefined))
await model.save()

return model
Expand Down
Loading