Merge branch 'main' into hishamco/azure-blobs

OrchardCMS · Apr 19, 2024 · 799b68c · 799b68c
2 parents 104b85e + ffafc87
commit 799b68c
Show file tree

Hide file tree

Showing 21 changed files with 81 additions and 25 deletions.
diff --git a/.github/workflows/mac_unit_test_ci.yml b/.github/workflows/mac_unit_test_ci.yml
@@ -13,5 +13,5 @@ jobs:
     - uses: actions/checkout@v4
     - name: Build and test
       run: |
-        dotnet build -c Release
+        dotnet build -c Release -warnaserror /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true
         dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
@@ -27,7 +27,7 @@ jobs:
         dotnet-version: '8.0.x'
     - name: Build
       run: |
-        dotnet build -c Release
+        dotnet build -c Release -warnaserror /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 

diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml
@@ -26,7 +26,7 @@ jobs:
         dotnet-version: '8.0.x'
     - name: Build
       run: |
-        dotnet build -c Release
+        dotnet build -c Release -warnaserror /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj

diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Build
       if: steps.check-publish.outputs.should-publish == 'true'
       run: |
-        dotnet build -c Release
+        dotnet build -c Release -warnaserror /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true
     - name: Unit Tests
       if: steps.check-publish.outputs.should-publish == 'true'
       run: |

diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
@@ -41,7 +41,7 @@ jobs:
       run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 15471 ))" >> $GITHUB_ENV
     - name: Build
       run: |
-        dotnet build -c Release -p:Version=${{ steps.get_version.outputs.VERSION }}
+        dotnet build -c Release -warnaserror /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true -p:Version=${{ steps.get_version.outputs.VERSION }}
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -33,7 +33,7 @@
     <!-- Avoid using cref tags with a prefix -->
     <NoWarn>$(NoWarn);CA1200</NoWarn>
 
-    <!--Rename type name X so that it does not end in 'Delegate', 'EventHandler', 'Permission' etc -->
+    <!-- Rename type name X so that it does not end in 'Delegate', 'EventHandler', 'Permission' etc -->
     <NoWarn>$(NoWarn);CA1711</NoWarn>
 
     <!-- Parameter name differs from original overriden implemented name -->
@@ -54,7 +54,7 @@
     <!-- Use PascalCase for named placeholders in the logging message template -->
     <NoWarn>$(NoWarn);CA1727</NoWarn>
 
-    <!--CA1861 : Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array -->
+    <!-- CA1861: Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array -->
     <NoWarn>$(NoWarn);CA1861</NoWarn>
 
   </PropertyGroup>

diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props
@@ -15,7 +15,7 @@
     <PackageManagement Include="Azure.Communication.Email" Version="1.0.1" />
     <PackageManagement Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
     <PackageManagement Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
-    <PackageManagement Include="Azure.Identity" Version="1.11.0" />
+    <PackageManagement Include="Azure.Identity" Version="1.11.1" />
     <PackageManagement Include="Azure.Search.Documents" Version="11.5.1" />
     <PackageManagement Include="Azure.Storage.Blobs" Version="12.19.1" />
     <PackageManagement Include="BenchmarkDotNet" Version="0.13.12" />

diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props
@@ -7,7 +7,6 @@
     <VersionPrefix>1.9.0</VersionPrefix>
     <VersionSuffix>preview</VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsNotAsErrors>612,618</WarningsNotAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591</NoWarn>

