Browse Source

Merge pull request #19326 from abpframework/issue-19324

Adding toastr notifications with new "SuccessfullySaved" localization
pull/19425/head
oykuermann 2 years ago
committed by GitHub
parent
commit
8029addef0
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json
  2. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json
  3. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json
  4. 7
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/el.json
  5. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en-GB.json
  6. 3
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
  7. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json
  8. 3
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fa.json
  9. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fi.json
  10. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fr.json
  11. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hi.json
  12. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hr.json
  13. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hu.json
  14. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/is.json
  15. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/it.json
  16. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json
  17. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl-PL.json
  18. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json
  19. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json
  20. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json
  21. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sk.json
  22. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json
  23. 3
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
  24. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json
  25. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json
  26. 5
      framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json
  27. 31
      npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts
  28. 17
      npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
  29. 21
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
  30. 36
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
  31. 48
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
  32. 23
      npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
  33. 2
      npm/ng-packs/packages/theme-shared/src/lib/services/create-error-component.service.ts

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "حفظ...",
"Actions": "الإجراءات",
"Delete": "حذف",
"SuccessfullyDeleted": "تم الحذف بنجاح",
"SavedSuccessfully": "تم الحفظ بنجاح",
"DeletedSuccessfully": "تم الحذف بنجاح",
"Edit": "تعديل",
"Refresh": "تحديث",
"Language": "لغة",
@ -59,4 +60,4 @@
"Theme": "سمة",
"NotAssigned": "غيرمعتمد"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Ukládám...",
"Actions": "Akce",
"Delete": "Smazat",
"SuccessfullyDeleted": "Úspěšně smazáno",
"SavedSuccessfully": "Úspěšně uloženo",
"DeletedSuccessfully": "Úspěšně smazáno",
"Edit": "Upravit",
"Refresh": "Obnovit",
"Language": "Jazyk",
@ -59,4 +60,4 @@
"Theme": "Téma",
"NotAssigned": "Nepřiřazena"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Speichern...",
"Actions": "Aktionen",
"Delete": "Löschen",
"SuccessfullyDeleted": "Erfolgreich gelöscht",
"SavedSuccessfully": "Erfolgreich gespeichert",
"DeletedSuccessfully": "Erfolgreich gelöscht",
"Edit": "Bearbeiten",
"Refresh": "Aktualisieren",
"Language": "Sprache",
@ -59,4 +60,4 @@
"Theme": "Thema",
"NotAssigned": "Nicht zugeordnet"
}
}
}

7
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/el.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Αποθηκεύεται...",
"Actions": "Ενέργειες",
"Delete": "Διαγραφή",
"SuccessfullyDeleted": "Διαγράφηκε με επιτυχία",
"SavedSuccessfully": "Αποθηκεύτηκε με επιτυχία",
"DeletedSuccessfully": "Διαγράφηκε με επιτυχία",
"Edit": "Επεξεργασία",
"Refresh": "Ανανέωση",
"Language": "Γλώσσα",
@ -49,8 +50,8 @@
"ItemWillBeDeletedMessageWithFormat": "Το {0} θα διαγραφεί",
"ItemWillBeDeletedMessage": "Αυτό το στοιχείο θα διαγραφεί!",
"ManageYourAccount": "Διαχείριση Λογαριασμού",
"OthersGroup":"άλλος",
"OthersGroup": "άλλος",
"Today": "Σήμερα",
"Apply": "Ισχύουν"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en-GB.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Saving",
"Actions": "Actions",
"Delete": "Delete",
"SuccessfullyDeleted": "Successfully deleted",
"SavedSuccessfully": "Saved successfully",
"DeletedSuccessfully": "Deleted successfully",
"Edit": "Edit",
"Refresh": "Refresh",
"Language": "Language",
@ -54,4 +55,4 @@
"Today": "Today",
"Apply": "Apply"
}
}
}

3
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Saving...",
"Actions": "Actions",
"Delete": "Delete",
"SuccessfullyDeleted": "Successfully deleted",
"SavedSuccessfully": "Saved successfully",
"DeletedSuccessfully": "Deleted successfully",
"Edit": "Edit",
"Refresh": "Refresh",
"Language": "Language",

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Guardando...",
"Actions": "Opciones",
"Delete": "Borrar",
"SuccessfullyDeleted": "Eliminado con éxito",
"SavedSuccessfully": "Guardado con éxito",
"DeletedSuccessfully": "Eliminado con éxito",
"Edit": "Editar",
"Refresh": "Actualizar",
"Language": "Idioma",
@ -59,4 +60,4 @@
"Theme": "Tema",
"NotAssigned": "No asignado"
}
}
}

