From 8f5fee9f7675d2f27199bad32aeabe7053312a0b Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 1 Aug 2023 15:09:10 +0200
Subject: [PATCH] Add cache buster to injected icons CSS in block grid (#14621)

* Inject icons css via shadow DOM

* Fix typo

* Import icons.less instead
---
 .../blockgridentryeditors/gridblock/gridblock.editor.html   | 2 --
 .../gridinlineblock/gridinlineblock.editor.html             | 2 --
 .../gridsortblock/gridsortblock.editor.html                 | 2 --
 .../unsupportedblock/unsupportedblock.editor.html           | 2 --
 .../src/views/propertyeditors/blockgrid/blockgridui.less    | 3 +--
 .../blockgrid/umbblockgridblock.component.js                | 6 +++++-
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
index 938ae384db..31d759188c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
@@ -1,6 +1,4 @@
 <style>
-    @import 'assets/css/icons.css';
-
     .blockelement-gridblock-editor {
         position: relative;
         border-radius: 3px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
index 85f8ef0450..2964cebc86 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
@@ -1,6 +1,4 @@
 <style>
-    @import 'assets/css/icons.css';
-
     .blockelement-gridinlineblock-editor {
         position: relative;
         border-radius: 3px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
index 80e42cfbfb..bd1ab8afc9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
@@ -1,6 +1,4 @@
 <style>
-    @import 'assets/css/icons.css';
-
     @keyframes umb-icon-jump {
         0%, 100% { transform: rotate(6deg); }
         50% { transform: rotate(-6deg); }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
index 788fe1f363..ed0795e791 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
@@ -1,6 +1,4 @@
 <style>
-    @import 'assets/css/icons.css';
-
     .blockelement-unsupportedblock-editor {
         position: relative;
         display: block;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
index 8fb8221d74..1f31a8b48d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
@@ -1,9 +1,8 @@
 @import "../../../less/variables.less";
 @import "../../../less/mixins.less";
-@import "../../../less/helveticons.less";
+@import "../../../less/icons.less";
 @import "../../../less/buttons.less";
 @import "../../../less/accessibility/sr-only.less";
-@import "../../../less/components/umb-icon.less";
 
 @umb-block-grid__item_minimum_height: 48px;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridblock.component.js
index 3dfbdab0ff..73ce2495fe 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridblock.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridblock.component.js
@@ -49,16 +49,20 @@
             var shadowRoot = $element[0].attachShadow({ mode: 'open' });
             shadowRoot.innerHTML = 
             `
+                <style>@import "assets/css/icons.css?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}"</style>
+            
                 ${ model.stylesheet ? `
                     <style>
                         @import "${model.stylesheet}?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}"
                     </style>`
                     : ''
                 }
+                
                 <div 
                     style="display:contents;" 
                     ng-class="{'show-validation': vm.blockEditorApi.internal.showValidation}"
-                    ng-include="api.internal.sortMode ? api.internal.sortModeView : '${model.view}'"></div>
+                    ng-include="api.internal.sortMode ? api.internal.sortModeView : '${model.view}'">
+                </div>
             `;
             $compile(shadowRoot)($scope);