Skip to content

Commit f1c53f0

Browse files
fix: reenable saturation and value slider in backpack. (#7192)
* fix: reenable saturation and value slider in backpack. fix: use feature flag also for the processing of the color * fix: update color processing * tests: added feature flag initialization to failing tests
1 parent 86d48f8 commit f1c53f0

11 files changed

Lines changed: 212 additions & 75 deletions

Explorer/Assets/DCL/Character/CharacterObject/Tests/CharacterTransformDirtyFlagShould.cs

Lines changed: 88 additions & 71 deletions
Large diffs are not rendered by default.

Explorer/Assets/DCL/Multiplayer/SDK/Tests/PlayerCRDTEntitiesHandlerSystemShould.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
using DCL.AvatarRendering.Emotes;
44
using DCL.Character;
55
using DCL.Character.Components;
6+
using DCL.FeatureFlags;
67
using DCL.Multiplayer.SDK.Components;
78
using DCL.Multiplayer.SDK.Systems.GlobalWorld;
89
using DCL.PluginSystem.World;
910
using DCL.Profiles;
1011
using ECS.LifeCycle.Components;
1112
using ECS.SceneLifeCycle;
1213
using ECS.TestSuite;
14+
using Global.AppArgs;
1315
using NSubstitute;
1416
using NUnit.Framework;
1517
using SceneRunner.Scene;
@@ -31,6 +33,21 @@ public class PlayerCRDTEntitiesHandlerSystemShould : UnitySystemTestBase<PlayerC
3133
private ISceneFacade scene1Facade;
3234
private ISceneFacade scene2Facade;
3335

36+
[OneTimeSetUp]
37+
public void InitFF()
38+
{
39+
var appArgs = new ApplicationParametersParser();
40+
FeatureFlagsConfiguration.Initialize(new FeatureFlagsConfiguration(FeatureFlagsResultDto.Empty));
41+
FeaturesRegistry.Initialize(new FeaturesRegistry(appArgs, false));
42+
}
43+
44+
[OneTimeTearDown]
45+
public void ResetFF()
46+
{
47+
FeaturesRegistry.Reset();
48+
FeatureFlagsConfiguration.Reset();
49+
}
50+
3451
[SetUp]
3552
public void Setup()
3653
{

Explorer/Assets/DCL/Multiplayer/SDK/Tests/PlayerProfileDataPropagationSystemShould.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using Arch.Core;
22
using CRDT;
33
using CrdtEcsBridge.Components;
4+
using DCL.FeatureFlags;
45
using DCL.Multiplayer.SDK.Components;
56
using DCL.Multiplayer.SDK.Systems.GlobalWorld;
67
using DCL.Optimization.Pools;
78
using DCL.PluginSystem.World;
89
using DCL.Profiles;
910
using ECS.TestSuite;
11+
using Global.AppArgs;
1012
using NSubstitute;
1113
using NUnit.Framework;
1214
using SceneRunner.Scene;
@@ -27,6 +29,21 @@ public class PlayerProfileDataPropagationSystemShould : UnitySystemTestBase<Play
2729
private PlayerCRDTEntity playerCRDTEntity;
2830
private CharacterDataPropagationUtility characterDataPropagationUtility;
2931

32+
[OneTimeSetUp]
33+
public void InitFF()
34+
{
35+
var appArgs = new ApplicationParametersParser();
36+
FeatureFlagsConfiguration.Initialize(new FeatureFlagsConfiguration(FeatureFlagsResultDto.Empty));
37+
FeaturesRegistry.Initialize(new FeaturesRegistry(appArgs, false));
38+
}
39+
40+
[OneTimeTearDown]
41+
public void ResetFF()
42+
{
43+
FeatureFlagsConfiguration.Reset();
44+
FeaturesRegistry.Reset();
45+
}
46+
3047
[SetUp]
3148
public void Setup()
3249
{

Explorer/Assets/DCL/Multiplayer/SDK/Tests/WriteAvatarEquippedDataSystemShould.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
using DCL.AvatarRendering.Loading.Components;
55
using DCL.AvatarRendering.Wearables.Helpers;
66
using DCL.ECSComponents;
7+
using DCL.FeatureFlags;
78
using DCL.Multiplayer.SDK.Components;
89
using DCL.Profiles;
910
using ECS.LifeCycle.Components;
1011
using ECS.TestSuite;
12+
using Global.AppArgs;
1113
using NSubstitute;
1214
using NUnit.Framework;
1315
using System;
@@ -31,6 +33,21 @@ private Avatar CreateTestAvatar() =>
3133
WearablesConstants.DefaultColors.GetRandomHairColor(),
3234
WearablesConstants.DefaultColors.GetRandomSkinColor());
3335

36+
[OneTimeSetUp]
37+
public void InitFF()
38+
{
39+
var appArgs = new ApplicationParametersParser();
40+
FeatureFlagsConfiguration.Initialize(new FeatureFlagsConfiguration(FeatureFlagsResultDto.Empty));
41+
FeaturesRegistry.Initialize(new FeaturesRegistry(appArgs, false));
42+
}
43+
44+
[OneTimeTearDown]
45+
public void ResetFF()
46+
{
47+
FeaturesRegistry.Reset();
48+
FeatureFlagsConfiguration.Reset();
49+
}
50+
3451
[SetUp]
3552
public void Setup()
3653
{

Explorer/Assets/DCL/Multiplayer/SDK/Tests/WritePlayerIdentityDataSystemShould.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
using CrdtEcsBridge.Components;
33
using CrdtEcsBridge.ECSToCRDTWriter;
44
using DCL.ECSComponents;
5+
using DCL.FeatureFlags;
56
using DCL.Multiplayer.SDK.Components;
67
using DCL.Profiles;
78
using ECS.LifeCycle.Components;
89
using ECS.TestSuite;
10+
using Global.AppArgs;
911
using NSubstitute;
1012
using NUnit.Framework;
1113
using SceneRunner.Scene;
@@ -23,6 +25,21 @@ public class WritePlayerIdentityDataSystemShould : UnitySystemTestBase<WritePlay
2325
private SDKProfile profile;
2426
private PlayerSceneCRDTEntity playerCRDTEntity;
2527

28+
[OneTimeSetUp]
29+
public void InitFF()
30+
{
31+
var appArgs = new ApplicationParametersParser();
32+
FeatureFlagsConfiguration.Initialize(new FeatureFlagsConfiguration(FeatureFlagsResultDto.Empty));
33+
FeaturesRegistry.Initialize(new FeaturesRegistry(appArgs, false));
34+
}
35+
36+
[OneTimeTearDown]
37+
public void ResetFF()
38+
{
39+
FeaturesRegistry.Reset();
40+
FeatureFlagsConfiguration.Reset();
41+
}
42+
2643
[SetUp]
2744
public void Setup()
2845
{

Explorer/Assets/DCL/Multiplayer/SDK/Tests/WriteSDKAvatarBaseSystemShould.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
using CrdtEcsBridge.Components;
33
using CrdtEcsBridge.ECSToCRDTWriter;
44
using DCL.ECSComponents;
5+
using DCL.FeatureFlags;
56
using DCL.Multiplayer.SDK.Components;
67
using DCL.Profiles;
78
using ECS.LifeCycle.Components;
89
using ECS.TestSuite;
10+
using Global.AppArgs;
911
using NSubstitute;
1012
using NUnit.Framework;
1113
using System;
@@ -22,6 +24,21 @@ public class WriteSDKAvatarBaseSystemShould : UnitySystemTestBase<WriteSDKAvatar
2224
private SDKProfile profile;
2325
private PlayerSceneCRDTEntity playerCRDTEntity;
2426

27+
[OneTimeSetUp]
28+
public void InitFF()
29+
{
30+
var appArgs = new ApplicationParametersParser();
31+
FeatureFlagsConfiguration.Initialize(new FeatureFlagsConfiguration(FeatureFlagsResultDto.Empty));
32+
FeaturesRegistry.Initialize(new FeaturesRegistry(appArgs, false));
33+
}
34+
35+
[OneTimeTearDown]
36+
public void ResetFF()
37+
{
38+
FeaturesRegistry.Reset();
39+
FeatureFlagsConfiguration.Reset();
40+
}
41+
2542
[SetUp]
2643
public void Setup()
2744
{

Explorer/Assets/DCL/Passport/PassportController.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ private enum OpenBadgeSectionOrigin
147147
private GenericContextMenuElement contextMenuBlockUserButton;
148148
private CommunityInvitationContextMenuButtonHandler invitationButtonHandler;
149149
private NameColorPickerController? colorPickerController;
150-
private Color? userNameColorToSave;
151150

152151
private UniTaskCompletionSource? contextMenuCloseTask;
153152
private UniTaskCompletionSource? passportCloseTask;
@@ -648,7 +647,6 @@ private async UniTaskVoid LoadPassportSectionAsync(string userId, PassportSectio
648647

649648
private void SetNewUserNameColor(Color color)
650649
{
651-
userNameColorToSave = color;
652650
UpdateBackgroundColor(color);
653651
UpdateUserNameTextColor(color);
654652
}

Explorer/Assets/DCL/Profiles/SharedAPI/Profile.CompactInfo.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using CommunicationData.URLHelpers;
22
using DCL.Diagnostics;
3+
using DCL.FeatureFlags;
34
using DCL.Utilities;
45
using DCL.Web3;
56
using ECS.StreamableLoading.Common.Components;
@@ -131,7 +132,7 @@ public Color? ClaimedNameColor
131132
}
132133

133134
claimedNameColor = value;
134-
if (value != null)
135+
if (FeaturesRegistry.Instance.IsEnabled(FeatureId.NAME_COLOR_CHANGE) && value is { a: > 0 })
135136
UserNameColor = value.Value;
136137
}
137138
}
@@ -261,7 +262,7 @@ private void GenerateAndValidateName()
261262
MentionName = new string(mentionBuffer);
262263
}
263264

264-
if (claimedNameColor.HasValue)
265+
if (FeaturesRegistry.Instance.IsEnabled(FeatureId.NAME_COLOR_CHANGE) && claimedNameColor is { a: > 0 })
265266
UserNameColor = claimedNameColor.Value;
266267
else
267268
UserNameColor = NameColorHelper.GetNameColor(DisplayName);

Explorer/Assets/DCL/Profiles/Tests/RealmProfileRepositoryShould.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
using Cysharp.Threading.Tasks;
33
using DCL.AvatarRendering.Loading.Components;
44
using DCL.DebugUtilities;
5+
using DCL.FeatureFlags;
56
using DCL.Ipfs;
67
using DCL.Multiplayer.Connections.DecentralandUrls;
78
using DCL.PerformanceAndDiagnostics.Analytics;
89
using DCL.Web3.Identities;
910
using DCL.WebRequests;
1011
using ECS;
12+
using Global.AppArgs;
1113
using Newtonsoft.Json;
1214
using NSubstitute;
1315
using NUnit.Framework;
@@ -35,6 +37,21 @@ public class RealmProfileRepositoryShould
3537
// 19 profiles
3638
private List<Profile> dtos;
3739

40+
[OneTimeSetUp]
41+
public void InitFF()
42+
{
43+
var appArgs = new ApplicationParametersParser();
44+
FeatureFlagsConfiguration.Initialize(new FeatureFlagsConfiguration(FeatureFlagsResultDto.Empty));
45+
FeaturesRegistry.Initialize(new FeaturesRegistry(appArgs, false));
46+
}
47+
48+
[OneTimeTearDown]
49+
public void ResetFF()
50+
{
51+
FeatureFlagsConfiguration.Reset();
52+
FeaturesRegistry.Reset();
53+
}
54+
3855
[SetUp]
3956
public void SetUp()
4057
{

Explorer/Assets/DCL/SDKComponents/AvatarModifierArea/Tests/AvatarModifierAreaHandlerSystemShould.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using DCL.AvatarRendering.Wearables.Helpers;
66
using DCL.SDKEntityTriggerArea.Components;
77
using DCL.ECSComponents;
8+
using DCL.FeatureFlags;
89
using DCL.Profiles;
910
using DCL.SceneRestrictionBusController.SceneRestrictionBus;
1011
using DCL.SDKComponents.AvatarModifierArea.Components;
@@ -14,6 +15,7 @@
1415
using ECS.Prioritization.Components;
1516
using ECS.TestSuite;
1617
using ECS.Unity.Transforms.Components;
18+
using Global.AppArgs;
1719
using NSubstitute;
1820
using NUnit.Framework;
1921
using System.Collections.Generic;
@@ -36,6 +38,21 @@ public class AvatarModifierAreaHandlerSystemShould : UnitySystemTestBase<AvatarM
3638
private GameObject fakeTriggerAreaGO;
3739
private SDKEntityTriggerArea.SDKEntityTriggerArea sdkEntityTriggerArea;
3840

41+
[OneTimeSetUp]
42+
public void InitFF()
43+
{
44+
var appArgs = new ApplicationParametersParser();
45+
FeatureFlagsConfiguration.Initialize(new FeatureFlagsConfiguration(FeatureFlagsResultDto.Empty));
46+
FeaturesRegistry.Initialize(new FeaturesRegistry(appArgs, false));
47+
}
48+
49+
[OneTimeTearDown]
50+
public void ResetFF()
51+
{
52+
FeaturesRegistry.Reset();
53+
FeatureFlagsConfiguration.Reset();
54+
}
55+
3956
[SetUp]
4057
public void Setup()
4158
{

0 commit comments

Comments
 (0)