Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions client/Packages/com.beamable/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Fixed

- Fixed the Content window Snapshot tab hanging at "Loading snapshots" when snapshots in different realm folders share a name (e.g. `LastPublished-global.json` auto snapshots from publishing to multiple realms)

## [5.1.1] - 2026-06-29

### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -598,13 +598,27 @@ private async Task CacheSnapshots()
_selectedSnapshotsPaths.Clear();
_snapshotSearchData = new SearchData();
_gatheringSnapshots = true;
var snapshotListResult = await _contentService.GetContentSnapshots();
_sharedSnapshots = snapshotListResult.SharedSnapshots.ToDictionary(item => item.Name, item => item);
_localSnapshots = snapshotListResult.LocalSnapshots.ToDictionary(item => item.Name, item => item);
_allSnapshots.Clear();
_localSnapshots.Values.ToList().ForEach(snapshot => _allSnapshots.Add(snapshot.Path, snapshot));
_sharedSnapshots.Values.ToList().ForEach(snapshot => _allSnapshots.Add(snapshot.Path, snapshot));
_gatheringSnapshots = false;
try
{
var snapshotListResult = await _contentService.GetContentSnapshots();
_sharedSnapshots = BuildSnapshotLookup(snapshotListResult.SharedSnapshots);
_localSnapshots = BuildSnapshotLookup(snapshotListResult.LocalSnapshots);
_allSnapshots.Clear();
_localSnapshots.Values.ToList().ForEach(snapshot => _allSnapshots.Add(snapshot.Path, snapshot));
_sharedSnapshots.Values.ToList().ForEach(snapshot => _allSnapshots.Add(snapshot.Path, snapshot));
}
finally
{
// Always clear the flag, otherwise the window is stuck on "Loading snapshots".
_gatheringSnapshots = false;
}
}

// Snapshots in different realm folders can share a file name (auto snapshots are
// always named "LastPublished-<manifestId>"), so the lookup must key by path.
public static Dictionary<string, BeamManifestSnapshotItem> BuildSnapshotLookup(IEnumerable<BeamManifestSnapshotItem> snapshots)
{
return snapshots.ToDictionary(item => item.Path, item => item);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
using Beamable.Editor.BeamCli.Commands;
using Beamable.Editor.UI.ContentWindow;
using NUnit.Framework;
using System.Linq;

namespace Beamable.Editor.Tests
{
public class ContentWindowSnapshotTests
{
private static BeamManifestSnapshotItem Snapshot(string name, string path)
{
return new BeamManifestSnapshotItem { Name = name, Path = path };
}

[Test]
public void BuildSnapshotLookup_DuplicateNamesAcrossRealms_KeepsAllSnapshots()
{
// Auto snapshots share the name "LastPublished-<manifestId>" across realm folders.
var snapshots = new[]
{
Snapshot("LastPublished-global", ".beamable/content-snapshots/DE_111/LastPublished-global.json"),
Snapshot("LastPublished-global", ".beamable/content-snapshots/DE_222/LastPublished-global.json"),
};

var lookup = ContentWindow.BuildSnapshotLookup(snapshots);

Assert.AreEqual(2, lookup.Count);
CollectionAssert.AreEquivalent(snapshots.Select(item => item.Path), lookup.Keys);
}

[Test]
public void BuildSnapshotLookup_KeysByPath()
{
var snapshots = new[]
{
Snapshot("my-snapshot", ".beamable/content-snapshots/DE_111/my-snapshot.json"),
Snapshot("other-snapshot", ".beamable/temp/content-snapshots/DE_111/other-snapshot.json"),
};

var lookup = ContentWindow.BuildSnapshotLookup(snapshots);

Assert.AreSame(snapshots[0], lookup[snapshots[0].Path]);
Assert.AreSame(snapshots[1], lookup[snapshots[1].Path]);
}

[Test]
public void BuildSnapshotLookup_EmptyInput_ReturnsEmptyLookup()
{
var lookup = ContentWindow.BuildSnapshotLookup(System.Array.Empty<BeamManifestSnapshotItem>());

Assert.AreEqual(0, lookup.Count);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading