diff --git a/Directory.Packages.props b/Directory.Packages.props index 39c98ea5de..b1398663ee 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -38,8 +38,8 @@ - - + + @@ -174,4 +174,4 @@ - \ No newline at end of file + diff --git a/README.md b/README.md index ccc31da4b5..dd953a6431 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,18 @@ # ABP Framework -![build and test](https://img.shields.io/github/actions/workflow/status/abpframework/abp/build-and-test.yml?branch=dev&style=flat-square) -[![codecov](https://codecov.io/gh/abpframework/abp/branch/dev/graph/badge.svg?token=jUKLCxa6HF)](https://codecov.io/gh/abpframework/abp) -[![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) -[![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) -[![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds) -[![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) -[![Code of Conduct](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://github.com/abpframework/abp/blob/dev/CODE_OF_CONDUCT.md) -[![CLA Signed](https://cla-assistant.io/readme/badge/abpframework/abp)](https://cla-assistant.io/abpframework/abp) -[![ABP Discord server](https://img.shields.io/discord/951497912645476422?label=Discord)](https://discord.gg/abp) - -ABP Framework is a complete **infrastructure** based on **ASP.NET Core** to create **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**. Check out https://abp.io +![build and test](https://img.shields.io/github/actions/workflow/status/abpframework/abp/build-and-test.yml?branch=dev&style=flat-square) 🔹 [![codecov](https://codecov.io/gh/abpframework/abp/branch/dev/graph/badge.svg?token=jUKLCxa6HF)](https://codecov.io/gh/abpframework/abp) 🔹 [![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds) 🔹 +[![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![Code of Conduct](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://github.com/abpframework/abp/blob/dev/CODE_OF_CONDUCT.md) 🔹 [![CLA Signed](https://cla-assistant.io/readme/badge/abpframework/abp)](https://cla-assistant.io/abpframework/abp) 🔹 [![Discord Shield](https://discord.com/api/guilds/951497912645476422/widget.png?style=shield)](https://discord.gg/abp) + +ABP Framework is a complete **infrastructure** based on **ASP.NET Core** that creates **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**. + +[![ABP Platform](https://github.com/abpframework/abp/assets/9526587/47531496-4088-406d-9c69-63cb0ffec2ba)](https://abp.io) + ## Getting Started -- [Quick Start](https://docs.abp.io/en/abp/latest/Tutorials/Todo/Index) is a single-part, quick-start tutorial to build a simple application with the ABP Framework. Start with this tutorial if you want to quickly understand how ABP works. -- [Getting Started guide](https://docs.abp.io/en/abp/latest/Getting-Started) can be used to create and run ABP based solutions with different options and details. -- [Web Application Development Tutorial](https://docs.abp.io/en/abp/latest/Tutorials/Part-1) is a complete tutorial to develop a full stack web application with all aspects of a real-life solution. +- [Quick Start](https://docs.abp.io/en/abp/latest/Tutorials/Todo/Index) is a single-part, quick-start tutorial to build a simple application with the ABP Framework. Start with this tutorial if you want to understand how ABP works quickly. +- [Getting Started guide](https://docs.abp.io/en/abp/latest/Getting-Started) can be used to create and run ABP-based solutions with different options and details. +- [Web Application Development Tutorial](https://docs.abp.io/en/abp/latest/Tutorials/Part-1) is a complete tutorial on developing a full-stack web application with all aspects of a real-life solution. ### Quick Start @@ -34,28 +30,26 @@ Create a new solution: > See the [CLI documentation](https://docs.abp.io/en/abp/latest/CLI) for all available options. + + ### UI Framework Options + + ### Database Provider Options -## The Book: Mastering ABP Framework -Written by the creator of ABP Framework, this book will help you to gain a complete understanding of the ABP Framework and modern web application development techniques. - -* [Buy on Amazon](https://www.amazon.com/gp/product/B097Z2DM8Q) -* [Buy on Packt Publishing](https://www.packtpub.com/product/mastering-abp-framework/9781801079242) -* [More details about the book](https://abp.io/books/mastering-abp-framework) - -![book-mastering-abp-framework](docs/en/images/book-mastering-abp-framework.png) ## What ABP Provides? ABP provides a **full stack developer experience**. + + ### Architecture @@ -64,30 +58,48 @@ ABP offers a complete, **modular** and **layered** software architecture based o ABP Framework is suitable for **[microservice solutions](https://docs.abp.io/en/abp/latest/Microservice-Architecture)** as well as monolithic applications. + + ### Infrastructure -There are a lot of features provided by the ABP Framework to achieve real world scenarios easier, like [Event Bus](https://docs.abp.io/en/abp/latest/Event-Bus), [Background Job System](https://docs.abp.io/en/abp/latest/Background-Jobs), [Audit Logging](https://docs.abp.io/en/abp/latest/Audit-Logging), [BLOB Storing](https://docs.abp.io/en/abp/latest/Blob-Storing), [Data Seeding](https://docs.abp.io/en/abp/latest/Data-Seeding), [Data Filtering](https://docs.abp.io/en/abp/latest/Data-Filtering), etc. +There are a lot of features provided by the ABP Framework to achieve real-world scenarios easier, like [Event Bus](https://docs.abp.io/en/abp/latest/Event-Bus), [Background Job System](https://docs.abp.io/en/abp/latest/Background-Jobs), [Audit Logging](https://docs.abp.io/en/abp/latest/Audit-Logging), [BLOB Storing](https://docs.abp.io/en/abp/latest/Blob-Storing), [Data Seeding](https://docs.abp.io/en/abp/latest/Data-Seeding), [Data Filtering](https://docs.abp.io/en/abp/latest/Data-Filtering), etc. + + + +### Cross-Cutting Concerns + +ABP also simplifies (and even automates wherever possible) cross-cutting concerns and common non-functional requirements like [Exception Handling](https://docs.abp.io/en/abp/latest/Exception-Handling), [Validation](https://docs.abp.io/en/abp/latest/Validation), [Authorization](https://docs.abp.io/en/abp/latest/Authorization), [Localization](https://docs.abp.io/en/abp/latest/Localization), [Caching](https://docs.abp.io/en/abp/latest/Caching), [Dependency Injection](https://docs.abp.io/en/abp/latest/Dependency-Injection), [Setting Management](https://docs.abp.io/en/abp/latest/Settings), etc. -### Cross Cutting Concerns -ABP also simplifies (and even automates wherever possible) cross cutting concerns and common non-functional requirements like [Exception Handling](https://docs.abp.io/en/abp/latest/Exception-Handling), [Validation](https://docs.abp.io/en/abp/latest/Validation), [Authorization](https://docs.abp.io/en/abp/latest/Authorization), [Localization](https://docs.abp.io/en/abp/latest/Localization), [Caching](https://docs.abp.io/en/abp/latest/Caching), [Dependency Injection](https://docs.abp.io/en/abp/latest/Dependency-Injection), [Setting Management](https://docs.abp.io/en/abp/latest/Settings), etc. ### Application Modules ABP is a modular framework and the Application Modules provide **pre-built application functionalities**; - [**Account**](https://docs.abp.io/en/abp/latest/Modules/Account): Provides UI for the account management and allows user to login/register to the application. -- **[Identity](https://docs.abp.io/en/abp/latest/Modules/Identity)**: Manages organization units, roles, users and their permissions, based on the Microsoft Identity library. +- **[Identity](https://docs.abp.io/en/abp/latest/Modules/Identity)**: Manages organization units, roles, users and their permissions based on the Microsoft Identity library. - [**OpenIddict**](https://docs.abp.io/en/abp/latest/Modules/OpenIddict): Integrates to OpenIddict. - [**Tenant Management**](https://docs.abp.io/en/abp/latest/Modules/Tenant-Management): Manages tenants for a [multi-tenant](https://docs.abp.io/en/abp/latest/Multi-Tenancy) (SaaS) application. See the [Application Modules](https://docs.abp.io/en/abp/latest/Modules/Index) document for all pre-built modules. + + ### Startup Templates The [Startup templates](https://docs.abp.io/en/abp/latest/Startup-Templates/Index) are pre-built Visual Studio solution templates. You can create your own solution based on these templates to **immediately start your development**. -## ABP Community + + +## Mastering ABP Framework Book + +This book will help you to gain a complete understanding of the ABP Framework and modern web application development techniques. It is written by the creator and team lead of the ABP Framework. You can buy from [Amazon](https://www.amazon.com/gp/product/B097Z2DM8Q) or [Packt Publishing](https://www.packtpub.com/product/mastering-abp-framework/9781801079242). Find further info about the book at [abp.io/books/mastering-abp-framework](https://abp.io/books/mastering-abp-framework). + +![book-mastering-abp-framework](docs/en/images/book-mastering-abp-framework.png) + + + +## The Community ### ABP Community Web Site @@ -103,28 +115,31 @@ See the [sample projects](https://docs.abp.io/en/abp/latest/Samples/Index) built ### Want to Contribute? -ABP is a community-driven open source project. See [the contribution guide](https://docs.abp.io/en/abp/latest/Contribution/Index) if you want to be a part of this project. +ABP is a community-driven open-source project. See [the contribution guide](https://docs.abp.io/en/abp/latest/Contribution/Index) if you want to participate in this project. + + ## Official Links -* Main Web Site - * Get Started - * Features -* Documentation -* Samples -* Blog -* Community -* Stack overflow -* Twitter +* [Home Website](https://abp.io) + * [Get Started](https://abp.io/get-started) + * [Features](https://abp.io/features) +* [Documents](https://docs.abp.io/) +* [Samples](https://docs.abp.io/en/abp/latest/Samples/Index) +* [Blog](https://blog.abp.io/) +* [Community](https://community.abp.io/) +* [Stackoverflow](https://stackoverflow.com/questions/tagged/abp) +* [Twitter](https://twitter.com/abpframework) + + + +## Support ABP -## Support the ABP Framework +GitHub repository stars are an important indicator of popularity and the size of the community. If you like ABP Framework, support us by clicking the star :star: on the repository. -Love ABP Framework? **Please give a star** to this repository :star: -## Discord Channel -You can use this link to join the ABP Community Discord Server: https://discord.gg/abp +## Discord Server -## ABP Commercial +We have a Discord server where you can chat with other ABP users. Share your ideas, report technical issues, showcase your creations, share the tips that worked for you and catch up with the latest news and announcements about ABP Framework. Join 👉 https://discord.gg/abp. -See also [ABP Commercial](https://commercial.abp.io/) if you are looking for pre-built application modules, professional themes, code generation tooling and premium support for the ABP Framework. diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json index c667591160..cbe186e97c 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json @@ -632,6 +632,7 @@ "Menu:ReportsMenu": "Reports", "Permission:HeroSections": "Hero Sections", "RedirectLink": "Redirect link", - "HeroSectionsDeletionConfirmationMessage": "Are you sure you want to delete the hero section?" + "HeroSectionsDeletionConfirmationMessage": "Are you sure you want to delete the hero section?", + "AbpStudioName": "Abp Studio name" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en-GB.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en-GB.json index 347b18ce4b..dc59234777 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en-GB.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en-GB.json @@ -59,7 +59,7 @@ "MilestoneErrorMessage": "Couldn't get the current milestone details from Github.", "QuestionItemErrorMessage": "Couldn't get the latest question details from Stackoverflow.", "Oops": "Oops!", - "CreatePostSuccessMessage": "The Post has been successfully submitted. It will be published once it has been reviewed by the site admin.", + "CreatePostSuccessMessage": "Your post has been successfully submitted. It will be published after review by the site administrator.", "ChooseCoverImage": "Choose a cover image...", "CoverImage": "Cover Image", "ShareYourExperiencesWithTheABPFramework": "Share your experiences with the ABP Framework!", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json index ef07928c83..78231bb1af 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json @@ -16,7 +16,7 @@ "Title": "Title", "CreationTime": "Creation time", "Save": "Save", - "SameUrlAlreadyExist": "Same url already exists if you want to add this post, you should change the url!", + "SameUrlAlreadyExist": "Same URL already exists! You must change the URL!", "UrlIsNotValid": "Url is not valid.", "UrlNotFound": "Url not found.", "UrlContentNotFound": "Url content not found.", @@ -33,7 +33,7 @@ "FeatureRequest": "Feature Request", "CreatePostTitleInfo": "Title of the post to be shown on the post list.", "CreatePostSummaryInfo": "A short summary of the post to be shown on the post list. Maximum length: {0}", - "CreatePostCoverInfo": "For creating an effective post, add a cover photo. Upload 16:9 aspect ratio pictures for the best view.
Maximum file size: 1MB.", + "CreatePostCoverInfo": "To create an effective post, add a cover photo. Upload 16:9 aspect ratio pictures for the best view.
Maximum file size is 1MB.", "ThisExtensionIsNotAllowed": "This extension is not allowed.", "TheFileIsTooLarge": "The file is too large.", "GoToThePost": "Go to the Post", @@ -56,7 +56,7 @@ "MilestoneErrorMessage": "Could not get the current milestone details from Github.", "QuestionItemErrorMessage": "Could not get the latest question details from Stackoverflow.", "Oops": "Oops!", - "CreatePostSuccessMessage": "The Post has been successfully submitted. It will be published after a review from the site admin.", + "CreatePostSuccessMessage": "Your post has been successfully submitted. It will be published after review by the site administrator.", "Browse": "Browse", "CoverImage": "Cover Image", "ShareYourExperiencesWithTheABPFramework": "Share your experiences with the ABP Framework!", @@ -125,7 +125,7 @@ "YoutubeVideoSubmitStepTwo": "2. Submit the video URL using the form.", "YoutubeVideoSubmitStepThree": "3. Visitors will be able to watch your video content directly on this website.", "ExternalContent": "External Content", - "ExternalContentSubmitStepOne": "1. Create a content on any public platform (Medium, your own blog or anywhere you like).", + "ExternalContentSubmitStepOne": "1. Create content on any public platform (Medium, your own blog or anywhere you like).", "ExternalContentSubmitStepTwo": "2. Submit your content URL using the form.", "ExternalContentSubmitStepThree": "3. Visitors are redirected to the content on the original website.", "ChooseYourContentType": "Please choose the way you want to add your content.", @@ -135,12 +135,12 @@ "GitHubUserNameValidationMessage": "Your Github username can not include whitespace, please make sure your Github username is correct.", "PersonalSiteUrlValidationMessage": "Your personal site URL can not include whitespace, please make sure your personal site URL is correct.", "TwitterUserNameValidationMessage": "Your Twitter username can not include whitespace, please make sure your Twitter username is correct.", - "LinkedinUrlValidationMessage": "Your Linkedin URL can not include whitespace, please make sure your Linkedin URL is correct.", + "LinkedinUrlValidationMessage": "Your LinkedIn URL can not include whitespace, please make sure your LinkedIn URL is correct.", "NoPostsFound": "No posts found!", "SearchInPosts": "Search in posts...", "MinimumSearchContent": "You must enter at least 3 characters!", "Volo.AbpIo.Domain:060001": "Source URL(\"{PostUrl}\") is not Github URL", - "Volo.AbpIo.Domain:060002": "Post Content is not available from Github(\"{PostUrl}\") resource.", + "Volo.AbpIo.Domain:060002": "Post Content is not available from GitHub(\"{PostUrl}\") resource.", "Volo.AbpIo.Domain:060003": "No post content found!", "SeeMore": "See More", "JoinTheABPCommunity": "Join the ABP Community", @@ -171,14 +171,14 @@ "Discord_Page_Announce": "We are happy to announce ABP Community Discord Server!", "Discord_Page_Description_1": "ABP Community has been growing since day one. We wanted to take it to the next step by creating an official ABP Discord server so the ABP Community can interact with each other using the wonders of instant messaging.", "Discord_Page_Description_2": "ABP Community Discord Server is the place where you can showcase your creations using ABP Framework, share the tips that worked for you, catch up with the latest news and announcements about ABP Framework, just chat with community members to exchange ideas, and have fun!", - "Discord_Page_Description_3": "This ABP Community Discord Server is the official one with the ABP Core Team is present on the server to monitor.", + "Discord_Page_Description_3": "This ABP Community Discord Server is the official one with the ABP Core Team present on the server to monitor.", "Discord_Page_JoinToServer": "Join ABP Discord Server", "Events_Page_MetaTitle": "ABP Community Events", "Events_Page_MetaDescription": "The live shows, hosted by the ABP Team, are casual sessions full of community content, demos, Q&A, and discussions around what's happening in ABP.", "Events_Page_Title": "ABP Community Talks", "Members_Page_WritingFromUser": "Read writing from {0} on ABP Community.", "Post_Create_Page_MetaTitle": "New Post", - "Post_Create_Page_MetaDescription": "Create your post for sharing your experiences about ABP framework and contributing the ABP Community.", + "Post_Create_Page_MetaDescription": "Create your post for sharing your experiences about the ABP framework and contributing to the ABP Community.", "Post_Create_Page_CreateNewPost": "Create New Post", "Post_Index_Page_MetaDescription": "ABP Community's purpose is to create a contribution environment for developers who use the ABP framework.", "Layout_Title": "{0} | ABP Community", @@ -193,7 +193,7 @@ "AbpCommunityTitleContent": "ABP Community - Open Source ABP Framework", "CommunitySlogan": "A unique community platform for ABP Lovers", "RaffleIsNotActive": "Raffle is not active", - "YouAreAlreadyJoinedToThisRaffle": "You already joined to this raffle!", + "YouAreAlreadyJoinedToThisRaffle": "You already joined this raffle!", "InvalidSubscriptionCode": "Invalid subscription code", "Raffle:{0}": "Raffle: {0}", "Join": "Join", @@ -266,4 +266,4 @@ "DailyPostCreateLimitation": "You have reached the daily post creation limit. You can create a new post in {0}.", "YourAccountDisabled": "Your user account is disabled!" } -} \ No newline at end of file +} diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json index b8972317cf..0dc5f525b1 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json @@ -158,7 +158,7 @@ "IndexPageHeroSection": "open sourceWeb Application
Frameworkfor asp.net core", "UiFramework": "UI框架", "EmailAddress": "电子邮件地址", - "Mobile": "移动电话", + "Mobile": "选择移动应用程序框架", "ReactNative": "React Native", "Strong": "强大", "Complete": "完整", @@ -476,4 +476,4 @@ "ABPVideoCoursesPageDescription": "通过ABP团队创建的视频课程学习ABP框架的基础知识。在本视频系列中，您将学习ABP框架的基本主题。每个视频上的数字都是根据学习流程编写的。", "ABPVideoCoursesTitle": "ABP 基本视频" } -} \ No newline at end of file +} diff --git a/docs/en/CLI.md b/docs/en/CLI.md index e0eede9241..cb16fb2897 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -131,7 +131,7 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample * `--database-provider` or `-d`: Specifies the database provider. Default provider is `ef`. Available providers: * `ef`: Entity Framework Core. * `mongodb`: MongoDB. - * `--theme`: Specifes the theme. Default theme is `leptonx-lite`. Available themes: + * `--theme`: Specifies the theme. Default theme is `leptonx-lite`. Available themes: * `leptonx-lite`: [LeptonX Lite Theme](Themes/LeptonXLite/AspNetCore.md). * `basic`: [Basic Theme](UI/AspNetCore/Basic-Theme.md). * **`module`**: [Module template](Startup-Templates/Module.md). Additional options: @@ -147,7 +147,7 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample * `--database-provider` or `-d`: Specifies the database provider. Default provider is `ef`. Available providers: * `ef`: Entity Framework Core. * `mongodb`: MongoDB. - * `--theme`: Specifes the theme. Default theme is `leptonx-lite`. Available themes: + * `--theme`: Specifies the theme. Default theme is `leptonx-lite`. Available themes: * `leptonx-lite`: [LeptonX Lite Theme](Themes/LeptonXLite/AspNetCore.md). * `basic`: [Basic Theme](UI/AspNetCore/Basic-Theme.md). * **`maui`**: .NET MAUI. A minimalist .NET MAUI application will be created if you specify this option. diff --git a/docs/en/Data-Filtering.md b/docs/en/Data-Filtering.md index 830979e710..4706912fe7 100644 --- a/docs/en/Data-Filtering.md +++ b/docs/en/Data-Filtering.md @@ -217,17 +217,14 @@ protected override bool ShouldFilterEntity(IMutableEntityType entityTyp return base.ShouldFilterEntity(entityType); } -protected override Expression> CreateFilterExpression() +protected override Expression> CreateFilterExpression(ModelBuilder modelBuilder) { - var expression = base.CreateFilterExpression(); + var expression = base.CreateFilterExpression(modelBuilder); if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) { - Expression> isActiveFilter = - e => !IsActiveFilterEnabled || EF.Property(e, "IsActive"); - expression = expression == null - ? isActiveFilter - : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); + Expression> isActiveFilter = e => !IsActiveFilterEnabled || EF.Property(e, "IsActive"); + expression = expression == null ? isActiveFilter : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); } return expression; @@ -251,6 +248,78 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) } ```` +#### Using User-defined function mapping for global filters + +Using [User-defined function mapping](https://learn.microsoft.com/en-us/ef/core/querying/user-defined-function-mapping) for global filters will gain performance improvements. + +To use this feature, you need to change your DbContext like below: + +````csharp +protected bool IsActiveFilterEnabled => DataFilter?.IsEnabled() ?? false; + +protected override bool ShouldFilterEntity(IMutableEntityType entityType) +{ + if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) + { + return true; + } + + return base.ShouldFilterEntity(entityType); +} + +protected override Expression> CreateFilterExpression(ModelBuilder modelBuilder) +{ + var expression = base.CreateFilterExpression(modelBuilder); + + if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) + { + Expression> isActiveFilter = e => !IsActiveFilterEnabled || EF.Property(e, "IsActive"); + + if (UseDbFunction()) + { + isActiveFilter = e => IsActiveFilter(((IIsActive)e).IsActive, true); + + var abpEfCoreCurrentDbContext = this.GetService(); + modelBuilder.HasDbFunction(typeof(MyProjectNameDbContext).GetMethod(nameof(IsActiveFilter))!) + .HasTranslation(args => + { + // (bool isActive, bool boolParam) + var isActive = args[0]; + var boolParam = args[1]; + + if (abpEfCoreCurrentDbContext.Context?.DataFilter.IsEnabled() == true) + { + // isActive == true + return new SqlBinaryExpression( + ExpressionType.Equal, + isActive, + new SqlConstantExpression(Expression.Constant(true), boolParam.TypeMapping), + boolParam.Type, + boolParam.TypeMapping); + } + + // empty where sql + return new SqlConstantExpression(Expression.Constant(true), boolParam.TypeMapping); + }); + } + + expression = expression == null ? isActiveFilter : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); + } + + return expression; +} + +public static bool IsActiveFilter(bool isActive, bool boolParam) +{ + throw new NotSupportedException(AbpEfCoreDataFilterDbFunctionMethods.NotSupportedExceptionMessage); +} + +public override string GetCompiledQueryCacheKey() +{ + return $"{base.GetCompiledQueryCacheKey()}:{IsActiveFilterEnabled}"; +} +```` + ### MongoDB ABP abstracts the `IMongoDbRepositoryFilterer` interface to implement data filtering for the [MongoDB Integration](MongoDB.md), it works only if you use the repositories properly. Otherwise, you should manually filter the data. diff --git a/docs/en/Local-Event-Bus.md b/docs/en/Local-Event-Bus.md index 81c0c5a171..5c5d967f5f 100644 --- a/docs/en/Local-Event-Bus.md +++ b/docs/en/Local-Event-Bus.md @@ -235,6 +235,13 @@ Pre-build events are published when you save changes to the database; * For EF Core, they are published on `DbContext.SaveChanges`. * For MongoDB, they are published when you call repository's `InsertAsync`, `UpdateAsync` or `DeleteAsync` methods (since MongoDB has not a change tracking system). +#### AbpEntityChangeOptions + +There is a `PublishEntityUpdatedEventWhenNavigationChanges` option in the `AbpEntityChangeOptions` class with a default value of `true`. +If you set it to `false`, the `EntityUpdatedEventData` will not be published when a navigation property changes. + +> This option is only used for the EF Core. + ## See Also * [Distributed Event Bus](Distributed-Event-Bus.md) diff --git a/docs/en/Modules/Cms-Kit/Comments.md b/docs/en/Modules/Cms-Kit/Comments.md index ddd39fc675..4eca4cb93d 100644 --- a/docs/en/Modules/Cms-Kit/Comments.md +++ b/docs/en/Modules/Cms-Kit/Comments.md @@ -80,6 +80,12 @@ You can also view and manage replies on this page. ![comments-detail](../../images/cmskit-module-comments-detail.png) +## Settings + +You can configure the approval status of comments using the "Comment" tab under the "Cms" section on the Settings page. When this feature is enabled, you can approve and reject comments. In this way, users can only see the comments that you approve. By default, this feature is set to "false." + +![comments-settings](../../images/cmskit-module-comments-settings.png) + ## Internals ### Domain Layer diff --git a/docs/en/UI/AspNetCore/Static-JavaScript-Proxies.md b/docs/en/UI/AspNetCore/Static-JavaScript-Proxies.md index fffc53cf83..2ad46a2f9d 100644 --- a/docs/en/UI/AspNetCore/Static-JavaScript-Proxies.md +++ b/docs/en/UI/AspNetCore/Static-JavaScript-Proxies.md @@ -66,7 +66,7 @@ acme.bookStore.authors.author.get = function(id, ajaxParams) { }; ```` -> `generate-proxy` command generates proxies for only the APIs you've defined in your application (assumes `app` as the module name). If you are developing a modular application, you can specify the `-m` (or `--module`) parameter to specify the module you want to generate proxies. See the *generate-proxy* section in the [ABP CLI](../CLI.md) documentation for other options. +> `generate-proxy` command generates proxies for only the APIs you've defined in your application (assumes `app` as the module name). If you are developing a modular application, you can specify the `-m` (or `--module`) parameter to specify the module you want to generate proxies. See the *generate-proxy* section in the [ABP CLI](../../CLI.md) documentation for other options. ### Using the Proxy Functions @@ -154,4 +154,4 @@ See the [jQuery.ajax](https://api.jquery.com/jQuery.ajax/) documentation for all * [Dynamic JavaScript API Client Proxies](Dynamic-JavaScript-Proxies.md) * [Auto API Controllers](../../API/Auto-API-Controllers.md) -* [Web Application Development Tutorial](../../Tutorials/Part-1.md) \ No newline at end of file +* [Web Application Development Tutorial](../../Tutorials/Part-1.md) diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index d30322e277..d45a304039 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -1165,6 +1165,10 @@ "text": "Ellipsis", "path": "UI/Angular/Ellipsis-Directive.md" }, + { + "text": "Projection Strategy", + "path": "UI/Angular/Projection-Strategy.md" + }, { "text": "Context Strategy", "path": "UI/Angular/Context-Strategy.md" diff --git a/docs/en/images/book-mastering-abp-framework.png b/docs/en/images/book-mastering-abp-framework.png index c2a98a02a5..7a25f583d3 100644 Binary files a/docs/en/images/book-mastering-abp-framework.png and b/docs/en/images/book-mastering-abp-framework.png differ diff --git a/docs/en/images/cmskit-module-comments-settings.png b/docs/en/images/cmskit-module-comments-settings.png new file mode 100644 index 0000000000..3c5a60d571 Binary files /dev/null and b/docs/en/images/cmskit-module-comments-settings.png differ diff --git a/docs/en/images/db-options.png b/docs/en/images/db-options.png index 368377f5a3..0c581c4883 100644 Binary files a/docs/en/images/db-options.png and b/docs/en/images/db-options.png differ diff --git a/docs/en/images/ddd-microservice-simple.png b/docs/en/images/ddd-microservice-simple.png index f4195bff9d..6588c2c753 100644 Binary files a/docs/en/images/ddd-microservice-simple.png and b/docs/en/images/ddd-microservice-simple.png differ diff --git a/docs/en/images/ui-options.png b/docs/en/images/ui-options.png index 6f0d19b73e..6affab9d21 100644 Binary files a/docs/en/images/ui-options.png and b/docs/en/images/ui-options.png differ diff --git a/docs/zh-Hans/Data-Filtering.md b/docs/zh-Hans/Data-Filtering.md index 8a43ad93b1..01c4590761 100644 --- a/docs/zh-Hans/Data-Filtering.md +++ b/docs/zh-Hans/Data-Filtering.md @@ -166,17 +166,14 @@ protected override bool ShouldFilterEntity(IMutableEntityType entityTyp return base.ShouldFilterEntity(entityType); } -protected override Expression> CreateFilterExpression() +protected override Expression> CreateFilterExpression(ModelBuilder modelBuilder) { - var expression = base.CreateFilterExpression(); + var expression = base.CreateFilterExpression(modelBuilder); if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) { - Expression> isActiveFilter = - e => !IsActiveFilterEnabled || EF.Property(e, "IsActive"); - expression = expression == null - ? isActiveFilter - : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); + Expression> isActiveFilter = e => !IsActiveFilterEnabled || EF.Property(e, "IsActive"); + expression = expression == null ? isActiveFilter : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); } return expression; @@ -186,6 +183,78 @@ protected override Expression> CreateFilterExpression DataFilter?.IsEnabled() ?? false; + +protected override bool ShouldFilterEntity(IMutableEntityType entityType) +{ + if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) + { + return true; + } + + return base.ShouldFilterEntity(entityType); +} + +protected override Expression> CreateFilterExpression(ModelBuilder modelBuilder) +{ + var expression = base.CreateFilterExpression(modelBuilder); + + if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity))) + { + Expression> isActiveFilter = e => !IsActiveFilterEnabled || EF.Property(e, "IsActive"); + + if (UseDbFunction()) + { + isActiveFilter = e => IsActiveFilter(((IIsActive)e).IsActive, true); + + var abpEfCoreCurrentDbContext = this.GetService(); + modelBuilder.HasDbFunction(typeof(MyProjectNameDbContext).GetMethod(nameof(IsActiveFilter))!) + .HasTranslation(args => + { + // (bool isActive, bool boolParam) + var isActive = args[0]; + var boolParam = args[1]; + + if (abpEfCoreCurrentDbContext.Context?.DataFilter.IsEnabled() == true) + { + // isActive == true + return new SqlBinaryExpression( + ExpressionType.Equal, + isActive, + new SqlConstantExpression(Expression.Constant(true), boolParam.TypeMapping), + boolParam.Type, + boolParam.TypeMapping); + } + + // empty where sql + return new SqlConstantExpression(Expression.Constant(true), boolParam.TypeMapping); + }); + } + + expression = expression == null ? isActiveFilter : QueryFilterExpressionHelper.CombineExpressions(expression, isActiveFilter); + } + + return expression; +} + +public static bool IsActiveFilter(bool isActive, bool boolParam) +{ + throw new NotSupportedException(AbpEfCoreDataFilterDbFunctionMethods.NotSupportedExceptionMessage); +} + +public override string GetCompiledQueryCacheKey() +{ + return $"{base.GetCompiledQueryCacheKey()}:{IsActiveFilterEnabled}"; +} +```` + ### MongoDB ABP抽象了 `IMongoDbRepositoryFilterer` 接口为[MongoDB 集成](MongoDB.md)实现数据过滤, 只有正确的使用仓储,它才会工作. 否则你需要手动过滤数据. diff --git a/docs/zh-Hans/Local-Event-Bus.md b/docs/zh-Hans/Local-Event-Bus.md index 7a842a9e98..ebdb3f20a6 100644 --- a/docs/zh-Hans/Local-Event-Bus.md +++ b/docs/zh-Hans/Local-Event-Bus.md @@ -211,6 +211,14 @@ namespace AbpDemo * 对于 EF Core, 他们在 `DbContext.SaveChanges` 发布. * 对于 MongoDB, 在你调用仓储的 `InsertAsync`, `UpdateAsync` 或 `DeleteAsync` 方法发布(因为MongoDB没有更改追踪系统). + +#### AbpEntityChangeOptions + +`AbpEntityChangeOptions`类中有一个`PublishEntityUpdatedEventWhenNavigationChanges`选项，默认值为`true`。 +如果将其设置为`false`，则当导航属性更改时，将不会发布`EntityUpdatedEventData`事件。 + +> 此选项仅用于EF Core + ## 另请参阅 * [分布式事件总线](Distributed-Event-Bus.md) \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs index e518b54a95..b54c90abf8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Components.Server.Theming.Bundling; diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs index 42d354dc5d..3e186b9d0f 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Volo.Abp.AspNetCore.Components.DependencyInjection; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.Modularity; using Volo.Abp.UI; diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebOptions.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebOptions.cs index 2f5b8ca886..7ea40e6170 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebOptions.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.AspNetCore.Components.Server; +namespace Volo.Abp.AspNetCore.Components.Web; public class AbpAspNetCoreComponentsWebOptions { diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs index 25a57616e4..b4ea3cb50c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; -using Volo.Abp.AspNetCore.Components.Server; using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Web.ExceptionHandling; using Volo.Abp.AspNetCore.Components.Web.Security; diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ClientProxyExceptionEventHandler.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ClientProxyExceptionEventHandler.cs index d6a4257496..a4d615123c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ClientProxyExceptionEventHandler.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ClientProxyExceptionEventHandler.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Microsoft.JSInterop; -using Volo.Abp.AspNetCore.Components.Server; using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.DependencyInjection; using Volo.Abp.EventBus; diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs index 91bc360f72..0d70ae6aa9 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs @@ -22,8 +22,9 @@ public abstract class BackgroundWorkerBase : IBackgroundWorker protected ILogger Logger => LazyServiceProvider.LazyGetService(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance); - protected CancellationTokenSource StoppingTokenSource { get; } - protected CancellationToken StoppingToken { get; } + protected CancellationTokenSource StoppingTokenSource { get; set; } + + protected CancellationToken StoppingToken { get; set; } public BackgroundWorkerBase() { diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs index a3cd7372a6..2773b88bed 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs @@ -46,6 +46,12 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions public static string? GetDateEditInputFormatOrNull(this IBasicObjectExtensionPropertyInfo property) { + var dataFormatString = property.GetDataFormatStringOrNull(); + if (dataFormatString != null) + { + return dataFormatString; + } + if (property.IsDate()) { return "{0:yyyy-MM-dd}"; @@ -59,6 +65,14 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions return null; } + public static string? GetDataFormatStringOrNull(this IBasicObjectExtensionPropertyInfo property) + { + return property + .Attributes + .OfType() + .FirstOrDefault()?.DataFormatString; + } + public static string? GetTextInputValueOrNull(this IBasicObjectExtensionPropertyInfo property, object? value) { if (value == null) diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs index 8e494cba2f..ad0f996654 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.BlazoriseUI.Components; public partial class UiPageProgress : ComponentBase, IDisposable { - protected PageProgress PageProgressRef { get; set; } = default!; + protected PageProgress? PageProgressRef { get; set; } protected int? Percentage { get; set; } @@ -33,8 +33,11 @@ public partial class UiPageProgress : ComponentBase, IDisposable Visible = e.Percentage == null || (e.Percentage >= 0 && e.Percentage <= 100); Color = GetColor(e.Options.Type); - await PageProgressRef.SetValueAsync(e.Percentage); - + if(PageProgressRef != null) + { + await PageProgressRef.SetValueAsync(e.Percentage); + } + await InvokeAsync(StateHasChanged); } diff --git a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs index 768a9ba171..c5ae0b5393 100644 --- a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs +++ b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Caching.Distributed; @@ -19,6 +20,8 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems protected static readonly string SlidingExpirationKey; protected static readonly string DataKey; protected static readonly long NotPresent; + protected static readonly RedisValue[] HashMembersAbsoluteExpirationSlidingExpirationData; + protected static readonly RedisValue[] HashMembersAbsoluteExpirationSlidingExpiration; private readonly static FieldInfo SetScriptField; private readonly static FieldInfo RedisDatabaseField; @@ -27,29 +30,29 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems private readonly static MethodInfo MapMetadataMethod; private readonly static MethodInfo GetAbsoluteExpirationMethod; private readonly static MethodInfo GetExpirationInSecondsMethod; + private readonly static MethodInfo OnRedisErrorMethod; - protected IDatabase RedisDatabase => GetRedisDatabase()!; - private IDatabase? _redisDatabase; - - protected string Instance { get; } + protected RedisKey InstancePrefix { get; } static AbpRedisCache() { var type = typeof(RedisCache); - RedisDatabaseField = Check.NotNull(type.GetField("_cache", BindingFlags.Instance | BindingFlags.NonPublic), nameof(RedisDatabaseField))!; + RedisDatabaseField = Check.NotNull(type.GetField("_cache", BindingFlags.Instance | BindingFlags.NonPublic), nameof(RedisDatabaseField)); - SetScriptField = Check.NotNull(type.GetField("_setScript", BindingFlags.Instance | BindingFlags.NonPublic), nameof(SetScriptField))!; + SetScriptField = Check.NotNull(type.GetField("_setScript", BindingFlags.Instance | BindingFlags.NonPublic), nameof(SetScriptField)); - ConnectMethod = Check.NotNull(type.GetMethod("Connect", BindingFlags.Instance | BindingFlags.NonPublic), nameof(ConnectMethod))!; + ConnectMethod = Check.NotNull(type.GetMethod("Connect", BindingFlags.Instance | BindingFlags.NonPublic), nameof(ConnectMethod)); - ConnectAsyncMethod = Check.NotNull(type.GetMethod("ConnectAsync", BindingFlags.Instance | BindingFlags.NonPublic), nameof(ConnectAsyncMethod))!; + ConnectAsyncMethod = Check.NotNull(type.GetMethod("ConnectAsync", BindingFlags.Instance | BindingFlags.NonPublic), nameof(ConnectAsyncMethod)); - MapMetadataMethod = Check.NotNull(type.GetMethod("MapMetadata", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static), nameof(MapMetadataMethod))!; + MapMetadataMethod = Check.NotNull(type.GetMethod("MapMetadata", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static), nameof(MapMetadataMethod)); - GetAbsoluteExpirationMethod = Check.NotNull(type.GetMethod("GetAbsoluteExpiration", BindingFlags.Static | BindingFlags.NonPublic), nameof(GetAbsoluteExpirationMethod))!; + GetAbsoluteExpirationMethod = Check.NotNull(type.GetMethod("GetAbsoluteExpiration", BindingFlags.Static | BindingFlags.NonPublic), nameof(GetAbsoluteExpirationMethod)); - GetExpirationInSecondsMethod = Check.NotNull(type.GetMethod("GetExpirationInSeconds", BindingFlags.Static | BindingFlags.NonPublic), nameof(GetExpirationInSecondsMethod))!; + GetExpirationInSecondsMethod = Check.NotNull(type.GetMethod("GetExpirationInSeconds", BindingFlags.Static | BindingFlags.NonPublic), nameof(GetExpirationInSecondsMethod)); + + OnRedisErrorMethod = Check.NotNull(type.GetMethod("OnRedisError", BindingFlags.Instance | BindingFlags.NonPublic), nameof(OnRedisErrorMethod)); AbsoluteExpirationKey = type.GetField("AbsoluteExpirationKey", BindingFlags.Static | BindingFlags.NonPublic)!.GetValue(null)!.ToString()!; @@ -58,32 +61,30 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems DataKey = type.GetField("DataKey", BindingFlags.Static | BindingFlags.NonPublic)!.GetValue(null)!.ToString()!; NotPresent = type.GetField("NotPresent", BindingFlags.Static | BindingFlags.NonPublic)!.GetValue(null)!.To(); + + HashMembersAbsoluteExpirationSlidingExpirationData = [AbsoluteExpirationKey, SlidingExpirationKey, DataKey]; + + HashMembersAbsoluteExpirationSlidingExpiration = [AbsoluteExpirationKey, SlidingExpirationKey]; } public AbpRedisCache(IOptions optionsAccessor) : base(optionsAccessor) { - Instance = optionsAccessor.Value.InstanceName ?? string.Empty; - } - - protected virtual void Connect() - { - if (GetRedisDatabase() != null) + var instanceName = optionsAccessor.Value.InstanceName; + if (!string.IsNullOrEmpty(instanceName)) { - return; + InstancePrefix = (RedisKey)Encoding.UTF8.GetBytes(instanceName); } + } - ConnectMethod.Invoke(this, Array.Empty()); + protected virtual IDatabase Connect() + { + return (IDatabase)ConnectMethod.Invoke(this, Array.Empty())!; } - protected virtual async Task ConnectAsync(CancellationToken token = default) + protected virtual async ValueTask ConnectAsync(CancellationToken token = default) { - if (GetRedisDatabase() != null) - { - return; - } - - await (Task)ConnectAsyncMethod.Invoke(this, new object[] { token })!; + return await (ValueTask)ConnectAsyncMethod.Invoke(this, new object[] { token })!; } public byte[]?[] GetMany( @@ -107,9 +108,17 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems IEnumerable> items, DistributedCacheEntryOptions options) { - Connect(); + var cache = Connect(); - Task.WaitAll(PipelineSetMany(items, options)); + try + { + Task.WaitAll(PipelineSetMany(cache, items, options)); + } + catch (Exception ex) + { + OnRedisError(ex, cache); + throw; + } } public async Task SetManyAsync( @@ -119,9 +128,17 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems { token.ThrowIfCancellationRequested(); - await ConnectAsync(token); + var cache = await ConnectAsync(token); - await Task.WhenAll(PipelineSetMany(items, options)); + try + { + await Task.WhenAll(PipelineSetMany(cache, items, options)); + } + catch (Exception ex) + { + OnRedisError(ex, cache); + throw; + } } public void RefreshMany( @@ -145,9 +162,17 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems { keys = Check.NotNull(keys, nameof(keys)); - Connect(); + var cache = Connect(); - RedisDatabase.KeyDelete(keys.Select(key => (RedisKey)(Instance + key)).ToArray()); + try + { + cache.KeyDelete(keys.Select(key => InstancePrefix.Append(key)).ToArray()); + } + catch (Exception ex) + { + OnRedisError(ex, cache); + throw; + } } public async Task RemoveManyAsync(IEnumerable keys, CancellationToken token = default) @@ -155,33 +180,40 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems keys = Check.NotNull(keys, nameof(keys)); token.ThrowIfCancellationRequested(); - await ConnectAsync(token); + var cache = await ConnectAsync(token); - await RedisDatabase.KeyDeleteAsync(keys.Select(key => (RedisKey)(Instance + key)).ToArray()); + try + { + await cache.KeyDeleteAsync(keys.Select(key => InstancePrefix.Append(key)).ToArray()); + } + catch (Exception ex) + { + OnRedisError(ex, cache); + throw; + } } protected virtual byte[]?[] GetAndRefreshMany( IEnumerable keys, bool getData) { - Connect(); + var cache = Connect(); - var keyArray = keys.Select(key => Instance + key).ToArray(); - RedisValue[][] results; + var keyArray = keys.Select(key => InstancePrefix.Append( key)).ToArray(); + byte[]?[] bytes; - if (getData) + try { - results = RedisDatabase.HashMemberGetMany(keyArray, AbsoluteExpirationKey, - SlidingExpirationKey, DataKey); + var results = cache.HashMemberGetMany(keyArray, GetHashFields(getData)); + + Task.WaitAll(PipelineRefreshManyAndOutData(cache, keyArray, results, out bytes)); } - else + catch (Exception ex) { - results = RedisDatabase.HashMemberGetMany(keyArray, AbsoluteExpirationKey, - SlidingExpirationKey); + OnRedisError(ex, cache); + throw; } - Task.WaitAll(PipelineRefreshManyAndOutData(keyArray, results, out var bytes)); - return bytes; } @@ -192,29 +224,28 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems { token.ThrowIfCancellationRequested(); - await ConnectAsync(token); + var cache = await ConnectAsync(token); - var keyArray = keys.Select(key => Instance + key).ToArray(); - RedisValue[][] results; + var keyArray = keys.Select(key => InstancePrefix.Append(key)).ToArray(); + byte[]?[] bytes; - if (getData) + try { - results = await RedisDatabase.HashMemberGetManyAsync(keyArray, AbsoluteExpirationKey, - SlidingExpirationKey, DataKey); + var results = await cache.HashMemberGetManyAsync(keyArray, GetHashFields(getData)); + await Task.WhenAll(PipelineRefreshManyAndOutData(cache, keyArray, results, out bytes)); } - else + catch (Exception ex) { - results = await RedisDatabase.HashMemberGetManyAsync(keyArray, AbsoluteExpirationKey, - SlidingExpirationKey); + OnRedisError(ex, cache); + throw; } - - await Task.WhenAll(PipelineRefreshManyAndOutData(keyArray, results, out var bytes)); - + return bytes; } protected virtual Task[] PipelineRefreshManyAndOutData( - string[] keys, + IDatabase cache, + RedisKey[] keys, RedisValue[][] results, out byte[]?[] bytes) { @@ -241,7 +272,7 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems expr = sldExpr; } - tasks[i] = RedisDatabase.KeyExpireAsync(keys[i], expr); + tasks[i] = cache.KeyExpireAsync(keys[i], expr); } else { @@ -263,6 +294,7 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems } protected virtual Task[] PipelineSetMany( + IDatabase cache, IEnumerable> items, DistributedCacheEntryOptions options) { @@ -276,14 +308,13 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems for (var i = 0; i < itemArray.Length; i++) { - tasks[i] = RedisDatabase.ScriptEvaluateAsync(GetSetScript(), new RedisKey[] { Instance + itemArray[i].Key }, - new RedisValue[] - { - absoluteExpiration?.Ticks ?? NotPresent, + tasks[i] = cache.ScriptEvaluateAsync(GetSetScript(), new RedisKey[] { InstancePrefix.Append(itemArray[i].Key) }, + [ + absoluteExpiration?.Ticks ?? NotPresent, options.SlidingExpiration?.Ticks ?? NotPresent, GetExpirationInSeconds(creationTime, absoluteExpiration, options) ?? NotPresent, itemArray[i].Value - }); + ]); } return tasks; @@ -316,14 +347,21 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems { return (DateTimeOffset?)GetAbsoluteExpirationMethod.Invoke(null, new object[] { creationTime, options }); } - - private IDatabase? GetRedisDatabase() + + protected virtual void OnRedisError(Exception ex, IDatabase cache) { - return _redisDatabase ??= RedisDatabaseField.GetValue(this) as IDatabase; + OnRedisErrorMethod.Invoke(this, [ex, cache]); } private string GetSetScript() { return SetScriptField.GetValue(this)!.ToString()!; } + + private static RedisValue[] GetHashFields(bool getData) + { + return getData + ? HashMembersAbsoluteExpirationSlidingExpirationData + : HashMembersAbsoluteExpirationSlidingExpiration; + } } diff --git a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisExtensions.cs b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisExtensions.cs index 5954c06121..840a77fb28 100644 --- a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisExtensions.cs +++ b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisExtensions.cs @@ -8,16 +8,15 @@ public static class AbpRedisExtensions { public static RedisValue[][] HashMemberGetMany( this IDatabase cache, - string[] keys, - params string[] members) + RedisKey[] keys, + RedisValue[] fields) { var tasks = new Task[keys.Length]; - var fields = members.Select(member => (RedisValue)member).ToArray(); var results = new RedisValue[keys.Length][]; for (var i = 0; i < keys.Length; i++) { - tasks[i] = cache.HashGetAsync((RedisKey)keys[i], fields); + tasks[i] = cache.HashGetAsync(keys[i], fields); } for (var i = 0; i < tasks.Length; i++) @@ -28,17 +27,16 @@ public static class AbpRedisExtensions return results; } - public static async Task HashMemberGetManyAsync( + public async static Task HashMemberGetManyAsync( this IDatabase cache, - string[] keys, - params string[] members) + RedisKey[] keys, + RedisValue[] fields) { var tasks = new Task[keys.Length]; - var fields = members.Select(member => (RedisValue)member).ToArray(); for (var i = 0; i < keys.Length; i++) { - tasks[i] = cache.HashGetAsync((RedisKey)keys[i], fields); + tasks[i] = cache.HashGetAsync(keys[i], fields); } return await Task.WhenAll(tasks); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 5d916931bf..3c9aa74910 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -83,6 +83,7 @@ public class CliService : ITransientDependency catch (CliUsageException usageException) { Logger.LogWarning(usageException.Message); + Environment.ExitCode = 1; } catch (Exception ex) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs index 35d23e8f21..7e708ea0c1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs @@ -84,7 +84,7 @@ public class UpdateCommand : IConsoleCommand, ITransientDependency return; } - var project = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.csproj").FirstOrDefault(); + var project = Directory.GetFiles(directory, "*.csproj").FirstOrDefault(); if (project != null) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleInfo.cs index 95f41b8440..553851e789 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ModuleInfo.cs @@ -4,6 +4,8 @@ public class ModuleInfo { public string Name { get; set; } + public string AbpStudioName { get; set; } + public string Namespace { get; set; } public string DocumentUrl { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs index 450434d219..ff8174dec7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs @@ -37,7 +37,9 @@ public class ChangeThemeStep : ProjectBuildPipelineStep { var defaultThemeName = context.BuildArgs.TemplateName is AppTemplate.TemplateName or AppNoLayersTemplate.TemplateName ? LeptonXLite : LeptonX; - + + new RemoveFilesStep($"/Themes/{defaultThemeName}").Execute(context); + ChangeThemeToBasicForMvcProjects(context, defaultThemeName); ChangeThemeToBasicForBlazorProjects(context, defaultThemeName); ChangeThemeToBasicForBlazorServerProjects(context, defaultThemeName); @@ -627,11 +629,16 @@ public class ChangeThemeStep : ProjectBuildPipelineStep private static void ChangeThemeToBasicForMvcProjects(ProjectBuildContext context, string defaultThemeName) { - var projectNames = new[] + var projectNames = new List { - ".Web", ".HttpApi.Host", ".AuthServer", ".Web.Public", ".Web.Public.Host", + ".Web", ".AuthServer", ".Web.Public", ".Web.Public.Host", "" //for app-nolayers-mvc }; + + if(!context.Symbols.Contains("tiered")) + { + projectNames.Add(".HttpApi.Host"); + } foreach (var projectName in projectNames) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFileStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFileStep.cs index 8e66d26547..13880fef9d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFileStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFileStep.cs @@ -1,18 +1,21 @@ -using System; - -namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; public class RemoveFileStep : ProjectBuildPipelineStep { private readonly string _filePath; - public RemoveFileStep(string filePath) + private readonly bool _fullPath; + + public RemoveFileStep(string filePath, bool fullPath = true) { _filePath = filePath; + _fullPath = fullPath; } public override void Execute(ProjectBuildContext context) { - var fileToRemove = context.Files.Find(x => x.Name == _filePath);; + var fileToRemove = _fullPath + ? context.Files.Find(x => x.Name == _filePath) + : context.Files.Find(x => x.Name.EndsWith(_filePath)); if (fileToRemove != null) { context.Files.Remove(fileToRemove); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs index 6ce94eaaae..c83a5fc29d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs @@ -249,6 +249,11 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo steps.Add(new ChangeThemeStyleStep()); } + if (context.BuildArgs.Theme != Theme.LeptonX) + { + steps.Add(new RemoveFileStep("LeptonXFooter.razor", false)); + } + RemoveThemeLogoFolders(context, steps); if (IsDefaultThemeForTemplate(context.BuildArgs)) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 77da8469a7..ff656d7598 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -235,6 +235,10 @@ public abstract class AppTemplateBase : TemplateInfo { steps.Add(new ChangeThemeStyleStep()); } + else + { + steps.Add(new RemoveFileStep("LeptonXFooter.razor", false)); + } RemoveThemeLogoFolders(context, steps); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index a70f1db649..c462be1a60 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs @@ -49,6 +49,10 @@ public abstract class MicroserviceTemplateBase : TemplateInfo steps.Add(new ChangeThemeStyleStep()); return; } + else + { + steps.Add(new RemoveFileStep("LeptonXFooter.razor", false)); + } steps.Add(new ChangeThemeStep()); ReplaceLeptonXThemePackagesFromPackageJsonFiles(steps, uiFramework: context.BuildArgs.UiFramework, theme: context.BuildArgs.Theme, version: context.BuildArgs.Version ?? context.TemplateFile.Version); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs index e69f7f3da2..fa47442514 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs @@ -250,6 +250,17 @@ public class NpmPackagesUpdater : ITransientDependency return false; } + var prefix = string.Empty; + if (package.Value.ToString().StartsWith("~")) + { + prefix = "~"; + } + else if (package.Value.ToString().StartsWith("^")) + { + prefix = "^"; + } + + version = prefix + version.RemovePreFix("~", "^"); package.Value.Replace(version); Logger.LogInformation( diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs index 804f0688a3..8c5f40506d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs @@ -12,12 +12,12 @@ public class CmdHelper : ICmdHelper, ITransientDependency private const int SuccessfulExitCode = 0; protected AbpCliOptions CliOptions { get; } - + public CmdHelper(IOptionsSnapshot cliOptions) { CliOptions = cliOptions.Value; } - + public void Open(string pathOrUrl) { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) @@ -43,7 +43,7 @@ public class CmdHelper : ICmdHelper, ITransientDependency { HideNewCommandWindow(procStartInfo); } - + Process.Start(procStartInfo)?.WaitForExit(); } @@ -74,6 +74,7 @@ public class CmdHelper : ICmdHelper, ITransientDependency process?.WaitForExit(); exitCode = process.ExitCode; + Environment.ExitCode = exitCode; } } @@ -144,6 +145,7 @@ public class CmdHelper : ICmdHelper, ITransientDependency process.WaitForExit(); exitCode = process.ExitCode; + Environment.ExitCode = exitCode; } return output.Trim(); @@ -160,7 +162,7 @@ public class CmdHelper : ICmdHelper, ITransientDependency { procStartInfo.WorkingDirectory = workingDirectory; } - + if (CliOptions.AlwaysHideExternalCommandOutput) { HideNewCommandWindow(procStartInfo); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Version/PackageVersionCheckerService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Version/PackageVersionCheckerService.cs index 75c67a4f64..2266a0d30c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Version/PackageVersionCheckerService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Version/PackageVersionCheckerService.cs @@ -62,7 +62,7 @@ public class PackageVersionCheckerService : ITransientDependency public async Task GetLatestVersionOrNullAsync(string packageId, bool includeNightly = false, bool includeReleaseCandidates = false) { - if (!includeNightly && !includeReleaseCandidates && !packageId.Contains("LeptonX")) + if (!includeNightly && !includeReleaseCandidates && !packageId.Contains("LeptonX") && !packageId.StartsWith("Volo.Abp.Studio.")) { return await GetLatestStableVersionFromGithubAsync(); } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Check.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Check.cs index 0e6820c913..d50a19401e 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Check.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Check.cs @@ -10,7 +10,7 @@ public static class Check { [ContractAnnotation("value:null => halt")] public static T NotNull( - T? value, + [System.Diagnostics.CodeAnalysis.NotNull] T? value, [InvokerParameterName][NotNull] string parameterName) { if (value == null) @@ -23,7 +23,7 @@ public static class Check [ContractAnnotation("value:null => halt")] public static T NotNull( - T? value, + [System.Diagnostics.CodeAnalysis.NotNull] T? value, [InvokerParameterName][NotNull] string parameterName, string message) { @@ -37,7 +37,7 @@ public static class Check [ContractAnnotation("value:null => halt")] public static string NotNull( - string? value, + [System.Diagnostics.CodeAnalysis.NotNull] string? value, [InvokerParameterName][NotNull] string parameterName, int maxLength = int.MaxValue, int minLength = 0) @@ -62,7 +62,7 @@ public static class Check [ContractAnnotation("value:null => halt")] public static string NotNullOrWhiteSpace( - string? value, + [System.Diagnostics.CodeAnalysis.NotNull] string? value, [InvokerParameterName][NotNull] string parameterName, int maxLength = int.MaxValue, int minLength = 0) @@ -87,7 +87,7 @@ public static class Check [ContractAnnotation("value:null => halt")] public static string NotNullOrEmpty( - string? value, + [System.Diagnostics.CodeAnalysis.NotNull] string? value, [InvokerParameterName][NotNull] string parameterName, int maxLength = int.MaxValue, int minLength = 0) @@ -111,7 +111,9 @@ public static class Check } [ContractAnnotation("value:null => halt")] - public static ICollection NotNullOrEmpty(ICollection? value, [InvokerParameterName][NotNull] string parameterName) + public static ICollection NotNullOrEmpty( + [System.Diagnostics.CodeAnalysis.NotNull] ICollection? value, + [InvokerParameterName][NotNull] string parameterName) { if (value == null || value.Count <= 0) { @@ -339,7 +341,7 @@ public static class Check } public static T NotDefaultOrNull( - T? value, + [System.Diagnostics.CodeAnalysis.NotNull] T? value, [InvokerParameterName][NotNull] string parameterName) where T : struct { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs index f05ce07239..bfbf4e018a 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs @@ -60,7 +60,7 @@ public class ExposeServicesAttribute : Attribute, IExposedServiceTypesProvider interfaceName = interfaceName.Right(interfaceName.Length - 1); } - if (type.Name.EndsWith(interfaceName)) + if (type.Name.EndsWith(interfaceName, StringComparison.OrdinalIgnoreCase)) { serviceTypes.Add(interfaceType); } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/MySQL/AbpEntityFrameworkCoreMySQLModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/MySQL/AbpEntityFrameworkCoreMySQLModule.cs index 6431590230..0b493f5058 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/MySQL/AbpEntityFrameworkCoreMySQLModule.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/MySQL/AbpEntityFrameworkCoreMySQLModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Guids; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; +using Volo.Abp.Guids; using Volo.Abp.Modularity; namespace Volo.Abp.EntityFrameworkCore.MySQL; @@ -17,5 +18,10 @@ public class AbpEntityFrameworkCoreMySQLModule : AbpModule options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsString; } }); + + Configure(options => + { + options.UseDbFunction = true; + }); } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs index 3b4129b272..317f664b04 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; using Volo.Abp.Guids; using Volo.Abp.Modularity; @@ -18,5 +19,10 @@ public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary; } }); + + Configure(options => + { + options.UseDbFunction = true; + }); } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/Oracle/AbpEntityFrameworkCoreOracleModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/Oracle/AbpEntityFrameworkCoreOracleModule.cs index 54627a90c0..76ffe32f7a 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/Oracle/AbpEntityFrameworkCoreOracleModule.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/Oracle/AbpEntityFrameworkCoreOracleModule.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; using Volo.Abp.Guids; using Volo.Abp.Modularity; @@ -16,5 +17,10 @@ public class AbpEntityFrameworkCoreOracleModule : AbpModule options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary; } }); + + Configure(options => + { + options.UseDbFunction = true; + }); } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/PostgreSql/AbpEntityFrameworkCorePostgreSqlModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/PostgreSql/AbpEntityFrameworkCorePostgreSqlModule.cs index 2b679cccef..b82b128b3b 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/PostgreSql/AbpEntityFrameworkCorePostgreSqlModule.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/PostgreSql/AbpEntityFrameworkCorePostgreSqlModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Guids; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; +using Volo.Abp.Guids; using Volo.Abp.Modularity; namespace Volo.Abp.EntityFrameworkCore.PostgreSql; @@ -17,5 +18,10 @@ public class AbpEntityFrameworkCorePostgreSqlModule : AbpModule options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsString; } }); + + Configure(options => + { + options.UseDbFunction = true; + }); } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/SqlServer/AbpEntityFrameworkCoreSqlServerModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/SqlServer/AbpEntityFrameworkCoreSqlServerModule.cs index 8186809846..acebc98d86 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/SqlServer/AbpEntityFrameworkCoreSqlServerModule.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/SqlServer/AbpEntityFrameworkCoreSqlServerModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Guids; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; +using Volo.Abp.Guids; using Volo.Abp.Modularity; namespace Volo.Abp.EntityFrameworkCore.SqlServer; @@ -17,5 +18,10 @@ public class AbpEntityFrameworkCoreSqlServerModule : AbpModule options.DefaultSequentialGuidType = SequentialGuidType.SequentialAtEnd; } }); + + Configure(options => + { + options.UseDbFunction = true; + }); } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs index e772546154..52415d73b1 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs @@ -1,3 +1,4 @@ +using Volo.Abp.EntityFrameworkCore.GlobalFilters; using Volo.Abp.Modularity; namespace Volo.Abp.EntityFrameworkCore.Sqlite; @@ -7,5 +8,11 @@ namespace Volo.Abp.EntityFrameworkCore.Sqlite; )] public class AbpEntityFrameworkCoreSqliteModule : AbpModule { - + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.UseDbFunction = true; + }); + } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreDbContextOptionsBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreDbContextOptionsBuilderExtensions.cs new file mode 100644 index 0000000000..8c4b636d9e --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreDbContextOptionsBuilderExtensions.cs @@ -0,0 +1,21 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Volo.Abp.EntityFrameworkCore; + +namespace Microsoft.Extensions.DependencyInjection; + +public static class AbpEfCoreDbContextOptionsBuilderExtensions +{ + public static DbContextOptionsBuilder AddAbpDbContextOptionsExtension(this DbContextOptionsBuilder optionsBuilder) + { + ((IDbContextOptionsBuilderInfrastructure) optionsBuilder).AddOrUpdateExtension(new AbpDbContextOptionsExtension()); + return optionsBuilder; + } + + public static DbContextOptionsBuilder AddAbpDbContextOptionsExtension(this DbContextOptionsBuilder optionsBuilder) + where TContext : DbContext + { + ((IDbContextOptionsBuilderInfrastructure) optionsBuilder).AddOrUpdateExtension(new AbpDbContextOptionsExtension()); + return optionsBuilder; + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreModelBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreModelBuilderExtensions.cs new file mode 100644 index 0000000000..19ad9e0267 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreModelBuilderExtensions.cs @@ -0,0 +1,68 @@ +using System.Linq.Expressions; +using System.Reflection; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Query.SqlExpressions; +using Volo.Abp; +using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; +using Volo.Abp.MultiTenancy; + +namespace Microsoft.Extensions.DependencyInjection; + +public static class AbpEfCoreModelBuilderExtensions +{ + public static ModelBuilder ConfigureSoftDeleteDbFunction(this ModelBuilder modelBuilder, MethodInfo methodInfo, AbpEfCoreCurrentDbContext abpEfCoreCurrentDbContext) + { + modelBuilder.HasDbFunction(methodInfo) + .HasTranslation(args => + { + // (bool isDeleted, bool boolParam) + var isDeleted = args[0]; + var boolParam = args[1]; + + if (abpEfCoreCurrentDbContext.Context?.DataFilter.IsEnabled() == true) + { + // IsDeleted == false + return new SqlBinaryExpression( + ExpressionType.Equal, + isDeleted, + new SqlConstantExpression(Expression.Constant(false), boolParam.TypeMapping), + boolParam.Type, + boolParam.TypeMapping); + } + + // empty where sql + return new SqlConstantExpression(Expression.Constant(true), boolParam.TypeMapping); + }); + + return modelBuilder; + } + + public static ModelBuilder ConfigureMultiTenantDbFunction(this ModelBuilder modelBuilder, MethodInfo methodInfo, AbpEfCoreCurrentDbContext abpEfCoreCurrentDbContext) + { + modelBuilder.HasDbFunction(methodInfo) + .HasTranslation(args => + { + // (Guid? tenantId, int? currentTenantId) + var tenantId = args[0]; + var currentTenantId = args[1]; + var boolParam = args[2]; + + if (abpEfCoreCurrentDbContext.Context?.DataFilter.IsEnabled() == true) + { + // TenantId == CurrentTenantId + return new SqlBinaryExpression( + ExpressionType.Equal, + tenantId, + currentTenantId, + boolParam.Type, + boolParam.TypeMapping); + } + + // empty where sql + return new SqlConstantExpression(Expression.Constant(true), boolParam.TypeMapping); + }); + + return modelBuilder; + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs index 138bf82ec4..794058ad6e 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs @@ -11,11 +11,12 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; +using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Options; using Volo.Abp.Auditing; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; @@ -24,6 +25,7 @@ using Volo.Abp.Domain.Entities.Events; using Volo.Abp.Domain.Repositories; using Volo.Abp.EntityFrameworkCore.ChangeTrackers; using Volo.Abp.EntityFrameworkCore.EntityHistory; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; using Volo.Abp.EntityFrameworkCore.Modeling; using Volo.Abp.EntityFrameworkCore.ValueConverters; using Volo.Abp.EventBus.Distributed; @@ -37,7 +39,7 @@ using Volo.Abp.Uow; namespace Volo.Abp.EntityFrameworkCore; -public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, ITransientDependency +public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, IAbpEfCoreDbFunctionContext, ITransientDependency where TDbContext : DbContext { public IAbpLazyServiceProvider LazyServiceProvider { get; set; } = default!; @@ -78,6 +80,8 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, public IOptions Options => LazyServiceProvider.LazyGetRequiredService>(); + public IOptions GlobalFilterOptions => LazyServiceProvider.LazyGetRequiredService>(); + private static readonly MethodInfo ConfigureBasePropertiesMethodInfo = typeof(AbpDbContext) .GetMethod( @@ -99,9 +103,12 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, BindingFlags.Instance | BindingFlags.NonPublic )!; + protected readonly DbContextOptions DbContextOptions; + protected AbpDbContext(DbContextOptions options) : base(options) { + DbContextOptions = options; } protected override void OnModelCreating(ModelBuilder modelBuilder) @@ -713,7 +720,7 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, { if (mutableEntityType.BaseType == null && ShouldFilterEntity(mutableEntityType)) { - var filterExpression = CreateFilterExpression(); + var filterExpression = CreateFilterExpression(modelBuilder); if (filterExpression != null) { modelBuilder.Entity().HasAbpQueryFilter(filterExpression); @@ -782,7 +789,7 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, return false; } - protected virtual Expression>? CreateFilterExpression() + protected virtual Expression>? CreateFilterExpression(ModelBuilder modelBuilder) where TEntity : class { Expression>? expression = null; @@ -790,14 +797,37 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity))) { expression = e => !IsSoftDeleteFilterEnabled || !EF.Property(e, "IsDeleted"); + + if (UseDbFunction()) + { + expression = e => AbpEfCoreDataFilterDbFunctionMethods.SoftDeleteFilter(((ISoftDelete)e).IsDeleted, true); + modelBuilder.ConfigureSoftDeleteDbFunction(AbpEfCoreDataFilterDbFunctionMethods.SoftDeleteFilterMethodInfo, this.GetService()); + } } if (typeof(IMultiTenant).IsAssignableFrom(typeof(TEntity))) { Expression> multiTenantFilter = e => !IsMultiTenantFilterEnabled || EF.Property(e, "TenantId") == CurrentTenantId; + + if (UseDbFunction()) + { + multiTenantFilter = e => AbpEfCoreDataFilterDbFunctionMethods.MultiTenantFilter(((IMultiTenant)e).TenantId, CurrentTenantId, true); + modelBuilder.ConfigureMultiTenantDbFunction(AbpEfCoreDataFilterDbFunctionMethods.MultiTenantFilterMethodInfo, this.GetService()); + } + expression = expression == null ? multiTenantFilter : QueryFilterExpressionHelper.CombineExpressions(expression, multiTenantFilter); } return expression; } + + protected virtual bool UseDbFunction() + { + return LazyServiceProvider != null && GlobalFilterOptions.Value.UseDbFunction && DbContextOptions.FindExtension() != null; + } + + public virtual string GetCompiledQueryCacheKey() + { + return $"{CurrentTenantId?.ToString() ?? "Null"}:{IsSoftDeleteFilterEnabled}:{IsMultiTenantFilterEnabled}"; + } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsExtension.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsExtension.cs new file mode 100644 index 0000000000..d9dc4cef9f --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsExtension.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Query; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; + +namespace Volo.Abp.EntityFrameworkCore; + +public class AbpDbContextOptionsExtension : IDbContextOptionsExtension +{ + public void ApplyServices(IServiceCollection services) + { + var serviceDescriptor = services.FirstOrDefault(x => x.ServiceType == typeof(ICompiledQueryCacheKeyGenerator)); + if (serviceDescriptor != null && serviceDescriptor.ImplementationType != null) + { + services.Remove(serviceDescriptor); + services.AddScoped(serviceDescriptor.ImplementationType); + services.Add(ServiceDescriptor.Scoped(provider => + ActivatorUtilities.CreateInstance(provider, + provider.GetRequiredService(serviceDescriptor.ImplementationType) + .As()))); + } + + services.Replace(ServiceDescriptor.Scoped()); + services.AddSingleton(typeof(AbpEfCoreCurrentDbContext)); + } + + public void Validate(IDbContextOptions options) + { + } + + public DbContextOptionsExtensionInfo Info => new AbpOptionsExtensionInfo(this); + + private class AbpOptionsExtensionInfo : DbContextOptionsExtensionInfo + { + public AbpOptionsExtensionInfo(IDbContextOptionsExtension extension) + : base(extension) + { + } + + public override bool IsDatabaseProvider => false; + + public override int GetServiceProviderHashCode() + { + return 0; + } + + public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other) + { + return other is AbpOptionsExtensionInfo; + } + + public override void PopulateDebugInfo(IDictionary debugInfo) + { + } + + public override string LogFragment => "AbpOptionsExtension"; + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityQueryProvider.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityQueryProvider.cs new file mode 100644 index 0000000000..665757e17b --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityQueryProvider.cs @@ -0,0 +1,49 @@ +using System.Linq.Expressions; +using System.Threading; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Query.Internal; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; + +namespace Volo.Abp.EntityFrameworkCore; + +#pragma warning disable EF1001 +public class AbpEntityQueryProvider : EntityQueryProvider +{ + protected AbpEfCoreCurrentDbContext AbpEfCoreCurrentDbContext { get; } + protected ICurrentDbContext CurrentDbContext { get; } + + public AbpEntityQueryProvider( + IQueryCompiler queryCompiler, + AbpEfCoreCurrentDbContext abpEfCoreCurrentDbContext, + ICurrentDbContext currentDbContext) + : base(queryCompiler) + { + AbpEfCoreCurrentDbContext = abpEfCoreCurrentDbContext; + CurrentDbContext = currentDbContext; + } + + public override object Execute(Expression expression) + { + using (AbpEfCoreCurrentDbContext.Use(CurrentDbContext.Context as IAbpEfCoreDbFunctionContext)) + { + return base.Execute(expression); + } + } + + public override TResult Execute(Expression expression) + { + using (AbpEfCoreCurrentDbContext.Use(CurrentDbContext.Context as IAbpEfCoreDbFunctionContext)) + { + return base.Execute(expression); + } + } + + public override TResult ExecuteAsync(Expression expression, CancellationToken cancellationToken = new CancellationToken()) + { + using (AbpEfCoreCurrentDbContext.Use(CurrentDbContext.Context as IAbpEfCoreDbFunctionContext)) + { + return base.ExecuteAsync(expression, cancellationToken); + } + } +} +#pragma warning restore EF1001 diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/DbContextOptionsFactory.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/DbContextOptionsFactory.cs index 1b3a6f48b5..113a4aa86c 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/DbContextOptionsFactory.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/DbContextOptionsFactory.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp.Data; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; using Volo.Abp.MultiTenancy; namespace Volo.Abp.EntityFrameworkCore.DependencyInjection; @@ -27,6 +28,11 @@ public static class DbContextOptionsFactory PreConfigure(options, context); Configure(options, context); + if (serviceProvider.GetRequiredService>().Value.UseDbFunction) + { + context.DbContextOptions.AddAbpDbContextOptionsExtension(); + } + return context.DbContextOptions.Options; } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpCompiledQueryCacheKeyGenerator.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpCompiledQueryCacheKeyGenerator.cs new file mode 100644 index 0000000000..e43ae1e04d --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpCompiledQueryCacheKeyGenerator.cs @@ -0,0 +1,59 @@ +using System; +using System.Linq.Expressions; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Query; + +namespace Volo.Abp.EntityFrameworkCore.GlobalFilters; + +public class AbpCompiledQueryCacheKeyGenerator : ICompiledQueryCacheKeyGenerator +{ + protected ICompiledQueryCacheKeyGenerator InnerCompiledQueryCacheKeyGenerator { get; } + protected ICurrentDbContext CurrentContext { get; } + + public AbpCompiledQueryCacheKeyGenerator( + ICompiledQueryCacheKeyGenerator innerCompiledQueryCacheKeyGenerator, + ICurrentDbContext currentContext) + { + InnerCompiledQueryCacheKeyGenerator = innerCompiledQueryCacheKeyGenerator; + CurrentContext = currentContext; + } + + public virtual object GenerateCacheKey(Expression query, bool async) + { + var cacheKey = InnerCompiledQueryCacheKeyGenerator.GenerateCacheKey(query, async); + if (CurrentContext.Context is IAbpEfCoreDbFunctionContext abpEfCoreDbFunctionContext) + { + return new AbpCompiledQueryCacheKey(cacheKey, abpEfCoreDbFunctionContext.GetCompiledQueryCacheKey()); + } + + return cacheKey; + } + + private readonly struct AbpCompiledQueryCacheKey : IEquatable + { + private readonly object _compiledQueryCacheKey; + private readonly string _currentFilterCacheKey; + + public AbpCompiledQueryCacheKey(object compiledQueryCacheKey, string currentFilterCacheKey) + { + _compiledQueryCacheKey = compiledQueryCacheKey; + _currentFilterCacheKey = currentFilterCacheKey; + } + + public override bool Equals(object? obj) + { + return obj is AbpCompiledQueryCacheKey key && Equals(key); + } + + public bool Equals(AbpCompiledQueryCacheKey other) + { + return _compiledQueryCacheKey.Equals(other._compiledQueryCacheKey) && + _currentFilterCacheKey == other._currentFilterCacheKey; + } + + public override int GetHashCode() + { + return HashCode.Combine(_compiledQueryCacheKey, _currentFilterCacheKey); + } + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreCurrentDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreCurrentDbContext.cs new file mode 100644 index 0000000000..c3a29b6d70 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreCurrentDbContext.cs @@ -0,0 +1,21 @@ +using System; +using System.Threading; + +namespace Volo.Abp.EntityFrameworkCore.GlobalFilters; + +public class AbpEfCoreCurrentDbContext +{ + private readonly AsyncLocal _current = new AsyncLocal(); + + public IAbpEfCoreDbFunctionContext? Context => _current.Value; + + public IDisposable Use(IAbpEfCoreDbFunctionContext? context) + { + var previousValue = Context; + _current.Value = context; + return new DisposeAction(() => + { + _current.Value = previousValue; + }); + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreDataFilterDbFunctionMethods.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreDataFilterDbFunctionMethods.cs new file mode 100644 index 0000000000..10cb6be280 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreDataFilterDbFunctionMethods.cs @@ -0,0 +1,25 @@ +using System; +using System.Reflection; + +namespace Volo.Abp.EntityFrameworkCore.GlobalFilters; + +public static class AbpEfCoreDataFilterDbFunctionMethods +{ + public const string NotSupportedExceptionMessage = "Your EF Core database provider does not support 'User-defined function mapping'." + + "Please set 'UseDbFunction' of 'AbpEfCoreGlobalFilterOptions' to false to disable it." + + "See https://learn.microsoft.com/en-us/ef/core/querying/user-defined-function-mapping for more information." ; + + public static bool SoftDeleteFilter(bool isDeleted, bool boolParam) + { + throw new NotSupportedException(NotSupportedExceptionMessage); + } + + public static MethodInfo SoftDeleteFilterMethodInfo => typeof(AbpEfCoreDataFilterDbFunctionMethods).GetMethod(nameof(SoftDeleteFilter))!; + + public static bool MultiTenantFilter(Guid? tenantId, Guid? currentTenantId, bool boolParam) + { + throw new NotSupportedException(NotSupportedExceptionMessage); + } + + public static MethodInfo MultiTenantFilterMethodInfo => typeof(AbpEfCoreDataFilterDbFunctionMethods).GetMethod(nameof(MultiTenantFilter))!; +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreGlobalFilterOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreGlobalFilterOptions.cs new file mode 100644 index 0000000000..f97031ff13 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpEfCoreGlobalFilterOptions.cs @@ -0,0 +1,10 @@ +namespace Volo.Abp.EntityFrameworkCore.GlobalFilters; + +public class AbpEfCoreGlobalFilterOptions +{ + /// + /// Use User-defined function mapping to filter data. + /// https://learn.microsoft.com/en-us/ef/core/querying/user-defined-function-mapping + /// + public bool UseDbFunction { get; set; } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreDbFunctionContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreDbFunctionContext.cs new file mode 100644 index 0000000000..85096e9e0a --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreDbFunctionContext.cs @@ -0,0 +1,16 @@ +using Volo.Abp.Data; +using Volo.Abp.DependencyInjection; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.EntityFrameworkCore.GlobalFilters; + +public interface IAbpEfCoreDbFunctionContext +{ + IAbpLazyServiceProvider LazyServiceProvider { get; set; } + + ICurrentTenant CurrentTenant { get; } + + IDataFilter DataFilter { get; } + + string GetCompiledQueryCacheKey(); +} diff --git a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs index 0acdf852e5..1238d766be 100644 --- a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs @@ -5,6 +5,7 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using Swashbuckle.AspNetCore.SwaggerUI; using Volo.Abp.Content; +using Volo.Abp.MultiTenancy; using Volo.Abp.Swashbuckle; namespace Microsoft.Extensions.DependencyInjection; @@ -89,16 +90,15 @@ public static class AbpSwaggerGenServiceCollectionExtensions Action? setupAction = null) { var discoveryUrl = discoveryEndpoint != null ? - new Uri($"{discoveryEndpoint.TrimEnd('/')}/.well-known/openid-configuration") : - new Uri($"{authority.TrimEnd('/')}/.well-known/openid-configuration"); - + $"{discoveryEndpoint.TrimEnd('/')}/.well-known/openid-configuration": + $"{authority.TrimEnd('/')}/.well-known/openid-configuration"; flows ??= new [] { AbpSwaggerOidcFlows.AuthorizationCode }; services.Configure(swaggerUiOptions => { swaggerUiOptions.ConfigObject.AdditionalItems["oidcSupportedFlows"] = flows; swaggerUiOptions.ConfigObject.AdditionalItems["oidcSupportedScopes"] = scopes; - swaggerUiOptions.ConfigObject.AdditionalItems["oidcDiscoveryEndpoint"] = discoveryEndpoint; + swaggerUiOptions.ConfigObject.AdditionalItems["oidcDiscoveryEndpoint"] = discoveryUrl; }); return services @@ -109,7 +109,7 @@ public static class AbpSwaggerGenServiceCollectionExtensions options.AddSecurityDefinition("oidc", new OpenApiSecurityScheme { Type = SecuritySchemeType.OpenIdConnect, - OpenIdConnectUrl = discoveryUrl + OpenIdConnectUrl = new Uri(RemoveTenantPlaceholders(discoveryUrl)) }); options.AddSecurityRequirement(new OpenApiSecurityRequirement @@ -129,4 +129,12 @@ public static class AbpSwaggerGenServiceCollectionExtensions setupAction?.Invoke(options); }); } + + private static string RemoveTenantPlaceholders(string url) + { + return url + .Replace(MultiTenantUrlProvider.TenantPlaceHolder + ".", string.Empty) + .Replace(MultiTenantUrlProvider.TenantIdPlaceHolder + ".", string.Empty) + .Replace(MultiTenantUrlProvider.TenantNamePlaceHolder + ".", string.Empty); + } } diff --git a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js index 07deea114b..4e8790d38c 100644 --- a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js +++ b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js @@ -9,12 +9,12 @@ var abp = abp || {}; var oidcSupportedFlows = configObject.oidcSupportedFlows || []; var oidcSupportedScopes = configObject.oidcSupportedScopes || []; var oidcDiscoveryEndpoint = configObject.oidcDiscoveryEndpoint || []; - var tenantPlaceHolders = ["{{tenantId}}", "{{tenantName}}" , "{0}"] + var tenantPlaceHolders = ["{{tenantId}}", "{{tenantName}}", "{0}"] abp.appPath = configObject.baseUrl || abp.appPath; var requestInterceptor = configObject.requestInterceptor; var responseInterceptor = configObject.responseInterceptor; - + configObject.requestInterceptor = async function (request) { if (request.url.includes(excludeUrl[1])) { @@ -27,22 +27,6 @@ var abp = abp || {}; }); firstRequest = false; } - - // Intercept .well-known request when the discoveryEndpoint is provided - if (!firstRequest && oidcDiscoveryEndpoint.length !== 0 && request.url.includes(".well-known/openid-configuration")) { - - if (oidcDiscoveryEndpoint.endsWith(".well-known/openid-configuration")) { - request.url = await replaceTenantPlaceHolder(oidcDiscoveryEndpoint); - console.log(request.url); - return; - } - if (!oidcDiscoveryEndpoint.endsWith("/")) { - oidcDiscoveryEndpoint += "/" - } - request.url = await replaceTenantPlaceHolder(oidcDiscoveryEndpoint) + ".well-known/openid-configuration"; - - console.log(request.url); - } var antiForgeryToken = abp.security.antiForgery.getToken(); if (antiForgeryToken) { @@ -78,33 +62,50 @@ var abp = abp || {}; response.text = JSON.stringify(openIdConnectData); } + // Intercept .well-known request when the discoveryEndpoint is provided + if (response.url.endsWith("swagger.json") && response.status === 200 && oidcDiscoveryEndpoint.length !== 0) { + var swaggerData = JSON.parse(response.text); + + if (swaggerData.components.securitySchemes && swaggerData.components.securitySchemes.oidc) { + swaggerData.components.securitySchemes.oidc.openIdConnectUrl = await replaceTenantPlaceHolder(oidcDiscoveryEndpoint); + } + + response.text = JSON.stringify(swaggerData); + } + if (responseInterceptor) { responseInterceptor(response); } return response; }; - + async function replaceTenantPlaceHolder(url) { - - if(!abp.currentTenant){ + + if (!abp.currentTenant) { await getAbpApplicationConfiguration(); } - - url.replace(tenantPlaceHolders[0], abp.currentTenant.id); - url.replace(tenantPlaceHolders[1], abp.currentTenant.name); - - if(abp.currentTenant.name != null){ - url.replace(tenantPlaceHolders[2], abp.currentTenant.name); - }else if (abp.currentTenant.id != null){ - url.replace(tenantPlaceHolders[2], abp.currentTenant.id); + + if (abp.currentTenant.id == null && abp.currentTenant.name == null) { + return url + .replace(tenantPlaceHolders[0] + ".", "") + .replace(tenantPlaceHolders[1] + ".", "") + .replace(tenantPlaceHolders[2] + ".", ""); } - + + url = url.replace(tenantPlaceHolders[0], abp.currentTenant.id).replace(tenantPlaceHolders[1], abp.currentTenant.name); + + if (abp.currentTenant.name != null) { + url = url.replace(tenantPlaceHolders[2], abp.currentTenant.name); + } else if (abp.currentTenant.id != null) { + url = url.replace(tenantPlaceHolders[2], abp.currentTenant.id); + } + return url; } - + function getAbpApplicationConfiguration() { return fetch(`${abp.appPath}api/abp/application-configuration`).then(response => response.json()).then(data => { - abp.currentTenant = data.currentTenant; + abp.currentTenant = data.currentTenant; }); } diff --git a/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AbpAuditingTestModule.cs b/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AbpAuditingTestModule.cs index 4fe3ae9c16..4e14dbc262 100644 --- a/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AbpAuditingTestModule.cs +++ b/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AbpAuditingTestModule.cs @@ -70,7 +70,7 @@ public class AbpAuditingTestModule : AbpModule connection.Open(); using (var context = new AbpAuditingTestDbContext(new DbContextOptionsBuilder() - .UseSqlite(connection).Options)) + .UseSqlite(connection).AddAbpDbContextOptionsExtension().Options)) { context.GetService().CreateTables(); } diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AutoRegistrationHelper_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AutoRegistrationHelper_Tests.cs index 5d8716a70c..f13744de3a 100644 --- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AutoRegistrationHelper_Tests.cs +++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AutoRegistrationHelper_Tests.cs @@ -20,6 +20,22 @@ public class AutoRegistrationHelper_Tests exposedServices.ShouldContain(typeof(IDerivedService)); } + [Fact] + public void Should_Get_Conventional_Exposed_Types_By_Default_Case_Insensitive() + { + //Act + + var exposedServices = ExposedServiceExplorer.GetExposedServices(typeof(defaultderivedservice)); + + //Assert + + exposedServices.Count.ShouldBe(3); + exposedServices.ShouldContain(typeof(defaultderivedservice)); + exposedServices.ShouldContain(typeof(IService)); + exposedServices.ShouldContain(typeof(IDerivedService)); + } + + [Fact] public void Should_Get_Custom_Exposed_Types_If_Available() { @@ -52,6 +68,10 @@ public class AutoRegistrationHelper_Tests { } + public class defaultderivedservice : IDerivedService + { + } + public interface IService { } diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs index 5e81aa1a7d..a13aea2945 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs @@ -72,7 +72,7 @@ public class AbpEntityFrameworkCoreTestModule : AbpModule { options.Configure(abpDbContextConfigurationContext => { - abpDbContextConfigurationContext.DbContextOptions.UseSqlite(sqliteConnection); + abpDbContextConfigurationContext.DbContextOptions.UseSqlite(sqliteConnection).AddAbpDbContextOptionsExtension(); }); }); } @@ -101,7 +101,7 @@ public class AbpEntityFrameworkCoreTestModule : AbpModule var connection = new AbpUnitTestSqliteConnection("Data Source=:memory:"); connection.Open(); - using (var context = new TestMigrationsDbContext(new DbContextOptionsBuilder().UseSqlite(connection).Options)) + using (var context = new TestMigrationsDbContext(new DbContextOptionsBuilder().UseSqlite(connection).AddAbpDbContextOptionsExtension().Options)) { context.GetService().CreateTables(); context.Database.ExecuteSqlRaw( diff --git a/latest-versions.json b/latest-versions.json index 543e133787..82a4ddc6d4 100644 --- a/latest-versions.json +++ b/latest-versions.json @@ -1,6 +1,6 @@ [ { - "version": "8.1.3", + "version": "8.1.4", "releaseDate": "", "type": "stable", "message": "" diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js index 61dead22b4..afac70c9f4 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js @@ -1,6 +1,12 @@ -document.addEventListener('DOMContentLoaded', function (event) { +document.addEventListener("DOMContentLoaded", function (event) { setTimeout(function () { - window.clientName = document.getElementById("redirectButton").getAttribute("cname"); - window.location = document.getElementById('redirectButton').getAttribute('href'); - }, 3000); + var redirectButton = document.getElementById("redirectButton"); + + if(!redirectButton){ + return; + } + + redirectButton.getAttribute("cname"); + redirectButton.getAttribute("href"); + }, 3000) }); diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicThemeModule.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicThemeModule.cs index eb38111b37..cbc24669d8 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicThemeModule.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicThemeModule.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Web.BasicTheme; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.AspNetCore.Components.Web.Theming.Toolbars; diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor index a8987982ad..995dd0ba7f 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor @@ -1,7 +1,7 @@ @using Microsoft.Extensions.Localization @using global::Localization.Resources.AbpUi @using Microsoft.Extensions.Options -@using Volo.Abp.AspNetCore.Components.Server +@using Volo.Abp.AspNetCore.Components.Web @inherits AbpComponentBase @inject IJSRuntime JsRuntime @inject NavigationManager Navigation diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/WebAssemblyRedirectToLogin.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/WebAssemblyRedirectToLogin.razor index 71ee368102..97e0eb2995 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/WebAssemblyRedirectToLogin.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/WebAssemblyRedirectToLogin.razor @@ -3,7 +3,7 @@ @using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic @using Microsoft.AspNetCore.Components.WebAssembly.Authentication @using Microsoft.Extensions.Options -@using Volo.Abp.AspNetCore.Components.Server +@using Volo.Abp.AspNetCore.Components.Web @inherits RedirectToLogin @attribute [ExposeServices(typeof(RedirectToLogin))] @attribute [Dependency(ReplaceServices = true)] diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index 1acc428429..d158a7b0e6 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~8.2.0-rc.4", - "@abp/prismjs": "~8.2.0-rc.4", - "@abp/highlight.js": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.shared": "~8.2.0-rc.5", + "@abp/prismjs": "~8.2.0-rc.5", + "@abp/highlight.js": "~8.2.0-rc.5" } } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index 3060a455b4..8eade99b88 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,212 +2,212 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.4.tgz#c3d20d642765dc235749d4f95f599cb97f23325d" - integrity sha512-w94YGLT/UVn1haLGlH8zOcgrCS64OrnVlzh3QXps+8m4S9g7KDeVk3g4ju/VUao2YKCHmRJ3uRhOGCb58of1iw== +"@abp/clipboard@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.5.tgz#5cec3d9c89bdad8d50f41807b3be68d4cdecb003" + integrity sha512-cBaMy8A1CIU00X6SoGyuMTVf6z9iyEaR6smVRWCVmkf2VayAHFES981+iE+VmT2bezgbCidA2GXtkBZ/kunbJg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" clipboard "^2.0.8" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/highlight.js@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-8.2.0-rc.4.tgz#94587632517396f3d251d2c457ea8a452203f086" - integrity sha512-RHSrR0qqXncosbHDfYBB8aXh0BQ6M8BpjbyXeqe+vKDIznzjv3jcyF2SIP/l6TBBYcaBPnAOdjfuC9i9B8Rfzg== +"@abp/highlight.js@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-8.2.0-rc.5.tgz#24c329217ad4092172cba3e9e23a67814f9a164f" + integrity sha512-NHoUAVrGDV+BQ1rtC4orZ0xYX/4VkjZgouIktpuCAEs8wiP6/5Ddjzf2uYFv8c6XVqBm1Mx9Bufxx7aYo2O/Uw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/prismjs@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.4.tgz#f6df729333d4dc934c3978c29e62dddf6a22c19a" - integrity sha512-+fLF7ndhgV9v3zcWFoNSR0kPasIcagJC6FT90ALWs2XccBtjAYOm9/365DK5lyDUh0ynHx9fBgDdCdIX0Zv9RA== +"@abp/prismjs@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.5.tgz#7a7428bb2f118cef5121a196bc45cc5d1a5a8e93" + integrity sha512-lNPqRvisf8jAxyL/05ppH26ZH4DEEzZUKqO7zqqS+yl7sBTpR/Wh8xX09spQl+wBQTLWAz2z+MouBZnMQIYKjg== dependencies: - "@abp/clipboard" "~8.2.0-rc.4" - "@abp/core" "~8.2.0-rc.4" + "@abp/clipboard" "~8.2.0-rc.5" + "@abp/core" "~8.2.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index 6f0399af52..a8e136e613 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4", - "@abp/prismjs": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5", + "@abp/prismjs": "~8.2.0-rc.5" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index 314a912a8a..69bfd46110 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,211 +2,211 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.4.tgz#c3d20d642765dc235749d4f95f599cb97f23325d" - integrity sha512-w94YGLT/UVn1haLGlH8zOcgrCS64OrnVlzh3QXps+8m4S9g7KDeVk3g4ju/VUao2YKCHmRJ3uRhOGCb58of1iw== +"@abp/clipboard@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.5.tgz#5cec3d9c89bdad8d50f41807b3be68d4cdecb003" + integrity sha512-cBaMy8A1CIU00X6SoGyuMTVf6z9iyEaR6smVRWCVmkf2VayAHFES981+iE+VmT2bezgbCidA2GXtkBZ/kunbJg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" clipboard "^2.0.8" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/prismjs@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.4.tgz#f6df729333d4dc934c3978c29e62dddf6a22c19a" - integrity sha512-+fLF7ndhgV9v3zcWFoNSR0kPasIcagJC6FT90ALWs2XccBtjAYOm9/365DK5lyDUh0ynHx9fBgDdCdIX0Zv9RA== +"@abp/prismjs@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.5.tgz#7a7428bb2f118cef5121a196bc45cc5d1a5a8e93" + integrity sha512-lNPqRvisf8jAxyL/05ppH26ZH4DEEzZUKqO7zqqS+yl7sBTpR/Wh8xX09spQl+wBQTLWAz2z+MouBZnMQIYKjg== dependencies: - "@abp/clipboard" "~8.2.0-rc.4" - "@abp/core" "~8.2.0-rc.4" + "@abp/clipboard" "~8.2.0-rc.5" + "@abp/core" "~8.2.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index f26eacc7df..dc4536ebed 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4", - "@abp/blogging": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5", + "@abp/blogging": "~8.2.0-rc.5" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 963e3da8ca..500c9c2631 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,237 +2,237 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/blogging@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-8.2.0-rc.4.tgz#3d33c0e17411307f2fad9b84763bae2b29b903f2" - integrity sha512-uzhuHLk4GceYEnc2auIMC79gsncVplTCA2RbYCKs1aKC45/FYhOjpOke5fBsYiRrvvK5ZYVkDLKb/GvXxTnX0w== +"@abp/blogging@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-8.2.0-rc.5.tgz#821d5b01862d896591892e97e435adadcda07108" + integrity sha512-l6tbuaAkFTLv8BMcLFMLUE4ioYyuUmQecmnadDTE47DxZskIasyk7gvbpx8qDYwXr5IHAXgA7A7tTZX5K+tJAw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - "@abp/owl.carousel" "~8.2.0-rc.4" - "@abp/prismjs" "~8.2.0-rc.4" - "@abp/tui-editor" "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + "@abp/owl.carousel" "~8.2.0-rc.5" + "@abp/prismjs" "~8.2.0-rc.5" + "@abp/tui-editor" "~8.2.0-rc.5" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.4.tgz#c3d20d642765dc235749d4f95f599cb97f23325d" - integrity sha512-w94YGLT/UVn1haLGlH8zOcgrCS64OrnVlzh3QXps+8m4S9g7KDeVk3g4ju/VUao2YKCHmRJ3uRhOGCb58of1iw== +"@abp/clipboard@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.5.tgz#5cec3d9c89bdad8d50f41807b3be68d4cdecb003" + integrity sha512-cBaMy8A1CIU00X6SoGyuMTVf6z9iyEaR6smVRWCVmkf2VayAHFES981+iE+VmT2bezgbCidA2GXtkBZ/kunbJg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" clipboard "^2.0.8" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/owl.carousel@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-8.2.0-rc.4.tgz#05d8f959873a9813f7a358d376000d8eb36b2507" - integrity sha512-uWkUD8ZknBSrnAekFhE/1D+ttIn/x9zZPTvSWiKXX8uN3hiiAICtnm5ONc+Io8BPSYPkRycFL+aIZAr73UgBRQ== +"@abp/owl.carousel@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-8.2.0-rc.5.tgz#4f0dc2ebf8aa4120ae33136fc9fa20544ce36f73" + integrity sha512-eaYUpSsLvlmAovXPtmXHiP11xFkOgmiw6fbIl8JpyTRn/xS9I5wNVawr6vVXbL6JK90H7ZbKI/GY0KzsbDeWDQ== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" owl.carousel "^2.3.4" -"@abp/prismjs@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.4.tgz#f6df729333d4dc934c3978c29e62dddf6a22c19a" - integrity sha512-+fLF7ndhgV9v3zcWFoNSR0kPasIcagJC6FT90ALWs2XccBtjAYOm9/365DK5lyDUh0ynHx9fBgDdCdIX0Zv9RA== +"@abp/prismjs@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.5.tgz#7a7428bb2f118cef5121a196bc45cc5d1a5a8e93" + integrity sha512-lNPqRvisf8jAxyL/05ppH26ZH4DEEzZUKqO7zqqS+yl7sBTpR/Wh8xX09spQl+wBQTLWAz2z+MouBZnMQIYKjg== dependencies: - "@abp/clipboard" "~8.2.0-rc.4" - "@abp/core" "~8.2.0-rc.4" + "@abp/clipboard" "~8.2.0-rc.5" + "@abp/core" "~8.2.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/tui-editor@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-8.2.0-rc.4.tgz#105b5245b59a00ca3dc92900f051dfc55119c0ff" - integrity sha512-bKfHMbgelmrzqKzdKT6xONwjWDTKiSXroQaHCHcoCmAH6dRboIFCvltMY1xvOk5BAjWUOOgOB+G8PA3rhdlBYg== +"@abp/tui-editor@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-8.2.0-rc.5.tgz#809ef1bb0f90576d2ad7e67b13e707fe889a7e27" + integrity sha512-M1rKE0IhOmj6b/RopK2zDLSe0c7uSngWTv7MYEQjmGwHBG1+M0CEBSXVZWEJQ+LZjB+83oc4Z4UOW+yUW0suXg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" - "@abp/prismjs" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" + "@abp/prismjs" "~8.2.0-rc.5" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index 50cb9cd77a..f510e89f41 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index 3d710bd0cc..c02f3c8464 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,194 +2,194 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 687cfd1d17..3bba1919a7 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~8.2.0-rc.4", - "@abp/ng.identity": "~8.2.0-rc.4", - "@abp/ng.setting-management": "~8.2.0-rc.4", - "@abp/ng.tenant-management": "~8.2.0-rc.4", - "@abp/ng.theme.basic": "~8.2.0-rc.4", + "@abp/ng.account": "~8.2.0-rc.5", + "@abp/ng.identity": "~8.2.0-rc.5", + "@abp/ng.setting-management": "~8.2.0-rc.5", + "@abp/ng.tenant-management": "~8.2.0-rc.5", + "@abp/ng.theme.basic": "~8.2.0-rc.5", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index f4a420b9cb..684a9b94d7 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=8.2.0-rc.4", - "@abp/ng.theme.shared": ">=8.2.0-rc.4" + "@abp/ng.core": ">=8.2.0-rc.5", + "@abp/ng.theme.shared": ">=8.2.0-rc.5" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index a128ec5f82..6eb674afd1 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 3d710bd0cc..c02f3c8464 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,194 +2,194 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index 2115871f2c..dec85ed263 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock index 3d710bd0cc..c02f3c8464 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,194 +2,194 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index bc67e82bc1..ee1a89be0d 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4", - "@abp/cms-kit": "8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5", + "@abp/cms-kit": "8.2.0-rc.5" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index c1b2a2a560..73eb0e1c03 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,293 +2,293 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.4.tgz#c3d20d642765dc235749d4f95f599cb97f23325d" - integrity sha512-w94YGLT/UVn1haLGlH8zOcgrCS64OrnVlzh3QXps+8m4S9g7KDeVk3g4ju/VUao2YKCHmRJ3uRhOGCb58of1iw== +"@abp/clipboard@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.5.tgz#5cec3d9c89bdad8d50f41807b3be68d4cdecb003" + integrity sha512-cBaMy8A1CIU00X6SoGyuMTVf6z9iyEaR6smVRWCVmkf2VayAHFES981+iE+VmT2bezgbCidA2GXtkBZ/kunbJg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" clipboard "^2.0.8" -"@abp/cms-kit.admin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-8.2.0-rc.4.tgz#755926c1b6d259c6d88858b7cf1d6c3c3a0b3792" - integrity sha512-90BYx3YhYYs6zk5j0AeSlvge6sFZF7h8PeER6VZ/jL2y74hRQ51Wc0zY6DjJpMgrzy7fpYDrJHMF/NaZe8qgNw== +"@abp/cms-kit.admin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-8.2.0-rc.5.tgz#c91c4c4a3fb1d28e8ebbdb7eddcc9d739da0f5e0" + integrity sha512-0l6BfoKiqa2PqgucHwTL1uvrgQB9KV7OiT9OukwJfYi//9fgxi7ZNzqyjnI3ypb5yKRHYEX8pvFUpkDSBz+5Rg== dependencies: - "@abp/codemirror" "~8.2.0-rc.4" - "@abp/jstree" "~8.2.0-rc.4" - "@abp/slugify" "~8.2.0-rc.4" - "@abp/tui-editor" "~8.2.0-rc.4" - "@abp/uppy" "~8.2.0-rc.4" + "@abp/codemirror" "~8.2.0-rc.5" + "@abp/jstree" "~8.2.0-rc.5" + "@abp/slugify" "~8.2.0-rc.5" + "@abp/tui-editor" "~8.2.0-rc.5" + "@abp/uppy" "~8.2.0-rc.5" -"@abp/cms-kit.public@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-8.2.0-rc.4.tgz#eccc6768693c3e29e85fcab4327e91eec83a3a8b" - integrity sha512-bu6TJ10aKDx/EgSau6WIKKaHKWbjPz4+FPfukU5iVZ8KorwVs1YBRVIBSTOn/MeRyxSm8VSFcAYeWft5LskMsA== +"@abp/cms-kit.public@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-8.2.0-rc.5.tgz#a7b55b0c9a15ea634e68b1399d215442d7b6791f" + integrity sha512-BdaPklN/NrSAmd5g0Gm/5rYVm1yyIo+8k+N8owqDQl56PuNS6nYV2z0s2kJGSgq1+rGLIBCoAsYwHTGchSl3Og== dependencies: - "@abp/highlight.js" "~8.2.0-rc.4" - "@abp/star-rating-svg" "~8.2.0-rc.4" + "@abp/highlight.js" "~8.2.0-rc.5" + "@abp/star-rating-svg" "~8.2.0-rc.5" -"@abp/cms-kit@8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-8.2.0-rc.4.tgz#88573612c7bd8d7a873c61b0b843b029b9292e94" - integrity sha512-1nhEyG3uU3n38xGbglTDKgJA9C+NGhtF0XlaCXoasHRY45xUVQjv7c5XhZKMUWmzeFRk2FiqrU3Lanszf7VUYw== +"@abp/cms-kit@8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-8.2.0-rc.5.tgz#f56b0fc4bfc449e1f5089b56d5b31d8f9a3b52e3" + integrity sha512-yd1kzK5ozgtyo7NL1Cvpy1hi2M/nVmtkvlQpzLjj4Sh66ETX5RGqMn+c5F9RHWQG0htRbJADdnKEX92wyyqSzQ== dependencies: - "@abp/cms-kit.admin" "~8.2.0-rc.4" - "@abp/cms-kit.public" "~8.2.0-rc.4" + "@abp/cms-kit.admin" "~8.2.0-rc.5" + "@abp/cms-kit.public" "~8.2.0-rc.5" -"@abp/codemirror@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-8.2.0-rc.4.tgz#c237035fcf35143cc4607d3808511470008b7163" - integrity sha512-FhiaQH87k9C/iZDOolEmTYTqUlvTVgg3LW99pjBfhmNgC7/nrN8kZFIckyKRFC5u5Vri4scpM036e5Cze47kvQ== +"@abp/codemirror@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-8.2.0-rc.5.tgz#aaaac96018847901b77e49a5b49889abc7b63534" + integrity sha512-eIy9kML6ObXLy8tX177Mhqvbv9w6nJ1vX3UpPT3bCc0CUu9MpqvUnj3MWd9SA3RqPiy23Jy4DS/M/6Nd40Um7A== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" codemirror "^5.65.1" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/highlight.js@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-8.2.0-rc.4.tgz#94587632517396f3d251d2c457ea8a452203f086" - integrity sha512-RHSrR0qqXncosbHDfYBB8aXh0BQ6M8BpjbyXeqe+vKDIznzjv3jcyF2SIP/l6TBBYcaBPnAOdjfuC9i9B8Rfzg== +"@abp/highlight.js@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-8.2.0-rc.5.tgz#24c329217ad4092172cba3e9e23a67814f9a164f" + integrity sha512-NHoUAVrGDV+BQ1rtC4orZ0xYX/4VkjZgouIktpuCAEs8wiP6/5Ddjzf2uYFv8c6XVqBm1Mx9Bufxx7aYo2O/Uw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/jstree@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-8.2.0-rc.4.tgz#7f3e492b950a33caaa45dde106e0409bc2139c2a" - integrity sha512-877rG+Y1kKGC6xg6E8R0J/bsyYLTXqhVnUA4HnZLdkVdwgOxRUwHZXiaR3zadbkpeFYACBkMdBGI0ozWkjn1PA== +"@abp/jstree@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-8.2.0-rc.5.tgz#7aa921da7a37a1616256041974b322cd237f38b2" + integrity sha512-VxnrLSZfQ+ln8vSm6Hu3DWCfsnb+L+dGzCP1Lkgv1/MrDiRBhp52zzJHcvxjNhoM7pgHQ6ivHwCiYQ+0ru+3hg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jstree "^3.3.12" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/prismjs@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.4.tgz#f6df729333d4dc934c3978c29e62dddf6a22c19a" - integrity sha512-+fLF7ndhgV9v3zcWFoNSR0kPasIcagJC6FT90ALWs2XccBtjAYOm9/365DK5lyDUh0ynHx9fBgDdCdIX0Zv9RA== +"@abp/prismjs@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.5.tgz#7a7428bb2f118cef5121a196bc45cc5d1a5a8e93" + integrity sha512-lNPqRvisf8jAxyL/05ppH26ZH4DEEzZUKqO7zqqS+yl7sBTpR/Wh8xX09spQl+wBQTLWAz2z+MouBZnMQIYKjg== dependencies: - "@abp/clipboard" "~8.2.0-rc.4" - "@abp/core" "~8.2.0-rc.4" + "@abp/clipboard" "~8.2.0-rc.5" + "@abp/core" "~8.2.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/slugify@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-8.2.0-rc.4.tgz#f98961f363fa13648d03b0c23728e36e1cac3ea3" - integrity sha512-f3PDG3PFj4CNgRdPUue1rtwy5kNcpSlxUBuQPg3rwSQzdVZQS+dbTOFlkwtt/p8tcAkKaTOWL625Ezk02OS88g== +"@abp/slugify@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-8.2.0-rc.5.tgz#99f074e35a92d36912ccc984886682d225994ed2" + integrity sha512-NuEwyxW97VxHH4XEb1fejn/HMYlPCiVJgKdhxQB1XXw7yLqO9QTL6Z5v3H3gafllz/z6OyHdZFCOxq3lkgWt5Q== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-8.2.0-rc.4.tgz#c9d4d9f91a198aae5e436b88ce2163aa084f1b25" - integrity sha512-TdFt8FQhkStWfQ1d3OpupAxnw9f0sI53biMDLWweK40nuGEEtdaHHwU17yHcHMxQSMKm4xamxDsOPBD0xWYf+A== +"@abp/star-rating-svg@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-8.2.0-rc.5.tgz#59b231f053e67543eb259a516c03f62586bf0257" + integrity sha512-VLudGc14ui8qKXA8zjIjPUJCjCdOsF7bhd6y2E1tNrOOYyjKQqmrDEyslo8G7uCQhJ7kPhBULHDfJk8oViYruA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/tui-editor@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-8.2.0-rc.4.tgz#105b5245b59a00ca3dc92900f051dfc55119c0ff" - integrity sha512-bKfHMbgelmrzqKzdKT6xONwjWDTKiSXroQaHCHcoCmAH6dRboIFCvltMY1xvOk5BAjWUOOgOB+G8PA3rhdlBYg== +"@abp/tui-editor@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-8.2.0-rc.5.tgz#809ef1bb0f90576d2ad7e67b13e707fe889a7e27" + integrity sha512-M1rKE0IhOmj6b/RopK2zDLSe0c7uSngWTv7MYEQjmGwHBG1+M0CEBSXVZWEJQ+LZjB+83oc4Z4UOW+yUW0suXg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" - "@abp/prismjs" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" + "@abp/prismjs" "~8.2.0-rc.5" -"@abp/uppy@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-8.2.0-rc.4.tgz#d22105ae16bd9c8254b15c54f7b64ab8960822a5" - integrity sha512-MmoM5AULSBKLi97T5fmZ1WZaBj2GO/L4v6AR4SNsw9ID8frCUYadk8tb+qEitVW+d2ji9M91C4A22ILMmsVjeg== +"@abp/uppy@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-8.2.0-rc.5.tgz#5ff805da9d2ff6370c2b67ef4d4feac271dca89e" + integrity sha512-Wgkvo1KLLNQy61u8yRQ4/FyyL+PVOTBAzHh/GqLdgazToO+F22Z+7C0asX4P4dM77PmJ+Ynyp0uiohK1+ep+MQ== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" uppy "^3.0.0" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentApprovalDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentApprovalDto.cs new file mode 100644 index 0000000000..e0ef1be356 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentApprovalDto.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Volo.CmsKit.Admin.Comments; + +[Serializable] +public class CommentApprovalDto +{ + public bool IsApproved { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentDto.cs index aa64135270..44e0c47ef8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentDto.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.ObjectExtending; namespace Volo.CmsKit.Admin.Comments; @@ -19,4 +19,6 @@ public class CommentDto : ExtensibleObject public Guid CreatorId { get; set; } public DateTime CreationTime { get; set; } + + public bool? IsApproved { get; set; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentGetListInput.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentGetListInput.cs index 399674e520..f47ef86ebe 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentGetListInput.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentGetListInput.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using Volo.CmsKit.Comments; namespace Volo.CmsKit.Admin.Comments; @@ -17,4 +18,6 @@ public class CommentGetListInput : PagedAndSortedResultRequestDto public DateTime? CreationStartDate { get; set; } public DateTime? CreationEndDate { get; set; } + + public CommentApproveState CommentApproveState { get; set; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentSettingsDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentSettingsDto.cs new file mode 100644 index 0000000000..f7dc8aced3 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentSettingsDto.cs @@ -0,0 +1,9 @@ +using System; + +namespace Volo.CmsKit.Admin.Comments; + +[Serializable] +public class CommentSettingsDto +{ + public bool CommentRequireApprovement { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentWithAuthorDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentWithAuthorDto.cs index eeef248267..71cb884cb2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentWithAuthorDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentWithAuthorDto.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.ObjectExtending; namespace Volo.CmsKit.Admin.Comments; @@ -23,4 +23,6 @@ public class CommentWithAuthorDto : ExtensibleObject public CmsUserDto Author { get; set; } public string Url { get; set; } + + public bool? IsApproved { get; set; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs index 5ea8d64d1d..8fd87a2e00 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; @@ -12,4 +12,10 @@ public interface ICommentAdminAppService : IApplicationService Task GetAsync(Guid id); Task DeleteAsync(Guid id); + + Task UpdateApprovalStatusAsync(Guid id, CommentApprovalDto input); + + Task UpdateSettingsAsync(CommentSettingsDto input); + + Task GetWaitingCountAsync(); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs index 7ba4cc2d84..93f9f740df 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs @@ -17,6 +17,10 @@ public class CmsKitAdminPermissionDefinitionProvider : PermissionDefinitionProvi .RequireGlobalFeatures(typeof(CommentsFeature)); contentGroup.AddChild(CmsKitAdminPermissions.Comments.Delete, L("Permission:Comments.Delete")) .RequireGlobalFeatures(typeof(CommentsFeature)); + contentGroup.AddChild(CmsKitAdminPermissions.Comments.Update, L("Permission:Comments.Update")) + .RequireGlobalFeatures(typeof(CommentsFeature)); + contentGroup.AddChild(CmsKitAdminPermissions.Comments.SettingManagement, L("Permission:Comments.SettingManagement")) + .RequireGlobalFeatures(typeof(CommentsFeature)); var tagGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Tags.Default, L("Permission:TagManagement")) .RequireGlobalFeatures(typeof(TagsFeature)); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs index 2852a0b4ee..0cb2ad884e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs @@ -8,6 +8,8 @@ public static class CmsKitAdminPermissions { public const string Default = GroupName + ".Comments"; public const string Delete = Default + ".Delete"; + public const string Update = Default + ".Update"; + public const string SettingManagement = Default + ".SettingManagement"; } public static class Tags diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj index 5c95eaf0e8..ef9bb92ab3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj @@ -1,4 +1,4 @@ - + @@ -17,4 +17,5 @@ + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs index 1394b608c7..a6a0d6512a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs @@ -34,6 +34,7 @@ public class CmsKitAdminApplicationAutoMapperProfile : Profile CreateMap() .Ignore(d => d.BlogName) .MapExtraProperties(); + CreateMap(MemberList.Source).MapExtraProperties(); CreateMap(MemberList.Source).MapExtraProperties(); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs index 973a74b58e..edb709d846 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Dtos; using Volo.Abp.Features; using Volo.Abp.GlobalFeatures; +using Volo.Abp.SettingManagement; using Volo.CmsKit.Comments; using Volo.CmsKit.Features; using Volo.CmsKit.GlobalFeatures; @@ -20,9 +21,14 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp { protected ICommentRepository CommentRepository { get; } - public CommentAdminAppService(ICommentRepository commentRepository) + protected ISettingManager SettingManager { get; } + + public CommentAdminAppService( + ICommentRepository commentRepository, + ISettingManager settingManager) { CommentRepository = commentRepository; + SettingManager = settingManager; } public virtual async Task> GetListAsync(CommentGetListInput input) @@ -33,7 +39,9 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp input.RepliedCommentId, input.Author, input.CreationStartDate, - input.CreationEndDate); + input.CreationEndDate, + input.CommentApproveState + ); var comments = await CommentRepository.GetListAsync( input.Text, @@ -44,7 +52,8 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp input.CreationEndDate, input.Sorting, input.MaxResultCount, - input.SkipCount + input.SkipCount, + input.CommentApproveState ); var dtos = comments.Select(queryResultItem => @@ -74,4 +83,32 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp var comment = await CommentRepository.GetAsync(id); await CommentRepository.DeleteWithRepliesAsync(comment); } -} + + [Authorize(CmsKitAdminPermissions.Comments.Update)] + public async Task UpdateApprovalStatusAsync(Guid id, CommentApprovalDto input) + { + var comment = await CommentRepository.GetAsync(id); + + if (input.IsApproved) + { + comment.Approve(); + } + else + { + comment.Reject(); + } + + await CommentRepository.UpdateAsync(comment); + } + + [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)] + public async Task UpdateSettingsAsync(CommentSettingsDto input) + { + await SettingManager.SetGlobalAsync(CmsKitSettings.Comments.RequireApprovement, input.CommentRequireApprovement.ToString()); + } + + public async Task GetWaitingCountAsync() + { + return (int)await CommentRepository.GetCountAsync(commentApproveState: CommentApproveState.Waiting); + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Comments/CommentAdminClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Comments/CommentAdminClientProxy.Generated.cs index a92570cd0e..845963c334 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Comments/CommentAdminClientProxy.Generated.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Comments/CommentAdminClientProxy.Generated.cs @@ -40,4 +40,26 @@ public partial class CommentAdminClientProxy : ClientProxyBase GetWaitingCountAsync() + { + return await RequestAsync(nameof(GetWaitingCountAsync)); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json index b8d0738fac..cf4bbd1034 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json @@ -1267,6 +1267,56 @@ "type": "System.Void", "typeSimple": "System.Void" } + }, + { + "name": "UpdateApprovalStatusAsync", + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "input", + "typeAsString": "Volo.CmsKit.Admin.Comments.CommentApprovalDto, Volo.CmsKit.Admin.Application.Contracts", + "type": "Volo.CmsKit.Admin.Comments.CommentApprovalDto", + "typeSimple": "Volo.CmsKit.Admin.Comments.CommentApprovalDto", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "System.Void", + "typeSimple": "System.Void" + } + }, + { + "name": "UpdateSettingsAsync", + "parametersOnMethod": [ + { + "name": "input", + "typeAsString": "Volo.CmsKit.Admin.Comments.CommentSettingsDto, Volo.CmsKit.Admin.Application.Contracts", + "type": "Volo.CmsKit.Admin.Comments.CommentSettingsDto", + "typeSimple": "Volo.CmsKit.Admin.Comments.CommentSettingsDto", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "System.Void", + "typeSimple": "System.Void" + } + }, + { + "name": "GetWaitingCountAsync", + "parametersOnMethod": [], + "returnValue": { + "type": "System.Int32", + "typeSimple": "number" + } } ] } @@ -1361,6 +1411,18 @@ "bindingSourceId": "ModelBinding", "descriptorName": "input" }, + { + "nameOnMethod": "input", + "name": "CommentApproveState", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + }, { "nameOnMethod": "input", "name": "Sorting", @@ -1478,6 +1540,115 @@ }, "allowAnonymous": false, "implementFrom": "Volo.CmsKit.Admin.Comments.ICommentAdminAppService" + }, + "UpdateApprovalStatusAsyncByIdAndInput": { + "uniqueName": "UpdateApprovalStatusAsyncByIdAndInput", + "name": "UpdateApprovalStatusAsync", + "httpMethod": "PUT", + "url": "api/cms-kit-admin/comments/{id}/approval-status", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "input", + "typeAsString": "Volo.CmsKit.Admin.Comments.CommentApprovalDto, Volo.CmsKit.Admin.Application.Contracts", + "type": "Volo.CmsKit.Admin.Comments.CommentApprovalDto", + "typeSimple": "Volo.CmsKit.Admin.Comments.CommentApprovalDto", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "id", + "name": "id", + "jsonName": null, + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" + }, + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.CmsKit.Admin.Comments.CommentApprovalDto", + "typeSimple": "Volo.CmsKit.Admin.Comments.CommentApprovalDto", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.Void", + "typeSimple": "System.Void" + }, + "allowAnonymous": false, + "implementFrom": "Volo.CmsKit.Admin.Comments.ICommentAdminAppService" + }, + "UpdateSettingsAsyncByInput": { + "uniqueName": "UpdateSettingsAsyncByInput", + "name": "UpdateSettingsAsync", + "httpMethod": "POST", + "url": "api/cms-kit-admin/comments/settings", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "input", + "typeAsString": "Volo.CmsKit.Admin.Comments.CommentSettingsDto, Volo.CmsKit.Admin.Application.Contracts", + "type": "Volo.CmsKit.Admin.Comments.CommentSettingsDto", + "typeSimple": "Volo.CmsKit.Admin.Comments.CommentSettingsDto", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.CmsKit.Admin.Comments.CommentSettingsDto", + "typeSimple": "Volo.CmsKit.Admin.Comments.CommentSettingsDto", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.Void", + "typeSimple": "System.Void" + }, + "allowAnonymous": false, + "implementFrom": "Volo.CmsKit.Admin.Comments.ICommentAdminAppService" + }, + "GetWaitingCountAsync": { + "uniqueName": "GetWaitingCountAsync", + "name": "GetWaitingCountAsync", + "httpMethod": "GET", + "url": "api/cms-kit-admin/comments/waiting-count", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.Int32", + "typeSimple": "number" + }, + "allowAnonymous": false, + "implementFrom": "Volo.CmsKit.Admin.Comments.ICommentAdminAppService" } } }, diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs index f4813f61ad..9d9bbcd73f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs @@ -47,4 +47,25 @@ public class CommentAdminController : CmsKitAdminController, ICommentAdminAppSer { return CommentAdminAppService.DeleteAsync(id); } + + [HttpPut] + [Route("{id}/approval-status")] + public Task UpdateApprovalStatusAsync(Guid id, CommentApprovalDto input) + { + return CommentAdminAppService.UpdateApprovalStatusAsync(id, input); + } + + [HttpPost] + [Route("settings")] + public Task UpdateSettingsAsync(CommentSettingsDto input) + { + return CommentAdminAppService.UpdateSettingsAsync(input); + } + + [HttpGet] + [Route("waiting-count")] + public Task GetWaitingCountAsync() + { + return CommentAdminAppService.GetWaitingCountAsync(); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs index cd01a3fd88..70c2b575f4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs @@ -2,6 +2,10 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.Localization; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.MarkdownIt; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs; +using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars; using Volo.Abp.AutoMapper; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; @@ -9,11 +13,14 @@ using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending.Modularity; +using Volo.Abp.SettingManagement.Web.Pages.SettingManagement; using Volo.Abp.Threading; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; using Volo.CmsKit.Admin.MediaDescriptors; using Volo.CmsKit.Admin.Web.Menus; +using Volo.CmsKit.Admin.Web.Pages.CmsKit.Comments.Approve; +using Volo.CmsKit.Admin.Web.Pages.CmsKit.Shared.Components.Comments; using Volo.CmsKit.Localization; using Volo.CmsKit.Permissions; using Volo.CmsKit.Web; @@ -53,6 +60,21 @@ public class CmsKitAdminWebModule : AbpModule options.MenuContributors.Add(new CmsKitAdminMenuContributor()); }); + Configure(options => + { + options.ScriptBundles + .Configure(typeof(Abp.SettingManagement.Web.Pages.SettingManagement.IndexModel).FullName, + configuration => + { + configuration.AddContributors(typeof(CommentSettingScriptBundleContributor)); + }) + .Configure(StandardBundles.Scripts.Global, + configuration => + { + configuration.AddContributors(typeof(MarkdownItScriptContributor)); + }); + }); + Configure(options => { options.FileSets.AddEmbedded("Volo.CmsKit.Admin.Web"); @@ -77,6 +99,7 @@ public class CmsKitAdminWebModule : AbpModule options.Conventions.AuthorizeFolder("/CmsKit/BlogPosts/Create", CmsKitAdminPermissions.BlogPosts.Create); options.Conventions.AuthorizeFolder("/CmsKit/BlogPosts/Update", CmsKitAdminPermissions.BlogPosts.Update); options.Conventions.AuthorizeFolder("/CmsKit/Comments/", CmsKitAdminPermissions.Comments.Default); + options.Conventions.AuthorizeFolder("/CmsKit/Comments/Approve", CmsKitAdminPermissions.Comments.Default); options.Conventions.AuthorizeFolder("/CmsKit/Comments/Details", CmsKitAdminPermissions.Comments.Default); options.Conventions.AuthorizeFolder("/CmsKit/Menus", CmsKitAdminPermissions.Menus.Default); options.Conventions.AuthorizePage("/CmsKit/Menus/MenuItems/CreateModal", CmsKitAdminPermissions.Menus.Create); @@ -99,6 +122,7 @@ public class CmsKitAdminWebModule : AbpModule options.Conventions.AddPageRoute("/CmsKit/Comments/Details", "/Cms/Comments/{Id}"); options.Conventions.AddPageRoute("/CmsKit/Menus/MenuItems/Index", "/Cms/Menus/Items"); options.Conventions.AddPageRoute("/CmsKit/GlobalResources/Index", "/Cms/GlobalResources"); + options.Conventions.AddPageRoute("/CmsKit/Comments/Approve/Index", "/Cms/Comments/Approve"); }); Configure(options => @@ -163,7 +187,7 @@ public class CmsKitAdminWebModule : AbpModule ); }); }); - + Configure(options => { options.DisableModule(CmsKitAdminRemoteServiceConsts.ModuleName); @@ -173,6 +197,11 @@ public class CmsKitAdminWebModule : AbpModule { options.ConventionalControllers.FormBodyBindingIgnoredTypes.Add(typeof(CreateMediaInputWithStream)); }); + + Configure(options => + { + options.Contributors.Add(new CommentSettingPageContributor()); + }); } public override void PostConfigureServices(ServiceConfigurationContext context) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml index 5c855e9ffe..4ed695dfa8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml @@ -60,8 +60,8 @@
- - + +
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml index 673c402c2c..45bd2c8565 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml @@ -68,8 +68,8 @@
} - - + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/Index.cshtml new file mode 100644 index 0000000000..d15396f33d --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/Index.cshtml @@ -0,0 +1,75 @@ +@page + +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Layout +@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Comments +@using Volo.CmsKit.Admin.Web.Menus +@using Volo.CmsKit.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Packages.MarkdownIt + +@inject IPageLayout PageLayout +@inject IHtmlLocalizer L + +@model IndexModel + +@{ + PageLayout.Content.Title = L["CommentsAwaitingApproval"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:CMS"].Value); + PageLayout.Content.MenuItemName = CmsKitAdminMenus.Comments.CommentsMenu; +} + +@section styles { + + + +} + +@section scripts { + + + + + + +} + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/Index.cshtml.cs new file mode 100644 index 0000000000..54693bbe7b --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/Index.cshtml.cs @@ -0,0 +1,16 @@ +using System; + +namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Comments.Approve; + +public class IndexModel : CmsKitAdminPageModel +{ + public string EntityType { get; set; } + + public string Author { get; set; } + + public DateTime? CreationStartDate { get; set; } + + public DateTime? CreationEndDate { get; set; } + + public string IsApproved { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js new file mode 100644 index 0000000000..f8aa2ba80d --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js @@ -0,0 +1,174 @@ +$(function () { + var l = abp.localization.getResource("CmsKit"); + + var commentsService = volo.cmsKit.admin.comments.commentAdmin; + + moment()._locale.preparse = (string) => string; + moment()._locale.postformat = (string) => string; + + var getFormattedDate = function ($datePicker) { + if (!$datePicker.val()) { + return null; + } + var momentDate = moment($datePicker.val(), $datePicker.data('daterangepicker').locale.format); + return momentDate.isValid() ? momentDate.toISOString() : null; + }; + + $('.singledatepicker').daterangepicker({ + "singleDatePicker": true, + "showDropdowns": true, + "autoUpdateInput": false, + "autoApply": true, + "opens": "center", + "drops": "auto" + }); + + $('.singledatepicker').attr('autocomplete', 'off'); + + $('.singledatepicker').on('apply.daterangepicker', function (ev, picker) { + $(this).val(picker.startDate.format('l')); + }); + + var filterForm = $('#CmsKitCommentsFilterForm'); + + var getFilter = function () { + var filterObj = filterForm.serializeFormToObject(); + + filterObj.creationStartDate = getFormattedDate($('#CreationStartDate')); + filterObj.creationEndDate = getFormattedDate($('#CreationEndDate')); + filterObj.commentApproveState = "Waiting"; + + return filterObj; + }; + + var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({ + processing: true, + serverSide: true, + paging: true, + scrollX: true, + searching: false, + scrollCollapse: true, + ajax: abp.libs.datatables.createAjax(commentsService.getList, getFilter), + columnDefs: [ + { + width: "10%", + title: l("Actions"), + targets: 0, + orderable: false, + visible: abp.auth.isGranted('CmsKit.Comments.Update'), + render: function (data, type, row) { + let approveButton = $(``); + let rejectButton = $(``); + let buttons = []; + buttons.push(approveButton); + buttons.push(rejectButton); + + let result = `
`; + + buttons.forEach(x => { + if(x.data("status") !== data) { + result += x.get(0).outerHTML; + } + } ); + + result += `
`; + return result; + } + }, + { + width: "10%", + title: l("Username"), + orderable: false, + data: "author.userName", + render: function (data) { + if (data !== null) { + return GetFilterableDatatableContent('#Author', $.fn.dataTable.render.text().display(data)); //prevent against possible XSS + } + return ""; + } + }, + { + width: "15%", + title: l("EntityType"), + orderable: false, + data: "entityType", + render: function (data) { + if (data !== null) { + return GetFilterableDatatableContent('#EntityType', $.fn.dataTable.render.text().display(data)); + } + return ""; + } + }, + { + title: l("URL"), + data: "url", + render: function (data, type, row) { + if (data !== null) { + return ''; + } + return ""; + } + }, + { + title: l("Text"), + data: "text", + orderable: false, + render: function (data) { + var md = window.markdownit(); + var htmlContent = md.render(data); + return ( + '' + + htmlContent + + "" + ); + } + }, + { + width: "15%", + title: l("CreationTime"), + data: "creationTime", + orderable: true, + dataFormat: "datetime" + } + ] + })); + + function GetFilterableDatatableContent(filterSelector, data) { + return '' + data + ''; + } + + $(document).on('click', '.datatableCell', function () { + var inputSelector = $(this).attr('data-field'); + var value = $(this).attr('data-val'); + + $(inputSelector).val(value); + + _dataTable.ajax.reload(); + }); + + filterForm.submit(function (e) { + e.preventDefault(); + _dataTable.ajax.reload(); + }); + + _dataTable.on('draw.dt', function () { + var changeStatusButton = $(".change-status"); + changeStatusButton.click(function () { + $(this).html(""); + $(this).prop("disabled", true); + + let id = $(this).data("id"); + let isApproved = $(this).data("status"); + + commentsService + .updateApprovalStatus(id, {IsApproved: isApproved}) + .then(function (data) { + var message = isApproved ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully'); + abp.notify.success(message); + _dataTable.ajax.reload(); + }) + }); + }); +}); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml index 8e4cfbdb4e..a73475bac2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml @@ -5,6 +5,7 @@ @using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.CmsKit.Admin.Web.Pages.CmsKit.Comments @using Volo.CmsKit.Admin.Web.Menus +@using Volo.CmsKit.Comments @using Volo.CmsKit.Localization @inject IPageLayout PageLayout @@ -93,6 +94,17 @@ + + +
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml.cs index f1e793987f..3cc5d1bb7a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.CmsKit.Admin.Comments; +using Volo.CmsKit.Comments; namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Comments; @@ -16,6 +17,8 @@ public class DetailsModel : CmsKitAdminPageModel public DateTime? CreationEndDate { get; set; } + public CommentApproveState CommentApproveState { get; set; } + public CommentWithAuthorDto CommentWithAuthorDto { get; protected set; } protected readonly ICommentAdminAppService CommentAdminAppService; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml index d769d4fcb8..7ed80301c9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml @@ -4,6 +4,7 @@ @using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.CmsKit.Admin.Web.Pages.CmsKit.Comments @using Volo.CmsKit.Admin.Web.Menus +@using Volo.CmsKit.Comments @using Volo.CmsKit.Localization @inject IPageLayout PageLayout @@ -31,6 +32,9 @@ } + +
@@ -39,7 +43,7 @@ - + @@ -47,14 +51,26 @@ - + - + + + + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml.cs index 4502669669..f6c1a9ba3a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml.cs @@ -1,4 +1,5 @@ using System; +using Volo.CmsKit.Comments; namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Comments; @@ -8,7 +9,9 @@ public class IndexModel : CmsKitAdminPageModel public string Author { get; set; } - public DateTime? CreationStartDate { get; set; } + public DateTime? CreationStartDate { get; set; } = null; public DateTime? CreationEndDate { get; set; } + + public CommentApproveState CommentApproveState { get; set; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js index 3d1e95fad5..2d007b0983 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js @@ -3,9 +3,12 @@ $(function (){ var commentsService = volo.cmsKit.admin.comments.commentAdmin; - var detailsModal = new abp.ModalManager(abp.appPath + "CmsKit/Comments/DetailsModal"); - + var commentRequireApprovement = abp.setting.getBoolean("CmsKit.Comments.RequireApprovement"); + if (commentRequireApprovement) { + $('#IsApprovedSelectInput').show(); + } + var getFormattedDate = function ($datePicker) { return $datePicker.data('date'); }; @@ -32,7 +35,7 @@ $(function (){ }); var filterForm = $('#CmsKitCommentsFilterForm'); - + var getFilter = function () { var filterObj = filterForm.serializeFormToObject(); @@ -78,6 +81,42 @@ $(function (){ abp.notify.success(l('DeletedSuccessfully')); }); } + }, + { + text: function (data) { + return data.isApproved ? l('Disapproved') : l('Approve'); + }, + visible: commentRequireApprovement, + action: function (data) { + var newApprovalStatus = !data.record?.isApproved; + + commentsService + .updateApprovalStatus(data.record.id, { IsApproved: newApprovalStatus }) + .then(function () { + _dataTable.ajax.reloadEx(); + var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully'); + abp.notify.success(message); + }) + } + }, + { + text: function (data) { + if (data.isApproved == null) { + return l('Disapproved') + } + }, + visible: commentRequireApprovement, + action: function (data) { + var newApprovalStatus = false; + + commentsService + .updateApprovalStatus(data.record.id, { IsApproved: newApprovalStatus }) + .then(function () { + _dataTable.ajax.reloadEx(); + var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully'); + abp.notify.success(message); + }) + } } ] } @@ -123,6 +162,28 @@ $(function (){ data: "creationTime", orderable: true, dataFormat: "datetime" + }, + { + width: "10%", + title: l("ApproveState"), + visible: commentRequireApprovement, + orderable: false, + data: "isApproved", + render: function (data, type, row) { + var icons = '' + + if (data === null) { + icons = ''; + } else if (typeof data === "boolean") { + if (data) { + icons = ''; + } else { + icons = ''; + } + } + + return icons; + } } ] })); @@ -139,7 +200,7 @@ $(function (){ _dataTable.ajax.reloadEx(); }); - + filterForm.submit(function (e){ e.preventDefault(); _dataTable.ajax.reloadEx(); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.css b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.css index ba831f9356..d1dbb49a6f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.css +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.css @@ -1,3 +1,3 @@ .datatableCell{ cursor: pointer; -} +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js index bcf88dad4a..be652ce552 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js @@ -1,24 +1,25 @@ -$(function (){ +$(function () { var l = abp.localization.getResource("CmsKit"); - + var commentsService = volo.cmsKit.admin.comments.commentAdmin; - var detailsModal = new abp.ModalManager(abp.appPath + "CmsKit/Comments/DetailsModal"); - moment()._locale.preparse = (string) => string; moment()._locale.postformat = (string) => string; - + + var commentRequireApprovement = abp.setting.getBoolean("CmsKit.Comments.RequireApprovement"); + + if (commentRequireApprovement) { + $('#CommentsWaitingAlert').show() + $('#IsApprovedSelectInput').show(); + } + var getFormattedDate = function ($datePicker) { - if(!$datePicker.val()) { + if (!$datePicker.val()) { return null; } var momentDate = moment($datePicker.val(), $datePicker.data('daterangepicker').locale.format); return momentDate.isValid() ? momentDate.toISOString() : null; }; - - - var defaultStartDate = moment().add(-7, 'days'); - $("#CreationStartDate").val(defaultStartDate.format('L')); $('.singledatepicker').daterangepicker({ "singleDatePicker": true, @@ -29,27 +30,23 @@ $(function (){ "drops": "auto" }); - - $('.singledatepicker').attr('autocomplete', 'off'); $('.singledatepicker').on('apply.daterangepicker', function (ev, picker) { $(this).val(picker.startDate.format('l')); }); - - + var filterForm = $('#CmsKitCommentsFilterForm'); - + var getFilter = function () { var filterObj = filterForm.serializeFormToObject(); filterObj.creationStartDate = getFormattedDate($('#CreationStartDate')); filterObj.creationEndDate = getFormattedDate($('#CreationEndDate')); - + return filterObj; }; - - + var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({ processing: true, serverSide: true, @@ -83,9 +80,52 @@ $(function (){ .delete(data.record.id) .then(function () { _dataTable.ajax.reloadEx(); + CheckWaitingComments() abp.notify.success(l('DeletedSuccessfully')); }); } + }, + { + text: function (data) { + return data.isApproved ? l('Disapproved') : l('Approve'); + }, + action: function (data) { + var newApprovalStatus = !data.record?.isApproved; + + commentsService + .updateApprovalStatus(data.record.id, { IsApproved: newApprovalStatus }) + .then(function () { + _dataTable.ajax.reloadEx(); + CheckWaitingComments() + var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully'); + abp.notify.success(message); + }) + }, + visible: function (data) { + return commentRequireApprovement; + } + }, + { + text: function (data) { + if (data.isApproved == null) { + return l('Disapproved') + } + }, + action: function (data) { + var newApprovalStatus = false; + + commentsService + .updateApprovalStatus(data.record.id, { IsApproved: newApprovalStatus }) + .then(function () { + _dataTable.ajax.reloadEx(); + CheckWaitingComments() + var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully'); + abp.notify.success(message); + }) + }, + visible: function (data) { + return commentRequireApprovement && data.isApproved == null; + } } ] } @@ -119,7 +159,7 @@ $(function (){ data: "url", render: function (data, type, row) { if (data !== null) { - return ''; + return ''; } return ""; } @@ -147,6 +187,28 @@ $(function (){ } } }, + { + width: "5%", + title: l("ApproveState"), + orderable: false, + data: "isApproved", + visible: commentRequireApprovement, + render: function (data, type, row) { + var icons = '' + + if (data === null) { + icons = ''; + } else if (typeof data === "boolean") { + if (data) { + icons = ''; + } else { + icons = ''; + } + } + + return icons; + } + }, { width: "15%", title: l("CreationTime"), @@ -156,22 +218,43 @@ $(function (){ } ] })); - - function GetFilterableDatatableContent(filterSelector, data){ - return '' + data + ''; + + function GetFilterableDatatableContent(filterSelector, data) { + return '' + data + ''; } - + $(document).on('click', '.datatableCell', function () { var inputSelector = $(this).attr('data-field'); var value = $(this).attr('data-val'); - + $(inputSelector).val(value); - + _dataTable.ajax.reloadEx(); }); - filterForm.submit(function (e){ + filterForm.submit(function (e) { e.preventDefault(); _dataTable.ajax.reloadEx(); }); + + function CheckWaitingComments() { + commentsService.getWaitingCount().then(function (count) { + if (count > 0) { + var alertMessage = l("CommentAlertMessage", count); + var alertElement = '' + alertMessage + ' ' + ' '; + + var commentAlert = $('#CommentsWaitingAlert'); + + commentAlert.html(alertElement); + commentAlert.click(function () { + window.location.href = '/Cms/Comments/Approve' + }); + commentAlert.css('cursor', 'pointer'); + } else { + $('#CommentsWaitingAlert').hide() + } + }); + } + + CheckWaitingComments() }); \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs new file mode 100644 index 0000000000..28c0fe5b98 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs @@ -0,0 +1,31 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; +using Volo.Abp.SettingManagement.Web.Pages.SettingManagement; +using Volo.CmsKit.Localization; +using Volo.CmsKit.Permissions; + +namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Shared.Components.Comments; + +public class CommentSettingPageContributor : SettingPageContributorBase +{ + public CommentSettingPageContributor() + { + RequiredPermissions(CmsKitAdminPermissions.Comments.SettingManagement); + } + + public override Task ConfigureAsync(SettingPageCreationContext context) + { + var l = context.ServiceProvider.GetRequiredService>(); + context.Groups.Add( + new SettingPageGroup( + "Volo.Abp.CmsKit", + l["Settings:Menu:CmsKit"], + typeof(CommentSettingViewComponent) + ) + ); + + return Task.CompletedTask; + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingScriptBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingScriptBundleContributor.cs new file mode 100644 index 0000000000..9b02222330 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingScriptBundleContributor.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Shared.Components.Comments; + +public class CommentSettingScriptBundleContributor : BundleContributor +{ + public override void ConfigureBundle(BundleConfigurationContext context) + { + context.Files.AddIfNotContains("/client-proxies/cms-kit-admin-proxy.js"); + context.Files.AddIfNotContains("/Pages/CmsKit/Shared/Components/Comments/default.js"); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingViewComponent.cs new file mode 100644 index 0000000000..72c240c2de --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingViewComponent.cs @@ -0,0 +1,18 @@ +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; +using Volo.Abp.AspNetCore.Mvc; + +namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Shared.Components.Comments; + +[Widget( + ScriptTypes = new[] { typeof(CommentSettingScriptBundleContributor) }, + AutoInitialize = true +)] +[ViewComponent(Name = "CmsCommentSetting")] +public class CommentSettingViewComponent : AbpViewComponent +{ + public virtual IViewComponentResult Invoke() + { + return View("~/Pages/CmsKit/Shared/Components/Comments/Default.cshtml"); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Default.cshtml new file mode 100644 index 0000000000..05a18105da --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Default.cshtml @@ -0,0 +1,36 @@ +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.CmsKit.Localization + +@section scripts { + + + +} + +@{ + @inject IHtmlLocalizer L + + + + + + +
+
+ + +
+ @L["CmsKitCommentOptions:RequireApprovementDescription"].Value +
+
+ + @L["Save"] + +
+
+ + + + + +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js new file mode 100644 index 0000000000..042cb87a77 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js @@ -0,0 +1,37 @@ +var l = abp.localization.getResource("CmsKit"); +(function () { + abp.widgets.CmsCommentSetting = function ($wrapper) { + var _service = volo.cmsKit.admin.comments.commentAdmin; + + var _init = function () { + _getSettings(); + _bindEvents(); + }; + + var _getSettings = function () { + $wrapper.find('#RequireApprovementCheckbox').prop('checked', abp.setting.getBoolean("CmsKit.Comments.RequireApprovement")); + }; + + var _bindEvents = function () { + var $requireApprovalCheckbox = $('#RequireApprovementCheckbox'); + var previousValue = $requireApprovalCheckbox.prop('checked'); + + $wrapper.find('#Save').click(function () { + var isRequireApproved = $requireApprovalCheckbox.prop('checked'); + + function UpdateSettings(commentRequireApprovement) { + _service.updateSettings({commentRequireApprovement: commentRequireApprovement}).then(function (response) { + abp.notify.success(l("SavedSuccessfully")); + previousValue = commentRequireApprovement; + }) + } + + UpdateSettings(isRequireApproved); + }); + }; + + return { + init: _init + }; + }; +})(); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj index 67b21f4f81..a6c0d9cb0a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj @@ -40,5 +40,4 @@ <_ContentIncludedByDefault Remove="Pages\Admin\Index.cshtml" /> <_ContentIncludedByDefault Remove="Pages\Admin\_ViewImports.cshtml" /> - diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js index 3198bb3e3e..08dc7bf2c0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js @@ -5,207 +5,246 @@ (function(){ - // controller volo.cmsKit.admin.tags.entityTagAdmin + // controller volo.cmsKit.admin.blogs.blogAdmin (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.admin.tags.entityTagAdmin'); + abp.utils.createNamespace(window, 'volo.cmsKit.admin.blogs.blogAdmin'); - volo.cmsKit.admin.tags.entityTagAdmin.addTagToEntity = function(input, ajaxParams) { + volo.cmsKit.admin.blogs.blogAdmin.get = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/entity-tags', + url: abp.appPath + 'api/cms-kit-admin/blogs/' + id + '', + type: 'GET' + }, ajaxParams)); + }; + + volo.cmsKit.admin.blogs.blogAdmin.getList = function(input, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/blogs' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + type: 'GET' + }, ajaxParams)); + }; + + volo.cmsKit.admin.blogs.blogAdmin.create = function(input, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/blogs', type: 'POST', - dataType: null, data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.tags.entityTagAdmin.removeTagFromEntity = function(input, ajaxParams) { + volo.cmsKit.admin.blogs.blogAdmin.update = function(id, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/entity-tags' + abp.utils.buildQueryString([{ name: 'tagId', value: input.tagId }, { name: 'entityType', value: input.entityType }, { name: 'entityId', value: input.entityId }]) + '', + url: abp.appPath + 'api/cms-kit-admin/blogs/' + id + '', + type: 'PUT', + data: JSON.stringify(input) + }, ajaxParams)); + }; + + volo.cmsKit.admin.blogs.blogAdmin['delete'] = function(id, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/blogs/' + id + '', type: 'DELETE', dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.tags.entityTagAdmin.setEntityTags = function(input, ajaxParams) { + })(); + + // controller volo.cmsKit.admin.blogs.blogFeatureAdmin + + (function(){ + + abp.utils.createNamespace(window, 'volo.cmsKit.admin.blogs.blogFeatureAdmin'); + + volo.cmsKit.admin.blogs.blogFeatureAdmin.getList = function(blogId, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/entity-tags', + url: abp.appPath + 'api/cms-kit-admin/blogs/' + blogId + '/features', + type: 'GET' + }, ajaxParams)); + }; + + volo.cmsKit.admin.blogs.blogFeatureAdmin.set = function(blogId, dto, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/blogs/' + blogId + '/features', type: 'PUT', dataType: null, - data: JSON.stringify(input) + data: JSON.stringify(dto) }, ajaxParams)); }; })(); - // controller volo.cmsKit.admin.tags.tagAdmin + // controller volo.cmsKit.admin.blogs.blogPostAdmin (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.admin.tags.tagAdmin'); + abp.utils.createNamespace(window, 'volo.cmsKit.admin.blogs.blogPostAdmin'); - volo.cmsKit.admin.tags.tagAdmin.create = function(input, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.create = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/tags', + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts', type: 'POST', data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.tags.tagAdmin['delete'] = function(id, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin['delete'] = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/tags/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '', type: 'DELETE', dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.tags.tagAdmin.get = function(id, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.get = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/tags/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.tags.tagAdmin.getList = function(input, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.getList = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/tags' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'blogId', value: input.blogId }, { name: 'authorId', value: input.authorId }, { name: 'tagId', value: input.tagId }, { name: 'status', value: input.status }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.tags.tagAdmin.update = function(id, input, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.update = function(id, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/tags/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '', type: 'PUT', data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.tags.tagAdmin.getTagDefinitions = function(ajaxParams) { - return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/tags/tag-definitions', - type: 'GET' - }, ajaxParams)); - }; - - })(); - - // controller volo.cmsKit.admin.pages.pageAdmin - - (function(){ - - abp.utils.createNamespace(window, 'volo.cmsKit.admin.pages.pageAdmin'); - - volo.cmsKit.admin.pages.pageAdmin.get = function(id, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.publish = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/pages/' + id + '', - type: 'GET' + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '/publish', + type: 'POST', + dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.pages.pageAdmin.getList = function(input, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.draft = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/pages' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', - type: 'GET' + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '/draft', + type: 'POST', + dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.pages.pageAdmin.create = function(input, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.createAndPublish = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/pages', + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/create-and-publish', type: 'POST', data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.pages.pageAdmin.update = function(id, input, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.sendToReview = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/pages/' + id + '', - type: 'PUT', - data: JSON.stringify(input) + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '/send-to-review', + type: 'POST', + dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.pages.pageAdmin['delete'] = function(id, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.createAndSendToReview = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/pages/' + id + '', - type: 'DELETE', - dataType: null + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/create-and-send-to-review', + type: 'POST', + data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.pages.pageAdmin.setAsHomePage = function(id, ajaxParams) { + volo.cmsKit.admin.blogs.blogPostAdmin.hasBlogPostWaitingForReview = function(ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/pages/setashomepage/' + id + '', - type: 'PUT', - dataType: null + url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/has-blogpost-waiting-for-review', + type: 'GET' }, ajaxParams)); }; })(); - // controller volo.cmsKit.admin.menus.menuItemAdmin + // controller volo.cmsKit.admin.comments.commentAdmin (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.admin.menus.menuItemAdmin'); + abp.utils.createNamespace(window, 'volo.cmsKit.admin.comments.commentAdmin'); - volo.cmsKit.admin.menus.menuItemAdmin.getList = function(ajaxParams) { + volo.cmsKit.admin.comments.commentAdmin.getList = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/menu-items', + url: abp.appPath + 'api/cms-kit-admin/comments' + abp.utils.buildQueryString([{ name: 'entityType', value: input.entityType }, { name: 'text', value: input.text }, { name: 'repliedCommentId', value: input.repliedCommentId }, { name: 'author', value: input.author }, { name: 'creationStartDate', value: input.creationStartDate }, { name: 'creationEndDate', value: input.creationEndDate }, { name: 'commentApproveState', value: input.commentApproveState }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.menus.menuItemAdmin.get = function(id, ajaxParams) { + volo.cmsKit.admin.comments.commentAdmin.get = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/menu-items/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/comments/' + id + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.menus.menuItemAdmin.create = function(input, ajaxParams) { + volo.cmsKit.admin.comments.commentAdmin['delete'] = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/menu-items', - type: 'POST', - data: JSON.stringify(input) + url: abp.appPath + 'api/cms-kit-admin/comments/' + id + '', + type: 'DELETE', + dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.menus.menuItemAdmin.update = function(id, input, ajaxParams) { + volo.cmsKit.admin.comments.commentAdmin.updateApprovalStatus = function(id, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/menu-items/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/comments/' + id + '/approval-status', type: 'PUT', + dataType: null, data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.menus.menuItemAdmin['delete'] = function(id, ajaxParams) { + volo.cmsKit.admin.comments.commentAdmin.updateSettings = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/menu-items/' + id + '', - type: 'DELETE', - dataType: null + url: abp.appPath + 'api/cms-kit-admin/comments/settings', + type: 'POST', + dataType: null, + data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.menus.menuItemAdmin.moveMenuItem = function(id, input, ajaxParams) { + volo.cmsKit.admin.comments.commentAdmin.getWaitingCount = function(ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/menu-items/' + id + '/move', - type: 'PUT', - dataType: null, - data: JSON.stringify(input) + url: abp.appPath + 'api/cms-kit-admin/comments/waiting-count', + type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.menus.menuItemAdmin.getPageLookup = function(input, ajaxParams) { + })(); + + // controller volo.cmsKit.admin.globalResources.globalResourceAdmin + + (function(){ + + abp.utils.createNamespace(window, 'volo.cmsKit.admin.globalResources.globalResourceAdmin'); + + volo.cmsKit.admin.globalResources.globalResourceAdmin.get = function(ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/menu-items/lookup/pages' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + url: abp.appPath + 'api/cms-kit-admin/global-resources', type: 'GET' }, ajaxParams)); }; + volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalResources = function(input, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/global-resources', + type: 'POST', + dataType: null, + data: JSON.stringify(input) + }, ajaxParams)); + }; + })(); // controller volo.cmsKit.admin.mediaDescriptors.mediaDescriptorAdmin @@ -231,217 +270,203 @@ })(); - // controller volo.cmsKit.admin.globalResources.globalResourceAdmin + // controller volo.cmsKit.admin.menus.menuItemAdmin (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.admin.globalResources.globalResourceAdmin'); + abp.utils.createNamespace(window, 'volo.cmsKit.admin.menus.menuItemAdmin'); - volo.cmsKit.admin.globalResources.globalResourceAdmin.get = function(ajaxParams) { + volo.cmsKit.admin.menus.menuItemAdmin.getList = function(ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/global-resources', + url: abp.appPath + 'api/cms-kit-admin/menu-items', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalResources = function(input, ajaxParams) { + volo.cmsKit.admin.menus.menuItemAdmin.get = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/global-resources', + url: abp.appPath + 'api/cms-kit-admin/menu-items/' + id + '', + type: 'GET' + }, ajaxParams)); + }; + + volo.cmsKit.admin.menus.menuItemAdmin.create = function(input, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/menu-items', type: 'POST', - dataType: null, data: JSON.stringify(input) }, ajaxParams)); }; - })(); - - // controller volo.cmsKit.admin.comments.commentAdmin - - (function(){ - - abp.utils.createNamespace(window, 'volo.cmsKit.admin.comments.commentAdmin'); + volo.cmsKit.admin.menus.menuItemAdmin.update = function(id, input, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-admin/menu-items/' + id + '', + type: 'PUT', + data: JSON.stringify(input) + }, ajaxParams)); + }; - volo.cmsKit.admin.comments.commentAdmin.getList = function(input, ajaxParams) { + volo.cmsKit.admin.menus.menuItemAdmin['delete'] = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/comments' + abp.utils.buildQueryString([{ name: 'entityType', value: input.entityType }, { name: 'text', value: input.text }, { name: 'repliedCommentId', value: input.repliedCommentId }, { name: 'author', value: input.author }, { name: 'creationStartDate', value: input.creationStartDate }, { name: 'creationEndDate', value: input.creationEndDate }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', - type: 'GET' + url: abp.appPath + 'api/cms-kit-admin/menu-items/' + id + '', + type: 'DELETE', + dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.comments.commentAdmin.get = function(id, ajaxParams) { + volo.cmsKit.admin.menus.menuItemAdmin.moveMenuItem = function(id, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/comments/' + id + '', - type: 'GET' + url: abp.appPath + 'api/cms-kit-admin/menu-items/' + id + '/move', + type: 'PUT', + dataType: null, + data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.comments.commentAdmin['delete'] = function(id, ajaxParams) { + volo.cmsKit.admin.menus.menuItemAdmin.getPageLookup = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/comments/' + id + '', - type: 'DELETE', - dataType: null + url: abp.appPath + 'api/cms-kit-admin/menu-items/lookup/pages' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + type: 'GET' }, ajaxParams)); }; })(); - // controller volo.cmsKit.admin.blogs.blogAdmin + // controller volo.cmsKit.admin.pages.pageAdmin (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.admin.blogs.blogAdmin'); + abp.utils.createNamespace(window, 'volo.cmsKit.admin.pages.pageAdmin'); - volo.cmsKit.admin.blogs.blogAdmin.get = function(id, ajaxParams) { + volo.cmsKit.admin.pages.pageAdmin.get = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/pages/' + id + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogAdmin.getList = function(input, ajaxParams) { + volo.cmsKit.admin.pages.pageAdmin.getList = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + url: abp.appPath + 'api/cms-kit-admin/pages' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogAdmin.create = function(input, ajaxParams) { + volo.cmsKit.admin.pages.pageAdmin.create = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs', + url: abp.appPath + 'api/cms-kit-admin/pages', type: 'POST', data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogAdmin.update = function(id, input, ajaxParams) { + volo.cmsKit.admin.pages.pageAdmin.update = function(id, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/pages/' + id + '', type: 'PUT', data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogAdmin['delete'] = function(id, ajaxParams) { + volo.cmsKit.admin.pages.pageAdmin['delete'] = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/pages/' + id + '', type: 'DELETE', dataType: null }, ajaxParams)); }; - })(); - - // controller volo.cmsKit.admin.blogs.blogFeatureAdmin - - (function(){ - - abp.utils.createNamespace(window, 'volo.cmsKit.admin.blogs.blogFeatureAdmin'); - - volo.cmsKit.admin.blogs.blogFeatureAdmin.getList = function(blogId, ajaxParams) { - return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/' + blogId + '/features', - type: 'GET' - }, ajaxParams)); - }; - - volo.cmsKit.admin.blogs.blogFeatureAdmin.set = function(blogId, dto, ajaxParams) { + volo.cmsKit.admin.pages.pageAdmin.setAsHomePage = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/' + blogId + '/features', + url: abp.appPath + 'api/cms-kit-admin/pages/setashomepage/' + id + '', type: 'PUT', - dataType: null, - data: JSON.stringify(dto) + dataType: null }, ajaxParams)); }; })(); - // controller volo.cmsKit.admin.blogs.blogPostAdmin + // controller volo.cmsKit.admin.tags.entityTagAdmin (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.admin.blogs.blogPostAdmin'); + abp.utils.createNamespace(window, 'volo.cmsKit.admin.tags.entityTagAdmin'); - volo.cmsKit.admin.blogs.blogPostAdmin.create = function(input, ajaxParams) { + volo.cmsKit.admin.tags.entityTagAdmin.addTagToEntity = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts', + url: abp.appPath + 'api/cms-kit-admin/entity-tags', type: 'POST', + dataType: null, data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogPostAdmin['delete'] = function(id, ajaxParams) { + volo.cmsKit.admin.tags.entityTagAdmin.removeTagFromEntity = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/entity-tags' + abp.utils.buildQueryString([{ name: 'tagId', value: input.tagId }, { name: 'entityType', value: input.entityType }, { name: 'entityId', value: input.entityId }]) + '', type: 'DELETE', dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogPostAdmin.get = function(id, ajaxParams) { - return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '', - type: 'GET' - }, ajaxParams)); - }; - - volo.cmsKit.admin.blogs.blogPostAdmin.getList = function(input, ajaxParams) { - return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'blogId', value: input.blogId }, { name: 'authorId', value: input.authorId }, { name: 'tagId', value: input.tagId }, { name: 'status', value: input.status }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', - type: 'GET' - }, ajaxParams)); - }; - - volo.cmsKit.admin.blogs.blogPostAdmin.update = function(id, input, ajaxParams) { + volo.cmsKit.admin.tags.entityTagAdmin.setEntityTags = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '', + url: abp.appPath + 'api/cms-kit-admin/entity-tags', type: 'PUT', + dataType: null, data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogPostAdmin.publish = function(id, ajaxParams) { + })(); + + // controller volo.cmsKit.admin.tags.tagAdmin + + (function(){ + + abp.utils.createNamespace(window, 'volo.cmsKit.admin.tags.tagAdmin'); + + volo.cmsKit.admin.tags.tagAdmin.create = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '/publish', + url: abp.appPath + 'api/cms-kit-admin/tags', type: 'POST', - dataType: null + data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogPostAdmin.draft = function(id, ajaxParams) { + volo.cmsKit.admin.tags.tagAdmin['delete'] = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '/draft', - type: 'POST', + url: abp.appPath + 'api/cms-kit-admin/tags/' + id + '', + type: 'DELETE', dataType: null }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogPostAdmin.createAndPublish = function(input, ajaxParams) { + volo.cmsKit.admin.tags.tagAdmin.get = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/create-and-publish', - type: 'POST', - data: JSON.stringify(input) + url: abp.appPath + 'api/cms-kit-admin/tags/' + id + '', + type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogPostAdmin.sendToReview = function(id, ajaxParams) { + volo.cmsKit.admin.tags.tagAdmin.getList = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/' + id + '/send-to-review', - type: 'POST', - dataType: null + url: abp.appPath + 'api/cms-kit-admin/tags' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + type: 'GET' }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogPostAdmin.createAndSendToReview = function(input, ajaxParams) { + volo.cmsKit.admin.tags.tagAdmin.update = function(id, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/create-and-send-to-review', - type: 'POST', + url: abp.appPath + 'api/cms-kit-admin/tags/' + id + '', + type: 'PUT', data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.admin.blogs.blogPostAdmin.hasBlogPostWaitingForReview = function(ajaxParams) { + volo.cmsKit.admin.tags.tagAdmin.getTagDefinitions = function(ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-admin/blogs/blog-posts/has-blogpost-waiting-for-review', + url: abp.appPath + 'api/cms-kit-admin/tags/tag-definitions', type: 'GET' }, ajaxParams)); }; diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/ClientProxies/cms-kit-common-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/ClientProxies/cms-kit-common-generate-proxy.json index 07e4bf762c..2d81020438 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/ClientProxies/cms-kit-common-generate-proxy.json +++ b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/ClientProxies/cms-kit-common-generate-proxy.json @@ -4,59 +4,75 @@ "rootPath": "cms-kit-common", "remoteServiceName": "CmsKitCommon", "controllers": { - "Volo.CmsKit.MediaDescriptors.MediaDescriptorController": { - "controllerName": "MediaDescriptor", - "controllerGroupName": "MediaDescriptor", + "Volo.CmsKit.Blogs.BlogFeatureController": { + "controllerName": "BlogFeature", + "controllerGroupName": "BlogFeature", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.CmsKit.MediaDescriptors.MediaDescriptorController", + "type": "Volo.CmsKit.Blogs.BlogFeatureController", "interfaces": [ { - "type": "Volo.CmsKit.MediaDescriptors.IMediaDescriptorAppService", - "name": "IMediaDescriptorAppService", + "type": "Volo.CmsKit.Blogs.IBlogFeatureAppService", + "name": "IBlogFeatureAppService", "methods": [ { - "name": "DownloadAsync", + "name": "GetOrDefaultAsync", "parametersOnMethod": [ { - "name": "id", + "name": "blogId", "typeAsString": "System.Guid, System.Private.CoreLib", "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null + }, + { + "name": "featureName", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null } ], "returnValue": { - "type": "Volo.Abp.Content.RemoteStreamContent", - "typeSimple": "Volo.Abp.Content.RemoteStreamContent" + "type": "Volo.CmsKit.Blogs.BlogFeatureDto", + "typeSimple": "Volo.CmsKit.Blogs.BlogFeatureDto" } } ] } ], "actions": { - "DownloadAsyncById": { - "uniqueName": "DownloadAsyncById", - "name": "DownloadAsync", + "GetOrDefaultAsyncByBlogIdAndFeatureName": { + "uniqueName": "GetOrDefaultAsyncByBlogIdAndFeatureName", + "name": "GetOrDefaultAsync", "httpMethod": "GET", - "url": "api/cms-kit/media/{id}", + "url": "api/cms-kit/blogs/{blogId}/features/{featureName}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "id", + "name": "blogId", "typeAsString": "System.Guid, System.Private.CoreLib", "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null + }, + { + "name": "featureName", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "id", - "name": "id", + "nameOnMethod": "blogId", + "name": "blogId", "jsonName": null, "type": "System.Guid", "typeSimple": "string", @@ -65,86 +81,82 @@ "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" + }, + { + "nameOnMethod": "featureName", + "name": "featureName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" } ], "returnValue": { - "type": "Volo.Abp.Content.RemoteStreamContent", - "typeSimple": "Volo.Abp.Content.RemoteStreamContent" + "type": "Volo.CmsKit.Blogs.BlogFeatureDto", + "typeSimple": "Volo.CmsKit.Blogs.BlogFeatureDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.MediaDescriptors.IMediaDescriptorAppService" + "implementFrom": "Volo.CmsKit.Blogs.IBlogFeatureAppService" } } }, - "Volo.CmsKit.Blogs.BlogFeatureController": { - "controllerName": "BlogFeature", - "controllerGroupName": "BlogFeature", + "Volo.CmsKit.MediaDescriptors.MediaDescriptorController": { + "controllerName": "MediaDescriptor", + "controllerGroupName": "MediaDescriptor", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.CmsKit.Blogs.BlogFeatureController", + "type": "Volo.CmsKit.MediaDescriptors.MediaDescriptorController", "interfaces": [ { - "type": "Volo.CmsKit.Blogs.IBlogFeatureAppService", - "name": "IBlogFeatureAppService", + "type": "Volo.CmsKit.MediaDescriptors.IMediaDescriptorAppService", + "name": "IMediaDescriptorAppService", "methods": [ { - "name": "GetOrDefaultAsync", + "name": "DownloadAsync", "parametersOnMethod": [ { - "name": "blogId", + "name": "id", "typeAsString": "System.Guid, System.Private.CoreLib", "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null - }, - { - "name": "featureName", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null } ], "returnValue": { - "type": "Volo.CmsKit.Blogs.BlogFeatureDto", - "typeSimple": "Volo.CmsKit.Blogs.BlogFeatureDto" + "type": "Volo.Abp.Content.RemoteStreamContent", + "typeSimple": "Volo.Abp.Content.RemoteStreamContent" } } ] } ], "actions": { - "GetOrDefaultAsyncByBlogIdAndFeatureName": { - "uniqueName": "GetOrDefaultAsyncByBlogIdAndFeatureName", - "name": "GetOrDefaultAsync", + "DownloadAsyncById": { + "uniqueName": "DownloadAsyncById", + "name": "DownloadAsync", "httpMethod": "GET", - "url": "api/cms-kit/blogs/{blogId}/features/{featureName}", + "url": "api/cms-kit/media/{id}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "blogId", + "name": "id", "typeAsString": "System.Guid, System.Private.CoreLib", "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null - }, - { - "name": "featureName", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "blogId", - "name": "blogId", + "nameOnMethod": "id", + "name": "id", "jsonName": null, "type": "System.Guid", "typeSimple": "string", @@ -153,26 +165,14 @@ "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" - }, - { - "nameOnMethod": "featureName", - "name": "featureName", - "jsonName": null, - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", - "descriptorName": "" } ], "returnValue": { - "type": "Volo.CmsKit.Blogs.BlogFeatureDto", - "typeSimple": "Volo.CmsKit.Blogs.BlogFeatureDto" + "type": "Volo.Abp.Content.RemoteStreamContent", + "typeSimple": "Volo.Abp.Content.RemoteStreamContent" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Blogs.IBlogFeatureAppService" + "implementFrom": "Volo.CmsKit.MediaDescriptors.IMediaDescriptorAppService" } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs index e8a30a75bc..5f27f785f8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs @@ -7,13 +7,15 @@ using Volo.CmsKit.Reactions; using Volo.CmsKit.Web.Icons; using Markdig; using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.SettingManagement.Web; namespace Volo.CmsKit.Web; [DependsOn( typeof(AbpAspNetCoreMvcUiThemeSharedModule), typeof(CmsKitCommonApplicationContractsModule), - typeof(AbpAutoMapperModule) + typeof(AbpAutoMapperModule), + typeof(AbpSettingManagementWebModule) )] public class CmsKitCommonWebModule : AbpModule { diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj index b19f0d2ed6..9b8de76772 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj @@ -16,6 +16,7 @@ + diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/client-proxies/cms-kit-common-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/client-proxies/cms-kit-common-proxy.js index 27aa1d819e..7c8b1ebc86 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/client-proxies/cms-kit-common-proxy.js +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/wwwroot/client-proxies/cms-kit-common-proxy.js @@ -5,30 +5,30 @@ (function(){ - // controller volo.cmsKit.mediaDescriptors.mediaDescriptor + // controller volo.cmsKit.blogs.blogFeature (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.mediaDescriptors.mediaDescriptor'); + abp.utils.createNamespace(window, 'volo.cmsKit.blogs.blogFeature'); - volo.cmsKit.mediaDescriptors.mediaDescriptor.download = function(id, ajaxParams) { + volo.cmsKit.blogs.blogFeature.getOrDefault = function(blogId, featureName, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit/media/' + id + '', + url: abp.appPath + 'api/cms-kit/blogs/' + blogId + '/features/' + featureName + '', type: 'GET' }, ajaxParams)); }; })(); - // controller volo.cmsKit.blogs.blogFeature + // controller volo.cmsKit.mediaDescriptors.mediaDescriptor (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.blogs.blogFeature'); + abp.utils.createNamespace(window, 'volo.cmsKit.mediaDescriptors.mediaDescriptor'); - volo.cmsKit.blogs.blogFeature.getOrDefault = function(blogId, featureName, ajaxParams) { + volo.cmsKit.mediaDescriptors.mediaDescriptor.download = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit/blogs/' + blogId + '/features/' + featureName + '', + url: abp.appPath + 'api/cms-kit/media/' + id + '', type: 'GET' }, ajaxParams)); }; diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitSettingDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitSettingDefinitionProvider.cs new file mode 100644 index 0000000000..29f6272a9d --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitSettingDefinitionProvider.cs @@ -0,0 +1,11 @@ +using Volo.Abp.Settings; + +namespace Volo.CmsKit; + +public class CmsKitSettingDefinitionProvider : SettingDefinitionProvider +{ + public override void Define(ISettingDefinitionContext context) + { + context.Add(new SettingDefinition(CmsKitSettings.Comments.RequireApprovement, "false", null, null, true)); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitSettings.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitSettings.cs new file mode 100644 index 0000000000..6d2cc4e098 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitSettings.cs @@ -0,0 +1,12 @@ +namespace Volo.CmsKit; + +public static class CmsKitSettings +{ + private const string GroupName = "CmsKit"; + + public static class Comments + { + private const string Default = GroupName + ".Comments"; + public const string RequireApprovement = Default + ".RequireApprovement"; + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Comments/CommentApproveState.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Comments/CommentApproveState.cs new file mode 100644 index 0000000000..d2dc64bf66 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Comments/CommentApproveState.cs @@ -0,0 +1,12 @@ +using System; + +namespace Volo.CmsKit.Comments; + +[Flags] +public enum CommentApproveState +{ + All = 0, + Approved = 1, + Disapproved = 2, + Waiting = 4 +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index a7ab34b119..0f49bdbccf 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -168,7 +168,6 @@ "YourReply": "Your reply", "MarkdownSupported": "Markdown supported.", "GlobalResources": "Global resources", - "SavedSuccessfully": "Saved successfully", "CmsKit.BlogPost.Status.0": "Draft", "CmsKit.BlogPost.Status.1": "Published", "CmsKit.BlogPost.Status.2": "Waiting for review", @@ -228,6 +227,23 @@ "TagsHelpText": "Tags should be comma-separated (e.g.: tag1, tag2, tag3)", "ThisPartOfContentCouldntBeLoaded": "This part of content couldn't be loaded.", "DuplicateCommentAttemptMessage": "Duplicate comment post attempt detected. Your comment has already been submitted.", - "NoBlogPostYet": "No blog post yet!" + "NoBlogPostYet": "No blog post yet!", + "CmsKit:Comment": "Comment", + "CmsKitCommentOptions:RequireApprovement": "Require approval for comments", + "CmsKitCommentOptions:RequireApprovementDescription": "When enabled, comments will require approval before being published.", + "CommentFilter:ApproveState":"Approve State", + "ApproveState": "Approve State", + "CommentFilter:0":"All", + "CommentFilter:1":"Approved", + "CommentFilter:2":"Disapproved", + "CommentFilter:4":"Waiting", + "ApprovedSuccessfully":"Approved Successfully", + "ApprovalRevokedSuccessfully":"Approval Revoked Successfully", + "Approve":"Approve", + "Disapproved":"Disapproved", + "CommentAlertMessage":"There are {0} comments waiting for approval", + "Settings:Menu:CmsKit":"CMS", + "CommentsAwaitingApproval":"Comments Awaiting Approval", + "CommentSubmittedForApproval": "Your comment has been submitted for approval.", } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj index cc8cfb53b5..d54c87c4f9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj @@ -18,6 +18,7 @@ + diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs index 13055db98a..e3824063e6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs @@ -5,6 +5,7 @@ using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending.Modularity; +using Volo.Abp.SettingManagement; using Volo.Abp.Threading; using Volo.Abp.Users; using Volo.CmsKit.Blogs; @@ -25,7 +26,8 @@ namespace Volo.CmsKit; typeof(CmsKitDomainSharedModule), typeof(AbpUsersDomainModule), typeof(AbpDddDomainModule), - typeof(AbpBlobStoringModule) + typeof(AbpBlobStoringModule), + typeof(AbpSettingManagementDomainModule) )] public class CmsKitDomainModule : AbpModule { diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs index 7a09b18b63..589b8d5cb2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs @@ -27,6 +27,8 @@ public class Comment : AggregateRoot, IHasCreationTime, IMustHaveCreator, public virtual string IdempotencyToken { get; set; } + public virtual bool? IsApproved { get; private set; } + protected Comment() { @@ -62,4 +64,22 @@ public class Comment : AggregateRoot, IHasCreationTime, IMustHaveCreator, { Text = Check.NotNullOrWhiteSpace(text, nameof(text), CommentConsts.MaxTextLength); } + + public virtual Comment Approve() + { + IsApproved = true; + return this; + } + + public virtual Comment Reject() + { + IsApproved = false; + return this; + } + + public virtual Comment WaitForApproval() + { + IsApproved = null; + return this; + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/CommentManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/CommentManager.cs index b9f4e5c1d7..20e8a81106 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/CommentManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/CommentManager.cs @@ -1,9 +1,9 @@ - -using JetBrains.Annotations; +using JetBrains.Annotations; using System; using System.Threading.Tasks; using Volo.Abp; using Volo.Abp.Domain.Services; +using Volo.Abp.SettingManagement; using Volo.CmsKit.Users; namespace Volo.CmsKit.Comments; @@ -11,18 +11,22 @@ namespace Volo.CmsKit.Comments; public class CommentManager : DomainService { protected ICommentEntityTypeDefinitionStore DefinitionStore { get; } + protected ISettingManager SettingManager { get; } - public CommentManager(ICommentEntityTypeDefinitionStore definitionStore) + public CommentManager( + ICommentEntityTypeDefinitionStore definitionStore, + ISettingManager settingManager) { DefinitionStore = definitionStore; + SettingManager = settingManager; } public virtual async Task CreateAsync([NotNull] CmsUser creator, - [NotNull] string entityType, - [NotNull] string entityId, - [NotNull] string text, - [CanBeNull] string url = null, - [CanBeNull] Guid? repliedCommentId = null) + [NotNull] string entityType, + [NotNull] string entityId, + [NotNull] string text, + [CanBeNull] string url = null, + [CanBeNull] Guid? repliedCommentId = null) { Check.NotNull(creator, nameof(creator)); Check.NotNullOrWhiteSpace(entityType, nameof(entityType), CommentConsts.MaxEntityTypeLength); @@ -34,14 +38,27 @@ public class CommentManager : DomainService throw new EntityNotCommentableException(entityType); } - return new Comment( - GuidGenerator.Create(), - entityType, - entityId, - text, - repliedCommentId, - creator.Id, - url, - CurrentTenant.Id); + var comment = new Comment( + GuidGenerator.Create(), + entityType, + entityId, + text, + repliedCommentId, + creator.Id, + url, + CurrentTenant.Id); + + + var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.Comments.RequireApprovement)); + if (isRequireApprovementEnabled) + { + comment.WaitForApproval(); + } + else + { + comment.Approve(); + } + + return comment; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/ICommentRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/ICommentRepository.cs index b054f11037..2bba78505e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/ICommentRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/ICommentRepository.cs @@ -21,6 +21,7 @@ public interface ICommentRepository : IBasicRepository string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, + CommentApproveState commentApproveState = CommentApproveState.All, CancellationToken cancellationToken = default ); @@ -31,12 +32,14 @@ public interface ICommentRepository : IBasicRepository string authorUsername = null, DateTime? creationStartDate = null, DateTime? creationEndDate = null, + CommentApproveState commentApproveState = CommentApproveState.All, CancellationToken cancellationToken = default ); Task> GetListWithAuthorsAsync( [NotNull] string entityType, [NotNull] string entityId, + CommentApproveState commentApproveState = CommentApproveState.All, CancellationToken cancellationToken = default ); @@ -46,4 +49,4 @@ public interface ICommentRepository : IBasicRepository ); Task ExistsAsync(string idempotencyToken, CancellationToken cancellationToken = default); -} +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs index a141a139ee..dd73a9218a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Settings; +using Volo.Abp.Settings; namespace Volo.CmsKit.Settings; @@ -10,4 +10,4 @@ public class CmsKitSettingDefinitionProvider : SettingDefinitionProvider * Use names from CmsKitSettings class. */ } -} +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs index a01696c4c5..e3d5116ea5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs @@ -1,4 +1,4 @@ -namespace Volo.CmsKit.Settings; +namespace Volo.CmsKit.Settings; public static class CmsKitSettings { @@ -7,4 +7,4 @@ public static class CmsKitSettings /* Add constants for setting names. Example: * public const string MySettingName = GroupName + ".MySettingName"; */ -} +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Comments/EfCoreCommentRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Comments/EfCoreCommentRepository.cs index 2f626a5cd7..542188baf8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Comments/EfCoreCommentRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Comments/EfCoreCommentRepository.cs @@ -22,7 +22,8 @@ public class EfCoreCommentRepository : EfCoreRepository GetWithAuthorAsync(Guid id, + public virtual async Task GetWithAuthorAsync( + Guid id, CancellationToken cancellationToken = default) { var query = from comment in (await GetDbSetAsync()) @@ -54,6 +55,7 @@ public class EfCoreCommentRepository : EfCoreRepository> GetListWithAuthorsAsync( string entityType, string entityId, + CommentApproveState commentApproveState = CommentApproveState.All, CancellationToken cancellationToken = default) { Check.NotNullOrWhiteSpace(entityType, nameof(entityType)); @@ -119,6 +123,9 @@ public class EfCoreCommentRepository : EfCoreRepository c.Comment.IsApproved == true); + query = query.WhereIf(commentApproveState == (CommentApproveState.Approved | CommentApproveState.Waiting), c => c.Comment.IsApproved == true || c.Comment.IsApproved == null); + return await query.ToListAsync(GetCancellationToken(cancellationToken)); } @@ -141,7 +148,9 @@ public class EfCoreCommentRepository : EfCoreRepository ExistsAsync(string idempotencyToken, CancellationToken cancellationToken = default) + public virtual async Task ExistsAsync( + string idempotencyToken, + CancellationToken cancellationToken = default) { return await (await GetDbSetAsync()).AnyAsync(x => x.IdempotencyToken == idempotencyToken, GetCancellationToken(cancellationToken)); } @@ -153,8 +162,7 @@ public class EfCoreCommentRepository : EfCoreRepository(); @@ -173,6 +181,9 @@ public class EfCoreCommentRepository : EfCoreRepository c.Comment.RepliedCommentId == repliedCommentId) .WhereIf(!authorUsername.IsNullOrWhiteSpace(), c => c.Author.UserName.Contains(authorUsername)) .WhereIf(creationStartDate.HasValue, c => c.Comment.CreationTime >= creationStartDate) - .WhereIf(creationEndDate.HasValue, c => c.Comment.CreationTime <= creationEndDate); + .WhereIf(creationEndDate.HasValue, c => c.Comment.CreationTime <= creationEndDate) + .WhereIf(CommentApproveState.Approved == commentApproveState, c => c.Comment.IsApproved == true) + .WhereIf(CommentApproveState.Disapproved == commentApproveState, c => c.Comment.IsApproved == false) + .WhereIf(CommentApproveState.Waiting == commentApproveState, c => c.Comment.IsApproved == null); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs index 698c533b4e..ec82f052e4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs @@ -45,6 +45,7 @@ public class MongoCommentRepository : MongoDbRepository x.Id).ToList(); var authorsQuery = from comment in (await GetMongoQueryableAsync(token)) - join user in (await GetDbContextAsync(token)).CmsUsers on comment.CreatorId equals user.Id - where commentIds.Contains(comment.Id) - orderby comment.CreationTime - select user; + join user in (await GetDbContextAsync(token)).CmsUsers on comment.CreatorId equals user.Id + where commentIds.Contains(comment.Id) + orderby comment.CreationTime + select user; var authors = await ApplyDataFilters, CmsUser>(authorsQuery).ToListAsync(token); return comments .Select( comment => - new CommentWithAuthorQueryResultItem - { - Comment = comment, - Author = authors.FirstOrDefault(a => a.Id == comment.CreatorId) + new CommentWithAuthorQueryResultItem { + Comment = comment, Author = authors.FirstOrDefault(a => a.Id == comment.CreatorId) }).ToList(); } @@ -90,6 +90,7 @@ public class MongoCommentRepository : MongoDbRepository>() @@ -109,6 +111,7 @@ public class MongoCommentRepository : MongoDbRepository> GetListWithAuthorsAsync( string entityType, string entityId, + CommentApproveState commentApproveState = CommentApproveState.All, CancellationToken cancellationToken = default) { Check.NotNullOrWhiteSpace(entityType, nameof(entityType)); @@ -122,8 +125,16 @@ public class MongoCommentRepository : MongoDbRepository, CmsUser>(authorsQuery).ToListAsync(GetCancellationToken(cancellationToken)); - var comments = await (await GetMongoQueryableAsync(cancellationToken)) - .Where(c => c.EntityId == entityId && c.EntityType == entityType) + var commentsQuery = (await GetMongoQueryableAsync(cancellationToken)) + .Where(c => c.EntityId == entityId && c.EntityType == entityType); + + commentsQuery = commentApproveState switch { + CommentApproveState.Approved => commentsQuery.Where(c => c.IsApproved == true), + CommentApproveState.Approved | CommentApproveState.Waiting => commentsQuery.Where(c => c.IsApproved == true || c.IsApproved == null), + _ => commentsQuery + }; + + var comments = await commentsQuery .OrderBy(c => c.CreationTime) .ToListAsync(GetCancellationToken(cancellationToken)); @@ -172,6 +183,7 @@ public class MongoCommentRepository : MongoDbRepository c.EntityType == entityType) .WhereIf(repliedCommentId.HasValue, c => c.RepliedCommentId == repliedCommentId) .WhereIf(creationStartDate.HasValue, c => c.CreationTime >= creationStartDate) - .WhereIf(creationEndDate.HasValue, c => c.CreationTime <= creationEndDate); + .WhereIf(creationEndDate.HasValue, c => c.CreationTime <= creationEndDate) + .WhereIf(CommentApproveState.Approved == commentApproveState, c => c.IsApproved == true) + .WhereIf(CommentApproveState.Disapproved == commentApproveState, c => c.IsApproved == false) + .WhereIf(CommentApproveState.Waiting == commentApproveState, c => c.IsApproved == null); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj index 79e1e39ff9..d1625e8c7c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj @@ -12,5 +12,4 @@ - diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs index cda077bde7..d0937eb04c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs @@ -12,6 +12,7 @@ using Volo.Abp.Data; using Volo.Abp.EventBus.Distributed; using Volo.Abp.Features; using Volo.Abp.GlobalFeatures; +using Volo.Abp.SettingManagement; using Volo.Abp.Users; using Volo.CmsKit.Comments; using Volo.CmsKit.Features; @@ -32,27 +33,35 @@ public class CommentPublicAppService : CmsKitPublicAppServiceBase, ICommentPubli protected ICmsUserLookupService CmsUserLookupService { get; } public IDistributedEventBus DistributedEventBus { get; } protected CommentManager CommentManager { get; } - protected CmsKitCommentOptions CmsCommentOptions { get; } + private readonly ISettingManager SettingManager; + public CommentPublicAppService( ICommentRepository commentRepository, ICmsUserLookupService cmsUserLookupService, IDistributedEventBus distributedEventBus, CommentManager commentManager, - IOptionsSnapshot cmsCommentOptions) + IOptionsSnapshot cmsCommentOptions, + ISettingManager settingManager + ) { CommentRepository = commentRepository; CmsUserLookupService = cmsUserLookupService; DistributedEventBus = distributedEventBus; CommentManager = commentManager; CmsCommentOptions = cmsCommentOptions.Value; + SettingManager = settingManager; } public virtual async Task> GetListAsync(string entityType, string entityId) { - var commentsWithAuthor = await CommentRepository - .GetListWithAuthorsAsync(entityType, entityId); + var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.Comments.RequireApprovement)); + + var commentsWithAuthor = isRequireApprovementEnabled + ? await CommentRepository.GetListWithAuthorsAsync(entityType, entityId, CommentApproveState.Approved) + : await CommentRepository.GetListWithAuthorsAsync(entityType, entityId, CommentApproveState.Approved | CommentApproveState.Waiting); + return new ListResultDto( ConvertCommentsToNestedStructure(commentsWithAuthor) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json index 31e3fb52f8..68f721556b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json @@ -4,23 +4,23 @@ "rootPath": "cms-kit", "remoteServiceName": "CmsKitPublic", "controllers": { - "Volo.CmsKit.Public.Tags.TagPublicController": { - "controllerName": "TagPublic", - "controllerGroupName": "TagPublic", + "Volo.CmsKit.Public.Blogs.BlogPostPublicController": { + "controllerName": "BlogPostPublic", + "controllerGroupName": "BlogPostPublic", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.CmsKit.Public.Tags.TagPublicController", + "type": "Volo.CmsKit.Public.Blogs.BlogPostPublicController", "interfaces": [ { - "type": "Volo.CmsKit.Tags.ITagAppService", - "name": "ITagAppService", + "type": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService", + "name": "IBlogPostPublicAppService", "methods": [ { - "name": "GetAllRelatedTagsAsync", + "name": "GetListAsync", "parametersOnMethod": [ { - "name": "entityType", + "name": "blogSlug", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -28,24 +28,24 @@ "defaultValue": null }, { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput", + "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput", "isOptional": false, "defaultValue": null } ], "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Tags.TagDto]" + "type": "Volo.Abp.Application.Dtos.PagedResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" } }, { - "name": "GetPopularTagsAsync", + "name": "GetAsync", "parametersOnMethod": [ { - "name": "entityType", + "name": "blogSlug", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -53,32 +53,100 @@ "defaultValue": null }, { - "name": "maxCount", - "typeAsString": "System.Int32, System.Private.CoreLib", - "type": "System.Int32", - "typeSimple": "number", + "name": "blogPostSlug", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Tags.PopularTagDto]" + "type": "Volo.CmsKit.Contents.BlogPostCommonDto", + "typeSimple": "Volo.CmsKit.Contents.BlogPostCommonDto" + } + }, + { + "name": "GetAuthorsHasBlogPostsAsync", + "parametersOnMethod": [ + { + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto", + "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "Volo.Abp.Application.Dtos.PagedResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" + } + }, + { + "name": "GetAuthorHasBlogPostAsync", + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "Volo.CmsKit.Users.CmsUserDto", + "typeSimple": "Volo.CmsKit.Users.CmsUserDto" + } + }, + { + "name": "DeleteAsync", + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "System.Void", + "typeSimple": "System.Void" + } + }, + { + "name": "GetTagNameAsync", + "parametersOnMethod": [ + { + "name": "tagId", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" } } ] } ], "actions": { - "GetAllRelatedTagsAsyncByEntityTypeAndEntityId": { - "uniqueName": "GetAllRelatedTagsAsyncByEntityTypeAndEntityId", - "name": "GetAllRelatedTagsAsync", + "GetAsyncByBlogSlugAndBlogPostSlug": { + "uniqueName": "GetAsyncByBlogSlugAndBlogPostSlug", + "name": "GetAsync", "httpMethod": "GET", - "url": "api/cms-kit-public/tags/{entityType}/{entityId}", + "url": "api/cms-kit-public/blog-posts/{blogSlug}/{blogPostSlug}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "entityType", + "name": "blogSlug", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -86,7 +154,7 @@ "defaultValue": null }, { - "name": "entityId", + "name": "blogPostSlug", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -96,8 +164,8 @@ ], "parameters": [ { - "nameOnMethod": "entityType", - "name": "entityType", + "nameOnMethod": "blogSlug", + "name": "blogSlug", "jsonName": null, "type": "System.String", "typeSimple": "string", @@ -108,8 +176,8 @@ "descriptorName": "" }, { - "nameOnMethod": "entityId", - "name": "entityId", + "nameOnMethod": "blogPostSlug", + "name": "blogPostSlug", "jsonName": null, "type": "System.String", "typeSimple": "string", @@ -121,21 +189,21 @@ } ], "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Tags.TagDto]" + "type": "Volo.CmsKit.Contents.BlogPostCommonDto", + "typeSimple": "Volo.CmsKit.Contents.BlogPostCommonDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Tags.ITagAppService" + "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" }, - "GetPopularTagsAsyncByEntityTypeAndMaxCount": { - "uniqueName": "GetPopularTagsAsyncByEntityTypeAndMaxCount", - "name": "GetPopularTagsAsync", + "GetListAsyncByBlogSlugAndInput": { + "uniqueName": "GetListAsyncByBlogSlugAndInput", + "name": "GetListAsync", "httpMethod": "GET", - "url": "api/cms-kit-public/tags/popular/{entityType}/{maxCount}", + "url": "api/cms-kit-public/blog-posts/{blogSlug}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "entityType", + "name": "blogSlug", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -143,18 +211,18 @@ "defaultValue": null }, { - "name": "maxCount", - "typeAsString": "System.Int32, System.Private.CoreLib", - "type": "System.Int32", - "typeSimple": "number", + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput", + "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput", "isOptional": false, "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "entityType", - "name": "entityType", + "nameOnMethod": "blogSlug", + "name": "blogSlug", "jsonName": null, "type": "System.String", "typeSimple": "string", @@ -165,220 +233,157 @@ "descriptorName": "" }, { - "nameOnMethod": "maxCount", - "name": "maxCount", + "nameOnMethod": "input", + "name": "AuthorId", + "jsonName": null, + "type": "System.Guid?", + "typeSimple": "string?", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + }, + { + "nameOnMethod": "input", + "name": "TagId", + "jsonName": null, + "type": "System.Guid?", + "typeSimple": "string?", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + }, + { + "nameOnMethod": "input", + "name": "Sorting", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + }, + { + "nameOnMethod": "input", + "name": "SkipCount", "jsonName": null, "type": "System.Int32", "typeSimple": "number", "isOptional": false, "defaultValue": null, - "constraintTypes": [ - "IntRouteConstraint" - ], - "bindingSourceId": "Path", - "descriptorName": "" + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + }, + { + "nameOnMethod": "input", + "name": "MaxResultCount", + "jsonName": null, + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" } ], "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Tags.PopularTagDto]" + "type": "Volo.Abp.Application.Dtos.PagedResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Tags.ITagAppService" - } - } - }, - "Volo.CmsKit.Public.Reactions.ReactionPublicController": { - "controllerName": "ReactionPublic", - "controllerGroupName": "ReactionPublic", - "isRemoteService": true, - "isIntegrationService": false, - "apiVersion": null, - "type": "Volo.CmsKit.Public.Reactions.ReactionPublicController", - "interfaces": [ - { - "type": "Volo.CmsKit.Public.Reactions.IReactionPublicAppService", - "name": "IReactionPublicAppService", - "methods": [ + "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" + }, + "GetAuthorsHasBlogPostsAsyncByInput": { + "uniqueName": "GetAuthorsHasBlogPostsAsyncByInput", + "name": "GetAuthorsHasBlogPostsAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/blog-posts/authors", + "supportedVersions": [], + "parametersOnMethod": [ { - "name": "GetForSelectionAsync", - "parametersOnMethod": [ - { - "name": "entityType", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - } - ], - "returnValue": { - "type": "Volo.Abp.Application.Dtos.ListResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" - } - }, - { - "name": "CreateAsync", - "parametersOnMethod": [ - { - "name": "entityType", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "reaction", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - } - ], - "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" - } - }, - { - "name": "DeleteAsync", - "parametersOnMethod": [ - { - "name": "entityType", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "reaction", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - } - ], - "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" - } + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto", + "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto", + "isOptional": false, + "defaultValue": null } - ] - } - ], - "actions": { - "GetForSelectionAsyncByEntityTypeAndEntityId": { - "uniqueName": "GetForSelectionAsyncByEntityTypeAndEntityId", - "name": "GetForSelectionAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/reactions/{entityType}/{entityId}", - "supportedVersions": [], - "parametersOnMethod": [ + ], + "parameters": [ { - "name": "entityType", - "typeAsString": "System.String, System.Private.CoreLib", + "nameOnMethod": "input", + "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, - "defaultValue": null + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" }, { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", + "nameOnMethod": "input", + "name": "Sorting", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + }, { - "nameOnMethod": "entityType", - "name": "entityType", + "nameOnMethod": "input", + "name": "SkipCount", "jsonName": null, - "type": "System.String", - "typeSimple": "string", + "type": "System.Int32", + "typeSimple": "number", "isOptional": false, "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", - "descriptorName": "" + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" }, { - "nameOnMethod": "entityId", - "name": "entityId", + "nameOnMethod": "input", + "name": "MaxResultCount", "jsonName": null, - "type": "System.String", - "typeSimple": "string", + "type": "System.Int32", + "typeSimple": "number", "isOptional": false, "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", - "descriptorName": "" + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" } ], "returnValue": { - "type": "Volo.Abp.Application.Dtos.ListResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" + "type": "Volo.Abp.Application.Dtos.PagedResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Reactions.IReactionPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" }, - "CreateAsyncByEntityTypeAndEntityIdAndReaction": { - "uniqueName": "CreateAsyncByEntityTypeAndEntityIdAndReaction", - "name": "CreateAsync", - "httpMethod": "PUT", - "url": "api/cms-kit-public/reactions/{entityType}/{entityId}/{reaction}", + "GetAuthorHasBlogPostAsyncById": { + "uniqueName": "GetAuthorHasBlogPostAsyncById", + "name": "GetAuthorHasBlogPostAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/blog-posts/authors/{id}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "entityType", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "reaction", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null @@ -386,34 +391,47 @@ ], "parameters": [ { - "nameOnMethod": "entityType", - "name": "entityType", + "nameOnMethod": "id", + "name": "id", "jsonName": null, - "type": "System.String", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null, "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" - }, + } + ], + "returnValue": { + "type": "Volo.CmsKit.Users.CmsUserDto", + "typeSimple": "Volo.CmsKit.Users.CmsUserDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" + }, + "DeleteAsyncById": { + "uniqueName": "DeleteAsyncById", + "name": "DeleteAsync", + "httpMethod": "DELETE", + "url": "api/cms-kit-public/blog-posts/{id}", + "supportedVersions": [], + "parametersOnMethod": [ { - "nameOnMethod": "entityId", - "name": "entityId", - "jsonName": null, - "type": "System.String", + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, - "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", - "descriptorName": "" - }, + "defaultValue": null + } + ], + "parameters": [ { - "nameOnMethod": "reaction", - "name": "reaction", + "nameOnMethod": "id", + "name": "id", "jsonName": null, - "type": "System.String", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null, @@ -427,35 +445,19 @@ "typeSimple": "System.Void" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Reactions.IReactionPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" }, - "DeleteAsyncByEntityTypeAndEntityIdAndReaction": { - "uniqueName": "DeleteAsyncByEntityTypeAndEntityIdAndReaction", - "name": "DeleteAsync", - "httpMethod": "DELETE", - "url": "api/cms-kit-public/reactions/{entityType}/{entityId}/{reaction}", + "GetTagNameAsyncByTagId": { + "uniqueName": "GetTagNameAsyncByTagId", + "name": "GetTagNameAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/blog-posts/tags/{id}", "supportedVersions": [], "parametersOnMethod": [ - { - "name": "entityType", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "reaction", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", + { + "name": "tagId", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null @@ -463,35 +465,23 @@ ], "parameters": [ { - "nameOnMethod": "entityType", - "name": "entityType", - "jsonName": null, - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", - "descriptorName": "" - }, - { - "nameOnMethod": "entityId", - "name": "entityId", + "nameOnMethod": "tagId", + "name": "tagId", "jsonName": null, - "type": "System.String", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", + "constraintTypes": null, + "bindingSourceId": "ModelBinding", "descriptorName": "" }, { - "nameOnMethod": "reaction", - "name": "reaction", + "nameOnMethod": "id", + "name": "id", "jsonName": null, - "type": "System.String", - "typeSimple": "string", + "type": null, + "typeSimple": null, "isOptional": false, "defaultValue": null, "constraintTypes": [], @@ -500,28 +490,28 @@ } ], "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" + "type": "System.String", + "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Reactions.IReactionPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" } } }, - "Volo.CmsKit.Public.Ratings.RatingPublicController": { - "controllerName": "RatingPublic", - "controllerGroupName": "RatingPublic", + "Volo.CmsKit.Public.Comments.CommentPublicController": { + "controllerName": "CommentPublic", + "controllerGroupName": "CommentPublic", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.CmsKit.Public.Ratings.RatingPublicController", + "type": "Volo.CmsKit.Public.Comments.CommentPublicController", "interfaces": [ { - "type": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService", - "name": "IRatingPublicAppService", + "type": "Volo.CmsKit.Public.Comments.ICommentPublicAppService", + "name": "ICommentPublicAppService", "methods": [ { - "name": "CreateAsync", + "name": "GetListAsync", "parametersOnMethod": [ { "name": "entityType", @@ -538,23 +528,15 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null - }, - { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", - "typeSimple": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", - "isOptional": false, - "defaultValue": null } ], "returnValue": { - "type": "Volo.CmsKit.Public.Ratings.RatingDto", - "typeSimple": "Volo.CmsKit.Public.Ratings.RatingDto" + "type": "Volo.Abp.Application.Dtos.ListResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" } }, { - "name": "DeleteAsync", + "name": "CreateAsync", "parametersOnMethod": [ { "name": "entityType", @@ -571,47 +553,72 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null + }, + { + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Comments.CreateCommentInput, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Comments.CreateCommentInput", + "typeSimple": "Volo.CmsKit.Public.Comments.CreateCommentInput", + "isOptional": false, + "defaultValue": null } ], "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" + "type": "Volo.CmsKit.Public.Comments.CommentDto", + "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto" } }, { - "name": "GetGroupedStarCountsAsync", + "name": "UpdateAsync", "parametersOnMethod": [ { - "name": "entityType", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null }, { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Comments.UpdateCommentInput, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Comments.UpdateCommentInput", + "typeSimple": "Volo.CmsKit.Public.Comments.UpdateCommentInput", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "Volo.CmsKit.Public.Comments.CommentDto", + "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto" + } + }, + { + "name": "DeleteAsync", + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Public.Ratings.RatingWithStarCountDto]" + "type": "System.Void", + "typeSimple": "System.Void" } } ] } ], "actions": { - "CreateAsyncByEntityTypeAndEntityIdAndInput": { - "uniqueName": "CreateAsyncByEntityTypeAndEntityIdAndInput", - "name": "CreateAsync", - "httpMethod": "PUT", - "url": "api/cms-kit-public/ratings/{entityType}/{entityId}", + "GetListAsyncByEntityTypeAndEntityId": { + "uniqueName": "GetListAsyncByEntityTypeAndEntityId", + "name": "GetListAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/comments/{entityType}/{entityId}", "supportedVersions": [], "parametersOnMethod": [ { @@ -629,14 +636,6 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null - }, - { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", - "typeSimple": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", - "isOptional": false, - "defaultValue": null } ], "parameters": [ @@ -663,32 +662,20 @@ "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" - }, - { - "nameOnMethod": "input", - "name": "input", - "jsonName": null, - "type": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", - "typeSimple": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "Body", - "descriptorName": "" } ], "returnValue": { - "type": "Volo.CmsKit.Public.Ratings.RatingDto", - "typeSimple": "Volo.CmsKit.Public.Ratings.RatingDto" + "type": "Volo.Abp.Application.Dtos.ListResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Comments.ICommentPublicAppService" }, - "DeleteAsyncByEntityTypeAndEntityId": { - "uniqueName": "DeleteAsyncByEntityTypeAndEntityId", - "name": "DeleteAsync", - "httpMethod": "DELETE", - "url": "api/cms-kit-public/ratings/{entityType}/{entityId}", + "CreateAsyncByEntityTypeAndEntityIdAndInput": { + "uniqueName": "CreateAsyncByEntityTypeAndEntityIdAndInput", + "name": "CreateAsync", + "httpMethod": "POST", + "url": "api/cms-kit-public/comments/{entityType}/{entityId}", "supportedVersions": [], "parametersOnMethod": [ { @@ -706,6 +693,14 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null + }, + { + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Comments.CreateCommentInput, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Comments.CreateCommentInput", + "typeSimple": "Volo.CmsKit.Public.Comments.CreateCommentInput", + "isOptional": false, + "defaultValue": null } ], "parameters": [ @@ -732,34 +727,95 @@ "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" + }, + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.CmsKit.Public.Comments.CreateCommentInput", + "typeSimple": "Volo.CmsKit.Public.Comments.CreateCommentInput", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" } ], "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" + "type": "Volo.CmsKit.Public.Comments.CommentDto", + "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Comments.ICommentPublicAppService" }, - "GetGroupedStarCountsAsyncByEntityTypeAndEntityId": { - "uniqueName": "GetGroupedStarCountsAsyncByEntityTypeAndEntityId", - "name": "GetGroupedStarCountsAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/ratings/{entityType}/{entityId}", + "UpdateAsyncByIdAndInput": { + "uniqueName": "UpdateAsyncByIdAndInput", + "name": "UpdateAsync", + "httpMethod": "PUT", + "url": "api/cms-kit-public/comments/{id}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "entityType", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null }, { - "name": "entityId", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Comments.UpdateCommentInput, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Comments.UpdateCommentInput", + "typeSimple": "Volo.CmsKit.Public.Comments.UpdateCommentInput", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "id", + "name": "id", + "jsonName": null, + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" + }, + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.CmsKit.Public.Comments.UpdateCommentInput", + "typeSimple": "Volo.CmsKit.Public.Comments.UpdateCommentInput", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "Volo.CmsKit.Public.Comments.CommentDto", + "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.CmsKit.Public.Comments.ICommentPublicAppService" + }, + "DeleteAsyncById": { + "uniqueName": "DeleteAsyncById", + "name": "DeleteAsync", + "httpMethod": "DELETE", + "url": "api/cms-kit-public/comments/{id}", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null @@ -767,36 +823,129 @@ ], "parameters": [ { - "nameOnMethod": "entityType", - "name": "entityType", + "nameOnMethod": "id", + "name": "id", "jsonName": null, - "type": "System.String", + "type": "System.Guid", "typeSimple": "string", "isOptional": false, "defaultValue": null, "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" + } + ], + "returnValue": { + "type": "System.Void", + "typeSimple": "System.Void" + }, + "allowAnonymous": null, + "implementFrom": "Volo.CmsKit.Public.Comments.ICommentPublicAppService" + } + } + }, + "Volo.CmsKit.Public.GlobalResources.GlobalResourcePublicController": { + "controllerName": "GlobalResourcePublic", + "controllerGroupName": "GlobalResourcePublic", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourcePublicController", + "interfaces": [ + { + "type": "Volo.CmsKit.Public.GlobalResources.IGlobalResourcePublicAppService", + "name": "IGlobalResourcePublicAppService", + "methods": [ + { + "name": "GetGlobalScriptAsync", + "parametersOnMethod": [], + "returnValue": { + "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto", + "typeSimple": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto" + } }, { - "nameOnMethod": "entityId", - "name": "entityId", - "jsonName": null, - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", - "descriptorName": "" + "name": "GetGlobalStyleAsync", + "parametersOnMethod": [], + "returnValue": { + "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto", + "typeSimple": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto" + } } - ], + ] + } + ], + "actions": { + "GetGlobalScriptAsync": { + "uniqueName": "GetGlobalScriptAsync", + "name": "GetGlobalScriptAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/global-resources/script", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Public.Ratings.RatingWithStarCountDto]" + "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto", + "typeSimple": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService" + "implementFrom": "Volo.CmsKit.Public.GlobalResources.IGlobalResourcePublicAppService" + }, + "GetGlobalStyleAsync": { + "uniqueName": "GetGlobalStyleAsync", + "name": "GetGlobalStyleAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/global-resources/style", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto", + "typeSimple": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.CmsKit.Public.GlobalResources.IGlobalResourcePublicAppService" + } + } + }, + "Volo.CmsKit.Public.Menus.MenuItemPublicController": { + "controllerName": "MenuItemPublic", + "controllerGroupName": "MenuItemPublic", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.CmsKit.Public.Menus.MenuItemPublicController", + "interfaces": [ + { + "type": "Volo.CmsKit.Public.Menus.IMenuItemPublicAppService", + "name": "IMenuItemPublicAppService", + "methods": [ + { + "name": "GetListAsync", + "parametersOnMethod": [], + "returnValue": { + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.CmsKit.Menus.MenuItemDto]" + } + } + ] + } + ], + "actions": { + "GetListAsync": { + "uniqueName": "GetListAsync", + "name": "GetListAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/menu-items", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.CmsKit.Menus.MenuItemDto]" + }, + "allowAnonymous": null, + "implementFrom": "Volo.CmsKit.Public.Menus.IMenuItemPublicAppService" } } }, @@ -908,166 +1057,61 @@ "typeSimple": "Volo.CmsKit.Contents.PageDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" - }, - "DoesSlugExistAsyncBySlug": { - "uniqueName": "DoesSlugExistAsyncBySlug", - "name": "DoesSlugExistAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/pages/exist", - "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "slug", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ - { - "nameOnMethod": "slug", - "name": "slug", - "jsonName": null, - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "Query", - "descriptorName": "" - } - ], - "returnValue": { - "type": "System.Boolean", - "typeSimple": "boolean" - }, - "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" - } - } - }, - "Volo.CmsKit.Public.Menus.MenuItemPublicController": { - "controllerName": "MenuItemPublic", - "controllerGroupName": "MenuItemPublic", - "isRemoteService": true, - "isIntegrationService": false, - "apiVersion": null, - "type": "Volo.CmsKit.Public.Menus.MenuItemPublicController", - "interfaces": [ - { - "type": "Volo.CmsKit.Public.Menus.IMenuItemPublicAppService", - "name": "IMenuItemPublicAppService", - "methods": [ - { - "name": "GetListAsync", - "parametersOnMethod": [], - "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Menus.MenuItemDto]" - } - } - ] - } - ], - "actions": { - "GetListAsync": { - "uniqueName": "GetListAsync", - "name": "GetListAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/menu-items", - "supportedVersions": [], - "parametersOnMethod": [], - "parameters": [], - "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Menus.MenuItemDto]" - }, - "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Menus.IMenuItemPublicAppService" - } - } - }, - "Volo.CmsKit.Public.GlobalResources.GlobalResourcePublicController": { - "controllerName": "GlobalResourcePublic", - "controllerGroupName": "GlobalResourcePublic", - "isRemoteService": true, - "isIntegrationService": false, - "apiVersion": null, - "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourcePublicController", - "interfaces": [ - { - "type": "Volo.CmsKit.Public.GlobalResources.IGlobalResourcePublicAppService", - "name": "IGlobalResourcePublicAppService", - "methods": [ - { - "name": "GetGlobalScriptAsync", - "parametersOnMethod": [], - "returnValue": { - "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto", - "typeSimple": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto" - } - }, - { - "name": "GetGlobalStyleAsync", - "parametersOnMethod": [], - "returnValue": { - "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto", - "typeSimple": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto" - } - } - ] - } - ], - "actions": { - "GetGlobalScriptAsync": { - "uniqueName": "GetGlobalScriptAsync", - "name": "GetGlobalScriptAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/global-resources/script", - "supportedVersions": [], - "parametersOnMethod": [], - "parameters": [], - "returnValue": { - "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto", - "typeSimple": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto" - }, - "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.GlobalResources.IGlobalResourcePublicAppService" + "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" }, - "GetGlobalStyleAsync": { - "uniqueName": "GetGlobalStyleAsync", - "name": "GetGlobalStyleAsync", + "DoesSlugExistAsyncBySlug": { + "uniqueName": "DoesSlugExistAsyncBySlug", + "name": "DoesSlugExistAsync", "httpMethod": "GET", - "url": "api/cms-kit-public/global-resources/style", + "url": "api/cms-kit-public/pages/exist", "supportedVersions": [], - "parametersOnMethod": [], - "parameters": [], + "parametersOnMethod": [ + { + "name": "slug", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "slug", + "name": "slug", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Query", + "descriptorName": "" + } + ], "returnValue": { - "type": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto", - "typeSimple": "Volo.CmsKit.Public.GlobalResources.GlobalResourceDto" + "type": "System.Boolean", + "typeSimple": "boolean" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.GlobalResources.IGlobalResourcePublicAppService" + "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" } } }, - "Volo.CmsKit.Public.Comments.CommentPublicController": { - "controllerName": "CommentPublic", - "controllerGroupName": "CommentPublic", + "Volo.CmsKit.Public.Ratings.RatingPublicController": { + "controllerName": "RatingPublic", + "controllerGroupName": "RatingPublic", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.CmsKit.Public.Comments.CommentPublicController", + "type": "Volo.CmsKit.Public.Ratings.RatingPublicController", "interfaces": [ { - "type": "Volo.CmsKit.Public.Comments.ICommentPublicAppService", - "name": "ICommentPublicAppService", + "type": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService", + "name": "IRatingPublicAppService", "methods": [ { - "name": "GetListAsync", + "name": "CreateAsync", "parametersOnMethod": [ { "name": "entityType", @@ -1084,15 +1128,23 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null + }, + { + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", + "typeSimple": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", + "isOptional": false, + "defaultValue": null } ], "returnValue": { - "type": "Volo.Abp.Application.Dtos.ListResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" + "type": "Volo.CmsKit.Public.Ratings.RatingDto", + "typeSimple": "Volo.CmsKit.Public.Ratings.RatingDto" } }, { - "name": "CreateAsync", + "name": "DeleteAsync", "parametersOnMethod": [ { "name": "entityType", @@ -1109,72 +1161,47 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null - }, - { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Comments.CreateCommentInput, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Comments.CreateCommentInput", - "typeSimple": "Volo.CmsKit.Public.Comments.CreateCommentInput", - "isOptional": false, - "defaultValue": null } ], "returnValue": { - "type": "Volo.CmsKit.Public.Comments.CommentDto", - "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto" + "type": "System.Void", + "typeSimple": "System.Void" } }, { - "name": "UpdateAsync", + "name": "GetGroupedStarCountsAsync", "parametersOnMethod": [ { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "entityType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null }, { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Comments.UpdateCommentInput, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Comments.UpdateCommentInput", - "typeSimple": "Volo.CmsKit.Public.Comments.UpdateCommentInput", - "isOptional": false, - "defaultValue": null - } - ], - "returnValue": { - "type": "Volo.CmsKit.Public.Comments.CommentDto", - "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto" - } - }, - { - "name": "DeleteAsync", - "parametersOnMethod": [ - { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "entityId", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.CmsKit.Public.Ratings.RatingWithStarCountDto]" } } ] } ], "actions": { - "GetListAsyncByEntityTypeAndEntityId": { - "uniqueName": "GetListAsyncByEntityTypeAndEntityId", - "name": "GetListAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/comments/{entityType}/{entityId}", + "CreateAsyncByEntityTypeAndEntityIdAndInput": { + "uniqueName": "CreateAsyncByEntityTypeAndEntityIdAndInput", + "name": "CreateAsync", + "httpMethod": "PUT", + "url": "api/cms-kit-public/ratings/{entityType}/{entityId}", "supportedVersions": [], "parametersOnMethod": [ { @@ -1192,6 +1219,14 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null + }, + { + "name": "input", + "typeAsString": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput, Volo.CmsKit.Public.Application.Contracts", + "type": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", + "typeSimple": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", + "isOptional": false, + "defaultValue": null } ], "parameters": [ @@ -1218,20 +1253,32 @@ "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" + }, + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", + "typeSimple": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" } ], "returnValue": { - "type": "Volo.Abp.Application.Dtos.ListResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" + "type": "Volo.CmsKit.Public.Ratings.RatingDto", + "typeSimple": "Volo.CmsKit.Public.Ratings.RatingDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Comments.ICommentPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService" }, - "CreateAsyncByEntityTypeAndEntityIdAndInput": { - "uniqueName": "CreateAsyncByEntityTypeAndEntityIdAndInput", - "name": "CreateAsync", - "httpMethod": "POST", - "url": "api/cms-kit-public/comments/{entityType}/{entityId}", + "DeleteAsyncByEntityTypeAndEntityId": { + "uniqueName": "DeleteAsyncByEntityTypeAndEntityId", + "name": "DeleteAsync", + "httpMethod": "DELETE", + "url": "api/cms-kit-public/ratings/{entityType}/{entityId}", "supportedVersions": [], "parametersOnMethod": [ { @@ -1249,14 +1296,6 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null - }, - { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Comments.CreateCommentInput, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Comments.CreateCommentInput", - "typeSimple": "Volo.CmsKit.Public.Comments.CreateCommentInput", - "isOptional": false, - "defaultValue": null } ], "parameters": [ @@ -1283,57 +1322,45 @@ "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" - }, - { - "nameOnMethod": "input", - "name": "input", - "jsonName": null, - "type": "Volo.CmsKit.Public.Comments.CreateCommentInput", - "typeSimple": "Volo.CmsKit.Public.Comments.CreateCommentInput", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "Body", - "descriptorName": "" } ], "returnValue": { - "type": "Volo.CmsKit.Public.Comments.CommentDto", - "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto" + "type": "System.Void", + "typeSimple": "System.Void" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Comments.ICommentPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService" }, - "UpdateAsyncByIdAndInput": { - "uniqueName": "UpdateAsyncByIdAndInput", - "name": "UpdateAsync", - "httpMethod": "PUT", - "url": "api/cms-kit-public/comments/{id}", + "GetGroupedStarCountsAsyncByEntityTypeAndEntityId": { + "uniqueName": "GetGroupedStarCountsAsyncByEntityTypeAndEntityId", + "name": "GetGroupedStarCountsAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/ratings/{entityType}/{entityId}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "entityType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null }, { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Comments.UpdateCommentInput, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Comments.UpdateCommentInput", - "typeSimple": "Volo.CmsKit.Public.Comments.UpdateCommentInput", + "name": "entityId", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "id", - "name": "id", + "nameOnMethod": "entityType", + "name": "entityType", "jsonName": null, - "type": "System.Guid", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, @@ -1342,47 +1369,10 @@ "descriptorName": "" }, { - "nameOnMethod": "input", - "name": "input", - "jsonName": null, - "type": "Volo.CmsKit.Public.Comments.UpdateCommentInput", - "typeSimple": "Volo.CmsKit.Public.Comments.UpdateCommentInput", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "Body", - "descriptorName": "" - } - ], - "returnValue": { - "type": "Volo.CmsKit.Public.Comments.CommentDto", - "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto" - }, - "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Comments.ICommentPublicAppService" - }, - "DeleteAsyncById": { - "uniqueName": "DeleteAsyncById", - "name": "DeleteAsync", - "httpMethod": "DELETE", - "url": "api/cms-kit-public/comments/{id}", - "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ - { - "nameOnMethod": "id", - "name": "id", + "nameOnMethod": "entityId", + "name": "entityId", "jsonName": null, - "type": "System.Guid", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, @@ -1392,31 +1382,31 @@ } ], "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.CmsKit.Public.Ratings.RatingWithStarCountDto]" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Comments.ICommentPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService" } } }, - "Volo.CmsKit.Public.Blogs.BlogPostPublicController": { - "controllerName": "BlogPostPublic", - "controllerGroupName": "BlogPostPublic", + "Volo.CmsKit.Public.Reactions.ReactionPublicController": { + "controllerName": "ReactionPublic", + "controllerGroupName": "ReactionPublic", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.CmsKit.Public.Blogs.BlogPostPublicController", + "type": "Volo.CmsKit.Public.Reactions.ReactionPublicController", "interfaces": [ { - "type": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService", - "name": "IBlogPostPublicAppService", + "type": "Volo.CmsKit.Public.Reactions.IReactionPublicAppService", + "name": "IReactionPublicAppService", "methods": [ { - "name": "GetListAsync", + "name": "GetForSelectionAsync", "parametersOnMethod": [ { - "name": "blogSlug", + "name": "entityType", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -1424,24 +1414,24 @@ "defaultValue": null }, { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput", - "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput", + "name": "entityId", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "returnValue": { - "type": "Volo.Abp.Application.Dtos.PagedResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" + "type": "Volo.Abp.Application.Dtos.ListResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" } }, { - "name": "GetAsync", + "name": "CreateAsync", "parametersOnMethod": [ { - "name": "blogSlug", + "name": "entityType", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -1449,100 +1439,73 @@ "defaultValue": null }, { - "name": "blogPostSlug", + "name": "entityId", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null - } - ], - "returnValue": { - "type": "Volo.CmsKit.Contents.BlogPostCommonDto", - "typeSimple": "Volo.CmsKit.Contents.BlogPostCommonDto" - } - }, - { - "name": "GetAuthorsHasBlogPostsAsync", - "parametersOnMethod": [ + }, { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto", - "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto", + "name": "reaction", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "returnValue": { - "type": "Volo.Abp.Application.Dtos.PagedResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" + "type": "System.Void", + "typeSimple": "System.Void" } }, { - "name": "GetAuthorHasBlogPostAsync", + "name": "DeleteAsync", "parametersOnMethod": [ { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "entityType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null - } - ], - "returnValue": { - "type": "Volo.CmsKit.Users.CmsUserDto", - "typeSimple": "Volo.CmsKit.Users.CmsUserDto" - } - }, - { - "name": "DeleteAsync", - "parametersOnMethod": [ + }, { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "entityId", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null - } - ], - "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" - } - }, - { - "name": "GetTagNameAsync", - "parametersOnMethod": [ + }, { - "name": "tagId", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "reaction", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "returnValue": { - "type": "System.String", - "typeSimple": "string" + "type": "System.Void", + "typeSimple": "System.Void" } } ] } ], "actions": { - "GetAsyncByBlogSlugAndBlogPostSlug": { - "uniqueName": "GetAsyncByBlogSlugAndBlogPostSlug", - "name": "GetAsync", + "GetForSelectionAsyncByEntityTypeAndEntityId": { + "uniqueName": "GetForSelectionAsyncByEntityTypeAndEntityId", + "name": "GetForSelectionAsync", "httpMethod": "GET", - "url": "api/cms-kit-public/blog-posts/{blogSlug}/{blogPostSlug}", + "url": "api/cms-kit-public/reactions/{entityType}/{entityId}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "blogSlug", + "name": "entityType", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -1550,7 +1513,7 @@ "defaultValue": null }, { - "name": "blogPostSlug", + "name": "entityId", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -1560,8 +1523,8 @@ ], "parameters": [ { - "nameOnMethod": "blogSlug", - "name": "blogSlug", + "nameOnMethod": "entityType", + "name": "entityType", "jsonName": null, "type": "System.String", "typeSimple": "string", @@ -1572,8 +1535,8 @@ "descriptorName": "" }, { - "nameOnMethod": "blogPostSlug", - "name": "blogPostSlug", + "nameOnMethod": "entityId", + "name": "entityId", "jsonName": null, "type": "System.String", "typeSimple": "string", @@ -1585,21 +1548,21 @@ } ], "returnValue": { - "type": "Volo.CmsKit.Contents.BlogPostCommonDto", - "typeSimple": "Volo.CmsKit.Contents.BlogPostCommonDto" + "type": "Volo.Abp.Application.Dtos.ListResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Reactions.IReactionPublicAppService" }, - "GetListAsyncByBlogSlugAndInput": { - "uniqueName": "GetListAsyncByBlogSlugAndInput", - "name": "GetListAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/blog-posts/{blogSlug}", + "CreateAsyncByEntityTypeAndEntityIdAndReaction": { + "uniqueName": "CreateAsyncByEntityTypeAndEntityIdAndReaction", + "name": "CreateAsync", + "httpMethod": "PUT", + "url": "api/cms-kit-public/reactions/{entityType}/{entityId}/{reaction}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "blogSlug", + "name": "entityType", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -1607,18 +1570,26 @@ "defaultValue": null }, { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput", - "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostGetListInput", + "name": "entityId", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "reaction", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "blogSlug", - "name": "blogSlug", + "nameOnMethod": "entityType", + "name": "entityType", "jsonName": null, "type": "System.String", "typeSimple": "string", @@ -1629,157 +1600,201 @@ "descriptorName": "" }, { - "nameOnMethod": "input", - "name": "AuthorId", - "jsonName": null, - "type": "System.Guid?", - "typeSimple": "string?", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" - }, - { - "nameOnMethod": "input", - "name": "TagId", - "jsonName": null, - "type": "System.Guid?", - "typeSimple": "string?", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" - }, - { - "nameOnMethod": "input", - "name": "Sorting", + "nameOnMethod": "entityId", + "name": "entityId", "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" - }, - { - "nameOnMethod": "input", - "name": "SkipCount", - "jsonName": null, - "type": "System.Int32", - "typeSimple": "number", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" }, { - "nameOnMethod": "input", - "name": "MaxResultCount", + "nameOnMethod": "reaction", + "name": "reaction", "jsonName": null, - "type": "System.Int32", - "typeSimple": "number", + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" } ], "returnValue": { - "type": "Volo.Abp.Application.Dtos.PagedResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" + "type": "System.Void", + "typeSimple": "System.Void" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" + "implementFrom": "Volo.CmsKit.Public.Reactions.IReactionPublicAppService" }, - "GetAuthorsHasBlogPostsAsyncByInput": { - "uniqueName": "GetAuthorsHasBlogPostsAsyncByInput", - "name": "GetAuthorsHasBlogPostsAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/blog-posts/authors", + "DeleteAsyncByEntityTypeAndEntityIdAndReaction": { + "uniqueName": "DeleteAsyncByEntityTypeAndEntityIdAndReaction", + "name": "DeleteAsync", + "httpMethod": "DELETE", + "url": "api/cms-kit-public/reactions/{entityType}/{entityId}/{reaction}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "input", - "typeAsString": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto, Volo.CmsKit.Public.Application.Contracts", - "type": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto", - "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostFilteredPagedAndSortedResultRequestDto", + "name": "entityType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "entityId", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "reaction", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "input", - "name": "Filter", + "nameOnMethod": "entityType", + "name": "entityType", "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" }, { - "nameOnMethod": "input", - "name": "Sorting", + "nameOnMethod": "entityId", + "name": "entityId", "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" - }, - { - "nameOnMethod": "input", - "name": "SkipCount", - "jsonName": null, - "type": "System.Int32", - "typeSimple": "number", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" }, { - "nameOnMethod": "input", - "name": "MaxResultCount", + "nameOnMethod": "reaction", + "name": "reaction", "jsonName": null, - "type": "System.Int32", - "typeSimple": "number", + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" } ], "returnValue": { - "type": "Volo.Abp.Application.Dtos.PagedResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" + "type": "System.Void", + "typeSimple": "System.Void" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" - }, - "GetAuthorHasBlogPostAsyncById": { - "uniqueName": "GetAuthorHasBlogPostAsyncById", - "name": "GetAuthorHasBlogPostAsync", + "implementFrom": "Volo.CmsKit.Public.Reactions.IReactionPublicAppService" + } + } + }, + "Volo.CmsKit.Public.Tags.TagPublicController": { + "controllerName": "TagPublic", + "controllerGroupName": "TagPublic", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.CmsKit.Public.Tags.TagPublicController", + "interfaces": [ + { + "type": "Volo.CmsKit.Tags.ITagAppService", + "name": "ITagAppService", + "methods": [ + { + "name": "GetAllRelatedTagsAsync", + "parametersOnMethod": [ + { + "name": "entityType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "entityId", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.CmsKit.Tags.TagDto]" + } + }, + { + "name": "GetPopularTagsAsync", + "parametersOnMethod": [ + { + "name": "entityType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "maxCount", + "typeAsString": "System.Int32, System.Private.CoreLib", + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.CmsKit.Tags.PopularTagDto]" + } + } + ] + } + ], + "actions": { + "GetAllRelatedTagsAsyncByEntityTypeAndEntityId": { + "uniqueName": "GetAllRelatedTagsAsyncByEntityTypeAndEntityId", + "name": "GetAllRelatedTagsAsync", "httpMethod": "GET", - "url": "api/cms-kit-public/blog-posts/authors/{id}", + "url": "api/cms-kit-public/tags/{entityType}/{entityId}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "entityType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "entityId", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null @@ -1787,47 +1802,22 @@ ], "parameters": [ { - "nameOnMethod": "id", - "name": "id", + "nameOnMethod": "entityType", + "name": "entityType", "jsonName": null, - "type": "System.Guid", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, "constraintTypes": [], "bindingSourceId": "Path", "descriptorName": "" - } - ], - "returnValue": { - "type": "Volo.CmsKit.Users.CmsUserDto", - "typeSimple": "Volo.CmsKit.Users.CmsUserDto" - }, - "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" - }, - "DeleteAsyncById": { - "uniqueName": "DeleteAsyncById", - "name": "DeleteAsync", - "httpMethod": "DELETE", - "url": "api/cms-kit-public/blog-posts/{id}", - "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ + }, { - "nameOnMethod": "id", - "name": "id", + "nameOnMethod": "entityId", + "name": "entityId", "jsonName": null, - "type": "System.Guid", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, @@ -1837,60 +1827,70 @@ } ], "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.CmsKit.Tags.TagDto]" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" + "implementFrom": "Volo.CmsKit.Tags.ITagAppService" }, - "GetTagNameAsyncByTagId": { - "uniqueName": "GetTagNameAsyncByTagId", - "name": "GetTagNameAsync", + "GetPopularTagsAsyncByEntityTypeAndMaxCount": { + "uniqueName": "GetPopularTagsAsyncByEntityTypeAndMaxCount", + "name": "GetPopularTagsAsync", "httpMethod": "GET", - "url": "api/cms-kit-public/blog-posts/tags/{id}", + "url": "api/cms-kit-public/tags/popular/{entityType}/{maxCount}", "supportedVersions": [], "parametersOnMethod": [ { - "name": "tagId", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "entityType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null + }, + { + "name": "maxCount", + "typeAsString": "System.Int32, System.Private.CoreLib", + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "tagId", - "name": "tagId", + "nameOnMethod": "entityType", + "name": "entityType", "jsonName": null, - "type": "System.Guid", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", + "constraintTypes": [], + "bindingSourceId": "Path", "descriptorName": "" }, { - "nameOnMethod": "id", - "name": "id", + "nameOnMethod": "maxCount", + "name": "maxCount", "jsonName": null, - "type": null, - "typeSimple": null, + "type": "System.Int32", + "typeSimple": "number", "isOptional": false, "defaultValue": null, - "constraintTypes": [], + "constraintTypes": [ + "IntRouteConstraint" + ], "bindingSourceId": "Path", "descriptorName": "" } ], "returnValue": { - "type": "System.String", - "typeSimple": "string" + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.CmsKit.Tags.PopularTagDto]" }, "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" + "implementFrom": "Volo.CmsKit.Tags.ITagAppService" } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/default.js index 4e22092cf2..e9ddda97f3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/default.js +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/default.js @@ -111,7 +111,7 @@ $form.submit(function (e) { e.preventDefault(); - + abp.ui.setBusy($form.find("button[type='submit']")); let formAsObject = $form.serializeFormToObject(); @@ -178,6 +178,9 @@ }), success: function () { widgetManager.refresh($widget); + if (abp.setting.getBoolean("CmsKit.Comments.RequireApprovement")) { + abp.message.success(l("CommentSubmittedForApproval"), l("SavedSuccessfully")); + } $form.trigger('reset'); abp.ui.clearBusy(); }, diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml index 51cc8b9848..fabacd79eb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml @@ -56,7 +56,7 @@
- + diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml index a0c7163674..6074ed573f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml @@ -80,7 +80,7 @@ @@@blog.Author?.UserName @blog.CreationTime

-

@blog.ShortDescription

+

@blog.ShortDescription

@L["Read"] diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.css b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.css index d09be3150d..03ed4523e4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.css +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.css @@ -22,6 +22,11 @@ span.area-title { min-width: 276px; } +.card-img-ratio { + aspect-ratio: 16 / 9; + object-fit: cover; +} + #scroll-index { position: sticky; top: 20px; diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/index.css b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/index.css index 19137de2cb..e9a4f2fa19 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/index.css +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/index.css @@ -1,4 +1,6 @@ -.card-img-top { +.card-img-top { + aspect-ratio: 16 / 9; + object-fit: cover; } .popover { @@ -7,4 +9,12 @@ .author-name-span{ cursor: pointer; +} + +.cms-blogpost-desc-preview { + min-height: 60px; + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/wwwroot/client-proxies/cms-kit-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/wwwroot/client-proxies/cms-kit-proxy.js index 2d2be254a6..43e8caa7b2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/wwwroot/client-proxies/cms-kit-proxy.js +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/wwwroot/client-proxies/cms-kit-proxy.js @@ -5,99 +5,112 @@ (function(){ - // controller volo.cmsKit.public.tags.tagPublic + // controller volo.cmsKit.public.blogs.blogPostPublic (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.public.tags.tagPublic'); + abp.utils.createNamespace(window, 'volo.cmsKit.public.blogs.blogPostPublic'); - volo.cmsKit.public.tags.tagPublic.getAllRelatedTags = function(entityType, entityId, ajaxParams) { + volo.cmsKit.public.blogs.blogPostPublic.get = function(blogSlug, blogPostSlug, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/tags/' + entityType + '/' + entityId + '', + url: abp.appPath + 'api/cms-kit-public/blog-posts/' + blogSlug + '/' + blogPostSlug + '', type: 'GET' }, ajaxParams)); }; - })(); - - // controller volo.cmsKit.public.reactions.reactionPublic - - (function(){ - - abp.utils.createNamespace(window, 'volo.cmsKit.public.reactions.reactionPublic'); + volo.cmsKit.public.blogs.blogPostPublic.getList = function(blogSlug, input, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-public/blog-posts/' + blogSlug + '' + abp.utils.buildQueryString([{ name: 'authorId', value: input.authorId }, { name: 'tagId', value: input.tagId }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', + type: 'GET' + }, ajaxParams)); + }; - volo.cmsKit.public.reactions.reactionPublic.getForSelection = function(entityType, entityId, ajaxParams) { + volo.cmsKit.public.blogs.blogPostPublic.getAuthorsHasBlogPosts = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/reactions/' + entityType + '/' + entityId + '', + url: abp.appPath + 'api/cms-kit-public/blog-posts/authors' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.public.reactions.reactionPublic.create = function(entityType, entityId, reaction, ajaxParams) { + volo.cmsKit.public.blogs.blogPostPublic.getAuthorHasBlogPost = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/reactions/' + entityType + '/' + entityId + '/' + reaction + '', - type: 'PUT', - dataType: null + url: abp.appPath + 'api/cms-kit-public/blog-posts/authors/' + id + '', + type: 'GET' }, ajaxParams)); }; - volo.cmsKit.public.reactions.reactionPublic['delete'] = function(entityType, entityId, reaction, ajaxParams) { + volo.cmsKit.public.blogs.blogPostPublic['delete'] = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/reactions/' + entityType + '/' + entityId + '/' + reaction + '', + url: abp.appPath + 'api/cms-kit-public/blog-posts/' + id + '', type: 'DELETE', dataType: null }, ajaxParams)); }; + volo.cmsKit.public.blogs.blogPostPublic.getTagName = function(tagId, id, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-public/blog-posts/tags/' + id + '' + abp.utils.buildQueryString([{ name: 'tagId', value: tagId }]) + '', + type: 'GET' + }, { dataType: 'text' }, ajaxParams)); + }; + })(); - // controller volo.cmsKit.public.ratings.ratingPublic + // controller volo.cmsKit.public.comments.commentPublic (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.public.ratings.ratingPublic'); + abp.utils.createNamespace(window, 'volo.cmsKit.public.comments.commentPublic'); - volo.cmsKit.public.ratings.ratingPublic.create = function(entityType, entityId, input, ajaxParams) { + volo.cmsKit.public.comments.commentPublic.getList = function(entityType, entityId, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/ratings/' + entityType + '/' + entityId + '', - type: 'PUT', + url: abp.appPath + 'api/cms-kit-public/comments/' + entityType + '/' + entityId + '', + type: 'GET' + }, ajaxParams)); + }; + + volo.cmsKit.public.comments.commentPublic.create = function(entityType, entityId, input, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-public/comments/' + entityType + '/' + entityId + '', + type: 'POST', data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.public.ratings.ratingPublic['delete'] = function(entityType, entityId, ajaxParams) { + volo.cmsKit.public.comments.commentPublic.update = function(id, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/ratings/' + entityType + '/' + entityId + '', - type: 'DELETE', - dataType: null + url: abp.appPath + 'api/cms-kit-public/comments/' + id + '', + type: 'PUT', + data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.public.ratings.ratingPublic.getGroupedStarCounts = function(entityType, entityId, ajaxParams) { + volo.cmsKit.public.comments.commentPublic['delete'] = function(id, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/ratings/' + entityType + '/' + entityId + '', - type: 'GET' + url: abp.appPath + 'api/cms-kit-public/comments/' + id + '', + type: 'DELETE', + dataType: null }, ajaxParams)); }; })(); - // controller volo.cmsKit.public.pages.pagesPublic + // controller volo.cmsKit.public.globalResources.globalResourcePublic (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.public.pages.pagesPublic'); + abp.utils.createNamespace(window, 'volo.cmsKit.public.globalResources.globalResourcePublic'); - volo.cmsKit.public.pages.pagesPublic.findBySlug = function(slug, ajaxParams) { + volo.cmsKit.public.globalResources.globalResourcePublic.getGlobalScript = function(ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/pages/' + slug + '', + url: abp.appPath + 'api/cms-kit-public/global-resources/script', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.public.pages.pagesPublic.findDefaultHomePage = function(ajaxParams) { + volo.cmsKit.public.globalResources.globalResourcePublic.getGlobalStyle = function(ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/pages', + url: abp.appPath + 'api/cms-kit-public/global-resources/style', type: 'GET' }, ajaxParams)); }; @@ -119,106 +132,114 @@ })(); - // controller volo.cmsKit.public.globalResources.globalResourcePublic + // controller volo.cmsKit.public.pages.pagesPublic (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.public.globalResources.globalResourcePublic'); + abp.utils.createNamespace(window, 'volo.cmsKit.public.pages.pagesPublic'); - volo.cmsKit.public.globalResources.globalResourcePublic.getGlobalScript = function(ajaxParams) { + volo.cmsKit.public.pages.pagesPublic.findBySlug = function(slug, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/global-resources/script', + url: abp.appPath + 'api/cms-kit-public/pages/by-slug' + abp.utils.buildQueryString([{ name: 'slug', value: slug }]) + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.public.globalResources.globalResourcePublic.getGlobalStyle = function(ajaxParams) { + volo.cmsKit.public.pages.pagesPublic.findDefaultHomePage = function(ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/global-resources/style', + url: abp.appPath + 'api/cms-kit-public/pages/home', + type: 'GET' + }, ajaxParams)); + }; + + volo.cmsKit.public.pages.pagesPublic.doesSlugExist = function(slug, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/cms-kit-public/pages/exist' + abp.utils.buildQueryString([{ name: 'slug', value: slug }]) + '', type: 'GET' }, ajaxParams)); }; })(); - // controller volo.cmsKit.public.comments.commentPublic + // controller volo.cmsKit.public.ratings.ratingPublic (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.public.comments.commentPublic'); - - volo.cmsKit.public.comments.commentPublic.getList = function(entityType, entityId, ajaxParams) { - return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/comments/' + entityType + '/' + entityId + '', - type: 'GET' - }, ajaxParams)); - }; + abp.utils.createNamespace(window, 'volo.cmsKit.public.ratings.ratingPublic'); - volo.cmsKit.public.comments.commentPublic.create = function(entityType, entityId, input, ajaxParams) { + volo.cmsKit.public.ratings.ratingPublic.create = function(entityType, entityId, input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/comments/' + entityType + '/' + entityId + '', - type: 'POST', + url: abp.appPath + 'api/cms-kit-public/ratings/' + entityType + '/' + entityId + '', + type: 'PUT', data: JSON.stringify(input) }, ajaxParams)); }; - volo.cmsKit.public.comments.commentPublic.update = function(id, input, ajaxParams) { + volo.cmsKit.public.ratings.ratingPublic['delete'] = function(entityType, entityId, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/comments/' + id + '', - type: 'PUT', - data: JSON.stringify(input) + url: abp.appPath + 'api/cms-kit-public/ratings/' + entityType + '/' + entityId + '', + type: 'DELETE', + dataType: null }, ajaxParams)); }; - volo.cmsKit.public.comments.commentPublic['delete'] = function(id, ajaxParams) { + volo.cmsKit.public.ratings.ratingPublic.getGroupedStarCounts = function(entityType, entityId, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/comments/' + id + '', - type: 'DELETE', - dataType: null + url: abp.appPath + 'api/cms-kit-public/ratings/' + entityType + '/' + entityId + '', + type: 'GET' }, ajaxParams)); }; })(); - // controller volo.cmsKit.public.blogs.blogPostPublic + // controller volo.cmsKit.public.reactions.reactionPublic (function(){ - abp.utils.createNamespace(window, 'volo.cmsKit.public.blogs.blogPostPublic'); + abp.utils.createNamespace(window, 'volo.cmsKit.public.reactions.reactionPublic'); - volo.cmsKit.public.blogs.blogPostPublic.get = function(blogSlug, blogPostSlug, ajaxParams) { + volo.cmsKit.public.reactions.reactionPublic.getForSelection = function(entityType, entityId, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/blog-posts/' + blogSlug + '/' + blogPostSlug + '', + url: abp.appPath + 'api/cms-kit-public/reactions/' + entityType + '/' + entityId + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.public.blogs.blogPostPublic.getList = function(blogSlug, input, ajaxParams) { + volo.cmsKit.public.reactions.reactionPublic.create = function(entityType, entityId, reaction, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/blog-posts/' + blogSlug + '' + abp.utils.buildQueryString([{ name: 'authorId', value: input.authorId }, { name: 'tagId', value: input.tagId }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', - type: 'GET' + url: abp.appPath + 'api/cms-kit-public/reactions/' + entityType + '/' + entityId + '/' + reaction + '', + type: 'PUT', + dataType: null }, ajaxParams)); }; - volo.cmsKit.public.blogs.blogPostPublic.getAuthorsHasBlogPosts = function(input, ajaxParams) { + volo.cmsKit.public.reactions.reactionPublic['delete'] = function(entityType, entityId, reaction, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/blog-posts/authors' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', - type: 'GET' + url: abp.appPath + 'api/cms-kit-public/reactions/' + entityType + '/' + entityId + '/' + reaction + '', + type: 'DELETE', + dataType: null }, ajaxParams)); }; - volo.cmsKit.public.blogs.blogPostPublic.getAuthorHasBlogPost = function(id, ajaxParams) { + })(); + + // controller volo.cmsKit.public.tags.tagPublic + + (function(){ + + abp.utils.createNamespace(window, 'volo.cmsKit.public.tags.tagPublic'); + + volo.cmsKit.public.tags.tagPublic.getAllRelatedTags = function(entityType, entityId, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/blog-posts/authors/' + id + '', + url: abp.appPath + 'api/cms-kit-public/tags/' + entityType + '/' + entityId + '', type: 'GET' }, ajaxParams)); }; - volo.cmsKit.public.blogs.blogPostPublic['delete'] = function(id, ajaxParams) { + volo.cmsKit.public.tags.tagPublic.getPopularTags = function(entityType, maxCount, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/cms-kit-public/blog-posts/' + id + '', - type: 'DELETE', - dataType: null + url: abp.appPath + 'api/cms-kit-public/tags/popular/' + entityType + '/' + maxCount + '', + type: 'GET' }, ajaxParams)); }; diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentAdminAppService_Tests.cs index ac1c83135b..7253b13f84 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentAdminAppService_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentAdminAppService_Tests.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Shouldly; using Volo.Abp.Domain.Entities; +using Volo.Abp.SettingManagement; using Volo.CmsKit.Admin.Comments; using Xunit; @@ -11,7 +12,6 @@ public class CommentAdminAppService_Tests : CmsKitApplicationTestBase { private readonly ICommentAdminAppService _commentAdminAppService; private readonly CmsKitTestData _cmsKitTestData; - public CommentAdminAppService_Tests() { _commentAdminAppService = GetRequiredService(); diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs index 139e4bdce9..3c28251536 100644 --- a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs +++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs @@ -2,19 +2,27 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; +using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore.Sqlite; using Volo.Abp.Modularity; +using Volo.Abp.SettingManagement.EntityFrameworkCore; namespace Volo.CmsKit.EntityFrameworkCore; [DependsOn( typeof(CmsKitTestBaseModule), typeof(CmsKitEntityFrameworkCoreModule), - typeof(AbpEntityFrameworkCoreSqliteModule) + typeof(AbpEntityFrameworkCoreSqliteModule), + typeof(AbpSettingManagementEntityFrameworkCoreModule) )] public class CmsKitEntityFrameworkCoreTestModule : AbpModule { + public override void PreConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddDataMigrationEnvironment(); + } + public override void ConfigureServices(ServiceConfigurationContext context) { var sqliteConnection = CreateDatabaseAndGetConnection(); @@ -37,6 +45,10 @@ public class CmsKitEntityFrameworkCoreTestModule : AbpModule new DbContextOptionsBuilder().UseSqlite(connection).Options ).GetService().CreateTables(); + new SettingManagementDbContext( + new DbContextOptionsBuilder().UseSqlite(connection).Options + ).GetService().CreateTables(); + return connection; } } diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj index ae28eb3937..1d38b305d2 100644 --- a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj @@ -10,6 +10,7 @@ + diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index e8bacce0ee..f13fdc2f7b 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4", - "@abp/docs": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5", + "@abp/docs": "~8.2.0-rc.5" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index b59cfd656a..2ebe816eca 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,238 +2,238 @@ # yarn lockfile v1 -"@abp/anchor-js@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-8.2.0-rc.4.tgz#69449d3b6f2844bcf39ff07fd09db87897c4a60e" - integrity sha512-EICaf9WXW/zMOvtejwUTwlDzmXEpTcnJZxRmKi5yVlABkcX81b5bH5ZuYhBxkoDHW5yGbxEQPw/QTG3ZfqH9xQ== +"@abp/anchor-js@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-8.2.0-rc.5.tgz#6628b7c0cc6971f38ff6c1bb58e13e2ec1c355f0" + integrity sha512-nZPHVWWX6cM1+Lpkht393LK8BZnimrM2USGArNiQ+1m4nvA+UBEc4fFXfZ9iqIYkqhC4g20j3zSEM+LcOi2YCA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.4.tgz#c3d20d642765dc235749d4f95f599cb97f23325d" - integrity sha512-w94YGLT/UVn1haLGlH8zOcgrCS64OrnVlzh3QXps+8m4S9g7KDeVk3g4ju/VUao2YKCHmRJ3uRhOGCb58of1iw== +"@abp/clipboard@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.5.tgz#5cec3d9c89bdad8d50f41807b3be68d4cdecb003" + integrity sha512-cBaMy8A1CIU00X6SoGyuMTVf6z9iyEaR6smVRWCVmkf2VayAHFES981+iE+VmT2bezgbCidA2GXtkBZ/kunbJg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" clipboard "^2.0.8" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/docs@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-8.2.0-rc.4.tgz#be28155266c1f28f17f4c9f1c9d444e80408b97f" - integrity sha512-Sjvo24z4Wt176yB1JDidQ5hvP6f4EHmUdhQi+Urr4zaj4Xg800UrkVFdUWkDMXgnpTN8tiYOj8cM6RTbYn0ybw== +"@abp/docs@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-8.2.0-rc.5.tgz#ab30792f824d1f4f24abc8252662dacf8e45cf6d" + integrity sha512-jUv5KC5hc8rqe8cEhNS5TziWenChsPyxCr3gmxXjOYeBR4X6Zjps7L0nVrIVGp3fhtpJAxmnnTBchFrOPGcckA== dependencies: - "@abp/anchor-js" "~8.2.0-rc.4" - "@abp/clipboard" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/popper.js" "~8.2.0-rc.4" - "@abp/prismjs" "~8.2.0-rc.4" + "@abp/anchor-js" "~8.2.0-rc.5" + "@abp/clipboard" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/popper.js" "~8.2.0-rc.5" + "@abp/prismjs" "~8.2.0-rc.5" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/popper.js@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-8.2.0-rc.4.tgz#64cb18eeb6aaaf8788416ec1d8abe535f7168deb" - integrity sha512-0G4nLlaOzjRnr/VksUijSDNtJ0YukXyiNbL2o8ot2lghNN9bCLZ7WgMEDnSNXSqqoPWxJsYxrf/us4462TMP/A== +"@abp/popper.js@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-8.2.0-rc.5.tgz#f8258765ba55ee4cf2d116cd98bb13b4d21f24e4" + integrity sha512-iq5Tk7epczJIyJULPpbccQMMRME5xuCYH1NonukSW/uSr+lGkW6/hsu4ZfxUy1xITqeVYebHMotM2kh3KCRVqA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.4.tgz#f6df729333d4dc934c3978c29e62dddf6a22c19a" - integrity sha512-+fLF7ndhgV9v3zcWFoNSR0kPasIcagJC6FT90ALWs2XccBtjAYOm9/365DK5lyDUh0ynHx9fBgDdCdIX0Zv9RA== +"@abp/prismjs@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.5.tgz#7a7428bb2f118cef5121a196bc45cc5d1a5a8e93" + integrity sha512-lNPqRvisf8jAxyL/05ppH26ZH4DEEzZUKqO7zqqS+yl7sBTpR/Wh8xX09spQl+wBQTLWAz2z+MouBZnMQIYKjg== dependencies: - "@abp/clipboard" "~8.2.0-rc.4" - "@abp/core" "~8.2.0-rc.4" + "@abp/clipboard" "~8.2.0-rc.5" + "@abp/core" "~8.2.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml index a3a00a89c1..87d186d4ad 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml @@ -43,7 +43,6 @@ @for (var j = 0; j < featureGroup.Features.Count; j++) { var feature = featureGroup.Features[j]; - var disabled = Model.IsDisabled(feature.Provider.Name);
@@ -52,12 +51,13 @@ { + @if (feature.Description != null) {
@feature.Description
@@ -76,7 +76,6 @@ Features { get; set; } diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index 2115871f2c..dec85ed263 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index c8a20afb67..05cc3d441b 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~8.2.0-rc.4", - "@abp/ng.components": "~8.2.0-rc.4", - "@abp/ng.core": "~8.2.0-rc.4", - "@abp/ng.oauth": "~8.2.0-rc.4", - "@abp/ng.identity": "~8.2.0-rc.4", - "@abp/ng.setting-management": "~8.2.0-rc.4", - "@abp/ng.tenant-management": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", - "@abp/ng.theme.lepton-x": "~3.2.0-rc.4", + "@abp/ng.account": "~8.2.0-rc.5", + "@abp/ng.components": "~8.2.0-rc.5", + "@abp/ng.core": "~8.2.0-rc.5", + "@abp/ng.oauth": "~8.2.0-rc.5", + "@abp/ng.identity": "~8.2.0-rc.5", + "@abp/ng.setting-management": "~8.2.0-rc.5", + "@abp/ng.tenant-management": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", + "@abp/ng.theme.lepton-x": "~3.2.0-rc.5", "@angular/animations": "^15.0.1", "@angular/common": "^15.0.1", "@angular/compiler": "^15.0.1", @@ -36,7 +36,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~8.2.0-rc.4", + "@abp/ng.schematics": "~8.2.0-rc.5", "@angular-devkit/build-angular": "^15.0.1", "@angular-eslint/builder": "~15.1.0", "@angular-eslint/eslint-plugin": "~15.1.0", diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Claims/AbpDynamicClaimsOpenIddictClaimsPrincipalHandler.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Claims/AbpDynamicClaimsOpenIddictClaimsPrincipalHandler.cs index ec2d92c870..8fcadcff5c 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Claims/AbpDynamicClaimsOpenIddictClaimsPrincipalHandler.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Claims/AbpDynamicClaimsOpenIddictClaimsPrincipalHandler.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; +using OpenIddict.Abstractions; using Volo.Abp.DependencyInjection; using Volo.Abp.Security.Claims; @@ -9,6 +10,11 @@ public class AbpDynamicClaimsOpenIddictClaimsPrincipalHandler: IAbpOpenIddictCla { public virtual async Task HandleAsync(AbpOpenIddictClaimsPrincipalHandlerContext context) { + if (context.OpenIddictRequest.IsClientCredentialsGrantType()) + { + return; + } + var abpClaimsPrincipalFactory = context .ScopeServiceProvider .GetRequiredService(); diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index e721252bdb..659f9b38c8 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index 3d710bd0cc..c02f3c8464 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,194 +2,194 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index fe52896da5..5bec26931e 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4", - "@abp/virtual-file-explorer": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5", + "@abp/virtual-file-explorer": "~8.2.0-rc.5" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index f7e0cc7556..3f1739121b 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,221 +2,221 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.4.tgz#dc9e9e6541694531726127e2e387156a24dd7f9e" - integrity sha512-Ixs3yr5fHkB1h8PuuJdPiY0uDf+Dq9jUdbaHsoJmaYRdOSqhLDpNkyAqFFrqDmoEmZvmrThCupt5ZSg9laQ8yw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.4.tgz#2b1468bf05fc505d11d5c0253a782a328088d283" - integrity sha512-QveGyyMKAMnY48+AsUqkB/LnqtnTc3Fd5m1wLPNVF+P0j6CaaETmfJNc0xw+WYF14r+NC8K4PeC58z3SYMGlLw== - dependencies: - "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.4" - "@abp/bootstrap" "~8.2.0-rc.4" - "@abp/bootstrap-datepicker" "~8.2.0-rc.4" - "@abp/bootstrap-daterangepicker" "~8.2.0-rc.4" - "@abp/datatables.net-bs5" "~8.2.0-rc.4" - "@abp/font-awesome" "~8.2.0-rc.4" - "@abp/jquery-form" "~8.2.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.4" - "@abp/lodash" "~8.2.0-rc.4" - "@abp/luxon" "~8.2.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.4" - "@abp/moment" "~8.2.0-rc.4" - "@abp/select2" "~8.2.0-rc.4" - "@abp/sweetalert2" "~8.2.0-rc.4" - "@abp/timeago" "~8.2.0-rc.4" - "@abp/toastr" "~8.2.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.4.tgz#5e4613f506a02d45d7adcee1060032774e635fe5" - integrity sha512-rr3BE6RhimlHcNv0HKT3xIi/+6Sq5TSqRDvmiFqa7bvxemKMstHiEa2lxpx5XP9CPpV9gNzjC/NV+TQy4YDIqg== +"@abp/aspnetcore.mvc.ui.theme.basic@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.2.0-rc.5.tgz#5cc3231d27e9e12e6fdc3e4fc5eb3e6f2019cf13" + integrity sha512-SKr5Zm6k2SxrRBW2gqJAsTag4KacVzuVG3sTCD5P5BZLYn5OvknwSeky4tg/wzCodWp20wf89hWyET4E0iKExg== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.2.0-rc.5.tgz#97b86ea4daf4392a1067e2a7e7c03b4c381ccc82" + integrity sha512-lR3XbbNct+8QH1dRhED5s/CHCgkANVyNBrWCQbo4BwBFJ27d3wuJDVt39VxQUsgNfxEmyoJdVZNDRUKDv6fTOw== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.2.0-rc.5" + "@abp/bootstrap" "~8.2.0-rc.5" + "@abp/bootstrap-datepicker" "~8.2.0-rc.5" + "@abp/bootstrap-daterangepicker" "~8.2.0-rc.5" + "@abp/datatables.net-bs5" "~8.2.0-rc.5" + "@abp/font-awesome" "~8.2.0-rc.5" + "@abp/jquery-form" "~8.2.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~8.2.0-rc.5" + "@abp/lodash" "~8.2.0-rc.5" + "@abp/luxon" "~8.2.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~8.2.0-rc.5" + "@abp/moment" "~8.2.0-rc.5" + "@abp/select2" "~8.2.0-rc.5" + "@abp/sweetalert2" "~8.2.0-rc.5" + "@abp/timeago" "~8.2.0-rc.5" + "@abp/toastr" "~8.2.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.2.0-rc.5.tgz#4a845ebd4b6465b9ac04641d7479b449ca9e1c5f" + integrity sha512-l3brGHAD2jnlAWwITGNAY5zOtmc0WItVabYCTvKrYyNuKIPEtW9getUNFp9BFMT9x0KZiGnkkrRkvxH+DzIcug== dependencies: ansi-colors "^4.1.1" -"@abp/bootstrap-datepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.4.tgz#7f6b7b0da2c8fd46dc08b1976c57b80b65069246" - integrity sha512-+Ylw8PFuAmpza714vQPjfU/lCOS2NsUX2cGp12Yyy4fS36udPCa/HYWTVdpH36OGae1dV/GzrfgnlZsCvUNhBA== +"@abp/bootstrap-datepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.2.0-rc.5.tgz#0e8755a51d7a691837951f7a071a9e59a2e9e6cf" + integrity sha512-bLt8l6kYbVblThd2iuXcp6Ydss8TefpnZXHyXrQCxZGmVb79I/vf48CekJo1OWY/WcyEi/bm0m4LEI8Q0Y/LZQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.4.tgz#579e8a4fd9d235385514da3f2ca73283294a78e3" - integrity sha512-KIinwEwkCzlYd7gDJt3htgflfrdWnyW4fr/V6GVi2EGxK6UA5HWMRG8MkvUKXmJ4rCHfEUdpWeGBXLbPR8R4eQ== +"@abp/bootstrap-daterangepicker@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.2.0-rc.5.tgz#e37792f24c3c8a8643e5ba5744967505e54f836c" + integrity sha512-dN02S1g9sVgACMz+A5FJw0uz4u5lXTFd/7xjE+cmhj0p5AcGvDD3gTbes6d3QNKiwvsPge063lG9pisdn3uEjg== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.4.tgz#dc08a0db67a2a652c03087d299da1abfab677ebf" - integrity sha512-wwZQk2XU6puEzBJ7W+80Oh/8z6n+DNc2YJnCnJNPbURgclMsN4v3/WJ2iKlO4g0fOkepvlgYkbYWPf+pusxSCQ== +"@abp/bootstrap@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.2.0-rc.5.tgz#1acc191f8156d81e1794bc161bfb394ae8f7372e" + integrity sha512-FacgSrDlS3QSR+5WdOy06Qw0qF7OoqoBwAGqro2WOfY5sFR5OwEiqXHXUF95+a/q9B9NuYKXBjBfOPhljdiuuA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.4.tgz#c3d20d642765dc235749d4f95f599cb97f23325d" - integrity sha512-w94YGLT/UVn1haLGlH8zOcgrCS64OrnVlzh3QXps+8m4S9g7KDeVk3g4ju/VUao2YKCHmRJ3uRhOGCb58of1iw== +"@abp/clipboard@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-8.2.0-rc.5.tgz#5cec3d9c89bdad8d50f41807b3be68d4cdecb003" + integrity sha512-cBaMy8A1CIU00X6SoGyuMTVf6z9iyEaR6smVRWCVmkf2VayAHFES981+iE+VmT2bezgbCidA2GXtkBZ/kunbJg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" clipboard "^2.0.8" -"@abp/core@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.4.tgz#bf6b343ab43468ca88cdb4697caf25d65aa2c269" - integrity sha512-rGUDzLIiUJZ+7ZgzOGXxzc4k//9EBjVY4P4kO0XKCOEv08YwsUJmTzddsiMHZLIqRJ2wdT1UiH7PrcolBiW1UQ== +"@abp/core@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.2.0-rc.5.tgz#67eb75df046f8997f6af14e86bf8dbf249388a8d" + integrity sha512-XVunQMbK/MApkfnpL+8WsVqsJxARBl6W0TZwKfPyfm1QzPWE75P4oW3CIdNis0+Ob5HfhSFFp78tVrbSoEdzYQ== dependencies: - "@abp/utils" "~8.2.0-rc.4" + "@abp/utils" "~8.2.0-rc.5" -"@abp/datatables.net-bs5@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.4.tgz#869021a6639d765abb645a5de7501881b67e7095" - integrity sha512-CdYfn4qhB/KdTYfOrAsUSPtw8AGAbZHOTc4EyWAmxDKFCFyakj27+uoV/Stgs25nCaAXn1JHysfOxoNkP1ikyg== +"@abp/datatables.net-bs5@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.2.0-rc.5.tgz#fe04af4b14530545a05c4c58361aadfdddd8e8c2" + integrity sha512-yZKC111JVxcOkDz/WxJyQ0lw3JpbBBWr21LVNjyhEiN62w8tJN1Gwo7CjL+7WFm7RPnAUUf/qwitRWmWl7M4YA== dependencies: - "@abp/datatables.net" "~8.2.0-rc.4" + "@abp/datatables.net" "~8.2.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.4.tgz#4f0e612a11813f38331aae221c342efc4443138d" - integrity sha512-omEYXlB/OzUGmvTy7k7rhZjWtXILpl7idLwV1yXzJUkdjLjaBzIgrbWj/80YAI5K7MdpKE0/pdPnORX6G5ij9Q== +"@abp/datatables.net@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.2.0-rc.5.tgz#94e4b933750332732eeef02119a6cdfca67811e7" + integrity sha512-IAXbC29eiHvA3unVMsFh2sNfiw+Jlgah0D++IUKOlz1eAzHMrpwP5KE4jmF6GESF7Al95NkgqH7cd6MUst+UlA== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.4.tgz#5c977e54c428e80af2a93166e968ec7635b0694d" - integrity sha512-zyQwZhhOgKi6JLWbkI+iycwS1lcCx/tvn+AskQSdV2+ycnrcjm9TMWmWosAGwS6VW9demRamuegUNOgiVpy/SA== +"@abp/font-awesome@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.2.0-rc.5.tgz#5ae19305a373a6dd083944bd825ccea84aadf40b" + integrity sha512-VbcM80e9KrZzY6TJ9l/eW42CTpdQ0eBr5gOEW+/UWGTRalCLdGve9YVJZJA55bD1VtcgaR1sV342jw2B1XeN8w== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.4.tgz#3ef39f9f716ff17b34d61eeb3c234ed3867b91da" - integrity sha512-nD5c2g4aPlDSggoR2lJ0Zd9Jg/2yrpVKnJqNuvx7DIdxPIZed2LL5ONaOtO8pLTsKqh5ua1UsqgsyfJ/mb9T1w== +"@abp/jquery-form@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.2.0-rc.5.tgz#b955fe2c226f1f35a3736aa3b2170f265a797552" + integrity sha512-M9fUUYywljudem/K7aYlcIG2W+KTzUJPviSeOLo5KNxvVrScWr+Jf4M8Nbj6uWX1saYWmm5kYnfsDs+nOUcmDg== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.4.tgz#5124068f01db8c0e4365594fefb236f91bd60e8d" - integrity sha512-JKtZoeSSbSGbTl28ZEHvqCvC2cCX3aOV7PHKhpIzQSfVK22Uo3swsc2bv3sH2HdxNi3jWAGcd7YUG093STMm3Q== +"@abp/jquery-validation-unobtrusive@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.2.0-rc.5.tgz#c790dc1b707ee7d24fe99c2b7be6bc558af09667" + integrity sha512-sUkfb17cR2zM669U83R8dviv+p+uGNl5nmOV0AP4ch6CzLfnTOYzKsqV7ESGVxqB8oVHO/Wnr8sXaaLdsoQzJw== dependencies: - "@abp/jquery-validation" "~8.2.0-rc.4" + "@abp/jquery-validation" "~8.2.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.4.tgz#95540b7a6ef1f27b511e42b03cdf0c1c364ce8df" - integrity sha512-fN2ZJ0eCjQ5nu5fdwKx0cmGTWZyzltwrfhnI0JG27EsBP8EtyO8aWHZEFKgL+vXTy07LraTJD1KSpIIZSsrHVw== +"@abp/jquery-validation@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.2.0-rc.5.tgz#294254556e804d641d3bf4ea50d1c3eb42f191d1" + integrity sha512-C7sOuSShkX5Ba6LiSBGuxlrORcxiYczZtsxyjRZzNzATYwEBHcLqMxDvgAsWeWtvtkMotkbB2k99vD93nlGuCQ== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.4.tgz#327452ce3f49f6a9fe32a1934a6f347e2a0a309b" - integrity sha512-JYeQwpa671AyYf7sv+XgCaie2mOjWCDZYlFHEqH4whjTqT5SU8WwSkhux+/KLtBImSeQyTzyup7CuQYWBuk15w== +"@abp/jquery@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.2.0-rc.5.tgz#9b01156a80d8da6407abb6d51541cb89624cb906" + integrity sha512-KcRVhxEmUuJHd4JNBSeJV+3Ush4w9ambKxwPi3+q1fqdePekrLk9jKNud5HkP6JredBoESJ+TkeVFFQ5HnYPVg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.4.tgz#229be25a0e09f4e1b74b7e064113c3a1347d28c7" - integrity sha512-zhLlPlhrCZNngx2ns3reKG2Nmec8g2KWbN55Z1gx0XYqaymT/0zuzfkfPBdpuoyIqrXcPJL0aK21SH4Tu8LjUA== +"@abp/lodash@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.2.0-rc.5.tgz#b6fa8754258dd2db59b0df65fb9f7d90c8611af6" + integrity sha512-LvK03DSk9lDNGEFrjMdiaAkaH58ll+PIn663KJk0kVZvtNLy/egCOMCc6EBuE5DUsjwebLi6YZYzgRQRRKirgw== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.4.tgz#fdb6c8d13be6ded1d531e2d66b532d0453597c01" - integrity sha512-3iat30cVfmymoW208PjCLlrKO6VTuU8lgk/Vg0XnaX/DbNldNhBUHHzEgC9TiHLUejBSd5cunz88rhFuODz14Q== +"@abp/luxon@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.2.0-rc.5.tgz#e4300d1deebab16432737c831cfae0025b7c5891" + integrity sha512-UdAToIlS0CwmavErMtd5dwyssKNPa6oqlHrll5h7T26nHDPEdXzSi9rP8RvwqBkrt+BFPMctRSv6DYk8OwoWzA== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.4.tgz#1eb1621edd8559b43734590f123c331a360a2d93" - integrity sha512-OoqjoW1e5U/J77zr6A5DPyWha/b4UeTWaAXtl8xigJmhcDhvKe0jfvE33iHgZupFWiGu354mICNT+rQ1S2wMyA== +"@abp/malihu-custom-scrollbar-plugin@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.2.0-rc.5.tgz#8f39683e55fbc5487de08b9209a552cf32ea8087" + integrity sha512-e20kLUvnu6tD5GBjzGLQjTMeyeco4q5wO4H4mMuahJpCHue+EUrL0tT1IbWiE+eEmbePw/lAn7Yfhfwjq/+Eeg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.4.tgz#97eef0f868ad95057493e97f386c791871c063c3" - integrity sha512-q06AsfUbut7Rxgp0JMlN0dvP7C1QRMfPNO+95ZXEEnqDDlajqaIt4X/7l1gb/Iz+7yc5XVT7FJdmT+bR22etGA== +"@abp/moment@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.2.0-rc.5.tgz#e38c7e66ee383a986c7972f4ba2b19d79a43f60e" + integrity sha512-F//4TZySaFBTfWgBxzwTFLeStrS0nklmKcTMU+MOtb/7Zx3QtscJpNm4CmxiBpB8pLwK8xiJQGoiuMQdoTuq+g== dependencies: moment "^2.9.0" -"@abp/prismjs@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.4.tgz#f6df729333d4dc934c3978c29e62dddf6a22c19a" - integrity sha512-+fLF7ndhgV9v3zcWFoNSR0kPasIcagJC6FT90ALWs2XccBtjAYOm9/365DK5lyDUh0ynHx9fBgDdCdIX0Zv9RA== +"@abp/prismjs@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-8.2.0-rc.5.tgz#7a7428bb2f118cef5121a196bc45cc5d1a5a8e93" + integrity sha512-lNPqRvisf8jAxyL/05ppH26ZH4DEEzZUKqO7zqqS+yl7sBTpR/Wh8xX09spQl+wBQTLWAz2z+MouBZnMQIYKjg== dependencies: - "@abp/clipboard" "~8.2.0-rc.4" - "@abp/core" "~8.2.0-rc.4" + "@abp/clipboard" "~8.2.0-rc.5" + "@abp/core" "~8.2.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.4.tgz#085ec0f915099201b75cbb7b4bfe6826039f542d" - integrity sha512-DrRNVxB0UcRCBhYkkp9TTmu3SDwaJ6kR3WCH7zMZgjYx/K250ojcuIot98fzuecuT3Te3qiGxKwBIclr2Yt/aw== +"@abp/select2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.2.0-rc.5.tgz#5fc1dfa4bb871961db0ce9eb68a2c655c38b32d0" + integrity sha512-fT5L+mgiEOBtf2mmXNv6GtXVNjv22qQlgWp1UjI7c0jLtNPHa7P8idVTaP3g6d8b7VCP5zxIUGgjf6sZMxhADg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.4.tgz#6866295a91602167cf314f1eb3bc315825cc0cb3" - integrity sha512-3NdBP/4ZhkroWrCVyfHoc0PM6ZJD0IhqXkPO/bMDTjX8scilU85SkC2iAnReD6BoLF6ywriMpozHiU2Ax8aH2Q== +"@abp/sweetalert2@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.2.0-rc.5.tgz#502d6dbaf2c5296f67722e085e52dd0fe62e8dde" + integrity sha512-S0LTMU0a9SPdSA3ezEpo03ZGfrr7XtouEs0O5c4fA0kWYsddNkalighy3CYTgZZwaR9oWNnY6t4pyka3WXAaqg== dependencies: - "@abp/core" "~8.2.0-rc.4" + "@abp/core" "~8.2.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.4.tgz#777793699f0271e81b3fe96d46066a30925ed298" - integrity sha512-TfxUi1gn0dPuWFYCwo+g3xh4kkCo1otbvoUQOvrHp6VuQdHbXtSz0kP8VBPGKtVtlRsNe91+gDkv7n8njwrQ9g== +"@abp/timeago@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.2.0-rc.5.tgz#8bd78f2ee6b27b8ffd77e75a2851b61013e481ee" + integrity sha512-eLG9WFtP1dOoYHaNxyV8gOx1xnKmqSTwgviTU45qUFSNsgQHH1n0bpBxUXSSvaFw5mWRbF3R/JJQHql+Dl6Cow== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.4.tgz#5edfc10d6123219cc86286ed8b1249af5dbadfde" - integrity sha512-QDJXroe1Fp2VEWU0Yza/L+DU9R0ZDBw0RcopRcliwAm5RgsVVaaxHZ+jO7LLDfP8JQ6Pi0wTamhKwrfglnG7Ww== +"@abp/toastr@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.2.0-rc.5.tgz#baecda4e6fed5676f58de2228bf8d1c6ae66d49e" + integrity sha512-y7aOY1LF62yRwXRSrvimtqIilrsOgSAM8lHcp2RogZAFdmw7yU1R5a6fJlLDGeRBIgjdcIlSpaOuoi6T2hCjFw== dependencies: - "@abp/jquery" "~8.2.0-rc.4" + "@abp/jquery" "~8.2.0-rc.5" toastr "^2.1.4" -"@abp/utils@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.4.tgz#be59dd4b5dfc085b88528639047699a9e5486e81" - integrity sha512-imIFmlP0gY+rXFbwufo8jMzcmEuz/6uKr/e8/bW4bOhPDD65go/3TTVkNLr0hzB9qSahZG/LGu2eDFTqlowlrg== +"@abp/utils@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.2.0-rc.5.tgz#526d64aa3e059d2f6e595b22e35dda2d652377e4" + integrity sha512-ZU7jHFpDh7jDYgCrX6aXqy/v4LrMGgYJN+siyWUMpVddg2lTTO2MsxI+KmSxJwD7H01Mqj1sZ+LBAOVxGR3hsw== dependencies: just-compare "^2.3.0" -"@abp/virtual-file-explorer@~8.2.0-rc.4": - version "8.2.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-8.2.0-rc.4.tgz#b541a89a40bfb802d026685e4ccd95d1030f5805" - integrity sha512-WNQyQ9rt/fzjr4ESw4UkYc7NWbBwPidcCTPjaz9xjg2L/cFYFUyvV/LSKfvREFQAWxybSyNsLy5LPbScnLKP7Q== +"@abp/virtual-file-explorer@~8.2.0-rc.5": + version "8.2.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-8.2.0-rc.5.tgz#b3aa19ea19efb03bc33c07f9c7a01d41f0baf19e" + integrity sha512-OyVp9akDQEVJv+s+OfVl3pi0UXt0XDrqIvgOfHo2ItFrEg0YD62goPUf2fFjoWUKdShJq6sswBDhfluhen0clg== dependencies: - "@abp/clipboard" "~8.2.0-rc.4" - "@abp/prismjs" "~8.2.0-rc.4" + "@abp/clipboard" "~8.2.0-rc.5" + "@abp/prismjs" "~8.2.0-rc.5" "@fortawesome/fontawesome-free@^6.5.1": version "6.5.1" diff --git a/npm/lerna.json b/npm/lerna.json index 46270f8397..eb386ed716 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 6e19cd15ab..f34263805e 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -44,8 +44,8 @@ }, "private": true, "devDependencies": { - "@abp/ng.theme.lepton-x": "~3.2.0-rc.4", - "@abp/utils": "~8.2.0-rc.4", + "@abp/ng.theme.lepton-x": "~3.2.0-rc.5", + "@abp/utils": "~8.2.0-rc.5", "@angular-devkit/build-angular": "~17.3.0", "@angular-devkit/core": "~17.3.0", "@angular-devkit/schematics": "~17.3.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 90abf3af69..29dd8c85a7 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account.core", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.core": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 198a586ca6..2915108343 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.account.core": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html index 8054133a76..fa12d14965 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -161,7 +161,11 @@ @if (prop.displayTextResolver) { {{ prop.displayTextResolver(data) | abpLocalization }} } @else { - {{ prop.displayName | abpLocalization }} + @if (prop.isExtra) { + {{ '::' + prop.displayName | abpLocalization }} + } @else { + {{ prop.displayName | abpLocalization }} + } } {{ asterisk }} @if (prop.tooltip) { diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html index 9991336bf9..606a6de12a 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html @@ -64,6 +64,7 @@ [style]="action.btnStyle" [ngbTooltip]="action.tooltip.text | abpLocalization" [placement]="action.tooltip.placement || 'auto'" + triggers="hover" container="body" > extends Prop { export class FormPropData extends PropData { getInjected: PropData['getInjected']; - constructor(injector: Injector, public readonly record: R) { + constructor( + injector: Injector, + public readonly record: R, + ) { super(); this.getInjected = injector.get.bind(injector); diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 1882da1ee7..8e8671bcfc 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=8.2.0-rc.4", - "@abp/ng.theme.shared": ">=8.2.0-rc.4" + "@abp/ng.core": ">=8.2.0-rc.5", + "@abp/ng.theme.shared": ">=8.2.0-rc.5" }, "dependencies": { "chart.js": "^3.5.1", diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index 2e25a506b4..ea45ef13c4 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~8.2.0-rc.4", + "@abp/utils": "~8.2.0-rc.5", "just-clone": "^6.0.0", "just-compare": "^2.0.0", "ts-toolbelt": "6.15.4", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index 56d99b33a6..0f3ac69b72 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/generators/package.json b/npm/ng-packs/packages/generators/package.json index 10a4b22578..452154217a 100644 --- a/npm/ng-packs/packages/generators/package.json +++ b/npm/ng-packs/packages/generators/package.json @@ -1,6 +1,6 @@ { "name": "@abp/nx.generators", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "generators": "./generators.json", "type": "commonjs", diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index 04061eaef4..c3804e6073 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,15 +1,15 @@ { "name": "@abp/ng.identity", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~8.2.0-rc.4", - "@abp/ng.permission-management": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.components": "~8.2.0-rc.5", + "@abp/ng.permission-management": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts index 9f802c8283..6b0b03ccf0 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts +++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts @@ -1,5 +1,5 @@ import { Validators } from '@angular/forms'; -import { ConfigStateService, CurrentUserDto } from '@abp/ng.core'; +import { ConfigStateService } from '@abp/ng.core'; import { getPasswordValidators } from '@abp/ng.theme.shared'; import { ePropType, FormProp } from '@abp/ng.components/extensible'; import { IdentityUserDto } from '@abp/ng.identity/proxy'; diff --git a/npm/ng-packs/packages/oauth/package.json b/npm/ng-packs/packages/oauth/package.json index 7984489b08..0918f3e848 100644 --- a/npm/ng-packs/packages/oauth/package.json +++ b/npm/ng-packs/packages/oauth/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.oauth", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~8.2.0-rc.4", - "@abp/utils": "~8.2.0-rc.4", + "@abp/ng.core": "~8.2.0-rc.5", + "@abp/utils": "~8.2.0-rc.5", "angular-oauth2-oidc": "^17.0.0", "just-clone": "^6.0.0", "just-compare": "^2.0.0", diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index d50c180f2c..e6ab609a13 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 80ba71c904..83556c16b0 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "author": "", "schematics": "./collection.json", "dependencies": { diff --git a/npm/ng-packs/packages/schematics/src/commands/api/index.ts b/npm/ng-packs/packages/schematics/src/commands/api/index.ts index c04ca1d433..15dfb8ab2d 100644 --- a/npm/ng-packs/packages/schematics/src/commands/api/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/api/index.ts @@ -29,6 +29,8 @@ import { sanitizeTypeNames, sanitizeControllerTypeNames, serializeParameters, + resolveAbpPackages, + resolveSelfGenericProps, } from '../../utils'; import * as cases from '../../utils/text'; @@ -49,6 +51,8 @@ export default function (schema: GenerateProxySchema) { const data = readProxyConfig(tree); data.types = sanitizeTypeNames(data.types); + resolveSelfGenericProps({ solution, types: data.types }); + const types = data.types; const modules = data.modules; const serviceType = schema.serviceType || defaultEServiceType; @@ -157,6 +161,8 @@ function createModelGenerator(params: ModelGeneratorParams) { ), ); + resolveAbpPackages(models); + return chain( models.map(model => applyWithOverwrite(url('./files-model'), [ diff --git a/npm/ng-packs/packages/schematics/src/constants/volo.ts b/npm/ng-packs/packages/schematics/src/constants/volo.ts index f42f4ed196..7a65902732 100644 --- a/npm/ng-packs/packages/schematics/src/constants/volo.ts +++ b/npm/ng-packs/packages/schematics/src/constants/volo.ts @@ -3,3 +3,33 @@ export const VOLO_REMOTE_STREAM_CONTENT = [ 'Volo.Abp.Content.IRemoteStreamContent', 'Volo.Abp.Content.RemoteStreamContent', ]; + +export const SAAS_NAMESPACE = 'Volo.Saas'; +export const TENANT_KEY = 'tenant'; + +export const VOLO_PACKAGE_PROXY_IMPORTS = new Map([ + ['Volo.Abp.Identity.IdentityUserDto', '@volo/abp.ng.identity/proxy'], + ['Volo.Abp.Identity.IdentityRoleDto', '@volo/abp.ng.identity/proxy'], + ['Volo.Abp.FileManagement.FileDescriptorDto', '@volo/abp.ng.file-management/proxy'], + ['Volo.Abp.FileManagement.DirectoryContentDto', '@volo/abp.ng.file-management/proxy'], + ['Volo.Abp.AuditLogging.AuditLogDto', '@volo/abp.ng.audit-logging/proxy'], + ['Volo.Abp.AuditLogging.AuditLogActionDto', '@volo/abp.ng.audit-logging/proxy'], + ['Volo.Abp.AuditLogging.EntityChangeDto', '@volo/abp.ng.audit-logging/proxy'], + ['Volo.Abp.AuditLogging.EntityPropertyChangeDto', '@volo/abp.ng.audit-logging/proxy'], + ['Volo.Chat.Messages', '@volo/abp.ng.chat/proxy'], + ['Volo.Chat.ChatMessageDto', '@volo/abp.ng.chat/proxy'], + ['Volo.Chat.ChatConversationDto', '@volo/abp.ng.chat/proxy'], + ['Volo.Abp.Gdpr.GdprRequestDto', '@volo/abp.ng.gdpr/proxy'], + ['Volo.Saas.Tenants.TenantDto', '@volo/abp.ng.saas/proxy'], + //TenantConnectionStringDto it must end with Strings. + ['Volo.Saas.Tenants.TenantConnectionStringDto', '@volo/abp.ng.saas/proxy'], + ['Volo.Saas.Editions.EditionDto', '@volo/abp.ng.saas/proxy'], + [ + 'Volo.Abp.TextTemplateManagement.TextTemplates.TextTemplateContentDto', + '@volo/abp.ng.saas/proxy', + ], + [ + 'Volo.Abp.TextTemplateManagement.TextTemplates.TemplateDefinitionDto', + '@volo/abp.ng.saas/proxy', + ], +]); diff --git a/npm/ng-packs/packages/schematics/src/utils/generics.ts b/npm/ng-packs/packages/schematics/src/utils/generics.ts index 96376900e7..c6dfffbe18 100644 --- a/npm/ng-packs/packages/schematics/src/utils/generics.ts +++ b/npm/ng-packs/packages/schematics/src/utils/generics.ts @@ -72,7 +72,7 @@ export function extractSimpleGenerics(sourceType: string) { return { identifier: getLastSegment(identifier), generics: generics.map(getLastSegment), - array + array, }; } @@ -80,10 +80,10 @@ export function extractGenerics(sourceType: string) { const isArray = /\[\]$/.test(sourceType); const regex = /(?[^<]+)(<(?.+)>)?/g; const { identifier = '', generics = '' } = regex.exec(sourceType)?.groups ?? {}; - return { + return { identifier, generics: generics.split(/,\s*/).filter(Boolean), - array: isArray ? '[]':'' + array: isArray ? '[]' : '', }; } diff --git a/npm/ng-packs/packages/schematics/src/utils/model.ts b/npm/ng-packs/packages/schematics/src/utils/model.ts index 52b9b36be0..35e29a39f1 100644 --- a/npm/ng-packs/packages/schematics/src/utils/model.ts +++ b/npm/ng-packs/packages/schematics/src/utils/model.ts @@ -1,5 +1,4 @@ -import { VOLO_REGEX } from '../constants'; -import { Interface, Model, Property, PropertyDef, Type, TypeWithEnum } from '../models'; +import { Import, Interface, Model, Property, PropertyDef, Type, TypeWithEnum } from '../models'; import { extractGenerics, generateRefWithPlaceholders, @@ -17,6 +16,8 @@ import { extendsSelf, removeTypeModifiers, } from './type'; +import { SAAS_NAMESPACE, TENANT_KEY, VOLO_PACKAGE_PROXY_IMPORTS, VOLO_REGEX } from '../constants'; + // eslint-disable-next-line @typescript-eslint/no-var-requires const shouldQuote = require('should-quote'); @@ -40,7 +41,7 @@ export function createImportRefsToModelReducer(params: ModelGeneratorParams) { sortInterfaces(interfaces); interfaces.forEach(_interface => { - if (VOLO_REGEX.test(_interface.ref)) return; + if (VOLO_REGEX.test(_interface.ref) || VOLO_PACKAGE_PROXY_IMPORTS.has(_interface.ref)) return; if (types[_interface.ref]!.isEnum) { if (!enums.includes(_interface.ref)) enums.push(_interface.ref); @@ -201,3 +202,67 @@ export function parseBaseTypeWithGenericTypes(type: string): string[] { return nodeToText(parsedTypeNode); } + +export function resolveAbpPackages(models: Model[]) { + for (const model of models) { + renamePropForTenant(model.interfaces); + + model.imports.forEach((imp, i) => { + fixImportNameForTenant(imp); + + for (const ref of imp.refs) { + const path = VOLO_PACKAGE_PROXY_IMPORTS.get(ref); + if (path) { + model.imports[i] = new Import({ ...imp, path }); + } + } + }); + } +} + +function renamePropForTenant(interfaces: Interface[]) { + for (const inters of interfaces) { + for (const prop of inters.properties) { + const isTenant = prop.name.toLocaleLowerCase().includes(TENANT_KEY); + const isSaasDto = prop.refs.filter(f => f.startsWith(SAAS_NAMESPACE)).length > 0; + + if (isTenant && isSaasDto) { + prop.type = 'Saas' + prop.type; + } + } + } +} + +function fixImportNameForTenant(imp: Import) { + imp.specifiers.forEach((spe, index) => { + const isTenant = spe.toLocaleLowerCase().includes(TENANT_KEY); + + if (isTenant) { + imp.specifiers[index] = 'Saas' + spe; + } + }); +} + +export function resolveSelfGenericProps(params: Partial) { + const { types, solution } = params; + if (!types || !solution) { + return; + } + + Object.keys(types) + .filter(f => f.startsWith(solution)) + .forEach(key => { + const type = types[key]; + if (type.genericArguments?.length) { + type.properties?.map(prop => { + if (prop.type.includes('<>')) { + prop.type = prop.type.replace('<>', `<${type.genericArguments!.join(', ')}>`); + prop.typeSimple = prop.typeSimple.replace( + '<>', + `<${type.genericArguments!.join(', ')}>`, + ); + } + }); + } + }); +} diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index 2a37bd9e4c..f5f6a0d82a 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.setting-management", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.components": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index b190142388..5ed30fd0ab 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.feature-management": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index ee7a49a4e3..fc9802fcc8 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.account.core": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 8be95095d7..42b4901004 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.shared", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~8.2.0-rc.4", + "@abp/ng.core": "~8.2.0-rc.5", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~16.0.0", "@ngx-validate/core": "^0.2.0", diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 10219468c6..92ad6fc746 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "anchor-js": "^4.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 3ad96756b2..0d92f8a62d 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~8.2.0-rc.4" + "@abp/aspnetcore.components.server.theming": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index 253bda61b0..13f1582a32 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~8.2.0-rc.4", - "@abp/font-awesome": "~8.2.0-rc.4" + "@abp/bootstrap": "~8.2.0-rc.5", + "@abp/font-awesome": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 1932a06408..98b05dba3c 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.shared": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index aa182835b3..e8107cd6bf 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,22 +10,22 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~8.2.0-rc.4", - "@abp/bootstrap": "~8.2.0-rc.4", - "@abp/bootstrap-datepicker": "~8.2.0-rc.4", - "@abp/bootstrap-daterangepicker": "~8.2.0-rc.4", - "@abp/datatables.net-bs5": "~8.2.0-rc.4", - "@abp/font-awesome": "~8.2.0-rc.4", - "@abp/jquery-form": "~8.2.0-rc.4", - "@abp/jquery-validation-unobtrusive": "~8.2.0-rc.4", - "@abp/lodash": "~8.2.0-rc.4", - "@abp/luxon": "~8.2.0-rc.4", - "@abp/malihu-custom-scrollbar-plugin": "~8.2.0-rc.4", - "@abp/moment": "~8.2.0-rc.4", - "@abp/select2": "~8.2.0-rc.4", - "@abp/sweetalert2": "~8.2.0-rc.4", - "@abp/timeago": "~8.2.0-rc.4", - "@abp/toastr": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui": "~8.2.0-rc.5", + "@abp/bootstrap": "~8.2.0-rc.5", + "@abp/bootstrap-datepicker": "~8.2.0-rc.5", + "@abp/bootstrap-daterangepicker": "~8.2.0-rc.5", + "@abp/datatables.net-bs5": "~8.2.0-rc.5", + "@abp/font-awesome": "~8.2.0-rc.5", + "@abp/jquery-form": "~8.2.0-rc.5", + "@abp/jquery-validation-unobtrusive": "~8.2.0-rc.5", + "@abp/lodash": "~8.2.0-rc.5", + "@abp/luxon": "~8.2.0-rc.5", + "@abp/malihu-custom-scrollbar-plugin": "~8.2.0-rc.5", + "@abp/moment": "~8.2.0-rc.5", + "@abp/select2": "~8.2.0-rc.5", + "@abp/sweetalert2": "~8.2.0-rc.5", + "@abp/timeago": "~8.2.0-rc.5", + "@abp/toastr": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index 30286105ee..3427bb3d19 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "lockfileVersion": 1, "requires": true, "packages": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index ba2c21992d..93decdf781 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 3516fef18c..4ba857a995 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~8.2.0-rc.4", - "@abp/owl.carousel": "~8.2.0-rc.4", - "@abp/prismjs": "~8.2.0-rc.4", - "@abp/tui-editor": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.shared": "~8.2.0-rc.5", + "@abp/owl.carousel": "~8.2.0-rc.5", + "@abp/prismjs": "~8.2.0-rc.5", + "@abp/tui-editor": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 3f4563b958..327e90471d 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap-daterangepicker/package.json b/npm/packs/bootstrap-daterangepicker/package.json index e77ee9b6f4..733ee17864 100644 --- a/npm/packs/bootstrap-daterangepicker/package.json +++ b/npm/packs/bootstrap-daterangepicker/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/bootstrap-daterangepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 9a0ac459b9..1509ed1ede 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index b6f19add19..eee2d8139f 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index e85fbb3fa9..3481bfc3e5 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "clipboard": "^2.0.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index e803f4e7a8..4528c47940 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,16 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~8.2.0-rc.4", - "@abp/jstree": "~8.2.0-rc.4", - "@abp/slugify": "~8.2.0-rc.4", - "@abp/tui-editor": "~8.2.0-rc.4", - "@abp/uppy": "~8.2.0-rc.4" + "@abp/codemirror": "~8.2.0-rc.5", + "@abp/jstree": "~8.2.0-rc.5", + "@abp/slugify": "~8.2.0-rc.5", + "@abp/tui-editor": "~8.2.0-rc.5", + "@abp/uppy": "~8.2.0-rc.5", + "@abp/markdown-it": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index a2bd475ef7..6dbd8fb3f5 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~8.2.0-rc.4", - "@abp/star-rating-svg": "~8.2.0-rc.4" + "@abp/highlight.js": "~8.2.0-rc.5", + "@abp/star-rating-svg": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index 2bb07ea735..2c38a82bea 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~8.2.0-rc.4", - "@abp/cms-kit.public": "~8.2.0-rc.4" + "@abp/cms-kit.admin": "~8.2.0-rc.5", + "@abp/cms-kit.public": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 97873f2625..f531abd5c2 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 38dde86707..29c0c660ec 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~8.2.0-rc.4" + "@abp/utils": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 3d9fe6fe7e..cab5ff0d69 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "cropperjs": "^1.5.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index 8396374d6b..48956a29de 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~8.2.0-rc.4", + "@abp/datatables.net": "~8.2.0-rc.5", "datatables.net-bs4": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index 68f47b9aec..03bcece395 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~8.2.0-rc.4", + "@abp/datatables.net": "~8.2.0-rc.5", "datatables.net-bs5": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index a83f9c9835..1df2d2737b 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~8.2.0-rc.4", + "@abp/jquery": "~8.2.0-rc.5", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index a3f54eea49..abceaecd93 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~8.2.0-rc.4", - "@abp/clipboard": "~8.2.0-rc.4", - "@abp/malihu-custom-scrollbar-plugin": "~8.2.0-rc.4", - "@abp/popper.js": "~8.2.0-rc.4", - "@abp/prismjs": "~8.2.0-rc.4" + "@abp/anchor-js": "~8.2.0-rc.5", + "@abp/clipboard": "~8.2.0-rc.5", + "@abp/malihu-custom-scrollbar-plugin": "~8.2.0-rc.5", + "@abp/popper.js": "~8.2.0-rc.5", + "@abp/prismjs": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 439c78fb6c..fda6d1afbc 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/flag-icons/package.json b/npm/packs/flag-icons/package.json index 65ccad3751..eeb5ceb575 100644 --- a/npm/packs/flag-icons/package.json +++ b/npm/packs/flag-icons/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/flag-icons", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 3365dae1d3..7c4ee45293 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "@fortawesome/fontawesome-free": "^6.5.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index baf93dde1b..acbdb0e1ba 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "@highlightjs/cdn-assets": "~11.4.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 2d912c81e9..59807bbf95 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~8.2.0-rc.4", + "@abp/jquery": "~8.2.0-rc.5", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index 9d00e93a5a..66a7eb9663 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~8.2.0-rc.4", + "@abp/jquery-validation": "~8.2.0-rc.5", "jquery-validation-unobtrusive": "^3.2.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index aaa9b950b0..2e23ecbb4e 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~8.2.0-rc.4", + "@abp/jquery": "~8.2.0-rc.5", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 32025bb5eb..e1cbcc1f01 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 3d903d597f..3cfa5785b4 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~8.2.0-rc.4", + "@abp/jquery": "~8.2.0-rc.5", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 1829deb384..9d330b36f8 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index 128150f032..9853c20bc8 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "luxon": "^2.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 3be9b84cac..8224167e7c 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index a3e405a610..745cdcee03 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/moment/package.json b/npm/packs/moment/package.json index 82ced0fce8..722d7cfbf0 100644 --- a/npm/packs/moment/package.json +++ b/npm/packs/moment/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/moment", "repository": { "type": "git", diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 0a0056d693..0a60a02f4d 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 817179f237..8dc8b09aad 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 11262280c8..0e1e802e29 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~8.2.0-rc.4", - "@abp/core": "~8.2.0-rc.4", + "@abp/clipboard": "~8.2.0-rc.5", + "@abp/core": "~8.2.0-rc.5", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/qrcode/package.json b/npm/packs/qrcode/package.json index 3b04272594..167191f94a 100644 --- a/npm/packs/qrcode/package.json +++ b/npm/packs/qrcode/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/qrcode", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4" + "@abp/core": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 83b4dd67e6..a7082f7430 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 23eed9492b..5ec711b70c 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index ca1e5fab18..231894b7e8 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index 90674165e5..27016d6568 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~8.2.0-rc.4", + "@abp/jquery": "~8.2.0-rc.5", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 0bdd74454b..09018c9618 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 074c38a16d..5c461a24d6 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~8.2.0-rc.4", + "@abp/jquery": "~8.2.0-rc.5", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index de76e641c0..ad9ca2781f 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~8.2.0-rc.4", + "@abp/jquery": "~8.2.0-rc.5", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 188d17bfd2..d214a2591d 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~8.2.0-rc.4", - "@abp/prismjs": "~8.2.0-rc.4" + "@abp/jquery": "~8.2.0-rc.5", + "@abp/prismjs": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index be90dfda54..31fb4b0369 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "uppy": "^3.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index f3ec32ea8f..d1a6135001 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index a48834b0ae..d4b6eeb410 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~8.2.0-rc.4", + "@abp/vue": "~8.2.0-rc.5", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index 334299021a..940165210f 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~8.2.0-rc.4", - "@abp/prismjs": "~8.2.0-rc.4" + "@abp/clipboard": "~8.2.0-rc.5", + "@abp/prismjs": "~8.2.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index 2ea44b5cef..dd565b5d8a 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/npm/packs/zxcvbn/package.json b/npm/packs/zxcvbn/package.json index e58f1acb25..ab2c2ce04e 100644 --- a/npm/packs/zxcvbn/package.json +++ b/npm/packs/zxcvbn/package.json @@ -1,11 +1,11 @@ { - "version": "8.2.0-rc.4", + "version": "8.2.0-rc.5", "name": "@abp/zxcvbn", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~8.2.0-rc.4", + "@abp/core": "~8.2.0-rc.5", "zxcvbn": "^4.4.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip index e02c2dd52a..8f14b73910 100644 Binary files a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip and b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip differ diff --git a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip index 55255c687a..249d4e605a 100644 Binary files a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip and b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip index afe84d7050..0e1a5888e2 100644 Binary files a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip and b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip index 9c412cf13b..a7a58eb48c 100644 Binary files a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip and b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip index 0aae8f2f30..1cd9b242ed 100644 Binary files a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip and b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip differ diff --git a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip index eea800d378..f4b05b3289 100644 Binary files a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip and b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip index 4591c2a586..0015220a63 100644 Binary files a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip and b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip differ diff --git a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip index 5753dd4f8a..9d68bdc223 100644 Binary files a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip and b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip differ diff --git a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip index 21b6813ad6..9b70c10d14 100644 Binary files a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip and b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip differ diff --git a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip index 9b3f367c92..1d58dade50 100644 Binary files a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip and b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip index f28e2c8c82..8890f3e35d 100644 Binary files a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip and b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip index a2eac59173..6c6a7f41c7 100644 Binary files a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip and b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip index e205ad47da..8c66e4d906 100644 Binary files a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip and b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip differ diff --git a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip index ce56e6933f..0720e25f73 100644 Binary files a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip and b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip differ diff --git a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip index 8010fd5716..be8c8cc017 100644 Binary files a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip and b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip differ diff --git a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip index 5213c8f45d..2340d46476 100644 Binary files a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip and b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip differ diff --git a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip index bfe280268e..c4930bee7b 100644 Binary files a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip and b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip differ diff --git a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip index 6833f3def7..f130e7f64e 100644 Binary files a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip and b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip differ diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index c581337c3d..665dd65eeb 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~8.2.0-rc.4", - "@abp/ng.components": "~8.2.0-rc.4", - "@abp/ng.core": "~8.2.0-rc.4", - "@abp/ng.oauth": "~8.2.0-rc.4", - "@abp/ng.identity": "~8.2.0-rc.4", - "@abp/ng.setting-management": "~8.2.0-rc.4", - "@abp/ng.tenant-management": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", - "@abp/ng.theme.lepton-x": "~3.2.0-rc.4", + "@abp/ng.account": "~8.2.0-rc.5", + "@abp/ng.components": "~8.2.0-rc.5", + "@abp/ng.core": "~8.2.0-rc.5", + "@abp/ng.oauth": "~8.2.0-rc.5", + "@abp/ng.identity": "~8.2.0-rc.5", + "@abp/ng.setting-management": "~8.2.0-rc.5", + "@abp/ng.tenant-management": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", + "@abp/ng.theme.lepton-x": "~3.2.0-rc.5", "@angular/animations": "~17.3.0", "@angular/common": "~17.3.0", "@angular/compiler": "~17.3.0", @@ -36,7 +36,7 @@ "zone.js": "~0.14.0" }, "devDependencies": { - "@abp/ng.schematics": "~8.2.0-rc.4", + "@abp/ng.schematics": "~8.2.0-rc.5", "@angular-devkit/build-angular": "~17.3.0", "@angular-eslint/builder": "~17.3.0", "@angular-eslint/eslint-plugin": "~17.3.0", diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs index 2aaac16fc8..1a8c387482 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs @@ -12,7 +12,7 @@ using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling; diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 380187a503..e66e6f119c 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.4", - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.5", + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs index f869eec2e4..783e82a050 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs @@ -13,7 +13,7 @@ using Volo.Abp; using Volo.Abp.Uow; using Volo.Abp.Account; using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling; diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json index 938c909638..ed2aacf9dd 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.5" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index dc4ecf2da8..f7b6bd91c3 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~8.2.0-rc.4", - "@abp/ng.components": "~8.2.0-rc.4", - "@abp/ng.core": "~8.2.0-rc.4", - "@abp/ng.identity": "~8.2.0-rc.4", - "@abp/ng.oauth": "~8.2.0-rc.4", - "@abp/ng.setting-management": "~8.2.0-rc.4", - "@abp/ng.tenant-management": "~8.2.0-rc.4", - "@abp/ng.theme.lepton-x": "~3.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.account": "~8.2.0-rc.5", + "@abp/ng.components": "~8.2.0-rc.5", + "@abp/ng.core": "~8.2.0-rc.5", + "@abp/ng.identity": "~8.2.0-rc.5", + "@abp/ng.oauth": "~8.2.0-rc.5", + "@abp/ng.setting-management": "~8.2.0-rc.5", + "@abp/ng.tenant-management": "~8.2.0-rc.5", + "@abp/ng.theme.lepton-x": "~3.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "@angular/animations": "~17.3.0", "@angular/common": "~17.3.0", "@angular/compiler": "~17.3.0", @@ -36,7 +36,7 @@ "zone.js": "~0.14.0" }, "devDependencies": { - "@abp/ng.schematics": "~8.2.0-rc.4", + "@abp/ng.schematics": "~8.2.0-rc.5", "@angular-devkit/build-angular": "~17.3.0", "@angular-eslint/builder": "~17.3.0", "@angular-eslint/eslint-plugin": "~17.3.0", diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json index a3a652da4c..33c64d8ec3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs index 2ea2112a78..dad869db4d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs @@ -22,7 +22,7 @@ using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.OpenIdConnect; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json index 938c909638..ed2aacf9dd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.5" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs index 0003914f38..e1e9a212d5 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs @@ -18,7 +18,7 @@ using MyCompanyName.MyProjectName.MultiTenancy; using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json index 938c909638..ed2aacf9dd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.5" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameBlazorClientModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameBlazorClientModule.cs index 869935bafa..e2de628db7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameBlazorClientModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyProjectNameBlazorClientModule.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using MyCompanyName.MyProjectName.Blazor.WebApp.Client.Menus; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme; using Volo.Abp.Autofac.WebAssembly; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameBlazorClientModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameBlazorClientModule.cs index dc22eeddfa..b0e4e4f67f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameBlazorClientModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyProjectNameBlazorClientModule.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.Menus; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme; using Volo.Abp.Autofac.WebAssembly; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameBlazorModule.cs index 82f80d789e..b9cee43363 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameBlazorModule.cs @@ -24,7 +24,7 @@ using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.OpenIdConnect; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json index 938c909638..ed2aacf9dd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.5" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameBlazorModule.cs index dd9a5eb6a8..11e0e75f6c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameBlazorModule.cs @@ -19,7 +19,7 @@ using MyCompanyName.MyProjectName.MultiTenancy; using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme; using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json index 938c909638..ed2aacf9dd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.2.0-rc.5" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json index 8df52c4fde..e4e4642ca9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0-rc.5" } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index ba12963918..bab2596553 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -13,15 +13,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~8.2.0-rc.4", - "@abp/ng.components": "~8.2.0-rc.4", - "@abp/ng.core": "~8.2.0-rc.4", - "@abp/ng.identity": "~8.2.0-rc.4", - "@abp/ng.oauth": "~8.2.0-rc.4", - "@abp/ng.setting-management": "~8.2.0-rc.4", - "@abp/ng.tenant-management": "~8.2.0-rc.4", - "@abp/ng.theme.basic": "~8.2.0-rc.4", - "@abp/ng.theme.shared": "~8.2.0-rc.4", + "@abp/ng.account": "~8.2.0-rc.5", + "@abp/ng.components": "~8.2.0-rc.5", + "@abp/ng.core": "~8.2.0-rc.5", + "@abp/ng.identity": "~8.2.0-rc.5", + "@abp/ng.oauth": "~8.2.0-rc.5", + "@abp/ng.setting-management": "~8.2.0-rc.5", + "@abp/ng.tenant-management": "~8.2.0-rc.5", + "@abp/ng.theme.basic": "~8.2.0-rc.5", + "@abp/ng.theme.shared": "~8.2.0-rc.5", "@angular/animations": "~17.3.0", "@angular/common": "~17.3.0", "@angular/compiler": "~17.3.0", @@ -36,7 +36,7 @@ "zone.js": "~0.14.0" }, "devDependencies": { - "@abp/ng.schematics": "~8.2.0-rc.4", + "@abp/ng.schematics": "~8.2.0-rc.5", "@angular-devkit/build-angular": "~17.3.0", "@angular-eslint/builder": "~17.3.0", "@angular-eslint/eslint-plugin": "~17.3.0", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index fe58cf8ab6..70e34657ca 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": ">=14", "@angular/core": ">=14", - "@abp/ng.core": ">=8.2.0-rc.4", - "@abp/ng.theme.shared": ">=8.2.0-rc.4" + "@abp/ng.core": ">=8.2.0-rc.5", + "@abp/ng.theme.shared": ">=8.2.0-rc.5" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index 0260dea376..92bc39c1e5 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs index 6f1907ef9b..4451d010a0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs @@ -19,7 +19,7 @@ using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Components.Server; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Server.BasicTheme; using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index c54221b25b..84e8f59ab0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4", - "@abp/aspnetcore.components.server.basictheme": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5", + "@abp/aspnetcore.components.server.basictheme": "~8.2.0-rc.5" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index 2115871f2c..dec85ed263 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index 2115871f2c..dec85ed263 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.0-rc.5" } }