fix: map server-config value for null correctly

intershop · Mar 8, 2021 · fef26d9 · fef26d9
1 parent f0c3255
commit fef26d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/app/core/models/server-config/server-config.mapper.spec.ts b/src/app/core/models/server-config/server-config.mapper.spec.ts
@@ -6,7 +6,13 @@ describe('Server Config Mapper', () => {
     it(`should return the ServerConfig when getting ServerConfigData`, () => {
       const config = ServerConfigMapper.fromData({
         data: {
-          application: { applicationType: 'intershop.B2CResponsive', id: 'application', urlIdentifier: '-' },
+          application: {
+            applicationType: 'intershop.B2CResponsive',
+            id: 'application',
+            urlIdentifier: '-',
+            // tslint:disable-next-line: no-null-keyword
+            displayName: null,
+          },
           basket: { acceleration: true, id: 'basket' },
           general: { id: 'general', locales: ['en_US', 'de_DE'] },
           services: {
@@ -22,6 +28,7 @@ describe('Server Config Mapper', () => {
         Object {
           "application": Object {
             "applicationType": "intershop.B2CResponsive",
+            "displayName": null,
             "urlIdentifier": "-",
           },
           "basket": Object {

diff --git a/src/app/core/models/server-config/server-config.mapper.ts b/src/app/core/models/server-config/server-config.mapper.ts
@@ -22,7 +22,7 @@ export class ServerConfigMapper {
       (acc, entry) => ({
         ...acc,
         [entry[0]]:
-          typeof entry[1] === 'object' && !Array.isArray(entry[1])
+          entry[1] !== null && typeof entry[1] === 'object' && !Array.isArray(entry[1])
             ? // do recursion if we find an object
               ServerConfigMapper.mapEntries(
                 // get rid of id