Skip to content

Commit 677942f

Browse files
MikeAlhayekMikeAlhayek
authored
Migrate CatalogEntry class to CatalogItem (#179)
1 parent 34424fa commit 677942f

File tree

112 files changed

+801
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+801
-279
lines changed

‎CrestApps.OrchardCore.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrestApps.OrchardCore.Roles
8787
EndProject
8888
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrestApps.OrchardCore.Roles.Core", "src\Core\CrestApps.OrchardCore.Roles.Core\CrestApps.OrchardCore.Roles.Core.csproj", "{0ECE7076-8981-492F-97BB-1EC4CCF89B9F}"
8989
EndProject
90+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrestApps.OrchardCore.YesSql.Core", "src\Core\CrestApps.OrchardCore.YesSql.Core\CrestApps.OrchardCore.YesSql.Core.csproj", "{4C246918-26A3-4694-AB48-E48E00AB5C33}"
91+
EndProject
9092
Global
9193
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9294
Debug|Any CPU = Debug|Any CPU
@@ -213,6 +215,10 @@ Global
213215
{0ECE7076-8981-492F-97BB-1EC4CCF89B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
214216
{0ECE7076-8981-492F-97BB-1EC4CCF89B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
215217
{0ECE7076-8981-492F-97BB-1EC4CCF89B9F}.Release|Any CPU.Build.0 = Release|Any CPU
218+
{4C246918-26A3-4694-AB48-E48E00AB5C33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
219+
{4C246918-26A3-4694-AB48-E48E00AB5C33}.Debug|Any CPU.Build.0 = Debug|Any CPU
220+
{4C246918-26A3-4694-AB48-E48E00AB5C33}.Release|Any CPU.ActiveCfg = Release|Any CPU
221+
{4C246918-26A3-4694-AB48-E48E00AB5C33}.Release|Any CPU.Build.0 = Release|Any CPU
216222
EndGlobalSection
217223
GlobalSection(SolutionProperties) = preSolution
218224
HideSolutionNode = FALSE
@@ -248,6 +254,7 @@ Global
248254
{7A00967E-E049-42E6-A60D-D12BF892BEF3} = {C8D22F16-3D2B-4053-B0D5-A1F5EA5A91C2}
249255
{828C71FC-D3FC-4791-B870-F6951E0F9BAF} = {C8D22F16-3D2B-4053-B0D5-A1F5EA5A91C2}
250256
{0ECE7076-8981-492F-97BB-1EC4CCF89B9F} = {EC2B9CAB-56C8-4421-ACA2-43C09B71DAB5}
257+
{4C246918-26A3-4694-AB48-E48E00AB5C33} = {EC2B9CAB-56C8-4421-ACA2-43C09B71DAB5}
251258
EndGlobalSection
252259
GlobalSection(ExtensibilityGlobals) = postSolution
253260
SolutionGuid = {0E9F9B00-7078-4EA8-87A9-0B2E74375F1E}

‎Directory.Packages.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
<ItemGroup>
88
<!-- Miscellaneous Packages -->
99
<PackageVersion Include="JsonSchema.Net" Version="7.4.0" />
10+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />
1011
<PackageVersion Include="NuGet.Versioning" Version="6.14.0" />
1112
<PackageVersion Include="OllamaSharp" Version="5.3.4" />
1213
<PackageVersion Include="YesSql.Abstractions" Version="5.4.6" />
14+
<PackageVersion Include="YesSql.Core" Version="5.4.6" />
1315
<PackageVersion Include="ModelContextProtocol" Version="0.3.0-preview.1" />
1416
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.1.0-preview.7" />
1517
</ItemGroup>

‎src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/AIDataSource.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace CrestApps.OrchardCore.AI.Models;
66

7-
public sealed class AIDataSource : CatalogEntry, IDisplayTextAwareModel, ICloneable<AIDataSource>
7+
public sealed class AIDataSource : CatalogItem, IDisplayTextAwareModel, ICloneable<AIDataSource>
88
{
99
public string ProfileSource { get; set; }
1010

@@ -22,7 +22,7 @@ public AIDataSource Clone()
2222
{
2323
return new AIDataSource
2424
{
25-
Id = Id,
25+
ItemId = ItemId,
2626
DisplayText = DisplayText,
2727
ProfileSource = ProfileSource,
2828
Type = Type,

‎src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/AIDeployment.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public AIDeployment Clone()
3737
{
3838
return new AIDeployment
3939
{
40-
Id = Id,
40+
ItemId = ItemId,
4141
Name = Name,
4242
Source = Source,
4343
ConnectionName = ConnectionName,

‎src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/AIProfile.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public AIProfile Clone()
7979
{
8080
return new AIProfile()
8181
{
82-
Id = Id,
82+
ItemId = ItemId,
8383
Name = Name,
8484
DisplayText = DisplayText,
8585
Source = Source,

‎src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/AIProviderConnection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public AIProviderConnection Clone()
4141
{
4242
return new AIProviderConnection
4343
{
44-
Id = Id,
44+
ItemId = ItemId,
4545
Source = Source,
4646
Name = Name,
4747
DisplayText = DisplayText,

‎src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/AIToolInstance.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public AIToolInstance Clone()
1717
{
1818
return new AIToolInstance
1919
{
20-
Id = Id,
20+
ItemId = ItemId,
2121
Source = Source,
2222
DisplayText = DisplayText,
2323
CreatedUtc = CreatedUtc,

‎src/Abstractions/CrestApps.OrchardCore.Abstractions/Models/CatalogEntry.cs‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Abstractions/CrestApps.OrchardCore.Abstractions/Models/CatalogItem.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using OrchardCore.Entities;
2+
3+
namespace CrestApps.OrchardCore.Models;
4+
5+
public class CatalogItem : Entity
6+
{
7+
/// <summary>
8+
/// Gets or sets the unique identifier for the catalog item.
9+
/// </summary>
10+
public string ItemId { get; set; }
11+
}

‎src/Abstractions/CrestApps.OrchardCore.Abstractions/Models/SourceCatalogEntry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace CrestApps.OrchardCore.Models;
22

3-
public class SourceCatalogEntry : CatalogEntry, ISourceAwareModel
3+
public class SourceCatalogEntry : CatalogItem, ISourceAwareModel
44
{
55
/// <summary>
66
/// Gets the name of the source for this profile.

0 commit comments

Comments
 (0)