Merge pull request #8893 from abpframework/maliming/GivenTenantIsNotExist

Throw UserFriendlyException when tenant is not exist.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs

@@ -48,7 +48,12 @@ namespace Pages.Abp.MultiTenancy
             else
             {
                 var tenant = await TenantStore.FindAsync(Input.Name);
-                if (tenant == null || !tenant.IsActive)
+                if (tenant == null)
+                {
+                    throw new UserFriendlyException(L["GivenTenantIsNotExist", Input.Name]);
+                }
+
+                if (!tenant.IsActive)
                 {
                     throw new UserFriendlyException(L["GivenTenantIsNotAvailable", Input.Name]);
                 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/ar.json

@@ -1,6 +1,7 @@
 {
   "culture": "ar",
   "texts": {
+    "GivenTenantIsNotExist": "المستأجر المحدد غير موجود: {0}",
     "GivenTenantIsNotAvailable": "الجهة المحددة غير متاحة: {0}",
     "Tenant": "الجهة",
     "Switch": "تغيير",
@@ -9,4 +10,4 @@
     "SwitchTenant": "تغيير الجهة",
     "NotSelected": "غير محدد"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/cs.json

@@ -1,6 +1,7 @@
 {
   "culture": "cs",
   "texts": {
+    "GivenTenantIsNotExist": "Vybraný tenant neexistuje: {0}",
     "GivenTenantIsNotAvailable": "Zvolený tenant není dostupný: {0}",
     "Tenant": "Tenant",
     "Switch": "změnit",

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/de-DE.json

@@ -1,6 +1,7 @@
 {
   "culture": "de-DE",
   "texts": {
+    "GivenTenantIsNotExist": "Der angegebene Client ist nicht vorhanden: {0}",
     "GivenTenantIsNotAvailable": "Der angegebene Mandant ist nicht verfügbar: {0}",
     "Tenant": "Mandant",
     "Switch": "wechseln",
@@ -9,4 +10,4 @@
     "SwitchTenant": "Mandant wechseln",
     "NotSelected": "Nicht ausgewählt"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/de.json

@@ -1,6 +1,7 @@
 {
   "culture": "de",
   "texts": {
+    "GivenTenantIsNotExist": "Der angegebene Client ist nicht vorhanden: {0}",
     "GivenTenantIsNotAvailable": "Der angegebene Mandant ist nicht verfügbar: {0}",
     "Tenant": "Mandant",
     "Switch": "wechseln",
@@ -9,4 +10,4 @@
     "SwitchTenant": "Mandant wechseln",
     "NotSelected": "Nicht ausgewählt"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en-GB.json

@@ -1,6 +1,7 @@
 {
   "culture": "en-GB",
   "texts": {
+    "GivenTenantIsNotExist": "Given tenant is not exist: {0}",
     "GivenTenantIsNotAvailable": "Given tenant is not available: {0}",
     "Tenant": "Tenant",
     "Switch": "switch",
@@ -9,4 +10,4 @@
     "SwitchTenant": "Switch tenant",
     "NotSelected": "Not selected"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/en.json

@@ -1,6 +1,7 @@
 {
   "culture": "en",
   "texts": {
+    "GivenTenantIsNotExist": "Given tenant is not exist: {0}",
     "GivenTenantIsNotAvailable": "Given tenant is not available: {0}",
     "Tenant": "Tenant",
     "Switch": "switch",
@@ -9,4 +10,4 @@
     "SwitchTenant": "Switch tenant",
     "NotSelected": "Not selected"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/es-mx.json

@@ -1,6 +1,7 @@
 {
   "culture": "es-MX",
   "texts": {
+    "GivenTenantIsNotExist": "El inquilino {0} no existe",
     "GivenTenantIsNotAvailable": "El inquilino {0} no está disponible",
     "Tenant": "Inquilino",
     "Switch": "cambiar",

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/es.json

@@ -1,6 +1,7 @@
 {
   "culture": "es",
   "texts": {
+    "GivenTenantIsNotExist": "El inquilino {0} no existe",
     "GivenTenantIsNotAvailable": "El inquilino {0} no está disponible",
     "Tenant": "Inquilino",
     "Switch": "cambiar",
@@ -9,4 +10,4 @@
     "SwitchTenantHint": "Deje en blanco el campo nombre para cambiar el lado del host.",
     "NotSelected": "No seleccionado"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/fi.json

@@ -1,6 +1,7 @@
 {
   "culture": "fi",
   "texts": {
+    "GivenTenantIsNotExist": "Annettua vuokralaista ei ole olemassa: {0}",
     "GivenTenantIsNotAvailable": "Annettua vuokralaista ei ole saatavilla: {0}",
     "Tenant": "Vuokralainen",
     "Switch": "vaihtaa",
@@ -9,4 +10,4 @@
     "SwitchTenant": "Vaihda vuokralainen",
     "NotSelected": "Ei valittu"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/fr.json

@@ -1,6 +1,7 @@
 {
  "culture": "fr",
  "texts": {
+  "GivenTenantIsNotExist": "Adott bérlő nem létezik: {0}",
   "GivenTenantIsNotAvailable": "Le Tenant donné n'est pas disponible: {0}",
   "Tenant": "Tenant",
   "Switch": "Changer",
@@ -9,4 +10,4 @@
   "SwitchTenant": "Changer le Tenant",
   "NotSelected": "Non séléctionné"
  }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/hu.json

@@ -1,6 +1,7 @@
 {
     "culture": "hu",
     "texts": {
+      "GivenTenantIsNotExist": "Adott bérlő nem létezik: {0}",
       "GivenTenantIsNotAvailable": "A megadott előfizető nem érhető el: {0}",
       "Tenant": "Előfizető",
       "Switch": "váltás",
@@ -9,4 +10,4 @@
       "SwitchTenant": "Előfizető váltás",
       "NotSelected": "Nincs kiválasztva"
     }
-  }
+  }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/nl.json

@@ -1,6 +1,7 @@
 {
   "culture": "nl",
   "texts": {
+    "GivenTenantIsNotExist": "Opgegeven huurder bestaat niet: {0}",
     "GivenTenantIsNotAvailable": "Gegeven klant is niet beschikbaar: {0}",
     "Tenant": "Klant",
     "Switch": "Schakel over",
@@ -9,4 +10,4 @@
     "SwitchTenant": "Klant wisselen",
     "NotSelected": "Niet geselecteerd"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/pl-PL.json

@@ -1,6 +1,7 @@
 {
   "culture": "pl-PL",
   "texts": {
+    "GivenTenantIsNotExist": "Podany najemca nie istnieje: {0}",
     "GivenTenantIsNotAvailable": "Podany tenant jest niedostępny: {0}",
     "Tenant": "Tenant",
     "Switch": "zmień",
@@ -8,4 +9,4 @@
     "SwitchTenantHint": "Pozostaw pole nazwy puste, aby przełączyć się na stronę hosta.",
     "NotSelected": "Nie wybrano"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/pt-BR.json

@@ -1,6 +1,7 @@
 {
   "culture": "pt-BR",
   "texts": {
+    "GivenTenantIsNotExist": "O inquilino dado não existe: {0}",
     "GivenTenantIsNotAvailable": "Inquilino não está disponível: {0}",
     "Tenant": "Inquilino",
     "Switch": "trocar",
@@ -9,4 +10,4 @@
     "SwitchTenant": "Alterar Inquilino",
     "NotSelected": "Não selecionado"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/ru.json

@@ -1,6 +1,7 @@
 {
   "culture": "ru",
   "texts": {
+    "GivenTenantIsNotExist": "Данный арендатор не существует: {0}",
     "GivenTenantIsNotAvailable": "Данный арендатор недоступен: {0}",
     "Tenant": "Арендатор",
     "Switch": "переключиться",

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/sl.json

@@ -1,6 +1,7 @@
 {
   "culture": "sl",
   "texts": {
+    "GivenTenantIsNotExist": "Dani najemnik ne obstaja: {0}",
     "GivenTenantIsNotAvailable": "Najemnik ni na voljo: {0}",
     "Tenant": "Najemnik",
     "Switch": "Zamenjaj",

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/tr.json

@@ -1,6 +1,7 @@
 {
   "culture": "tr",
   "texts": {
+    "GivenTenantIsNotExist": "İstenilen müşteri bulunamadı: {0}",
     "GivenTenantIsNotAvailable": "İstenilen müşteri bulunamadı: {0}",
     "Tenant": "Müşteri",
     "Switch": "değiştir",
@@ -9,4 +10,4 @@
     "SwitchTenant": "Müşteri değiştir",
     "NotSelected": "Seçili değil"
   }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/vi.json

@@ -1,6 +1,7 @@
 {
   "culture": "vi",
   "texts": {
+    "GivenTenantIsNotExist": "Người thuê đã cho không tồn tại: {0}",
     "GivenTenantIsNotAvailable": "Người thuê không có sẵn: {0}",
     "Tenant": "Người thuê",
     "Switch": "Chuyển đổi",

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/zh-Hans.json

@@ -1,6 +1,7 @@
 {
     "culture": "zh-Hans",
     "texts": {
+      "GivenTenantIsNotExist": "给定的租户不存在: {0}",
       "GivenTenantIsNotAvailable": "给定的租户不可用: {0}",
       "Tenant": "租户",
       "Switch": "切换",
@@ -9,4 +10,4 @@
       "SwitchTenant": "切换租户",
       "NotSelected": "未选中"
     }
-  }
+  }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization/zh-Hant.json

@@ -1,6 +1,7 @@
 {
   "culture": "zh-Hant",
   "texts": {
+    "GivenTenantIsNotExist": "指定的租戶不存在: {0}",
     "GivenTenantIsNotAvailable": "指定的租戶不可用: {0}",
     "SwitchTenant": "切換租戶",
     "Name": "名稱",
@@ -9,4 +10,4 @@
     "Switch": "切換",
     "NotSelected": "尚未選定"
   }
-}
+}