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

UMT-9 XbyK API version upgrade to v29.1.0 #26

Merged
merged 3 commits into from
May 22, 2024
Merged

UMT-9 XbyK API version upgrade to v29.1.0 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98c5be9
UMT-9 XbyK API version upgrade to v29.1.0
tkrch May 21, 2024
603da83
UMT-9 XbyK API version upgrade - docs update
tkrch May 21, 2024
e5d0b5e
UMT-9 admin sample packages upgrade
tkrch May 22, 2024
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
16 changes: 8 additions & 8 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Kentico.Xperience.Core" Version="29.0.2" />
<PackageVersion Include="Kentico.Xperience.Admin" Version="29.0.2" />
<PackageVersion Include="Kentico.Xperience.ImageProcessing" Version="29.0.2" />
<PackageVersion Include="Kentico.Xperience.Core" Version="29.1.0" />
<PackageVersion Include="Kentico.Xperience.Admin" Version="29.1.0" />
<PackageVersion Include="Kentico.Xperience.ImageProcessing" Version="29.1.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.24.0.89429">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
</PackageVersion>
<PackageVersion Include="Markdig" Version="0.37.0" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.9.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.9.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageVersion Include="NJsonSchema" Version="10.9.0" />
<PackageVersion Include="RazorLight" Version="2.3.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageVersion Include="NJsonSchema" Version="11.0.0" />
<PackageVersion Include="RazorLight" Version="2.3.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The Universal Migration Tool (UMT) is an open-source set of software libraries,
### Prerequisites

- [.NET 8+ SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
- Xperience by Kentico of version **29.0.2**
- Xperience by Kentico of version **29.1.0**

### Installation

Expand Down
1 change: 1 addition & 0 deletions examples/Kentico.Xperience.UMT.Example.AdminApp/Client/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist/
3,220 changes: 1,105 additions & 2,115 deletions examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"build": "webpack --mode=production"
},
"dependencies": {
"@kentico/xperience-admin-base": "^28.0.3",
"@kentico/xperience-admin-components": "^28.0.3",
"@kentico/xperience-admin-base": "^29.1.0",
"@kentico/xperience-admin-components": "^29.1.0",
"copy-webpack-plugin": "^12.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sse": "^0.0.8",
"sse.js": "^2.2.0"
"sse.js": "^2.4.1"
},
"devDependencies": {
"@babel/core": "^7.20.12",
Expand Down
12 changes: 2 additions & 10 deletions ...tico.Xperience.UMT.Example.AdminApp/Client/src/components/import-background-container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,7 @@ export const ImportBackgroundContainer = (props: ImportSandboxProps) => {
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}} >

{/*<div className="content-container" style={{*/}
{/* display: "grid", justifyContent: 'center',*/}
{/* alignItems: 'center', width: "300", height: "300"*/}
{/*}}>*/}
{props.children}
{/*</div>*/}


}} >
{props.children}
</div>
};
26 changes: 1 addition & 25 deletions examples/Kentico.Xperience.UMT.Example.AdminApp/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#define MOCK_IMPORT

using System.Collections.Concurrent;
using System.Collections.Concurrent;
using System.Net.Sockets;
using System.Net.WebSockets;
using System.Text;
Expand Down Expand Up @@ -119,25 +117,6 @@
{
var data = importService.FromJsonStream(ms);

#if MOCK_IMPORT
// Any data file works with this mock
int ctr = 0;
await foreach (var item in data)
{
ctr++;
if (ctr == 10)
{
ctr = 0;
await Task.Delay(3);
}
}
stats.SuccessfulImports["ContentItem"] = 10;
stats.SuccessfulImports["Language"] = 11;
stats.Errors.Add(new ObjectImportError(Guid.NewGuid(), ObjectImportErrorKind.ValidationError, "Name is too long. Max 60 characters"));
stats.Errors.Add(new ObjectImportError(Guid.NewGuid(), ObjectImportErrorKind.ValidationError, "Type cannot be empty"));
return;
#endif

var observer = new ImportStateObserver();

observer = await importService.StartImportAsync(data!, observer);
Expand Down Expand Up @@ -211,9 +190,6 @@
int count = receiveResult.Count;
totalReceived += count;

//byte[] response = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { type = "progress", payload = count }));
//await webSocket.SendAsync(new ArraySegment<byte>(response, 0, response.Length), WebSocketMessageType.Text, true, CancellationToken.None);

if (ms.CachedBlocks > 3500)
{
await SendTooFastReport();
Expand Down Expand Up @@ -260,7 +236,7 @@
logService.LogException(SOURCE, "CONSUMER", e);
}

if (socketAvailable)

Check warning on line 239 in examples/Kentico.Xperience.UMT.Example.AdminApp/ServiceCollectionExtensions.cs

View workflow job for this annotation

GitHub Actions / Build and Test 

Change this condition so that it does not always evaluate to 'True'. (https://rules.sonarsource.com/csharp/RSPEC-2589)

Check warning on line 239 in examples/Kentico.Xperience.UMT.Example.AdminApp/ServiceCollectionExtensions.cs

View workflow job for this annotation

GitHub Actions / Build and Test 

Change this condition so that it does not always evaluate to 'True'. (https://rules.sonarsource.com/csharp/RSPEC-2589)
{
await SendStats(stats);
await Task.Delay(1000);
Expand Down
Loading
Loading