Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VCST-2376: update GraphQL.NET to v8 #6

Merged
merged 9 commits into from
Jan 28, 2025
Merged

VCST-2376: update GraphQL.NET to v8 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0efd5b2
feat: v8 update
ksavosteev Dec 27, 2024
cb8594e
fix: sonar
ksavosteev Dec 27, 2024
8259880
feat: update dependency
ksavosteev Jan 6, 2025
a496f3e
feat: remove obsolete fields definitions
ksavosteev Jan 8, 2025
7804a37
v3.900.0
ksavosteev Jan 27, 2025
ba71195
Merge branch 'dev' into feat/VCST-2376-update-graphql
ksavosteev Jan 27, 2025
868465c
fix: platform version
ksavosteev Jan 27, 2025
3c2f8b3
Merge branch 'dev' into feat/VCST-2376-update-graphql
ksavosteev Jan 28, 2025
7e7c350
Merge branch 'dev' into feat/VCST-2376-update-graphql
ksavosteev Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<!-- These properties will be shared for all projects -->
<PropertyGroup>
<VersionPrefix>3.806.0</VersionPrefix>
<VersionPrefix>3.900.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
Expand Down
7 changes: 4 additions & 3 deletions src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using GraphQL.Types;
using VirtoCommerce.WhiteLabeling.ExperienceApi.Models;
using VirtoCommerce.Xapi.Core.Schemas;
using VirtoCommerce.XCMS.Core.Schemas;

namespace VirtoCommerce.WhiteLabeling.ExperienceApi.Schemas
{
public class WhiteLabelingSettingsType : ObjectGraphType<ExpWhiteLabelingSetting>
public class WhiteLabelingSettingsType : ExtendableGraphType<ExpWhiteLabelingSetting>
{
public WhiteLabelingSettingsType()
{
Expand All @@ -15,8 +16,8 @@ public WhiteLabelingSettingsType()
Field(x => x.LabelingSetting.SecondaryLogoUrl, nullable: true).Description("Logo URL for footer");
Field(x => x.LabelingSetting.FaviconUrl, nullable: true).Description("Master favicon URL");
Field(x => x.LabelingSetting.ThemePresetName, nullable: true).Description("Theme preset name");
Field<ListGraphType<MenuLinkType>>("footerLinks", resolve: context => context.Source.FooterLinks);
Field<ListGraphType<FaviconType>>("favicons", resolve: context => context.Source.Favicons);
Field<ListGraphType<MenuLinkType>>("footerLinks").Resolve(context => context.Source.FooterLinks);
Field<ListGraphType<FaviconType>>("favicons").Resolve(context => context.Source.Favicons);
}
}
}
8 changes: 4 additions & 4 deletions ...irtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="VirtoCommerce.FileExperienceApi.Data" Version="3.803.0" />
<PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.800.0" />
<PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.800.0" />
<PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
<PackageReference Include="VirtoCommerce.FileExperienceApi.Data" Version="3.900.0" />
<PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.900.0" />
<PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.900.0" />
<PackageReference Include="VirtoCommerce.Platform.Data" Version="3.861.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.WhiteLabeling.Core\VirtoCommerce.WhiteLabeling.Core.csproj" />
Expand Down
15 changes: 6 additions & 9 deletions src/VirtoCommerce.WhiteLabeling.Web/Module.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using GraphQL.Server;
using MediatR;
using GraphQL;
using GraphQL.MicrosoftDI;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
using Microsoft.EntityFrameworkCore;
Expand All @@ -21,7 +21,6 @@
using VirtoCommerce.WhiteLabeling.ExperienceApi;
using VirtoCommerce.WhiteLabeling.ExperienceApi.Authorization;
using VirtoCommerce.Xapi.Core.Extensions;
using VirtoCommerce.Xapi.Core.Infrastructure;

namespace VirtoCommerce.WhiteLabeling.Web;

Expand All @@ -32,12 +31,10 @@ public class Module : IModule, IHasConfiguration

public void Initialize(IServiceCollection serviceCollection)
{
var assemblyMarker = typeof(AssemblyMarker);
var graphQlBuilder = new CustomGraphQLBuilder(serviceCollection);
graphQlBuilder.AddGraphTypes(assemblyMarker);
serviceCollection.AddMediatR(assemblyMarker);
serviceCollection.AddAutoMapper(assemblyMarker);
serviceCollection.AddSchemaBuilders(assemblyMarker);
_ = new GraphQLBuilder(serviceCollection, builder =>
{
builder.AddSchema(serviceCollection, typeof(AssemblyMarker));
});

serviceCollection.AddDbContext<WhiteLabelingDbContext>(options =>
{
Expand Down
10 changes: 5 additions & 5 deletions src/VirtoCommerce.WhiteLabeling.Web/module.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<module>
<id>VirtoCommerce.WhiteLabeling</id>
<version>3.806.0</version>
<version>3.900.0</version>
<version-tag></version-tag>

<platformVersion>3.841.0</platformVersion>
<platformVersion>3.861.0</platformVersion>
<dependencies>
<dependency id="VirtoCommerce.FileExperienceApi" version="3.803.0" />
<dependency id="VirtoCommerce.Xapi" version="3.800.0" />
<dependency id="VirtoCommerce.XCMS" version="3.800.0" />
<dependency id="VirtoCommerce.FileExperienceApi" version="3.900.0" />
<dependency id="VirtoCommerce.Xapi" version="3.900.0" />
<dependency id="VirtoCommerce.XCMS" version="3.900.0" />
<dependency id="VirtoCommerce.Customer" version="3.811.0" />
<dependency id="VirtoCommerce.ImageTools" version="3.802.0" />
</dependencies>
Expand Down
Loading