3
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fa.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "ذخیره...",
"Actions": "عملیات",
"Delete": "حذف",
"SuccessfullyDeleted": "با موفقیت حذف شد",
"SavedSuccessfully": "با موفقیت ذخیره شد",
"DeletedSuccessfully": "با موفقیت حذف شد",
"Edit": "ویرایش",
"Refresh": "رفرش",
"Language": "زبان",

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fi.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Tallennetaan...",
"Actions": "Toiminnot",
"Delete": "Poista",
"SuccessfullyDeleted": "Poistettu onnistuneesti",
"SavedSuccessfully": "Tallennettu onnistuneesti",
"DeletedSuccessfully": "Poistettu onnistuneesti",
"Edit": "Muokkaa",
"Refresh": "Virkistä",
"Language": "Kieli",
@ -59,4 +60,4 @@
"Theme": "Teema",
"NotAssigned": "Ei määritetty"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fr.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Enregistrement...",
"Actions": "Actions",
"Delete": "Supprimer",
"SuccessfullyDeleted": "Supprimé avec succès",
"SavedSuccessfully": "Enregistré avec succès",
"DeletedSuccessfully": "Supprimé avec succès",
"Edit": "Modifier",
"Refresh": "Actualiser",
"Language": "Langue",
@ -59,4 +60,4 @@
"Theme": "Thème",
"NotAssigned": "Non attribué"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hi.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "सहेजा जा रहा है...",
"Actions": "कार्रवाई",
"Delete": "हटाएं",
"SuccessfullyDeleted": "सफलतापूर्वक हटा दिया गया",
"SavedSuccessfully": "सफलतापूर्वक सहेजा गया",
"DeletedSuccessfully": "सफलतापूर्वक हटा दिया गया",
"Edit": "संपादित करें",
"Refresh": "ताज़ा करना",
"Language": "भाषा: हिन्दी",
@ -59,4 +60,4 @@
"Theme": "विषय",
"NotAssigned": "सौंपा नहीं गया है"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hr.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Spremanje...",
"Actions": "Akcije",
"Delete": "Izbrisati",
"SuccessfullyDeleted": "Uspješno izbrisano",
"SavedSuccessfully": "Uspešno zabeleženo",
"DeletedSuccessfully": "Uspješno izbrisano",
"Edit": "Uredi",
"Refresh": "Osvježi",
"Language": "Jezik",
@ -59,4 +60,4 @@
"Theme": "Tema",
"NotAssigned": "Nije dodijeljeno"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hu.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Mentés...",
"Actions": "Műveletek",
"Delete": "Törlés",
"SuccessfullyDeleted": "Sikeresen törölve",
"SavedSuccessfully": "Sikeresen mentve",
"DeletedSuccessfully": "Sikeresen törölve",
"Edit": "Szerkesztés",
"Refresh": "Frissítés",
"Language": "Nyelv",
@ -59,4 +60,4 @@
"Theme": "Téma",
"NotAssigned": "Nem kijelölt"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/is.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Er að vista...",
"Actions": "Aðgerðir",
"Delete": "Eyða",
"SuccessfullyDeleted": "Tókst að eyða",
"SavedSuccessfully": "Tókst að vista",
"DeletedSuccessfully": "Tókst að eyða",
"Edit": "Breyta",
"Refresh": "Endurhlaða",
"Language": "Tungumál",
@ -59,4 +60,4 @@
"Theme": "Þema",
"NotAssigned": "Ekki skráður"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/it.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Salvataggio...",
"Actions": "Azioni",
"Delete": "Elimina",
"SuccessfullyDeleted": "Eliminato con successo",
"SavedSuccessfully": "Salvato con successo",
"DeletedSuccessfully": "Eliminato con successo",
"Edit": "Modifica",
"Refresh": "Ricarica",
"Language": "Lingua",
@ -59,4 +60,4 @@
"Theme": "Tema",
"NotAssigned": "Non assegnato"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Opslaan...",
"Actions": "Acties",
"Delete": "Verwijder",
"SuccessfullyDeleted": "Succesvol verwijderd",
"SavedSuccessfully": "Succesvol opgeslagen",
"DeletedSuccessfully": "Succesvol verwijderd",
"Edit": "Bewerk",
"Refresh": "Ververs",
"Language": "Taal",
@ -59,4 +60,4 @@
"Theme": "Thema",
"NotAssigned": "Niet toegekend"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl-PL.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Zapisywanie...",
"Actions": "Akcje",
"Delete": "Usuń",
"SuccessfullyDeleted": "Pomyślnie usunięto",
"SavedSuccessfully": "Pomyślnie zapisano",
"DeletedSuccessfully": "Pomyślnie usunięto",
"Edit": "Edytuj",
"Refresh": "Odśwież",
"Language": "Język",
@ -59,4 +60,4 @@
"Theme": "Temat",
"NotAssigned": "Nie przypisano"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Salvando...",
"Actions": "Ações",
"Delete": "Excluir",
"SuccessfullyDeleted": "Excluído com sucesso",
"SavedSuccessfully": "Salvo com sucesso",
"DeletedSuccessfully": "Excluído com sucesso",
"Edit": "Editar",
"Refresh": "Atualizar",
"Language": "Idioma",
@ -59,4 +60,4 @@
"Theme": "Tema",
"NotAssigned": "Não atribuído"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Se salvează...",
"Actions": "Acţiuni",
"Delete": "Şterge",
"SuccessfullyDeleted": "Șters cu succes",
"SavedSuccessfully": "Salvat cu succes",
"DeletedSuccessfully": "Șters cu succes",
"Edit": "Editează",
"Refresh": "Reîncarcă",
"Language": "Limba",
@ -59,4 +60,4 @@
"Theme": "Temă",
"NotAssigned": "Nealocat"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Сохранение...",
"Actions": "Действия",
"Delete": "Удалить",
"SuccessfullyDeleted": "Успешно удалено",
"SavedSuccessfully": "Успешно сохранено",
"DeletedSuccessfully": "Успешно удалено",
"Edit": "Редактировать",
"Refresh": "Обновить",
"Language": "Язык",
@ -59,4 +60,4 @@
"Theme": "Тема",
"NotAssigned": "Не назначен"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sk.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Úkladanie...",
"Actions": "Akcie",
"Delete": "Odstrániť",
"SuccessfullyDeleted": "Úspešne odstránené",
"SavedSuccessfully": "Úspešne uložené",
"DeletedSuccessfully": "Úspešne odstránené",
"Edit": "Upraviť",
"Refresh": "Obnoviť",
"Language": "Jazyk",
@ -59,4 +60,4 @@
"Theme": "Téma",
"NotAssigned": "Nepridelené"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Shranjujem...",
"Actions": "Dejanja",
"Delete": "Izbriši",
"SuccessfullyDeleted": "Uspešno izbrisano",
"SavedSuccessfully": "Uspešno shranjeno",
"DeletedSuccessfully": "Uspešno izbrisano",
"Edit": "Uredi",
"Refresh": "Osveži",
"Language": "Jezik",
@ -59,4 +60,4 @@
"Theme": "Tema",
"NotAssigned": "Ni dodeljena"
}
}
}

