Fixes misuse of scripts registration

src/OrchardCore.Modules/OrchardCore.Google/Analytics/Drivers/GoogleAnalyticsSettingsDisplayDriver.cs

@@ -41,7 +41,6 @@ public override async Task<IDisplayResult> EditAsync(GoogleAnalyticsSettings set
             return Initialize<GoogleAnalyticsSettingsViewModel>("GoogleAnalyticsSettings_Edit", model =>
             {
                 model.TrackingID = settings.TrackingID;
-                model.ScriptsAtHead = settings.ScriptsAtHead;
             }).Location("Content:5").OnGroup(GoogleConstants.Features.GoogleAnalytics);
         }
 
@@ -61,7 +60,6 @@ public override async Task<IDisplayResult> UpdateAsync(GoogleAnalyticsSettings s
                 if (context.Updater.ModelState.IsValid)
                 {
                     settings.TrackingID = model.TrackingID;
-                    settings.ScriptsAtHead = model.ScriptsAtHead;
                 }
             }
             return await EditAsync(settings, context);

src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs

@@ -1,24 +1,27 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.Admin;
-using OrchardCore.DisplayManagement;
-using OrchardCore.DisplayManagement.Layout;
+using OrchardCore.Entities;
+using OrchardCore.Google.Analytics.Settings;
+using OrchardCore.ResourceManagement;
+using OrchardCore.Settings;
 
 namespace OrchardCore.Google.Analytics
 {
     public class GoogleAnalyticsFilter : IAsyncResultFilter
     {
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly IShapeFactory _shapeFactory;
+        private readonly IResourceManager _resourceManager;
+        private readonly ISiteService _siteService;
 
         public GoogleAnalyticsFilter(
-            ILayoutAccessor layoutAccessor,
-            IShapeFactory shapeFactory)
+            IResourceManager resourceManager,
+            ISiteService siteService)
         {
-            _layoutAccessor = layoutAccessor;
-            _shapeFactory = shapeFactory;
+            _resourceManager = resourceManager;
+            _siteService = siteService;
         }
 
         public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
@@ -27,10 +30,16 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
             if ((context.Result is ViewResult || context.Result is PageResult) &&
                 !AdminAttribute.IsApplied(context.HttpContext))
             {
-                dynamic layout = await _layoutAccessor.GetLayoutAsync();
-                layout.Zones["Header"].Add(await _shapeFactory.CreateAsync("gtag"));
+                var settings = (await _siteService.GetSiteSettingsAsync()).As<GoogleAnalyticsSettings>();
+                if (!string.IsNullOrWhiteSpace(settings?.TrackingID))
+                {
+                    _resourceManager.RegisterHeadScript(new HtmlString($"<script async src=\"https://www.googletagmanager.com/gtag/js?id={settings.TrackingID}\"></script>"));
+                    _resourceManager.RegisterHeadScript(new HtmlString($"<script>window.dataLayer = window.dataLayer || [];function gtag() {{ dataLayer.push(arguments); }}gtag('js', new Date());gtag('config', '{settings.TrackingID}')</script>"));
+                }
             }
             await next.Invoke();
         }
     }
+
+
 }

src/OrchardCore.Modules/OrchardCore.Google/Analytics/Recipes/GoogleAnalyticsSettingsStep.cs

@@ -32,7 +32,6 @@ public async Task ExecuteAsync(RecipeExecutionContext context)
             container.Alter<GoogleAnalyticsSettings>(nameof(GoogleAnalyticsSettings), aspect =>
             {
                 aspect.TrackingID = model.TrackingID;
-                aspect.ScriptsAtHead = model.ScriptsAtHead;
             });
         }
     }

src/OrchardCore.Modules/OrchardCore.Google/Analytics/Settings/GoogleAnalyticsSettings.cs

@@ -5,6 +5,5 @@ namespace OrchardCore.Google.Analytics.Settings
     public class GoogleAnalyticsSettings
     {
         public string TrackingID { get; set; }
-        public bool ScriptsAtHead { get; set; }
     }
 }

src/OrchardCore.Modules/OrchardCore.Google/Analytics/ViewModels/GoogleAnalyticsSettingsViewModel.cs

@@ -6,6 +6,5 @@ public class GoogleAnalyticsSettingsViewModel
     {
         [Required(AllowEmptyStrings = false)]
         public string TrackingID { get; set; }
-        public bool ScriptsAtHead { get; set; }
     }
 }

src/OrchardCore.Modules/OrchardCore.Google/OrchardCore.Google.csproj

@@ -22,13 +22,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Views\gtag.cshtml">
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </EmbeddedResource>
   </ItemGroup>
 
 </Project>

src/OrchardCore.Modules/OrchardCore.Google/Views/GoogleAnalyticsSettings.Edit.cshtml

@@ -11,14 +11,3 @@
         <span class="hint">@T["The tracking ID defined in your Google Analytics account."]</span>
     </div>
 </div>
-
-<div class="form-group row" asp-validation-class-for="ScriptsAtHead">
-    <div class="col-lg">
-        <div class="form-check">
-            <input asp-for="ScriptsAtHead" class="form-check-input" type="checkbox" checked="@Model.ScriptsAtHead" />
-            <label asp-for="ScriptsAtHead" class="form-check-label">@T["Put scripts at head"]</label>
-        </div>
-        <span asp-validation-for="ScriptsAtHead"></span>
-        <span class="hint">@T["Put javascript at head instead of foot."]</span>
-    </div>
-</div>