fix(POPUP): merge tile defaults when passing newly created tile object (#555)

We've overlooked the fact that user can pass a newly created tile object
to $scope.showPopup() in which case the tile defaults were not merged.

Explicitly merge defaults from the showPopup() call but avoid doing it
multiple times for tiles that have already had defaults merged by
checking a special cache key.

Fixes #553

Author: rchl

scripts/controllers/main-utilities.js

@@ -1,6 +1,8 @@
 import mergeWith from 'lodash.mergewith';
 import { TILE_DEFAULTS, TYPES } from '../globals/constants';
 
+const MERGED_DEFAULTS_KEY = '__merged_defaults';
+
 export function mergeConfigDefaults (pages) {
    for (const page of pages) {
       for (const group of page.groups) {
@@ -15,37 +17,47 @@ function mergeTileListDefaults (tiles) {
       return;
    }
    for (const [index, tile] of tiles.entries()) {
-      const mergedTile = mergeTileDefaults(tile);
-      tiles[index] = mergedTile;
-      switch (mergedTile.type) {
-         case TYPES.CAMERA:
-         case TYPES.CAMERA_STREAM:
-         case TYPES.CAMERA_THUMBNAIL:
-            if (mergedTile.type === TYPES.CAMERA_THUMBNAIL) {
-               console.warn('The CAMERA_THUMBNAIL tile is deprecated. Please replace it with the CAMERA tile. Tile: ', tile);
-               mergedTile.type = TYPES.CAMERA;
-            }
-            mergedTile.fullscreen = mergeTileDefaults(mergedTile.fullscreen);
-            break;
-         case TYPES.DOOR_ENTRY:
-            if (mergedTile.layout?.camera) {
-               mergedTile.layout.camera = mergeTileDefaults(mergedTile.layout.camera);
-            }
-            mergeTileListDefaults(mergedTile.layout?.tiles);
-            break;
-         case TYPES.POPUP:
-            mergeTileListDefaults(mergedTile.popup?.items);
-            break;
-      }
+      tiles[index] = mergeTileDefaults(tile);
    }
    return tiles;
 }
 
-function mergeTileDefaults (tile) {
-   if (tile && tile.type in TILE_DEFAULTS) {
-      return mergeTileConfigs({}, TILE_DEFAULTS[tile.type], tile);
+export function mergeTileDefaults (tile) {
+   if (tile[MERGED_DEFAULTS_KEY]) {
+      return tile;
+   }
+   let mergedTile = tile;
+   if (mergedTile && mergedTile.type in TILE_DEFAULTS) {
+      mergedTile = mergeTileConfigs({}, TILE_DEFAULTS[mergedTile.type], mergedTile);
+   }
+   switch (mergedTile.type) {
+      case TYPES.CAMERA:
+      case TYPES.CAMERA_STREAM:
+      case TYPES.CAMERA_THUMBNAIL:
+         if (mergedTile.type === TYPES.CAMERA_THUMBNAIL) {
+            console.warn('The CAMERA_THUMBNAIL tile is deprecated. Please replace it with the CAMERA tile. Tile: ', mergedTile);
+            mergedTile.type = TYPES.CAMERA;
+         }
+         if (mergedTile.fullscreen) {
+            mergedTile.fullscreen = mergeTileDefaults(mergedTile.fullscreen);
+         }
+         break;
+      case TYPES.DOOR_ENTRY:
+         if (mergedTile.layout?.camera) {
+            mergedTile.layout.camera = mergeTileDefaults(mergedTile.layout.camera);
+         }
+         if (mergedTile.layout?.tiles) {
+            mergeTileListDefaults(mergedTile.layout.tiles);
+         }
+         break;
+      case TYPES.POPUP:
+         if (mergedTile.popup?.items) {
+            mergeTileListDefaults(mergedTile.popup.items);
+         }
+         break;
    }
-   return tile;
+   mergedTile[MERGED_DEFAULTS_KEY] = true;
+   return mergedTile;
 }
 
 export function mergeTileConfigs (object, ...sources) {

scripts/controllers/main.js

@@ -1,6 +1,6 @@
 import angular from 'angular';
 import Hammer from 'hammerjs';
-import { mergeConfigDefaults, mergeTileConfigs } from './main-utilities';
+import { mergeConfigDefaults, mergeTileConfigs, mergeTileDefaults } from './main-utilities';
 import { App } from '../app';
 import { TYPES, FEATURES, HEADER_ITEMS, MENU_POSITIONS, GROUP_ALIGNS, TRANSITIONS, MAPBOX_MAP, YANDEX_MAP, DEFAULT_SLIDER_OPTIONS, DEFAULT_LIGHT_SLIDER_OPTIONS, DEFAULT_VOLUME_SLIDER_OPTIONS, DEFAULT_POPUP_HISTORY, DEFAULT_POPUP_IFRAME, DEFAULT_POPUP_DOOR_ENTRY } from '../globals/constants';
 import { debounce, leadZero, supportsFeature, toAbsoluteServerURL } from '../globals/utils';
@@ -1396,6 +1396,8 @@ App.controller('Main', function ($scope, $timeout, $location, Api) {
    };
 
    $scope.openPopup = function (item, entity, layout) {
+      item = mergeTileDefaults(item);
+
       if ($scope.popupTimeout) {
          clearTimeout($scope.popupTimeout);
          $scope.popupTimeout = null;