Merge branch 'main' of github.com:masastack/MASA.DCC

masastack · Jul 13, 2023 · 86aa5bf · 86aa5bf
2 parents 851c66e + 387510c
commit 86aa5bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/ProjectList.razor.cs b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/ProjectList.razor.cs
@@ -27,7 +27,7 @@ public partial class ProjectList
         public EventCallback<int> FetchProjectCount { get; set; }
 
         [Parameter]
-        public string Environment { get; set; } = string.Empty;
+        public IMultiEnvironmentUserContext MultiEnvironmentUserContext { get; set; } = default!;
 
         [Inject]
         public ProjectCaller ProjectCaller { get; set; } = default!;
@@ -91,7 +91,7 @@ public async Task InitDataAsync()
                 _projects = await ProjectCaller.GetListByTeamIdAsync(new List<Guid> { TeamId });
             }
 
-            _allTeams = await AuthClient.TeamService.GetAllAsync(Environment);
+            _allTeams = await AuthClient.TeamService.GetAllAsync(MultiEnvironmentUserContext.Environment ?? "");
             _backupProjects = new List<ProjectModel>(_projects.ToArray());
             var projectIds = _projects.Select(p => p.Id).ToList();
             _apps = await GetAppByProjectIdAsync(projectIds);

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.cs b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.cs
@@ -10,6 +10,7 @@
 global using FluentValidation;
 global using Mapster;
 global using Masa.Blazor;
+global using Masa.BuildingBlocks.Authentication.Identity;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
 global using Masa.BuildingBlocks.StackSdks.Pm.Model;