mirror of https://github.com/abpframework/abp
Engincan VESKE
2 years ago
committed by
GitHub
commit
0fcf551414
@ -0,0 +1,14 @@
|
||||
# Security Policy
|
||||
|
||||
## Supported Versions
|
||||
|
||||
| Version | Supported |
|
||||
| ------- | ------------------ |
|
||||
| 7.x.x | :white_check_mark: |
|
||||
| < 7.0.0 | :x: |
|
||||
|
||||
## Reporting a Vulnerability
|
||||
|
||||
Please don not share vulnerabilities publicly in GitHub or other platforms.
|
||||
You can report security issues by sending a email to `security@abp.io`
|
||||
Your report is immediately evaluated. We publish patch versions for critical vulnerabilities in a week at most.
|
||||
@ -0,0 +1,287 @@
|
||||
# ABP.IO Platform 7.4 RC Has Been Released
|
||||
|
||||
Today, we are happy to release the [ABP Framework](https://abp.io/) and [ABP Commercial](https://commercial.abp.io/) version **7.4 RC** (Release Candidate). This blog post introduces the new features and important changes in this new version.
|
||||
|
||||
Try this version and provide feedback for a more stable version of ABP v7.4! Thanks to all of you.
|
||||
|
||||
## Get Started with the 7.4 RC
|
||||
|
||||
Follow the steps below to try version 7.4.0 RC today:
|
||||
|
||||
1) **Upgrade** the ABP CLI to version `7.4.0-rc.1` using a command line terminal:
|
||||
|
||||
````bash
|
||||
dotnet tool update Volo.Abp.Cli -g --version 7.4.0-rc.1
|
||||
````
|
||||
|
||||
**or install** it if you haven't before:
|
||||
|
||||
````bash
|
||||
dotnet tool install Volo.Abp.Cli -g --version 7.4.0-rc.1
|
||||
````
|
||||
|
||||
2) Create a **new application** with the `--preview` option:
|
||||
|
||||
````bash
|
||||
abp new BookStore --preview
|
||||
````
|
||||
|
||||
See the [ABP CLI documentation](https://docs.abp.io/en/abp/latest/CLI) for all the available options.
|
||||
|
||||
> You can also use the [Get Started](https://abp.io/get-started) page to generate a CLI command to create a new application.
|
||||
|
||||
You can use any IDE that supports .NET 7.x, like [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/).
|
||||
|
||||
## Migration Guides
|
||||
|
||||
There are a few breaking changes in this version that may affect your application.
|
||||
Please see the following migration documents, if you are upgrading from v7.3 or earlier:
|
||||
|
||||
* [ABP Framework 7.3 to 7.4 Migration Guide](https://docs.abp.io/en/abp/7.4/Migration-Guides/Abp-7_4)
|
||||
|
||||
## What's New with ABP Framework 7.4?
|
||||
|
||||
In this section, I will introduce some major features released in this version. Here is a brief list of the titles that will be explained in the next sections:
|
||||
|
||||
* Dynamic Setting Store
|
||||
* Introducing the `AdditionalAssemblyAttribute`
|
||||
* `CorrelationId` Support on Distributed Events
|
||||
* Database Migration System for EF Core
|
||||
* Other News
|
||||
|
||||
### Dynamic Setting Store
|
||||
|
||||
Prior to this version, it was hard to define settings in different microservices and centrally manage all setting definitions in a single admin application. To make that possible, we used to add project references for all the microservices' service contract packages from a single microservice, so it can know all the setting definitions and manage them.
|
||||
|
||||
In this version, ABP Framework introduces the Dynamic Setting Store, which is an important feature that allows you to collect and get all setting definitions from a single point and overcome the setting management problems on microservices.
|
||||
|
||||
> *Note*: If you are upgrading from an earlier version and using the Setting Management module, you need to create a new migration and apply it to your database because a new database table has been added for this feature.
|
||||
|
||||
### Introducing the `AdditionalAssemblyAttribute`
|
||||
|
||||
In this version, we have introduced the `AdditionalAssemblyAttribute` to define additional assemblies to be part of a module. ABP Framework automatically registers all the services of your module to the [Dependency Injection System](https://docs.abp.io/en/abp/latest/Dependency-Injection). It finds the service types by scanning types in the assembly that define your module class. Typically, every assembly contains a separate module class definition and modules depend on each other using the `DependsOn` attribute.
|
||||
|
||||
In some rare cases, your module may consist of multiple assemblies and only one of them defines a module class, and you want to make the other assemblies parts of your module. This is especially useful if you can't define a module class in the target assembly or you don't want to depend on that module's dependencies.
|
||||
|
||||
In that case, you can use the `AdditionalAssembly` attribute as shown below:
|
||||
|
||||
```csharp
|
||||
[DependsOn(...)] // Your module dependencies as you normally would do
|
||||
[AdditionalAssembly(typeof(IdentityServiceModule))] // A type in the target assembly (in another assembly)
|
||||
public class IdentityServiceTestModule : AbpModule
|
||||
{
|
||||
...
|
||||
}
|
||||
```
|
||||
|
||||
With the `AdditionalAssembly` attribute definition, ABP loads the assembly containing the `IdentityServiceModule` class as a part of the identity service module. Notice that in this case, none of the module dependencies of the `IdentityServiceModule` are loaded. Because we are not depending on the `IdentityServiceModule`, instead we are just adding its assembly as a part of the `IdentityServiceTestModule`.
|
||||
|
||||
> You can check the [Module Development Basics](https://docs.abp.io/en/abp/7.4/Module-Development-Basics) documentation to learn more.
|
||||
|
||||
### `CorrelationId` Support on Distributed Events
|
||||
|
||||
In this version, `CorrelationId` (a unique key that is used in distributed applications to trace requests across multiple services/operations) is attached to the distributed events, so you can relate events with HTTP requests and can trace all the related activities.
|
||||
|
||||
ABP Framework generates a `correlationId` for the first time when an operation is started and then attaches the current `correlationId` to distributed events as an additional property. For example, if you are using the [transactional outbox or inbox pattern provided by ABP Framework](https://docs.abp.io/en/abp/latest/Distributed-Event-Bus#outbox-inbox-for-transactional-events), you can see the `correlationId` in the extra properties of the `IncomingEventInfo` or `OutgoingEventInfo` classes with the standard `X-Correlation-Id` key.
|
||||
|
||||
> You can check [this issue](https://github.com/abpframework/abp/issues/16773) for more information.
|
||||
|
||||
### Database Migration System for EF Core
|
||||
|
||||
In this version, ABP Framework provides base classes and events to migrate the database schema and seed the database on application startup. This system works compatibly with multi-tenancy and whenever a new tenant is created or a tenant's database connection string has been updated, it checks and applies database migrations for the new tenant state.
|
||||
|
||||
This system is especially useful to migrate databases for microservices. In this way, when you deploy a new version of a microservice, you don't need to manually migrate its database.
|
||||
|
||||
You need to take the following actions to use the database migration system:
|
||||
|
||||
* Create a class that derives from `EfCoreRuntimeDatabaseMigratorBase` class, override and implement its `SeedAsync` method. And lastly, execute the `CheckAndApplyDatabaseMigrationsAsync` method of your class in the `OnPostApplicationInitializationAsync` method of your module class.
|
||||
* Create a class that derives from `DatabaseMigrationEventHandlerBase` class, override and implement its `SeedAsync` method. Then, whenever a new tenant is created or a tenant's connection string is changed then the `SeedAsync` method will be executed.
|
||||
|
||||
### Other News
|
||||
|
||||
* [OpenIddict](https://github.com/openiddict/openiddict-core/tree/4.7.0) library has been upgraded to **v4.7.0**. See [#17334](https://github.com/abpframework/abp/pull/17334) for more info.
|
||||
* ABP v7.4 introduces the `Volo.Abp.Maui.Client` package, which is used by the MAUI mobile application in ABP Commercial. See [#17201](https://github.com/abpframework/abp/pull/17201) for more info.
|
||||
* In this version, the `AbpAspNetCoreIntegratedTestBase` class gets a generic type parameter, which expects either a startup class or an ABP module class. This allows us to use configurations from an ABP module or old-style ASP.NET Core Startup class in a test application class and this simplifies the test application project. See [#17039](https://github.com/abpframework/abp/pull/17039) for more info.
|
||||
|
||||
## What's New with ABP Commercial 7.4?
|
||||
|
||||
We've also worked on [ABP Commercial](https://commercial.abp.io/) to align the features and changes made in the ABP Framework. The following sections introduce new features coming with ABP Commercial 7.4.
|
||||
|
||||
### Dynamic Text Template Store
|
||||
|
||||
Prior to this version, it was hard to create text templates in different microservices and centrally manage them in a single admin application. For example, if you would define a text template in your ordering microservice, then those text templates could not be seen on the administration microservice because the administration microservice would not have any knowledge about that text template (because it's hard-coded in the ordering microservice).
|
||||
|
||||
For this reason, in this version, the Dynamic Text Template Store has been introduced to make the [Text Template Management module](https://docs.abp.io/en/commercial/latest/modules/text-template-management) compatible with microservices and distributed systems. It allows you to store and get all text templates from a single point. Thanks to that, you can centrally manage the text templates in your admin application.
|
||||
|
||||
> *Note*: If you are upgrading from an earlier version and are using the Text Template Management module, you need to create a new migration and apply it to your database.
|
||||
|
||||
To enable the dynamic template store, you just need to configure the `TextTemplateManagementOptions` and set the `IsDynamicTemplateStoreEnabled` as true in your module class:
|
||||
|
||||
```csharp
|
||||
Configure<TextTemplateManagementOptions>(options =>
|
||||
{
|
||||
options.IsDynamicTemplateStoreEnabled = true;
|
||||
});
|
||||
```
|
||||
|
||||
Notice this is only needed in the microservice where you centrally manage your text template contents. So, typically you would use the configuration above in your administration microservice. Other microservices automatically save their text template contents to the central database.
|
||||
|
||||
### Suite: Custom Code Support
|
||||
|
||||
In this version, we have implemented the custom code support in Suite. This allows you to customize the generated code-blocks and preserve your custom code changes in the next CRUD Page Generation in Suite. ABP Suite specifies hook-points to allow adding custom code blocks. Then, the code that you wrote to these hook points will be respected and will not be overridden in the next entity generation.
|
||||
|
||||
|
||||
|
||||
To enable custom code support, you should check the *Customizable code* option in the crud page generation page. When you enable the custom code support, you will be seeing some hook-points in your application.
|
||||
|
||||
For example, on the C# side, you'll be seeing some abstract classes and classes that derive from them (for entities, application services, interfaces, domain services, and so on...). You can write your custom code in those classes (`*.Extended.cs`) and the next time when you need to re-generate the entity, your custom code will not be overridden (only the base abstract classes will be re-generated and your changes on Suite will be respected):
|
||||
|
||||
Folder structure | Book.Extended.cs
|
||||
:-------------------------:|:-------------------------:
|
||||
 | 
|
||||
|
||||
> *Note*: If you want to override the entity and add custom code, please do not touch the code between `<suite-custom-code-autogenerated>...</suite-custom-code-autogenerated>` placeholders, because the constructor of the entity should be always re-generated in case of a new property added.
|
||||
|
||||
On the UI side, you can see the *comment placeholders* on the pages for MVC & Blazor applications. These are hook-points provided by ABP Suite and you can write your custom code between these comment sections:
|
||||
|
||||
Folder structure | Books/Index.cshtml
|
||||
:-------------------------:|:-------------------------:
|
||||
 | 
|
||||
|
||||
### MAUI & React Native UI Revisions
|
||||
|
||||
In this version, we have revised MAUI & React Native mobile applications and added new pages, functionalities and made improvements on the UI side.
|
||||
|
||||
|
||||
|
||||
For example, in the MAUI application, we have implemented the following functionalities and changed the UI completely:
|
||||
|
||||
* **User Management Page**: Management page for your application users. You can search, add, update, or delete users of your application.
|
||||
* **Tenants**: Management page for your tenants.
|
||||
* **Settings**: Management page for your application settings. On this page, you can change **the current language**, **the profile picture**, **the current password**, or/and **the current theme**.
|
||||
|
||||
Also, we have aligned the features on both of these mobile options (MAUI & React Native) and showed them in the ["ABP Community Talks 2023.5: Exploring the Options for Mobile Development with the ABP Framework"](https://community.abp.io/events/mobile-development-with-the-abp-framework-ogtwaz5l).
|
||||
|
||||
> If you have missed the event, you can watch from 👉 [here](https://www.youtube.com/watch?v=-wrdngeKgZw).
|
||||
|
||||
### New LeptonX Theme Features
|
||||
|
||||
In the new version of LeptonX Theme, which is v2.4.0-rc.1, there are some new features that we want to mention.
|
||||
|
||||
#### Mobile Toolbars
|
||||
|
||||
The [Toolbar System](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Toolbars) is used to define *toolbars* on the user interface. Modules (or your application) can add items to a toolbar, then the UI themes can render the toolbar on the layout.
|
||||
|
||||
LeptonX Theme extends this system even further and introduces mobile toolbars with this version. You can create a component and add it as a mobile toolbar as below:
|
||||
|
||||
```csharp
|
||||
public class MyToolbarContributor : IToolbarContributor
|
||||
{
|
||||
public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
|
||||
{
|
||||
if (context.Toolbar.Name == LeptonXToolbars.MainMobile)
|
||||
{
|
||||
context.Toolbar.Items.Add(new ToolbarItem(typeof(ShoppingCardToolbarComponent)));
|
||||
|
||||
//other mobile toolbars...
|
||||
}
|
||||
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Then, the LeptonX Theme will render these mobile toolbars like in the figure below:
|
||||
|
||||
|
||||
|
||||
> **Note**: The Angular UI hasn't been completed yet. We aim to complete it as soon as possible and include it in the next release.
|
||||
|
||||
#### New Error Page Designs
|
||||
|
||||
In this version, we have implemented new error pages. Encounter a fresh look during error situations with the 'New Error Page Designs,' providing informative and visually appealing error displays that enhance user experience:
|
||||
|
||||
|
||||
|
||||
#### Fluid Layout
|
||||
|
||||
In this version, LeptonX Theme introduces the fresh-looking **Fluid Layout**, which is a layout that lets you align elements so that they automatically adjust their alignment and proportions for different page sizes and orientations.
|
||||
|
||||
|
||||
|
||||
> You can visit [the live demo of LeptonX Theme](https://x.leptontheme.com/side-menu) and try the Fluid Layout now!
|
||||
|
||||
### Check & Move Related Entities on Deletion/Demand
|
||||
|
||||
In application modules, there are some entities that have complete relationships with each other such as role-user relations. In such cases, it's a typical requirement to check & move related entities that have a relation with the other entity that is about to be deleted.
|
||||
|
||||
For example, if you need to delete an edition from your system, you would typically want to move the tenant that is associated with that edition. For this purpose, in this version, ABP Commercial allows you to move related entities on deletion/demand.
|
||||
|
||||
|
||||
|
||||
Currently, this feature is implemented for SaaS and Identity Pro modules and for the following relations:
|
||||
|
||||
* Edition - Tenant
|
||||
* Role - User
|
||||
* Organization Unit - User
|
||||
|
||||
Also, it's possible to move the related associated-records before deleting the record. For example, you can move all tenants from an edition as shown in the figure below:
|
||||
|
||||
"Move all tenants" action | "Move all tenants" modal
|
||||
:-------------------------:|:-------------------------:
|
||||
 | 
|
||||
|
||||
### CMS Kit Pro: Page Feedback
|
||||
|
||||
In this version, the **Page Feedback** feature has been added to the [CMS Kit Pro](https://docs.abp.io/en/commercial/latest/modules/cms-kit/index) module. This feature allows you to get feedback from a page in your application.
|
||||
|
||||
This is especially useful if you have content that needs feedback from users. For example, if you have documentation or a blog website, it's a common requirement to assess the quality of the articles and get feedback from users. In that case, you can use this feature:
|
||||
|
||||
|
||||
|
||||
### Chat Module: Deleting Messages & Conversations
|
||||
|
||||
In this version, the [Chat Module](https://docs.abp.io/en/commercial/latest/modules/chat) allows you to delete individual messages or a complete conversation.
|
||||
|
||||
You can enable or disable the message/conversation deletion globally on your application:
|
||||
|
||||
|
||||
|
||||
> **Note**: The Angular UI hasn't been completed yet. We aim to complete it as soon as possible and include it in the next release.
|
||||
|
||||
### Password Complexity Indicators
|
||||
|
||||
In this version, ABP Framework introduces an innovative ["Password Complexity Indicator"](https://docs.abp.io/en/commercial/7.4/ui/angular/password-complexity-indicator-component) feature, designed to enhance security and user experience. This feature dynamically evaluates and rates the strength of user-generated passwords, providing real-time feedback to users as they create or update their passwords. By visually indicating the complexity level, users are guided toward crafting stronger passwords that meet modern security standards.
|
||||
|
||||
|
||||
|
||||
You can check the [Password Complexity Indicator Angular documentation](https://docs.abp.io/en/commercial/7.4/ui/angular/password-complexity-indicator-component) to learn more.
|
||||
|
||||
> **Note**: Currently, this feature is only available for the Angular UI, but we will be implemented for other UIs in the next version.
|
||||
|
||||
## Community News
|
||||
|
||||
### DevNot Developer Summit 2023
|
||||
|
||||
|
||||
|
||||
We are thrilled to announce that the co-founder of [Volosoft](https://volosoft.com/) and Lead Developer of the ABP Framework, Halil Ibrahim Kalkan will give a speech about "Building a Kubernetes Integrated Local Development Environment" in the [Developer Summit 2023 event](https://summit.devnot.com/) on the 7th of October.
|
||||
|
||||
### New ABP Community Posts
|
||||
|
||||
There are exciting articles contributed by the ABP community as always. I will highlight some of them here:
|
||||
|
||||
* [ABP Commercial - GDPR Module Overview](https://community.abp.io/posts/abp-commercial-gdpr-module-overview-kvmsm3ku) by [Engincan Veske](https://twitter.com/EngincanVeske)
|
||||
* [Video: ABP Framework Data Transfer Objects](https://community.abp.io/videos/abp-framework-data-transfer-objects-qwebfqz5) by [Hamza Albreem](https://github.com/braim23)
|
||||
* [Video: ABP Framework Essentials: MongoDB](https://community.abp.io/videos/abp-framework-essentials-mongodb-gwlblh5x) by [Hamza Albreem](https://github.com/braim23)
|
||||
* [ABP Modules and Entity Dependencies](https://community.abp.io/posts/abp-modules-and-entity-dependencies-hn7wr093) by [Jack Fistelmann](https://github.com/nebula2)
|
||||
* [How to add dark mode support to the Basic Theme in 3 steps?](https://community.abp.io/posts/how-to-add-dark-mode-support-to-the-basic-theme-in-3-steps-ge9c0f85) by [Enis Necipoğlu](https://twitter.com/EnisNecipoglu)
|
||||
* [Deploying docker image to Azure with yml and bicep through Github Actions](https://community.abp.io/posts/deploying-docker-image-to-azure-with-yml-and-bicep-through-github-actions-cjiuh55m) by [Sturla](https://community.abp.io/members/Sturla)
|
||||
|
||||
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://community.abp.io/articles/submit) to the ABP Community.
|
||||
|
||||
## Conclusion
|
||||
|
||||
This version comes with some new features and a lot of enhancements to the existing features. You can see the [Road Map](https://docs.abp.io/en/abp/7.4/Road-Map) documentation to learn about the release schedule and planned features for the next releases. Please try ABP v7.4 RC and provide feedback to help us release a more stable version.
|
||||
|
||||
Thanks for being a part of this community!
|
||||
|
After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 176 KiB |
|
After Width: | Height: | Size: 233 KiB |
|
After Width: | Height: | Size: 85 KiB |
|
After Width: | Height: | Size: 259 KiB |
|
After Width: | Height: | Size: 52 KiB |
|
After Width: | Height: | Size: 310 KiB |
|
After Width: | Height: | Size: 83 KiB |
|
After Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 27 KiB |
|
After Width: | Height: | Size: 55 KiB |
|
After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 52 KiB |
@ -0,0 +1,450 @@
|
||||
# Cascading Option Loading with Extensions System in ABP Angular
|
||||
|
||||
This article will show how to load cascading options with an extensions system in ABP Angular. For this example, we'll simulate renting a book process. Besides our default form properties, we'll contribute `Name` property to our `Rent Form Modal` in the Books module. This property will be loaded after `Genre` is selected.
|
||||
|
||||
> Before starting this article, I suggest you read the [ABP Angular Dynamic Form Extensions](https://docs.abp.io/en/abp/latest/UI/Angular/Dynamic-Form-Extensions)
|
||||
|
||||
### Environment
|
||||
|
||||
- **ABP Framework Version:** ~7.3.0 (`~` means that use the latest patch version of the specified release)
|
||||
- **DB Provider:** MongoDB
|
||||
- **Angular Version:** ~16.0.0
|
||||
|
||||
### Project structure
|
||||
|
||||
The books module is not a library; for this demo, it'll placed in the application itself.
|
||||
|
||||
|
||||
|
||||
- **books folder:** Contains default form properties, tokens, models, etc. It's similar to the ABP module structure.
|
||||
- Also I've used **standalone** and **signals** feature in this demo.
|
||||
- **books-extended folder:** Contains only `Name` property for the contribute `Rent Form Modal` inside the Books module.
|
||||
- **For more readability, I've used TS path aliases in this demo. Don't forget to export files in `index.ts` file 🙂**
|
||||
|
||||
|
||||
|
||||
### First look at the demo
|
||||
|
||||
|
||||
|
||||
### What is the Extension system?
|
||||
|
||||
|
||||
|
||||
# Reviewing the code step by step
|
||||
|
||||
**1. Create default form properties for `Rent Form` in the `Books` module**
|
||||
|
||||
- `getInjected` function is the key point of the cascading loading
|
||||
- We can reach and track any value from `Service` or `Component`
|
||||
- In that way we can load options according to the selected value
|
||||
|
||||
```ts
|
||||
// ~/books/defaults/default-books-form.props.ts
|
||||
|
||||
import { Validators } from "@angular/forms";
|
||||
import { map, of } from "rxjs";
|
||||
import { ePropType, FormProp } from "@abp/ng.theme.shared/extensions";
|
||||
import { BookDto, AuthorService, BooksService } from "../proxy";
|
||||
import { RentBookComponent } from "../components";
|
||||
import { DefaultOption } from "../utils";
|
||||
|
||||
const { required } = Validators;
|
||||
|
||||
export const DEFAULT_RENT_FORM_PROPS = FormProp.createMany<BookDto>([
|
||||
{
|
||||
type: ePropType.String,
|
||||
id: "authorId",
|
||||
name: "authorId",
|
||||
displayName: "BookStore::Author",
|
||||
defaultValue: null,
|
||||
validators: () => [required],
|
||||
options: (data) => {
|
||||
const { authors } = data.getInjected(AuthorService);
|
||||
|
||||
return of([
|
||||
DefaultOption,
|
||||
...authors().map((author) => ({ value: author.id, key: author.name })),
|
||||
]);
|
||||
},
|
||||
},
|
||||
{
|
||||
type: ePropType.String,
|
||||
id: "genreId",
|
||||
name: "genreId",
|
||||
displayName: "BookStore::Genre",
|
||||
defaultValue: null,
|
||||
validators: () => [required],
|
||||
options: (data) => {
|
||||
const rentBookComponent = data.getInjected(RentBookComponent);
|
||||
const { genres } = data.getInjected(BooksService);
|
||||
|
||||
const genreOptions = genres().map(({ id, name }) => ({
|
||||
value: id,
|
||||
key: name,
|
||||
}));
|
||||
|
||||
return rentBookComponent.form.controls.authorId.valueChanges.pipe(
|
||||
map((value: string | undefined) =>
|
||||
value ? [DefaultOption, ...genreOptions] : [DefaultOption]
|
||||
)
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
type: ePropType.Date,
|
||||
id: "returnDate",
|
||||
name: "returnDate",
|
||||
displayName: "BookStore::ReturnDate",
|
||||
defaultValue: null,
|
||||
validators: () => [required],
|
||||
},
|
||||
]);
|
||||
```
|
||||
|
||||
**2. Configure tokens and config options**
|
||||
|
||||
The documentation explains these steps; that's why I won't explain it again. If documents or samples are not enough, please let me know in the comments 🙂
|
||||
|
||||
**Extensions Token**
|
||||
|
||||
```ts
|
||||
// ~/books/tokens/extensions.token.ts
|
||||
|
||||
import { CreateFormPropContributorCallback } from "@abp/ng.theme.shared/extensions";
|
||||
import { InjectionToken } from "@angular/core";
|
||||
import { BookDto } from "../proxy";
|
||||
import { eBooksComponents } from "../enums";
|
||||
import { DEFAULT_RENT_FORM_PROPS } from "../defaults";
|
||||
|
||||
export const DEFAULT_BOOK_STORE_CREATE_FORM_PROPS = {
|
||||
[eBooksComponents.RentBook]: DEFAULT_RENT_FORM_PROPS,
|
||||
};
|
||||
|
||||
export const BOOK_STORE_RENT_FORM_PROP_CONTRIBUTORS =
|
||||
new InjectionToken<CreateFormPropContributors>(
|
||||
"BOOK_STORE_RENT_FORM_PROP_CONTRIBUTORS"
|
||||
);
|
||||
|
||||
type CreateFormPropContributors = Partial<{
|
||||
[eBooksComponents.RentBook]: CreateFormPropContributorCallback<BookDto>[];
|
||||
/**
|
||||
* Other creation form prop contributors...
|
||||
*/
|
||||
// [eBooksComponents.CreateBook]: CreateFormPropContributorCallback<BookDto>[];
|
||||
}>;
|
||||
```
|
||||
|
||||
**Extensions Config Option**
|
||||
|
||||
```ts
|
||||
// ~/books/models/config-options.ts
|
||||
|
||||
import { CreateFormPropContributorCallback } from "@abp/ng.theme.shared/extensions";
|
||||
import { BookDto } from "../proxy";
|
||||
import { eBooksComponents } from "../enums";
|
||||
|
||||
export type BookStoreRentFormPropContributors = Partial<{
|
||||
[eBooksComponents.RentBook]: CreateFormPropContributorCallback<BookDto>[];
|
||||
}>;
|
||||
|
||||
export interface BooksConfigOptions {
|
||||
rentFormPropContributors?: BookStoreRentFormPropContributors;
|
||||
}
|
||||
```
|
||||
|
||||
**3. Extensions Guard**
|
||||
|
||||
It'll to collect all contributors from [ExtensionsService](https://github.com/abpframework/abp/blob/dev/npm/ng-packs/packages/theme-shared/extensions/src/lib/services/extensions.service.ts)
|
||||
|
||||
```ts
|
||||
// ~/books/guards/extensions.guard.ts
|
||||
|
||||
import { Injectable, inject } from "@angular/core";
|
||||
import { Observable, map, tap } from "rxjs";
|
||||
import { ConfigStateService, IAbpGuard } from "@abp/ng.core";
|
||||
import {
|
||||
ExtensionsService,
|
||||
getObjectExtensionEntitiesFromStore,
|
||||
mapEntitiesToContributors,
|
||||
mergeWithDefaultProps,
|
||||
} from "@abp/ng.theme.shared/extensions";
|
||||
import {
|
||||
BOOK_STORE_RENT_FORM_PROP_CONTRIBUTORS,
|
||||
DEFAULT_BOOK_STORE_CREATE_FORM_PROPS,
|
||||
} from "../tokens";
|
||||
|
||||
@Injectable()
|
||||
export class BooksExtensionsGuard implements IAbpGuard {
|
||||
protected readonly configState = inject(ConfigStateService);
|
||||
protected readonly extensions = inject(ExtensionsService);
|
||||
|
||||
canActivate(): Observable<boolean> {
|
||||
const createFormContributors =
|
||||
inject(BOOK_STORE_RENT_FORM_PROP_CONTRIBUTORS, { optional: true }) || {};
|
||||
|
||||
return getObjectExtensionEntitiesFromStore(
|
||||
this.configState,
|
||||
"BookStore"
|
||||
).pipe(
|
||||
mapEntitiesToContributors(this.configState, "BookStore"),
|
||||
tap((objectExtensionContributors) => {
|
||||
mergeWithDefaultProps(
|
||||
this.extensions.createFormProps,
|
||||
DEFAULT_BOOK_STORE_CREATE_FORM_PROPS,
|
||||
objectExtensionContributors.createForm,
|
||||
createFormContributors
|
||||
);
|
||||
}),
|
||||
map(() => true)
|
||||
);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Yes, I'm still using class-based guard 🙂 much more flexible...
|
||||
|
||||
**4. RentBookComponent**
|
||||
|
||||
- Our trackable variable is defined here `(form:FormGroup)`, which means We'll track this variable in `options` property at defaults || contributors files.
|
||||
- Providing `AuthorService`, also `EXTENSIONS_IDENTIFIER` for the reach dynamic properties
|
||||
|
||||
```ts
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
EventEmitter,
|
||||
Injector,
|
||||
Output,
|
||||
inject,
|
||||
} from "@angular/core";
|
||||
import { FormGroup } from "@angular/forms";
|
||||
import { CoreModule, uuid } from "@abp/ng.core";
|
||||
import { ThemeSharedModule } from "@abp/ng.theme.shared";
|
||||
import {
|
||||
EXTENSIONS_IDENTIFIER,
|
||||
FormPropData,
|
||||
UiExtensionsModule,
|
||||
generateFormFromProps,
|
||||
} from "@abp/ng.theme.shared/extensions";
|
||||
import { AuthorService, BookDto, BooksService } from "../../proxy";
|
||||
import { eBooksComponents } from "../../enums";
|
||||
|
||||
@Component({
|
||||
standalone: true,
|
||||
selector: "app-rent-book",
|
||||
templateUrl: "./rent-book.component.html",
|
||||
imports: [CoreModule, UiExtensionsModule, ThemeSharedModule],
|
||||
providers: [
|
||||
{
|
||||
provide: EXTENSIONS_IDENTIFIER,
|
||||
useValue: eBooksComponents.RentBook,
|
||||
},
|
||||
AuthorService,
|
||||
],
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class RentBookComponent {
|
||||
protected readonly injector = inject(Injector);
|
||||
protected readonly authorService = inject(AuthorService);
|
||||
protected readonly booksService = inject(BooksService);
|
||||
|
||||
//#region Just for demo
|
||||
readonly #authors = this.authorService.authors();
|
||||
readonly #genres = this.booksService.genres();
|
||||
readonly #books = this.booksService.books();
|
||||
//#endregion
|
||||
|
||||
protected modalVisible = true;
|
||||
@Output() modalVisibleChange = new EventEmitter<boolean>();
|
||||
|
||||
selected: BookDto;
|
||||
form: FormGroup;
|
||||
modalBusy = false;
|
||||
|
||||
protected buildForm(): void {
|
||||
const data = new FormPropData(this.injector, this.selected);
|
||||
this.form = generateFormFromProps(data);
|
||||
}
|
||||
|
||||
constructor() {
|
||||
this.buildForm();
|
||||
}
|
||||
|
||||
save(): void {
|
||||
if (this.form.invalid) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.modalBusy = true;
|
||||
|
||||
const { authorId, genreId, bookId, returnDate } = this.form.value;
|
||||
|
||||
//#region Just for demo
|
||||
const authorName = this.#authors.find(({ id }) => id === authorId).name;
|
||||
const genreName = this.#genres.find(({ id }) => id === genreId).name;
|
||||
const bookName = this.#books.find(({ id }) => id === bookId).name;
|
||||
//#endregion
|
||||
|
||||
this.booksService.rentedBooks.update((books) => [
|
||||
{
|
||||
id: uuid(),
|
||||
name: bookName,
|
||||
author: authorName,
|
||||
genre: genreName,
|
||||
returnDate,
|
||||
},
|
||||
...books,
|
||||
]);
|
||||
|
||||
this.modalBusy = false;
|
||||
this.modalVisible = false;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
```html
|
||||
<abp-modal
|
||||
[visible]="modalVisible"
|
||||
[busy]="modalBusy"
|
||||
(visibleChange)="modalVisibleChange.next($event)"
|
||||
>
|
||||
<ng-template #abpHeader>
|
||||
<h3>{{ 'BookStore::RentABook' | abpLocalization }}</h3>
|
||||
</ng-template>
|
||||
|
||||
<ng-template #abpBody>
|
||||
<ng-template #loaderRef>
|
||||
<div class="text-center">
|
||||
<i class="fa fa-pulse fa-spinner" aria-hidden="true"></i>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<form
|
||||
*ngIf="form; else loaderRef"
|
||||
[formGroup]="form"
|
||||
(ngSubmit)="save()"
|
||||
validateOnSubmit
|
||||
>
|
||||
<abp-extensible-form [selectedRecord]="selected"></abp-extensible-form>
|
||||
</form>
|
||||
</ng-template>
|
||||
|
||||
<ng-template #abpFooter>
|
||||
<button abpClose type="button" class="btn btn-secondary">
|
||||
{{ 'AbpIdentity::Cancel' | abpLocalization }}
|
||||
</button>
|
||||
<abp-button
|
||||
iconClass="fa fa-check"
|
||||
[disabled]="form?.invalid"
|
||||
(click)="save()"
|
||||
>
|
||||
{{ 'AbpIdentity::Save' | abpLocalization }}
|
||||
</abp-button>
|
||||
</ng-template>
|
||||
</abp-modal>
|
||||
```
|
||||
|
||||
Up to now, we have constructed our module's default form properties.
|
||||
|
||||
- As you can see, there are no book names we'll add them via contributors
|
||||
|
||||
|
||||
|
||||
## Next, add new property dynamically (book name list as dropdown)
|
||||
|
||||
- Created new folder ./src/app/books-extended
|
||||
- Create contributors/form-prop.contributors.ts
|
||||
|
||||
```ts
|
||||
// ~/books-extened/contributors/form-prop.contributors.ts
|
||||
|
||||
import { Validators } from "@angular/forms";
|
||||
import { map } from "rxjs";
|
||||
import {
|
||||
ePropType,
|
||||
FormProp,
|
||||
FormPropList,
|
||||
} from "@abp/ng.theme.shared/extensions";
|
||||
import {
|
||||
BookDto,
|
||||
BookStoreRentFormPropContributors,
|
||||
BooksService,
|
||||
DefaultOption,
|
||||
RentBookComponent,
|
||||
eBooksComponents,
|
||||
} from "@book-store/books";
|
||||
|
||||
const { required, maxLength } = Validators;
|
||||
|
||||
const bookIdProp = new FormProp<BookDto>({
|
||||
type: ePropType.String,
|
||||
id: "bookId",
|
||||
name: "bookId",
|
||||
displayName: "BookStore::Name",
|
||||
options: (data) => {
|
||||
const rentBook = data.getInjected(RentBookComponent);
|
||||
const { books } = data.getInjected(BooksService);
|
||||
const bookOptions = books().map(({ id, name }) => ({
|
||||
value: id,
|
||||
key: name,
|
||||
}));
|
||||
|
||||
return rentBook.form.controls.genreId.valueChanges.pipe(
|
||||
map((value: string | undefined) =>
|
||||
value ? [DefaultOption, ...bookOptions] : [DefaultOption]
|
||||
)
|
||||
);
|
||||
},
|
||||
validators: () => [required, maxLength(255)],
|
||||
});
|
||||
|
||||
export function bookIdPropContributor(propList: FormPropList<BookDto>) {
|
||||
propList.addByIndex(bookIdProp, 2);
|
||||
}
|
||||
|
||||
export const bookStoreRentFormPropContributors: BookStoreRentFormPropContributors =
|
||||
{
|
||||
[eBooksComponents.RentBook]: [bookIdPropContributor],
|
||||
};
|
||||
```
|
||||
|
||||
- Load new contributions via routing & forLazy method
|
||||
|
||||
```ts
|
||||
// ~/app-routing.module.ts
|
||||
import { bookStoreRentFormPropContributors } from "./books-extended/contributors/form-prop.contributors";
|
||||
|
||||
const routes: Routes = [
|
||||
// other routes...
|
||||
{
|
||||
path: "books",
|
||||
loadChildren: () =>
|
||||
import("@book-store/books").then((m) =>
|
||||
m.BooksModule.forLazy({
|
||||
rentFormPropContributors: bookStoreRentFormPropContributors,
|
||||
})
|
||||
),
|
||||
},
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forRoot(routes, {})],
|
||||
exports: [RouterModule],
|
||||
})
|
||||
export class AppRoutingModule {}
|
||||
```
|
||||
|
||||
Finally, we've added a new property to our module, and it'll be loaded after `Genre` is selected.
|
||||
|
||||
## Conclusion
|
||||
|
||||
|
||||
|
||||
- In ABP Angular, we can create form properties and load dropdown options dynamically via the Extensions System
|
||||
- We can reach and track any value from `Service` or `Component`
|
||||
- We can create our custom library or module and contribute it to any module in the application
|
||||
|
||||
Thanks for reading, I hope it was helpful. If you have any questions, please let me know in the comments section. 👋👋
|
||||
|
||||
> You can find the source code of this article on [Github](https://github.com/abpframework/abp-samples/tree/master/AngularCascadingOptionLoading/Volo.BookStore)
|
||||
|
After Width: | Height: | Size: 8.5 MiB |
|
After Width: | Height: | Size: 57 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 58 KiB |
@ -0,0 +1,236 @@
|
||||
# Moving Background Job Execution To A Separate Application
|
||||
|
||||
In this article, I will show you how to move the background job execution to a separate application.
|
||||
|
||||
Here are some benefits of doing this:
|
||||
|
||||
* If your background jobs consume high system resources (CPU, RAM or Disk), then you can deploy that background application to a dedicated server so it won't affect your application's performance.
|
||||
* You can scale your background job application independently from your web application. For example, you can deploy multiple instances of your background job application to a Kubernetes cluster and scale it easily.
|
||||
|
||||
Here are some disadvantages of doing this:
|
||||
|
||||
* You need to deploy and maintain at least two applications instead of one.
|
||||
* You need to implement a mechanism to share the common code between your applications. For example, you can create a shared project and add it to your applications as a project reference.
|
||||
|
||||
## Source code
|
||||
|
||||
You can find the source code of the application at [abpframework/abp-samples](https://github.com/abpframework/abp-samples/tree/master/SeparateBackgroundJob).
|
||||
|
||||
You can check the PR to see the changes step by step: [abpframework/abp-samples#250](https://github.com/abpframework/abp-samples/pull/250)
|
||||
|
||||
## Creating the Web Application
|
||||
|
||||
First, we need to create a new web application using the ABP CLI:
|
||||
|
||||
```bash
|
||||
abp new SeparateBackgroundJob -t app
|
||||
```
|
||||
|
||||
* Create a shared project named `SeparateBackgroundJob.Common.Shared` to share the `BackgroundJob` and `BackgroundJobArgs` classes between the web and job executor applications.
|
||||
* Install the `Volo.Abp.BackgroundJobs.Abstractions` package to the `SeparateBackgroundJob.Common.Shared` project.
|
||||
|
||||
Add the `SeparateBackgroundJobCommonSharedModule` class to the `SeparateBackgroundJob.Common.Shared` project:
|
||||
|
||||
```csharp
|
||||
[DependsOn(typeof(AbpBackgroundJobsAbstractionsModule))]
|
||||
public class SeparateBackgroundJobCommonSharedModule : AbpModule
|
||||
{
|
||||
}
|
||||
```
|
||||
|
||||
Add the `MyReportJob` and `MyReportJobArgs` classes to the `SeparateBackgroundJob.Common.Shared` project:
|
||||
|
||||
```csharp
|
||||
public class MyReportJob : AsyncBackgroundJob<MyReportJobArgs>, ITransientDependency
|
||||
{
|
||||
public override Task ExecuteAsync(MyReportJobArgs args)
|
||||
{
|
||||
Logger.LogInformation("Executing MyReportJob with args: {0}", args.Content);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
public class MyReportJobArgs
|
||||
{
|
||||
public string? Content { get; set; }
|
||||
}
|
||||
```
|
||||
|
||||
Add the `SeparateBackgroundJob.Common.Shared` project reference to the `SeparateBackgroundJob.Domain` project and add `SeparateBackgroundJobCommonSharedModule` to the `DependsOn` attribute of the `SeparateBackgroundJobDomainModule` class:
|
||||
|
||||
```csharp
|
||||
[DependsOn(
|
||||
typeof(SeparateBackgroundJobDomainSharedModule),
|
||||
typeof(AbpAuditLoggingDomainModule),
|
||||
typeof(AbpBackgroundJobsDomainModule),
|
||||
typeof(AbpFeatureManagementDomainModule),
|
||||
typeof(AbpIdentityDomainModule),
|
||||
typeof(AbpOpenIddictDomainModule),
|
||||
typeof(AbpPermissionManagementDomainOpenIddictModule),
|
||||
typeof(AbpPermissionManagementDomainIdentityModule),
|
||||
typeof(AbpSettingManagementDomainModule),
|
||||
typeof(AbpTenantManagementDomainModule),
|
||||
typeof(AbpEmailingModule),
|
||||
typeof(SeparateBackgroundJobCommonSharedModule) //Add this line
|
||||
)]
|
||||
public class SeparateBackgroundJobDomainModule : AbpModule
|
||||
```
|
||||
|
||||
Open the `Index.cshtml` and replace the content with the following code:
|
||||
|
||||
```csharp
|
||||
@page
|
||||
@using Microsoft.AspNetCore.Mvc.Localization
|
||||
@using SeparateBackgroundJob.Localization
|
||||
@using Volo.Abp.Users
|
||||
@model SeparateBackgroundJob.Web.Pages.IndexModel
|
||||
@inject IHtmlLocalizer<SeparateBackgroundJobResource> L
|
||||
@inject ICurrentUser CurrentUser
|
||||
|
||||
@section styles {
|
||||
<abp-style src="/Pages/Index.css"/>
|
||||
}
|
||||
|
||||
@section scripts {
|
||||
<abp-script src="/Pages/Index.js"/>
|
||||
}
|
||||
|
||||
<div class="container">
|
||||
<abp-card>
|
||||
<abp-card-header>
|
||||
<abp-card-title>
|
||||
Add NEW BACKGROUND JOB
|
||||
</abp-card-title>
|
||||
</abp-card-header>
|
||||
<abp-card-body>
|
||||
<form id="NewItemForm" method="post" class="row row-cols-lg-auto g-3 align-items-center">
|
||||
<div class="col-12">
|
||||
<div class="input-group">
|
||||
<input id="ReportContent" required name="ReportContent" type="text" class="form-control" placeholder="enter text...">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary">Add</button>
|
||||
</div>
|
||||
</form>
|
||||
</abp-card-body>
|
||||
</abp-card>
|
||||
</div>
|
||||
```
|
||||
|
||||
Open the `Index.cshtml.cs` and replace the content with the following code:
|
||||
|
||||
```csharp
|
||||
public class IndexModel : SeparateBackgroundJobPageModel
|
||||
{
|
||||
private readonly IBackgroundJobManager _backgroundJobManager;
|
||||
|
||||
[BindProperty(SupportsGet = true)]
|
||||
public string? ReportContent { get; set; }
|
||||
|
||||
public IndexModel(IBackgroundJobManager backgroundJobManager)
|
||||
{
|
||||
_backgroundJobManager = backgroundJobManager;
|
||||
}
|
||||
|
||||
public void OnGet()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public async Task OnPostAsync()
|
||||
{
|
||||
await _backgroundJobManager.EnqueueAsync(new MyReportJobArgs
|
||||
{
|
||||
Content = ReportContent
|
||||
});
|
||||
|
||||
Alerts.Success("Job is queued!");
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Run the application and navigate to the home page. You should see the following page:
|
||||
|
||||
|
||||
|
||||
When you enter some text and click the **Add** button, the job will be queued and executed in the web application:
|
||||
|
||||
## Creating the Console Application
|
||||
|
||||
Now we split the background job execution to a separate console application.
|
||||
|
||||
Open the `SeparateBackgroundJobWebModule` class to disable the background job execution in the web application:
|
||||
|
||||
```csharp
|
||||
public class SeparateBackgroundJobWebModule : AbpModule
|
||||
{
|
||||
....
|
||||
|
||||
public override void ConfigureServices(ServiceConfigurationContext context)
|
||||
{
|
||||
...
|
||||
|
||||
//Disable background job execution in the web application
|
||||
Configure<AbpBackgroundJobOptions>(options =>
|
||||
{
|
||||
options.IsJobExecutionEnabled = false;
|
||||
});
|
||||
}
|
||||
|
||||
...
|
||||
}
|
||||
```
|
||||
|
||||
* Create a new console application using the ABP CLI:
|
||||
|
||||
```bash
|
||||
abp new BackgroundJobExecutor -t console
|
||||
```
|
||||
|
||||
* Add the `BackgroundJobExecutor` project to the solution of the web application.
|
||||
* Add the `SeparateBackgroundJob.Common.Shared` project reference to the `BackgroundJobExecutor` project.
|
||||
* Install the `Volo.Abp.BackgroundJobs.EntityFrameworkCore` and `Volo.Abp.EntityFrameworkCore.SqlServer` packages to the `BackgroundJobExecutor` project.
|
||||
|
||||
Update the `BackgroundJobExecutorModule` class as follows:
|
||||
|
||||
```csharp
|
||||
[DependsOn(
|
||||
typeof(AbpAutofacModule),
|
||||
typeof(AbpBackgroundJobsEntityFrameworkCoreModule),
|
||||
typeof(AbpEntityFrameworkCoreSqlServerModule),
|
||||
typeof(SeparateBackgroundJobCommonSharedModule)
|
||||
)]
|
||||
public class BackgroundJobExecutorModule : AbpModule
|
||||
{
|
||||
public override void ConfigureServices(ServiceConfigurationContext context)
|
||||
{
|
||||
Configure<AbpDbContextOptions>(options =>
|
||||
{
|
||||
options.UseSqlServer();
|
||||
});
|
||||
}
|
||||
|
||||
....
|
||||
}
|
||||
```
|
||||
|
||||
Open the `appsettings.json` file to configure the [connection string](https://docs.abp.io/en/abp/latest/Connection-Strings#configure-the-connection-strings):
|
||||
|
||||
```json
|
||||
{
|
||||
"ConnectionStrings": {
|
||||
"AbpBackgroundJobs": "Server=(LocalDb)\\MSSQLLocalDB;Database=SeparateBackgroundJob;Trusted_Connection=True"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
> You must use the same connection string for the web application, `AbpBackgroundJobs` is the default connection string name for the background job module.
|
||||
|
||||
The solution structure should look like this:
|
||||
|
||||
|
||||
|
||||
Now, run the web and console application. When you enter some text and click the **Add** button, the job will be queued and executed in the console application:
|
||||
|
||||
|
||||
|
After Width: | Height: | Size: 140 KiB |
|
After Width: | Height: | Size: 376 KiB |
|
After Width: | Height: | Size: 102 KiB |
@ -0,0 +1,12 @@
|
||||
using System.Collections.Generic;
|
||||
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
|
||||
|
||||
namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Zxcvbn;
|
||||
|
||||
public class ZxcvbnScriptContributor : BundleContributor
|
||||
{
|
||||
public override void ConfigureBundle(BundleConfigurationContext context)
|
||||
{
|
||||
context.Files.AddIfNotContains("/libs/zxcvbn/zxcvbn.js");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using Microsoft.AspNetCore.Mvc.Testing;
|
||||
using Microsoft.AspNetCore.Routing;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace Volo.Abp.AspNetCore.TestBase;
|
||||
|
||||
public abstract class AbpWebApplicationFactoryIntegratedTest<TProgram> : WebApplicationFactory<TProgram>
|
||||
where TProgram : class
|
||||
{
|
||||
protected HttpClient Client { get; set; }
|
||||
|
||||
protected IServiceProvider ServiceProvider => Services;
|
||||
|
||||
protected AbpWebApplicationFactoryIntegratedTest()
|
||||
{
|
||||
Client = CreateClient(new WebApplicationFactoryClientOptions
|
||||
{
|
||||
AllowAutoRedirect = false
|
||||
});
|
||||
ServiceProvider.GetRequiredService<ITestServerAccessor>().Server = Server;
|
||||
}
|
||||
|
||||
protected override IHost CreateHost(IHostBuilder builder)
|
||||
{
|
||||
builder
|
||||
.AddAppSettingsSecretsJson()
|
||||
.ConfigureServices(ConfigureServices);
|
||||
return base.CreateHost(builder);
|
||||
}
|
||||
|
||||
protected virtual T? GetService<T>()
|
||||
{
|
||||
return Services.GetService<T>();
|
||||
}
|
||||
|
||||
protected virtual T GetRequiredService<T>() where T : notnull
|
||||
{
|
||||
return Services.GetRequiredService<T>();
|
||||
}
|
||||
|
||||
protected virtual void ConfigureServices(IServiceCollection services)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
#region GetUrl
|
||||
|
||||
/// <summary>
|
||||
/// Gets default URL for given controller type.
|
||||
/// </summary>
|
||||
/// <typeparam name="TController">The type of the controller.</typeparam>
|
||||
protected virtual string GetUrl<TController>()
|
||||
{
|
||||
return "/" + typeof(TController).Name.RemovePostFix("Controller", "AppService", "ApplicationService", "IntService", "IntegrationService", "Service");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets default URL for given controller type's given action.
|
||||
/// </summary>
|
||||
/// <typeparam name="TController">The type of the controller.</typeparam>
|
||||
protected virtual string GetUrl<TController>(string actionName)
|
||||
{
|
||||
return GetUrl<TController>() + "/" + actionName;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets default URL for given controller type's given action with query string parameters (as anonymous object).
|
||||
/// </summary>
|
||||
/// <typeparam name="TController">The type of the controller.</typeparam>
|
||||
protected virtual string GetUrl<TController>(string actionName, object queryStringParamsAsAnonymousObject)
|
||||
{
|
||||
var url = GetUrl<TController>(actionName);
|
||||
|
||||
var dictionary = new RouteValueDictionary(queryStringParamsAsAnonymousObject);
|
||||
if (dictionary.Any())
|
||||
{
|
||||
url += "?" + dictionary.Select(d => $"{d.Key}={d.Value}").JoinAsString("&");
|
||||
}
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Volo.Abp.Modularity;
|
||||
|
||||
namespace Volo.Abp.AspNetCore.TestBase;
|
||||
|
||||
public static class WebApplicationBuilderExtensions
|
||||
{
|
||||
public async static Task RunAbpModuleAsync<TModule>(this WebApplicationBuilder builder, Action<AbpApplicationCreationOptions>? optionsAction = null)
|
||||
where TModule : IAbpModule
|
||||
{
|
||||
var assemblyName = typeof(TModule).Assembly.GetName()?.Name;
|
||||
if (!assemblyName.IsNullOrWhiteSpace())
|
||||
{
|
||||
// Set the application name as the assembly name of the module will automatically add assembly to the ApplicationParts of MVC application.
|
||||
builder.Environment.ApplicationName = assemblyName!;
|
||||
}
|
||||
builder.Host.UseAutofac();
|
||||
await builder.AddApplicationAsync<TModule>(optionsAction);
|
||||
var app = builder.Build();
|
||||
await app.InitializeApplicationAsync();
|
||||
await app.RunAsync();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Volo.Abp.Cli.ProjectBuilding.Building;
|
||||
|
||||
namespace Volo.Abp.Cli.ProjectBuilding.Templates;
|
||||
|
||||
public class CheckRedisPreRequirements : ProjectBuildPipelineStep
|
||||
{
|
||||
public override void Execute(ProjectBuildContext context)
|
||||
{
|
||||
var modules = context.Files.Where(f => f.Name.EndsWith("Module.cs", StringComparison.OrdinalIgnoreCase));
|
||||
if (modules.Any(module => module.Content.Contains("Redis:Configuration")))
|
||||
{
|
||||
context.BuildArgs.ExtraProperties["PreRequirements:Redis"] = "true";
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using JetBrains.Annotations;
|
||||
using Volo.Abp.Domain.Repositories;
|
||||
|
||||
namespace Volo.Abp.Domain.ChangeTracking;
|
||||
|
||||
public static class ChangeTrackingHelper
|
||||
{
|
||||
public static bool IsEntityChangeTrackingType(TypeInfo implementationType)
|
||||
{
|
||||
return HasEntityChangeTrackingAttribute(implementationType) || AnyMethodHasEntityChangeTrackingAttribute(implementationType);
|
||||
}
|
||||
|
||||
public static bool IsEntityChangeTrackingMethod([NotNull] MethodInfo methodInfo, out EntityChangeTrackingAttribute? entityChangeTrackingAttribute)
|
||||
{
|
||||
Check.NotNull(methodInfo, nameof(methodInfo));
|
||||
|
||||
//Method declaration
|
||||
var attrs = methodInfo.GetCustomAttributes(true).OfType<EntityChangeTrackingAttribute>().ToArray();
|
||||
if (attrs.Any())
|
||||
{
|
||||
entityChangeTrackingAttribute = attrs.First();
|
||||
return true;
|
||||
}
|
||||
|
||||
if (methodInfo.DeclaringType != null)
|
||||
{
|
||||
//Class declaration
|
||||
attrs = methodInfo.DeclaringType.GetTypeInfo().GetCustomAttributes(true).OfType<EntityChangeTrackingAttribute>().ToArray();
|
||||
if (attrs.Any())
|
||||
{
|
||||
entityChangeTrackingAttribute = attrs.First();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
entityChangeTrackingAttribute = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool AnyMethodHasEntityChangeTrackingAttribute(TypeInfo implementationType)
|
||||
{
|
||||
return implementationType
|
||||
.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
|
||||
.Any(HasEntityChangeTrackingAttribute);
|
||||
}
|
||||
|
||||
private static bool HasEntityChangeTrackingAttribute(MemberInfo memberInfo)
|
||||
{
|
||||
return memberInfo.IsDefined(typeof(EntityChangeTrackingAttribute), true);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
using System.Threading.Tasks;
|
||||
using Volo.Abp.DependencyInjection;
|
||||
using Volo.Abp.Domain.Repositories;
|
||||
using Volo.Abp.DynamicProxy;
|
||||
|
||||
namespace Volo.Abp.Domain.ChangeTracking;
|
||||
|
||||
public class ChangeTrackingInterceptor : AbpInterceptor, ITransientDependency
|
||||
{
|
||||
private readonly IEntityChangeTrackingProvider _entityChangeTrackingProvider;
|
||||
|
||||
public ChangeTrackingInterceptor(IEntityChangeTrackingProvider entityChangeTrackingProvider)
|
||||
{
|
||||
_entityChangeTrackingProvider = entityChangeTrackingProvider;
|
||||
}
|
||||
|
||||
public async override Task InterceptAsync(IAbpMethodInvocation invocation)
|
||||
{
|
||||
if (!ChangeTrackingHelper.IsEntityChangeTrackingMethod(invocation.Method, out var changeTrackingAttribute))
|
||||
{
|
||||
await invocation.ProceedAsync();
|
||||
return;
|
||||
}
|
||||
|
||||
using (_entityChangeTrackingProvider.Change(changeTrackingAttribute?.IsEnabled))
|
||||
{
|
||||
await invocation.ProceedAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue