Skip to content

Commit

Permalink
fix: icon not displaying and Masa Stack. Components Upgrade (#493)
Browse files Browse the repository at this point in the history 
* refactor: Adjusting the expression for filtering alarm query logs

* chore: Upgrade Package

* fix: icon not displaying and Masa Stack. Components Upgrade
  • Loading branch information
@wzh425
wzh425 authored Jul 10, 2024
1 parent 380f43b commit adb81b8
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 24 deletions.
3 changes: 2 additions & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<WarningsAsErrors>
$(WarningsAsErrors);CS8600;CS8601;CS8602;CS8603;CS8604;CS8609;CS8610;CS8614;CS8616;CS8618;CS8619;CS8620;CS8622;CS8625
</WarningsAsErrors>
<MasaFrameworkPackageVersion>1.0.1-preview.17</MasaFrameworkPackageVersion>
<MasaFrameworkPackageVersion>1.2.0-preview.2</MasaFrameworkPackageVersion>
<MasaStackSdksPackageVersion>1.1.0-preview.2</MasaStackSdksPackageVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion ...ateways/Caller/Masa.Scheduler.ApiGateways.Caller/Masa.Scheduler.ApiGateways.Caller.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Masa.Contrib.StackSdks.Caller" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Caller" Version="$(MasaStackSdksPackageVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/Contracts/Masa.Scheduler.Contracts.Server/Masa.Scheduler.Contracts.Server.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
<PackageReference Include="FluentValidation" Version="11.2.0" />
<PackageReference Include="Masa.BuildingBlocks.Caching" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.Configuration.ConfigurationApi.Dcc" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.BuildingBlocks.StackSdks.Config" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Config" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.BuildingBlocks.StackSdks.Config" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Config" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.Dispatcher.IntegrationEvents.Dapr" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Utils.Extensions.Validations.FluentValidation" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Utils.Security.Cryptography" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Utils.Configuration.Json" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.Data.UoW.EFCore" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Isolation" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Auth" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Dcc" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Alert" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Isolation" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Auth" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Dcc" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Alert" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.5" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="6.0.5" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Services/Masa.Scheduler.Services.Server/Masa.Scheduler.Services.Server.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
<PackageReference Include="Masa.Contrib.Dispatcher.IntegrationEvents.Dapr" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.Exceptions" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.Globalization.I18n.AspNetCore" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
Expand Down
1 change: 1 addition & 0 deletions ...es/Masa.Scheduler.Services.Worker/Domain/Managers/Workers/TaskHandlers/HttpTaskHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public async Task<TaskRunStatus> RunTask(Guid taskId, SchedulerJobDto jobDto, Da

HttpUtils.AddHttpHeader(client, jobDto.HttpConfig.HttpHeaders);

jobDto.HttpConfig.HttpParameters.Add(new("jobId", jobDto.Id.ToString()));
jobDto.HttpConfig.HttpParameters.Add(new("taskId", taskId.ToString()));
jobDto.HttpConfig.HttpParameters.Add(new("excuteTime", System.Web.HttpUtility.UrlEncode(excuteTime.ToString(), System.Text.Encoding.UTF8)));
jobDto.HttpConfig.HttpParameters.Add(new("traceId", traceId ?? ""));
Expand Down
2 changes: 1 addition & 1 deletion src/Services/Masa.Scheduler.Services.Worker/Masa.Scheduler.Services.Worker.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<PackageReference Include="Masa.Contrib.Caching.Distributed.StackExchangeRedis" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.Development.DaprStarter.AspNetCore" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.Exceptions" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
<PrivateAssets>all</PrivateAssets>
Expand Down
4 changes: 2 additions & 2 deletions src/Shells/Masa.Scheduler.Shells.JobShell/Masa.Scheduler.Shells.JobShell.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Masa.Contrib.StackSdks.Scheduler" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Scheduler" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaStackSdksPackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Scheduler.Web.Admin.Server/Pages/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<body>
@RenderBody()
<script src="_framework/blazor.server.js"></script>
<script src="_content/BlazorComponent/js/blazor-component.js"></script>
<script src="_content/Masa.Blazor/js/masa-blazor.js"></script>
<script src="_content/Masa.Stack.Components/js/components.js"></script>
<script src="https://cdn.masastack.com/npm/echarts/5.1.1/echarts.min.js"></script>
<script src="_content/MASA.Blazor.Experimental.Components/js/experimental.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions src/Web/Masa.Scheduler.Web.Admin/Masa.Scheduler.Web.Admin.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<PackageReference Include="Masa.BuildingBlocks.Authentication.Identity" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.Data.Mapping.Mapster" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Stack.Components" Version="0.0.451" />
<PackageReference Include="Masa.Stack.Components" Version="0.0.460" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.15" />
<PackageReference Include="Quartz.AspNetCore" Version="3.6.2" />
<PackageReference Include="Masa.Contrib.StackSdks.Alert" Version="$(MasaFrameworkPackageVersion)" />
<PackageReference Include="Masa.Contrib.StackSdks.Alert" Version="$(MasaStackSdksPackageVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Scheduler.Web.Admin/Shared/MainLayout.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@inject NavigationManager Navigation
@inject IMasaStackConfig MasaStackConfig

<SLayout OnSignOut="SignOut" OnErrorAsync="OnError" WhiteUris="_whiteUris" IsShowEnvironmentSwitch
<SLayout OnSignOut="SignOut" OnErrorAsync="OnError" WhiteUris="_whiteUris" IsShowEnvironmentSwitch Class="full-height"
Logo="https://cdn.masastack.com/stack/images/logo/MASAStack/logo-h-en.png"
MiniLogo="/_content/Masa.Scheduler.Web.Admin/img/mainLayout/logo.svg">
@Body
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Scheduler.Web.Admin/Shared/ProComponentBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Masa.Scheduler.Web.Admin;

public abstract class ProComponentBase : BDomComponentBase
public abstract class ProComponentBase : Blazor.Core.MasaComponentBase
{
private SchedulerServerCaller? _schedulerServerCaller;
private GlobalConfig? _globalConfig;
Expand Down
2 changes: 0 additions & 2 deletions src/Web/Masa.Scheduler.Web.Admin/_Imports.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the Apache License. See LICENSE.txt in the project root for license information.

global using BlazorComponent;
global using BlazorComponent.I18n;
global using FluentValidation;
global using Humanizer;
global using Humanizer.Localisation;
Expand Down
3 changes: 1 addition & 2 deletions src/Web/Masa.Scheduler.Web.Admin/_Imports.razor
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@using BlazorComponent
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.Web
@using Masa.Blazor
@using Masa.Scheduler.Web.Admin.Global
@using Masa.Scheduler.Web.Admin.Data
Expand Down

0 comments on commit adb81b8

Please sign in to comment.