diff --git a/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj b/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj
@@ -7,7 +7,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsNotAsErrors>612,618</WarningsNotAsErrors>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <RazorRuntimeCompilation>false</RazorRuntimeCompilation>

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Assets/js/vue-multiselect-wrapper.js b/src/OrchardCore.Modules/OrchardCore.ContentFields/Assets/js/vue-multiselect-wrapper.js
@@ -17,6 +17,8 @@ function initVueMultiselect(element) {
     if (element) {
         var elementId = element.id;
         var selectedItems = JSON.parse(element.dataset.selectedItems || "[]");
+        var editUrl = element.dataset.editUrl;
+        var viewUrl = element.dataset.viewUrl;
         var searchUrl = element.dataset.searchUrl;
         var multiple = JSON.parse(element.dataset.multiple);
 
@@ -99,6 +101,10 @@ function initVueMultiselect(element) {
                     // a single content item and we've just selected that one item.
                     this.searchBoxContainer.css("display", multiple ? "block" : "none");
                 },
+                url: function(item) {
+                    var url = item.isEditable ? editUrl : viewUrl;
+                    return url.replace('contentItemId', item.id);
+                },
                 remove: function (item) {
                     this.arrayOfItems.splice(this.arrayOfItems.indexOf(item), 1);
 

diff --git a/...OrchardCore.Modules/OrchardCore.ContentFields/Controllers/ContentPickerAdminController.cs b/...OrchardCore.Modules/OrchardCore.ContentFields/Controllers/ContentPickerAdminController.cs
@@ -2,29 +2,40 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore.Admin;
 using OrchardCore.ContentFields.Settings;
 using OrchardCore.ContentFields.ViewModels;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.ContentManagement.Metadata.Models;
+using OrchardCore.Contents;
 
 namespace OrchardCore.ContentFields.Controllers
 {
     [Admin]
     public class ContentPickerAdminController : Controller
     {
         private readonly IContentDefinitionManager _contentDefinitionManager;
+        private readonly IContentManager _contentManager;
         private readonly IEnumerable<IContentPickerResultProvider> _resultProviders;
+        private readonly IAuthorizationService _authorizationService;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
         public ContentPickerAdminController(
             IContentDefinitionManager contentDefinitionManager,
-            IEnumerable<IContentPickerResultProvider> resultProviders
-            )
+            IContentManager contentManager,
+            IEnumerable<IContentPickerResultProvider> resultProviders,
+            IAuthorizationService authorizationService,
+            IHttpContextAccessor httpContextAccessor)
         {
             _contentDefinitionManager = contentDefinitionManager;
+            _contentManager = contentManager;
             _resultProviders = resultProviders;
+            _authorizationService = authorizationService;
+            _httpContextAccessor = httpContextAccessor;
         }
 
         [Admin("ContentFields/SearchContentItems", "ContentPicker")]
@@ -76,7 +87,23 @@ public async Task<IActionResult> SearchContentItems(string part, string field, s
                 PartFieldDefinition = partFieldDefinition,
             });
 
-            return new ObjectResult(results.Select(r => new VueMultiselectItemViewModel() { Id = r.ContentItemId, DisplayText = r.DisplayText, HasPublished = r.HasPublished }));
+            var contentItems = await _contentManager
+                .GetAsync(results.Select(r => r.ContentItemId));
+
+            var selectedItems = new List<VueMultiselectItemViewModel>();
+            foreach (var contentItem in contentItems)
+            {
+                selectedItems.Add(new VueMultiselectItemViewModel()
+                {
+                    Id = contentItem.ContentItemId,
+                    DisplayText = contentItem.ToString(),
+                    HasPublished = contentItem.IsPublished(),
+                    IsViewable = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User,
+                                     CommonPermissions.EditContent, contentItem)
+                });
+            }
+
+            return new ObjectResult(selectedItems);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/ContentPickerFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/ContentPickerFieldDisplayDriver.cs
@@ -3,6 +3,8 @@
 using System.Threading.Tasks;
 using Fluid;
 using Fluid.Values;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Localization;
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.ContentFields.Settings;
@@ -12,6 +14,7 @@
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.ContentManagement.Display.Models;
 using OrchardCore.ContentManagement.Metadata.Models;
+using OrchardCore.Contents;
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Liquid;
@@ -25,15 +28,21 @@ public class ContentPickerFieldDisplayDriver : ContentFieldDisplayDriver<Content
         private readonly IContentManager _contentManager;
         private readonly ILiquidTemplateManager _templateManager;
         protected readonly IStringLocalizer S;
+        private readonly IAuthorizationService _authorizationService;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
         public ContentPickerFieldDisplayDriver(
             IContentManager contentManager,
             IStringLocalizer<ContentPickerFieldDisplayDriver> localizer,
-            ILiquidTemplateManager templateManager)
+            ILiquidTemplateManager templateManager,
+            IAuthorizationService authorizationService,
+            IHttpContextAccessor httpContextAccessor)
         {
             _contentManager = contentManager;
             S = localizer;
             _templateManager = templateManager;
+            _authorizationService = authorizationService;
+            _httpContextAccessor = httpContextAccessor;
         }
 
         public override IDisplayResult Display(ContentPickerField field, BuildFieldDisplayContext fieldDisplayContext)
@@ -79,9 +88,12 @@ public override IDisplayResult Edit(ContentPickerField field, BuildFieldEditorCo
                             Id = contentItemId,
                             DisplayText = await _templateManager.RenderStringAsync(settings.TitlePattern, NullEncoder.Default, contentItem,
                                 new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(contentItem) }),
-                            HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem)
+                            HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem),
+                            IsEditable = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext!.User, CommonPermissions.EditContent, contentItem),
+                            IsViewable = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext!.User, CommonPermissions.ViewContent, contentItem)
                         });
                     }
+
                 }
             });
         }

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/VueMultiselectItemViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/VueMultiselectItemViewModel.cs
@@ -5,5 +5,8 @@ public class VueMultiselectItemViewModel
         public string Id { get; set; }
         public string DisplayText { get; set; }
         public bool HasPublished { get; set; }
