Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix reseting instance categories/languages

Chocobozzzf74f6e5dcf85
diff --git a/client/src/app/shared/shared-admin/admin-config.service.ts b/client/src/app/shared/shared-admin/admin-config.service.ts
index 922bc5d137..363e42e870 100644
--- a/client/src/app/shared/shared-admin/admin-config.service.ts
+++ b/client/src/app/shared/shared-admin/admin-config.service.ts
@@ -6,7 +6,7 @@ import { formatICU } from '@app/helpers'
import { BuildFormValidator } from '@app/shared/form-validators/form-validator.model'
import { CustomConfig } from '@peertube/peertube-models'
import { DeepPartial } from '@peertube/peertube-typescript-utils'
-import merge from 'lodash-es/merge'
+import mergeWith from 'lodash-es/mergeWith'
import { catchError, map, switchMap } from 'rxjs/operators'
import { environment } from '../../../environments/environment'
import { SelectOptionsItem } from '../../../types/select-options-item.model'
@@ -106,7 +106,12 @@ export class AdminConfigService {
return this.getCustomConfig()
.pipe(
switchMap(customConfig => {
- const newConfig = merge(customConfig, partialConfig)
+ const newConfig = mergeWith(customConfig, partialConfig, (objValue, srcValue) => {
+ // We want to replace arrays, not merge them
+ if (Array.isArray(srcValue)) return srcValue
+
+ return undefined
+ })
return this.authHttp.put<CustomConfig>(AdminConfigService.BASE_APPLICATION_URL + '/custom', newConfig)
.pipe(map(() => newConfig))