- ...widgets
-
-````
-
-`data-widget-filter` attribute relates the form with the widgets. Whenever the form is submitted, all the widgets are automatically refreshed with the form fields as the filter.
-
-Instead of the `data-widget-filter` attribute, you can use the `filterForm` parameter of the `WidgetManager` constructor. Example:
-
-````js
-var myWidgetManager = new abp.WidgetManager({
- wrapper: '#MyDashboardWidgetsArea',
- filterForm: '#MyDashboardFilterForm'
-});
-````
-
-##### Filter Callback
-
-You may want to have a better control to provide filters while initializing and refreshing the widgets. In this case, you can use the `filterCallback` option:
-
-````js
-var myWidgetManager = new abp.WidgetManager({
- wrapper: '#MyDashboardWidgetsArea',
- filterCallback: function() {
- return $('#MyDashboardFilterForm').serializeFormToObject();
- }
-});
-````
-
-This example shows the default implementation of the `filterCallback`. You can return any JavaScript object with fields. Example:
-
-````js
-filterCallback: function() {
- return {
- 'startDate': $('#StartDateInput').val(),
- 'endDate': $('#EndDateInput').val()
- };
-}
-````
-
-The returning filters are passed to all widgets on `init` and `refresh`.
-
-### Widget JavaScript API
-
-A widget can define a JavaScript API that is invoked by the `WidgetManager` when needed. The code sample below can be used to start to define an API for a widget.
-
-````js
-(function () {
- abp.widgets.NewUserStatisticWidget = function ($wrapper) {
-
- var getFilters = function () {
- return {
- ...
- };
- }
-
- var refresh = function (filters) {
- ...
- };
-
- var init = function (filters) {
- ...
- };
-
- return {
- getFilters: getFilters,
- init: init,
- refresh: refresh
- };
- };
-})();
-````
-
-`NewUserStatisticWidget` is the name of the widget here. It should match the widget name defined in the server side. All of the functions are optional.
-
-#### getFilters
-
-If the widget has internal custom filters, this function should return the filter object. Example:
-
-````js
-var getFilters = function() {
- return {
- frequency: $wrapper.find('.frequency-filter option:selected').val()
- };
-}
-````
-
-This method is used by the `WidgetManager` while building filters.
-
-#### init
-
-Used to initialize the widget when needed. It has a filter argument that can be used while getting data from server. `init` method is used when `WidgetManager.init()` function is called. It is also called if your widget requires a full re-load on refresh. See the `RefreshUrl` widget option.
-
-#### refresh
-
-Used to refresh the widget when needed. It has a filter argument that can be used while getting data from server. `refresh` method is used whenever `WidgetManager.refresh()` function is called.
-
-## Authorization
-
-Some widgets may need to be available only for authenticated or authorized users. In this case, use the following properties of the `Widget` attribute:
-
-* `RequiresAuthentication` (`bool`): Set to true to make this widget usable only for authentication users (user have logged in to the application).
-* `RequiredPolicies` (`List{%{{{ '::Key' | abpLocalization }}}%}
+ +{%{{{ 'MyProjectName::Key' | abpLocalization }}}%}
+``` + +## Using the Localization Pipe + +You can use the `abpLocalization` pipe to get localized text as in this example: + +```html +{%{{{ 'Resource::Key' | abpLocalization }}}%}
+``` + +The pipe will replace the key with the localized text. + +You can also specify a default value as shown below: + +```html +{%{{{ { key: 'Resource::Key', defaultValue: 'Default Value' } | abpLocalization }}}%}
+``` + +To use interpolation, you must give the values for interpolation as pipe parameters, for example: + +Localization data is stored in key-value pairs: + +```js +{ + //... + AbpAccount: { // AbpAccount is the resource name + Key: "Value", + PagerInfo: "Showing {0} to {1} of {2} entries" + } +} +``` + +So we can use this key like this: + +```html +{%{{{ 'AbpAccount::PagerInfo' | abpLocalization:'20':'30':'50' }}}%}
+ + +``` + +### Using the Localization Service + +First of all you should import the `LocalizationService` from **@abp/ng.core** + +```js +import { LocalizationService } from '@abp/ng.core'; + +class MyClass { + constructor(private localizationService: LocalizationService) {} +} +``` + +After that, you are able to use localization service. + +> You can add interpolation parameters as arguments to `instant()` and `get()` methods. + +```js +this.localizationService.instant('AbpIdentity::UserDeletionConfirmation', 'John'); + +// with fallback value +this.localizationService.instant( + { key: 'AbpIdentity::UserDeletionConfirmation', defaultValue: 'Default Value' }, + 'John', +); + +// Output +// User 'John' will be deleted. Do you confirm that? +``` + +To get a localized text as [_Observable_](https://rxjs.dev/guide/observable) use `get` method instead of `instant`: + +```js +this.localizationService.get('Resource::Key'); + +// with fallback value +this.localizationService.get({ key: 'Resource::Key', defaultValue: 'Default Value' }); +``` + +### Using the Config State + +In order to you `getLocalization` method you should import ConfigState. + +```js +import { ConfigState } from '@abp/ng.core'; +``` + +Then you can use it as followed: + +```js +this.store.selectSnapshot(ConfigState.getLocalization('ResourceName::Key')); +``` + +`getLocalization` method can be used with both `localization key` and [`LocalizationWithDefault`](https://github.com/abpframework/abp/blob/dev/npm/ng-packs/packages/core/src/lib/models/config.ts#L34) interface. + +```js +this.store.selectSnapshot( + ConfigState.getLocalization( + { + key: 'AbpIdentity::UserDeletionConfirmation', + defaultValue: 'Default Value', + }, + 'John', + ), +); +``` + +Localization resources are stored in the `localization` property of `ConfigState`. + + +## See Also + +* [Localization in ASP.NET Core](../../Localization.md) \ No newline at end of file diff --git a/docs/en/UI/Angular/Permission-Management.md b/docs/en/UI/Angular/Permission-Management.md new file mode 100644 index 0000000000..6e5c5d7155 --- /dev/null +++ b/docs/en/UI/Angular/Permission-Management.md @@ -0,0 +1,79 @@ +# Permission Management + +A permission is a simple policy that is granted or prohibited for a particular user, role or client. You can read more about [authorization in ABP](../../Authorization.md) document. + +You can get permission of authenticated user using `getGrantedPolicy` selector of `ConfigState`. + +You can get permission as boolean value from store: + +```js +import { Store } from '@ngxs/store'; +import { ConfigState } from '../states'; + +export class YourComponent { + constructor(private store: Store) {} + + ngOnInit(): void { + const canCreate = this.store.selectSnapshot(ConfigState.getGrantedPolicy('AbpIdentity.Roles.Create')); + } + + // ... +} +``` + +Or you can get it via `ConfigStateService`: + +```js +import { ConfigStateService } from '../services/config-state.service'; + +export class YourComponent { + constructor(private configStateService: ConfigStateService) {} + + ngOnInit(): void { + const canCreate = this.configStateService.getGrantedPolicy('AbpIdentity.Roles.Create'); + } + + // ... +} +``` + +## Permission Directive + +You can use the `PermissionDirective` to manage visibility of a DOM Element accordingly to user's permission. + +```html +
+ This content is only visible if the user has 'AbpIdentity.Roles' permission.
+
+```
+
+As shown above you can remove elements from DOM with `abpPermission` structural directive.
+
+The directive can also be used as an attribute directive but we recommend to you to use it as a structural directive.
+
+## Permission Guard
+
+You can use `PermissionGuard` if you want to control authenticated user's permission to access to the route during navigation.
+
+Add `requiredPolicy` to the `routes` property in your routing module.
+
+```js
+const routes: Routes = [
+ {
+ path: 'path',
+ component: YourComponent,
+ canActivate: [PermissionGuard],
+ data: {
+ routes: {
+ requiredPolicy: 'AbpIdentity.Roles.Create',
+ },
+ },
+ },
+];
+```
+
+Granted Policies are stored in the `auth` property of `ConfigState`.
+
+## What's Next?
+
+* [Component Replacement](./Component-Replacement.md)
\ No newline at end of file
diff --git a/docs/en/UI/Angular/images/component-replacement.gif b/docs/en/UI/Angular/images/component-replacement.gif
new file mode 100644
index 0000000000..3a88500e53
Binary files /dev/null and b/docs/en/UI/Angular/images/component-replacement.gif differ
diff --git a/docs/en/UI/Angular/images/custom-settings.png b/docs/en/UI/Angular/images/custom-settings.png
new file mode 100644
index 0000000000..05dd3f695a
Binary files /dev/null and b/docs/en/UI/Angular/images/custom-settings.png differ
diff --git a/docs/en/UI/AspNetCore/Bundling-Minification.md b/docs/en/UI/AspNetCore/Bundling-Minification.md
new file mode 100644
index 0000000000..5af3f177d5
--- /dev/null
+++ b/docs/en/UI/AspNetCore/Bundling-Minification.md
@@ -0,0 +1,352 @@
+
+# ASP.NET Core MVC Bundling & Minification
+
+There are many ways of bundling & minification of client side resources (JavaScript and CSS files). Most common ways are:
+
+* Using the [Bundler & Minifier](https://marketplace.visualstudio.com/items?itemName=MadsKristensen.BundlerMinifier) Visual Studio extension or the [NuGet package](https://www.nuget.org/packages/BuildBundlerMinifier/).
+* Using [Gulp](https://gulpjs.com/)/[Grunt](https://gruntjs.com/) task managers and their plugins.
+
+ABP offers a simple, dynamic, powerful, modular and built-in way.
+
+## Volo.Abp.AspNetCore.Mvc.UI.Bundling Package
+
+> This package is already installed by default with the startup templates. So, most of the time, you don't need to install it manually.
+
+Install the `Volo.Abp.AspNetCore.Mvc.UI.Bundling` nuget package to your project:
+
+````
+install-package Volo.Abp.AspNetCore.Mvc.UI.Bundling
+````
+
+Then you can add the `AbpAspNetCoreMvcUiBundlingModule` dependency to your module:
+
+````C#
+using Volo.Abp.Modularity;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace MyCompany.MyProject
+{
+ [DependsOn(typeof(AbpAspNetCoreMvcUiBundlingModule))]
+ public class MyWebModule : AbpModule
+ {
+ //...
+ }
+}
+````
+
+## Razor Bundling Tag Helpers
+
+The simplest way of creating a bundle is to use `abp-script-bundle` or `abp-style-bundle` tag helpers. Example:
+
+````html
+
+
+````
+
+Now, you can run the application to see the result:
+
+
+
+If you need, you can also replace [the code behind c# class](https://github.com/abpframework/abp/blob/dev/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/MainNavbarBrandViewComponent.cs) of the component just using the dependency injection system.
+
+### Overriding the Theme
+
+Just as explained above, you can replace any component, layout or c# class of the used theme. See the [theming document](Theming.md) for more information on the theming system.
+
+## Overriding Static Resources
+
+Overriding a static embedded resource (like JavaScript, Css or image files) of a module is pretty easy. Just place a file in the same path in your solution and let the Virtual File System to handle it.
+
+## Manipulating the Bundles
+
+The [Bundling & Minification](Bundling-Minification.md) system provides an **extensible and dynamic** system to create **script** and **style** bundles. It allows you to extend and manipulate the existing bundles.
+
+### Example: Add a Global CSS File
+
+For example, ABP Framework defines a **global style bundle** which is added to every page (actually, added to the layout by the themes). Let's add a **custom style file** to the end of the bundle files, so we can override any global style.
+
+First, create a CSS file and locate it in a folder inside the `wwwroot`:
+
+
+
+Define some custom CSS rules inside the file. Example:
+
+````css
+.card-title {
+ color: orange;
+ font-size: 2em;
+ text-decoration: underline;
+}
+
+.btn-primary {
+ background-color: red;
+}
+````
+
+Then add this file to the standard global style bundle in the `ConfigureServices` method of your [module](../../Module-Development-Basics.md):
+
+````csharp
+Configure
+
+
+````
+
+Now, we can create a class implementing the `IToolbarContributor` interface:
+
+````csharp
+public class MyToolbarContributor : IToolbarContributor
+{
+ public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
+ {
+ if (context.Toolbar.Name == StandardToolbars.Main)
+ {
+ context.Toolbar.Items
+ .Insert(0, new ToolbarItem(typeof(NotificationViewComponent)));
+ }
+
+ return Task.CompletedTask;
+ }
+}
+````
+
+This class adds the `NotificationViewComponent` as the first item in the `Main` toolbar.
+
+Finally, you need to add this contributor to the `AbpToolbarOptions`, in the `ConfigureServices` of your module:
+
+````csharp
+Configure
+ ...widgets
+
+````
+
+`data-widget-filter` attribute relates the form with the widgets. Whenever the form is submitted, all the widgets are automatically refreshed with the form fields as the filter.
+
+Instead of the `data-widget-filter` attribute, you can use the `filterForm` parameter of the `WidgetManager` constructor. Example:
+
+````js
+var myWidgetManager = new abp.WidgetManager({
+ wrapper: '#MyDashboardWidgetsArea',
+ filterForm: '#MyDashboardFilterForm'
+});
+````
+
+##### Filter Callback
+
+You may want to have a better control to provide filters while initializing and refreshing the widgets. In this case, you can use the `filterCallback` option:
+
+````js
+var myWidgetManager = new abp.WidgetManager({
+ wrapper: '#MyDashboardWidgetsArea',
+ filterCallback: function() {
+ return $('#MyDashboardFilterForm').serializeFormToObject();
+ }
+});
+````
+
+This example shows the default implementation of the `filterCallback`. You can return any JavaScript object with fields. Example:
+
+````js
+filterCallback: function() {
+ return {
+ 'startDate': $('#StartDateInput').val(),
+ 'endDate': $('#EndDateInput').val()
+ };
+}
+````
+
+The returning filters are passed to all widgets on `init` and `refresh`.
+
+### Widget JavaScript API
+
+A widget can define a JavaScript API that is invoked by the `WidgetManager` when needed. The code sample below can be used to start to define an API for a widget.
+
+````js
+(function () {
+ abp.widgets.NewUserStatisticWidget = function ($wrapper) {
+
+ var getFilters = function () {
+ return {
+ ...
+ };
+ }
+
+ var refresh = function (filters) {
+ ...
+ };
+
+ var init = function (filters) {
+ ...
+ };
+
+ return {
+ getFilters: getFilters,
+ init: init,
+ refresh: refresh
+ };
+ };
+})();
+````
+
+`NewUserStatisticWidget` is the name of the widget here. It should match the widget name defined in the server side. All of the functions are optional.
+
+#### getFilters
+
+If the widget has internal custom filters, this function should return the filter object. Example:
+
+````js
+var getFilters = function() {
+ return {
+ frequency: $wrapper.find('.frequency-filter option:selected').val()
+ };
+}
+````
+
+This method is used by the `WidgetManager` while building filters.
+
+#### init
+
+Used to initialize the widget when needed. It has a filter argument that can be used while getting data from server. `init` method is used when `WidgetManager.init()` function is called. It is also called if your widget requires a full re-load on refresh. See the `RefreshUrl` widget option.
+
+#### refresh
+
+Used to refresh the widget when needed. It has a filter argument that can be used while getting data from server. `refresh` method is used whenever `WidgetManager.refresh()` function is called.
+
+## Authorization
+
+Some widgets may need to be available only for authenticated or authorized users. In this case, use the following properties of the `Widget` attribute:
+
+* `RequiresAuthentication` (`bool`): Set to true to make this widget usable only for authentication users (user have logged in to the application).
+* `RequiredPolicies` (`List
-
-
- ())
@RenderBody()
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/Default.cshtml
index ea379156a4..39b079f802 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/Default.cshtml
@@ -26,15 +26,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/Default.cshtml
index b37c877f34..d40637735c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/Default.cshtml
@@ -2,7 +2,7 @@
- 
+ 
Card Title
Some quick example text to build on the card title and make up the bulk of the card's content.
@@ -46,7 +46,7 @@
-
+
Card Title Some quick example text to build on the card title and make up the bulk of the card's content.
@@ -97,6 +97,155 @@
+
+
+
+
+
+ Quote
+
+
+
+
+
+
+ Featured
+
+ Special title treatment
+ With supporting text below as a natural lead-in to additional content.
+ Go somewhere
+
+ 2 days ago
+
+
+
+
+
+
+ Special title treatment
+ With supporting text below as a natural lead-in to additional content.
+ Go somewhere
+
+
+
+
+ Special title treatment
+ With supporting text below as a natural lead-in to additional content.
+ Go somewhere
+
+
+
+
+ Special title treatment
+ With supporting text below as a natural lead-in to additional content.
+ Go somewhere
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+ Header
+
+ Primary card title
+ Some quick example text to build on the card title and make up the bulk of the card's content.
+
+
+
+
+ Header
+
+ Secondary card title
+ Some quick example text to build on the card title and make up the bulk of the card's content.
+
+
+
+
+ Header
+
+ Success card title
+ Some quick example text to build on the card title and make up the bulk of the card's content.
+
+
+
+
+ Header
+
+ Danger card title
+ Some quick example text to build on the card title and make up the bulk of the card's content.
+
+
+
+
+ Header
+
+ Warning card title
+ Some quick example text to build on the card title and make up the bulk of the card's content.
+
+
+
+
+ Header
+
+ Info card title
+ Some quick example text to build on the card title and make up the bulk of the card's content.
+
+
+
+
+ Header
+
+ Light card title
+ Some quick example text to build on the card title and make up the bulk of the card's content.
+
+
+
+
+ Header
+
+ Dark card title
+ Some quick example text to build on the card title and make up the bulk of the card's content.
+
+
+
+
Featured
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/Default.cshtml
index f21d4fc3c7..1a9587b600 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/Default.cshtml
@@ -10,9 +10,6 @@
Something else here
-
-
-
@@ -21,9 +18,6 @@
Something else here
-
-
-
@@ -47,9 +41,6 @@
Separated link
-
-
-
@@ -59,7 +50,8 @@
Separated link
-
+
+
Action
@@ -68,7 +60,8 @@
Separated link
-
+
+
Action
@@ -77,7 +70,8 @@
Separated link
-
+
+
Action
@@ -89,6 +83,7 @@
+
Another action
Something else here
-
+
+
Action
Another action
Something else here
-
+
+
Action
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs
index 63b411f1a2..3681eda627 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs
@@ -6,7 +6,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
[Widget]
public class DynamicFormsDemoViewComponent : AbpViewComponent
{
- public const string ViewPath = "/Views/Components/Themes/Shared/Demos/DynamicForms/Default.cshtml";
+ public const string ViewPath = "/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/Default.cshtml";
public IViewComponentResult Invoke()
{
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs
index ef1f509e02..01c477ecb1 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs
@@ -6,7 +6,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
[Widget]
public class FormElementsDemoViewComponent : AbpViewComponent
{
- public const string ViewPath = "/Views/Components/Themes/Shared/Demos/FormElements/Default.cshtml";
+ public const string ViewPath = "/Views/Components/Themes/Shared/Demos/FormElementsDemo/Default.cshtml";
public IViewComponentResult Invoke()
{
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/Default.cshtml
index ff11769976..69dfbd24c4 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/Default.cshtml
@@ -18,7 +18,7 @@
-
+
Cras justo odio
Dapibus ac facilisis in
@@ -27,12 +27,12 @@
-
+
- Cras justo odio
- Dapibus ac facilisis in
- Morbi leo risus
- Vestibulum at eros
+ Cras justo odio
+ Dapibus ac facilisis in
+ Morbi leo risus
+ Vestibulum at eros
@@ -59,7 +59,7 @@
-
+
Cras justo odio
A simple Primary list group item
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/Default.cshtml
new file mode 100644
index 0000000000..f0c5113054
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/Default.cshtml
@@ -0,0 +1,71 @@
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.NavbarsDemo
+
+
+
+ Navbar
+
+
+
+ Home (current)
+
+
+ Link
+
+
+
+
+ Dropdown header
+ Action
+ Another disabled action
+ Something else here
+ Separated link
+
+
+
+
+ Disabled
+
+
+
+ Sample Text
+
+
+
+
+
+
+
+ Navbar
+
+
+
+ Home (current)
+
+
+ Link
+
+
+
+
+ Dropdown header
+ Action
+ Another disabled action
+ Something else here
+ Separated link
+
+
+
+
+ Disabled
+
+
+
+ Sample Text
+
+
+
+
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs
new file mode 100644
index 0000000000..e282f1b923
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.NavbarsDemo
+{
+ [Widget]
+ public class NavbarsDemoViewComponent : AbpViewComponent
+ {
+ public const string ViewPath = "/Views/Components/Themes/Shared/Demos/NavbarsDemo/Default.cshtml";
+
+ public IViewComponentResult Invoke()
+ {
+ return View(ViewPath);
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/Default.cshtml
index 033fefa45b..1423aea2b6 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/Default.cshtml
@@ -8,6 +8,16 @@
Longer nav link
+
+
+
+ Action
+ Another action
+ Something else here
+
+
+
link
@@ -17,37 +27,104 @@
-
-
- Navbar
-
-
-
- Home (current)
-
-
- Link
-
-
-
-
- Dropdown header
- Action
- Another disabled action
- Something else here
- Separated link
-
-
-
-
- Disabled
-
-
-
- Sample Text
-
-
-
+
+
+
+ Active
+
+
+ Longer nav link
+
+
+
+
+ Action
+ Another action
+ Something else here
+
+
+
+
+ link
+
+
+ disabled
+
+
+
+
+ Active
+
+
+ Longer nav link
+
+
+
+
+ Action
+ Another action
+ Something else here
+
+
+
+
+ link
+
+
+ disabled
+
+
+
+
+ Active
+
+
+ Longer nav link
+
+
+
+
+ Action
+ Another action
+ Something else here
+
+
+
+
+ link
+
+
+ disabled
+
+
+
+
+
+
+ Active
+
+
+ Longer nav link
+
+
+
+
+ Action
+ Another action
+ Something else here
+
+
+
+
+ link
+
+
+ disabled
+
+
+
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/Default.cshtml
index 8e171cb640..1efee90533 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/Default.cshtml
@@ -1,16 +1,16 @@
@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.PopoversDemo
-
+
Popover Default
-
+
Popover With Title
-
+
Dismissible Popover
-
+
Disabled Popover
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Microsoft/AspNetCore/Http/AbpFormFileExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Microsoft/AspNetCore/Http/AbpFormFileExtensions.cs
index c808250a3e..31768b5e6a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Microsoft/AspNetCore/Http/AbpFormFileExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Microsoft/AspNetCore/Http/AbpFormFileExtensions.cs
@@ -1,4 +1,5 @@
using System.IO;
+using System.Threading.Tasks;
namespace Microsoft.AspNetCore.Http
{
@@ -11,5 +12,13 @@ namespace Microsoft.AspNetCore.Http
return stream.GetAllBytes();
}
}
+
+ public static async Task GetAllBytesAsync(this IFormFile file)
+ {
+ using (var stream = file.OpenReadStream())
+ {
+ return await stream.GetAllBytesAsync();
+ }
+ }
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
index 06ce49551b..21a675ddc4 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
@@ -43,21 +43,6 @@ namespace Volo.Abp.AspNetCore.Mvc
public override void ConfigureServices(ServiceConfigurationContext context)
{
- //Configure Razor
- context.Services.Insert(0,
- ServiceDescriptor.Singleton>(
- new ConfigureOptions(options =>
- {
- options.FileProviders.Add(
- new RazorViewEngineVirtualFileProvider(
- context.Services.GetSingletonInstance>()
- )
- );
- }
- )
- )
- );
-
Configure(options =>
{
options.IgnoredInterfaces.AddIfNotContains(typeof(IAsyncActionFilter));
@@ -101,7 +86,16 @@ namespace Volo.Abp.AspNetCore.Mvc
};
})
.AddViewLocalization(); //TODO: How to configure from the application? Also, consider to move to a UI module since APIs does not care about it.
-
+
+ Configure(options =>
+ {
+ options.FileProviders.Add(
+ new RazorViewEngineVirtualFileProvider(
+ context.Services.GetSingletonInstance>()
+ )
+ );
+ });
+
context.Services.ExecutePreConfiguredActions(mvcBuilder);
//TODO: AddViewLocalization by default..?
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
index 69f75a31b2..4b4cf521c2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
@@ -8,9 +8,11 @@ using System.Globalization;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Volo.Abp.Application.Services;
+using Volo.Abp.AspNetCore.Mvc.MultiTenancy;
using Volo.Abp.Authorization;
using Volo.Abp.Features;
using Volo.Abp.Localization;
+using Volo.Abp.MultiTenancy;
using Volo.Abp.Settings;
using Volo.Abp.Users;
@@ -19,6 +21,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApplicationConfigurationAppService
{
private readonly AbpLocalizationOptions _localizationOptions;
+ private readonly AbpMultiTenancyOptions _multiTenancyOptions;
private readonly IServiceProvider _serviceProvider;
private readonly IAbpAuthorizationPolicyProvider _abpAuthorizationPolicyProvider;
private readonly IAuthorizationService _authorizationService;
@@ -30,6 +33,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
public AbpApplicationConfigurationAppService(
IOptions localizationOptions,
+ IOptions multiTenancyOptions,
IServiceProvider serviceProvider,
IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider,
IAuthorizationService authorizationService,
@@ -48,6 +52,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
_featureDefinitionManager = featureDefinitionManager;
_languageProvider = languageProvider;
_localizationOptions = localizationOptions.Value;
+ _multiTenancyOptions = multiTenancyOptions.Value;
}
public virtual async Task GetAsync()
@@ -60,11 +65,31 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
Features = await GetFeaturesConfigAsync(),
Localization = await GetLocalizationConfigAsync(),
CurrentUser = GetCurrentUser(),
- Setting = await GetSettingConfigAsync()
+ Setting = await GetSettingConfigAsync(),
+ MultiTenancy = GetMultiTenancy(),
+ CurrentTenant = GetCurrentTenant()
};
}
+ protected virtual CurrentTenantDto GetCurrentTenant()
+ {
+ return new CurrentTenantDto()
+ {
+ Id = CurrentTenant.Id,
+ Name = CurrentTenant.Name,
+ IsAvailable = CurrentTenant.IsAvailable
+ };
+ }
+
+ protected virtual MultiTenancyInfoDto GetMultiTenancy()
+ {
+ return new MultiTenancyInfoDto
+ {
+ IsEnabled = _multiTenancyOptions.IsEnabled
+ };
+ }
+
protected virtual CurrentUserDto GetCurrentUser()
{
return new CurrentUserDto
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
index 9875ccd808..0254a6022b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
@@ -12,6 +12,7 @@ using Volo.Abp.Application.Services;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Http;
using Volo.Abp.Http.Modeling;
+using Volo.Abp.Http.ProxyScripting.Generators;
using Volo.Abp.Reflection;
namespace Volo.Abp.AspNetCore.Mvc.Conventions
@@ -81,7 +82,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
continue;
}
- if (!TypeHelper.IsPrimitiveExtended(prm.ParameterInfo.ParameterType))
+ if (!TypeHelper.IsPrimitiveExtended(prm.ParameterInfo.ParameterType, includeEnums: true))
{
if (CanUseFormBodyBinding(action, prm))
{
@@ -94,7 +95,15 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
protected virtual bool CanUseFormBodyBinding(ActionModel action, ParameterModel parameter)
{
- if (_options.ConventionalControllers.FormBodyBindingIgnoredTypes.Any(t => t.IsAssignableFrom(parameter.ParameterInfo.ParameterType)))
+ //We want to use "id" as path parameter, not body!
+ if (parameter.ParameterName == "id")
+ {
+ return false;
+ }
+
+ if (_options.ConventionalControllers
+ .FormBodyBindingIgnoredTypes
+ .Any(t => t.IsAssignableFrom(parameter.ParameterInfo.ParameterType)))
{
return false;
}
@@ -251,7 +260,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
if (!selector.ActionConstraints.OfType().Any())
{
- selector.ActionConstraints.Add(new HttpMethodActionConstraint(new[] {httpMethod}));
+ selector.ActionConstraints.Add(new HttpMethodActionConstraint(new[] { httpMethod }));
}
}
}
@@ -295,9 +304,24 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
var url = $"api/{rootPath}/{controllerNameInUrl.ToCamelCase()}";
//Add {id} path if needed
- if (action.Parameters.Any(p => p.ParameterName == "id"))
+ var idParameterModel = action.Parameters.FirstOrDefault(p => p.ParameterName == "id");
+ if (idParameterModel != null)
{
- url += "/{id}";
+ if (TypeHelper.IsPrimitiveExtended(idParameterModel.ParameterType, includeEnums: true))
+ {
+ url += "/{id}";
+ }
+ else
+ {
+ var properties = idParameterModel
+ .ParameterType
+ .GetProperties(BindingFlags.Instance | BindingFlags.Public);
+
+ foreach (var property in properties)
+ {
+ url += "/{" + property.Name + "}";
+ }
+ }
}
//Add action name if needed
@@ -341,7 +365,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
protected virtual string NormalizeUrlControllerName(string rootPath, string controllerName, ActionModel action, string httpMethod, [CanBeNull] ConventionalControllerSetting configuration)
{
- if(configuration?.UrlControllerNameNormalizer == null)
+ if (configuration?.UrlControllerNameNormalizer == null)
{
return controllerName;
}
@@ -364,7 +388,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
protected virtual bool IsEmptySelector(SelectorModel selector)
{
- return selector.AttributeRouteModel == null
+ return selector.AttributeRouteModel == null
&& selector.ActionConstraints.IsNullOrEmpty()
&& selector.EndpointMetadata.IsNullOrEmpty();
}
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 1ce71ca3f9..3326c4e65f 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs
@@ -1,5 +1,7 @@
+using System;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
@@ -11,14 +13,34 @@ namespace Volo.Abp.BackgroundWorkers
public abstract class BackgroundWorkerBase : IBackgroundWorker
{
//TODO: Add UOW, Localization and other useful properties..?
+ public IServiceProvider ServiceProvider { get; set; }
+ protected readonly object ServiceProviderLock = new object();
- public ILogger Logger { protected get; set; }
+ protected TService LazyGetRequiredService(ref TService reference)
+ => LazyGetRequiredService(typeof(TService), ref reference);
- protected BackgroundWorkerBase()
+ protected TRef LazyGetRequiredService(Type serviceType, ref TRef reference)
{
- Logger = NullLogger.Instance;
+ if (reference == null)
+ {
+ lock (ServiceProviderLock)
+ {
+ if (reference == null)
+ {
+ reference = (TRef)ServiceProvider.GetRequiredService(serviceType);
+ }
+ }
+ }
+
+ return reference;
}
-
+
+ public ILoggerFactory LoggerFactory => LazyGetRequiredService(ref _loggerFactory);
+ private ILoggerFactory _loggerFactory;
+
+ protected ILogger Logger => _lazyLogger.Value;
+ private Lazy _lazyLogger => new Lazy(() => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance, true);
+
public virtual Task StartAsync(CancellationToken cancellationToken = default)
{
Logger.LogDebug("Started background worker: " + ToString());
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs
new file mode 100644
index 0000000000..ccb3beac5d
--- /dev/null
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs
@@ -0,0 +1,38 @@
+using System;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Volo.Abp.BackgroundWorkers
+{
+ public static class BackgroundWorkersApplicationInitializationContextExtensions
+ {
+ public static ApplicationInitializationContext AddBackgroundWorker([NotNull] this ApplicationInitializationContext context)
+ where TWorker : IBackgroundWorker
+ {
+ Check.NotNull(context, nameof(context));
+
+ context.AddBackgroundWorker(typeof(TWorker));
+
+ return context;
+ }
+
+ public static ApplicationInitializationContext AddBackgroundWorker([NotNull] this ApplicationInitializationContext context, [NotNull] Type workerType)
+ {
+ Check.NotNull(context, nameof(context));
+ Check.NotNull(workerType, nameof(workerType));
+
+ if (!workerType.IsAssignableTo())
+ {
+ throw new AbpException($"Given type ({workerType.AssemblyQualifiedName}) must implement the {typeof(IBackgroundWorker).AssemblyQualifiedName} interface, but it doesn't!");
+ }
+
+ context.ServiceProvider
+ .GetRequiredService()
+ .Add(
+ (IBackgroundWorker)context.ServiceProvider.GetRequiredService(workerType)
+ );
+
+ return context;
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
index 34bf95fdf1..63fb4f8eee 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
@@ -30,6 +30,8 @@ namespace Volo.Abp.Cli
options.Commands["login"] = typeof(LoginCommand);
options.Commands["logout"] = typeof(LogoutCommand);
options.Commands["suite"] = typeof(SuiteCommand);
+ options.Commands["switch-to-preview"] = typeof(SwitchNightlyPreviewCommand);
+ options.Commands["switch-to-stable"] = typeof(SwitchStableCommand);
});
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
index f25a4ad89f..04b9168a44 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
@@ -162,6 +162,7 @@ namespace Volo.Abp.Cli.Commands
sb.AppendLine("");
sb.AppendLine("-t|--template (default: app)");
sb.AppendLine("-u|--ui (if supported by the template)");
+ sb.AppendLine("-m|--mobile (if supported by the template)");
sb.AppendLine("-d|--database-provider (if supported by the template)");
sb.AppendLine("-o|--output-folder (default: current folder)");
sb.AppendLine("-v|--version (default: latest version)");
@@ -177,6 +178,8 @@ namespace Volo.Abp.Cli.Commands
sb.AppendLine(" abp new Acme.BookStore --tiered");
sb.AppendLine(" abp new Acme.BookStore -u angular");
sb.AppendLine(" abp new Acme.BookStore -u angular -d mongodb");
+ sb.AppendLine(" abp new Acme.BookStore -m none");
+ sb.AppendLine(" abp new Acme.BookStore -m react-native");
sb.AppendLine(" abp new Acme.BookStore -d mongodb");
sb.AppendLine(" abp new Acme.BookStore -d mongodb -o d:\\my-project");
sb.AppendLine(" abp new Acme.BookStore -t module");
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchNightlyPreviewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchNightlyPreviewCommand.cs
new file mode 100644
index 0000000000..883ac4db2f
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchNightlyPreviewCommand.cs
@@ -0,0 +1,44 @@
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.ProjectModification;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Commands
+{
+ public class SwitchNightlyPreviewCommand : IConsoleCommand, ITransientDependency
+ {
+ private readonly PackageSourceSwitcher _packageSourceSwitcher;
+
+ public SwitchNightlyPreviewCommand(PackageSourceSwitcher packageSourceSwitcher)
+ {
+ _packageSourceSwitcher = packageSourceSwitcher;
+ }
+
+ public async Task ExecuteAsync(CommandLineArgs commandLineArgs)
+ {
+ await _packageSourceSwitcher.SwitchToPreview(commandLineArgs);
+ }
+
+ public string GetUsageInfo()
+ {
+ var sb = new StringBuilder();
+
+ sb.AppendLine("");
+ sb.AppendLine("Usage:");
+ sb.AppendLine(" abp switch-to-preview [options]");
+ sb.AppendLine("");
+ sb.AppendLine("Options:");
+ sb.AppendLine("-sd|--solution-directory");
+ sb.AppendLine("");
+ sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+
+ return sb.ToString();
+ }
+
+ public string GetShortDescription()
+ {
+ return "Switches packages to nightly preview ABP version.";
+ }
+ }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchStableCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchStableCommand.cs
new file mode 100644
index 0000000000..54db7bc082
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchStableCommand.cs
@@ -0,0 +1,44 @@
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.ProjectModification;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Commands
+{
+ public class SwitchStableCommand : IConsoleCommand, ITransientDependency
+ {
+ private readonly PackageSourceSwitcher _packageSourceSwitcher;
+
+ public SwitchStableCommand(PackageSourceSwitcher packageSourceSwitcher)
+ {
+ _packageSourceSwitcher = packageSourceSwitcher;
+ }
+
+ public async Task ExecuteAsync(CommandLineArgs commandLineArgs)
+ {
+ await _packageSourceSwitcher.SwitchToStable(commandLineArgs);
+ }
+
+ public string GetUsageInfo()
+ {
+ var sb = new StringBuilder();
+
+ sb.AppendLine("");
+ sb.AppendLine("Usage:");
+ sb.AppendLine(" abp switch-to-stable [options]");
+ sb.AppendLine("");
+ sb.AppendLine("Options:");
+ sb.AppendLine("-sd|--solution-directory");
+ sb.AppendLine("");
+ sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+
+ return sb.ToString();
+ }
+
+ public string GetShortDescription()
+ {
+ return "Switches packages to stable ABP version from preview version.";
+ }
+ }
+}
\ No newline at end of file
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 d201790c94..c44f77b749 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
@@ -42,13 +42,13 @@ namespace Volo.Abp.Cli.Commands
if (updateNpm || !updateNuget)
{
- UpdateNpmPackages(directory);
+ await UpdateNpmPackages(directory);
}
}
- private void UpdateNpmPackages(string directory)
+ private async Task UpdateNpmPackages(string directory)
{
- _npmPackagesUpdater.Update(directory);
+ await _npmPackagesUpdater.Update(directory);
}
private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs, string directory)
@@ -94,7 +94,7 @@ namespace Volo.Abp.Cli.Commands
sb.AppendLine("");
sb.AppendLine("Usage:");
sb.AppendLine("");
- sb.AppendLine(" abp update [options]");
+ sb.AppendLine(" abp update [options]");
sb.AppendLine("");
sb.AppendLine("Options:");
sb.AppendLine("-p|--include-previews (if supported by the template)");
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
index 3cdd658403..0b70ae6cca 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
@@ -95,21 +95,19 @@ namespace Volo.Abp.Cli.NuGet
.OrResult(msg => !msg.IsSuccessStatusCode)
.WaitAndRetryAsync(new[]
{
- TimeSpan.FromSeconds(1),
- TimeSpan.FromSeconds(3),
- TimeSpan.FromSeconds(7)
+ TimeSpan.FromSeconds(1)
},
(responseMessage, timeSpan, retryCount, context) =>
{
if (responseMessage.Exception != null)
{
- Logger.LogWarning(
+ Logger.LogDebug(
$"{retryCount}. HTTP request attempt failed to {url} with an error: HTTP {(int)responseMessage.Result.StatusCode}-{responseMessage.Exception.Message}. " +
$"Waiting {timeSpan.TotalSeconds} secs for the next try...");
}
else if (responseMessage.Result != null)
{
- Logger.LogWarning(
+ Logger.LogDebug(
$"{retryCount}. HTTP request attempt failed to {url} with an error: {(int)responseMessage.Result.StatusCode}-{responseMessage.Result.ReasonPhrase}. " +
$"Waiting {timeSpan.TotalSeconds} secs for the next try...");
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs
index 03504251f5..263b675a2a 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs
@@ -54,19 +54,21 @@ namespace Volo.Abp.Cli.ProjectBuilding
version = latestVersion;
}
+ var nugetVersion = (await GetTemplateNugetVersionAsync(name, type, version)) ?? version;
+
DirectoryHelper.CreateIfNotExists(CliPaths.TemplateCache);
if (!string.IsNullOrWhiteSpace(templateSource) && !IsNetworkSource(templateSource))
{
Logger.LogInformation("Using local " + type + ": " + name + ", version: " + version);
- return new TemplateFile(File.ReadAllBytes(Path.Combine(templateSource, name + "-" + version + ".zip")), version, latestVersion);
+ return new TemplateFile(File.ReadAllBytes(Path.Combine(templateSource, name + "-" + version + ".zip")), version, latestVersion, nugetVersion);
}
var localCacheFile = Path.Combine(CliPaths.TemplateCache, name + "-" + version + ".zip");
if (Options.CacheTemplates && File.Exists(localCacheFile) && templateSource.IsNullOrWhiteSpace())
{
Logger.LogInformation("Using cached " + type + ": " + name + ", version: " + version);
- return new TemplateFile(File.ReadAllBytes(localCacheFile), version, latestVersion);
+ return new TemplateFile(File.ReadAllBytes(localCacheFile), version, latestVersion, nugetVersion);
}
Logger.LogInformation("Downloading " + type + ": " + name + ", version: " + version);
@@ -86,7 +88,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
File.WriteAllBytes(localCacheFile, fileContent);
}
- return new TemplateFile(fileContent, version, latestVersion);
+ return new TemplateFile(fileContent, version, latestVersion, nugetVersion);
}
@@ -110,7 +112,38 @@ namespace Volo.Abp.Cli.ProjectBuilding
var result = await response.Content.ReadAsStringAsync();
- return JsonSerializer.Deserialize(result).Version;
+ return JsonSerializer.Deserialize(result).Version;
+ }
+ }
+
+ private async Task GetTemplateNugetVersionAsync(string name, string type, string version)
+ {
+ try
+ {
+ using (var client = new CliHttpClient(TimeSpan.FromMinutes(10)))
+ {
+ var response = await client.PostAsync(
+ $"{CliUrls.WwwAbpIo}api/download/{type}/get-nuget-version/",
+ new StringContent(
+ JsonSerializer.Serialize(
+ new GetTemplateNugetVersionDto { Name = name, Version = version }
+ ),
+ Encoding.UTF8,
+ MimeTypes.Application.Json
+ ),
+ CancellationTokenProvider.Token
+ );
+
+ await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+
+ var result = await response.Content.ReadAsStringAsync();
+
+ return JsonSerializer.Deserialize(result).Version;
+ }
+ }
+ catch (Exception)
+ {
+ return null;
}
}
@@ -162,7 +195,14 @@ namespace Volo.Abp.Cli.ProjectBuilding
public string Name { get; set; }
}
- public class GetLatestSourceCodeVersionResultDto
+ public class GetTemplateNugetVersionDto
+ {
+ public string Name { get; set; }
+
+ public string Version { get; set; }
+ }
+
+ public class GetVersionResultDto
{
public string Version { get; set; }
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/MobileApp.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/MobileApp.cs
index 1a85471529..97132e8f79 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/MobileApp.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/MobileApp.cs
@@ -17,9 +17,9 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
{
case MobileApp.ReactNative:
return "react-native";
- default:
- return null;
}
+
+ throw new Exception("Mobile app folder name is not set!");
}
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectReferenceReplaceStep.cs
index a7fd3f529f..5aaf4b1488 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectReferenceReplaceStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ProjectReferenceReplaceStep.cs
@@ -29,7 +29,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
}
else
{
- var nugetPackageVersion = context.TemplateFile.Version;
+ var nugetPackageVersion = context.TemplateFile.RepositoryNugetVersion;
if (IsBranchName(nugetPackageVersion))
{
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs
index c7f9e77cb2..fc514e8a74 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs
@@ -6,13 +6,16 @@
public string LatestVersion { get; }
+ public string RepositoryNugetVersion { get; }
+
public byte[] FileBytes { get; }
- public TemplateFile(byte[] fileBytes, string version, string latestVersion)
+ public TemplateFile(byte[] fileBytes, string version, string latestVersion, string repositoryNugetVersion)
{
FileBytes = fileBytes;
Version = version;
LatestVersion = latestVersion;
+ RepositoryNugetVersion = repositoryNugetVersion;
}
}
}
\ No newline at end of file
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 9df2c03ee4..07ada2fe3d 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
@@ -77,7 +77,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
if (context.BuildArgs.MobileApp != MobileApp.ReactNative)
{
- steps.Add(new RemoveFolderStep(MobileApp.ReactNative.GetFolderName()?.EnsureStartsWith('/')));
+ steps.Add(new RemoveFolderStep(MobileApp.ReactNative.GetFolderName().EnsureStartsWith('/')));
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/TemplateRandomSslPortStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/TemplateRandomSslPortStep.cs
index c5f5292e1a..12bc34221a 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/TemplateRandomSslPortStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/TemplateRandomSslPortStep.cs
@@ -137,12 +137,15 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates
{
environment.NormalizeLineEndings();
+ var buildInUrlHttp = buildInUrl.Replace("https://", "http://");
+ var buildInUrlWithoutPortHttp = buildInUrlWithoutPort.Replace("https://", "http://");
+
var environmentLines = environment.GetLines();
for (var i = 0; i < environmentLines.Length; i++)
{
- if (environmentLines[i].Contains(buildInUrl))
+ if (environmentLines[i].Contains(buildInUrlHttp))
{
- environmentLines[i] = environmentLines[i].Replace(buildInUrl, $"{buildInUrlWithoutPort}:{newPort}");
+ environmentLines[i] = environmentLines[i].Replace(buildInUrlHttp, $"{buildInUrlWithoutPortHttp}:{newPort}");
}
}
environment.SetLines(environmentLines);
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularModuleSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularModuleSourceCodeAdder.cs
new file mode 100644
index 0000000000..2d1e237933
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularModuleSourceCodeAdder.cs
@@ -0,0 +1,198 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.ProjectModification
+{
+ public class AngularModuleSourceCodeAdder : ITransientDependency
+ {
+ public async Task AddAsync(string solutionFilePath, string angularPath)
+ {
+ var angularProjectsPath = Path.Combine(angularPath, "projects");
+
+ var projects = await CopyAndGetNamesOfAngularProjectsAsync(solutionFilePath, angularProjectsPath);
+
+ if (!projects.Any())
+ {
+ return;
+ }
+
+ await ReplaceProjectNamesAndCopySourCodeRequirementsToProjectsAsync(angularProjectsPath, projects);
+
+ await RemoveRedundantFilesAsync(angularProjectsPath, projects);
+
+ await AddPathsToTsConfigAsync(angularPath, angularProjectsPath, projects);
+
+ await AddProjectToAngularJsonAsync(angularPath, projects);
+ }
+
+ private async Task AddProjectToAngularJsonAsync(string angularPath, List projects)
+ {
+ var angularJsonFilePath = Path.Combine(angularPath, "angular.json");
+ var fileContent = File.ReadAllText(angularJsonFilePath);
+
+ var json = JObject.Parse(fileContent);
+
+ var projectsJobject = (JObject)json["projects"];
+
+ foreach (var project in projects)
+ {
+ projectsJobject.Add(project, new JObject(
+ new JProperty("projectType", "library"),
+ new JProperty("root", $"projects/{project}"),
+ new JProperty("sourceRoot", $"projects/{project}/src"),
+ new JProperty("prefix", "lib"),
+ new JProperty("architect", new JObject(
+ new JProperty("build", new JObject(
+ new JProperty("builder", "@angular-devkit/build-ng-package:build"),
+ new JProperty("options", new JObject(
+ new JProperty("tsConfig", $"projects/{project}/tsconfig.lib.json"),
+ new JProperty("project", $"projects/{project}/ng-package.json")
+ )),
+ new JProperty("configurations", new JObject(
+ new JProperty("production", new JObject(
+ new JProperty("tsConfig", $"projects/{project}/tsconfig.lib.prod.json")))
+ )))),
+ new JProperty("test", new JObject(
+ new JProperty("builder", "@angular-devkit/build-angular:karma"),
+ new JProperty("options", new JObject(
+ new JProperty("main", $"projects/{project}/src/test.ts"),
+ new JProperty("tsConfig", $"projects/{project}/tsconfig.spec.json"),
+ new JProperty("karmaConfig", $"projects/{project}/karma.conf.js")
+ )
+ ))),
+ new JProperty("lint", new JObject(
+ new JProperty("builder", "@angular-devkit/build-angular:tslint"),
+ new JProperty("options", new JObject(
+ new JProperty("tsConfig", new JArray(new JValue($"projects/{project}/tsconfig.lib.json"), new JValue($"projects/{project}/tsconfig.spec.json"))),
+ new JProperty("exclude", new JArray(new JValue("**/node_modules/**")))
+ ))
+ ))
+ ))
+ ));
+ }
+
+ File.WriteAllText(angularJsonFilePath, json.ToString(Formatting.Indented));
+ }
+
+ private async Task AddPathsToTsConfigAsync(string angularPath, string angularProjectsPath, List projects)
+ {
+ var tsConfigPath = Path.Combine(angularPath, "tsconfig.json");
+ var fileContent = File.ReadAllText(tsConfigPath);
+
+ var tsConfigAsJson = JObject.Parse(fileContent);
+
+ var compilerOptions = (JObject)tsConfigAsJson["compilerOptions"];
+
+ foreach (var project in projects)
+ {
+ var projectPackageName = await GetProjectPackageNameAsync(angularProjectsPath, project);
+
+ var property = new JProperty($"{projectPackageName}",
+ new JArray(new object[] { $"projects/{project}/src/public-api.ts" })
+ );
+ var property2 = new JProperty($"{projectPackageName}/*",
+ new JArray(new object[] { $"projects/{project}/src/lib/*" })
+ );
+
+ if (compilerOptions["paths"] == null)
+ {
+
+ compilerOptions.Add("paths", new JObject());
+ }
+
+ ((JObject)compilerOptions["paths"]).Add(property);
+ ((JObject)compilerOptions["paths"]).Add(property2);
+ }
+
+ File.WriteAllText(tsConfigPath, tsConfigAsJson.ToString(Formatting.Indented));
+ }
+
+ private async Task GetProjectPackageNameAsync(string angularProjectsPath, string project)
+ {
+ var packageJsonPath = Path.Combine(angularProjectsPath, project, "package.json");
+
+ var fileContent = File.ReadAllText(packageJsonPath);
+
+ return (string)JObject.Parse(fileContent)["name"];
+ }
+
+ private async Task RemoveRedundantFilesAsync(string angularProjectsPath, List projects)
+ {
+ foreach (var project in projects)
+ {
+ var jestConfigPath = Path.Combine(angularProjectsPath, project, "jest.config.js");
+
+ File.Delete(jestConfigPath);
+
+ var testPath = Path.Combine(angularProjectsPath, project, "src", "test.ts");
+
+ File.Delete(testPath);
+ }
+ }
+
+ private async Task ReplaceProjectNamesAndCopySourCodeRequirementsToProjectsAsync(string angularProjectsPath, List projects)
+ {
+ foreach (var project in projects)
+ {
+ var sourceCodeReqFolder = Path.Combine(angularProjectsPath, project, "source-code-requirements");
+
+ Directory.CreateDirectory(sourceCodeReqFolder);
+
+ var filesUnderSourceCodeReqFolder = Directory.GetFiles(sourceCodeReqFolder);
+
+ foreach (var fileUnderSourceCodeReqFolder in filesUnderSourceCodeReqFolder)
+ {
+ var newDest = Path.Combine(angularProjectsPath, project, Path.GetFileName(fileUnderSourceCodeReqFolder));
+ File.Move(fileUnderSourceCodeReqFolder, newDest);
+
+ var fileContent = File.ReadAllText(newDest);
+ fileContent = fileContent.Replace("{{project-name}}", project);
+ fileContent = fileContent.Replace("{{library-name-kebab-case}}", project);
+ File.WriteAllText(newDest, fileContent);
+ }
+ }
+ }
+
+ private async Task> CopyAndGetNamesOfAngularProjectsAsync(string solutionFilePath, string angularProjectsPath)
+ {
+ var projects = new List();
+
+ if (!Directory.Exists(angularProjectsPath))
+ {
+ Directory.CreateDirectory(angularProjectsPath);
+ }
+
+ var angularPathsInDownloadedSourceCode = Directory.GetDirectories(Path.Combine(Path.Combine(Path.GetDirectoryName(solutionFilePath), "modules"))).Select(p => Path.Combine(p, "angular"))
+ .Where(Directory.Exists);
+
+
+ foreach (var folder in angularPathsInDownloadedSourceCode)
+ {
+ var projectsInFolder = Directory.GetDirectories(folder);
+ foreach (var projectInFolder in projectsInFolder)
+ {
+ var projectName = Path.GetFileName(projectInFolder.TrimEnd('\\').TrimEnd('/'));
+
+ var destDirName = Path.Combine(angularProjectsPath, projectName);
+ if (Directory.Exists(destDirName))
+ {
+ Directory.Delete(projectInFolder, true);
+ continue;
+ }
+
+
+ projects.Add(projectName);
+
+ Directory.Move(projectInFolder, destDirName);
+ }
+ }
+
+ return projects;
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetApiResponse.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetApiResponse.cs
new file mode 100644
index 0000000000..9a32d8d6fc
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetApiResponse.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Cli.ProjectModification
+{
+ public class MyGetApiResponse
+ {
+ public string _date { get; set; }
+
+ public List
- @MultiTenancyStringLocalizer["Tenant"]
-
- -
- @if (CurrentTenant.Id == null) - { - - @MultiTenancyStringLocalizer["NotSelected"] - - } - else - { - @(CurrentTenant.Name ?? CurrentTenant.Id.Value.ToString()) - } -
-
- @MultiTenancyStringLocalizer["Switch"]
+ (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true))
+ {
+
}
@(await Component.InvokeAsync
+
-
+
+
+ @MultiTenancyStringLocalizer["Tenant"]
+
+
+
+ @if (CurrentTenant.Id == null) + { + + @MultiTenancyStringLocalizer["NotSelected"] + + } + else + { + @(CurrentTenant.Name ?? CurrentTenant.Id.Value.ToString()) + } +
++
+
+
+
+
+
+ Quote
+
+
+
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ +
+
+ Featured
+
+ Special title treatment
+ With supporting text below as a natural lead-in to additional content.
+ Go somewhere
+
+ 2 days ago
+
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ +
+
+