Skip to content

Commit 6eff0e8

Browse files
committed
6871: Applied coding standards
1 parent 7ad6727 commit 6eff0e8

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ All notable changes to this project will be documented in this file.
2828
- Aligned environment variable names.
2929
- Aligned with v. 2.6.0.
3030
- Added relations checksum feature flag.
31+
- Fixes saving issues described in issue where saving resulted in infinite spinner.
32+
- Fixed loading of routes containing null string values.
3133

3234
### NB! Prior to 3.x the project was split into separate repositories
3335

assets/admin/components/screen/screen-manager.jsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,16 @@ function ScreenManager({
161161
function mapPlaylistsWithRegion(playlists, regions) {
162162
const returnArray = [];
163163
const regionIds = regions.map((r) =>
164-
typeof r === "string" ? idFromUrl(r, 1) : idFromUrl(r["@id"])
164+
typeof r === "string" ? idFromUrl(r, 1) : idFromUrl(r["@id"]),
165165
);
166166

167167
// The playlists all have a regionId, the following creates a unique list of relevant regions If there are not
168168
// playlists, then an empty playlist is to be saved per region
169169
let playlistRegions = [];
170170
if (playlists?.length > 0) {
171-
playlistRegions = [...new Set(playlists.map(({ region }) => idFromUrl(region)))];
171+
playlistRegions = [
172+
...new Set(playlists.map(({ region }) => idFromUrl(region))),
173+
];
172174
}
173175

174176
// Then the playlists are mapped by region Looping through the regions that have a playlist connected...
@@ -244,7 +246,10 @@ function ScreenManager({
244246
resolution: getResolution(localFormStateObject),
245247
groups: mapGroups(localFormStateObject),
246248
orientation: getOrientation(localFormStateObject),
247-
regions: mapPlaylistsWithRegion(localFormStateObject.playlists, localFormStateObject.regions),
249+
regions: mapPlaylistsWithRegion(
250+
localFormStateObject.playlists,
251+
localFormStateObject.regions,
252+
),
248253
}),
249254
};
250255

0 commit comments

Comments
 (0)