tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Background color.

pull/681/head
Sebastian Stehle 5 years ago
parent
2d1085d152
commit
a968bf811b
24 changed files with 101 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      backend/Squidex.ruleset
  2. 6
      backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
  3. 2
      backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
  4. 6
      backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  5. 2
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
  6. 6
      backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Primitives/InstantGraphType.cs
  7. 8
      backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Primitives/JsonGraphType.cs
  8. 6
      backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Primitives/JsonNoopGraphType.cs
  9. 14
      backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  10. 2
      backend/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj
  11. 2
      backend/src/Squidex.Domain.Users/Squidex.Domain.Users.csproj
  12. 4
      backend/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj
  13. 16
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  14. 4
      backend/src/Squidex.Web/Squidex.Web.csproj
  15. 6
      backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetContentQueryDto.cs
  16. 22
      backend/src/Squidex/Areas/Api/Controllers/News/Service/FeaturesService.cs
  17. 42
      backend/src/Squidex/Squidex.csproj
  18. 2
      backend/src/Squidex/appsettings.json
  19. 4
      backend/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
  20. 10
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
  21. 4
      backend/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj
  22. 4
      backend/tests/Squidex.Infrastructure.Tests/Json/Newtonsoft/ReadOnlyCollectionTests.cs
  23. 8
      backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj
  24. 4
      backend/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj

1
backend/Squidex.ruleset
View File

@ -89,6 +89,7 @@
<Rule Id="IDE0070" Action="None" /> <Rule Id="IDE0070" Action="None" />
<Rule Id="IDE0032" Action="None" /> <Rule Id="IDE0032" Action="None" />
<Rule Id="IDE0042" Action="None" /> <Rule Id="IDE0042" Action="None" />
<Rule Id="IDE0090" Action="None" />
</Rules> </Rules>
<Rules AnalyzerId="Microsoft.AspNetCore.Mvc.Api.Analyzers" RuleNamespace="Microsoft.AspNetCore.Mvc.Api.Analyzers"> <Rules AnalyzerId="Microsoft.AspNetCore.Mvc.Api.Analyzers" RuleNamespace="Microsoft.AspNetCore.Mvc.Api.Analyzers">
<Rule Id="API1000" Action="Error" /> <Rule Id="API1000" Action="Error" />

6
backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
View File

@ -13,12 +13,12 @@
<PackageReference Include="Confluent.Kafka" Version="1.6.3" /> <PackageReference Include="Confluent.Kafka" Version="1.6.3" />
<PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.3.0" /> <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.3.0" />
<PackageReference Include="CoreTweet" Version="1.0.0.483" /> <PackageReference Include="CoreTweet" Version="1.0.0.483" />
<PackageReference Include="Datadog.Trace" Version="1.24.0" /> <PackageReference Include="Datadog.Trace" Version="1.25.0" />
<PackageReference Include="Elasticsearch.Net" Version="7.11.1" /> <PackageReference Include="Elasticsearch.Net" Version="7.12.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
<PackageReference Include="Microsoft.OData.Core" Version="7.8.3" /> <PackageReference Include="Microsoft.OData.Core" Version="7.8.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NodaTime" Version="3.0.5" /> <PackageReference Include="NodaTime" Version="3.0.5" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

2
backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
View File

@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" /> <PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.4.0"> <PackageReference Include="Fody" Version="6.5.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

6
backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
View File

@ -18,11 +18,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Fluid.Core.Squidex" Version="1.0.0-beta" /> <PackageReference Include="Fluid.Core.Squidex" Version="1.0.0-beta" />
<PackageReference Include="GeoJSON.Net" Version="1.2.19" /> <PackageReference Include="GeoJSON.Net" Version="1.2.19" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.31" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.32" />
<PackageReference Include="Markdig" Version="0.23.0" /> <PackageReference Include="Markdig" Version="0.24.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
<PackageReference Include="Microsoft.OData.Core" Version="7.8.3" /> <PackageReference Include="Microsoft.OData.Core" Version="7.8.3" />
<PackageReference Include="NJsonSchema" Version="10.3.11" /> <PackageReference Include="NJsonSchema" Version="10.4.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Jint" Version="3.0.0-beta-0" /> <PackageReference Include="Squidex.Jint" Version="3.0.0-beta-0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