3
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Kaydediliyor...",
"Actions": "İşlemler",
"Delete": "Sil",
"SuccessfullyDeleted": "Başarıyla silindi",
"SavedSuccessfully": "Başarıyla kaydedildi",
"DeletedSuccessfully": "Başarıyla silindi",
"Edit": "Düzenle",
"Refresh": "Yenile",
"Language": "Dil",

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "Đang lưu...",
"Actions": "Hành động",
"Delete": "Xóa",
"SuccessfullyDeleted": "Đã xóa thành công",
"SavedSuccessfully": "Đã lưu thành công",
"DeletedSuccessfully": "Đã xóa thành công",
"Edit": "Sửa",
"Refresh": "Làm mới",
"Language": "Ngôn ngữ",
@ -59,4 +60,4 @@
"Theme": "chủ đề",
"NotAssigned": "Không được chỉ định"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "保存中...",
"Actions": "操作",
"Delete": "删除",
"SuccessfullyDeleted": "删除成功",
"SavedSuccessfully": "保存成功",
"DeletedSuccessfully": "删除成功",
"Edit": "编辑",
"Refresh": "刷新",
"Language": "语言",
@ -59,4 +60,4 @@
"Theme": "主题",
"NotAssigned": "未分配"
}
}
}

5
framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json

