Skip to content

Commit

Permalink
fix: update used current teamid
Browse files Browse the repository at this point in the history
  • Loading branch information
Qinyouzeng committed Jan 6, 2025
1 parent 9e028b4 commit 71e5efc
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/Apm/Endpoint.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private async Task LoadPageDataAsync()
StatusCode = Search.Status,
//Queries = Search.Text
};
var result = await ApiCaller.ApmService.GetEndpointPageAsync(CurrentTeamId, query, Search.Project, Search.ServiceType);
var result = await ApiCaller.ApmService.GetEndpointPageAsync(GlobalConfig.CurrentTeamId, query, Search.Project, Search.ServiceType);
data.Clear();
total = 0;
if (result != null && result.Result != null && result.Result.Any())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private async Task LoadLogAysnc()
var message = list.Find(item => item.Name == StorageConst.Current.ExceptionMessage)!;
message.Name = StorageConst.Current.Log.Body;
}
var result = await ApiCaller.ApmService.GetLogListAsync(CurrentTeamId, query, Search.Project, Search.ServiceType, ignoreTeam: !string.IsNullOrEmpty(Search.TraceId) || string.IsNullOrEmpty(Search.Service));
var result = await ApiCaller.ApmService.GetLogListAsync(GlobalConfig.CurrentTeamId, query, Search.Project, Search.ServiceType, ignoreTeam: !string.IsNullOrEmpty(Search.TraceId) || string.IsNullOrEmpty(Search.Service));
if (result != null)
{
if (currentPage == 1)
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/Apm/Errors.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private async Task LoadPageDataAsync()
TextValue = Search.TextValue,
Filter = Search.EnableExceptError
};
var result = await ApiCaller.ApmService.GetErrorsPageAsync(CurrentTeamId, query, Search.Project, Search.ServiceType);
var result = await ApiCaller.ApmService.GetErrorsPageAsync(GlobalConfig.CurrentTeamId, query, Search.Project, Search.ServiceType);
data.Clear();
total = 0;
if (result != null)
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/Apm/Logs.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private async Task LoadPageDataAsync()
list.Add(new FieldConditionDto { Name = nameof(ApmErrorRequestDto.Filter), Value = true, Type = ConditionTypes.Equal });

query.Conditions = list;
var result = await ApiCaller.ApmService.GetLogListAsync(CurrentTeamId, query, Search.Project, Search.ServiceType);
var result = await ApiCaller.ApmService.GetLogListAsync(GlobalConfig.CurrentTeamId, query, Search.Project, Search.ServiceType);
data.Clear();
total = 0;
if (result != null)
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/Apm/Service.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private async Task LoadPageDataAsync()
IsDesc = sortBy,
ComparisonType = Search.ComparisonType.ToComparisonType(),
};
var result = await ApiCaller.ApmService.GetServicePageAsync(CurrentTeamId, query, Search.Project, Search.ServiceType);
var result = await ApiCaller.ApmService.GetServicePageAsync(GlobalConfig.CurrentTeamId, query, Search.Project, Search.ServiceType);
data.Clear();
total = 0;
if (result != null && result.Result != null && result.Result.Any())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private async Task LoadPageDataAsync()
Env = SearchData.Environment,
IsDesc = sortBy
};
var result = await ApiCaller.ApmService.GetEndpointPageAsync(CurrentTeamId, query, Search.Project, Search.ServiceType);
var result = await ApiCaller.ApmService.GetEndpointPageAsync(GlobalConfig.CurrentTeamId, query, Search.Project, Search.ServiceType);
data.Clear();
total = 0;
if (result != null && result.Result != null && result.Result.Any())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ private async Task LoadPageDataAsync()
TextValue = lastSpanId,
Filter = SearchData.EnableExceptError
};
var result = await ApiCaller.ApmService.GetErrorsPageAsync(CurrentTeamId, query, SearchData.Project, SearchData.ServiceType, string.IsNullOrEmpty(SearchData.Service));
var result = await ApiCaller.ApmService.GetErrorsPageAsync(GlobalConfig.CurrentTeamId, query, SearchData.Project, SearchData.ServiceType, string.IsNullOrEmpty(SearchData.Service));
data = result?.Result?.ToList() ?? new();
total = (int)(result?.Total ?? 0);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private async Task LoadPageDataAsync()
if (Search.EnableExceptError)
list.Add(new FieldConditionDto { Name = nameof(ApmErrorRequestDto.Filter), Value = true, Type = ConditionTypes.Equal });
query.Conditions = list;
var result = await ApiCaller.ApmService.GetLogListAsync(CurrentTeamId, query, SearchData.Project, SearchData.ServiceType, string.IsNullOrEmpty(SearchData.Service));
var result = await ApiCaller.ApmService.GetLogListAsync(GlobalConfig.CurrentTeamId, query, SearchData.Project, SearchData.ServiceType, string.IsNullOrEmpty(SearchData.Service));
data.Clear();
total = 0;
if (result != null)
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/App/Index.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ private async Task LoadService()
services = new();
return;
}
_teamServices = await ApiCaller.ApmService.GetEnvironmentServiceAsync(CurrentTeamId, Search.Start, Search.End, ignoreTeam: true) ?? new();
_teamServices = await ApiCaller.ApmService.GetEnvironmentServiceAsync(GlobalConfig.CurrentTeamId, Search.Start, Search.End, ignoreTeam: true) ?? new();
if (_teamServices != null && _teamServices.Count > 0)
{
foreach (var service in data)
Expand Down

0 comments on commit 71e5efc

Please sign in to comment.