+        public bool IsViewable { get; set; }
+        public bool IsEditable { get; set; }
+        public bool IsClickable => IsEditable || IsViewable;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
@@ -7,6 +7,8 @@
     var selectedItems = JConvert.SerializeObject(Model.SelectedItems, JOptions.CamelCase);
     var partName = Model.PartFieldDefinition.PartDefinition.Name;
     var fieldName = Model.PartFieldDefinition.Name;
+    var editUrl = Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "Edit", contentItemId = "contentItemId", returnUrl = FullRequestPath });
+    var viewUrl = Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "Display", contentItemId = "contentItemId" });
     var searchUrl = Url.RouteUrl(new { area = "OrchardCore.ContentFields", controller = "ContentPickerAdmin", action = "SearchContentItems", part = partName, field = fieldName });
     var vueElementId = $"ContentPicker_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}";
     var multiple = settings.Multiple.ToString().ToLowerInvariant();
@@ -18,15 +20,21 @@
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.ContentItemIds)_FieldWrapper">
     <label asp-for="ContentItemIds" class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndClasses()">
-        <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-editor-type="ContentPicker" data-selected-items="@selectedItems" data-search-url="@searchUrl" data-multiple="@multiple">
+        <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-editor-type="ContentPicker" data-selected-items="@selectedItems" data-edit-url="@editUrl" data-view-url="@viewUrl" data-search-url="@searchUrl" data-multiple="@multiple">
 
             <ul class="mb-1 list-group w-lg-75 w-xxl-50 content-picker-default__list" v-show="arrayOfItems.length" v-cloak>
                 <draggable v-model="arrayOfItems">
                     <li v-for="(item, i) in arrayOfItems"
                         class="cursor-move list-group-item content-picker-default__list-item d-flex align-items-start justify-content-between"
                         :key="item.id">
-                        <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
-
+                        <div class="align-items-center align-self-center">
+                            <a v-if="item.isClickable" :href="url(item)" target="_blank">
+                                <span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span>
+                            </a>
+                            <span v-else>
+                                <span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span>
+                            </span>
+                        </div>
                         <div class="btn-group btn-group-sm align-items-center" role="group">
                             <button v-on:click="remove(item)" type="button" class="btn btn-secondary content-picker-default__list-item__delete"><i class="fa-solid fa-trash fa-sm" aria-hidden="true"></i></button>
                         </div>

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/wwwroot/Scripts/vue-multiselect-wrapper.js b/src/OrchardCore.Modules/OrchardCore.ContentFields/wwwroot/Scripts/vue-multiselect-wrapper.js
@@ -24,6 +24,8 @@ function initVueMultiselect(element) {
   if (element) {
     var elementId = element.id;
     var selectedItems = JSON.parse(element.dataset.selectedItems || "[]");
+    var editUrl = element.dataset.editUrl;
+    var viewUrl = element.dataset.viewUrl;
     var searchUrl = element.dataset.searchUrl;
     var multiple = JSON.parse(element.dataset.multiple);
     var debouncedSearch = debounce(function (vm, query) {
@@ -107,6 +109,10 @@ function initVueMultiselect(element) {
           // a single content item and we've just selected that one item.
           this.searchBoxContainer.css("display", multiple ? "block" : "none");
         },
+        url: function url(item) {
+          var url = item.isEditable ? editUrl : viewUrl;
+          return url.replace('contentItemId', item.id);
+        },
         remove: function remove(item) {
           this.arrayOfItems.splice(this.arrayOfItems.indexOf(item), 1);
 

diff --git a/...hardCore.Modules/OrchardCore.ContentFields/wwwroot/Scripts/vue-multiselect-wrapper.min.js b/...hardCore.Modules/OrchardCore.ContentFields/wwwroot/Scripts/vue-multiselect-wrapper.min.js
diff --git a/src/Templates/OrchardCore.ProjectTemplates/OrchardCore.ProjectTemplates.csproj b/src/Templates/OrchardCore.ProjectTemplates/OrchardCore.ProjectTemplates.csproj
@@ -15,7 +15,6 @@
       This setting changes that so that the .template.config folder will be included.
     -->
     <NoDefaultExcludes>True</NoDefaultExcludes>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <PackageType>Template</PackageType>
     <!--
       The previous code used a nuget package to allow the 'RoslynCodeTaskFactory' (see the ReplaceFileText task definition below) to be used.
@@ -24,7 +23,7 @@
       The error message is not accurate, as it indicates there is no content. It should say assemblies instead, since we have content but no assemblies.
         NU5128 warning: Ignore since the project template package doesn't contain content or references to other packages.
     -->
-    <NoWarn>CS8021,CS2008,NU5128</NoWarn>
+    <NoWarn>CS8021;CS2008;NU5128;CA1016</NoWarn>
     <!--
       Prevent the symbol package from being created as this nuget package doesn't have package refs or assemblies.
       Otherwise, the following error will be thrown by `dotnet pack`: error NU5017: Cannot create a package that has no dependencies nor content.