2
backend/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
View File

@ -17,7 +17,7 @@
<ProjectReference Include="..\Squidex.Domain.Apps.Entities\Squidex.Domain.Apps.Entities.csproj" /> <ProjectReference Include="..\Squidex.Domain.Apps.Entities\Squidex.Domain.Apps.Entities.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.12.0" /> <PackageReference Include="MongoDB.Driver" Version="2.12.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />

6
backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Primitives/InstantGraphType.cs
View File

@ -13,14 +13,14 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Primitives
{ {
public sealed class InstantGraphType : DateTimeGraphType public sealed class InstantGraphType : DateTimeGraphType
{ {
public override object Serialize(object value) public override object? Serialize(object? value)
{ {
return value; return value;
} }
public override object ParseValue(object value) public override object? ParseValue(object? value)
{ {
return InstantPattern.ExtendedIso.Parse(value.ToString()!).Value; return InstantPattern.ExtendedIso.Parse(value?.ToString()!).Value;
} }
public override object? ParseLiteral(IValue value) public override object? ParseLiteral(IValue value)

8
backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Primitives/JsonGraphType.cs
View File

@ -13,17 +13,17 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Primitives
{ {
public sealed class JsonGraphType : JsonNoopGraphType public sealed class JsonGraphType : JsonNoopGraphType
{ {
public override object Serialize(object value) public override object? Serialize(object? value)
{ {
return value; return value;
} }
public override object ParseValue(object value) public override object? ParseValue(object? value)
{ {
return ParseJson(value); return ParseJson(value);
} }
public static IJsonValue ParseJson(object value) public static IJsonValue ParseJson(object? value)
{ {
switch (value) switch (value)
{ {
@ -72,7 +72,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Primitives
return value; return value;
} }
public override IValue ToAST(object value) public override IValue ToAST(object? value)
{ {
return new JsonValueNode(ParseJson(value)); return new JsonValueNode(ParseJson(value));
} }

6
backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Primitives/JsonNoopGraphType.cs
View File

@ -19,17 +19,17 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Primitives
Description = "Unstructured Json object"; Description = "Unstructured Json object";
} }
public override object ParseLiteral(IValue value) public override object? ParseLiteral(IValue value)
{ {
return value.Value; return value.Value;
} }
public override object ParseValue(object value) public override object? ParseValue(object? value)
{ {
return value; return value;
} }
public override object Serialize(object value) public override object? Serialize(object? value)
{ {
return value; return value;
} }

14
backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
View File

@ -17,21 +17,21 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CsvHelper" Version="26.0.1" /> <PackageReference Include="CsvHelper" Version="26.1.0" />
<PackageReference Include="Elasticsearch.Net" Version="7.11.1" /> <PackageReference Include="Elasticsearch.Net" Version="7.12.0" />
<PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" /> <PackageReference Include="Equals.Fody" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.4.0"> <PackageReference Include="Fody" Version="6.5.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="GraphQL" Version="4.0.2" /> <PackageReference Include="GraphQL" Version="4.2.0" />
<PackageReference Include="GraphQL.DataLoader" Version="4.0.2" /> <PackageReference Include="GraphQL.DataLoader" Version="4.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.1"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.2">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.4.1" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.4.2" />
<PackageReference Include="Notifo.SDK" Version="1.0.0-beta2" /> <PackageReference Include="Notifo.SDK" Version="1.0.0-beta2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

2
backend/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj
View File

@ -20,7 +20,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" /> <PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="MongoDB.Driver" Version="2.12.0" /> <PackageReference Include="MongoDB.Driver" Version="2.12.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />

2
backend/src/Squidex.Domain.Users/Squidex.Domain.Users.csproj
View File

@ -17,7 +17,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" /> <PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.4" /> <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.5" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="SharpPwned.NET" Version="1.0.8" /> <PackageReference Include="SharpPwned.NET" Version="1.0.8" />

4
backend/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj
View File

@ -13,8 +13,8 @@
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.12.0" /> <PackageReference Include="MongoDB.Driver" Version="2.12.1" />
<PackageReference Include="MongoDB.Driver.GridFS" Version="2.12.0" /> <PackageReference Include="MongoDB.Driver.GridFS" Version="2.12.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" /> <PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />

16
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
View File

@ -13,18 +13,18 @@
<PackageReference Include="MailKit" Version="2.11.1" /> <PackageReference Include="MailKit" Version="2.11.1" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" /> <PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.4" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.5" />
<PackageReference Include="Microsoft.OData.Core" Version="7.8.3" /> <PackageReference Include="Microsoft.OData.Core" Version="7.8.3" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.1"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.2">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.4.1" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.4.2" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.4.1" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.4.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NJsonSchema" Version="10.3.11" /> <PackageReference Include="NJsonSchema" Version="10.4.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets" Version="1.3.0" /> <PackageReference Include="Squidex.Assets" Version="1.4.0" />
<PackageReference Include="Squidex.Caching" Version="1.8.0" /> <PackageReference Include="Squidex.Caching" Version="1.8.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="1.9.0" /> <PackageReference Include="Squidex.Hosting.Abstractions" Version="1.9.0" />
<PackageReference Include="Squidex.Log" Version="1.2.0" /> <PackageReference Include="Squidex.Log" Version="1.2.0" />
@ -36,7 +36,7 @@
<PackageReference Include="System.Reactive" Version="5.0.0" /> <PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" /> <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Include="System.Security.Claims" Version="4.3.0" /> <PackageReference Include="System.Security.Claims" Version="4.3.0" />
<PackageReference Include="System.Text.Json" Version="5.0.1" /> <PackageReference Include="System.Text.Json" Version="5.0.2" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" /> <PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

4
backend/src/Squidex.Web/Squidex.Web.csproj
View File

@ -12,11 +12,11 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Fody" Version="6.4.0"> <PackageReference Include="Fody" Version="6.5.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="5.0.0" /> <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="5.0.1" />
<PackageReference Include="Lazy.Fody" Version="1.9.0" PrivateAssets="all" /> <PackageReference Include="Lazy.Fody" Version="1.9.0" PrivateAssets="all" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

6
backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetContentQueryDto.cs
View File

@ -57,6 +57,12 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models
[FromQuery(Name = "mode")] [FromQuery(Name = "mode")]
public ResizeMode? Mode { get; set; } public ResizeMode? Mode { get; set; }
/// <summary>
/// Optional background color.
/// </summary>
[FromQuery(Name = "bg")]
public string? Background { get; set; }
/// <summary> /// <summary>
/// Override the y focus point. /// Override the y focus point.
/// </summary> /// </summary>

22
backend/src/Squidex/Areas/Api/Controllers/News/Service/FeaturesService.cs
View File

@ -44,18 +44,28 @@ namespace Squidex.Areas.Api.Controllers.News.Service
public async Task<FeaturesDto> GetFeaturesAsync(int version = 0) public async Task<FeaturesDto> GetFeaturesAsync(int version = 0)
{ {
var result = new FeaturesDto { Features = new List<FeatureDto>(), Version = FeatureVersion }; var result = new FeaturesDto
{
Version = FeatureVersion
};
if (client != null && version < FeatureVersion) if (client != null && version < FeatureVersion)
{ {
var query = new ContentQuery try
{ {
Filter = $"data/version/iv ge {FeatureVersion}" var query = new ContentQuery
}; {
Filter = $"data/version/iv ge {FeatureVersion}"
};
var features = await client.GetAsync(query, flatten); var features = await client.GetAsync(query, flatten);
result.Features.AddRange(features.Items.Select(x => x.Data)); result.Features = features.Items.Select(x => x.Data).ToList();
}
catch
{
result.Features = new List<FeatureDto>();
}
} }
return result; return result;

42
backend/src/Squidex/Squidex.csproj
View File

@ -33,40 +33,40 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="5.0.2" /> <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="5.0.3" />
<PackageReference Include="GraphQL.DataLoader" Version="4.0.2" /> <PackageReference Include="GraphQL.DataLoader" Version="4.2.0" />
<PackageReference Include="GraphQL.Server.Core" Version="5.0.0" /> <PackageReference Include="GraphQL.Server.Core" Version="5.0.1" />
<PackageReference Include="GraphQL.Server.Transports.AspNetCore.NewtonsoftJson" Version="5.0.0" /> <PackageReference Include="GraphQL.Server.Transports.AspNetCore.NewtonsoftJson" Version="5.0.1" />
<PackageReference Include="GraphQL.Server.Transports.AspNetCore.SystemTextJson" Version="5.0.0" /> <PackageReference Include="GraphQL.Server.Transports.AspNetCore.SystemTextJson" Version="5.0.1" />
<PackageReference Include="IdentityServer4" Version="4.1.2" /> <PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" /> <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.5" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" /> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" /> <PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" />
<PackageReference Include="Microsoft.OData.Core" Version="7.8.3" /> <PackageReference Include="Microsoft.OData.Core" Version="7.8.3" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.4.1" /> <PackageReference Include="Microsoft.Orleans.Core" Version="3.4.2" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.4.1" /> <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.4.2" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.4.1" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.4.2" />
<PackageReference Include="MongoDB.Driver" Version="2.12.0" /> <PackageReference Include="MongoDB.Driver" Version="2.12.1" />
<PackageReference Include="Namotion.Reflection" Version="1.0.18" /> <PackageReference Include="Namotion.Reflection" Version="1.0.18" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NJsonSchema" Version="10.3.11" /> <PackageReference Include="NJsonSchema" Version="10.4.0" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" /> <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
<PackageReference Include="NSwag.AspNetCore" Version="13.10.8" /> <PackageReference Include="NSwag.AspNetCore" Version="13.10.8" />
<PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" /> <PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" />
<PackageReference Include="Orleans.Providers.MongoDB" Version="3.2.0" /> <PackageReference Include="Orleans.Providers.MongoDB" Version="3.3.0" />
<PackageReference Include="OrleansDashboard" Version="3.1.0" /> <PackageReference Include="OrleansDashboard" Version="3.1.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="4.8.7" PrivateAssets="all" /> <PackageReference Include="ReportGenerator" Version="4.8.7" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets.Azure" Version="1.3.0" /> <PackageReference Include="Squidex.Assets.Azure" Version="1.4.0" />
<PackageReference Include="Squidex.Assets.GoogleCloud" Version="1.3.0" /> <PackageReference Include="Squidex.Assets.GoogleCloud" Version="1.4.0" />
<PackageReference Include="Squidex.Assets.FTP" Version="1.3.0" /> <PackageReference Include="Squidex.Assets.FTP" Version="1.4.0" />
<PackageReference Include="Squidex.Assets.Mongo" Version="1.3.0" /> <PackageReference Include="Squidex.Assets.Mongo" Version="1.4.0" />
<PackageReference Include="Squidex.Assets.S3" Version="1.3.0" /> <PackageReference Include="Squidex.Assets.S3" Version="1.4.0" />
<PackageReference Include="Squidex.Caching.Orleans" Version="1.8.0" /> <PackageReference Include="Squidex.Caching.Orleans" Version="1.8.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="6.19.0" /> <PackageReference Include="Squidex.ClientLibrary" Version="6.19.0" />
<PackageReference Include="Squidex.Hosting" Version="1.9.0" /> <PackageReference Include="Squidex.Hosting" Version="1.9.0" />

2
backend/src/Squidex/appsettings.json
View File

@ -676,7 +676,7 @@
/* /*
* The credentials to the app (Readonly). * The credentials to the app (Readonly).
*/ */
"clientId": "squidex-website:default", "clientId": "squidex-website:default2",
"clientSecret": "QGgqxd7bDHBTEkpC6fj8sbdPWgZrPrPfr3xzb3LKoec=" "clientSecret": "QGgqxd7bDHBTEkpC6fj8sbdPWgZrPrPfr3xzb3LKoec="
}, },

4
backend/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
View File

@ -12,11 +12,11 @@
<ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.0.0" /> <PackageReference Include="FakeItEasy" Version="7.0.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" /> <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

10
backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
View File

@ -17,15 +17,15 @@
<ProjectReference Include="..\Squidex.Domain.Apps.Core.Tests\Squidex.Domain.Apps.Core.Tests.csproj" /> <ProjectReference Include="..\Squidex.Domain.Apps.Core.Tests\Squidex.Domain.Apps.Core.Tests.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.0.0" /> <PackageReference Include="FakeItEasy" Version="7.0.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="GraphQL" Version="4.0.2" /> <PackageReference Include="GraphQL" Version="4.2.0" />
<PackageReference Include="GraphQL.NewtonsoftJson" Version="4.0.2" /> <PackageReference Include="GraphQL.NewtonsoftJson" Version="4.2.0" />
<PackageReference Include="Lorem.Universal.Net" Version="4.0.80" /> <PackageReference Include="Lorem.Universal.Net" Version="4.0.80" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.4.1" /> <PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.4.2" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" /> <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Caching.Orleans" Version="1.8.0" /> <PackageReference Include="Squidex.Caching.Orleans" Version="1.8.0" />

4
backend/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj
View File

@ -13,9 +13,9 @@
<ProjectReference Include="..\..\src\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\..\src\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.0.0" /> <PackageReference Include="FakeItEasy" Version="7.0.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />

4
backend/tests/Squidex.Infrastructure.Tests/Json/Newtonsoft/ReadOnlyCollectionTests.cs
View File

@ -37,7 +37,7 @@ namespace Squidex.Infrastructure.Json.Newtonsoft
var json = JsonConvert.SerializeObject(source, serializerSettings); var json = JsonConvert.SerializeObject(source, serializerSettings);
var serialized = JsonConvert.DeserializeObject<MyClass<IReadOnlyDictionary<int, int>>>(json); var serialized = JsonConvert.DeserializeObject<MyClass<IReadOnlyDictionary<int, int>>>(json)!;
Assert.DoesNotContain("$type", json); Assert.DoesNotContain("$type", json);
Assert.Equal(2, serialized.Values.Count); Assert.Equal(2, serialized.Values.Count);
@ -62,7 +62,7 @@ namespace Squidex.Infrastructure.Json.Newtonsoft
var json = JsonConvert.SerializeObject(source, serializerSettings); var json = JsonConvert.SerializeObject(source, serializerSettings);
var serialized = JsonConvert.DeserializeObject<MyClass<IReadOnlyList<int>>>(json); var serialized = JsonConvert.DeserializeObject<MyClass<IReadOnlyList<int>>>(json)!;
Assert.DoesNotContain("$type", json); Assert.DoesNotContain("$type", json);
Assert.Equal(2, serialized.Values.Count); Assert.Equal(2, serialized.Values.Count);

8
backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj
View File

@ -13,13 +13,13 @@
<ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.0.0" /> <PackageReference Include="FakeItEasy" Version="7.0.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="3.4.0" /> <PackageReference Include="Google.Cloud.Storage.V1" Version="3.4.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.4.1" /> <PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.4.2" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.1"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.2">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>

4
backend/tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj
View File

@ -11,10 +11,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="7.0.0" /> <PackageReference Include="FakeItEasy" Version="7.0.1" />
<PackageReference Include="IdentityServer4" Version="4.1.2" /> <PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />

Write Preview
Loading…
Cancel
Save