@ -13,7 +13,8 @@
"SavingWithThreeDot": "保存中...",
"Actions": "操作",
"Delete": "刪除",
"SuccessfullyDeleted": "刪除成功",
"SavedSuccessfully": "保存成功",
"DeletedSuccessfully": "刪除成功",
"Edit": "修改",
"Refresh": "更新",
"Language": "語言",
@ -59,4 +60,4 @@
"Theme": "主題",
"NotAssigned": "未分配"
}
}
}

31
npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts

@ -1,6 +1,6 @@
import { ProfileDto, ProfileService } from '@abp/ng.account.core/proxy';
import { Confirmation, ConfirmationService, ToasterService } from '@abp/ng.theme.shared';
import { Component, Inject, Injector, OnInit, ViewEncapsulation } from '@angular/core';
import { Component, inject, Injector, OnInit } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { finalize, filter } from 'rxjs/operators';
import { Account } from '../../models/account';
@ -31,25 +31,24 @@ export class PersonalSettingsComponent
Account.PersonalSettingsComponentInputs,
Account.PersonalSettingsComponentOutputs
{
private readonly fb = inject(UntypedFormBuilder);
protected readonly toasterService = inject(ToasterService);
protected readonly profileService = inject(ProfileService);
protected readonly manageProfileState = inject(ManageProfileStateService);
protected readonly authService = inject(AuthService);
protected readonly confirmationService = inject(ConfirmationService);
protected readonly configState = inject(ConfigStateService);
protected readonly isPersonalSettingsChangedConfirmationActive = inject(
RE_LOGIN_CONFIRMATION_TOKEN,
);
private readonly injector = inject(Injector);
selected?: ProfileDto;
form!: UntypedFormGroup;
inProgress?: boolean;
constructor(
private fb: UntypedFormBuilder,
private toasterService: ToasterService,
private profileService: ProfileService,
private manageProfileState: ManageProfileStateService,
private readonly authService: AuthService,
private confirmationService: ConfirmationService,
private configState: ConfigStateService,
@Inject(RE_LOGIN_CONFIRMATION_TOKEN)
private isPersonalSettingsChangedConfirmationActive: boolean,
protected injector: Injector,
) {}
buildForm() {
this.selected = this.manageProfileState.getProfile();
if (!this.selected) {
@ -76,10 +75,10 @@ export class PersonalSettingsComponent
this.configState.refreshAppState();
this.toasterService.success('AbpAccount::PersonalSettingsSaved', 'Success', { life: 5000 });
if(isRefreshTokenExists){
if (isRefreshTokenExists) {
return this.authService.refreshToken();
}
if (isLogOutConfirmMessageVisible) {
this.showLogoutConfirmMessage();
}

17
npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts

@ -11,7 +11,7 @@ import {
LocaleDirection,
ToasterService,
} from '@abp/ng.theme.shared';
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { finalize } from 'rxjs/operators';
import { FeatureManagement } from '../../models/feature-management';
@ -31,6 +31,12 @@ export class FeatureManagementComponent
FeatureManagement.FeatureManagementComponentInputs,
FeatureManagement.FeatureManagementComponentOutputs
{
protected readonly track = inject(TrackByService);
protected readonly toasterService = inject(ToasterService);
protected readonly service = inject(FeaturesService);
protected readonly configState = inject(ConfigStateService);
protected readonly confirmationService = inject(ConfirmationService);
@Input()
providerKey: string;
@ -72,14 +78,6 @@ export class FeatureManagementComponent
modalBusy = false;
constructor(
public readonly track: TrackByService,
private toasterService: ToasterService,
protected service: FeaturesService,
protected configState: ConfigStateService,
protected confirmationService: ConfirmationService,
) {}
openModal() {
if (!this.providerName) {
throw new Error('providerName is required.');
@ -127,6 +125,7 @@ export class FeatureManagementComponent
.subscribe(() => {
this.visible = false;
this.toasterService.success('AbpFeatureManagement::Saved');
if (!this.providerKey) {
// to refresh host's features
this.configState.refreshAppState().subscribe();

21
npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts

@ -1,13 +1,13 @@
import { ListService, PagedAndSortedResultRequestDto, PagedResultDto } from '@abp/ng.core';
import { IdentityRoleDto, IdentityRoleService } from '@abp/ng.identity/proxy';
import { ePermissionManagementComponents } from '@abp/ng.permission-management';
import {Confirmation, ConfirmationService, ToasterService} from '@abp/ng.theme.shared';
import { Confirmation, ConfirmationService, ToasterService } from '@abp/ng.theme.shared';
import {
EXTENSIONS_IDENTIFIER,
FormPropData,
generateFormFromProps,
} from '@abp/ng.components/extensible';
import { Component, Injector, OnInit } from '@angular/core';
import { Component, inject, Injector, OnInit } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms';
import { finalize } from 'rxjs/operators';
import { eIdentityComponents } from '../../enums/components';
@ -24,6 +24,12 @@ import { eIdentityComponents } from '../../enums/components';
],
})
export class RolesComponent implements OnInit {
protected readonly list = inject(ListService<PagedAndSortedResultRequestDto>);
protected readonly confirmationService = inject(ConfirmationService);
protected readonly toasterService = inject(ToasterService);
private readonly injector = inject(Injector);
protected readonly service = inject(IdentityRoleService);
data: PagedResultDto<IdentityRoleDto> = { items: [], totalCount: 0 };
form!: UntypedFormGroup;
@ -44,14 +50,6 @@ export class RolesComponent implements OnInit {
this.visiblePermissions = event;
};
constructor(
public readonly list: ListService<PagedAndSortedResultRequestDto>,
protected confirmationService: ConfirmationService,
private toasterService: ToasterService,
protected injector: Injector,
protected service: IdentityRoleService,
) {}
ngOnInit() {
this.hookToQuery();
}
@ -90,6 +88,7 @@ export class RolesComponent implements OnInit {
.pipe(finalize(() => (this.modalBusy = false)))
.subscribe(() => {
this.isModalVisible = false;
this.toasterService.success('AbpUi::SavedSuccessfully');
this.list.get();
});
}
@ -101,7 +100,7 @@ export class RolesComponent implements OnInit {
})
.subscribe((status: Confirmation.Status) => {
if (status === Confirmation.Status.confirm) {
this.toasterService.success('AbpUi::SuccessfullyDeleted');
this.toasterService.success('AbpUi::DeletedSuccessfully');
this.service.delete(id).subscribe(() => this.list.get());
}
});

36
npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

@ -6,7 +6,12 @@ import {
IdentityUserService,
} from '@abp/ng.identity/proxy';
import { ePermissionManagementComponents } from '@abp/ng.permission-management';
import {Confirmation, ConfirmationService, eFormComponets, ToasterService} from '@abp/ng.theme.shared';
import {
Confirmation,
ConfirmationService,
eFormComponets,
ToasterService,
} from '@abp/ng.theme.shared';
import {
EXTENSIONS_IDENTIFIER,
FormPropData,
@ -14,13 +19,19 @@ import {
} from '@abp/ng.components/extensible';
import {
Component,
inject,
Injector,
OnInit,
TemplateRef,
TrackByFunction,
ViewChild,
} from '@angular/core';
import { AbstractControl, UntypedFormArray, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import {
AbstractControl,
UntypedFormArray,
UntypedFormBuilder,
UntypedFormGroup,
} from '@angular/forms';
import { finalize, switchMap, tap } from 'rxjs/operators';
import { eIdentityComponents } from '../../enums/components';
@ -36,6 +47,13 @@ import { eIdentityComponents } from '../../enums/components';
],
})
export class UsersComponent implements OnInit {
protected readonly list = inject(ListService<GetIdentityUsersInput>);
protected readonly confirmationService = inject(ConfirmationService);
protected readonly service = inject(IdentityUserService);
protected readonly toasterService = inject(ToasterService);
private readonly fb = inject(UntypedFormBuilder);
private readonly injector = inject(Injector);
data: PagedResultDto<IdentityUserDto> = { items: [], totalCount: 0 };
@ViewChild('modalContent', { static: false })
@ -61,7 +79,7 @@ export class UsersComponent implements OnInit {
entityDisplayName: string;
inputKey=eFormComponets.FormCheckboxComponent
inputKey = eFormComponets.FormCheckboxComponent;
trackByFn: TrackByFunction<AbstractControl> = (index, item) => Object.keys(item)[0] || index;
@ -73,15 +91,6 @@ export class UsersComponent implements OnInit {
return ((this.form.get('roleNames') as UntypedFormArray)?.controls as UntypedFormGroup[]) || [];
}
constructor(
public readonly list: ListService<GetIdentityUsersInput>,
protected confirmationService: ConfirmationService,
protected service: IdentityUserService,
private toasterService: ToasterService,
protected fb: UntypedFormBuilder,
protected injector: Injector,
) {}
ngOnInit() {
this.hookToQuery();
}
@ -158,6 +167,7 @@ export class UsersComponent implements OnInit {
.pipe(finalize(() => (this.modalBusy = false)))
.subscribe(() => {
this.isModalVisible = false;
this.toasterService.success('AbpUi::SavedSuccessfully');
this.list.get();
});
}
@ -170,7 +180,7 @@ export class UsersComponent implements OnInit {
.subscribe((status: Confirmation.Status) => {
if (status === Confirmation.Status.confirm) {
this.service.delete(id).subscribe(() => {
this.toasterService.success('AbpUi::SuccessfullyDeleted');
this.toasterService.success('AbpUi::DeletedSuccessfully');
this.list.get();
});
}

48
npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

@ -7,11 +7,12 @@ import {
ProviderInfoDto,
UpdatePermissionDto,
} from '@abp/ng.permission-management/proxy';
import { LocaleDirection } from '@abp/ng.theme.shared';
import { LocaleDirection, ToasterService } from '@abp/ng.theme.shared';
import {
Component,
ElementRef,
EventEmitter,
inject,
Input,
Output,
QueryList,
@ -41,16 +42,21 @@ type PermissionWithGroupName = PermissionGrantInfoDto & {
overflow-y: scroll;
}
.scroll-in-modal {
overflow:auto;
max-height: calc(100vh - 15rem)
overflow: auto;
max-height: calc(100vh - 15rem);
}
`,
],
})
export class PermissionManagementComponent
implements
PermissionManagement.PermissionManagementComponentInputs,
PermissionManagement.PermissionManagementComponentOutputs {
PermissionManagement.PermissionManagementComponentInputs,
PermissionManagement.PermissionManagementComponentOutputs
{
protected readonly service = inject(PermissionsService);
protected readonly configState = inject(ConfigStateService);
protected readonly toasterService = inject(ToasterService);
@Input()
readonly providerName!: string;
@ -117,8 +123,6 @@ export class PermissionManagementComponent
trackByFn: TrackByFunction<PermissionGroupDto> = (_, item) => item.name;
constructor(protected service: PermissionsService, protected configState: ConfigStateService) { }
getChecked(name: string) {
return (this.permissions.find(per => per.name === name) || { isGranted: false }).isGranted;
}
@ -130,19 +134,20 @@ export class PermissionManagementComponent
return;
}
const margin = `margin-${(document.body.dir as LocaleDirection) === 'rtl' ? 'right' : 'left'
}.px`;
const margin = `margin-${
(document.body.dir as LocaleDirection) === 'rtl' ? 'right' : 'left'
}.px`;
const permissions =
(this.data.groups.find(group => group.name === this.selectedGroup?.name) || {}).permissions ||
[];
this.selectedGroupPermissions = permissions.map(
permission =>
({
...permission,
style: { [margin]: findMargin(permissions, permission) },
isGranted: (this.permissions.find(per => per.name === permission.name) || {}).isGranted,
} as unknown as PermissionWithStyle),
({
...permission,
style: { [margin]: findMargin(permissions, permission) },
isGranted: (this.permissions.find(per => per.name === permission.name) || {}).isGranted,
}) as unknown as PermissionWithStyle,
);
}
@ -199,19 +204,19 @@ export class PermissionManagementComponent
if (per.name === clickedPermissions.parentName) {
parentPermission = per;
}
})
});
this.permissions.forEach(per => {
if (parentPermission.name === per.parentName) {
per.isGranted && childPermissionGrantedCount++;
}
})
});
if (childPermissionGrantedCount === 1 && !parentPermission.isGranted) {
this.permissions = this.permissions.map(per => {
if (per.name === parentPermission.name) {
per.isGranted = true;
}
return per;
})
});
}
return;
}
@ -220,16 +225,16 @@ export class PermissionManagementComponent
per.isGranted = false;
}
return per;
})
});
}
updateSelectedGroupPermissions(clickedPermissions: PermissionGrantInfoDto) {
this.selectedGroupPermissions = this.selectedGroupPermissions.map(per => {
if (per.name === clickedPermissions.name) {
per.isGranted = !per.isGranted
per.isGranted = !per.isGranted;
}
return per;
})
});
}
setTabCheckboxState() {
@ -310,7 +315,7 @@ export class PermissionManagementComponent
const changedPermissions: UpdatePermissionDto[] = this.permissions
.filter(per =>
(unchangedPermissions.find(unchanged => unchanged.name === per.name) || {}).isGranted ===
per.isGranted
per.isGranted
? false
: true,
)
@ -332,6 +337,7 @@ export class PermissionManagementComponent
)
.subscribe(() => {
this.visible = false;
this.toasterService.success('AbpUi::SavedSuccessfully');
});
}

23
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts

@ -1,13 +1,13 @@
import { ListService, PagedResultDto } from '@abp/ng.core';
import { eFeatureManagementComponents } from '@abp/ng.feature-management';
import { GetTenantsInput, TenantDto, TenantService } from '@abp/ng.tenant-management/proxy';
import {Confirmation, ConfirmationService, ToasterService} from '@abp/ng.theme.shared';
import { Confirmation, ConfirmationService, ToasterService } from '@abp/ng.theme.shared';
import {
EXTENSIONS_IDENTIFIER,
FormPropData,
generateFormFromProps,
} from '@abp/ng.components/extensible';
import { Component, Injector, OnInit } from '@angular/core';
import { Component, inject, Injector, OnInit } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { finalize } from 'rxjs/operators';
import { eTenantManagementComponents } from '../../enums/components';
@ -24,6 +24,13 @@ import { eTenantManagementComponents } from '../../enums/components';
],
})
export class TenantsComponent implements OnInit {
protected readonly list = inject(ListService<GetTenantsInput>);
protected readonly confirmationService = inject(ConfirmationService);
protected readonly service = inject(TenantService);
protected readonly toasterService = inject(ToasterService);
private readonly fb = inject(UntypedFormBuilder);
private readonly injector = inject(Injector);
data: PagedResultDto<TenantDto> = { items: [], totalCount: 0 };
selected!: TenantDto;
@ -48,15 +55,6 @@ export class TenantsComponent implements OnInit {
this.visibleFeatures = value;
};
constructor(
public readonly list: ListService<GetTenantsInput>,
private injector: Injector,
private confirmationService: ConfirmationService,
private service: TenantService,
private toasterService: ToasterService,
private fb: UntypedFormBuilder,
) {}
ngOnInit() {
this.hookToQuery();
}
@ -93,6 +91,7 @@ export class TenantsComponent implements OnInit {
.pipe(finalize(() => (this.modalBusy = false)))
.subscribe(() => {
this.isModalVisible = false;
this.toasterService.success('AbpUi::SavedSuccessfully');
this.list.get();
});
}
@ -108,7 +107,7 @@ export class TenantsComponent implements OnInit {
)
.subscribe((status: Confirmation.Status) => {
if (status === Confirmation.Status.confirm) {
this.toasterService.success('AbpUi::SuccessfullyDeleted');
this.toasterService.success('AbpUi::DeletedSuccessfully');
this.service.delete(id).subscribe(() => this.list.get());
}
});

2
npm/ng-packs/packages/theme-shared/src/lib/services/create-error-component.service.ts

@ -23,7 +23,7 @@ export class CreateErrorComponentService {
protected readonly rendererFactory = inject(RendererFactory2);
protected readonly cfRes = inject(ComponentFactoryResolver);
protected readonly routerEvents = inject(RouterEvents);
protected readonly injector = inject(Injector);
private readonly injector = inject(Injector);
protected readonly httpErrorConfig = inject(HTTP_ERROR_CONFIG);
componentRef: ComponentRef<HttpErrorWrapperComponent> | null = null;

Loading…
Cancel
Save