Merge pull request #936 from uPortal-Project/drop-duplicates-during-layout-migrate

drop duplicate fnames when migrating layout from old layout backend

Author: apetro

CHANGELOG.md

@@ -11,6 +11,9 @@ Versions in this document should match those
 
 ## Next
 
++ Drops duplicate fnames when migrating from old layout backend
+  to new layout backend.
+
 ## 14.0.1 - 2021-11-22
 
 + Built on [uPortal-app-framework 21.0.2][].

web/src/main/webapp/my-app/layout/services.js

@@ -83,12 +83,19 @@ define(['angular', 'jquery'], function(angular, $) {
                 var oldArrayOfMaps = formattedOldLayout.layout;
                 var newLayoutRepresentation = [];
 
+                // use a Set to drop subsequent duplicates when migrating
+                var fnameSet = new Set();
                 for (var i = 0; i < oldArrayOfMaps.length; i++) {
                   var fname = oldArrayOfMaps[i].fname;
                   $log.log('Object in the array is ' +
                     angular.toJson(oldArrayOfMaps[i]));
                   $log.log('fname is ' + fname);
-                  newLayoutRepresentation.push(fname);
+                  if (!fnameSet.has(fname)) {
+                    fnameSet.add(fname);
+                    newLayoutRepresentation.push(fname);
+                  } else {
+                    $log.log('Dropped duplicate fname ' + fname);
+                  }
                 }
 
                 $log.log('persistAndUse: ' +