Merge pull request #91 from emeraudeframework/dev

Remove useless wrapper
empages · Jan 12, 2022 · 6b5e7c3 · 6b5e7c3
2 parents 5c6f310 + 6957822
commit 6b5e7c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/Emeraude.Application.Admin.EmPages/Schema/EmPageSchemaSettings.cs b/src/Emeraude.Application.Admin.EmPages/Schema/EmPageSchemaSettings.cs
@@ -189,14 +189,4 @@ public EmPageSchemaDescription BuildDescription(IEnumerable<Assembly> targetAsse
 
         return description;
     }
-
-    /// <summary>
-    /// Gets model property placeholder.
-    /// </summary>
-    /// <param name="property"></param>
-    /// <returns></returns>
-    public string GetModelPlaceholder(Expression<Func<TModel, object>> property)
-    {
-        return EmPagesPlaceholders.GetModelPlaceholder(this.Route, property);
-    }
 }
diff --git a/src/Emeraude.Defaults/Extensions/EmPageSchemaSettingsExtensions.cs b/src/Emeraude.Defaults/Extensions/EmPageSchemaSettingsExtensions.cs
@@ -3,6 +3,7 @@
 using System.Net.Http;
 using Emeraude.Application.Admin.EmPages.Schema;
 using Emeraude.Application.Admin.EmPages.Shared;
+using Emeraude.Application.Admin.EmPages.Utilities;
 using Emeraude.Defaults.Options;
 using Emeraude.Essentials.Extensions;
 
@@ -65,7 +66,7 @@ public static class EmPageSchemaSettingsExtensions
             Title = defaultOptions.CurrentBreadcrumbTitle,
             Order = 1,
             IsActive = true,
-            Href = $"/admin/{settings.Route}/{settings.GetModelPlaceholder(x => x.Id)}",
+            Href = $"/admin/{settings.Route}/{EmPagesPlaceholders.GetModelPlaceholder<TModel>(settings.Route, x => x.Id)}",
             HideContextually = true,
         };
 
@@ -95,21 +96,21 @@ public static EmPageSchemaSettings<TModel> ApplyDefaultEmPageActions<TModel>(thi
         {
             Order = 0,
             Name = "Details",
-            RelativeUrlFormat = $"/{settings.GetModelPlaceholder(x => x.Id)}",
+            RelativeUrlFormat = $"/{EmPagesPlaceholders.GetModelPlaceholder<TModel>(settings.Route, x => x.Id)}",
         });
 
         settings.ModelActions.Add(new EmPageAction()
         {
             Order = 10,
             Name = "Edit",
-            RelativeUrlFormat = $"/{settings.GetModelPlaceholder(x => x.Id)}/edit",
+            RelativeUrlFormat = $"/{EmPagesPlaceholders.GetModelPlaceholder<TModel>(settings.Route, x => x.Id)}/edit",
         });
 
         settings.ModelActions.Add(new EmPageAction()
         {
             Order = 20,
             Name = "Delete",
-            RelativeUrl = $"/_em/api/admin/em-pages/delete/{settings.Route}/{settings.GetModelPlaceholder(x => x.Id)}",
+            RelativeUrl = $"/_em/api/admin/em-pages/delete/{settings.Route}/{EmPagesPlaceholders.GetModelPlaceholder<TModel>(settings.Route, x => x.Id)}",
             Method = HttpMethod.Delete,
             ConfirmationMessage = "Are you sure you want to delete this entity?",
         });
@@ -120,7 +121,7 @@ public static EmPageSchemaSettings<TModel> ApplyDefaultEmPageActions<TModel>(thi
             {
                 Order = 1,
                 Name = "Edit",
-                RelativeUrlFormat = $"/{settings.GetModelPlaceholder(x => x.Id)}/edit",
+                RelativeUrlFormat = $"/{EmPagesPlaceholders.GetModelPlaceholder<TModel>(settings.Route, x => x.Id)}/edit",
             });
         }