- _claims;
-
- protected override async Task OnInitializedAsync()
- {
- var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
- if (authState.User.Identity.IsAuthenticated)
- {
- _claims = authState.User.Claims;
- }
- }
-}
+
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs
new file mode 100644
index 0000000000..8c5440e747
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+
+namespace MyCompanyName.MyProjectName.Blazor.Pages
+{
+ public partial class Index
+ {
+ private IEnumerable
+
-
-@code
-{
- [Inject] IUiMessageService UiMessageService { get; set; }
-
- private IEnumerable
+
- AlternativeOptionLinkQueries { get; set; } = new List();
+
public bool FullSearchEnabled { get; set; }
private const int MaxDescriptionMetaTagLength = 200;
@@ -441,6 +444,7 @@ namespace Volo.Docs.Pages.Documents.Project
if (_uiOptions.SectionRendering)
{
await SetDocumentPreferencesAsync();
+ SetAlternativeOptionLinksAsync();
SetUserPreferences();
var partialTemplates = await GetDocumentPartialTemplatesAsync();
@@ -617,21 +621,21 @@ namespace Volo.Docs.Pages.Documents.Project
return;
}
- var availableparameters = await _documentSectionRenderer.GetAvailableParametersAsync(Document.Content);
+ var availableParameters = await _documentSectionRenderer.GetAvailableParametersAsync(Document.Content);
DocumentPreferences = new DocumentParametersDto
{
Parameters = new List()
};
- if (availableparameters == null || !availableparameters.Any())
+ if (availableParameters == null || !availableParameters.Any())
{
return;
}
foreach (var parameter in projectParameters.Parameters)
{
- var availableParameter = availableparameters.GetOrDefault(parameter.Name);
+ var availableParameter = availableParameters.GetOrDefault(parameter.Name);
if (availableParameter != null)
{
var newParameter = new DocumentParameterDto
@@ -654,6 +658,48 @@ namespace Volo.Docs.Pages.Documents.Project
}
}
+ private void SetAlternativeOptionLinksAsync()
+ {
+ if (!DocumentPreferences?.Parameters?.Any() ?? true)
+ {
+ return;
+ }
+
+ AlternativeOptionLinkQueries = CollectAlternativeOptionLinksRecursively();
+ }
+
+ private List CollectAlternativeOptionLinksRecursively(int index = 0)
+ {
+ if (index >= DocumentPreferences.Parameters.Count)
+ {
+ return new List();
+ }
+
+ var option = DocumentPreferences.Parameters[index];
+ var queries = new List();
+
+ foreach (var key in option.Values.Keys)
+ {
+ var linkQuery = new StringBuilder($"{option.Name}={key}");
+
+ var restOfQueries = CollectAlternativeOptionLinksRecursively(index + 1);
+
+ if (restOfQueries.Any())
+ {
+ foreach (var restOfQuery in restOfQueries)
+ {
+ queries.Add($"{linkQuery}&{restOfQuery}");
+ }
+ }
+ else
+ {
+ queries.Add($"{linkQuery}");
+ }
+ }
+
+ return queries;
+ }
+
public string GetDescription()
{
if (Document == null || Document.Content.IsNullOrWhiteSpace())
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
index bbb97b041c..a65251a20e 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
@@ -237,119 +237,6 @@
setQueryString();
};
- var initCrawlerLinks = function () {
- var isCrawler = function () {
- var crawlers = [
- 'Google',
- 'Googlebot',
- 'YandexBot',
- 'msnbot',
- 'Rambler',
- 'Yahoo',
- 'AbachoBOT',
- 'accoona',
- 'AcoiRobot',
- 'ASPSeek',
- 'CrocCrawler',
- 'Dumbot',
- 'FAST-WebCrawler',
- 'GeonaBot',
- 'Gigabot',
- 'Lycos',
- 'MSRBOT',
- 'Scooter',
- 'AltaVista',
- 'IDBot',
- 'eStyle',
- 'Scrubby',
- 'Slurp',
- 'DuckDuckBot',
- 'Baiduspider',
- 'VoilaBot',
- 'ExaLead',
- 'Search Dog',
- 'MSN Bot',
- 'BingBot',
- ];
-
- var agent = navigator.userAgent;
-
- for (var i = 0; i < crawlers.length; i++) {
- if (agent.indexOf(crawlers[i]) >= 0) {
- return true;
- }
- }
-
- return false;
- };
-
- if (!isCrawler()) {
- return;
- }
-
- var comboboxes = $('.doc-section-combobox');
-
- if (comboboxes.length <= 0) {
- return;
- }
-
- $('#crawler_link').show();
-
- var html = '';
-
- var currentUrl = window.location.href.toString();
-
- if (currentUrl.indexOf('?') > 0) {
- currentUrl = currentUrl.substring(0, currentUrl.indexOf('?'));
- }
-
- var getQueryStringsFromComboboxes = function (x) {
- if (x >= comboboxes.length) {
- return [];
- }
-
- var key = $(comboboxes[x]).data('key');
-
- var queryStrings = getQueryStringsFromComboboxes(x + 1);
- var returnList = [];
-
- $(comboboxes[x])
- .find('option')
- .each(function () {
- if (queryStrings.length <= 0) {
- returnList.push(key + '=' + $(this).val());
- } else {
- for (var k = 0; k < queryStrings.length; k++) {
- returnList.push(
- key +
- '=' +
- $(this).val() +
- '&' +
- queryStrings[k]
- );
- }
- }
- });
-
- return returnList;
- };
-
- var queryStrings = getQueryStringsFromComboboxes(0);
-
- for (var i = 0; i < queryStrings.length; i++) {
- html +=
- '' +
- queryStrings[i] +
- ' ';
- }
-
- $('#crawler_link').html(html);
- };
-
initNavigationFilter('sidebar-scroll');
initAnchorTags('.docs-page .docs-body');
@@ -357,7 +244,5 @@
initSocialShareLinks();
initSections();
-
- initCrawlerLinks();
});
})(jQuery);
From 9c21446df9dd6f1e339433c67b6aa285051656f5 Mon Sep 17 00:00:00 2001
From: mehmet-erim
Date: Sat, 3 Oct 2020 00:57:16 +0300
Subject: [PATCH 014/108] feat: create LOCALE_ERROR_HANDLER
---
npm/ng-packs/packages/core/src/lib/tokens/index.ts | 1 +
.../src/lib/tokens/locale-error-handler.token.ts | 14 ++++++++++++++
2 files changed, 15 insertions(+)
create mode 100644 npm/ng-packs/packages/core/src/lib/tokens/locale-error-handler.token.ts
diff --git a/npm/ng-packs/packages/core/src/lib/tokens/index.ts b/npm/ng-packs/packages/core/src/lib/tokens/index.ts
index 8d23d581a5..bd798ae448 100644
--- a/npm/ng-packs/packages/core/src/lib/tokens/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/tokens/index.ts
@@ -1,2 +1,3 @@
export * from './list.token';
+export * from './locale-error-handler.token';
export * from './options.token';
diff --git a/npm/ng-packs/packages/core/src/lib/tokens/locale-error-handler.token.ts b/npm/ng-packs/packages/core/src/lib/tokens/locale-error-handler.token.ts
new file mode 100644
index 0000000000..a1d2c93c20
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/tokens/locale-error-handler.token.ts
@@ -0,0 +1,14 @@
+import { InjectionToken, Injector } from '@angular/core';
+
+export interface LocaleErrorHandlerData {
+ resolve: any;
+ reject: any;
+ error: any;
+ locale: string;
+ storedLocales: Record;
+ injector: Injector;
+}
+
+export const LOCALE_ERROR_HANDLER = new InjectionToken<(data: LocaleErrorHandlerData) => any>(
+ 'LOCALE_ERROR_HANDLER',
+);
From a1b7d83cafde3f74a691bb3d587e21e5a203339e Mon Sep 17 00:00:00 2001
From: mehmet-erim
Date: Sat, 3 Oct 2020 00:57:35 +0300
Subject: [PATCH 015/108] feat: improve different-locales constant
---
.../src/lib/constants/different-locales.ts | 345 +++++++++++++++++-
.../src/lib/constants/included-locales.ts | 12 +
.../packages/core/src/lib/constants/index.ts | 1 +
3 files changed, 338 insertions(+), 20 deletions(-)
create mode 100644 npm/ng-packs/packages/core/src/lib/constants/included-locales.ts
diff --git a/npm/ng-packs/packages/core/src/lib/constants/different-locales.ts b/npm/ng-packs/packages/core/src/lib/constants/different-locales.ts
index 401a766fda..3f86e31a2e 100644
--- a/npm/ng-packs/packages/core/src/lib/constants/different-locales.ts
+++ b/npm/ng-packs/packages/core/src/lib/constants/different-locales.ts
@@ -2,32 +2,337 @@
// Key is .NET locale, value is Angular locale
export default {
- 'ar-sa': 'ar-SA',
+ aa: 'en',
+ 'aa-DJ': 'en',
+ 'aa-ER': 'en',
+ 'aa-ET': 'en',
+ 'af-ZA': 'af',
+ 'agq-CM': 'agq',
+ 'ak-GH': 'ak',
+ 'am-ET': 'am',
+ 'ar-001': 'ar',
+ arn: 'en',
+ 'arn-CL': 'en',
+ 'as-IN': 'as',
+ 'asa-TZ': 'asa',
+ 'ast-ES': 'ast',
+ 'az-Cyrl-AZ': 'az-Cyrl',
+ 'az-Latn-AZ': 'az-Latn',
+ ba: 'ru',
+ 'ba-RU': 'ru',
+ 'bas-CM': 'bas',
+ 'be-BY': 'be',
+ 'bem-ZM': 'bem',
+ 'bez-TZ': 'bez',
+ 'bg-BG': 'bg',
+ bin: 'en',
+ 'bin-NG': 'en',
+ 'bm-Latn': 'bm',
+ 'bm-Latn-ML': 'bm',
+ 'bn-BD': 'bn',
+ 'bo-CN': 'bo',
+ 'br-FR': 'br',
+ 'brx-IN': 'brx',
+ 'bs-Cyrl-BA': 'bs-Cyrl',
+ 'bs-Latn-BA': 'bs-Latn',
+ byn: 'en',
+ 'byn-ER': 'en',
+ 'ca-ES': 'ca',
'ca-ES-valencia': 'ca-ES-VALENCIA',
- 'de-de': 'de',
- 'es-ES': 'es',
+ 'ce-RU': 'ce',
+ 'cgg-UG': 'cgg',
+ 'chr-Cher': 'chr',
+ 'chr-Cher-US': 'chr',
+ co: 'en',
+ 'co-FR': 'fr',
+ 'cs-CZ': 'cs',
+ 'cu-RU': 'cu',
+ 'cy-GB': 'cy',
+ 'da-DK': 'da',
+ 'dav-KE': 'dav',
+ 'de-DE': 'de',
+ 'dje-NE': 'dje',
+ 'dsb-DE': 'dsb',
+ 'dua-CM': 'dua',
+ dv: 'en',
+ 'dv-MV': 'en',
+ 'dyo-SN': 'dyo',
+ 'dz-BT': 'dz',
+ 'ebu-KE': 'ebu',
+ 'ee-GH': 'ee',
+ 'el-GR': 'el',
+ 'en-029': 'en',
+ 'en-ID': 'en',
'en-US': 'en',
- 'fil-Latn': 'en',
- 'ku-Arab': 'en',
- 'ky-Cyrl': 'en',
- 'mi-Latn': 'en',
- 'prs-Arab': 'en',
- 'qut-Latn': 'en',
- nso: 'en',
- quz: 'en',
+ 'eo-001': 'en',
+ 'es-ES': 'es',
+ 'et-EE': 'et',
+ 'eu-ES': 'eu',
+ 'ewo-CM': 'ewo',
+ 'fa-IR': 'fa',
+ 'ff-Latn-SN': 'ff-Latn',
+ 'ff-NG': 'ff',
+ 'fi-FI': 'fi',
+ 'fil-PH': 'fil',
+ 'fo-FO': 'fo',
+ 'fr-029': 'fr',
'fr-FR': 'fr',
- 'gd-Latn': 'gd',
+ 'fur-IT': 'fur',
+ 'fy-NL': 'fy',
+ 'ga-IE': 'ga',
+ 'gd-GB': 'gd',
+ 'gl-ES': 'gl',
+ gn: 'en',
+ 'gn-PY': 'en',
+ 'gsw-CH': 'gsw',
+ 'gu-IN': 'gu',
+ 'guz-KE': 'guz',
+ 'gv-IM': 'gv',
'ha-Latn': 'ha',
- 'ig-Latn': 'ig',
- 'it-it': 'it',
+ 'ha-Latn-GH': 'ha-GH',
+ 'ha-Latn-NE': 'ha-NE',
+ 'ha-Latn-NG': 'ha',
+ 'haw-US': 'haw',
+ 'he-IL': 'he',
+ 'hi-IN': 'hi',
+ 'hr-HR': 'hr',
+ 'hsb-DE': 'hsb',
+ 'hu-HU': 'hu',
+ 'hy-AM': 'hy',
+ 'ia-001': 'ia',
+ 'ia-FR': 'ia',
+ ibb: 'en',
+ 'ibb-NG': 'en',
+ 'id-ID': 'id',
+ 'ig-NG': 'ig',
+ 'ii-CN': 'ii',
+ 'is-IS': 'is',
+ 'it-IT': 'it',
+ iu: 'en',
+ 'iu-Cans': 'en',
+ 'iu-Cans-CA': 'en',
+ 'iu-Latn': 'en',
+ 'iu-Latn-CA': 'en',
+ 'ja-JP': 'ja',
+ 'jgo-CM': 'jgo',
+ 'jmc-TZ': 'jmc',
+ 'jv-Java': 'jv',
+ 'jv-Java-ID': 'jv',
+ 'jv-Latn': 'jv',
+ 'jv-Latn-ID': 'jv',
+ 'ka-GE': 'ka',
+ 'kab-DZ': 'kab',
+ 'kam-KE': 'kam',
+ 'kde-TZ': 'kde',
+ 'kea-CV': 'kea',
+ 'khq-ML': 'khq',
+ 'ki-KE': 'ki',
+ 'kk-KZ': 'kk',
+ 'kkj-CM': 'kkj',
+ 'kl-GL': 'kl',
+ 'kln-KE': 'kln',
+ 'km-KH': 'km',
+ 'kn-IN': 'kn',
+ 'ko-KR': 'ko',
+ 'kok-IN': 'kok',
+ kr: 'en',
+ 'kr-NG': 'en',
+ 'ks-Arab': 'ks',
+ 'ks-Arab-IN': 'ks',
+ 'ks-Deva': 'ks',
+ 'ks-Deva-IN': 'ks',
+ 'ksb-TZ': 'ksb',
+ 'ksf-CM': 'ksf',
+ 'ksh-DE': 'ksh',
+ 'ku-Arab': 'ku',
+ 'ku-Arab-IQ': 'ku',
+ 'ku-Arab-IR': 'ku',
+ 'kw-GB': 'kw',
+ 'ky-KG': 'ky',
+ la: 'en',
+ 'la-001': 'en',
+ 'lag-TZ': 'lag',
+ 'lb-LU': 'lb',
+ 'lg-UG': 'lg',
+ 'lkt-US': 'lkt',
+ 'ln-CD': 'ln',
+ 'lo-LA': 'lo',
+ 'lrc-IR': 'lrc',
+ 'lt-LT': 'lt',
+ 'lu-CD': 'lu',
+ 'luo-KE': 'luo',
+ 'luy-KE': 'luy',
+ 'lv-LV': 'lv',
+ 'mas-KE': 'mas',
+ 'mer-KE': 'mer',
+ 'mfe-MU': 'mfe',
+ 'mg-MG': 'mg',
+ 'mgh-MZ': 'mgh',
+ 'mgo-CM': 'mgo',
+ 'mi-NZ': 'mi',
+ 'mk-MK': 'mk',
+ 'ml-IN': 'ml',
'mn-Cyrl': 'mn',
+ 'mn-MN': 'mn',
+ 'mn-Mong': 'mn',
+ 'mn-Mong-CN': 'mn',
+ 'mn-Mong-MN': 'mn',
+ mni: 'en',
+ 'mni-IN': 'en',
+ moh: 'en',
+ 'moh-CA': 'en',
+ 'mr-IN': 'mr',
+ 'ms-MY': 'ms',
+ 'mt-MT': 'mt',
+ 'mua-CM': 'mua',
+ 'my-MM': 'my',
+ 'mzn-IR': 'mzn',
+ 'naq-NA': 'naq',
+ 'nb-NO': 'nb',
+
+ 'nd-ZW': 'nd',
+ 'ne-NP': 'ne',
+ 'nl-NL': 'nl',
+ 'nmg-CM': 'ngm',
+ 'nn-NO': 'nn',
+ 'nnh-CM': 'nnh',
+ no: 'en',
+ nqo: 'en',
+ 'nqo-GN': 'en',
+ nr: 'en',
+ 'nr-ZA': 'en',
+ nso: 'en',
+ 'nso-ZA': 'en',
+ 'nus-SS': 'nus',
+ 'nyn-UG': 'nyn',
+ oc: 'en',
+ 'oc-FR': 'fr',
+ 'om-ET': 'om',
+ 'or-IN': 'or',
+ 'os-GE': 'os',
+ 'pa-Arab-PK': 'pa-Arab',
+ 'pa-IN': 'pa',
+ pap: 'en',
+ 'pap-029': 'en',
+ 'pl-PL': 'pl',
+ 'prg-001': 'prg',
+ prs: 'en',
+ 'prs-AF': 'en',
+ 'ps-AF': 'ps',
'pt-BR': 'pt',
- 'sd-Arab': 'pa-Arab',
- 'sr-Cyrl-RS': 'sr-Cyrl',
+ quc: 'en',
+ 'quc-Latn': 'en',
+ 'quc-Latn-GT': 'en',
+ quz: 'en',
+ 'quz-BO': 'en',
+ 'quz-EC': 'en',
+ 'quz-PE': 'en',
+ 'rm-CH': 'rm',
+ 'rn-BI': 'rn',
+ 'ro-RO': 'ro',
+ 'rof-TZ': 'rof',
+ 'ru-RU': 'ru',
+ 'rw-RW': 'rw',
+ 'rwk-TZ': 'rwk',
+ sa: 'en',
+ 'sa-IN': 'en',
+ 'sah-RU': 'sah',
+ 'saq-KE': 'saq',
+ 'sbp-TZ': 'en',
+ 'sd-Arab': 'sd',
+ 'sd-Arab-PK': 'sd',
+ 'sd-Deva': 'sd',
+ 'sd-Deva-IN': 'sd',
+ 'se-NO': 'se',
+ 'seh-MZ': 'seh',
+ 'ses-ML': 'ses',
+ 'sg-CF': 'sg',
+ 'shi-Latn-MA': 'shi-Latn',
+ 'shi-Tfng-MA': 'shi-Tfng',
+ 'si-LK': 'si',
+ 'sk-SK': 'sk',
+ 'sl-SI': 'sl',
+ sma: 'en',
+ 'sma-NO': 'en',
+ 'sma-SE': 'en',
+ smj: 'en',
+ 'smj-NO': 'en',
+ 'smj-SE': 'en',
+ 'smn-FI': 'en',
+ sms: 'en',
+ 'sms-FI': 'en',
+ 'sn-Latn': 'sn',
+ 'sn-Latn-ZW': 'sn',
+ 'so-SO': 'so',
+ 'sq-AL': 'so',
+ 'sr-Cyrl-RS': 'sr-Cryl',
'sr-Latn-RS': 'sr-Latn',
+ ss: 'en',
+ 'ss-SZ': 'en',
+ 'ss-ZA': 'en',
+ ssy: 'en',
+ 'ssy-ER': 'en',
+ st: 'en',
+ 'st-LS': 'en',
+ 'st-ZA': 'en',
+ 'sv-SE': 'sv',
+ 'sw-TZ': 'sw',
+ syr: 'en',
+ 'syr-SY': 'en',
+ 'ta-IN': 'ta',
+ 'te-IN': 'te',
+ 'teo-UG': 'teo',
'tg-Cyrl': 'tg',
- 'tk-Latn': 'tk',
- 'tt-Cyrl': 'tt',
- 'ug-Arab': 'ug',
- 'yo-Latn': 'yo',
+ 'tg-Cyrl-TJ': 'tg',
+ 'th-TH': 'th',
+ 'ti-ET': 'ti',
+ tig: 'en',
+ 'tig-ER': 'en',
+ 'tk-TM': 'tk',
+ tn: 'en',
+ 'tn-BW': 'en',
+ 'tn-ZA': 'en',
+ 'to-TO': 'to',
+ 'tr-TR': 'tr',
+ ts: 'en',
+ 'ts-ZA': 'en',
+ 'tt-RU': 'tt',
+ 'twq-NE': 'twq',
+ 'tzm-Arab': 'tzm',
+ 'tzm-Arab-MA': 'tzm',
+ 'tzm-Latn': 'tzm',
+ 'tzm-Latn-DZ': 'tzm',
+ 'tzm-Latn-MA': 'tzm',
+ 'tzm-Tfng': 'tzm',
+ 'tzm-Tfng-MA': 'tzm',
+ 'ug-CN': 'ug',
+ 'uk-UA': 'uk',
+ 'ur-PK': 'ur',
+ 'uz-Arab-AF': 'uz-Arab',
+ 'uz-Cyrl-UZ': 'uz-Cyrl',
+ 'uz-Latn-UZ': 'uz-Latn',
+ 'vai-Latn-LR': 'vai-Latn',
+ 'vai-Vaii-LR': 'vai-Vaii',
+ ve: 'en',
+ 've-ZA': 'en',
+ 'vi-VN': 'vi',
+ 'vo-001': 'vo',
+ 'vun-TZ': 'vun',
+ 'wae-CH': 'wae',
+ wal: 'en',
+ 'wal-ET': 'en',
+ 'wo-SN': 'wo',
+ 'xh-ZA': 'xh',
+ 'xog-UG': 'xog',
+ 'yav-CM': 'yav',
+ 'yi-001': 'yi',
+ 'yo-NG': 'yo',
+ 'zgh-Tfng': 'zgh',
+ 'zgh-Tfng-MA': 'zgh',
+ 'zh-CN': 'zh',
+ 'zh-HK': 'zh',
+ 'zh-MO': 'zh',
+ 'zh-SG': 'zh',
+ 'zh-TW': 'zh',
+ 'zu-ZA': 'zu',
};
diff --git a/npm/ng-packs/packages/core/src/lib/constants/included-locales.ts b/npm/ng-packs/packages/core/src/lib/constants/included-locales.ts
new file mode 100644
index 0000000000..68ec959235
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/constants/included-locales.ts
@@ -0,0 +1,12 @@
+export const includedLocales = [
+ 'tr',
+ 'ar',
+ 'cs',
+ 'en',
+ 'fr',
+ 'pt',
+ 'ru',
+ 'sl',
+ 'zh-Hans',
+ 'zh-Hant',
+];
diff --git a/npm/ng-packs/packages/core/src/lib/constants/index.ts b/npm/ng-packs/packages/core/src/lib/constants/index.ts
index 54aaba730c..2113cfed8c 100644
--- a/npm/ng-packs/packages/core/src/lib/constants/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/constants/index.ts
@@ -1 +1,2 @@
export * from './different-locales';
+export * from './included-locales';
From 1d07d6e173362bea4bf360ca611a02f636da000b Mon Sep 17 00:00:00 2001
From: mehmet-erim
Date: Sat, 3 Oct 2020 00:59:10 +0300
Subject: [PATCH 016/108] refactor: reduce locale chunk files count & imrove
locale registering
---
.../src/lib/services/localization.service.ts | 3 +-
.../core/src/lib/utils/initial-utils.ts | 72 +++++++++++++++----
2 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
index 5cdbe3c291..c6ebb3dd00 100644
--- a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
@@ -48,12 +48,11 @@ export class LocalizationService {
registerLocale(locale: string) {
const router = this.injector.get(Router);
- const { cultureNameLocaleFileMap } = this.injector.get(CORE_OPTIONS);
const { shouldReuseRoute } = router.routeReuseStrategy;
router.routeReuseStrategy.shouldReuseRoute = () => false;
router.navigated = false;
- return registerLocale(locale, cultureNameLocaleFileMap).then(() => {
+ return registerLocale(locale, this.injector).then(() => {
this.ngZone.run(async () => {
await router.navigateByUrl(router.url).catch(noop);
router.routeReuseStrategy.shouldReuseRoute = shouldReuseRoute;
diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
index cf35cc3023..76f01214c8 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
@@ -1,5 +1,5 @@
import { registerLocaleData } from '@angular/common';
-import { Injector } from '@angular/core';
+import { Injector, isDevMode } from '@angular/core';
import { Store } from '@ngxs/store';
import { OAuthService } from 'angular-oauth2-oidc';
import { tap } from 'rxjs/operators';
@@ -8,6 +8,7 @@ import { ABP } from '../models/common';
import { AuthService } from '../services/auth.service';
import { ConfigState } from '../states/config.state';
import { clearOAuthStorage } from '../strategies/auth-flow.strategy';
+import { LocaleErrorHandlerData, LOCALE_ERROR_HANDLER } from '../tokens/locale-error-handler.token';
import { CORE_OPTIONS } from '../tokens/options.token';
import { getRemoteEnv } from './environment-utils';
import { parseTenantFromUrl } from './multi-tenancy-utils';
@@ -42,26 +43,73 @@ export function checkAccessToken(store: Store, injector: Injector) {
export function localeInitializer(injector: Injector) {
const fn = () => {
const store: Store = injector.get(Store);
- const options = injector.get(CORE_OPTIONS);
const lang = store.selectSnapshot(state => state.SessionState.language) || 'en';
return new Promise((resolve, reject) => {
- registerLocale(lang, options.cultureNameLocaleFileMap).then(
- () => resolve('resolved'),
- reject,
- );
+ registerLocale(lang, injector).then(() => resolve('resolved'), reject);
});
};
return fn;
}
-export function registerLocale(locale: string, localeNameMap: ABP.Dictionary) {
- return import(
- /* webpackChunkName: "_locale-[request]"*/
- `@angular/common/locales/${localeNameMap[locale] || locale}.js`
- ).then(module => {
- registerLocaleData(module.default);
+export function registerLocale(locale: string, injector: Injector): Promise {
+ const { cultureNameLocaleFileMap } = injector.get(CORE_OPTIONS, {} as ABP.Root);
+
+ const errorHandlerFn = injector.get(LOCALE_ERROR_HANDLER, defaultLocalErrorHandlerFn);
+
+ return new Promise((resolve, reject) => {
+ return import(
+ /* webpackChunkName: "_locale-[request]"*/
+ /* webpackInclude: /\/(ar|cs|en|fr|pt|ru|sl|zh-Hans|zh-Hant).js/ */
+ /* webpackExclude: /\/global|\/extra/ */
+ `@angular/common/locales/${cultureNameLocaleFileMap[locale] || locale}.js`
+ )
+ .then(module => {
+ registerLocaleData(module.default, locale);
+ resolve(module.default);
+ })
+ .catch(error => {
+ errorHandlerFn({
+ resolve,
+ reject,
+ error,
+ injector,
+ locale,
+ storedLocales: { ...extraLocales },
+ });
+ });
});
}
+
+const extraLocales = {};
+export function storeLocaleData(data: any, localeId: string) {
+ extraLocales[localeId] = data;
+}
+
+async function defaultLocalErrorHandlerFn({
+ locale,
+ storedLocales,
+ resolve,
+ injector,
+}: LocaleErrorHandlerData) {
+ if (storedLocales[locale]) {
+ registerLocaleData(storedLocales[locale], locale);
+ resolve();
+ return;
+ }
+
+ if (isDevMode) {
+ console.error(`Cannot find the ${locale} locale file. You should add the code below to app.module:
+
+import { storeLocaleData } from '@abp/ng.core';
+import(
+/* webpackChunkName: "_locale-${locale}-js"*/
+/* webpackMode: "eager" */
+'@angular/common/locales/${locale}.js'
+).then(m => storeLocaleData(m.default, '${locale}'));`);
+ }
+
+ resolve();
+}
From 5151be6bddcd837a6a84113e970c5b7fadbc8086 Mon Sep 17 00:00:00 2001
From: PMExtra
Date: Sun, 4 Oct 2020 17:57:24 +0800
Subject: [PATCH 017/108] Improve EFCoreRepositoryExtensions.
---
.../EfCoreRepositoryExtensions.cs | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs
index a019d29a49..1153f5e873 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs
@@ -9,28 +9,27 @@ namespace Volo.Abp.Domain.Repositories
public static class EfCoreRepositoryExtensions
{
- public static DbContext GetDbContext(this IReadOnlyBasicRepository repository)
- where TEntity : class, IEntity
+ public static DbContext GetDbContext(this IReadOnlyBasicRepository repository)
+ where TEntity : class, IEntity
{
return repository.ToEfCoreRepository().DbContext;
}
- public static DbSet GetDbSet(this IReadOnlyBasicRepository repository)
- where TEntity : class, IEntity
+ public static DbSet GetDbSet(this IReadOnlyBasicRepository repository)
+ where TEntity : class, IEntity
{
return repository.ToEfCoreRepository().DbSet;
}
- public static IEfCoreRepository ToEfCoreRepository(this IReadOnlyBasicRepository repository)
- where TEntity : class, IEntity
+ public static IEfCoreRepository ToEfCoreRepository(this IReadOnlyBasicRepository repository)
+ where TEntity : class, IEntity
{
- var efCoreRepository = repository as IEfCoreRepository;
- if (efCoreRepository == null)
+ if (repository is IEfCoreRepository efCoreRepository)
{
- throw new ArgumentException("Given repository does not implement " + typeof(IEfCoreRepository).AssemblyQualifiedName, nameof(repository));
+ return efCoreRepository;
}
- return efCoreRepository;
+ throw new ArgumentException("Given repository does not implement " + typeof(IEfCoreRepository).AssemblyQualifiedName, nameof(repository));
}
}
}
From fb80dccb4be10157a66718f2d717db43d3153a96 Mon Sep 17 00:00:00 2001
From: mehmet-erim
Date: Sun, 4 Oct 2020 16:52:29 +0300
Subject: [PATCH 018/108] chore: add tr locale to webpack magic comment
---
npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
index 76f01214c8..be9e7184e5 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
@@ -62,7 +62,7 @@ export function registerLocale(locale: string, injector: Injector): Promise
return new Promise((resolve, reject) => {
return import(
/* webpackChunkName: "_locale-[request]"*/
- /* webpackInclude: /\/(ar|cs|en|fr|pt|ru|sl|zh-Hans|zh-Hant).js/ */
+ /* webpackInclude: /\/(ar|cs|en|fr|pt|tr|ru|sl|zh-Hans|zh-Hant).js/ */
/* webpackExclude: /\/global|\/extra/ */
`@angular/common/locales/${cultureNameLocaleFileMap[locale] || locale}.js`
)
From fbe4975543b7820942da1fc5d73c875bbba6b288 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Mon, 5 Oct 2020 09:32:34 +0800
Subject: [PATCH 019/108] Rename ResolverAndGet to GetAsync.
---
.../Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs | 2 +-
.../Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs | 2 +-
.../Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
index e0a5cfb498..24e2b40067 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
public async Task InvokeAsync(HttpContext context, RequestDelegate next)
{
- var tenant = await _tenantConfigurationProvider.ResolverAndGet();
+ var tenant = await _tenantConfigurationProvider.GetAsync();
using (_currentTenant.Change(tenant?.Id, tenant?.Name))
{
await next(context);
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs
index 6d573bac36..d46b6b2497 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs
@@ -4,6 +4,6 @@ namespace Volo.Abp.MultiTenancy
{
public interface ITenantConfigurationProvider
{
- Task ResolverAndGet();
+ Task GetAsync();
}
}
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs
index c07ec3931d..7e32611dfb 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.MultiTenancy
TenantResolveResultAccessor = tenantResolveResultAccessor;
}
- public virtual async Task ResolverAndGet()
+ public virtual async Task GetAsync()
{
var resolveResult = TenantResolver.ResolveTenantIdOrName();
TenantResolveResultAccessor.Result = resolveResult;
From 520e80cb3bf90071f03474e2b6f9d11ebbd3492e Mon Sep 17 00:00:00 2001
From: muhammedaltug
Date: Mon, 5 Oct 2020 12:26:04 +0300
Subject: [PATCH 020/108] fix: locale error handler message changed. -code
block moved to documentation
---
docs/en/UI/Angular/Localization.md | 11 +++++++++++
.../packages/core/src/lib/utils/initial-utils.ts | 9 +--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/docs/en/UI/Angular/Localization.md b/docs/en/UI/Angular/Localization.md
index eec4db0cb4..c8073585e1 100644
--- a/docs/en/UI/Angular/Localization.md
+++ b/docs/en/UI/Angular/Localization.md
@@ -219,7 +219,18 @@ If you see an error like this, you should pass the `cultureNameLocaleFileMap` pr
See [all locale files in Angular](https://github.com/angular/angular/tree/master/packages/common/locales).
+## Adding new culture
+```js
+//app.module.ts
+
+import { storeLocaleData } from '@abp/ng.core';
+import(
+/* webpackChunkName: "_locale-your-locale-js"*/
+/* webpackMode: "eager" */
+'@angular/common/locales/your-locale.js'
+).then(m => storeLocaleData(m.default, 'your-locale'));
+```
## See Also
* [Localization in ASP.NET Core](../../Localization.md)
diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
index be9e7184e5..b30b1e742b 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
@@ -101,14 +101,7 @@ async function defaultLocalErrorHandlerFn({
}
if (isDevMode) {
- console.error(`Cannot find the ${locale} locale file. You should add the code below to app.module:
-
-import { storeLocaleData } from '@abp/ng.core';
-import(
-/* webpackChunkName: "_locale-${locale}-js"*/
-/* webpackMode: "eager" */
-'@angular/common/locales/${locale}.js'
-).then(m => storeLocaleData(m.default, '${locale}'));`);
+ console.error(`Cannot find the ${locale} locale file. You can check how can add new culture at https://docs.abp.io/en/abp/latest/UI/Angular/Localization#adding-new-culture`);
}
resolve();
From 9dcf9a789eacc3fc87738456053077b9fcf50843 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic
Date: Mon, 5 Oct 2020 13:05:29 +0200
Subject: [PATCH 021/108] First UiMessageAlert test
---
framework/Volo.Abp.sln | 28 ++++-----
.../WebAssembly/IUiMessageNotifierService.cs | 25 ++++++++
.../WebAssembly/NullUiMessageService.cs | 33 +++++++++++
.../Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs | 4 +-
.../BlazoriseUiMessageService.cs | 49 ++++++++++++++++
.../Components/UiMessageAlert.razor | 17 ++++++
.../Components/UiMessageAlert.razor.cs | 58 +++++++++++++++++++
.../UiMessageNotifierService.cs | 20 +++++++
.../Volo.Abp.BlazoriseUI.csproj | 2 +-
.../src/Volo.Abp.BlazoriseUI/_Imports.razor | 2 +
.../MyCompanyName.MyProjectName.Blazor.csproj | 1 +
.../Pages/Index.razor | 20 ++++++-
.../_Imports.razor | 2 +
13 files changed, 242 insertions(+), 19 deletions(-)
create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageNotifierService.cs
create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/NullUiMessageService.cs
create mode 100644 framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs
create mode 100644 framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
create mode 100644 framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
create mode 100644 framework/src/Volo.Abp.BlazoriseUI/UiMessageNotifierService.cs
create mode 100644 framework/src/Volo.Abp.BlazoriseUI/_Imports.razor
diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
index 503b42c7e1..53666c57c1 100644
--- a/framework/Volo.Abp.sln
+++ b/framework/Volo.Abp.sln
@@ -319,33 +319,33 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.BlobStoring.Aliyun
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.BlobStoring.Aliyun.Tests", "test\Volo.Abp.BlobStoring.Aliyun.Tests\Volo.Abp.BlobStoring.Aliyun.Tests.csproj", "{8E49687A-E69F-49F2-8DB0-428D0883A937}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.BlobStoring.Aws", "src\Volo.Abp.BlobStoring.Aws\Volo.Abp.BlobStoring.Aws.csproj", "{50968CDE-1029-4051-B2E5-B69D0ECF2A18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.BlobStoring.Aws", "src\Volo.Abp.BlobStoring.Aws\Volo.Abp.BlobStoring.Aws.csproj", "{50968CDE-1029-4051-B2E5-B69D0ECF2A18}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.BlobStoring.Aws.Tests", "test\Volo.Abp.BlobStoring.Aws.Tests\Volo.Abp.BlobStoring.Aws.Tests.csproj", "{2CD3B26A-CA81-4279-8D5D-6A594517BB3F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.BlobStoring.Aws.Tests", "test\Volo.Abp.BlobStoring.Aws.Tests\Volo.Abp.BlobStoring.Aws.Tests.csproj", "{2CD3B26A-CA81-4279-8D5D-6A594517BB3F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Kafka", "src\Volo.Abp.Kafka\Volo.Abp.Kafka.csproj", "{2A864049-9CD5-4493-8CDB-C408474D43D4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Kafka", "src\Volo.Abp.Kafka\Volo.Abp.Kafka.csproj", "{2A864049-9CD5-4493-8CDB-C408474D43D4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Kafka", "src\Volo.Abp.EventBus.Kafka\Volo.Abp.EventBus.Kafka.csproj", "{C1D891B0-AE83-42CB-987D-425A2787DE78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EventBus.Kafka", "src\Volo.Abp.EventBus.Kafka\Volo.Abp.EventBus.Kafka.csproj", "{C1D891B0-AE83-42CB-987D-425A2787DE78}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.GlobalFeatures", "src\Volo.Abp.GlobalFeatures\Volo.Abp.GlobalFeatures.csproj", "{04F44063-C952-403A-815F-EFB778BDA125}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.GlobalFeatures", "src\Volo.Abp.GlobalFeatures\Volo.Abp.GlobalFeatures.csproj", "{04F44063-C952-403A-815F-EFB778BDA125}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.GlobalFeatures.Tests", "test\Volo.Abp.GlobalFeatures.Tests\Volo.Abp.GlobalFeatures.Tests.csproj", "{231F1581-AA21-44C3-BF27-51EB3AD5355C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.GlobalFeatures.Tests", "test\Volo.Abp.GlobalFeatures.Tests\Volo.Abp.GlobalFeatures.Tests.csproj", "{231F1581-AA21-44C3-BF27-51EB3AD5355C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Client.IdentityModel.WebAssembly", "src\Volo.Abp.Http.Client.IdentityModel.WebAssembly\Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj", "{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Http.Client.IdentityModel.WebAssembly", "src\Volo.Abp.Http.Client.IdentityModel.WebAssembly\Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj", "{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.Client.Common", "src\Volo.Abp.AspNetCore.Mvc.Client.Common\Volo.Abp.AspNetCore.Mvc.Client.Common.csproj", "{8A22D962-016E-474A-8BB7-F831F0ABF3AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.Client.Common", "src\Volo.Abp.AspNetCore.Mvc.Client.Common\Volo.Abp.AspNetCore.Mvc.Client.Common.csproj", "{8A22D962-016E-474A-8BB7-F831F0ABF3AC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Components.WebAssembly", "src\Volo.Abp.AspNetCore.Components.WebAssembly\Volo.Abp.AspNetCore.Components.WebAssembly.csproj", "{E1A62D10-F2FB-4040-BD60-11A3934058DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Components.WebAssembly", "src\Volo.Abp.AspNetCore.Components.WebAssembly\Volo.Abp.AspNetCore.Components.WebAssembly.csproj", "{E1A62D10-F2FB-4040-BD60-11A3934058DF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.BlazoriseUI", "src\Volo.Abp.BlazoriseUI\Volo.Abp.BlazoriseUI.csproj", "{4EBDDB1B-D6C5-4FAE-B5A7-2171B18CDFA5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.BlazoriseUI", "src\Volo.Abp.BlazoriseUI\Volo.Abp.BlazoriseUI.csproj", "{4EBDDB1B-D6C5-4FAE-B5A7-2171B18CDFA5}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme", "src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj", "{ABC27C10-C0FF-44CB-B4FF-A09C0B79F695}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme", "src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj", "{ABC27C10-C0FF-44CB-B4FF-A09C0B79F695}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Components.WebAssembly.Theming", "src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj", "{29CA7471-4E3E-4E75-8B33-001DDF682F01}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Components.WebAssembly.Theming", "src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj", "{29CA7471-4E3E-4E75-8B33-001DDF682F01}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Autofac.WebAssembly", "src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj", "{37F89B0B-1C6B-426F-A5EE-676D1956D9E9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Autofac.WebAssembly", "src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj", "{37F89B0B-1C6B-426F-A5EE-676D1956D9E9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Authentication.OpenIdConnect", "src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj", "{DEFE3DB2-EA4F-4F90-87FC-B25D64427BC5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Authentication.OpenIdConnect", "src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj", "{DEFE3DB2-EA4F-4F90-87FC-B25D64427BC5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageNotifierService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageNotifierService.cs
new file mode 100644
index 0000000000..c3f6b917a7
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageNotifierService.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+ public interface IUiMessageNotifierService
+ {
+ event EventHandler MessageReceived;
+
+ Task NotifyMessageReceived(string message, string title = null);
+ }
+
+ public class UiMessageEventArgs : EventArgs
+ {
+ public UiMessageEventArgs(string message, string title)
+ {
+ Message = message;
+ Title = title;
+ }
+
+ public string Message { get; }
+
+ public string Title { get; }
+ }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/NullUiMessageService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/NullUiMessageService.cs
new file mode 100644
index 0000000000..59830b0480
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/NullUiMessageService.cs
@@ -0,0 +1,33 @@
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+ public class NullUiMessageService : IUiMessageService, ITransientDependency
+ {
+ public Task InfoAsync(string message, string title = null)
+ {
+ return Task.CompletedTask;
+ }
+
+ public Task SuccessAsync(string message, string title = null)
+ {
+ return Task.CompletedTask;
+ }
+
+ public Task WarnAsync(string message, string title = null)
+ {
+ return Task.CompletedTask;
+ }
+
+ public Task ErrorAsync(string message, string title = null)
+ {
+ return Task.CompletedTask;
+ }
+
+ public Task ConfirmAsync(string message, string title = null)
+ {
+ return Task.FromResult(true);
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
index 7289ebe954..8723209c53 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
@@ -225,7 +225,7 @@ namespace Volo.Abp.BlazoriseUI
{
if (reference == null)
{
- reference = (TRef) ScopedServices.GetRequiredService(serviceType);
+ reference = (TRef)ScopedServices.GetRequiredService(serviceType);
}
return reference;
@@ -266,7 +266,7 @@ namespace Volo.Abp.BlazoriseUI
var input = await CreateGetListInputAsync();
var result = await AppService.GetListAsync(input);
Entities = MapToListViewModel(result.Items);
- TotalCount = (int?) result.TotalCount;
+ TotalCount = (int?)result.TotalCount;
}
private IReadOnlyList MapToListViewModel(IReadOnlyList dtos)
diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs
new file mode 100644
index 0000000000..66bc231ce7
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs
@@ -0,0 +1,49 @@
+using System.Threading.Tasks;
+using Blazorise;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.BlazoriseUI
+{
+ [Dependency(ReplaceServices = true)]
+ public class BlazoriseUiMessageService : IUiMessageService, IScopedDependency
+ {
+ private readonly IUiMessageNotifierService uiMessageNotifierService;
+
+ public ILogger Logger { get; set; }
+
+ public BlazoriseUiMessageService(IUiMessageNotifierService uiMessageNotifierService)
+ {
+ this.uiMessageNotifierService = uiMessageNotifierService;
+
+ Logger = NullLogger.Instance;
+ }
+
+ public Task InfoAsync(string message, string title = null)
+ {
+ return uiMessageNotifierService.NotifyMessageReceived(message, title);
+ }
+
+ public Task SuccessAsync(string message, string title = null)
+ {
+ return uiMessageNotifierService.NotifyMessageReceived(message, title);
+ }
+
+ public Task WarnAsync(string message, string title = null)
+ {
+ return uiMessageNotifierService.NotifyMessageReceived(message, title);
+ }
+
+ public Task ErrorAsync(string message, string title = null)
+ {
+ return uiMessageNotifierService.NotifyMessageReceived(message, title);
+ }
+
+ public Task ConfirmAsync(string message, string title = null)
+ {
+ return Task.FromResult(true);
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
new file mode 100644
index 0000000000..e041053883
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
@@ -0,0 +1,17 @@
+
+
+
+
+ @Title
+
+
+
+ @Message
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
new file mode 100644
index 0000000000..b5ee799bdd
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Blazorise;
+using Microsoft.AspNetCore.Components;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+
+namespace Volo.Abp.BlazoriseUI.Components
+{
+ public partial class UiMessageAlert : ComponentBase, IDisposable
+ {
+ protected override void OnInitialized()
+ {
+ UiMessageNotifierService.MessageReceived += UiMessageNotifierService_MessageReceived;
+
+ base.OnInitialized();
+ }
+
+ private void UiMessageNotifierService_MessageReceived(object sender, UiMessageEventArgs e)
+ {
+ Message = e.Message;
+ Title = e.Title;
+
+ ModalRef.Show();
+ }
+
+ public void Dispose()
+ {
+ if (UiMessageNotifierService != null)
+ {
+ UiMessageNotifierService.MessageReceived -= UiMessageNotifierService_MessageReceived;
+ }
+ }
+
+ protected Task OnCancelClicked()
+ {
+ ModalRef.Hide();
+
+ return Task.CompletedTask;
+ }
+
+ protected Task OnOKClicked()
+ {
+ ModalRef.Hide();
+
+ return Task.CompletedTask;
+ }
+
+ protected Modal ModalRef { get; set; }
+
+ [Inject] IUiMessageNotifierService UiMessageNotifierService { get; set; }
+
+ [Parameter] public string Title { get; set; }
+
+ [Parameter] public string Message { get; set; }
+ }
+}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/UiMessageNotifierService.cs b/framework/src/Volo.Abp.BlazoriseUI/UiMessageNotifierService.cs
new file mode 100644
index 0000000000..cdd86a75f3
--- /dev/null
+++ b/framework/src/Volo.Abp.BlazoriseUI/UiMessageNotifierService.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.BlazoriseUI
+{
+ [Dependency(ReplaceServices = true)]
+ public class UiMessageNotifierService : IUiMessageNotifierService, IScopedDependency
+ {
+ public event EventHandler MessageReceived;
+
+ public Task NotifyMessageReceived(string message, string title = null)
+ {
+ MessageReceived?.Invoke(this, new UiMessageEventArgs(message, title));
+
+ return Task.CompletedTask;
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
index 12628b1440..091ee37717 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
index 114be0b5e1..3f5e2f52fc 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
@@ -4,6 +4,7 @@
@using System.Security.Claims
@using Microsoft.Extensions.Localization
@using MyCompanyName.MyProjectName.Localization
+@using Volo.Abp.BlazoriseUI.Components
@inject ICurrentUser CurrentUser
@inject ICurrentTenant CurrentTenant
@inject AuthenticationStateProvider AuthenticationStateProvider
@@ -14,8 +15,21 @@
+
+ UI Message Tests
+
+
+
+
+
+
+
-
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
index 661c21eb11..9b7daa596a 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
+using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
@@ -70,6 +71,8 @@ namespace Volo.Docs.Pages.Documents.Project
public DocumentRenderParameters UserPreferences { get; set; } = new DocumentRenderParameters();
+ public ListCongratulations, MyProjectName is successfully running!
-Welcome to the Application
+Welcome to the Application
+@L["LongWelcomeMessage"]
@if (!CurrentUser.IsAuthenticated) @@ -23,7 +37,7 @@ @L["Login"] - } + }
@@ -161,6 +175,8 @@
@code
{
+ [Inject] IUiMessageService UiMessageService { get; set; }
+
private IEnumerable _claims;
protected override async Task OnInitializedAsync()
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
index b1ade9c628..3fcce1e0d0 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
@@ -9,3 +9,5 @@
@using MyCompanyName.MyProjectName.Blazor
@using Blazorise
@using Blazorise.DataGrid
+@using Volo.Abp.BlazoriseUI;
+@using Volo.Abp.BlazoriseUI.Components;
\ No newline at end of file
From 8a113064a5edf214aaaec8d6bb17b49961de362d Mon Sep 17 00:00:00 2001
From: muhammedaltug
Date: Mon, 5 Oct 2020 17:35:27 +0300
Subject: [PATCH 022/108] fix: toaster container removed from empty layout and
account layout - selectors changed in toaster service test - documentation
update for implementing Toaster.Service interface
---
docs/en/UI/Angular/Toaster-Service.md | 96 +++++++++++++++++++
.../packages/core/src/lib/models/utility.ts | 4 +
.../account-layout.component.ts | 1 -
.../empty-layout/empty-layout.component.ts | 1 -
.../theme-shared/src/lib/models/toaster.ts | 2 +-
.../src/lib/services/toaster.service.ts | 24 ++---
.../src/lib/tests/toaster.service.spec.ts | 34 +++----
.../src/lib/theme-shared.module.ts | 3 +
8 files changed, 134 insertions(+), 31 deletions(-)
diff --git a/docs/en/UI/Angular/Toaster-Service.md b/docs/en/UI/Angular/Toaster-Service.md
index d2c1fc08f3..4778af020b 100644
--- a/docs/en/UI/Angular/Toaster-Service.md
+++ b/docs/en/UI/Angular/Toaster-Service.md
@@ -85,7 +85,103 @@ The all open toasts can be removed manually via the `clear` method:
```js
this.toaster.clear();
```
+## Replacing ToasterService with 3rd party toaster libraries
+If you want the ABP Framework to utilize 3rd party libraries for the toasters instead of the built-in one, you can provide a service that implements `Toaster.Service` interface, and provide it as follows (ngx-toastr library used in example):
+
+> You can use *LocalizationService* for toaster messages translations.
+```js
+// your-custom-toaster.service.ts
+import { Injectable } from '@angular/core';
+import { Config, LocalizationService } from '@abp/ng.core';
+import { Toaster } from '@abp/ng.theme.shared';
+import { ToastrService } from 'ngx-toastr';
+
+@Injectable()
+export class CustomToasterService implements Toaster.Service {
+ constructor(private toastr: ToastrService, private localizationService: LocalizationService) {}
+
+ error(
+ message: Config.LocalizationParam,
+ title?: Config.LocalizationParam,
+ options?: Partial,
+ ) {
+ return this.show(message, title, 'error', options);
+ }
+
+ clear(): void {
+ this.toastr.clear();
+ }
+
+ info(
+ message: Config.LocalizationParam,
+ title: Config.LocalizationParam | undefined,
+ options: Partial | undefined,
+ ): Toaster.ToasterId {
+ return this.show(message, title, 'info', options);
+ }
+
+ remove(id: number): void {
+ this.toastr.remove(id);
+ }
+
+ show(
+ message: Config.LocalizationParam,
+ title: Config.LocalizationParam,
+ severity: Toaster.Severity,
+ options: Partial,
+ ): Toaster.ToasterId {
+ const translatedMessage = this.localizationService.instant(message);
+ const translatedTitle = this.localizationService.instant(title);
+ const toasterOptions = {
+ positionClass: 'toast-bottom-right',
+ tapToDismiss: options.tapToDismiss,
+ ...(options.sticky && {
+ extendedTimeOut: 0,
+ timeOut: 0,
+ }),
+ };
+ const activeToast = this.toastr.show(
+ translatedMessage,
+ translatedTitle,
+ toasterOptions,
+ `toast-${severity}`,
+ );
+ return activeToast.toastId;
+ }
+
+ success(
+ message: Config.LocalizationParam,
+ title: Config.LocalizationParam | undefined,
+ options: Partial | undefined,
+ ): Toaster.ToasterId {
+ return this.show(message, title, 'success', options);
+ }
+
+ warn(
+ message: Config.LocalizationParam,
+ title: Config.LocalizationParam | undefined,
+ options: Partial | undefined,
+ ): Toaster.ToasterId {
+ return this.show(message, title, 'warning', options);
+ }
+}
+```
+```js
+// app.module.ts
+
+import { ToasterService } from '@abp/ng.theme.shared';
+
+@NgModule({
+ providers: [
+ // ...
+ {
+ provide: ToasterService,
+ useClass: CustomToasterService,
+ },
+ ]
+})
+```
## API
### success
diff --git a/npm/ng-packs/packages/core/src/lib/models/utility.ts b/npm/ng-packs/packages/core/src/lib/models/utility.ts
index 228cab0de3..f1cfbdb6da 100644
--- a/npm/ng-packs/packages/core/src/lib/models/utility.ts
+++ b/npm/ng-packs/packages/core/src/lib/models/utility.ts
@@ -11,3 +11,7 @@ type Serializable = Record<
export type InferredInstanceOf = T extends Type ? U : never;
export type InferredContextOf = T extends TemplateRef ? U : never;
+
+export type Strict = Class extends Contract
+ ? { [K in keyof Class]: K extends keyof Contract ? Contract[K] : never }
+ : Contract;
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
index 105c756e54..56851c6d27 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
@@ -6,7 +6,6 @@ import { eLayoutType } from '@abp/ng.core';
template: `
,
) => ToasterId;
remove: (id: number) => void;
- clear: (key?: string) => void;
+ clear: (containerKey?: string) => void;
info: (
message: Config.LocalizationParam,
title?: Config.LocalizationParam,
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts
index 83f6655371..84275a0fc8 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts
@@ -1,15 +1,15 @@
import { ComponentRef, Injectable } from '@angular/core';
import { Toaster } from '../models';
import { ReplaySubject } from 'rxjs';
-import { Config, ContentProjectionService, PROJECTION_STRATEGY } from '@abp/ng.core';
+import { Config, ContentProjectionService, PROJECTION_STRATEGY, Strict } from '@abp/ng.core';
import snq from 'snq';
import { ToastContainerComponent } from '../components/toast-container/toast-container.component';
@Injectable({
providedIn: 'root',
})
-export class ToasterService implements Toaster.Service {
- toasts$ = new ReplaySubject(1);
+export class ToasterService implements ToasterContract {
+ private toasts$ = new ReplaySubject(1);
private lastId = -1;
@@ -37,7 +37,7 @@ export class ToasterService implements Toaster.Service {
message: Config.LocalizationParam,
title?: Config.LocalizationParam,
options?: Partial,
- ): number {
+ ): Toaster.ToasterId {
return this.show(message, title, 'info', options);
}
@@ -51,7 +51,7 @@ export class ToasterService implements Toaster.Service {
message: Config.LocalizationParam,
title?: Config.LocalizationParam,
options?: Partial,
- ): number {
+ ): Toaster.ToasterId {
return this.show(message, title, 'success', options);
}
@@ -65,7 +65,7 @@ export class ToasterService implements Toaster.Service {
message: Config.LocalizationParam,
title?: Config.LocalizationParam,
options?: Partial,
- ): number {
+ ): Toaster.ToasterId {
return this.show(message, title, 'warning', options);
}
@@ -79,7 +79,7 @@ export class ToasterService implements Toaster.Service {
message: Config.LocalizationParam,
title?: Config.LocalizationParam,
options?: Partial,
- ): number {
+ ): Toaster.ToasterId {
return this.show(message, title, 'error', options);
}
@@ -96,7 +96,7 @@ export class ToasterService implements Toaster.Service {
title: Config.LocalizationParam = null,
severity: Toaster.Severity = 'neutral',
options = {} as Partial,
- ): number {
+ ): Toaster.ToasterId {
if (!this.containerComponentRef) this.setContainer();
const id = ++this.lastId;
@@ -122,10 +122,12 @@ export class ToasterService implements Toaster.Service {
/**
* Removes all open toasts at once.
*/
- clear(key?: string): void {
- this.toasts = !key
+ clear(containerKey?: string): void {
+ this.toasts = !containerKey
? []
- : this.toasts.filter(toast => snq(() => toast.options.containerKey) !== key);
+ : this.toasts.filter(toast => snq(() => toast.options.containerKey) !== containerKey);
this.toasts$.next(this.toasts);
}
}
+
+export type ToasterContract = Strict;
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
index 0807bf632e..d47e4a7cf5 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
@@ -14,6 +14,7 @@ import { ToasterService } from '../services/toaster.service';
imports: [CoreModule.forTest()],
})
export class MockModule {}
+const toastClassPrefix = 'abp-toast';
describe('ToasterService', () => {
let spectator: SpectatorService;
@@ -39,24 +40,23 @@ describe('ToasterService', () => {
service['containerComponentRef'].changeDetectorRef.detectChanges();
expect(selectToasterElement('.fa-exclamation-circle')).toBeTruthy();
- expect(selectToasterContent('.toast-title')).toBe('TITLE');
- expect(selectToasterContent('.toast-message')).toBe('MESSAGE');
+ expect(selectToasterContent(`.${toastClassPrefix}-title`)).toBe('TITLE');
+ expect(selectToasterContent(`.${toastClassPrefix}-message`)).toBe('MESSAGE');
});
test.each`
- type | selector | icon
- ${'info'} | ${'.toast-info'} | ${'.fa-info-circle'}
- ${'success'} | ${'.toast-success'} | ${'.fa-check-circle'}
- ${'warn'} | ${'.toast-warning'} | ${'.fa-exclamation-triangle'}
- ${'error'} | ${'.toast-error'} | ${'.fa-times-circle'}
+ type | selector | icon
+ ${'info'} | ${`.${toastClassPrefix}-info`} | ${'.fa-info-circle'}
+ ${'success'} | ${`.${toastClassPrefix}-success`} | ${'.fa-check-circle'}
+ ${'warn'} | ${`.${toastClassPrefix}-warning`} | ${'.fa-exclamation-triangle'}
+ ${'error'} | ${`.${toastClassPrefix}-error`} | ${'.fa-times-circle'}
`('should display $type toast', async ({ type, selector, icon }) => {
service[type]('MESSAGE', 'TITLE');
await timer(0).toPromise();
service['containerComponentRef'].changeDetectorRef.detectChanges();
-
- expect(selectToasterContent('.toast-title')).toBe('TITLE');
- expect(selectToasterContent('.toast-message')).toBe('MESSAGE');
+ expect(selectToasterContent(`.${toastClassPrefix}-title`)).toBe('TITLE');
+ expect(selectToasterContent(`.${toastClassPrefix}-message`)).toBe('MESSAGE');
expect(selectToasterElement()).toBe(document.querySelector(selector));
expect(selectToasterElement(icon)).toBeTruthy();
});
@@ -68,10 +68,10 @@ describe('ToasterService', () => {
await timer(0).toPromise();
service['containerComponentRef'].changeDetectorRef.detectChanges();
- const titles = document.querySelectorAll('.toast-title');
+ const titles = document.querySelectorAll(`.${toastClassPrefix}-title`);
expect(titles.length).toBe(2);
- const messages = document.querySelectorAll('.toast-message');
+ const messages = document.querySelectorAll(`.${toastClassPrefix}-message`);
expect(messages.length).toBe(2);
});
@@ -104,19 +104,19 @@ describe('ToasterService', () => {
service['containerComponentRef'].changeDetectorRef.detectChanges();
expect(selectToasterElement('.fa-exclamation-circle')).toBeTruthy();
- expect(selectToasterContent('.toast-title')).toBe('TITLE_2');
- expect(selectToasterContent('.toast-message')).toBe('MESSAGE_2');
+ expect(selectToasterContent(`.${toastClassPrefix}-title`)).toBe('TITLE_2');
+ expect(selectToasterContent(`.${toastClassPrefix}-message`)).toBe('MESSAGE_2');
});
});
-function clearElements(selector = '.toast') {
+function clearElements(selector = `.${toastClassPrefix}`) {
document.querySelectorAll(selector).forEach(element => element.parentNode.removeChild(element));
}
-function selectToasterContent(selector = '.toast'): string {
+function selectToasterContent(selector = `.${toastClassPrefix}`): string {
return selectToasterElement(selector).textContent.trim();
}
-function selectToasterElement(selector = '.toast'): T {
+function selectToasterElement(selector = `.${toastClassPrefix}`): T {
return document.querySelector(selector);
}
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
index 2ba44dfa7a..c4647cbcd1 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
@@ -22,6 +22,7 @@ import { LoadingDirective } from './directives/loading.directive';
import { NgxDatatableDefaultDirective } from './directives/ngx-datatable-default.directive';
import { NgxDatatableListDirective } from './directives/ngx-datatable-list.directive';
import { TableSortDirective } from './directives/table-sort.directive';
+import { ErrorHandler } from './handlers/error.handler';
import { initLazyStyleHandler } from './handlers/lazy-style.handler';
import { RootParams } from './models/common';
import { THEME_SHARED_ROUTE_PROVIDERS } from './providers/route.provider';
@@ -68,6 +69,8 @@ const declarationsWithExports = [
],
})
export class ThemeSharedModule {
+ constructor(private errorHandler: ErrorHandler) {}
+
static forRoot(options = {} as RootParams): ModuleWithProviders {
return {
ngModule: ThemeSharedModule,
From b1c1e26141c5270ce6fa0baed6f53e21abe2c3e6 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Tue, 6 Oct 2020 09:25:24 +0800
Subject: [PATCH 023/108] Update EfCoreRepositoryExtensions.cs
---
.../Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs | 2 --
1 file changed, 2 deletions(-)
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs
index 1153f5e873..2463062cde 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EfCoreRepositoryExtensions.cs
@@ -5,8 +5,6 @@ using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
namespace Volo.Abp.Domain.Repositories
{
- //TODO: Should work for any IRepository implementation
-
public static class EfCoreRepositoryExtensions
{
public static DbContext GetDbContext(this IReadOnlyBasicRepository repository)
From 360300be002fbf30a3e4b9875ddac32924a2ddd8 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan
Date: Tue, 6 Oct 2020 10:18:30 +0300
Subject: [PATCH 024/108] Docs: shouldn't remove other attributes from img tags
resolved https://github.com/abpframework/abp/issues/5565
---
.../docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs b/modules/docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs
index 1689a209fe..4aba5776df 100644
--- a/modules/docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs
+++ b/modules/docs/src/Volo.Docs.Web/HtmlConverting/HtmlNormalizer.cs
@@ -49,7 +49,7 @@ namespace Volo.Docs.HtmlConverting
var imgTag = match.Groups[0].Value;
var title = GetTitleFromTag(imgTag);
- return $"![\"{title}\"](\"{link}\")
";
+ return $"{imgTag}";
});
}
@@ -82,4 +82,4 @@ namespace Volo.Docs.HtmlConverting
return null;
}
}
-}
\ No newline at end of file
+}
From 3c00231d3fb16fdbf07b233000611eae1ed31056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lkay=20=C4=B0lknur?=
Date: Tue, 6 Oct 2020 12:08:39 +0300
Subject: [PATCH 025/108] additional methods added to the
UINotificationService.
---
.../WebAssembly/IUiNotificationService.cs | 3 +++
.../WebAssembly/NullUiNotificationService.cs | 14 ++++++++++++++
.../BlazoriseUiNotificationService.cs | 15 +++++++++++++++
3 files changed, 32 insertions(+)
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiNotificationService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiNotificationService.cs
index a25bf75ae0..a9816dc325 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiNotificationService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiNotificationService.cs
@@ -5,5 +5,8 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly
public interface IUiNotificationService
{
Task Info(string message);
+ Task Success(string message);
+ Task Warn(string message);
+ Task Error(string message);
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/NullUiNotificationService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/NullUiNotificationService.cs
index d93aaa8e83..85ee10287c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/NullUiNotificationService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/NullUiNotificationService.cs
@@ -9,5 +9,19 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly
{
return Task.CompletedTask;
}
+
+ public Task Success(string message)
+ {
+ return Task.CompletedTask;
+ }
+
+ public Task Warn(string message)
+ {
+ return Task.CompletedTask;
+ }
+ public Task Error(string message)
+ {
+ return Task.CompletedTask;
+ }
}
}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiNotificationService.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiNotificationService.cs
index 5163e05467..549a1f4d07 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiNotificationService.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiNotificationService.cs
@@ -21,5 +21,20 @@ namespace Volo.Abp.BlazoriseUI
Logger.LogInformation(message);
return Task.CompletedTask;
}
+
+ public Task Success(string message)
+ {
+ return Task.CompletedTask;
+ }
+
+ public Task Warn(string message)
+ {
+ return Task.CompletedTask;
+ }
+
+ public Task Error(string message)
+ {
+ return Task.CompletedTask;
+ }
}
}
From 8330e0bd21b6d4a94feacdc9a7137ba13139ad8a Mon Sep 17 00:00:00 2001
From: Mladen Macanovic
Date: Tue, 6 Oct 2020 11:22:45 +0200
Subject: [PATCH 026/108] WIP: Confirmation message implementation and started
the adding options and styles
---
.../WebAssembly/IUiMessageNotifierService.cs | 28 +++++-
.../WebAssembly/UiMessageOptions.cs | 19 ++++
.../BlazoriseUiMessageService.cs | 17 ++--
.../Components/UiMessageAlert.razor | 37 ++++++-
.../Components/UiMessageAlert.razor.cs | 97 +++++++++++++++++--
.../UiMessageNotifierService.cs | 11 ++-
.../Pages/Index.razor | 37 +++----
.../Pages/Index.razor.cs | 62 ++++++++++++
8 files changed, 264 insertions(+), 44 deletions(-)
create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/UiMessageOptions.cs
create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageNotifierService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageNotifierService.cs
index c3f6b917a7..309b73337b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageNotifierService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IUiMessageNotifierService.cs
@@ -7,19 +7,43 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly
{
event EventHandler MessageReceived;
- Task NotifyMessageReceived(string message, string title = null);
+ Task NotifyMessageReceivedAsync(UiMessageType messageType, string message, string title = null);
+
+ Task NotifyConfirmationReceivedAsync(string message, string title, TaskCompletionSource callback);
}
public class UiMessageEventArgs : EventArgs
{
- public UiMessageEventArgs(string message, string title)
+ public UiMessageEventArgs(UiMessageType messageType, string message, string title)
+ {
+ MessageType = messageType;
+ Message = message;
+ Title = title;
+ }
+
+ public UiMessageEventArgs(UiMessageType messageType, string message, string title, TaskCompletionSource callback)
{
+ MessageType = messageType;
Message = message;
Title = title;
+ Callback = callback;
}
+ public UiMessageType MessageType { get; set; }
+
public string Message { get; }
public string Title { get; }
+
+ public TaskCompletionSource Callback { get; }
+ }
+
+ public enum UiMessageType
+ {
+ Info,
+ Success,
+ Warning,
+ Error,
+ Confirmation,
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/UiMessageOptions.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/UiMessageOptions.cs
new file mode 100644
index 0000000000..7909911c7e
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/UiMessageOptions.cs
@@ -0,0 +1,19 @@
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+ public class UiMessageOptions
+ {
+ public bool ShowMessageIcon { get; set; } = true;
+
+ public string OkButtonText { get; set; }
+
+ public object OkButtonIcon { get; set; }
+
+ public string ConfirmButtonText { get; set; }
+
+ public object ConfirmButtonIcon { get; set; }
+
+ public string CancelButtonText { get; set; }
+
+ public object CancelButtonIcon { get; set; }
+ }
+}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs
index 66bc231ce7..e7795f928d 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs
@@ -1,5 +1,4 @@
using System.Threading.Tasks;
-using Blazorise;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.AspNetCore.Components.WebAssembly;
@@ -23,27 +22,31 @@ namespace Volo.Abp.BlazoriseUI
public Task InfoAsync(string message, string title = null)
{
- return uiMessageNotifierService.NotifyMessageReceived(message, title);
+ return uiMessageNotifierService.NotifyMessageReceivedAsync(UiMessageType.Info, message, title);
}
public Task SuccessAsync(string message, string title = null)
{
- return uiMessageNotifierService.NotifyMessageReceived(message, title);
+ return uiMessageNotifierService.NotifyMessageReceivedAsync(UiMessageType.Success, message, title);
}
public Task WarnAsync(string message, string title = null)
{
- return uiMessageNotifierService.NotifyMessageReceived(message, title);
+ return uiMessageNotifierService.NotifyMessageReceivedAsync(UiMessageType.Warning, message, title);
}
public Task ErrorAsync(string message, string title = null)
{
- return uiMessageNotifierService.NotifyMessageReceived(message, title);
+ return uiMessageNotifierService.NotifyMessageReceivedAsync(UiMessageType.Error, message, title);
}
- public Task ConfirmAsync(string message, string title = null)
+ public async Task ConfirmAsync(string message, string title = null)
{
- return Task.FromResult(true);
+ var callback = new TaskCompletionSource();
+
+ await uiMessageNotifierService.NotifyConfirmationReceivedAsync(message, title, callback);
+
+ return await callback.Task;
}
}
}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
index e041053883..0bba328a51 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
@@ -1,17 +1,48 @@
+
@Title
+ @if ( ShowMessageIcon )
+ {
+
+
+ }
@Message
-
-
+ @if ( IsConfirmation )
+ {
+
+
+ }
+ else
+ {
+
+ }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
index b5ee799bdd..dadab8135b 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using Blazorise;
@@ -10,17 +9,21 @@ namespace Volo.Abp.BlazoriseUI.Components
{
public partial class UiMessageAlert : ComponentBase, IDisposable
{
+ private object messageIcon;
+
protected override void OnInitialized()
{
- UiMessageNotifierService.MessageReceived += UiMessageNotifierService_MessageReceived;
+ UiMessageNotifierService.MessageReceived += OnMessageReceived;
base.OnInitialized();
}
- private void UiMessageNotifierService_MessageReceived(object sender, UiMessageEventArgs e)
+ private void OnMessageReceived(object sender, UiMessageEventArgs e)
{
+ MessageType = e.MessageType;
Message = e.Message;
Title = e.Title;
+ Callback = e.Callback;
ModalRef.Show();
}
@@ -29,30 +32,106 @@ namespace Volo.Abp.BlazoriseUI.Components
{
if (UiMessageNotifierService != null)
{
- UiMessageNotifierService.MessageReceived -= UiMessageNotifierService_MessageReceived;
+ UiMessageNotifierService.MessageReceived -= OnMessageReceived;
}
}
- protected Task OnCancelClicked()
+ protected Task OnOkClicked()
{
ModalRef.Hide();
- return Task.CompletedTask;
+ return Okayed.InvokeAsync(null);
+ }
+
+ protected Task OnConfirmClicked()
+ {
+ ModalRef.Hide();
+
+ if (IsConfirmation && Callback != null)
+ {
+ Callback.SetResult(true);
+ }
+
+ return Confirmed.InvokeAsync(null);
}
- protected Task OnOKClicked()
+ protected Task OnCancelClicked()
{
ModalRef.Hide();
- return Task.CompletedTask;
+ if (IsConfirmation && Callback != null)
+ {
+ Callback.SetResult(false);
+ }
+
+ return Canceled.InvokeAsync(null);
}
protected Modal ModalRef { get; set; }
- [Inject] IUiMessageNotifierService UiMessageNotifierService { get; set; }
+ protected virtual bool IsConfirmation
+ => MessageType == UiMessageType.Confirmation;
+
+ protected virtual bool ShowMessageIcon
+ => Options?.ShowMessageIcon ?? true;
+
+ protected virtual object MessageIcon => MessageType switch
+ {
+ UiMessageType.Info => IconName.Info,
+ UiMessageType.Success => IconName.Check,
+ UiMessageType.Warning => IconName.Exclamation,
+ UiMessageType.Error => IconName.Stop,
+ UiMessageType.Confirmation => IconName.QuestionCircle,
+ _ => null,
+ };
+
+ protected virtual string MessageIconColor => MessageType switch
+ {
+ UiMessageType.Info => "#0000ff",
+ UiMessageType.Success => "#00ff00",
+ UiMessageType.Warning => "#ffae00",
+ UiMessageType.Error => "#e8301c",
+ UiMessageType.Confirmation => "#de692f",
+ _ => null,
+ };
+
+ protected virtual string MessageIconStyle
+ {
+ get
+ {
+ var sb = new StringBuilder();
+
+ sb.Append($"color:{MessageIconColor}");
+
+ return sb.ToString();
+ }
+ }
+
+ protected virtual string OkButtonText
+ => Options?.OkButtonText ?? "OK";
+
+ protected virtual string ConfirmButtonText
+ => Options?.ConfirmButtonText ?? "Confirm";
+
+ protected virtual string CancelButtonText
+ => Options?.CancelButtonText ?? "Cancel";
+
+ [Parameter] public UiMessageType MessageType { get; set; }
[Parameter] public string Title { get; set; }
[Parameter] public string Message { get; set; }
+
+ [Parameter] public TaskCompletionSource Callback { get; set; }
+
+ [Parameter] public UiMessageOptions Options { get; set; }
+
+ [Parameter] public EventCallback Okayed { get; set; } // TODO: ?
+
+ [Parameter] public EventCallback Confirmed { get; set; }
+
+ [Parameter] public EventCallback Canceled { get; set; }
+
+ [Inject] protected IUiMessageNotifierService UiMessageNotifierService { get; set; }
}
}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/UiMessageNotifierService.cs b/framework/src/Volo.Abp.BlazoriseUI/UiMessageNotifierService.cs
index cdd86a75f3..3b97045a93 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/UiMessageNotifierService.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/UiMessageNotifierService.cs
@@ -10,9 +10,16 @@ namespace Volo.Abp.BlazoriseUI
{
public event EventHandler MessageReceived;
- public Task NotifyMessageReceived(string message, string title = null)
+ public Task NotifyMessageReceivedAsync(UiMessageType messageType, string message, string title = null)
{
- MessageReceived?.Invoke(this, new UiMessageEventArgs(message, title));
+ MessageReceived?.Invoke(this, new UiMessageEventArgs(messageType, message, title));
+
+ return Task.CompletedTask;
+ }
+
+ public Task NotifyConfirmationReceivedAsync(string message, string title, TaskCompletionSource callback)
+ {
+ MessageReceived?.Invoke(this, new UiMessageEventArgs(UiMessageType.Confirmation, message, title, callback));
return Task.CompletedTask;
}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
index 3f5e2f52fc..5a0d3dd08b 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
@@ -1,7 +1,6 @@
@page "/"
@using Volo.Abp.Users
@using Volo.Abp.MultiTenancy
-@using System.Security.Claims
@using Microsoft.Extensions.Localization
@using MyCompanyName.MyProjectName.Localization
@using Volo.Abp.BlazoriseUI.Components
@@ -20,19 +19,31 @@
UI Message Tests
-
-Welcome to the Application
- +@L["LongWelcomeMessage"]
- @if (!CurrentUser.IsAuthenticated) + @if ( !CurrentUser.IsAuthenticated ) { @L["Login"] @@ -171,20 +182,4 @@ abpframeworkLorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ +
@Body
+
+
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
index f1ebc76453..7d695e9344 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
@@ -8,3 +8,5 @@
@using Volo.Abp.AspNetCore.Components.WebAssembly
@using Blazorise
@using Blazorise.DataGrid
+@using Volo.Abp.BlazoriseUI;
+@using Volo.Abp.BlazoriseUI.Components;
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
index 0bba328a51..6caf37c0b9 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
@@ -9,7 +9,7 @@
Welcome to the Application
@L["LongWelcomeMessage"]
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs index 730da74983..7ac6682659 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using Blazorise; From 104244a05d21e632233f17c7d7387e9d437f55bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?=
+ 
+
+
+
+In this article, we will go through a scenario together and find the solutions to our questions through this scenario. However, since the scenario is not a real-life scenario, it may be strange, please don't get too about this issue :)
+
+## Step-1
+
+Add two new properties to the `AppUser` in the Users folder of the **CustomizeUserDemo.Domain** project as follows:
+
+```csharp
+public string Title { get; protected set; }
+
+public int Reputation { get; protected set; }
+```
+
+## Step-2
+
+Create the Users folder in the **CustomizeUserDemo.DomainShared** project, create the class `UserConsts` inside the folder and update the class you created as below:
+
+```csharp
+public class UserConst
+{
+ public const string TitlePropertyName = "Title";
+
+ public const string ReputationPropertyName = "Reputation";
+
+ public const int MaxTitleLength = 64;
+
+ public const double MaxReputationValue = 1_000;
+
+ public const double MinReputationValue = 1;
+}
+```
+
+## Step-3
+
+Update the `CustomizeUserDemoEfCoreEntityExtensionMappings` class in the **CustomizeUserDemo.EntityFramework** project in the EntityFrameworkCore folder as below:
+
+```csharp
+public static class CustomizeUserDemoEfCoreEntityExtensionMappings
+{
+ private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+ public static void Configure()
+ {
+ CustomizeUserDemoGlobalFeatureConfigurator.Configure();
+ CustomizeUserDemoModuleExtensionConfigurator.Configure();
+
+ OneTimeRunner.Run(() =>
+ {
+ ObjectExtensionManager.Instance
+ .MapEfCoreProperty
+