From a4abfd4962814004d47360123828256693949459 Mon Sep 17 00:00:00 2001
From: Nikolaj <nel@umbraco.dk>
Date: Thu, 10 Sep 2020 08:52:18 +0200
Subject: [PATCH 01/73] Add Content with contentpicker test and bump helpers
 version

---
 .../cypress/integration/Content/content.ts    | 99 ++++++++++++++++++-
 src/Umbraco.Tests.AcceptanceTest/package.json |  2 +-
 2 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index 23e97043b0..d2990a8635 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -1,5 +1,5 @@
 /// <reference types="Cypress" />
-import { DocumentTypeBuilder, ContentBuilder } from 'umbraco-cypress-testhelpers';
+import { DocumentTypeBuilder, ContentBuilder, AliasHelper } from 'umbraco-cypress-testhelpers';
 context('Content', () => {
 
     beforeEach(() => {
@@ -499,4 +499,101 @@ context('Content', () => {
         // Clean up (content is automatically deleted when document types are gone)
         cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
     });
+
+    it('Content with contentpicker', () => {
+        const pickerDocTypeName = 'Content Picker Type';
+        const groupName = 'ContentPickerGroup';
+        const alias = AliasHelper.toAlias(pickerDocTypeName);
+        const pickedDocTypeName = 'Picked Content Type';
+        const pickedNodeName = 'Content to pick';
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(pickerDocTypeName);
+        cy.umbracoEnsureTemplateNameNotExists(pickerDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(pickedDocTypeName);
+
+        // Create the content type and content we'll be picking from.
+        const pickedDocType = new DocumentTypeBuilder()
+            .withName(pickedDocTypeName)
+            .withAllowAsRoot(true)
+            .addGroup()
+            .addTextBoxProperty()
+            .withAlias('text')
+            .done()
+            .done()
+            .build();
+            
+        cy.saveDocumentType(pickedDocType).then((generatedType) => {
+            const pickedContentNode = new ContentBuilder()
+                .withContentTypeAlias(generatedType["alias"])
+                .withAction("publishNew")
+                .addVariant()
+                .withName(pickedNodeName)
+                .withSave(true)
+                .withPublish(true)
+                .addProperty()
+                .withAlias('text')
+                .withValue('Acceptance test')
+                .done()
+                .withSave(true)
+                .withPublish(true)
+                .done()
+                .build();
+            cy.saveContent(pickedContentNode);
+        });
+
+        // Create the doctype with a the picker
+        const pickerDocType = new DocumentTypeBuilder()
+            .withName(pickerDocTypeName)
+            .withAlias(alias)
+            .withAllowAsRoot(true)
+            .withDefaultTemplate(alias)
+            .addGroup()
+            .withName(groupName)
+            .addContentPickerProperty()
+            .withAlias('picker')
+            .done()
+            .done()
+            .build();
+
+        cy.saveDocumentType(pickerDocType);
+
+        // Edit it the template to allow us to verify the rendered view.
+        cy.editTemplate(pickerDocTypeName, `@inherits Umbraco.Web.Mvc.UmbracoViewPage<ContentModels.ContentPickerType>
+        @using ContentModels = Umbraco.Web.PublishedModels;
+        @{
+            Layout = null;
+        }
+        
+        @{
+            IPublishedContent typedContentPicker = Model.Value<IPublishedContent>("picker");
+            if (typedContentPicker != null)
+            {
+                <p>@typedContentPicker.Value("text")</p>
+            }
+        }`);
+
+        // Create content with content picker
+        cy.get('.umb-tree-root-link').rightclick();
+        cy.get('.-opens-dialog > .umb-action-link').click();
+        cy.get('[data-element="action-create-contentPickerType"] > .umb-action-link').click();
+        // Fill out content
+        cy.umbracoEditorHeaderName('ContentPickerContent');
+        cy.get('.umb-node-preview-add').click();
+        // Should really try and find a better way to do this, but umbracoTreeItem tries to click the content pane in the background
+        cy.get('[ng-if="vm.treeReady"] > .umb-tree > [ng-if="!tree.root.containsGroups"] > .umb-animated > .umb-tree-item__inner').click();
+        // We have to wait for the picked content to show up or it wont be added.
+        cy.get('.umb-node-preview__description').should('be.visible');
+        //save and publish
+        cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
+        cy.umbracoSuccessNotification().should('be.visible');
+
+        // Assert
+        const expectedContent = '<p>Acceptance test</p>'
+        cy.umbracoVerifyRenderedViewContent('contentpickercontent', expectedContent, true).should('be.true');
+        // clean
+        cy.umbracoEnsureDocumentTypeNameNotExists(pickerDocTypeName);
+        cy.umbracoEnsureTemplateNameNotExists(pickerDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(pickedDocTypeName);
+    });
 });
diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json
index 2017142d1e..f09313f2ad 100644
--- a/src/Umbraco.Tests.AcceptanceTest/package.json
+++ b/src/Umbraco.Tests.AcceptanceTest/package.json
@@ -7,7 +7,7 @@
     "cross-env": "^7.0.2",
     "cypress": "^5.1.0",
     "ncp": "^2.0.0",
-    "umbraco-cypress-testhelpers": "^1.0.0-beta-50"
+    "umbraco-cypress-testhelpers": "^1.0.0-beta-51"
   },
   "dependencies": {
     "typescript": "^3.9.2"

From f82a4c19cbde8a2cd51e36e223a6b40f13cc8a99 Mon Sep 17 00:00:00 2001
From: Nikolaj <nel@umbraco.dk>
Date: Thu, 10 Sep 2020 09:30:07 +0200
Subject: [PATCH 02/73] Wait for content to be refreshed and switch order of
 rollback

---
 .../cypress/integration/Content/content.ts    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index d2990a8635..bb70a1c858 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -6,6 +6,14 @@ context('Content', () => {
         cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
     });
 
+    function refreshContentTree(){
+        // Refresh to update the tree
+        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
+        cy.umbracoContextMenuAction("action-refreshNode").click();
+        // We have to wait in case the execution is slow, otherwise we'll try and click the item before it appears in the UI
+        cy.get('.umb-tree-item__inner').should('exist', {timeout: 10000});
+    }
+
     it('Copy content', () => {
         const rootDocTypeName = "Test document type";
         const childDocTypeName = "Child test document type";
@@ -74,8 +82,7 @@ context('Content', () => {
         });
 
         // Refresh to update the tree
-        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
-        cy.umbracoContextMenuAction("action-refreshNode").click();
+        refreshContentTree();
 
         // Copy node
         cy.umbracoTreeItem("content", [nodeName, childNodeName]).rightclick({ force: true });
@@ -159,8 +166,7 @@ context('Content', () => {
         });
 
         // Refresh to update the tree
-        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
-        cy.umbracoContextMenuAction("action-refreshNode").click();
+        refreshContentTree();
 
         // Move node
         cy.umbracoTreeItem("content", [nodeName, childNodeName]).rightclick({ force: true });
@@ -247,8 +253,7 @@ context('Content', () => {
         });
 
         // Refresh to update the tree
-        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
-        cy.umbracoContextMenuAction("action-refreshNode").click();
+        refreshContentTree();
 
         // Sort nodes
         cy.umbracoTreeItem("content", [nodeName]).rightclick({ force: true });
@@ -297,8 +302,7 @@ context('Content', () => {
         });
 
         // Refresh to update the tree
-        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
-        cy.umbracoContextMenuAction("action-refreshNode").click();
+        refreshContentTree();
 
         // Access node
         cy.umbracoTreeItem("content", [initialNodeName]).click();
@@ -326,8 +330,8 @@ context('Content', () => {
         cy.reload();
 
         // Assert
-        cy.get('.history').find('.umb-badge').eq(0).should('contain.text', "Save");
-        cy.get('.history').find('.umb-badge').eq(1).should('contain.text', "Rollback");
+        cy.get('.history').find('.umb-badge').eq(0).should('contain.text', "Rollback");
+        cy.get('.history').find('.umb-badge').eq(1).should('contain.text', "Save");
         cy.get('#headerName').should('have.value', initialNodeName);
 
         // Clean up (content is automatically deleted when document types are gone)
@@ -365,8 +369,7 @@ context('Content', () => {
         });
 
         // Refresh to update the tree
-        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
-        cy.umbracoContextMenuAction("action-refreshNode").click();
+        refreshContentTree();
 
         // Access node
         cy.umbracoTreeItem("content", [nodeName]).click();
@@ -407,8 +410,7 @@ context('Content', () => {
         });
 
         // Refresh to update the tree
-        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
-        cy.umbracoContextMenuAction("action-refreshNode").click();
+        refreshContentTree();
 
         // Access node
         cy.umbracoTreeItem("content", [nodeName]).click();
@@ -446,8 +448,7 @@ context('Content', () => {
         });
 
         // Refresh to update the tree
-        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
-        cy.umbracoContextMenuAction("action-refreshNode").click();
+        refreshContentTree();
 
         // Access node
         cy.umbracoTreeItem("content", [nodeName]).click();
@@ -487,8 +488,7 @@ context('Content', () => {
         });
 
         // Refresh to update the tree
-        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
-        cy.umbracoContextMenuAction("action-refreshNode").click();
+        refreshContentTree();
 
         // Access node
         cy.umbracoTreeItem("content", [nodeName]).click();

From 6fb33043e5d29c8afe21fe4e76d521a4014e7438 Mon Sep 17 00:00:00 2001
From: Nikolaj <nel@umbraco.dk>
Date: Thu, 10 Sep 2020 11:15:43 +0200
Subject: [PATCH 03/73] Add javascript tests

---
 .../cypress/integration/Settings/scripts.ts   | 94 ++++++++++++++++++-
 1 file changed, 90 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts
index cce8a45da6..430f8aa108 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts
@@ -1,18 +1,24 @@
 /// <reference types="Cypress" />
+import { ScriptBuilder } from "umbraco-cypress-testhelpers";
+
 context('Scripts', () => {
 
   beforeEach(() => {
     cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
   });
 
+  function navigateToSettings() {
+    cy.umbracoSection('settings');
+    cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+  }
+
   it('Create new JavaScript file', () => {
     const name = "TestScript";
     const fileName = name + ".js";
 
-   cy.umbracoEnsureScriptNameNotExists(fileName);
+    cy.umbracoEnsureScriptNameNotExists(fileName);
 
-    cy.umbracoSection('settings');
-    cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+    navigateToSettings()
 
     cy.umbracoTreeItem("settings", ["Scripts"]).rightclick();
 
@@ -27,9 +33,89 @@ context('Scripts', () => {
 
     //Assert
     cy.umbracoSuccessNotification().should('be.visible');
+    cy.umbracoScriptExists(fileName).should('be.true');
+
 
     //Clean up
     cy.umbracoEnsureScriptNameNotExists(fileName);
-   });
+  });
 
+  it('Delete a JavaScript file', () => {
+    const name = "TestDeleteScriptFile";
+    const fileName = name + ".js";
+
+    cy.umbracoEnsureScriptNameNotExists(fileName);
+
+    const script = new ScriptBuilder()
+      .withName(name)
+      .withContent('alert("this is content");')
+      .build();
+
+    cy.saveScript(script);
+
+    navigateToSettings()
+
+    cy.umbracoTreeItem("settings", ["Scripts", fileName]).rightclick();
+    cy.umbracoContextMenuAction("action-delete").click();
+    cy.umbracoButtonByLabelKey("general_ok").click();
+
+    cy.contains(fileName).should('not.exist');
+    cy.umbracoScriptExists(name).should('be.false');
+
+    cy.umbracoEnsureScriptNameNotExists(fileName);
+  });
+
+  it('Update JavaScript file', () => {
+    const name = "TestEditJavaScriptFile";
+    const nameEdit = "Edited";
+    let fileName = name + ".js";
+
+    const originalContent = 'console.log("A script);\n';
+    const edit = 'alert("content");';
+    const expected = originalContent + edit;
+
+    cy.umbracoEnsureScriptNameNotExists(fileName);
+
+    const script = new ScriptBuilder()
+      .withName(name)
+      .withContent(originalContent)
+      .build();
+    cy.saveScript(script);
+
+    navigateToSettings();
+    cy.umbracoTreeItem("settings", ["Scripts", fileName]).click();
+
+    cy.get('.ace_text-input').type(edit, { force: true });
+
+    // Since scripts has no alias it should be safe to not use umbracoEditorHeaderName
+    // umbracoEditorHeaderName does not like {backspace}
+    cy.get('#headerName').type("{backspace}{backspace}{backspace}" + nameEdit).should('have.value', name+nameEdit);
+    fileName = name + nameEdit + ".js";
+    cy.get('.btn-success').click();
+
+    cy.umbracoSuccessNotification().should('be.visible');
+    cy.umbracoVerifyScriptContent(fileName, expected).should('be.true');
+
+    cy.umbracoEnsureScriptNameNotExists(fileName);
+  });
+
+  it('Can Delete folder', () => {
+    const folderName = "TestFolder";
+
+    // The way scripts and folders are fetched and deleted are identical
+    cy.umbracoEnsureScriptNameNotExists(folderName);
+    cy.saveFolder('scripts', folderName);
+
+    navigateToSettings()
+
+    cy.umbracoTreeItem("settings", ["Scripts", folderName]).rightclick();
+    cy.umbracoContextMenuAction("action-delete").click();
+    cy.umbracoButtonByLabelKey("general_ok").click();
+
+    cy.contains(folderName).should('not.exist');
+    cy.umbracoScriptExists(folderName).should('be.false')
+
+    // A script an a folder is the same thing in this case
+    cy.umbracoEnsureScriptNameNotExists(folderName);
+  });
 });

From a7db1588947ecc1518c28d8988733d469f9d115a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Fri, 2 Oct 2020 16:12:24 +0200
Subject: [PATCH 04/73] ask user wether they like to stay in preview mode

---
 src/Umbraco.Web.UI.Client/gulp/config.js      |   3 +-
 .../src/websitepreview/websitepreview.js      | 146 +++++
 .../config/umbracoSettings.config             | 533 +++++++++---------
 3 files changed, 415 insertions(+), 267 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js

diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 3c32832ba0..9eb335a62c 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -30,6 +30,7 @@ module.exports = {
         // js files for backoffice
         // processed in the js task
         js: {
+            websitepreview: { files: "./src/websitepreview/**/*.js", out: "umbraco.websitepreview.js" },
             preview: { files: "./src/preview/**/*.js", out: "umbraco.preview.js" },
             installer: { files: "./src/installer/**/*.js", out: "umbraco.installer.js" },
             filters: { files: "./src/common/filters/**/*.js", out: "umbraco.filters.js" },
@@ -56,7 +57,7 @@ module.exports = {
                 ],
                 out: "umbraco.directives.js"
             }
-            
+
         },
 
         //selectors for copying all views into the build
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
new file mode 100644
index 0000000000..203748e96e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -0,0 +1,146 @@
+
+/*********************************************************************************************************/
+/* website preview controller */
+/*********************************************************************************************************/
+
+(function() {
+
+    if ( window.location !== window.parent.location ) {
+        //we are in an iFrame, so lets skip the dialog.
+        return;
+    }
+
+    function setCookie(cname, cvalue, exminutes) {
+        var d = new Date();
+        d.setTime(d.getTime() + (exminutes * 60 * 1000));
+        document.cookie = cname + "=" + cvalue + ";expires="+d.toUTCString() + ";path=/";
+    }
+
+    function getCookie(cname) {
+        var name = cname + "=";
+        var ca = document.cookie.split(';');
+        for(var i = 0; i < ca.length; i++) {
+            var c = ca[i];
+            while (c.charAt(0) == ' ') {
+            c = c.substring(1);
+            }
+            if (c.indexOf(name) == 0) {
+            return c.substring(name.length, c.length);
+            }
+        }
+        return "";
+    }
+
+    function exitPreviewMode() {
+        window.top.location.href = "../preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
+    }
+    function continuePreviewMode() {
+        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", 1);
+    }
+
+    var user = getCookie("UMB-WEBSITE-PREVIEW-ACCEPT");
+    if (user != "true") {
+
+        var modelStyles = `
+            .umbraco-preview-dialog {
+                position: fixed;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                z-index: 99999999;
+                top:0;
+                bottom:0;
+                left:0;
+                right:0;
+                overflow: auto;
+                background-color: rgba(0,0,0,0.6);
+            }
+
+            .umbraco-preview-dialog__modal {
+                background-color: #fff;
+                border-radius: 6px;
+                box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+                margin: auto;
+                padding: 30px 40px;
+                width: 100%;
+                max-width: 540px;
+                font-family: Lato,Helvetica Neue,Helvetica,Arial,sans-serif;
+                font-size: 15px;
+            }
+
+            .umbraco-preview-dialog__headline {
+                font-weight: 700;
+                font-size: 22px;
+                color: #1b264f;
+                margin-top:10px;
+                margin-bottom:10px;
+            }
+            .umbraco-preview-dialog__question {
+                margin-bottom:30px;
+            }
+            .umbraco-preview-dialog__modal > button {
+                display: inline-block;
+                padding: 8px 18px;
+                text-align: center;
+                vertical-align: middle;
+                border-radius: 3px;
+                border:none;
+                font-weight: 700;
+                float:right;
+                margin-left:10px;
+
+                color: #1b264f;
+                background-color: #f6f1ef;
+            }
+            .umbraco-preview-dialog__modal > button:hover {
+                color: #2152a3;
+                background-color: #f6f1ef;
+            }
+            .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue {
+                color: #fff;
+                background-color: #2bc37c;
+            }
+            .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue:hover {
+                background-color: #39d38b;
+            }
+        `;
+
+        var fragment = document.createDocumentFragment();
+
+        var con = document.createElement("style");
+        con.innerHTML = modelStyles;
+        fragment.appendChild(con);
+
+        var con = document.createElement("div");
+        con.className = "umbraco-preview-dialog";
+
+
+        var model = document.createElement("div");
+        model.className = "umbraco-preview-dialog";
+        model.innerHTML = `<div class="umbraco-preview-dialog__headline">Preview mode</div>
+            <div class="umbraco-preview-dialog__question">Do you want to continue viewing latest saved version?</div>`;
+
+        var continueButton = document.createElement("button");
+        continueButton.type = "button";
+        continueButton.innerHTML = "Continue";
+        model.appendChild(continueButton);
+
+        continueButton.addEventListener("click", continuePreviewMode);
+
+        var exitButton = document.createElement("button");
+        exitButton.type = "button";
+        exitButton.className = "umbraco-preview-dialog__continue";
+        exitButton.innerHTML = "Exit preview mode";
+        model.appendChild(exitButton);
+
+        continueButton.addEventListener("click", exitPreviewMode);
+
+        fragment.appendChild(con);
+
+        document.getElementsByTagName("BODY")[0].appendChild(fragment);
+    } else {
+        continuePreviewMode();
+        console.log("already set");
+    }
+
+})();
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index d723b9c7c0..43f239444f 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -1,266 +1,267 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<settings>
-
-  <!--
-    umbracoSettings.config configuration documentation can be found here:
-    https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/
-    Many of the optional settings are not explicitly listed here
-    but can be found in the online documentation.
-    -->
-
-    <backOffice>
-        <tours enable="true"></tours>
-    </backOffice>
-
-  <content>
-
-    <errors>
-      <error404>1</error404>
-      <!--
-        The value for error pages can be:
-        * A content item's GUID ID      (example: 26C1D84F-C900-4D53-B167-E25CC489DAC8)
-        * An XPath statement            (example: //errorPages[@nodeName='My cool error']
-        * A content item's integer ID   (example: 1234)
-      -->
-      <!--
-        <error404>
-            <errorPage culture="default">26C1D84F-C900-4D53-B167-E25CC489DAC8</errorPage>
-            <errorPage culture="en-US">D820E120-6865-4D88-BFFE-48801A6AC375</errorPage>
-        </error404>
-       -->
-    </errors>
-
-    <notifications>
-      <!-- the email that should be used as from mail when umbraco sends a notification -->
-      <!-- you can add a display name to the email like this: <email>Your display name here &lt;your@email.here&gt;</email> -->
-      <email>your@email.here</email>
-    </notifications>
-
-    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
-    <PreviewBadge>
-        <![CDATA[
-            <div id="umbracoPreviewBadge" class="umbraco-preview-badge">
-                <span class="umbraco-preview-badge__header">Preview mode</span>
-                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open">
-                    …
-                </a>
-                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end">
-                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
-                </a>
-            </div>
-            <style type="text/css">
-                .umbraco-preview-badge {{
-                    position: fixed;
-                    bottom: 0;
-                    display: inline-flex;
-                    background: rgba(27, 38, 79, 0.9);
-                    color: #fff;
-                    font-size: 12px;
-                    z-index: 99999999;
-                    justify-content: center;
-                    align-items: center;
-                    box-shadow: 0 5px 10px rgba(0, 0, 0, .2), 0 1px 2px rgba(0, 0, 0, .2);
-                    line-height: 1;
-                    pointer-events:none;
-                    left: 50%;
-                    transform: translate(-50%, 40px);
-                    animation: umbraco-preview-badge--effect 10s 100ms ease both;
-                    border-radius: 3px 3px 0 0;
-                }}
-                @keyframes umbraco-preview-badge--effect {{
-                    0% {{
-                        transform: translate(-50%, 40px);
-                        animation-timing-function: ease-out;
-                    }}
-                    1.5% {{
-                        transform: translate(-50%, -20px);
-                        animation-timing-function: ease-in;
-                    }}
-                    5.0% {{
-                        transform: translate(-50%, -8px);
-                        animation-timing-function: ease-in;
-                    }}
-                    7.5% {{
-                        transform: translate(-50%, -4px);
-                        animation-timing-function: ease-in;
-                    }}
-                    9.2% {{
-                        transform: translate(-50%, -2px);
-                        animation-timing-function: ease-in;
-                    }}
-                    3.5%,
-                    6.5%,
-                    8.5% {{
-                        transform: translate(-50%, 0);
-                        animation-timing-function: ease-out;
-                    }}
-                    9.7% {{
-                        transform: translate(-50%, 0);
-                        animation-timing-function: ease-out;
-                    }}
-                    10.0% {{
-                        transform: translate(-50%, 0);
-                    }}
-
-
-                    60% {{
-                        transform: translate(-50%, 0);
-                        animation-timing-function: ease-out;
-                    }}
-                    61.5% {{
-                        transform: translate(-50%, -20px);
-                        animation-timing-function: ease-in;
-                    }}
-                    65.0% {{
-                        transform: translate(-50%, -8px);
-                        animation-timing-function: ease-in;
-                    }}
-                    67.5% {{
-                        transform: translate(-50%, -4px);
-                        animation-timing-function: ease-in;
-                    }}
-                    69.2% {{
-                        transform: translate(-50%, -2px);
-                        animation-timing-function: ease-in;
-                    }}
-                    63.5%,
-                    66.5%,
-                    68.5% {{
-                        transform: translate(-50%, 0);
-                        animation-timing-function: ease-out;
-                    }}
-                    69.7% {{
-                        transform: translate(-50%, 0);
-                        animation-timing-function: ease-out;
-                    }}
-                    70.0% {{
-                        transform: translate(-50%, 0);
-                    }}
-                    100.0% {{
-                        transform: translate(-50%, 0);
-                    }}
-                }}
-                .umbraco-preview-badge__header {{
-                    padding: 1em;
-                    font-weight: bold;
-                    pointer-events:none;
-                }}
-                .umbraco-preview-badge__a {{
-                    width: 3em;
-                    padding: 1em;
-                    display: flex;
-                    flex-shrink: 0;
-                    align-items: center;
-                    align-self: stretch;
-                    color:white;
-                    text-decoration:none;
-                    font-weight: bold;
-                    border-left: 1px solid hsla(0,0%,100%,.25);
-                    pointer-events:all;
-                }}
-                .umbraco-preview-badge__a svg {{
-                    width: 1em;
-                    height:1em;
-                }}
-                .umbraco-preview-badge__a:hover {{
-                    background: #202d5e;
-                }}
-                .umbraco-preview-badge__end svg {{
-                    fill: #fff;
-                    width:1em;
-                }}
-            </style>
-        ]]>
-    </PreviewBadge>
-
-    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
-         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
-         - silent - Silently suppress the error and do not render the offending macro.
-         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
-                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
-         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
-    <MacroErrors>throw</MacroErrors>
-
-    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
-
-    <!-- You can specify your own background image for the login screen here. This path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/login.jpg -->
-    <loginBackgroundImage>assets/img/login.jpg</loginBackgroundImage>
-
-  </content>
-
-  <security>
-    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-    <keepUserLoggedIn>false</keepUserLoggedIn>
-    <!-- by default this is true and if not specified in config will be true. set to false to always show a separate username field in the back office user editor -->
-    <usernameIsEmail>true</usernameIsEmail>
-    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
-    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
-  </security>
-
-  <requestHandler>
-    <!-- this ensures that all url segments are turned to ASCII as much as we can -->
-    <urlReplacing toAscii="try" />
-  </requestHandler>
-
-  <!--
-    web.routing
-      @trySkipIisCustomErrors
-        Tries to skip IIS custom errors.
-        Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take
-        over and render its built-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors.
-        The default value is false, for backward compatibility reasons, which means that IIS _will_ take
-        over, and _prevent_ Umbraco 404 pages to show.
-      @internalRedirectPreservesTemplate
-        By default as soon as we're not displaying the initial document, we reset the template set by the
-        finder or by the alt. template. Set this option to true to preserve the template set by the finder
-        or by the alt. template, in case of an internal redirect.
-        (false by default, and in fact should remain false unless you know what you're doing)
-      @disableAlternativeTemplates
-        By default you can add a altTemplate querystring or append a template name to the current URL which
-        will make Umbraco render the content on the current page with the template you requested, for example:
-        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the
-        "About Us" page with a template with the alias Home. Setting this setting to true stops that behavior
-      @validateAlternativeTemplates
-        By default you can add a altTemplate querystring or append a template name to the current URL which
-        will make Umbraco render the content on the current page with the template you requested, for example:
-        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the
-        "About Us" page with a template with the alias Home. Setting this setting to true will ensure that
-        only templates that have been permitted on the document type will be allowed
-      @disableFindContentByIdPath
-        By default you can call any content Id in the url and show the content with that id, for example:
-        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting
-        this setting to true stops that behavior
-      @disableRedirectUrlTracking
-        When the URL changes for content, redirects are automatically created for redirect handling within the
-        request pipeline. Setting this setting to true stops the automatic creation of redirects. Note that this
-        does not stop the request pipeline from handling any previously created redirects.
-      @urlProviderMode
-        By default Umbraco automatically figures out if internal URLs should be rendered as relative or absolute,
-        depending on the current request and the configured domains. By setting this setting to "Relative" or
-        "Absolute" you can force Umbraco to always render URLs as either relative or absolute.
-      @umbracoApplicationUrl
-        The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
-        Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
-        path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
-  -->
-  <web.routing
-    trySkipIisCustomErrors="true"
-    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
-    umbracoApplicationUrl="">
-  </web.routing>
-
-  <!--
-  keepAlive
-    @disableKeepAliveTask
-      Disables the periodic KeepAliveTask when set to "true".
-      Use this setting to disable the KeepAliveTask in case you already have an alternative.
-      For example, Azure App Service has keep alive functionality built-in.
-      Defaults to "false".
-    @keepAlivePingUrl
-      The url of the KeepAlivePing action. By default, the url will use the umbracoApplicationUrl setting as the basis.
-      Change this setting to specify an alternative url to reach the KeepAlivePing action. eg http://localhost/umbraco/api/keepalive/ping
-      Defaults to "{umbracoApplicationUrl}/api/keepalive/ping".
-  -->
-  <keepAlive disableKeepAliveTask="false" keepAlivePingUrl="{umbracoApplicationUrl}/api/keepalive/ping" />
-</settings>
+<?xml version="1.0" encoding="utf-8" ?>
+<settings>
+
+  <!--
+    umbracoSettings.config configuration documentation can be found here:
+    https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/
+    Many of the optional settings are not explicitly listed here
+    but can be found in the online documentation.
+    -->
+
+    <backOffice>
+        <tours enable="true"></tours>
+    </backOffice>
+
+  <content>
+
+    <errors>
+      <error404>1</error404>
+      <!--
+        The value for error pages can be:
+        * A content item's GUID ID      (example: 26C1D84F-C900-4D53-B167-E25CC489DAC8)
+        * An XPath statement            (example: //errorPages[@nodeName='My cool error']
+        * A content item's integer ID   (example: 1234)
+      -->
+      <!--
+        <error404>
+            <errorPage culture="default">26C1D84F-C900-4D53-B167-E25CC489DAC8</errorPage>
+            <errorPage culture="en-US">D820E120-6865-4D88-BFFE-48801A6AC375</errorPage>
+        </error404>
+       -->
+    </errors>
+
+    <notifications>
+      <!-- the email that should be used as from mail when umbraco sends a notification -->
+      <!-- you can add a display name to the email like this: <email>Your display name here &lt;your@email.here&gt;</email> -->
+      <email>your@email.here</email>
+    </notifications>
+
+    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
+    <PreviewBadge>
+        <![CDATA[
+            <div id="umbracoPreviewBadge" class="umbraco-preview-badge">
+                <span class="umbraco-preview-badge__header">Preview mode</span>
+                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open">
+                    …
+                </a>
+                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end">
+                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
+                </a>
+            </div>
+            <style type="text/css">
+                .umbraco-preview-badge {{
+                    position: fixed;
+                    bottom: 0;
+                    display: inline-flex;
+                    background: rgba(27, 38, 79, 0.9);
+                    color: #fff;
+                    font-size: 12px;
+                    z-index: 99999999;
+                    justify-content: center;
+                    align-items: center;
+                    box-shadow: 0 5px 10px rgba(0, 0, 0, .2), 0 1px 2px rgba(0, 0, 0, .2);
+                    line-height: 1;
+                    pointer-events:none;
+                    left: 50%;
+                    transform: translate(-50%, 40px);
+                    animation: umbraco-preview-badge--effect 10s 100ms ease both;
+                    border-radius: 3px 3px 0 0;
+                }}
+                @keyframes umbraco-preview-badge--effect {{
+                    0% {{
+                        transform: translate(-50%, 40px);
+                        animation-timing-function: ease-out;
+                    }}
+                    1.5% {{
+                        transform: translate(-50%, -20px);
+                        animation-timing-function: ease-in;
+                    }}
+                    5.0% {{
+                        transform: translate(-50%, -8px);
+                        animation-timing-function: ease-in;
+                    }}
+                    7.5% {{
+                        transform: translate(-50%, -4px);
+                        animation-timing-function: ease-in;
+                    }}
+                    9.2% {{
+                        transform: translate(-50%, -2px);
+                        animation-timing-function: ease-in;
+                    }}
+                    3.5%,
+                    6.5%,
+                    8.5% {{
+                        transform: translate(-50%, 0);
+                        animation-timing-function: ease-out;
+                    }}
+                    9.7% {{
+                        transform: translate(-50%, 0);
+                        animation-timing-function: ease-out;
+                    }}
+                    10.0% {{
+                        transform: translate(-50%, 0);
+                    }}
+
+
+                    60% {{
+                        transform: translate(-50%, 0);
+                        animation-timing-function: ease-out;
+                    }}
+                    61.5% {{
+                        transform: translate(-50%, -20px);
+                        animation-timing-function: ease-in;
+                    }}
+                    65.0% {{
+                        transform: translate(-50%, -8px);
+                        animation-timing-function: ease-in;
+                    }}
+                    67.5% {{
+                        transform: translate(-50%, -4px);
+                        animation-timing-function: ease-in;
+                    }}
+                    69.2% {{
+                        transform: translate(-50%, -2px);
+                        animation-timing-function: ease-in;
+                    }}
+                    63.5%,
+                    66.5%,
+                    68.5% {{
+                        transform: translate(-50%, 0);
+                        animation-timing-function: ease-out;
+                    }}
+                    69.7% {{
+                        transform: translate(-50%, 0);
+                        animation-timing-function: ease-out;
+                    }}
+                    70.0% {{
+                        transform: translate(-50%, 0);
+                    }}
+                    100.0% {{
+                        transform: translate(-50%, 0);
+                    }}
+                }}
+                .umbraco-preview-badge__header {{
+                    padding: 1em;
+                    font-weight: bold;
+                    pointer-events:none;
+                }}
+                .umbraco-preview-badge__a {{
+                    width: 3em;
+                    padding: 1em;
+                    display: flex;
+                    flex-shrink: 0;
+                    align-items: center;
+                    align-self: stretch;
+                    color:white;
+                    text-decoration:none;
+                    font-weight: bold;
+                    border-left: 1px solid hsla(0,0%,100%,.25);
+                    pointer-events:all;
+                }}
+                .umbraco-preview-badge__a svg {{
+                    width: 1em;
+                    height:1em;
+                }}
+                .umbraco-preview-badge__a:hover {{
+                    background: #202d5e;
+                }}
+                .umbraco-preview-badge__end svg {{
+                    fill: #fff;
+                    width:1em;
+                }}
+            </style>
+            <script type="text/javascript" src="{0}/js/umbraco.websitepreview.js"></script>
+        ]]>
+    </PreviewBadge>
+
+    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
+         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
+         - silent - Silently suppress the error and do not render the offending macro.
+         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
+                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
+         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
+    <MacroErrors>throw</MacroErrors>
+
+    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
+    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
+
+    <!-- You can specify your own background image for the login screen here. This path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/login.jpg -->
+    <loginBackgroundImage>assets/img/login.jpg</loginBackgroundImage>
+
+  </content>
+
+  <security>
+    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
+    <keepUserLoggedIn>false</keepUserLoggedIn>
+    <!-- by default this is true and if not specified in config will be true. set to false to always show a separate username field in the back office user editor -->
+    <usernameIsEmail>true</usernameIsEmail>
+    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
+    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
+  </security>
+
+  <requestHandler>
+    <!-- this ensures that all url segments are turned to ASCII as much as we can -->
+    <urlReplacing toAscii="try" />
+  </requestHandler>
+
+  <!--
+    web.routing
+      @trySkipIisCustomErrors
+        Tries to skip IIS custom errors.
+        Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take
+        over and render its built-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors.
+        The default value is false, for backward compatibility reasons, which means that IIS _will_ take
+        over, and _prevent_ Umbraco 404 pages to show.
+      @internalRedirectPreservesTemplate
+        By default as soon as we're not displaying the initial document, we reset the template set by the
+        finder or by the alt. template. Set this option to true to preserve the template set by the finder
+        or by the alt. template, in case of an internal redirect.
+        (false by default, and in fact should remain false unless you know what you're doing)
+      @disableAlternativeTemplates
+        By default you can add a altTemplate querystring or append a template name to the current URL which
+        will make Umbraco render the content on the current page with the template you requested, for example:
+        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the
+        "About Us" page with a template with the alias Home. Setting this setting to true stops that behavior
+      @validateAlternativeTemplates
+        By default you can add a altTemplate querystring or append a template name to the current URL which
+        will make Umbraco render the content on the current page with the template you requested, for example:
+        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the
+        "About Us" page with a template with the alias Home. Setting this setting to true will ensure that
+        only templates that have been permitted on the document type will be allowed
+      @disableFindContentByIdPath
+        By default you can call any content Id in the url and show the content with that id, for example:
+        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting
+        this setting to true stops that behavior
+      @disableRedirectUrlTracking
+        When the URL changes for content, redirects are automatically created for redirect handling within the
+        request pipeline. Setting this setting to true stops the automatic creation of redirects. Note that this
+        does not stop the request pipeline from handling any previously created redirects.
+      @urlProviderMode
+        By default Umbraco automatically figures out if internal URLs should be rendered as relative or absolute,
+        depending on the current request and the configured domains. By setting this setting to "Relative" or
+        "Absolute" you can force Umbraco to always render URLs as either relative or absolute.
+      @umbracoApplicationUrl
+        The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
+        Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
+        path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
+  -->
+  <web.routing
+    trySkipIisCustomErrors="true"
+    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
+    umbracoApplicationUrl="">
+  </web.routing>
+
+  <!--
+  keepAlive
+    @disableKeepAliveTask
+      Disables the periodic KeepAliveTask when set to "true".
+      Use this setting to disable the KeepAliveTask in case you already have an alternative.
+      For example, Azure App Service has keep alive functionality built-in.
+      Defaults to "false".
+    @keepAlivePingUrl
+      The url of the KeepAlivePing action. By default, the url will use the umbracoApplicationUrl setting as the basis.
+      Change this setting to specify an alternative url to reach the KeepAlivePing action. eg http://localhost/umbraco/api/keepalive/ping
+      Defaults to "{umbracoApplicationUrl}/api/keepalive/ping".
+  -->
+  <keepAlive disableKeepAliveTask="false" keepAlivePingUrl="{umbracoApplicationUrl}/api/keepalive/ping" />
+</settings>

From f20e322ff5adb454b71c830784e43b739ca6d343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Fri, 2 Oct 2020 20:46:54 +0200
Subject: [PATCH 05/73] apply functionality to modal.

---
 .../src/websitepreview/websitepreview.js      | 53 ++++++++++---------
 .../config/umbracoSettings.config             |  2 +-
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
index 203748e96e..be5c989f68 100644
--- a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -10,6 +10,8 @@
         return;
     }
 
+    const scriptElement = document.currentScript;
+
     function setCookie(cname, cvalue, exminutes) {
         var d = new Date();
         d.setTime(d.getTime() + (exminutes * 60 * 1000));
@@ -18,24 +20,24 @@
 
     function getCookie(cname) {
         var name = cname + "=";
-        var ca = document.cookie.split(';');
+        var ca = document.cookie.split(";");
         for(var i = 0; i < ca.length; i++) {
             var c = ca[i];
-            while (c.charAt(0) == ' ') {
-            c = c.substring(1);
+            while (c.charAt(0) == " ") {
+                c = c.substring(1);
             }
             if (c.indexOf(name) == 0) {
-            return c.substring(name.length, c.length);
+                return c.substring(name.length, c.length);
             }
         }
         return "";
     }
 
     function exitPreviewMode() {
-        window.top.location.href = "../preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
+        window.top.location.href = scriptElement.getAttribute("data-umbraco-path")+"/preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
     }
     function continuePreviewMode() {
-        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", 1);
+        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", 5);
     }
 
     var user = getCookie("UMB-WEBSITE-PREVIEW-ACCEPT");
@@ -105,42 +107,45 @@
             }
         `;
 
+        var bodyEl = document.getElementsByTagName("BODY")[0];
+
         var fragment = document.createDocumentFragment();
 
-        var con = document.createElement("style");
-        con.innerHTML = modelStyles;
-        fragment.appendChild(con);
+        var style = document.createElement("style");
+        style.innerHTML = modelStyles;
+        fragment.appendChild(style);
 
         var con = document.createElement("div");
         con.className = "umbraco-preview-dialog";
+        fragment.appendChild(con);
 
-
-        var model = document.createElement("div");
-        model.className = "umbraco-preview-dialog";
-        model.innerHTML = `<div class="umbraco-preview-dialog__headline">Preview mode</div>
+        var modal = document.createElement("div");
+        modal.className = "umbraco-preview-dialog__modal";
+        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">Preview mode</div>
             <div class="umbraco-preview-dialog__question">Do you want to continue viewing latest saved version?</div>`;
+        con.appendChild(modal);
 
         var continueButton = document.createElement("button");
         continueButton.type = "button";
+        continueButton.className = "umbraco-preview-dialog__continue";
         continueButton.innerHTML = "Continue";
-        model.appendChild(continueButton);
-
-        continueButton.addEventListener("click", continuePreviewMode);
+        continueButton.addEventListener("click", function() {
+            bodyEl.removeChild(style);
+            bodyEl.removeChild(con);
+            continuePreviewMode();
+        });
+        modal.appendChild(continueButton);
 
         var exitButton = document.createElement("button");
         exitButton.type = "button";
-        exitButton.className = "umbraco-preview-dialog__continue";
         exitButton.innerHTML = "Exit preview mode";
-        model.appendChild(exitButton);
+        exitButton.addEventListener("click", exitPreviewMode);
+        modal.appendChild(exitButton);
 
-        continueButton.addEventListener("click", exitPreviewMode);
-
-        fragment.appendChild(con);
-
-        document.getElementsByTagName("BODY")[0].appendChild(fragment);
+        bodyEl.appendChild(fragment);
+        continueButton.focus();
     } else {
         continuePreviewMode();
-        console.log("already set");
     }
 
 })();
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 43f239444f..2287464d07 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -170,7 +170,7 @@
                     width:1em;
                 }}
             </style>
-            <script type="text/javascript" src="{0}/js/umbraco.websitepreview.js"></script>
+            <script type="text/javascript" data-umbraco-path="{0}" src="{0}/js/umbraco.websitepreview.js"></script>
         ]]>
     </PreviewBadge>
 

From 879d54b5259b237d7c6b82c285bee28c2f64dd7f Mon Sep 17 00:00:00 2001
From: Mike Masey <mike.masey@yoyodesign.com>
Date: Tue, 6 Oct 2020 13:09:35 +0100
Subject: [PATCH 06/73] V8/feature/update icon picker to use umb icon (#9063)

(cherry picked from commit 27751a4ae70b66e477aff554583e4261f5e4e94a)
---
 ...on-adressbook.svg => icon-addressbook.svg} |  0
 .../components/umbicon.directive.js           | 36 +++++++++++--------
 .../iconpicker/iconpicker.controller.js       | 22 +++++++++---
 .../iconpicker/iconpicker.html                |  8 ++---
 4 files changed, 44 insertions(+), 22 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/assets/icons/{icon-adressbook.svg => icon-addressbook.svg} (100%)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-adressbook.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-addressbook.svg
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/assets/icons/icon-adressbook.svg
rename to src/Umbraco.Web.UI.Client/src/assets/icons/icon-addressbook.svg
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
index 517776388b..87d976f6d9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
@@ -15,16 +15,7 @@ Simple icon
 
 Icon with additional attribute. It can be treated like any other dom element
 <pre>
-    <umb-icon icon="icon-alert" class="icon-class" ng-click="doSomething()"></umb-icon>
-</pre>
-
-Manual svg string
-This format is only used in the iconpicker.html
-<pre>
-    <umb-icon 
-        icon="icon-alert"
-        svg-string='<svg height="50" width="50"><circle cx="25" cy="25" r="25" fill="red" /></svg>'>
-    </umb-icon>
+    <umb-icon icon="icon-alert" class="icon-class"></umb-icon>
 </pre>
 @example
  **/
@@ -43,13 +34,19 @@ This format is only used in the iconpicker.html
                 svgString: "=?"
             },
 
-            link: function (scope) {
-                
+            link: function (scope, element) {
                 if (scope.svgString === undefined && scope.svgString !== null && scope.icon !== undefined && scope.icon !== null) {
-                    var icon = scope.icon.split(" ")[0]; // Ensure that only the first part of the icon is used as sometimes the color is added too, e.g. see umbeditorheader.directive scope.openIconPicker
+                    const observer = new IntersectionObserver(_lazyRequestIcon, {rootMargin: "100px"});
+                    const iconEl = element[0];
 
-                    _requestIcon(icon);
+                    observer.observe(iconEl);
+
+                    // make sure to disconnect the observer when the scope is destroyed
+                    scope.$on('$destroy', function () {
+                        observer.disconnect();
+                    });
                 }
+
                 scope.$watch("icon", function (newValue, oldValue) {
                     if (newValue && oldValue) {
                         var newicon = newValue.split(" ")[0];
@@ -61,6 +58,17 @@ This format is only used in the iconpicker.html
                     }
                 });
 
+                function _lazyRequestIcon(entries, observer) {
+                    entries.forEach(entry => {
+                        if (entry.isIntersecting === true) {
+                            observer.disconnect();
+
+                            var icon = scope.icon.split(" ")[0]; // Ensure that only the first part of the icon is used as sometimes the color is added too, e.g. see umbeditorheader.directive scope.openIconPicker
+                            _requestIcon(icon);
+                        }
+                    });
+                }
+
                 function _requestIcon(icon) {
                     // Reset svg string before requesting new icon.
                     scope.svgString = null;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
index 44b10b852d..59a9aed4bb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
@@ -43,10 +43,24 @@ function IconPickerController($scope, localizationService, iconHelper) {
 
         setTitle();
 
-        iconHelper.getIcons().then(function (icons) {
-            vm.icons = icons;
-            vm.loading = false;
-        });
+        iconHelper.getAllIcons()
+            .then(icons => {
+                vm.icons = icons;
+
+                // Get's legacy icons, removes duplicates then maps them to IconModel
+                iconHelper.getIcons()
+                    .then(icons => {
+                        if (icons && icons.length > 0) {
+                            let legacyIcons = icons
+                                .filter(icon => !vm.icons.find(x => x.name == icon))
+                                .map(icon => { return { name: icon, svgString: null }; });
+
+                            vm.icons = legacyIcons.concat(vm.icons);
+                        }
+
+                        vm.loading = false;
+                    });
+            });
 
         // set a default color if nothing is passed in
         vm.color = $scope.model.color ? findColor($scope.model.color) : vm.colors.find(x => x.default);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
index dd2ff41efa..e364b29b3f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
@@ -45,10 +45,10 @@
 
                 <div class="umb-control-group" ng-show="!vm.loading && filtered.length > 0 ">
                     <ul class="umb-iconpicker" ng-class="vm.color.value" ng-show="vm.icons">
-                        <li class="umb-iconpicker-item" ng-class="{'-selected': icon == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm) track by $id(icon)">
-                            <button type="button" title="{{icon}}" ng-click="vm.selectIcon(icon, vm.color.value)">
-                                <i class="{{icon}} large" aria-hidden="true"></i>
-                                <span class="sr-only"><localize key="buttons_select">Select</localize> {{icon}}</span>
+                        <li class="umb-iconpicker-item" ng-class="{'-selected': icon.name == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm | orderBy:'name') track by $id(icon)">
+                            <button type="button" title="{{icon.name}}" ng-click="vm.selectIcon(icon.name, vm.color.value)">
+                                <umb-icon class="umb-iconpicker-svg {{icon.name}} large" icon="{{icon.name}}"></umb-icon>
+                                <span class="sr-only"><localize key="buttons_select">Select</localize> {{icon.name}}</span>
                             </button>
                         </li>
                     </ul>

From d7bf980f121995fd62aa38c4efce71c1deda209e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <sk@ecreo.dk>
Date: Tue, 6 Oct 2020 15:06:03 +0200
Subject: [PATCH 07/73] Adds icons from App_Plugins/**/Icons/*.svg (#8884)

(cherry picked from commit 3b551bdc5d01c2b28b66f670fc93da4a619c856e)
---
 src/Umbraco.Core/Services/IIconService.cs |  4 +-
 src/Umbraco.Web/Services/IconService.cs   | 65 ++++++++++++++++++-----
 2 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Core/Services/IIconService.cs b/src/Umbraco.Core/Services/IIconService.cs
index 963edb22a5..72174a0504 100644
--- a/src/Umbraco.Core/Services/IIconService.cs
+++ b/src/Umbraco.Core/Services/IIconService.cs
@@ -9,13 +9,13 @@ namespace Umbraco.Core.Services
         /// Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
         /// </summary>
         /// <param name="iconName"></param>
-        /// <returns></returns>
+        /// <returns><see cref="IconModel"/></returns>
         IconModel GetIcon(string iconName);
 
         /// <summary>
         /// Gets a list of all svg icons found at at the global icons path.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>A list of <see cref="IconModel"/></returns>
         IList<IconModel> GetAllIcons();
     }
 }
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index 206af296f9..ba6692c7b9 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -19,13 +19,11 @@ namespace Umbraco.Web.Services
             _globalSettings = globalSettings;
         }
 
-
         /// <inheritdoc />
         public IList<IconModel> GetAllIcons()
         {
             var icons = new List<IconModel>();
-            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
-            var iconNames = directory.GetFiles("*.svg");
+            var iconNames = GetAllIconNames();
 
             iconNames.OrderBy(f => f.Name).ToList().ForEach(iconInfo =>
             {
@@ -45,15 +43,15 @@ namespace Umbraco.Web.Services
         {
             return string.IsNullOrWhiteSpace(iconName)
                 ? null
-                : CreateIconModel(iconName.StripFileExtension(), IOHelper.MapPath($"{_globalSettings.IconsPath}/{iconName}.svg"));
+                : CreateIconModel(iconName.StripFileExtension());
         }
 
         /// <summary>
         /// Gets an IconModel using values from a FileInfo model
         /// </summary>
         /// <param name="fileInfo"></param>
-        /// <returns></returns>
-        private IconModel GetIcon(FileInfo fileInfo)
+        /// <returns><see cref="IconModel"/></returns>
+        private IconModel GetIcon(FileSystemInfo fileInfo)
         {
             return fileInfo == null || string.IsNullOrWhiteSpace(fileInfo.Name)
                 ? null
@@ -64,17 +62,37 @@ namespace Umbraco.Web.Services
         /// Gets an IconModel containing the icon name and SvgString
         /// </summary>
         /// <param name="iconName"></param>
-        /// <param name="iconPath"></param>
-        /// <returns></returns>
-        private IconModel CreateIconModel(string iconName, string iconPath)
+        /// <returns><see cref="IconModel"/></returns>
+        private IconModel CreateIconModel(string iconName)
         {
-            var sanitizer = new HtmlSanitizer();
-            sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
-            sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
-            sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
+            if (string.IsNullOrWhiteSpace(iconName))
+                return null;
+
+            var iconNames = GetAllIconNames();
+            var iconPath = iconNames.FirstOrDefault(x => x.Name.InvariantEquals($"{iconName}.svg"))?.FullName;
+            return iconPath == null
+                ? null
+                : CreateIconModel(iconName, iconPath);
+        }
+
+        /// <summary>
+        /// Gets an IconModel containing the icon name and SvgString
+        /// </summary>
+        /// <param name="iconName"></param>
+        /// <param name="iconPath"></param>
+        /// <returns><see cref="IconModel"/></returns>
+        private static IconModel CreateIconModel(string iconName, string iconPath)
+        {
+            if (string.IsNullOrWhiteSpace(iconPath))
+                return null;
 
             try
             {
+                var sanitizer = new HtmlSanitizer();
+                sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
+                sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
+                sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
+
                 var svgContent = System.IO.File.ReadAllText(iconPath);
                 var sanitizedString = sanitizer.Sanitize(svgContent);
 
@@ -91,5 +109,26 @@ namespace Umbraco.Web.Services
                 return null;
             }
         }
+
+        private IEnumerable<FileInfo> GetAllIconNames()
+        {
+            // add icons from plugins
+            var appPlugins = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.AppPlugins));
+            var pluginIcons = appPlugins.Exists == false
+                ? new List<FileInfo>()
+                : appPlugins.GetDirectories()
+                    // Find all directories in App_Plugins that are named "Icons" and get a list of SVGs from them
+                    .SelectMany(x => x.GetDirectories("Icons", SearchOption.AllDirectories))
+                    .SelectMany(x => x.GetFiles("*.svg", SearchOption.TopDirectoryOnly));
+
+            // add icons from IconsPath if not already added from plugins
+            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
+            var iconNames = directory.GetFiles("*.svg")
+                .Where(x => pluginIcons.Any(i => i.Name == x.Name) == false);
+
+            iconNames = iconNames.Concat(pluginIcons).ToList();
+
+            return iconNames;
+        }
     }
 }

From df607dbef8bab97f668a9cf6bd894fc0e46e5302 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 7 Oct 2020 11:20:40 +0200
Subject: [PATCH 08/73] Make rollback test pass again

---
 .../cypress/integration/Content/content.ts                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index bb70a1c858..9095ee0abb 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -317,11 +317,11 @@ context('Content', () => {
         // Rollback
         cy.get('.umb-box-header :button').click();
 
-        cy.get('.umb-box-content > .ng-scope > .input-block-level')
+        cy.get('.umb-box-content > div > .input-block-level')
             .find('option[label*=' + new Date().getDate() + ']')
             .then(elements => {
                 const option = elements[[elements.length - 1]].getAttribute('value');
-                cy.get('.umb-box-content > .ng-scope > .input-block-level')
+                cy.get('.umb-box-content > div > .input-block-level')
                     .select(option);
             });
 
@@ -330,8 +330,8 @@ context('Content', () => {
         cy.reload();
 
         // Assert
-        cy.get('.history').find('.umb-badge').eq(0).should('contain.text', "Rollback");
-        cy.get('.history').find('.umb-badge').eq(1).should('contain.text', "Save");
+        cy.get('.history').find('.umb-badge').eq(0).should('contain.text', "Save");
+        cy.get('.history').find('.umb-badge').eq(1).should('contain.text', "Rollback");
         cy.get('#headerName').should('have.value', initialNodeName);
 
         // Clean up (content is automatically deleted when document types are gone)

From 3137c01ea1b8b76917c93a1be08eefc21cc1e4a4 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 7 Oct 2020 13:04:23 +0200
Subject: [PATCH 09/73] Assert success notification after publishign content in
 rollback test

---
 .../cypress/integration/Content/content.ts                       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index 9095ee0abb..bb121b5f5b 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -313,6 +313,7 @@ context('Content', () => {
 
         // Save and publish
         cy.get('.btn-success').first().click();
+        cy.umbracoSuccessNotification().should('be.visible');
 
         // Rollback
         cy.get('.umb-box-header :button').click();

From 035b5beba737f97ed80c6eb473b18c7fc0247f3f Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 7 Oct 2020 15:19:56 +0200
Subject: [PATCH 10/73] Click the content area in  create template test instead
 of making edit

Tests no longer fail with a weird The process cannot access the file, or well at least not in the 10 recurrent tries i just did.
---
 .../cypress/integration/Settings/templates.ts      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index aff1c38093..e315a74c8a 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -27,12 +27,14 @@ context('Templates', () => {
         createTemplate();
         //Type name
         cy.umbracoEditorHeaderName(name);
-        /* Make an edit, if you don't the file will be create twice,
-        only happens in testing though, probably because the test is too fast
-        Certifiably mega wonk regardless */
-        cy.get('.ace_text-input').type("var num = 5;", {force:true} );
-
-        //Save
+        /*
+        Click the content area, if we don't do this we wont get redirected
+        to the new edit url, this will cause the test to save two copies at best
+        worst case, we'll get an error "The process cannot access the file" on the
+        template.
+         */
+        cy.get('.ace_content').click();
+        // Save
         cy.get('.btn-success').click();
 
         //Assert

From 030928f3a6938bc409917a48c6896e43214ffe10 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu, 8 Oct 2020 09:35:16 +0200
Subject: [PATCH 11/73] Unfocus and wait for save to be visible in templates

---
 .../cypress/integration/Settings/templates.ts   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index e315a74c8a..4cc990b762 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -21,20 +21,21 @@ context('Templates', () => {
 
 
     it('Create template', () => {
-        const name = "Test template test";
+        const name = "Create Template test";
         cy.umbracoEnsureTemplateNameNotExists(name);
 
         createTemplate();
         //Type name
         cy.umbracoEditorHeaderName(name);
-        /*
-        Click the content area, if we don't do this we wont get redirected
-        to the new edit url, this will cause the test to save two copies at best
-        worst case, we'll get an error "The process cannot access the file" on the
-        template.
-         */
-        cy.get('.ace_content').click();
         // Save
+        // We must drop focus for the auto save event to occur.
+        cy.get('.btn-success').focus();
+        // And then wait for the auto save event to finish but finding the page in the tree view
+        // This is a bit of a roundabout way to find items in a treev view since we dont use umbracoTreeItem
+        // But we must be able to wait for the save evnent to finish, and we can't do that with umbracoTreeItem
+        cy.get('[data-element="tree-item-templates"] > :nth-child(2) > .umb-animated > .umb-tree-item__inner > .umb-tree-item__label').contains(name).should('be.visible', {timeout:10000});
+        // Now that the auto save event has finished we can save
+        // And there wont be any duplicates or file in use errors.
         cy.get('.btn-success').click();
 
         //Assert

From a5115757847ee96064b0a439c757bbe35cb3cc7a Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu, 8 Oct 2020 10:06:56 +0200
Subject: [PATCH 12/73] Assert that error notification does not come up on
 create template

Had the test pass sometimes before the fix because the success notification appear, but the error notification appear at well, so the test shouldn't actually have passed
---
 .../cypress/integration/Settings/templates.ts                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index 4cc990b762..36fa447d1e 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -18,8 +18,6 @@ context('Templates', () => {
         cy.umbracoContextMenuAction("action-create").click();
     }
 
-
-
     it('Create template', () => {
         const name = "Create Template test";
         cy.umbracoEnsureTemplateNameNotExists(name);
@@ -40,6 +38,9 @@ context('Templates', () => {
 
         //Assert
         cy.umbracoSuccessNotification().should('be.visible');
+        // For some reason cy.umbracoErrorNotification tries to click the element which is not possible
+        // if it doesn't actually exist, making should('not.be.visible') impossible.
+        cy.get('.umb-notifications__notifications > .alert-error', {timeout: 5000}).should('not.be.visible');
 
         //Clean up
         cy.umbracoEnsureTemplateNameNotExists(name);

From 3c29982c0987baec55a3ed4ec74b40a10efb37c1 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu, 8 Oct 2020 10:35:05 +0200
Subject: [PATCH 13/73] Don't expect a certain order from badges in rollback

The badge order is not deterministic which means we can't expect them to be in a certain order.
---
 .../cypress/integration/Content/content.ts                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index bb121b5f5b..c63031532c 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -331,8 +331,8 @@ context('Content', () => {
         cy.reload();
 
         // Assert
-        cy.get('.history').find('.umb-badge').eq(0).should('contain.text', "Save");
-        cy.get('.history').find('.umb-badge').eq(1).should('contain.text', "Rollback");
+        cy.get('.history').find('.umb-badge').contains('Save').should('be.visible');
+        cy.get('.history').find('.umb-badge').contains('Rollback').should('be.visible');
         cy.get('#headerName').should('have.value', initialNodeName);
 
         // Clean up (content is automatically deleted when document types are gone)

From c8018ed00a941f4e16621968d45918a6970fdf47 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu, 8 Oct 2020 15:19:54 +0200
Subject: [PATCH 14/73] Add a timeout when getting the progress percentage

---
 .../cypress/integration/Tour/backofficeTour.ts                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
index 307da2518c..e7f250d2be 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
@@ -71,7 +71,7 @@ function resetTourData() {
 function runBackOfficeIntroTour(percentageComplete, buttonText, timeout) {
     cy.get('[data-element="help-tours"]').should("be.visible");
     cy.get('[data-element="help-tours"]').click();
-    cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: timeout }).get('[percentage]').contains(percentageComplete + '%');
+    cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: timeout }).get('[percentage]').contains(percentageComplete + '%', {timeout: timeout});
     cy.get('[data-element="help-tours"]').click();
     cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').should("be.visible");
     cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').contains(buttonText);

From dc072293f9233bcab690b69d80ec02a919748856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 8 Oct 2020 16:36:25 +0200
Subject: [PATCH 15/73] New dialogs for asking about Preview mode

---
 src/Umbraco.Core/Constants-Web.cs             |   4 +
 .../src/preview/preview.controller.js         | 205 ++++++++++++++++--
 .../src/websitepreview/websitepreview.js      |  49 +++--
 .../Umbraco/Views/Preview/Index.cshtml        |   3 +
 .../config/umbracoSettings.config             |   2 +-
 src/Umbraco.Web/Editors/PreviewController.cs  |  17 +-
 6 files changed, 240 insertions(+), 40 deletions(-)

diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 64216ba571..0e956cfd6a 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -17,6 +17,10 @@
             /// The preview cookie name
             /// </summary>
             public const string PreviewCookieName = "UMB_PREVIEW";
+            /// <summary>
+            /// Client-side cookie that determins wether the user has accepted to be in Preview Mode when visiting the website.
+            /// </summary>
+            public const string AcceptPreviewCookieName = "UMB-WEBSITE-PREVIEW-ACCEPT";
 
             public const string InstallerCookieName = "umb_installId";
         }
diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 5ff8dd3633..412d0c9cc5 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -5,13 +5,13 @@
 
 var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.services'])
 
-    .controller("previewController", function ($scope, $window, $location) {
+    .controller("previewController", function ($scope, $window, $location, $http) {
 
         $scope.currentCulture = { iso: '', title: '...', icon: 'icon-loading' }
         var cultures = [];
 
         $scope.tabbingActive = false;
-        // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. 
+        // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution.
         // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
         function handleFirstTab(evt) {
             if (evt.keyCode === 9) {
@@ -89,7 +89,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         if (isInit === "true") {
             //do not continue, this is the first load of this new window, if this is passed in it means it's been
             //initialized by the content editor and then the content editor will actually re-load this window without
-            //this flag. This is a required trick to get around chrome popup mgr. 
+            //this flag. This is a required trick to get around chrome popup mgr.
             return;
         }
 
@@ -100,7 +100,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
 
         $scope.valueAreLoaded = false;
         $scope.devices = [
-            { name: "fullsize", css: "fullsize", icon: "icon-application-window-alt", title: "Browser" },
+            { name: "fullsize", css: "fullsize", icon: "icon-application-window-alt", title: "Fit browser" },
             { name: "desktop", css: "desktop shadow", icon: "icon-display", title: "Desktop" },
             { name: "laptop - 1366px", css: "laptop shadow", icon: "icon-laptop", title: "Laptop" },
             { name: "iPad portrait - 768px", css: "iPad-portrait shadow", icon: "icon-ipad", title: "Tablet portrait" },
@@ -136,17 +136,24 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         $scope.windowClickHandler = function () {
             closeOthers();
         }
+
         function windowBlurHandler() {
             closeOthers();
             $scope.$digest();
         }
+        window.addEventListener("blur", windowBlurHandler);
 
-        var win = $($window);
-
-        win.on("blur", windowBlurHandler);
+        function windowVisibilityHandler(e) {
+            // When tab is visible again:
+            if(document.hidden === false) {
+                checkPreviewState();
+            }
+        }
+        document.addEventListener("visibilitychange", windowVisibilityHandler);
 
         $scope.$on("$destroy", function () {
-            win.off("blur", handleBlwindowBlurHandlerur);
+            window.removeEventListener("blur", windowBlurHandler);
+            window.removeEventListener("visibilitychange", windowVisibilityHandler);
         });
 
 
@@ -162,6 +169,167 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
                 $scope.pageUrl = "frame?" + query;
             }
         }
+        function getCookie(cname) {
+            var name = cname + "=";
+            var ca = document.cookie.split(";");
+            for(var i = 0; i < ca.length; i++) {
+                var c = ca[i];
+                while (c.charAt(0) == " ") {
+                    c = c.substring(1);
+                }
+                if (c.indexOf(name) == 0) {
+                    return c.substring(name.length, c.length);
+                }
+            }
+            return null;
+        }
+        function setCookie(cname, cvalue, exminutes) {
+            var d = new Date();
+            d.setTime(d.getTime() + (exminutes * 60 * 1000));
+            document.cookie = cname + "=" + cvalue + ";expires="+d.toUTCString() + ";path=/";
+        }
+        var hasPreviewDialog = false;
+        function checkPreviewState() {
+            if (getCookie("UMB_PREVIEW") === null) {
+
+                if(hasPreviewDialog === true) return;
+                hasPreviewDialog = true;
+
+                // Ask to re-enter preview mode?
+
+                // This modal is also used in websitepreview.js
+                var modelStyles = `
+
+                    /* Webfont: LatoLatin-Bold */
+                    @font-face {
+                        font-family: 'Lato';
+                        src: url('https://fonts.googleapis.com/css2?family=Lato:wght@700&display=swap');
+                        font-style: normal;
+                        font-weight: 700;
+                        font-display: swap;
+                        text-rendering: optimizeLegibility;
+                    }
+
+                    .umbraco-preview-dialog {
+                        position: fixed;
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        z-index: 99999999;
+                        top:0;
+                        bottom:0;
+                        left:0;
+                        right:0;
+                        overflow: auto;
+                        background-color: rgba(0,0,0,0.6);
+                    }
+
+                    .umbraco-preview-dialog__modal {
+                        background-color: #fff;
+                        border-radius: 6px;
+                        box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+                        margin: auto;
+                        padding: 30px 40px;
+                        width: 100%;
+                        max-width: 540px;
+                        font-family: Lato,Helvetica Neue,Helvetica,Arial,sans-serif;
+                        font-size: 15px;
+                    }
+
+                    .umbraco-preview-dialog__headline {
+                        font-weight: 700;
+                        font-size: 22px;
+                        color: #1b264f;
+                        margin-top:10px;
+                        margin-bottom:20px;
+                    }
+                    .umbraco-preview-dialog__question {
+                        margin-bottom:30px;
+                    }
+                    .umbraco-preview-dialog__modal > button {
+                        display: inline-block;
+                        cursor: pointer;
+                        padding: 8px 18px;
+                        text-align: center;
+                        vertical-align: middle;
+                        border-radius: 3px;
+                        border:none;
+                        font-family: inherit;
+                        font-weight: 700;
+                        font-size: 15px;
+                        float:right;
+                        margin-left:10px;
+
+                        color: #1b264f;
+                        background-color: #f6f1ef;
+                    }
+                    .umbraco-preview-dialog__modal > button:hover {
+                        color: #2152a3;
+                        background-color: #f6f1ef;
+                    }
+                    .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue {
+                        color: #fff;
+                        background-color: #2bc37c;
+                    }
+                    .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue:hover {
+                        background-color: #39d38b;
+                    }
+                `;
+
+                var bodyEl = document.getElementsByTagName("BODY")[0];
+
+                var fragment = document.createElement("div");
+                var shadowRoot = fragment.attachShadow({ mode: 'open' });
+
+                var style = document.createElement("style");
+                style.innerHTML = modelStyles;
+                shadowRoot.appendChild(style);
+
+                var con = document.createElement("div");
+                con.className = "umbraco-preview-dialog";
+                shadowRoot.appendChild(con);
+
+                var modal = document.createElement("div");
+                modal.className = "umbraco-preview-dialog__modal";
+                modal.innerHTML = `<div class="umbraco-preview-dialog__headline">Preview content?</div>
+                    <div class="umbraco-preview-dialog__question">You have exited preview mode, do you want to continue previewing this content?</div>`;
+                con.appendChild(modal);
+
+                var continueButton = document.createElement("button");
+                continueButton.type = "button";
+                continueButton.className = "umbraco-preview-dialog__continue";
+                continueButton.innerHTML = "Preview content";
+                continueButton.addEventListener("click", () => {
+                    bodyEl.removeChild(fragment);
+                    reenterPreviewMode();
+                    hasPreviewDialog = false;
+                });
+                modal.appendChild(continueButton);
+
+                bodyEl.appendChild(fragment);
+                continueButton.focus();
+
+            }
+        }
+        function reenterPreviewMode() {
+            //Re-enter Preview Mode
+            $http({
+                method: 'POST',
+                url: '../preview/enterPreview',
+                params: {
+                    id: $scope.pageId
+                }
+            })
+        }
+        function getPageURL() {
+            var culture = $location.search().culture || getParameterByName("culture");
+            var relativeUrl = "/" + $scope.pageId;
+            if (culture) {
+                relativeUrl += '?culture=' + culture;
+            }
+            return relativeUrl;
+        }
+
         /*****************************************************************************/
         /* Preview devices */
         /*****************************************************************************/
@@ -171,18 +339,21 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             $scope.previewDevice = device;
         };
 
+        /*****************************************************************************/
+        /* Open website in preview mode */
+        /*****************************************************************************/
+
+        $scope.openInBrowser = function () {
+            setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", 5);
+            window.open(getPageURL(), "_blank");
+        };
+
         /*****************************************************************************/
         /* Exit Preview */
         /*****************************************************************************/
 
         $scope.exitPreview = function () {
-
-            var culture = $location.search().culture || getParameterByName("culture");
-            var relativeUrl = "/" + $scope.pageId;
-            if (culture) {
-                relativeUrl += '?culture=' + culture;
-            }
-            window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
+            window.top.location.href = "../preview/end?redir=" + encodeURIComponent(getPageURL());
         };
 
         $scope.onFrameLoaded = function (iframe) {
@@ -239,8 +410,8 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             var vm = this;
 
             vm.$postLink = function () {
-                var resultFrame = $element.find("#resultFrame");
-                resultFrame.on("load", iframeReady);
+                var resultFrame = $element.find("#resultFrame").get(0);
+                resultFrame.addEventListener("load", iframeReady);
             };
 
             function iframeReady() {
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
index be5c989f68..cb76b47bb7 100644
--- a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -30,20 +30,31 @@
                 return c.substring(name.length, c.length);
             }
         }
-        return "";
+        return null;
     }
 
     function exitPreviewMode() {
         window.top.location.href = scriptElement.getAttribute("data-umbraco-path")+"/preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
     }
-    function continuePreviewMode() {
-        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", 5);
+    function continuePreviewMode(minutsToExpire) {
+        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", minutsToExpire || 2);
     }
 
     var user = getCookie("UMB-WEBSITE-PREVIEW-ACCEPT");
     if (user != "true") {
 
+        // This modal is also used in preview.js
         var modelStyles = `
+            /* Webfont: LatoLatin-Bold */
+            @font-face {
+                font-family: 'Lato';
+                src: url('https://fonts.googleapis.com/css2?family=Lato:wght@700&display=swap');
+                font-style: normal;
+                font-weight: 700;
+                font-display: swap;
+                text-rendering: optimizeLegibility;
+            }
+
             .umbraco-preview-dialog {
                 position: fixed;
                 display: flex;
@@ -68,6 +79,7 @@
                 max-width: 540px;
                 font-family: Lato,Helvetica Neue,Helvetica,Arial,sans-serif;
                 font-size: 15px;
+                line-height: 1.5;
             }
 
             .umbraco-preview-dialog__headline {
@@ -75,19 +87,22 @@
                 font-size: 22px;
                 color: #1b264f;
                 margin-top:10px;
-                margin-bottom:10px;
+                margin-bottom:20px;
             }
             .umbraco-preview-dialog__question {
                 margin-bottom:30px;
             }
             .umbraco-preview-dialog__modal > button {
                 display: inline-block;
+                cursor: pointer;
                 padding: 8px 18px;
                 text-align: center;
                 vertical-align: middle;
                 border-radius: 3px;
                 border:none;
+                font-family: inherit;
                 font-weight: 700;
+                font-size: 15px;
                 float:right;
                 margin-left:10px;
 
@@ -109,37 +124,37 @@
 
         var bodyEl = document.getElementsByTagName("BODY")[0];
 
-        var fragment = document.createDocumentFragment();
+        var fragment = document.createElement("div");
+        var shadowRoot = fragment.attachShadow({ mode: 'open' });
 
         var style = document.createElement("style");
         style.innerHTML = modelStyles;
-        fragment.appendChild(style);
+        shadowRoot.appendChild(style);
 
         var con = document.createElement("div");
         con.className = "umbraco-preview-dialog";
-        fragment.appendChild(con);
+        shadowRoot.appendChild(con);
 
         var modal = document.createElement("div");
         modal.className = "umbraco-preview-dialog__modal";
-        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">Preview mode</div>
-            <div class="umbraco-preview-dialog__question">Do you want to continue viewing latest saved version?</div>`;
+        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">View published version?</div>
+            <div class="umbraco-preview-dialog__question">You are in Preview Mode, do you want exit in order to view the published version of your website?</div>`;
         con.appendChild(modal);
 
         var continueButton = document.createElement("button");
         continueButton.type = "button";
         continueButton.className = "umbraco-preview-dialog__continue";
-        continueButton.innerHTML = "Continue";
-        continueButton.addEventListener("click", function() {
-            bodyEl.removeChild(style);
-            bodyEl.removeChild(con);
-            continuePreviewMode();
-        });
+        continueButton.innerHTML = "View published version";
+        continueButton.addEventListener("click", exitPreviewMode);
         modal.appendChild(continueButton);
 
         var exitButton = document.createElement("button");
         exitButton.type = "button";
-        exitButton.innerHTML = "Exit preview mode";
-        exitButton.addEventListener("click", exitPreviewMode);
+        exitButton.innerHTML = "Stay in preview mode";
+        exitButton.addEventListener("click", function() {
+            bodyEl.removeChild(fragment);
+            continuePreviewMode(5);
+        });
         modal.appendChild(exitButton);
 
         bodyEl.appendChild(fragment);
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 4b7bcaee87..8b7d871ba4 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -65,6 +65,9 @@
                     </div>
                 }
 
+                <button ng-click="openInBrowser()" title="Visit website in a new tab" class="menu-bar__button umb-outline"><i class="icon icon-out"></i><span>Open in browser</span>
+                </button>
+
                 <button ng-click="exitPreview()" title="Exit Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>Exit</span>
                 </button>
 
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 2287464d07..086210e5a5 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -64,7 +64,7 @@
                     pointer-events:none;
                     left: 50%;
                     transform: translate(-50%, 40px);
-                    animation: umbraco-preview-badge--effect 10s 100ms ease both;
+                    animation: umbraco-preview-badge--effect 10s 1.2s ease both;
                     border-radius: 3px 3px 0 0;
                 }}
                 @keyframes umbraco-preview-badge--effect {{
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index f148655acd..c57968af06 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -101,11 +101,7 @@ namespace Umbraco.Web.Editors
         [UmbracoAuthorize]
         public ActionResult Frame(int id, string culture)
         {
-            var user = _umbracoContextAccessor.UmbracoContext.Security.CurrentUser;
-
-            var previewToken = _publishedSnapshotService.EnterPreview(user, id);
-
-            Response.Cookies.Set(new HttpCookie(Constants.Web.PreviewCookieName, previewToken));
+            EnterPreview(id);
 
             // use a numeric url because content may not be in cache and so .Url would fail
             var query = culture.IsNullOrWhiteSpace() ? string.Empty : $"?culture={culture}";
@@ -113,7 +109,16 @@ namespace Umbraco.Web.Editors
 
             return null;
         }
+        public ActionResult EnterPreview(int id)
+        {
+            var user = _umbracoContextAccessor.UmbracoContext.Security.CurrentUser;
 
+            var previewToken = _publishedSnapshotService.EnterPreview(user, id);
+
+            Response.Cookies.Set(new HttpCookie(Constants.Web.PreviewCookieName, previewToken));
+
+            return null;
+        }
         public ActionResult End(string redir = null)
         {
             var previewToken = Request.GetPreviewCookieValue();
@@ -121,6 +126,8 @@ namespace Umbraco.Web.Editors
             service.ExitPreview(previewToken);
 
             System.Web.HttpContext.Current.ExpireCookie(Constants.Web.PreviewCookieName);
+            // Expire Client-side cookie that determins wether the user has accepted to be in Preview Mode when visiting the website.
+            System.Web.HttpContext.Current.ExpireCookie(Constants.Web.AcceptPreviewCookieName);
 
             if (Uri.IsWellFormedUriString(redir, UriKind.Relative)
                 && redir.StartsWith("//") == false

From 3e77457b817232be9939cb29200d7dddcc30d4be Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 9 Oct 2020 09:49:09 +0200
Subject: [PATCH 16/73] Increase typing timeout in member tests and some minor
 cleaning

---
 .../cypress/integration/Members/members.js            |  5 +++--
 .../cypress/integration/Settings/templates.ts         | 11 ++++++-----
 .../cypress/integration/Tour/backofficeTour.ts        |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
index aeb4576ccd..3d257cfa58 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
@@ -9,6 +9,7 @@ context('Members', () => {
         const name = "Alice Bobson";
         const email = "alice-bobson@acceptancetest.umbraco";
         const password = "$AUlkoF*St0kgPiyyVEk5iU5JWdN*F7&@OSl5Y4pOofnidfifkBj5Ns2ONv%FzsTl36V1E924Gw97zcuSeT7UwK&qb5l&O9h!d!w";
+        const passwordTimeout = 20000
 
         cy.umbracoEnsureMemberEmailNotExists(email);
         cy.umbracoSection('member');
@@ -24,8 +25,8 @@ context('Members', () => {
 
         cy.get('input#_umb_login').clear().type(email);
         cy.get('input#_umb_email').clear().type(email);
-        cy.get('input#password').clear().type(password);
-        cy.get('input#confirmPassword').clear().type(password);
+        cy.get('input#password').clear().type(password, { timeout: passwordTimeout });
+        cy.get('input#confirmPassword').clear().type(password, { timeout: passwordTimeout });
 
         // Save
         cy.get('.btn-success').click();
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index 36fa447d1e..39e303a486 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -28,19 +28,20 @@ context('Templates', () => {
         // Save
         // We must drop focus for the auto save event to occur.
         cy.get('.btn-success').focus();
-        // And then wait for the auto save event to finish but finding the page in the tree view
+        // And then wait for the auto save event to finish by finding the page in the tree view.
         // This is a bit of a roundabout way to find items in a treev view since we dont use umbracoTreeItem
-        // But we must be able to wait for the save evnent to finish, and we can't do that with umbracoTreeItem
-        cy.get('[data-element="tree-item-templates"] > :nth-child(2) > .umb-animated > .umb-tree-item__inner > .umb-tree-item__label').contains(name).should('be.visible', {timeout:10000});
+        // but we must be able to wait for the save evnent to finish, and we can't do that with umbracoTreeItem
+        cy.get('[data-element="tree-item-templates"] > :nth-child(2) > .umb-animated > .umb-tree-item__inner > .umb-tree-item__label')
+            .contains(name).should('be.visible', { timeout: 10000 });
         // Now that the auto save event has finished we can save
-        // And there wont be any duplicates or file in use errors.
+        // and there wont be any duplicates or file in use errors.
         cy.get('.btn-success').click();
 
         //Assert
         cy.umbracoSuccessNotification().should('be.visible');
         // For some reason cy.umbracoErrorNotification tries to click the element which is not possible
         // if it doesn't actually exist, making should('not.be.visible') impossible.
-        cy.get('.umb-notifications__notifications > .alert-error', {timeout: 5000}).should('not.be.visible');
+        cy.get('.umb-notifications__notifications > .alert-error').should('not.be.visible');
 
         //Clean up
         cy.umbracoEnsureTemplateNameNotExists(name);
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
index e7f250d2be..9bc1fff488 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
@@ -71,7 +71,7 @@ function resetTourData() {
 function runBackOfficeIntroTour(percentageComplete, buttonText, timeout) {
     cy.get('[data-element="help-tours"]').should("be.visible");
     cy.get('[data-element="help-tours"]').click();
-    cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: timeout }).get('[percentage]').contains(percentageComplete + '%', {timeout: timeout});
+    cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: timeout }).get('[percentage]').contains(percentageComplete + '%', { timeout: timeout });
     cy.get('[data-element="help-tours"]').click();
     cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').should("be.visible");
     cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').contains(buttonText);

From 2fcab52e7e17b28bcd38c2f0f323e5c68f356538 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 9 Oct 2020 10:07:04 +0200
Subject: [PATCH 17/73] Indent nested builders

Makes it easier to see what calls belongs where
---
 .../cypress/integration/Content/content.ts    | 82 +++++++++----------
 .../cypress/integration/Settings/templates.ts |  2 +-
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index c63031532c..e52f109b1a 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -48,8 +48,8 @@ context('Content', () => {
                     .withContentTypeAlias(rootDocTypeAlias)
                     .withAction("saveNew")
                     .addVariant()
-                    .withName(nodeName)
-                    .withSave(true)
+                        .withName(nodeName)
+                        .withSave(true)
                     .done()
                     .build();
 
@@ -60,8 +60,8 @@ context('Content', () => {
                         .withAction("saveNew")
                         .withParent(contentNode["id"])
                         .addVariant()
-                        .withName(childNodeName)
-                        .withSave(true)
+                            .withName(childNodeName)
+                            .withSave(true)
                         .done()
                         .build();
 
@@ -72,8 +72,8 @@ context('Content', () => {
                     .withContentTypeAlias(rootDocTypeAlias)
                     .withAction("saveNew")
                     .addVariant()
-                    .withName(anotherNodeName)
-                    .withSave(true)
+                        .withName(anotherNodeName)
+                        .withSave(true)
                     .done()
                     .build();
 
@@ -132,8 +132,8 @@ context('Content', () => {
                     .withContentTypeAlias(rootDocTypeAlias)
                     .withAction("saveNew")
                     .addVariant()
-                    .withName(nodeName)
-                    .withSave(true)
+                        .withName(nodeName)
+                        .withSave(true)
                     .done()
                     .build();
 
@@ -144,8 +144,8 @@ context('Content', () => {
                         .withAction("saveNew")
                         .withParent(contentNode["id"])
                         .addVariant()
-                        .withName(childNodeName)
-                        .withSave(true)
+                            .withName(childNodeName)
+                            .withSave(true)
                         .done()
                         .build();
 
@@ -156,8 +156,8 @@ context('Content', () => {
                     .withContentTypeAlias(rootDocTypeAlias)
                     .withAction("saveNew")
                     .addVariant()
-                    .withName(anotherNodeName)
-                    .withSave(true)
+                        .withName(anotherNodeName)
+                        .withSave(true)
                     .done()
                     .build();
 
@@ -215,8 +215,8 @@ context('Content', () => {
                     .withContentTypeAlias(generatedRootDocType["alias"])
                     .withAction("saveNew")
                     .addVariant()
-                    .withName(nodeName)
-                    .withSave(true)
+                        .withName(nodeName)
+                        .withSave(true)
                     .done()
                     .build();
 
@@ -229,8 +229,8 @@ context('Content', () => {
                         .withAction("saveNew")
                         .withParent(parentId)
                         .addVariant()
-                        .withName(firstChildNodeName)
-                        .withSave(true)
+                            .withName(firstChildNodeName)
+                            .withSave(true)
                         .done()
                         .build();
 
@@ -242,8 +242,8 @@ context('Content', () => {
                         .withAction("saveNew")
                         .withParent(parentId)
                         .addVariant()
-                        .withName(secondChildNodeName)
-                        .withSave(true)
+                            .withName(secondChildNodeName)
+                            .withSave(true)
                         .done()
                         .build();
 
@@ -293,8 +293,8 @@ context('Content', () => {
             const rootContentNode = new ContentBuilder()
                 .withContentTypeAlias(generatedRootDocType["alias"])
                 .addVariant()
-                .withName(initialNodeName)
-                .withSave(true)
+                    .withName(initialNodeName)
+                    .withSave(true)
                 .done()
                 .build();
 
@@ -348,9 +348,9 @@ context('Content', () => {
             .withName(rootDocTypeName)
             .withAllowAsRoot(true)
             .addGroup()
-            .addTextBoxProperty()
-            .withLabel(labelName)
-            .done()
+                .addTextBoxProperty()
+                    .withLabel(labelName)
+                .done()
             .done()
             .build();
 
@@ -361,8 +361,8 @@ context('Content', () => {
             const rootContentNode = new ContentBuilder()
                 .withContentTypeAlias(generatedRootDocType["alias"])
                 .addVariant()
-                .withName(nodeName)
-                .withSave(true)
+                    .withName(nodeName)
+                    .withSave(true)
                 .done()
                 .build();
 
@@ -402,8 +402,8 @@ context('Content', () => {
                 .withContentTypeAlias(generatedRootDocType["alias"])
                 .withAction("saveNew")
                 .addVariant()
-                .withName(nodeName)
-                .withSave(true)
+                    .withName(nodeName)
+                    .withSave(true)
                 .done()
                 .build();
 
@@ -440,8 +440,8 @@ context('Content', () => {
                 .withContentTypeAlias(generatedRootDocType["alias"])
                 .withAction("saveNew")
                 .addVariant()
-                .withName(nodeName)
-                .withSave(true)
+                    .withName(nodeName)
+                    .withSave(true)
                 .done()
                 .build();
 
@@ -480,8 +480,8 @@ context('Content', () => {
             const rootContentNode = new ContentBuilder()
                 .withContentTypeAlias(generatedRootDocType["alias"])
                 .addVariant()
-                .withName(nodeName)
-                .withSave(true)
+                    .withName(nodeName)
+                    .withSave(true)
                 .done()
                 .build();
 
@@ -502,10 +502,10 @@ context('Content', () => {
     });
 
     it('Content with contentpicker', () => {
-        const pickerDocTypeName = 'Content Picker Type';
+        const pickerDocTypeName = 'Content picker doc type';
         const groupName = 'ContentPickerGroup';
         const alias = AliasHelper.toAlias(pickerDocTypeName);
-        const pickedDocTypeName = 'Picked Content Type';
+        const pickedDocTypeName = 'Picked content document type';
         const pickedNodeName = 'Content to pick';
 
         cy.deleteAllContent();
@@ -518,8 +518,8 @@ context('Content', () => {
             .withName(pickedDocTypeName)
             .withAllowAsRoot(true)
             .addGroup()
-            .addTextBoxProperty()
-            .withAlias('text')
+                .addTextBoxProperty()
+                .withAlias('text')
             .done()
             .done()
             .build();
@@ -533,8 +533,8 @@ context('Content', () => {
                 .withSave(true)
                 .withPublish(true)
                 .addProperty()
-                .withAlias('text')
-                .withValue('Acceptance test')
+                    .withAlias('text')
+                    .withValue('Acceptance test')
                 .done()
                 .withSave(true)
                 .withPublish(true)
@@ -550,10 +550,10 @@ context('Content', () => {
             .withAllowAsRoot(true)
             .withDefaultTemplate(alias)
             .addGroup()
-            .withName(groupName)
-            .addContentPickerProperty()
-            .withAlias('picker')
-            .done()
+                .withName(groupName)
+                .addContentPickerProperty()
+                    .withAlias('picker')
+                .done()
             .done()
             .build();
 
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index 39e303a486..da1adedaeb 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -19,7 +19,7 @@ context('Templates', () => {
     }
 
     it('Create template', () => {
-        const name = "Create Template test";
+        const name = "Create template test";
         cy.umbracoEnsureTemplateNameNotExists(name);
 
         createTemplate();

From 9039f3030bbeebd8e11605b1e843edc2736cb441 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 9 Oct 2020 10:39:20 +0200
Subject: [PATCH 18/73] Fix content with contentpicker after renaming doctype

---
 .../cypress/integration/Content/content.ts      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index e52f109b1a..4422df9859 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -503,10 +503,8 @@ context('Content', () => {
 
     it('Content with contentpicker', () => {
         const pickerDocTypeName = 'Content picker doc type';
-        const groupName = 'ContentPickerGroup';
-        const alias = AliasHelper.toAlias(pickerDocTypeName);
+        const pickerDocTypeAlias = AliasHelper.toAlias(pickerDocTypeName);
         const pickedDocTypeName = 'Picked content document type';
-        const pickedNodeName = 'Content to pick';
 
         cy.deleteAllContent();
         cy.umbracoEnsureDocumentTypeNameNotExists(pickerDocTypeName);
@@ -529,7 +527,7 @@ context('Content', () => {
                 .withContentTypeAlias(generatedType["alias"])
                 .withAction("publishNew")
                 .addVariant()
-                .withName(pickedNodeName)
+                .withName('Content to pick')
                 .withSave(true)
                 .withPublish(true)
                 .addProperty()
@@ -546,11 +544,11 @@ context('Content', () => {
         // Create the doctype with a the picker
         const pickerDocType = new DocumentTypeBuilder()
             .withName(pickerDocTypeName)
-            .withAlias(alias)
+            .withAlias(pickerDocTypeAlias)
             .withAllowAsRoot(true)
-            .withDefaultTemplate(alias)
+            .withDefaultTemplate(pickerDocTypeAlias)
             .addGroup()
-                .withName(groupName)
+                .withName('ContentPickerGroup')
                 .addContentPickerProperty()
                     .withAlias('picker')
                 .done()
@@ -560,7 +558,7 @@ context('Content', () => {
         cy.saveDocumentType(pickerDocType);
 
         // Edit it the template to allow us to verify the rendered view.
-        cy.editTemplate(pickerDocTypeName, `@inherits Umbraco.Web.Mvc.UmbracoViewPage<ContentModels.ContentPickerType>
+        cy.editTemplate(pickerDocTypeName, `@inherits Umbraco.Web.Mvc.UmbracoViewPage<ContentModels.ContentPickerDocType>
         @using ContentModels = Umbraco.Web.PublishedModels;
         @{
             Layout = null;
@@ -577,7 +575,7 @@ context('Content', () => {
         // Create content with content picker
         cy.get('.umb-tree-root-link').rightclick();
         cy.get('.-opens-dialog > .umb-action-link').click();
-        cy.get('[data-element="action-create-contentPickerType"] > .umb-action-link').click();
+        cy.get('[data-element="action-create-' + pickerDocTypeAlias + '"] > .umb-action-link').click();
         // Fill out content
         cy.umbracoEditorHeaderName('ContentPickerContent');
         cy.get('.umb-node-preview-add').click();
@@ -590,6 +588,7 @@ context('Content', () => {
         cy.umbracoSuccessNotification().should('be.visible');
 
         // Assert
+        cy.log('Checking that content is rendered correctly.')
         const expectedContent = '<p>Acceptance test</p>'
         cy.umbracoVerifyRenderedViewContent('contentpickercontent', expectedContent, true).should('be.true');
         // clean

From 4485e76a28ed10dad70fce40ca5f438432b22005 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 9 Oct 2020 10:44:52 +0200
Subject: [PATCH 19/73] Add forgotten indent

---
 .../cypress/integration/Content/content.ts                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index 4422df9859..68f31e80bb 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -517,8 +517,8 @@ context('Content', () => {
             .withAllowAsRoot(true)
             .addGroup()
                 .addTextBoxProperty()
-                .withAlias('text')
-            .done()
+                    .withAlias('text')
+                .done()
             .done()
             .build();
             

From 6009acdfbf0558cbb8273d1589e57c0a7a05eaf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Fri, 9 Oct 2020 10:46:36 +0200
Subject: [PATCH 20/73] updated wording

---
 src/Umbraco.Web.UI.Client/src/preview/preview.controller.js | 2 +-
 .../src/websitepreview/websitepreview.js                    | 2 +-
 src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml       | 4 ++--
 src/Umbraco.Web.UI/config/umbracoSettings.config            | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 412d0c9cc5..056ade090e 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -292,7 +292,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
                 var modal = document.createElement("div");
                 modal.className = "umbraco-preview-dialog__modal";
                 modal.innerHTML = `<div class="umbraco-preview-dialog__headline">Preview content?</div>
-                    <div class="umbraco-preview-dialog__question">You have exited preview mode, do you want to continue previewing this content?</div>`;
+                    <div class="umbraco-preview-dialog__question">You have ended preview mode, do you want to continue previewing this content?</div>`;
                 con.appendChild(modal);
 
                 var continueButton = document.createElement("button");
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
index cb76b47bb7..43fd152e61 100644
--- a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -37,7 +37,7 @@
         window.top.location.href = scriptElement.getAttribute("data-umbraco-path")+"/preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
     }
     function continuePreviewMode(minutsToExpire) {
-        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", minutsToExpire || 2);
+        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", minutsToExpire || 4);
     }
 
     var user = getCookie("UMB-WEBSITE-PREVIEW-ACCEPT");
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 8b7d871ba4..912470eb65 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -65,10 +65,10 @@
                     </div>
                 }
 
-                <button ng-click="openInBrowser()" title="Visit website in a new tab" class="menu-bar__button umb-outline"><i class="icon icon-out"></i><span>Open in browser</span>
+                <button ng-click="openInBrowser()" title="Open preview in the browser" class="menu-bar__button umb-outline"><i class="icon icon-out"></i><span>Open in browser</span>
                 </button>
 
-                <button ng-click="exitPreview()" title="Exit Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>Exit</span>
+                <button ng-click="exitPreview()" title="End Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>End</span>
                 </button>
 
             </div>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 086210e5a5..454da921e7 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -41,11 +41,11 @@
         <![CDATA[
             <div id="umbracoPreviewBadge" class="umbraco-preview-badge">
                 <span class="umbraco-preview-badge__header">Preview mode</span>
-                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open">
+                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open" title="Open preview in BackOffice">
                     …
                 </a>
-                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end">
-                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
+                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end" title="End preview mode">
+                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end preview mode</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
                 </a>
             </div>
             <style type="text/css">

From 79db8c2e99c545708e34dd03f19fb2f45bf898c5 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 9 Oct 2020 10:53:23 +0200
Subject: [PATCH 21/73] Shorten password in members test

---
 .../cypress/integration/Members/members.js                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
index 3d257cfa58..4d468a0cf0 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
@@ -8,7 +8,7 @@ context('Members', () => {
     it('Create member', () => {
         const name = "Alice Bobson";
         const email = "alice-bobson@acceptancetest.umbraco";
-        const password = "$AUlkoF*St0kgPiyyVEk5iU5JWdN*F7&@OSl5Y4pOofnidfifkBj5Ns2ONv%FzsTl36V1E924Gw97zcuSeT7UwK&qb5l&O9h!d!w";
+        const password = "$AUlkoF*St0kgPiyyVEk5iU5JWdN*F7&";
         const passwordTimeout = 20000
 
         cy.umbracoEnsureMemberEmailNotExists(email);

From 20f2917a0c1910b1d70cbbd2b96c06f38528cd3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Fri, 9 Oct 2020 16:05:53 +0200
Subject: [PATCH 22/73] Exit PreviewMode when all Preview Session are closed +
 translation

---
 .../src/preview/preview.controller.js         | 44 ++++++++++--
 .../src/websitepreview/websitepreview.js      | 67 ++++++++++++++++---
 .../Umbraco/Views/Preview/Index.cshtml        | 22 +++++-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 14 +++-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 15 ++++-
 .../Umbraco/config/lang/en_us.xml             | 13 ++++
 6 files changed, 160 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 056ade090e..7a005298c1 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -144,6 +144,10 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         window.addEventListener("blur", windowBlurHandler);
 
         function windowVisibilityHandler(e) {
+
+            var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount');
+            console.log("windowVisibilityHandler", amountOfPreviewSessions)
+
             // When tab is visible again:
             if(document.hidden === false) {
                 checkPreviewState();
@@ -151,9 +155,15 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         }
         document.addEventListener("visibilitychange", windowVisibilityHandler);
 
+        function beforeUnloadHandler(e) {
+            endPreviewSession();
+        }
+        window.addEventListener("beforeunload", beforeUnloadHandler, false);
+
         $scope.$on("$destroy", function () {
             window.removeEventListener("blur", windowBlurHandler);
-            window.removeEventListener("visibilitychange", windowVisibilityHandler);
+            document.removeEventListener("visibilitychange", windowVisibilityHandler);
+            window.removeEventListener("beforeunload", beforeUnloadHandler);
         });
 
 
@@ -291,14 +301,14 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
 
                 var modal = document.createElement("div");
                 modal.className = "umbraco-preview-dialog__modal";
-                modal.innerHTML = `<div class="umbraco-preview-dialog__headline">Preview content?</div>
-                    <div class="umbraco-preview-dialog__question">You have ended preview mode, do you want to continue previewing this content?</div>`;
+                modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${$window.umbLocalizedVars.returnToPreviewHeadline}</div>
+                    <div class="umbraco-preview-dialog__question">${$window.umbLocalizedVars.returnToPreviewDescription}</div>`;
                 con.appendChild(modal);
 
                 var continueButton = document.createElement("button");
                 continueButton.type = "button";
                 continueButton.className = "umbraco-preview-dialog__continue";
-                continueButton.innerHTML = "Preview content";
+                continueButton.innerHTML = $window.umbLocalizedVars.returnToPreviewButton;
                 continueButton.addEventListener("click", () => {
                     bodyEl.removeChild(fragment);
                     reenterPreviewMode();
@@ -320,6 +330,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
                     id: $scope.pageId
                 }
             })
+            startPreviewSession();
         }
         function getPageURL() {
             var culture = $location.search().culture || getParameterByName("culture");
@@ -330,6 +341,29 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             return relativeUrl;
         }
 
+        function startPreviewSession() {
+            // lets registrer this preview session.
+        var amountOfPreviewSessions = Math.max(localStorage.getItem('UmbPreviewSessionAmount') || 0, 0);
+            amountOfPreviewSessions++;
+            localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
+            console.log("UmbPreviewSessionAmount", amountOfPreviewSessions)
+        }
+        function resetPreviewSessions() {
+            localStorage.setItem('UmbPreviewSessionAmount', 0);
+        }
+        function endPreviewSession() {
+            var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount') || 0;
+            amountOfPreviewSessions--;
+            localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
+            console.log("ENDDDD", amountOfPreviewSessions)
+
+            if(amountOfPreviewSessions <= 0) {
+                // We are good to secretly end preview mode.
+                navigator.sendBeacon("../preview/end");
+            }
+        }
+        startPreviewSession();
+
         /*****************************************************************************/
         /* Preview devices */
         /*****************************************************************************/
@@ -353,10 +387,12 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         /*****************************************************************************/
 
         $scope.exitPreview = function () {
+            resetPreviewSessions();
             window.top.location.href = "../preview/end?redir=" + encodeURIComponent(getPageURL());
         };
 
         $scope.onFrameLoaded = function (iframe) {
+
             $scope.frameLoaded = true;
             configureSignalR(iframe);
 
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
index 43fd152e61..fed177fd7b 100644
--- a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -5,6 +5,7 @@
 
 (function() {
 
+
     if ( window.location !== window.parent.location ) {
         //we are in an iFrame, so lets skip the dialog.
         return;
@@ -33,7 +34,37 @@
         return null;
     }
 
-    function exitPreviewMode() {
+
+    function beforeUnloadHandler(e) {
+        endPreviewSession();
+    }
+    window.addEventListener("beforeunload", beforeUnloadHandler, false);
+
+    function startPreviewSession() {
+        // lets registrer this preview session.
+        var amountOfPreviewSessions = Math.max(localStorage.getItem('UmbPreviewSessionAmount') || 0, 0);
+        amountOfPreviewSessions++;
+        localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
+        console.log("UmbPreviewSessionAmount", amountOfPreviewSessions)
+    }
+    function resetPreviewSessions() {
+        localStorage.setItem('UmbPreviewSessionAmount', 0);
+    }
+    function endPreviewSession() {
+        var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount') || 0;
+        amountOfPreviewSessions--;
+        localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
+        console.log("ENDDDD", amountOfPreviewSessions)
+
+        if(amountOfPreviewSessions <= 0) {
+            // We are good to secretly end preview mode.
+            navigator.sendBeacon(scriptElement.getAttribute("data-umbraco-path")+"/preview/end");
+        }
+    }
+    startPreviewSession();
+
+    function endPreviewMode() {
+        resetPreviewSessions();
         window.top.location.href = scriptElement.getAttribute("data-umbraco-path")+"/preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
     }
     function continuePreviewMode(minutsToExpire) {
@@ -42,6 +73,28 @@
 
     var user = getCookie("UMB-WEBSITE-PREVIEW-ACCEPT");
     if (user != "true") {
+        askToViewPublishedVersion();
+    } else {
+        continuePreviewMode();
+    }
+
+    function askToViewPublishedVersion() {
+
+        scriptElement.getAttribute("data-umbraco-path");
+
+        const request = new XMLHttpRequest();
+        request.open("GET", scriptElement.getAttribute("data-umbraco-path") + "/LocalizedText");
+        request.send();
+
+        request.onreadystatechange = (e) => {
+            if (request.readyState == 4 && request.status == 200) {
+                const jsonLocalization = JSON.parse(request.responseText);
+                createAskUserAboutVersionDialog(jsonLocalization);
+            }
+        }
+
+    }
+    function createAskUserAboutVersionDialog(jsonLocalization) {
 
         // This modal is also used in preview.js
         var modelStyles = `
@@ -137,20 +190,20 @@
 
         var modal = document.createElement("div");
         modal.className = "umbraco-preview-dialog__modal";
-        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">View published version?</div>
-            <div class="umbraco-preview-dialog__question">You are in Preview Mode, do you want exit in order to view the published version of your website?</div>`;
+        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${jsonLocalization.preview.viewPublishedContentHeadline}</div>
+            <div class="umbraco-preview-dialog__question">${jsonLocalization.preview.viewPublishedContentDescription}</div>`;
         con.appendChild(modal);
 
         var continueButton = document.createElement("button");
         continueButton.type = "button";
         continueButton.className = "umbraco-preview-dialog__continue";
-        continueButton.innerHTML = "View published version";
-        continueButton.addEventListener("click", exitPreviewMode);
+        continueButton.innerHTML = jsonLocalization.preview.viewPublishedContentAcceptButton;
+        continueButton.addEventListener("click", endPreviewMode);
         modal.appendChild(continueButton);
 
         var exitButton = document.createElement("button");
         exitButton.type = "button";
-        exitButton.innerHTML = "Stay in preview mode";
+        exitButton.innerHTML = jsonLocalization.preview.viewPublishedContentDeclineButton;
         exitButton.addEventListener("click", function() {
             bodyEl.removeChild(fragment);
             continuePreviewMode(5);
@@ -159,8 +212,6 @@
 
         bodyEl.appendChild(fragment);
         continueButton.focus();
-    } else {
-        continuePreviewMode();
     }
 
 })();
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 912470eb65..c3365f06fc 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -4,12 +4,25 @@
 @using Umbraco.Core.IO
 @using Umbraco.Web
 @using Umbraco.Core.Configuration
+@using Umbraco.Core.Composing
+@using Umbraco.Core.Services
 
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficePreviewModel>
 @{
     var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant();
 
     Html.RequiresCss("assets/css/canvasdesigner.css", "Umbraco");
+
+    // See if we can get without using Current
+    var textService = Current.Services.TextService;
+
+    var EndLabel = textService.Localize("preview", "endLabel");
+    var EndTitle = textService.Localize("preview", "endTitle");
+    var OpenWebsiteLabel = textService.Localize("preview", "openWebsiteLabel");
+    var OpenWebsiteTitle = textService.Localize("preview", "openWebsiteTitle");
+    var returnToPreviewHeadline = textService.Localize("preview", "returnToPreviewHeadline");
+    var returnToPreviewDescription = textService.Localize("preview", "returnToPreviewDescription");
+    var returnToPreviewButton = textService.Localize("preview", "returnToPreviewButton");
 }
 <!DOCTYPE html>
 <html lang="en">
@@ -22,6 +35,13 @@
     @Html.RenderCssHere(
         new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
 
+    <script type="text/javascript">
+        window.umbLocalizedVars = {
+            'returnToPreviewHeadline': '@returnToPreviewHeadline',
+            'returnToPreviewDescription':'@returnToPreviewDescription',
+            'returnToPreviewButton':'@returnToPreviewButton'
+        };
+    </script>
 </head>
 <body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-controller="previewController" ng-class="{'tabbing-active': tabbingActive === true}" ng-click="windowClickHandler($event)">
     <div class="wait" ng-show="!frameLoaded"></div>
@@ -68,7 +88,7 @@
                 <button ng-click="openInBrowser()" title="Open preview in the browser" class="menu-bar__button umb-outline"><i class="icon icon-out"></i><span>Open in browser</span>
                 </button>
 
-                <button ng-click="exitPreview()" title="End Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>End</span>
+                <button ng-click="exitPreview()" title="@EndTitle" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>@EndLabel</span>
                 </button>
 
             </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 597afadac4..cc728e3640 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1864,5 +1864,17 @@ Mange hilsner fra Umbraco robotten
     <key alias="elementTypeDoesNotExistHeadline">Error!</key>
     <key alias="elementTypeDoesNotExistDescription">The ElementType of this block does not exist anymore</key>
   </area>
-
+  <area alias="preview">
+    <key alias="endLabel">Afslut</key>
+    <key alias="endTitle">Afslut forhåndsvisning</key>
+    <key alias="openWebsiteLabel">Vis i nyt vindue</key>
+    <key alias="openWebsiteTitle">Åben forhåndsvisning i nyt vindue</key>
+    <key alias="returnToPreviewHeadline">Forhåndsvisning af indholdet?</key>
+    <key alias="returnToPreviewDescription">Du har afslutet forhåndsvisning, vil du se dette indhold i forhåndsvisning?</key>
+    <key alias="returnToPreviewButton">Fortsæt</key>
+    <key alias="viewPublishedContentHeadline">Se udgivet indhold?</key>
+    <key alias="viewPublishedContentDescription">Du er i forhåndsvisning, vil du afslutte for at se den udgivet version?</key>
+    <key alias="viewPublishedContentAcceptButton">Se udgivet version</key>
+    <key alias="viewPublishedContentDeclineButton">Forbliv i forhåndsvisning</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index db2e707b4d..3cacea1674 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -515,7 +515,7 @@
     <key alias="selectSnippet">Select snippet</key>
     <key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead.</key>
     <key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
-    <key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>    
+    <key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
     <key alias="yesRemove">Yes, remove</key>
   </area>
   <area alias="dictionary">
@@ -2511,4 +2511,17 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="manageHeadline">How do I manage Content Templates?</key>
     <key alias="manageDescription">You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.</key>
   </area>
+  <area alias="preview">
+    <key alias="endLabel">End</key>
+    <key alias="endTitle">End preview mode</key>
+    <key alias="openWebsiteLabel">Preview website</key>
+    <key alias="openWebsiteTitle">Open website in preview mode</key>
+    <key alias="returnToPreviewHeadline">Preview content?</key>
+    <key alias="returnToPreviewDescription">You have ended preview mode, do you want to continue previewing this content?</key>
+    <key alias="returnToPreviewButton">Preview</key>
+    <key alias="viewPublishedContentHeadline">View published version?</key>
+    <key alias="viewPublishedContentDescription">You are in Preview Mode, do you want exit in order to view the published version of your website?</key>
+    <key alias="viewPublishedContentAcceptButton">View published version</key>
+    <key alias="viewPublishedContentDeclineButton">Stay in preview mode</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index e88b4fc007..b86424a68d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2533,4 +2533,17 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="manageHeadline">How do I manage Content Templates?</key>
     <key alias="manageDescription">You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.</key>
   </area>
+  <area alias="preview">
+    <key alias="endLabel">End</key>
+    <key alias="endTitle">End preview mode</key>
+    <key alias="openWebsiteLabel">Preview website</key>
+    <key alias="openWebsiteTitle">Open website in preview mode</key>
+    <key alias="returnToPreviewHeadline">Preview content?</key>
+    <key alias="returnToPreviewDescription">You have ended preview mode, do you want to continue previewing this content?</key>
+    <key alias="returnToPreviewButton">Preview</key>
+    <key alias="viewPublishedContentHeadline">View published version?</key>
+    <key alias="viewPublishedContentDescription">You are in Preview Mode, do you want exit in order to view the published version of your website?</key>
+    <key alias="viewPublishedContentAcceptButton">View published version</key>
+    <key alias="viewPublishedContentDeclineButton">Stay in preview mode</key>
+  </area>
 </language>

From 22a1423324fe1cdb2795e1dd8eb2a66faa97de8b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 13 Oct 2020 15:36:39 +0200
Subject: [PATCH 23/73] Revert "umb-confirmation directive: move trashcan into
 directive and address accessibility issues (#8198)"

This reverts commit 1cd79d81af821470de2123e1c6febe2980d98111.

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html

(cherry picked from commit f9b49fc5f35dfd331388df76b24b91d6c11c9b2b)
---
 .../components/umbconfirmaction.directive.js  | 32 ++++++--------
 .../less/components/umb-confirm-action.less   |  5 ---
 .../components/tags/umb-tags-editor.html      |  5 ++-
 .../views/components/umb-confirm-action.html  | 31 +++++---------
 .../views/components/umb-groups-builder.html  | 10 +++--
 .../src/views/propertyeditors/grid/grid.html  |  8 ++--
 .../listview/layouts.prevalues.html           | 42 ++++++++++---------
 .../multipletextbox/multipletextbox.html      |  9 ++--
 8 files changed, 64 insertions(+), 78 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
index 2f682205ad..1dcccda481 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
@@ -14,10 +14,10 @@ The prompt can be opened in four direction up, down, left or right.</p>
     <div ng-controller="My.Controller as vm">
 
         <div class="my-action" style="position:relative;">
+            <i class="icon-trash" ng-click="vm.showPrompt()"></i>
             <umb-confirm-action
-                show="vm.promptIsVisible"
+                ng-if="vm.promptIsVisible"
                 direction="left"
-                on-delete="vm.showPrompt()"
                 on-confirm="vm.confirmAction()"
                 on-cancel="vm.hidePrompt()">
             </umb-confirm-action>
@@ -71,23 +71,17 @@ The prompt can be opened in four direction up, down, left or right.</p>
 
     function link(scope, el, attr, ctrl) {
 
-        scope.clickButton = function (event) {
-            if(scope.onDelete) {
-                scope.onDelete({$event: event});
-            }
-        }
+      scope.clickConfirm = function() {
+          if(scope.onConfirm) {
+              scope.onConfirm();
+          }
+      };
 
-        scope.clickConfirm = function() {
-            if(scope.onConfirm) {
-                scope.onConfirm();
-            }
-        };
-
-        scope.clickCancel = function() {
-            if(scope.onCancel) {
-                scope.onCancel();
-            }
-        };
+      scope.clickCancel = function() {
+          if(scope.onCancel) {
+              scope.onCancel();
+          }
+      };
 
     }
 
@@ -97,8 +91,6 @@ The prompt can be opened in four direction up, down, left or right.</p>
       templateUrl: 'views/components/umb-confirm-action.html',
       scope: {
         direction: "@",
-        show: "<",
-        onDelete: "&?",
         onConfirm: "&",
         onCancel: "&"
       },
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
index a6548123ac..112194f012 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
@@ -1,8 +1,3 @@
-//WRAPPER 
-.umb_confirm-action {
-    display: inline-block;
-}
-
 // OVERLAY
 .umb_confirm-action__overlay {
     position: absolute;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
index cce613782e..6251d0eed1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
@@ -12,9 +12,10 @@
             <span ng-repeat="tag in vm.viewModel track by $index" class="label label-primary tag" ng-keyup="vm.onKeyUpOnTag(tag, $event)" tabindex="0">
                 <span ng-bind-html="tag"></span>
 
-                <umb-confirm-action show="vm.promptIsVisible === $index"
+                <i class="icon-trash" ng-click="vm.showPrompt($index, tag)" localize="title" title="@buttons_deleteTag"></i>
+
+                <umb-confirm-action ng-if="vm.promptIsVisible === $index"
                                     direction="left"
-                                    on-delete="vm.showPrompt($index, tag)"
                                     on-confirm="vm.removeTag(tag)"
                                     on-cancel="vm.hidePrompt()">
                 </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
index 39864c26fd..1b88c9f988 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
@@ -1,31 +1,22 @@
-<div class="umb_confirm-action">
-    <button ng-if="onDelete" type="button" class="btn-icon" ng-click="clickButton($event)" localize="title" title="@general_delete">
-        <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
-        <span class="sr-only">
-            <localize key="general_delete">Delete</localize>
-        </span>
-    </button>
+<div class="umb_confirm-action__overlay"
+     ng-class="{
+     '-top': direction === 'top',
+     '-right': direction === 'right',
+     '-bottom': direction === 'bottom',
+     '-left': direction === 'left'}"
+     on-outside-click="clickCancel()">
 
-     <div class="umb_confirm-action__overlay"
-        ng-class="{
-        '-top': direction === 'top',
-        '-right': direction === 'right',
-        '-bottom': direction === 'bottom',
-        '-left': direction === 'left'}"
-        on-outside-click="clickCancel()" ng-if="show">
-
-        <button type="button" class="btn-reset umb_confirm-action__overlay-action -confirm" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm">
-            <umb-icon icon="icon-check" class="icon-check"></umb-icon>
+        <button class="umb_confirm-action__overlay-action -confirm btn-reset" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm" type="button">
+            <i class="icon-check" aria-hidden="true"></i>
             <span class="sr-only">
                 <localize key="buttons_confirmActionConfirm">Confirm</localize>
             </span>
         </button>
 
-        <button type="button" class="btn-reset umb_confirm-action__overlay-action -cancel" ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel">
-            <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
+        <button class="umb_confirm-action__overlay-action -cancel btn-reset"  ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel" type="button">
+            <i class="icon-delete" aria-hidden="true"></i>
             <span class="sr-only">
                 <localize key="buttons_confirmActionCancel">Cancel</localize>
             </span>
         </button>
-    </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index d722fba7be..2fdef77928 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -101,10 +101,10 @@
                     </ng-form>
 
                     <div class="umb-group-builder__group-remove" ng-if="!sortingMode && canRemoveGroup(tab)">
+                        <i class="icon-trash" ng-click="togglePrompt(tab)"></i>
                         <umb-confirm-action
-                            show="tab.deletePrompt"
+                            ng-if="tab.deletePrompt"
                             direction="left"
-                            on-delete="togglePrompt(tab)"
                             on-confirm="removeGroup($index)"
                             on-cancel="hidePrompt(tab)">
                         </umb-confirm-action>
@@ -266,10 +266,12 @@
 
                                     <!-- delete property -->
                                     <div ng-if="!property.locked" class="umb-group-builder__property-action">
+                                        <button aria-label="Delete property" class="btn-icon" ng-click="togglePrompt(property)">
+                                            <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
+                                        </button>
                                         <umb-confirm-action
-                                            show="property.deletePrompt"
+                                            ng-if="property.deletePrompt"
                                             direction="left"
-                                            on-delete="togglePrompt(property)"
                                             on-confirm="deleteProperty(tab, $index)"
                                             on-cancel="hidePrompt(property)">
                                         </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 56e8811133..0ef24157fe 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -95,10 +95,10 @@
                                    </div>
 
                                     <div class="cell-tools-remove row-tool">
+                                        <button class="icon-trash btn-reset" ng-click="togglePrompt(row)" type="button"></button>
                                         <umb-confirm-action
-                                            show="row.deletePrompt"
+                                            ng-if="row.deletePrompt"
                                             direction="left"
-                                            on-delete="togglePrompt(row)"
                                             on-confirm="removeRow(section, $index)"
                                             on-cancel="hidePrompt(row)">
                                         </umb-confirm-action>
@@ -209,9 +209,9 @@
                                                                           </div>
 
                                                                           <div class="umb-control-tool">
-                                                                              <umb-confirm-action show="control.deletePrompt"
+                                                                              <button class="umb-control-tool-icon icon-trash btn-reset" ng-click="togglePrompt(control)" type="button"></button>
+                                                                              <umb-confirm-action ng-if="control.deletePrompt"
                                                                                                   direction="left"
-                                                                                                  on-delete="togglePrompt(control)"
                                                                                                   on-confirm="removeControl(area, $index)"
                                                                                                   on-cancel="hidePrompt(control)">
                                                                               </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
index c33c3e840e..4527458d16 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
@@ -2,9 +2,9 @@
 
    <div class="list-view-layouts-container">
 
-   <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
+       <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
 
-      <div class="list-view-layout" ng-repeat="layout in model.value">
+           <div class="list-view-layout" ng-repeat="layout in model.value">
 
                <i class="icon-navigation list-view-layout__sort-handle" aria-hidden="true" aria-label="Sort"></i>
 
@@ -14,43 +14,45 @@
                        <span class="list-view-layout__icon">
                            <i class="{{layout.icon}}" aria-hidden="true"></i>
                        </span>
-            </button>
+                   </button>
 
-            <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
+                   <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
                        <i class="{{layout.icon}}" aria-hidden="true"></i>
-            </div>
+                   </div>
 
-         </div>
+               </div>
 
-         <div class="list-view-layout__name">
-            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
-                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{ layout.name }}</span>
-            <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
-         </div>
+               <div class="list-view-layout__name">
+                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{layout.name}}</span>
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
+               </div>
 
-         <div class="list-view-layout__path">
-            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
-         </div>
+               <div class="list-view-layout__path">
+                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
+               </div>
 
-         <div>
+               <div>
                    <umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>
 
                    <div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
-                       <umb-confirm-action show="layout.deletePrompt"
+                       <button type="button" class="btn-icon" ng-click="vm.showPrompt(layout)" aria-label="Remove">
+                           <i class="icon-trash" aria-hidden="true"></i>
+                       </button>
+                       <umb-confirm-action ng-if="layout.deletePrompt"
                                            direction="left"
-                                           on-delete="vm.showPrompt(layout)"
                                            on-confirm="vm.removeLayout($index, layout)"
                                            on-cancel="vm.hidePrompt(layout)">
                        </umb-confirm-action>
                    </div>
-         </div>
+               </div>
 
-      </div>
+           </div>
 
        </div>
 
       <button type="button" class="list-view-add-layout mt2" ng-click="vm.addLayout()">Add layout</button>
 
-    </div>
+   </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index 6a9826ac3c..d1c202b867 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -10,12 +10,15 @@
 
           <div class="icon-wrapper">
               <i class="icon icon-navigation handle" aria-hidden="true" localize="title" title="@general_move"></i>
-
+  
               <div class="umb-multiple-textbox__confirm" ng-show="model.value.length > model.config.min">
+                  <button type="button" class="umb-multiple-textbox__confirm-action" ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
+                      <i class="icon-trash" aria-hidden="true"></i>
+                  </button>
+  
                   <umb-confirm-action
-                      show="promptIsVisible === $index"
+                      ng-if="promptIsVisible === $index"
                       direction="left"
-                      on-delete="showPrompt($index, item)"
                       on-confirm="remove($index)"
                       on-cancel="hidePrompt()">
                   </umb-confirm-action>

From 469e35190ddec4ba88b789b3535b2fe851a4bf7a Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Tue, 6 Oct 2020 00:18:08 +0200
Subject: [PATCH 24/73] Retarget migration to Umbraco 8.9.0

(cherry picked from commit eb2f3384061b04190e80b3626eeef0213a906f81)
---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs   | 12 ++++++------
 .../ExternalLoginTableUserData.cs                    |  2 +-
 src/Umbraco.Core/Umbraco.Core.csproj                 |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Umbraco.Core/Migrations/Upgrade/{V_8_8_0 => V_8_9_0}/ExternalLoginTableUserData.cs (90%)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 723675ca1a..30f2606bfa 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Migrations.Upgrade.V_8_0_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_0_1;
 using Umbraco.Core.Migrations.Upgrade.V_8_1_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_6_0;
-using Umbraco.Core.Migrations.Upgrade.V_8_8_0;
+using Umbraco.Core.Migrations.Upgrade.V_8_9_0;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -176,26 +176,26 @@ namespace Umbraco.Core.Migrations.Upgrade
             To<MergeDateAndDateTimePropertyEditor>("{78BAF571-90D0-4D28-8175-EF96316DA789}");
             // release-8.0.0
 
-            // to 8.0.1...
+            // to 8.0.1
             To<ChangeNuCacheJsonFormat>("{80C0A0CB-0DD5-4573-B000-C4B7C313C70D}");
             // release-8.0.1
 
-            // to 8.1.0...
+            // to 8.1.0
             To<ConvertTinyMceAndGridMediaUrlsToLocalLink>("{B69B6E8C-A769-4044-A27E-4A4E18D1645A}");
             To<RenameUserLoginDtoDateIndex>("{0372A42B-DECF-498D-B4D1-6379E907EB94}");
             To<FixContentNuCascade>("{5B1E0D93-F5A3-449B-84BA-65366B84E2D4}");
 
-            // to 8.6.0...
+            // to 8.6.0
             To<UpdateRelationTypeTable>("{4759A294-9860-46BC-99F9-B4C975CAE580}");
             To<AddNewRelationTypes>("{0BC866BC-0665-487A-9913-0290BD0169AD}");
             To<AddPropertyTypeValidationMessageColumns>("{3D67D2C8-5E65-47D0-A9E1-DC2EE0779D6B}");
             To<MissingContentVersionsIndexes>("{EE288A91-531B-4995-8179-1D62D9AA3E2E}");
             To<AddMainDomLock>("{2AB29964-02A1-474D-BD6B-72148D2A53A2}");
 
-            // to 8.7.0...
+            // to 8.7.0
             To<MissingDictionaryIndex>("{a78e3369-8ea3-40ec-ad3f-5f76929d2b20}");
 
-            // to 8.8.0
+            // to 8.9.0
             To<ExternalLoginTableUserData>("{B5838FF5-1D22-4F6C-BCEB-F83ACB14B575}");
             
             //FINAL
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_8_0/ExternalLoginTableUserData.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_9_0/ExternalLoginTableUserData.cs
similarity index 90%
rename from src/Umbraco.Core/Migrations/Upgrade/V_8_8_0/ExternalLoginTableUserData.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_9_0/ExternalLoginTableUserData.cs
index 882dfdc2af..45bc1c620b 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_8_0/ExternalLoginTableUserData.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_9_0/ExternalLoginTableUserData.cs
@@ -1,6 +1,6 @@
 using Umbraco.Core.Persistence.Dtos;
 
-namespace Umbraco.Core.Migrations.Upgrade.V_8_8_0
+namespace Umbraco.Core.Migrations.Upgrade.V_8_9_0
 {
     public class ExternalLoginTableUserData : MigrationBase
     {
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 71b2a7be4a..04ae182b46 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -132,7 +132,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_8_0\ExternalLoginTableUserData.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_9_0\ExternalLoginTableUserData.cs" />
     <Compile Include="Models\Blocks\BlockEditorDataConverter.cs" />
     <Compile Include="Models\Blocks\BlockEditorData.cs" />
     <Compile Include="Models\Blocks\BlockItemData.cs" />

From b96776949ffbe4dc7562b12e4a4366e56ad320e6 Mon Sep 17 00:00:00 2001
From: Arkadiusz Biel <abi@novicell.co.uk>
Date: Mon, 12 Oct 2020 18:57:56 +0100
Subject: [PATCH 25/73] make composers and components public

(cherry picked from commit f288a6334277ef1c3b439c16d94b5ed7df36fb54)
---
 .../Compose/DisabledModelsBuilderComponent.cs                   | 2 +-
 src/Umbraco.Web/Logging/WebProfilerComponent.cs                 | 2 +-
 src/Umbraco.Web/Logging/WebProfilerComposer.cs                  | 2 +-
 src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs     | 2 +-
 src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs      | 2 +-
 src/Umbraco.Web/Scheduling/SchedulerComponent.cs                | 2 +-
 src/Umbraco.Web/Scheduling/SchedulerComposer.cs                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs
index c599785711..826b392592 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs
@@ -8,7 +8,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
     /// <summary>
     /// Special component used for when MB is disabled with the legacy MB is detected
     /// </summary>
-    internal class DisabledModelsBuilderComponent : IComponent
+    public sealed class DisabledModelsBuilderComponent : IComponent
     {
         private readonly UmbracoFeatures _features;
 
diff --git a/src/Umbraco.Web/Logging/WebProfilerComponent.cs b/src/Umbraco.Web/Logging/WebProfilerComponent.cs
index ff25eb6a22..e02f082aa9 100755
--- a/src/Umbraco.Web/Logging/WebProfilerComponent.cs
+++ b/src/Umbraco.Web/Logging/WebProfilerComponent.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Web.Logging
 {
-    internal sealed class WebProfilerComponent : IComponent
+    public sealed class WebProfilerComponent : IComponent
     {
         private readonly WebProfiler _profiler;
         private readonly bool _profile;
diff --git a/src/Umbraco.Web/Logging/WebProfilerComposer.cs b/src/Umbraco.Web/Logging/WebProfilerComposer.cs
index 5834dd9dd4..af1d2376cb 100644
--- a/src/Umbraco.Web/Logging/WebProfilerComposer.cs
+++ b/src/Umbraco.Web/Logging/WebProfilerComposer.cs
@@ -2,6 +2,6 @@
 
 namespace Umbraco.Web.Logging
 {
-    internal class WebProfilerComposer : ComponentComposer<WebProfilerComponent>, ICoreComposer
+    public sealed class WebProfilerComposer : ComponentComposer<WebProfilerComponent>, ICoreComposer
     { }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
index eaa209c055..cd7b7a1f39 100644
--- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
+++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Services.Implement;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    internal sealed class PropertyEditorsComponent : IComponent
+    public sealed class PropertyEditorsComponent : IComponent
     {
         private readonly PropertyEditorCollection _propertyEditors;
         private readonly List<Action> _terminate = new List<Action>();
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs
index ce0cf2904f..f22d18484b 100644
--- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs
+++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs
@@ -4,6 +4,6 @@ using Umbraco.Core.Composing;
 namespace Umbraco.Web.PropertyEditors
 {
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
-    internal class PropertyEditorsComposer : ComponentComposer<PropertyEditorsComponent>, ICoreComposer
+    public sealed class PropertyEditorsComposer : ComponentComposer<PropertyEditorsComponent>, ICoreComposer
     { }
 }
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
index f6ce11f939..ecabe3df31 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
@@ -16,7 +16,7 @@ using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Scheduling
 {
-    internal sealed class SchedulerComponent : IComponent
+    public sealed class SchedulerComponent : IComponent
     {
         private const int DefaultDelayMilliseconds = 180000; // 3 mins
         private const int OneMinuteMilliseconds = 60000;
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComposer.cs b/src/Umbraco.Web/Scheduling/SchedulerComposer.cs
index 5c56f3d314..8e71004d0c 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComposer.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComposer.cs
@@ -12,6 +12,6 @@ namespace Umbraco.Web.Scheduling
     /// the task correctly instead of killing it completely when the app domain shuts down.
     /// </remarks>
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
-    internal sealed class SchedulerComposer : ComponentComposer<SchedulerComponent>, ICoreComposer
+    public sealed class SchedulerComposer : ComponentComposer<SchedulerComponent>, ICoreComposer
     { }
 }

From 7d3df87b7fd72429c5ebd44edb14896c82a973be Mon Sep 17 00:00:00 2001
From: BatJan <1932158+BatJan@users.noreply.github.com>
Date: Sat, 10 Oct 2020 23:04:46 +0200
Subject: [PATCH 26/73] Change if check to be more specific ensuring it works
 in all picker instances

(cherry picked from commit 1c77ec156282875fbb332207a876056008e5b4f5)
---
 .../src/views/common/overlays/itempicker/itempicker.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index 405ca1d470..1e4cc70b7f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -1,5 +1,5 @@
 <div ng-controller="Umbraco.Overlays.ItemPickerOverlay" class="umb-itempicker">
-    <div class="form-search" ng-if="model.filter" style="margin-bottom: 15px;">
+    <div class="form-search" ng-if="model.filter !== false" style="margin-bottom: 15px;">
         <i class="icon-search" aria-hidden="true"></i>
         <input type="text"
                ng-model="searchTerm"

From 1f8fd87733a356b053d307359b4563fbbeab4f6a Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Fri, 16 Oct 2020 08:51:08 +0200
Subject: [PATCH 27/73] bumping version to 8.9.0

---
 src/SolutionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index f829770a59..082414399c 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -19,4 +19,4 @@ using System.Resources;
 
 // these are FYI and changed automatically
 [assembly: AssemblyFileVersion("8.9.0")]
-[assembly: AssemblyInformationalVersion("8.9.0-rc")]
+[assembly: AssemblyInformationalVersion("8.9.0")]

From 18309bccb63503bc702ba4d9448ce9a02e76c75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Mon, 19 Oct 2020 08:19:09 +0200
Subject: [PATCH 28/73] When redefining model.value it must be bound to the
 model to keep a runtime reference.

---
 .../blocklist/umbBlockListPropertyEditor.component.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index 401ecc3a63..a162814f52 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -138,10 +138,10 @@
 
             // We need to ensure that the property model value is an object, this is needed for modelObject to recive a reference and keep that updated.
             if (typeof newVal !== 'object' || newVal === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
-                newVal = {};
+                vm.model.value = newVal = {};
             }
 
-            modelObject.update(newVal, $scope);
+            modelObject.update(vm.model.value, $scope);
             onLoaded();
         }
 

From 3f883c740945a003999152bb6143b7db266cfc44 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 19 Oct 2020 21:57:21 +1100
Subject: [PATCH 29/73] adds null checks in JS

---
 .../src/common/services/externallogininfo.service.js        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js b/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
index 1d2048b2f5..31914f4e58 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
@@ -14,7 +14,7 @@ function externalLoginInfoService(externalLoginInfo, umbRequestHelper) {
     }
 
     function getLoginProviderView(provider) {
-        if (provider && provider.properties.UmbracoBackOfficeExternalLoginOptions && provider.properties.UmbracoBackOfficeExternalLoginOptions.CustomBackOfficeView) {
+        if (provider && provider.properties && provider.properties.UmbracoBackOfficeExternalLoginOptions && provider.properties.UmbracoBackOfficeExternalLoginOptions.CustomBackOfficeView) {
             return umbRequestHelper.convertVirtualToAbsolutePath(provider.properties.UmbracoBackOfficeExternalLoginOptions.CustomBackOfficeView);
         }
         return null;
@@ -26,10 +26,10 @@ function externalLoginInfoService(externalLoginInfo, umbRequestHelper) {
      */
     function hasDenyLocalLogin(provider) {
         if (!provider) {
-            return _.some(externalLoginInfo.providers, x => x.properties.UmbracoBackOfficeExternalLoginOptions.DenyLocalLogin === true);
+            return _.some(externalLoginInfo.providers, x => x.properties && x.properties.UmbracoBackOfficeExternalLoginOptions && (x.properties.UmbracoBackOfficeExternalLoginOptions.DenyLocalLogin === true));
         }
         else {
-            return provider.properties.UmbracoBackOfficeExternalLoginOptions.DenyLocalLogin;
+            return provider && provider.properties && provider.properties.UmbracoBackOfficeExternalLoginOptions && (provider.properties.UmbracoBackOfficeExternalLoginOptions.DenyLocalLogin === true);
         }
     }
 

From a3c40e0356e6363e1f5ec3dc4b615c519216c1d2 Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Mon, 19 Oct 2020 13:27:58 +0200
Subject: [PATCH 30/73] adding missing deliveryMethod to smtp comment in
 web.config.

---
 src/Umbraco.Web.UI/web.Template.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index a096cc6c32..03f462fb9e 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -72,7 +72,7 @@
                 you must configure your SMTP settings here - for example:
             -->
             <!--
-            <smtp from="noreply@example.com">
+            <smtp from="noreply@example.com" deliveryMethod="Network">
                 <network host="localhost" port="25" enableSsl="false" userName="" password="" />
             </smtp>
             -->

From dce7076aabbd470666892a249486cbe3b480ca80 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 20 Oct 2020 11:47:41 +1100
Subject: [PATCH 31/73] Fixes #9217 invite user form doesn't allow saving the
 password

The problem was that the directive was changed to a component and as such all things are named with vm which was not transitioned across for this form. There was also an issue with the avatar which is fixed too.
---
 .../directives/components/application/umblogin.directive.js | 6 +++---
 .../src/views/components/application/umb-login.html         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
index ed20203d46..dad7932de4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
@@ -164,7 +164,7 @@
 
         function inviteSavePassword() {
 
-            if (formHelper.submitForm({ scope: $scope })) {
+            if (formHelper.submitForm({ scope: $scope, formCtrl: vm.inviteUserPasswordForm })) {
 
                 vm.invitedUserPasswordModel.buttonState = "busy";
 
@@ -172,7 +172,7 @@
                     .then(function (data) {
 
                         //success
-                        formHelper.resetForm({ scope: $scope });
+                        formHelper.resetForm({ scope: $scope, formCtrl: vm.inviteUserPasswordForm });
                         vm.invitedUserPasswordModel.buttonState = "success";
                         //set the user and set them as logged in
                         vm.invitedUser = data;
@@ -181,7 +181,7 @@
                         vm.inviteStep = 2;
 
                     }, function (err) {
-                        formHelper.resetForm({ scope: $scope, hasErrors: true });
+                        formHelper.resetForm({ scope: $scope, hasErrors: true, formCtrl: vm.inviteUserPasswordForm });
                         formHelper.handleError(err);
                         vm.invitedUserPasswordModel.buttonState = "error";
                     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index e13e8df1d2..6224d9426b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -10,7 +10,7 @@
 
         <div ng-if="!vm.denyLocalLogin" ng-show="vm.invitedUser != null" class="umb-login-container">
 
-            <form name="inviteUserPasswordForm" novalidate="" ng-submit="vm.inviteSavePassword()" val-form-manager>
+            <form name="vm.inviteUserPasswordForm" novalidate="" ng-submit="vm.inviteSavePassword()" val-form-manager>
                 <div class="form" ng-if="vm.inviteStep === 1">
                     <h1 style="margin-bottom: 10px; text-align: left;">Hi, {{vm.invitedUser.name}}</h1>
                     <p style="line-height: 1.6; margin-bottom: 25px;">
@@ -79,7 +79,7 @@
                                         size="xl"
                                         unknown-char="+"
                                         img-src="{{vm.invitedUser.avatars[3]}}"
-                                        img-srcset="{{vm.invitedUser.avatars[4]}} 2x, {{invitedUser.avatars[4]}} 3x">
+                                        img-srcset="{{vm.invitedUser.avatars[4]}} 2x, {{vm.invitedUser.avatars[4]}} 3x">
                             </umb-avatar>
                         </a>
 

From abc42b5438dd64a4b5856d0a190787d1abc18d9d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 20 Oct 2020 12:26:40 +0100
Subject: [PATCH 32/73] Merge pull request #9215 from
 umbraco/v8/bugfix/9129-keep-model-value-reference-after-empty

9129 keep model value reference after empty
---
 .../blocklist/umbBlockListPropertyEditor.component.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index 401ecc3a63..a162814f52 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -138,10 +138,10 @@
 
             // We need to ensure that the property model value is an object, this is needed for modelObject to recive a reference and keep that updated.
             if (typeof newVal !== 'object' || newVal === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
-                newVal = {};
+                vm.model.value = newVal = {};
             }
 
-            modelObject.update(newVal, $scope);
+            modelObject.update(vm.model.value, $scope);
             onLoaded();
         }
 

From 383ae5c1eb6b175773e17a0391ea7120804bab2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 21 Oct 2020 13:13:12 +0200
Subject: [PATCH 33/73] fallback localizations + removed console.logs

---
 .../src/preview/preview.controller.js         | 17 +++++++++-----
 .../src/websitepreview/websitepreview.js      | 22 ++++++++++++++-----
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 7a005298c1..bcfe4213ba 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -146,7 +146,6 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         function windowVisibilityHandler(e) {
 
             var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount');
-            console.log("windowVisibilityHandler", amountOfPreviewSessions)
 
             // When tab is visible again:
             if(document.hidden === false) {
@@ -207,6 +206,14 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
 
                 // Ask to re-enter preview mode?
 
+                const localizeVarsFallback = {
+                    "returnToPreviewHeadline": "Preview content?",
+                    "returnToPreviewDescription":"You have ended preview mode, do you want to continue previewing this content?",
+                    "returnToPreviewButton":"Preview"
+                };
+                const umbLocalizedVars = Object.assign(localizeVarsFallback, $window.umbLocalizedVars);
+
+
                 // This modal is also used in websitepreview.js
                 var modelStyles = `
 
@@ -301,14 +308,14 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
 
                 var modal = document.createElement("div");
                 modal.className = "umbraco-preview-dialog__modal";
-                modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${$window.umbLocalizedVars.returnToPreviewHeadline}</div>
-                    <div class="umbraco-preview-dialog__question">${$window.umbLocalizedVars.returnToPreviewDescription}</div>`;
+                modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${umbLocalizedVars.returnToPreviewHeadline}</div>
+                    <div class="umbraco-preview-dialog__question">${umbLocalizedVars.returnToPreviewDescription}</div>`;
                 con.appendChild(modal);
 
                 var continueButton = document.createElement("button");
                 continueButton.type = "button";
                 continueButton.className = "umbraco-preview-dialog__continue";
-                continueButton.innerHTML = $window.umbLocalizedVars.returnToPreviewButton;
+                continueButton.innerHTML = umbLocalizedVars.returnToPreviewButton;
                 continueButton.addEventListener("click", () => {
                     bodyEl.removeChild(fragment);
                     reenterPreviewMode();
@@ -346,7 +353,6 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         var amountOfPreviewSessions = Math.max(localStorage.getItem('UmbPreviewSessionAmount') || 0, 0);
             amountOfPreviewSessions++;
             localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
-            console.log("UmbPreviewSessionAmount", amountOfPreviewSessions)
         }
         function resetPreviewSessions() {
             localStorage.setItem('UmbPreviewSessionAmount', 0);
@@ -355,7 +361,6 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount') || 0;
             amountOfPreviewSessions--;
             localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
-            console.log("ENDDDD", amountOfPreviewSessions)
 
             if(amountOfPreviewSessions <= 0) {
                 // We are good to secretly end preview mode.
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
index fed177fd7b..6aa2d7dc31 100644
--- a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -45,7 +45,6 @@
         var amountOfPreviewSessions = Math.max(localStorage.getItem('UmbPreviewSessionAmount') || 0, 0);
         amountOfPreviewSessions++;
         localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
-        console.log("UmbPreviewSessionAmount", amountOfPreviewSessions)
     }
     function resetPreviewSessions() {
         localStorage.setItem('UmbPreviewSessionAmount', 0);
@@ -54,7 +53,6 @@
         var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount') || 0;
         amountOfPreviewSessions--;
         localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
-        console.log("ENDDDD", amountOfPreviewSessions)
 
         if(amountOfPreviewSessions <= 0) {
             // We are good to secretly end preview mode.
@@ -96,6 +94,18 @@
     }
     function createAskUserAboutVersionDialog(jsonLocalization) {
 
+        const localizeVarsFallback = {
+            "viewPublishedContentHeadline": "Preview content?",
+            "viewPublishedContentDescription":"You have ended preview mode, do you want to continue previewing this content?",
+            "viewPublishedContentAcceptButton":"You have ended preview mode, do you want to continue previewing this content?",
+            "viewPublishedContentDeclineButton":"Preview"
+        };
+
+        const umbLocalizedVars = jsonLocalization || {};
+        umbLocalizedVars.preview = Object.assign(localizeVarsFallback, jsonLocalization.preview);
+
+
+
         // This modal is also used in preview.js
         var modelStyles = `
             /* Webfont: LatoLatin-Bold */
@@ -190,20 +200,20 @@
 
         var modal = document.createElement("div");
         modal.className = "umbraco-preview-dialog__modal";
-        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${jsonLocalization.preview.viewPublishedContentHeadline}</div>
-            <div class="umbraco-preview-dialog__question">${jsonLocalization.preview.viewPublishedContentDescription}</div>`;
+        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${umbLocalizedVars.preview.viewPublishedContentHeadline}</div>
+            <div class="umbraco-preview-dialog__question">${umbLocalizedVars.preview.viewPublishedContentDescription}</div>`;
         con.appendChild(modal);
 
         var continueButton = document.createElement("button");
         continueButton.type = "button";
         continueButton.className = "umbraco-preview-dialog__continue";
-        continueButton.innerHTML = jsonLocalization.preview.viewPublishedContentAcceptButton;
+        continueButton.innerHTML = umbLocalizedVars.preview.viewPublishedContentAcceptButton;
         continueButton.addEventListener("click", endPreviewMode);
         modal.appendChild(continueButton);
 
         var exitButton = document.createElement("button");
         exitButton.type = "button";
-        exitButton.innerHTML = jsonLocalization.preview.viewPublishedContentDeclineButton;
+        exitButton.innerHTML = umbLocalizedVars.preview.viewPublishedContentDeclineButton;
         exitButton.addEventListener("click", function() {
             bodyEl.removeChild(fragment);
             continuePreviewMode(5);

From b49cb02935035dbab73727a7fa2eff00c8326c0d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 21 Oct 2020 13:02:31 +0100
Subject: [PATCH 34/73] Update src/Umbraco.Core/Constants-Web.cs

---
 src/Umbraco.Core/Constants-Web.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 0e956cfd6a..80906a0663 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -18,7 +18,8 @@
             /// </summary>
             public const string PreviewCookieName = "UMB_PREVIEW";
             /// <summary>
-            /// Client-side cookie that determins wether the user has accepted to be in Preview Mode when visiting the website.
+
+            /// Client-side cookie that determines whether the user has accepted to be in Preview Mode when visiting the website.
             /// </summary>
             public const string AcceptPreviewCookieName = "UMB-WEBSITE-PREVIEW-ACCEPT";
 

From d3407ac15584c4f2b61119818481c1d325a453ed Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 21 Oct 2020 13:03:53 +0100
Subject: [PATCH 35/73] Apply suggestions from code review

---
 src/Umbraco.Web.UI.Client/src/preview/preview.controller.js    | 2 +-
 src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js | 2 +-
 src/Umbraco.Web/Editors/PreviewController.cs                   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index bcfe4213ba..6dc159d4f6 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -363,7 +363,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
 
             if(amountOfPreviewSessions <= 0) {
-                // We are good to secretly end preview mode.
+                // We are good to end preview mode.
                 navigator.sendBeacon("../preview/end");
             }
         }
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
index 6aa2d7dc31..d6e84e7ef3 100644
--- a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -1,6 +1,6 @@
 
 /*********************************************************************************************************/
-/* website preview controller */
+/* website preview */
 /*********************************************************************************************************/
 
 (function() {
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index c57968af06..b5aa4c68e3 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -126,7 +126,8 @@ namespace Umbraco.Web.Editors
             service.ExitPreview(previewToken);
 
             System.Web.HttpContext.Current.ExpireCookie(Constants.Web.PreviewCookieName);
-            // Expire Client-side cookie that determins wether the user has accepted to be in Preview Mode when visiting the website.
+
+            // Expire Client-side cookie that determines whether the user has accepted to be in Preview Mode when visiting the website.
             System.Web.HttpContext.Current.ExpireCookie(Constants.Web.AcceptPreviewCookieName);
 
             if (Uri.IsWellFormedUriString(redir, UriKind.Relative)

From 0f81e486344f35b5d65a2ceac86f260906230d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 21 Oct 2020 16:18:36 +0200
Subject: [PATCH 36/73] Make blockConfigModel optional

---
 .../src/views/components/blockcard/umb-block-card.html        | 4 ++--
 .../src/views/components/blockcard/umbBlockCard.component.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
index 41e3d62886..d87055bf97 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
@@ -1,8 +1,8 @@
 
     <div class="__showcase"
         ng-class="{'--error':vm.elementTypeModel === null}"
-        ng-style="{'background-color':vm.blockConfigModel.backgroundColor, 'background-image': vm.styleBackgroundImage}">
-        <i ng-if="vm.blockConfigModel.thumbnail == null" class="__icon {{ vm.elementTypeModel ? vm.elementTypeModel.icon : 'icon-block' }}" ng-attr-style="{{'color:'+vm.blockConfigModel.iconColor+' !important'}}" aria-hidden="true"></i>
+        ng-style="{'background-color': vm.blockConfigModel ? vm.blockConfigModel.backgroundColor : '', 'background-image': vm.styleBackgroundImage}">
+        <i ng-if="vm.blockConfigModel && vm.blockConfigModel.thumbnail == null" class="__icon {{ vm.elementTypeModel ? vm.elementTypeModel.icon : 'icon-block' }}" ng-attr-style="{{'color:'+vm.blockConfigModel.iconColor+' !important'}}" aria-hidden="true"></i>
     </div>
     <div class="__info" ng-if="vm.elementTypeModel !== null">
         <div class="__name" ng-bind="vm.elementTypeModel.name"></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
index 761e7c28ae..0c75bfbee3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
@@ -9,7 +9,7 @@
             controllerAs: "vm",
             transclude: true,
             bindings: {
-                blockConfigModel: "<",
+                blockConfigModel: "<?",
                 elementTypeModel: "<"
             }
         });
@@ -35,7 +35,7 @@
         }
 
         vm.updateThumbnail = function () {
-            if (vm.blockConfigModel.thumbnail == null || vm.blockConfigModel.thumbnail === "") {
+            if (vm.blockConfigModel == null || vm.blockConfigModel.thumbnail == null || vm.blockConfigModel.thumbnail === "") {
                 vm.styleBackgroundImage = "none";
                 return;
             }

From 7053e8f966cf42d7360d19bff382b22827f091b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 21 Oct 2020 16:33:00 +0200
Subject: [PATCH 37/73] corrected ng-if

---
 .../src/views/components/blockcard/umb-block-card.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
index d87055bf97..c1656c33ff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
@@ -2,7 +2,7 @@
     <div class="__showcase"
         ng-class="{'--error':vm.elementTypeModel === null}"
         ng-style="{'background-color': vm.blockConfigModel ? vm.blockConfigModel.backgroundColor : '', 'background-image': vm.styleBackgroundImage}">
-        <i ng-if="vm.blockConfigModel && vm.blockConfigModel.thumbnail == null" class="__icon {{ vm.elementTypeModel ? vm.elementTypeModel.icon : 'icon-block' }}" ng-attr-style="{{'color:'+vm.blockConfigModel.iconColor+' !important'}}" aria-hidden="true"></i>
+        <i ng-if="vm.blockConfigModel == null || vm.blockConfigModel.thumbnail == null" class="__icon {{ vm.elementTypeModel ? vm.elementTypeModel.icon : 'icon-block' }}" ng-attr-style="{{'color:'+vm.blockConfigModel.iconColor+' !important'}}" aria-hidden="true"></i>
     </div>
     <div class="__info" ng-if="vm.elementTypeModel !== null">
         <div class="__name" ng-bind="vm.elementTypeModel.name"></div>

From 79ad43b64886937a3081a6a96dd3f2c993398b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 21 Oct 2020 16:51:52 +0200
Subject: [PATCH 38/73] use umb-outline

---
 .../src/views/components/blockcard/umb-block-card.less    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
index f10b888ce1..bfd72c0216 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
@@ -7,12 +7,13 @@ umb-block-card {
     background-color: white;
     border-radius: @doubleBorderRadius;
     box-shadow: 0 1px 2px rgba(0,0,0,.2);
-    overflow: hidden;
 
     transition: box-shadow 120ms;
 
     cursor: pointer;
 
+    .umb-outline();
+
     &:hover {
         box-shadow: 0 1px 3px rgba(@ui-action-type-hover, .5);
     }
@@ -60,6 +61,9 @@ umb-block-card {
         background-size: cover;
         background-position: 50% 50%;
         background-repeat: no-repeat;
+        
+        border-top-left-radius: @doubleBorderRadius;
+        border-top-right-radius: @doubleBorderRadius;
 
         &.--error {
             border: 2px solid @errorBackground;
@@ -85,6 +89,8 @@ umb-block-card {
         background-color: #fff;
         padding-top: 10px;
         padding-bottom: 11px;// 10 + 1 to compentiate for the -1 substraction in margin-bottom.
+        border-bottom-left-radius: @doubleBorderRadius;
+        border-bottom-right-radius: @doubleBorderRadius;
 
         &.--error {
             background-color: @errorBackground;

From 9c13dc432025310a182915782b68242ac136f8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 21 Oct 2020 17:35:02 +0200
Subject: [PATCH 39/73] prototype

---
 .../common/services/blockeditor.service.js    |  1 +
 .../src/common/services/clipboard.service.js  |  9 +++++
 .../umbBlockListPropertyEditor.component.js   | 37 +++++++++++++++++--
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
index 12e1144acc..916c5b5a79 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
@@ -58,6 +58,7 @@
             }
         }
         function replaceElementTypeBlockListUDIsResolver(obj, propClearingMethod) {
+            // we could filter for specific Property Editor Aliases, but as the Block Editor structure can be used by many Property Editor we do not in this code know a good way to detect that this is a Block Editor and will therefor leave it to the value structure to determin this.
             replaceRawBlockListUDIsResolver(obj.value, propClearingMethod);
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 58ed07367e..105e3b1ee6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -15,6 +15,7 @@ function clipboardService(notificationsService, eventsService, localStorageServi
 
     const TYPES = {};
     TYPES.ELEMENT_TYPE = "elementType";
+    TYPES.BLOCK = "block";
     TYPES.RAW = "raw";
 
     var clearPropertyResolvers = {};
@@ -30,6 +31,14 @@ function clipboardService(notificationsService, eventsService, localStorageServi
             }
         }
     }
+    clipboardTypeResolvers[TYPES.BLOCK] = function(data, propMethod) {
+        if (data.data != null) {
+            clipboardTypeResolvers[TYPES.RAW](data.data, propMethod);
+        }
+        if (data.settingsData != null) {
+            clipboardTypeResolvers[TYPES.RAW](data.settingsData, propMethod);
+        }
+    }
     clipboardTypeResolvers[TYPES.RAW] = function(data, propMethod) {
         for (var p = 0; p < data.length; p++) {
             propMethod(data[p], TYPES.RAW);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index a162814f52..fe99ccfc41 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -493,6 +493,25 @@
                 blockPickerModel.clipboardItems.push(pasteEntry);
             });
 
+            var entriesForPaste = clipboardService.retriveEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
+            entriesForPaste.forEach(function (entry) {
+                var pasteEntry = {
+                    type: clipboardService.TYPES.BLOCK,
+                    date: entry.date,
+                    pasteData: entry.data,
+                    elementTypeModel: {
+                        name: entry.label,
+                        icon: entry.icon
+                    }
+                }
+                if(Array.isArray(pasteEntry.data) === false) {
+                    pasteEntry.blockConfigModel = modelObject.getScaffoldFromAlias(entry.alias);
+                } else {
+                    pasteEntry.blockConfigModel = {};
+                }
+                blockPickerModel.clipboardItems.push(pasteEntry);
+            });
+
             blockPickerModel.clipboardItems.sort( (a, b) => {
                 return b.date - a.date
             });
@@ -504,7 +523,12 @@
 
         var requestCopyAllBlocks = function() {
 
-            var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(entry => entry.$block.content);
+            var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(
+                (entry) => {
+                    // No need to clone the data as its begin handled by the clipboardService.
+                    return {"data": entry.$block.data, "settingsData":entry.$block.settingsData}
+                }
+            );
 
             // list aliases
             var aliases = elementTypesToCopy.map(content => content.contentTypeAlias);
@@ -515,16 +539,21 @@
             var contentNodeName = "";
             if(vm.umbVariantContent) {
                 contentNodeName = vm.umbVariantContent.editor.content.name;
+                contentNodeIcon = vm.umbVariantContent.editor.content.icon;
             } else if (vm.umbElementEditorContent) {
-                contentNodeName = vm.umbElementEditorContent.model.documentType.name
+                contentNodeName = vm.umbElementEditorContent.model.documentType.name;
+                contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon;
             }
 
+            console.log("contentNodeIcon", contentNodeIcon)
+
             localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, contentNodeName]).then(function(localizedLabel) {
-                clipboardService.copyArray(clipboardService.TYPES.ELEMENT_TYPE, aliases, elementTypesToCopy, localizedLabel, "icon-thumbnail-list", vm.model.id);
+                clipboardService.copyArray(clipboardService.TYPES.BLOCK, aliases, elementTypesToCopy, localizedLabel, contentNodeIcon || "icon-thumbnail-list", vm.model.id);
             });
         }
         function copyBlock(block) {
-            clipboardService.copy(clipboardService.TYPES.ELEMENT_TYPE, block.content.contentTypeAlias, block.content, block.label);
+            console.log(block)
+            clipboardService.copy(clipboardService.TYPES.BLOCK, block.content.contentTypeAlias, {"data": block.data, "settingsData":block.settingsData}, block.label, block.content.icon, block.content.udi);
         }
         function requestPasteFromClipboard(index, pasteEntry) {
 

From 657f1fcdc71181e7770a9aec6d51e846141fdb0d Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 22 Oct 2020 05:30:35 +1100
Subject: [PATCH 40/73] Fixes regression issue with property values being
 updated in content repositories (#9146)

---
 .../Implement/ContentRepositoryBase.cs        | 71 +++++++++++++++++++
 .../Implement/DocumentRepository.cs           | 16 ++---
 .../Repositories/Implement/MediaRepository.cs | 19 ++---
 .../Implement/MemberRepository.cs             | 36 ++--------
 .../Services/ContentServiceTests.cs           | 47 ++++++++++++
 .../Services/MediaServiceTests.cs             | 24 +++++++
 .../Services/MemberServiceTests.cs            |  9 ++-
 src/Umbraco.Web/Search/ExamineComponent.cs    | 10 ++-
 8 files changed, 172 insertions(+), 60 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 13b687eb4e..2ea4914aaa 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -863,6 +863,77 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         }
 
+        /// <summary>
+        /// Inserts property values for the content entity
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="publishedVersionId"></param>
+        /// <param name="edited"></param>
+        /// <param name="editedCultures"></param>
+        /// <remarks>
+        /// Used when creating a new entity
+        /// </remarks>
+        protected void InsertPropertyValues(TEntity entity, int publishedVersionId, out bool edited, out HashSet<string> editedCultures)
+        {
+            // persist the property data
+            var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishedVersionId, entity.Properties, LanguageRepository, out edited, out editedCultures);
+            foreach (var propertyDataDto in propertyDataDtos)
+            {
+                Database.Insert(propertyDataDto);
+            }
+            // TODO: we can speed this up: Use BulkInsert and then do one SELECT to re-retrieve the property data inserted with assigned IDs.
+            // This is a perfect thing to benchmark with Benchmark.NET to compare perf between Nuget releases.
+        }
+
+        /// <summary>
+        /// Used to atomically replace the property values for the entity version specified
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="versionId"></param>
+        /// <param name="publishedVersionId"></param>
+        /// <param name="edited"></param>
+        /// <param name="editedCultures"></param>
+        protected void ReplacePropertyValues(TEntity entity, int versionId, int publishedVersionId, out bool edited, out HashSet<string> editedCultures)
+        {
+            // Replace the property data.
+            // Lookup the data to update with a UPDLOCK (using ForUpdate()) this is because we need to be atomic
+            // and handle DB concurrency. Doing a clear and then re-insert is prone to concurrency issues.
+
+            var propDataSql = SqlContext.Sql().Select("*").From<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == versionId).ForUpdate();
+            var existingPropData = Database.Fetch<PropertyDataDto>(propDataSql);
+            var propertyTypeToPropertyData = new Dictionary<(int propertyTypeId, int versionId), PropertyDataDto>();
+            var existingPropDataIds = new List<int>();
+            foreach (var p in existingPropData)
+            {
+                existingPropDataIds.Add(p.Id);
+                propertyTypeToPropertyData[(p.PropertyTypeId, p.VersionId)] = p;
+            }
+            var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishedVersionId, entity.Properties, LanguageRepository, out edited, out editedCultures);
+            foreach (var propertyDataDto in propertyDataDtos)
+            {
+                // Check if this already exists and update, else insert a new one
+                if (propertyTypeToPropertyData.TryGetValue((propertyDataDto.PropertyTypeId, propertyDataDto.VersionId), out var propData))
+                {
+                    propertyDataDto.Id = propData.Id;
+                    Database.Update(propertyDataDto);
+                }
+                else
+                {
+                    // TODO: we can speed this up: Use BulkInsert and then do one SELECT to re-retrieve the property data inserted with assigned IDs.
+                    // This is a perfect thing to benchmark with Benchmark.NET to compare perf between Nuget releases.
+                    Database.Insert(propertyDataDto);
+                }
+
+                // track which ones have been processed
+                existingPropDataIds.Remove(propertyDataDto.Id);
+            }
+            // For any remaining that haven't been processed they need to be deleted
+            if (existingPropDataIds.Count > 0)
+            {
+                Database.Execute(SqlContext.Sql().Delete<PropertyDataDto>().WhereIn<PropertyDataDto>(x => x.Id, existingPropDataIds));
+            }
+        }
+
         private class NodeIdKey
         {
             [Column("id")]
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index a34aadd70f..2fdfc9afff 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -519,8 +519,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IContent entity)
         {
-            var entityBase = entity as EntityBase;
-            var isEntityDirty = entityBase != null && entityBase.IsDirty();
+            var isEntityDirty = entity.IsDirty();
 
             // check if we need to make any database changes at all
             if ((entity.PublishedState == PublishedState.Published || entity.PublishedState == PublishedState.Unpublished)
@@ -597,17 +596,10 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 Database.Insert(documentVersionDto); 
             }
 
-            // replace the property data (rather than updating)
+            // replace the property data
             // only need to delete for the version that existed, the new version (if any) has no property data yet
-            var versionToDelete = publishing ? entity.PublishedVersionId : entity.VersionId;
-            var deletePropertyDataSql = Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == versionToDelete);
-            Database.Execute(deletePropertyDataSql);
-
-            // insert property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishing ? entity.PublishedVersionId : 0,
-                entity.Properties, LanguageRepository, out var edited, out var editedCultures);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
+            var versionToDelete = publishing ? entity.PublishedVersionId : entity.VersionId;         
+            ReplacePropertyValues(entity, versionToDelete, publishing ? entity.PublishedVersionId : 0, out var edited, out var editedCultures);
 
             // if !publishing, we may have a new name != current publish name,
             // also impacts 'edited'
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
index 081efcfdf6..63cee80a8b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
@@ -219,7 +219,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistNewItem(IMedia entity)
         {
-            var media = (Models.Media) entity;
             entity.AddingEntity();
 
             // ensure unique name on the same level
@@ -274,17 +273,15 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             contentVersionDto.NodeId = nodeDto.NodeId;
             contentVersionDto.Current = true;
             Database.Insert(contentVersionDto);
-            media.VersionId = contentVersionDto.Id;
+            entity.VersionId = contentVersionDto.Id;
 
             // persist the media version dto
             var mediaVersionDto = dto.MediaVersionDto;
-            mediaVersionDto.Id = media.VersionId;
+            mediaVersionDto.Id = entity.VersionId;
             Database.Insert(mediaVersionDto);
 
             // persist the property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(media.ContentType.Variations, media.VersionId, 0, entity.Properties, LanguageRepository, out _, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
+            InsertPropertyValues(entity, 0, out _, out _);
 
             // set tags
             SetEntityTags(entity, _tagRepository);
@@ -298,10 +295,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override void PersistUpdatedItem(IMedia entity)
         {
-            var media = (Models.Media) entity;
-
             // update
-            media.UpdatingEntity();
+            entity.UpdatingEntity();
 
             // ensure unique name on the same level
             entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
@@ -339,11 +334,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             Database.Update(mediaVersionDto);
 
             // replace the property data
-            var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == media.VersionId);
-            Database.Execute(deletePropertyDataSql);
-            var propertyDataDtos = PropertyFactory.BuildDtos(media.ContentType.Variations, media.VersionId, 0, entity.Properties, LanguageRepository, out _, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
+            ReplacePropertyValues(entity, entity.VersionId, 0, out _, out _);
 
             SetEntityTags(entity, _tagRepository);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
index 687e35aef3..78dbbe317a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
@@ -245,8 +245,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             }
             entity.AddingEntity();
 
-            var member = (Member) entity;
-
             // ensure that strings don't contain characters that are invalid in xml
             // TODO: do we really want to keep doing this here?
             entity.SanitizeEntityPropertiesForXmlStorage();
@@ -304,7 +302,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             contentVersionDto.NodeId = nodeDto.NodeId;
             contentVersionDto.Current = true;
             Database.Insert(contentVersionDto);
-            member.VersionId = contentVersionDto.Id;
+            entity.VersionId = contentVersionDto.Id;
 
             // persist the member dto
             dto.NodeId = nodeDto.NodeId;
@@ -321,9 +319,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             Database.Insert(dto);
 
             // persist the property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(member.ContentType.Variations, member.VersionId, 0, entity.Properties, LanguageRepository, out _, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
+            InsertPropertyValues(entity, 0, out _, out _);
 
             SetEntityTags(entity, _tagRepository);
 
@@ -335,11 +331,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         }
 
         protected override void PersistUpdatedItem(IMember entity)
-        {
-            var member = (Member) entity;
-
+        {   
             // update
-            member.UpdatingEntity();
+            entity.UpdatingEntity();
 
             // ensure that strings don't contain characters that are invalid in xml
             // TODO: do we really want to keep doing this here?
@@ -385,27 +379,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (changedCols.Count > 0)
                 Database.Update(dto, changedCols);
 
-            // Replace the property data
-            // Lookup the data to update with a UPDLOCK (using ForUpdate()) this is because we have another method that doesn't take an explicit WriteLock
-            // in SetLastLogin which is called very often and we want to avoid the lock timeout for the explicit lock table but we still need to ensure atomic
-            // operations between that method and this one. 
-
-            var propDataSql = SqlContext.Sql().Select("*").From<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == member.VersionId).ForUpdate();
-            var existingPropData = Database.Fetch<PropertyDataDto>(propDataSql).ToDictionary(x => x.PropertyTypeId);
-            var propertyDataDtos = PropertyFactory.BuildDtos(member.ContentType.Variations, member.VersionId, 0, entity.Properties, LanguageRepository, out _, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-            {
-                // Check if this already exists and update, else insert a new one
-                if (existingPropData.TryGetValue(propertyDataDto.PropertyTypeId, out var propData))
-                {
-                    propertyDataDto.Id = propData.Id;
-                    Database.Update(propertyDataDto);
-                }
-                else
-                {
-                    Database.Insert(propertyDataDto);
-                }
-            }   
+            ReplacePropertyValues(entity, entity.VersionId, 0, out _, out _);
 
             SetEntityTags(entity, _tagRepository);
 
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 92d2a68472..c0d9b47c37 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -1537,6 +1537,53 @@ namespace Umbraco.Tests.Services
             Assert.That(content.HasIdentity, Is.True);
         }
 
+        [Test]
+        public void Can_Update_Content_Property_Values()
+        {
+            IContentType contentType = MockedContentTypes.CreateSimpleContentType();
+            ServiceContext.ContentTypeService.Save(contentType);
+            IContent content = MockedContent.CreateSimpleContent(contentType, "hello");
+            content.SetValue("title", "title of mine");
+            content.SetValue("bodyText", "hello world");
+            ServiceContext.ContentService.SaveAndPublish(content);
+
+            // re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            content.SetValue("title", "another title of mine");          // Change a value
+            content.SetValue("bodyText", null);                          // Clear a value
+            content.SetValue("author", "new author");                    // Add a value
+            ServiceContext.ContentService.SaveAndPublish(content);
+
+            // re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            Assert.AreEqual("another title of mine", content.GetValue("title"));
+            Assert.IsNull(content.GetValue("bodyText"));
+            Assert.AreEqual("new author", content.GetValue("author"));
+
+            content.SetValue("title", "new title");
+            content.SetValue("bodyText", "new body text");
+            content.SetValue("author", "new author text");
+            ServiceContext.ContentService.Save(content);                // new non-published version
+
+            // re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            content.SetValue("title", null);                            // Clear a value
+            content.SetValue("bodyText", null);                         // Clear a value
+            ServiceContext.ContentService.Save(content);                // saving non-published version
+
+            // re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            Assert.IsNull(content.GetValue("title"));                   // Test clearing the value worked with the non-published version
+            Assert.IsNull(content.GetValue("bodyText"));
+            Assert.AreEqual("new author text", content.GetValue("author"));
+
+            // make sure that the published version remained the same
+            var publishedContent = ServiceContext.ContentService.GetVersion(content.PublishedVersionId);
+            Assert.AreEqual("another title of mine", publishedContent.GetValue("title"));
+            Assert.IsNull(publishedContent.GetValue("bodyText"));
+            Assert.AreEqual("new author", publishedContent.GetValue("author"));
+        }
+
         [Test]
         public void Can_Bulk_Save_Content()
         {
diff --git a/src/Umbraco.Tests/Services/MediaServiceTests.cs b/src/Umbraco.Tests/Services/MediaServiceTests.cs
index b3dc274c5e..52f26ecb4d 100644
--- a/src/Umbraco.Tests/Services/MediaServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MediaServiceTests.cs
@@ -26,6 +26,30 @@ namespace Umbraco.Tests.Services
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
     public class MediaServiceTests : TestWithSomeContentBase
     {
+        [Test]
+        public void Can_Update_Media_Property_Values()
+        {
+            IMediaType mediaType = MockedContentTypes.CreateSimpleMediaType("test", "Test");
+            ServiceContext.MediaTypeService.Save(mediaType);
+            IMedia media = MockedMedia.CreateSimpleMedia(mediaType, "hello", -1);
+            media.SetValue("title", "title of mine");
+            media.SetValue("bodyText", "hello world");
+            ServiceContext.MediaService.Save(media);
+
+            // re-get
+            media = ServiceContext.MediaService.GetById(media.Id);
+            media.SetValue("title", "another title of mine");          // Change a value
+            media.SetValue("bodyText", null);                          // Clear a value
+            media.SetValue("author", "new author");                    // Add a value
+            ServiceContext.MediaService.Save(media);
+
+            // re-get
+            media = ServiceContext.MediaService.GetById(media.Id);
+            Assert.AreEqual("another title of mine", media.GetValue("title"));
+            Assert.IsNull(media.GetValue("bodyText"));
+            Assert.AreEqual("new author", media.GetValue("author"));
+        }
+
         /// <summary>
         /// Used to list out all ambiguous events that will require dispatching with a name
         /// </summary>
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index ce84c2701b..00bfe59fa3 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -49,22 +49,27 @@ namespace Umbraco.Tests.Services
         }
 
         [Test]
-        public void Can_Update_Member_Property_Value()
+        public void Can_Update_Member_Property_Values()
         {
             IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
             ServiceContext.MemberTypeService.Save(memberType);
             IMember member = MockedMember.CreateSimpleMember(memberType, "hello", "helloworld@test123.com", "hello", "hello");
             member.SetValue("title", "title of mine");
+            member.SetValue("bodyText", "hello world");
             ServiceContext.MemberService.Save(member);
 
             // re-get
             member = ServiceContext.MemberService.GetById(member.Id);
-            member.SetValue("title", "another title of mine");
+            member.SetValue("title", "another title of mine");          // Change a value
+            member.SetValue("bodyText", null);                          // Clear a value
+            member.SetValue("author", "new author");                    // Add a value
             ServiceContext.MemberService.Save(member);
 
             // re-get
             member = ServiceContext.MemberService.GetById(member.Id);
             Assert.AreEqual("another title of mine", member.GetValue("title"));
+            Assert.IsNull(member.GetValue("bodyText"));
+            Assert.AreEqual("new author", member.GetValue("author"));
         }
 
         [Test]
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index ca16aaee65..c9d7b7cf56 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -269,6 +269,14 @@ namespace Umbraco.Web.Search
                         DeleteIndexForEntity(c4.Id, false);
                     }
                     break;
+                case MessageType.RefreshByPayload:
+                    var payload = (MemberCacheRefresher.JsonPayload[])args.MessageObject;
+                    var members = payload.Select(x => _services.MemberService.GetById(x.Id));
+                    foreach(var m in members)
+                    {
+                        ReIndexForMember(m);
+                    }
+                    break;
                 case MessageType.RefreshAll:
                 case MessageType.RefreshByJson:
                 default:
@@ -746,6 +754,6 @@ namespace Umbraco.Web.Search
         }
         #endregion
 
-        
+
     }
 }

From 28954afcadbd6c00b81b1cf7486a08190789f114 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 19 Oct 2020 14:26:15 +0100
Subject: [PATCH 41/73] When exporting package.xml it will now use the UDI/Key
 so we can reimport with the same key

---
 src/Umbraco.Core/Packaging/PackageDataInstallation.cs      | 2 ++
 src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 6a5acb0dc7..d669600c44 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -604,6 +604,7 @@ namespace Umbraco.Core.Packaging
             var defaultTemplateElement = infoElement.Element("DefaultTemplate");
 
             contentType.Name = infoElement.Element("Name").Value;
+            contentType.Key = new Guid(infoElement.Element("Key").Value);
             contentType.Icon = infoElement.Element("Icon").Value;
             contentType.Thumbnail = infoElement.Element("Thumbnail").Value;
             contentType.Description = infoElement.Element("Description").Value;
@@ -783,6 +784,7 @@ namespace Umbraco.Core.Packaging
                 var propertyType = new PropertyType(dataTypeDefinition, property.Element("Alias").Value)
                 {
                     Name = property.Element("Name").Value,
+                    Key = new Guid(property.Element("Key").Value),
                     Description = (string)property.Element("Description"),
                     Mandatory = property.Element("Mandatory") != null
                         ? property.Element("Mandatory").Value.ToLowerInvariant().Equals("true")
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 5189b3422e..ea31226324 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -434,6 +434,7 @@ namespace Umbraco.Core.Services.Implement
             var info = new XElement("Info",
                                     new XElement("Name", contentType.Name),
                                     new XElement("Alias", contentType.Alias),
+                                    new XElement("Key", contentType.Key),
                                     new XElement("Icon", contentType.Icon),
                                     new XElement("Thumbnail", contentType.Thumbnail),
                                     new XElement("Description", contentType.Description),
@@ -484,8 +485,9 @@ namespace Umbraco.Core.Services.Implement
                 var genericProperty = new XElement("GenericProperty",
                                                    new XElement("Name", propertyType.Name),
                                                    new XElement("Alias", propertyType.Alias),
+                                                   new XElement("Key", propertyType.Key),
                                                    new XElement("Type", propertyType.PropertyEditorAlias),
-                                                   new XElement("Definition", definition.Key),
+                                                   new XElement("Definition", definition.Key),                                                   
                                                    new XElement("Tab", propertyGroup == null ? "" : propertyGroup.Name),
                                                    new XElement("SortOrder", propertyType.SortOrder),
                                                    new XElement("Mandatory", propertyType.Mandatory.ToString()),

From f1724a68b2147859addb5dd905d641d59dff950a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 19 Oct 2020 14:26:15 +0100
Subject: [PATCH 42/73] When exporting package.xml it will now use the UDI/Key
 so we can reimport with the same key

(cherry picked from commit 28954afcadbd6c00b81b1cf7486a08190789f114)
---
 src/Umbraco.Core/Packaging/PackageDataInstallation.cs      | 2 ++
 src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 6a5acb0dc7..d669600c44 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -604,6 +604,7 @@ namespace Umbraco.Core.Packaging
             var defaultTemplateElement = infoElement.Element("DefaultTemplate");
 
             contentType.Name = infoElement.Element("Name").Value;
+            contentType.Key = new Guid(infoElement.Element("Key").Value);
             contentType.Icon = infoElement.Element("Icon").Value;
             contentType.Thumbnail = infoElement.Element("Thumbnail").Value;
             contentType.Description = infoElement.Element("Description").Value;
@@ -783,6 +784,7 @@ namespace Umbraco.Core.Packaging
                 var propertyType = new PropertyType(dataTypeDefinition, property.Element("Alias").Value)
                 {
                     Name = property.Element("Name").Value,
+                    Key = new Guid(property.Element("Key").Value),
                     Description = (string)property.Element("Description"),
                     Mandatory = property.Element("Mandatory") != null
                         ? property.Element("Mandatory").Value.ToLowerInvariant().Equals("true")
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 5189b3422e..ea31226324 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -434,6 +434,7 @@ namespace Umbraco.Core.Services.Implement
             var info = new XElement("Info",
                                     new XElement("Name", contentType.Name),
                                     new XElement("Alias", contentType.Alias),
+                                    new XElement("Key", contentType.Key),
                                     new XElement("Icon", contentType.Icon),
                                     new XElement("Thumbnail", contentType.Thumbnail),
                                     new XElement("Description", contentType.Description),
@@ -484,8 +485,9 @@ namespace Umbraco.Core.Services.Implement
                 var genericProperty = new XElement("GenericProperty",
                                                    new XElement("Name", propertyType.Name),
                                                    new XElement("Alias", propertyType.Alias),
+                                                   new XElement("Key", propertyType.Key),
                                                    new XElement("Type", propertyType.PropertyEditorAlias),
-                                                   new XElement("Definition", definition.Key),
+                                                   new XElement("Definition", definition.Key),                                                   
                                                    new XElement("Tab", propertyGroup == null ? "" : propertyGroup.Name),
                                                    new XElement("SortOrder", propertyType.SortOrder),
                                                    new XElement("Mandatory", propertyType.Mandatory.ToString()),

From 24f07af0e127606d17cf571f3c04224b45964bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 22 Oct 2020 08:35:12 +0200
Subject: [PATCH 43/73] ability to create from Block Data

---
 .../common/services/blockeditor.service.js    | 43 +++++++++++++++----
 .../blockeditormodelobject.service.js         | 31 +++++++++++++
 .../umbBlockListPropertyEditor.component.js   | 26 ++++++++---
 3 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
index 916c5b5a79..08c9803ff3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
@@ -57,15 +57,15 @@
                 }
             }
         }
-        function replaceElementTypeBlockListUDIsResolver(obj, propClearingMethod) {
+        function elementTypeBlockResolver(obj, propPasteResolverMethod) {
             // we could filter for specific Property Editor Aliases, but as the Block Editor structure can be used by many Property Editor we do not in this code know a good way to detect that this is a Block Editor and will therefor leave it to the value structure to determin this.
-            replaceRawBlockListUDIsResolver(obj.value, propClearingMethod);
+            rawBlockResolver(obj.value, propPasteResolverMethod);
         }
 
-        clipboardService.registerPastePropertyResolver(replaceElementTypeBlockListUDIsResolver, clipboardService.TYPES.ELEMENT_TYPE);
+        clipboardService.registerPastePropertyResolver(elementTypeBlockResolver, clipboardService.TYPES.ELEMENT_TYPE);
 
 
-        function replaceRawBlockListUDIsResolver(value, propClearingMethod) {
+        function rawBlockResolver(value, propPasteResolverMethod) {
             if (value != null && typeof value === "object") {
 
                 // we got an object, and it has these three props then we are most likely dealing with a Block Editor.
@@ -73,19 +73,19 @@
 
                     replaceUdisOfObject(value.layout, value);
 
-                    // replace UDIs for inner properties of this Block Editors content data.
+                    // run resolvers for inner properties of this Blocks content data.
                     if(value.contentData.length > 0) {
                         value.contentData.forEach((item) => {
                             for (var k in item) {
-                                propClearingMethod(item[k], clipboardService.TYPES.RAW);
+                                propPasteResolverMethod(item[k], clipboardService.TYPES.RAW);
                             }
                         });
                     }
-                    // replace UDIs for inner properties of this Block Editors settings data.
+                    // run resolvers for inner properties of this Blocks settings data.
                     if(value.settingsData.length > 0) {
                         value.settingsData.forEach((item) => {
                             for (var k in item) {
-                                propClearingMethod(item[k], clipboardService.TYPES.RAW);
+                                propPasteResolverMethod(item[k], clipboardService.TYPES.RAW);
                             }
                         });
                     }
@@ -94,7 +94,32 @@
             }
         }
 
-        clipboardService.registerPastePropertyResolver(replaceRawBlockListUDIsResolver, clipboardService.TYPES.RAW);
+        clipboardService.registerPastePropertyResolver(rawBlockResolver, clipboardService.TYPES.RAW);
+
+
+        function blockResolver(block, propPasteResolverMethod) {
+
+            if(block.data) {
+
+                // Make new UDI for content-element
+                block.data.udi = block.layout.contentUdi = udiService.create("element");
+
+                // run resolvers for inner properties of this Blocks content data.
+                propPasteResolverMethod(block.data, clipboardService.TYPES.RAW);
+            }
+
+            if(block.settingsData) {
+
+                // Make new UDI for settings-element
+                block.settingsData.udi = block.layout.settingsUdi = udiService.create("element");
+
+                // run resolvers for inner properties of this Blocks settings data.
+                propPasteResolverMethod(block.settingsData, clipboardService.TYPES.RAW);
+            }
+
+        }
+
+        clipboardService.registerPastePropertyResolver(blockResolver, clipboardService.TYPES.BLOCK);
 
     }]);
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
index 77ed357c35..ac6bfb9135 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
@@ -773,6 +773,37 @@
 
                 return layoutEntry;
 
+            },
+            /**
+             * @ngdoc method
+             * @name createFromRawData
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Insert data from raw models
+             * @return {Object | null} Layout entry object, to be inserted at a decired location in the layout object. Or ´null´ if the given ElementType isnt supported by the block configuration.
+             */
+            createFromBlockData: function (blockData) {
+
+                blockData = clipboardService.parseContentForPaste(blockData, clipboardService.TYPES.BLOCK);
+
+                // As the blockData is a cloned object we can use its layout part for our layout entry.
+                var layoutEntry = blockData.layout;
+                if (layoutEntry === null) {
+                    return null;
+                }
+
+                if (blockData.data) {
+                    this.value.contentData.push(blockData.data);
+                } else {
+                    // We do not have data, this cannot be succesful paste.
+                    return null;
+                }
+
+                if (blockData.settingsData) {
+                    this.value.settingsData.push(blockData.settingsData);
+                }
+
+                return layoutEntry;
+
             },
 
             /**
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index fe99ccfc41..7cac113b6f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -430,12 +430,12 @@
                     if (Array.isArray(item.pasteData)) {
                         var indexIncrementor = 0;
                         item.pasteData.forEach(function (entry) {
-                            if (requestPasteFromClipboard(createIndex + indexIncrementor, entry)) {
+                            if (requestPasteFromClipboard(createIndex + indexIncrementor, entry, item.type)) {
                                 indexIncrementor++;
                             }
                         });
                     } else {
-                        requestPasteFromClipboard(createIndex, item.pasteData);
+                        requestPasteFromClipboard(createIndex, item.pasteData, item.type);
                     }
                     if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
                         blockPickerModel.close();
@@ -470,6 +470,7 @@
 
             blockPickerModel.clickClearClipboard = function ($event) {
                 clipboardService.clearEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, vm.availableContentTypesAliases);
+                clipboardService.clearEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
             };
 
             blockPickerModel.clipboardItems = [];
@@ -526,7 +527,7 @@
             var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(
                 (entry) => {
                     // No need to clone the data as its begin handled by the clipboardService.
-                    return {"data": entry.$block.data, "settingsData":entry.$block.settingsData}
+                    return {"layout": block.layout, "data": entry.$block.data, "settingsData":entry.$block.settingsData}
                 }
             );
 
@@ -552,23 +553,33 @@
             });
         }
         function copyBlock(block) {
-            console.log(block)
-            clipboardService.copy(clipboardService.TYPES.BLOCK, block.content.contentTypeAlias, {"data": block.data, "settingsData":block.settingsData}, block.label, block.content.icon, block.content.udi);
+            clipboardService.copy(clipboardService.TYPES.BLOCK, block.content.contentTypeAlias, {"layout": block.layout, "data": block.data, "settingsData":block.settingsData}, block.label, block.content.icon, block.content.udi);
         }
-        function requestPasteFromClipboard(index, pasteEntry) {
+        function requestPasteFromClipboard(index, pasteEntry, pasteType) {
 
             if (pasteEntry === undefined) {
                 return false;
             }
 
-            var layoutEntry = modelObject.createFromElementType(pasteEntry);
+            var layoutEntry;
+            if (pasteType === clipboardService.TYPES.ELEMENT_TYPE) {
+                layoutEntry = modelObject.createFromElementType(pasteEntry);
+            } else if (pasteType === clipboardService.TYPES.BLOCK) {
+                layoutEntry = modelObject.createFromBlockData(pasteEntry);
+            } else {
+                // Not a supported paste type.
+                return false;
+            }
+
             if (layoutEntry === null) {
+                // Pasting did not go well.
                 return false;
             }
 
             // make block model
             var blockObject = getBlockObject(layoutEntry);
             if (blockObject === null) {
+                // Initalization of the Block Object didnt go well, therefor we will fail the paste action.
                 return false;
             }
 
@@ -583,6 +594,7 @@
             return true;
 
         }
+
         function requestDeleteBlock(block) {
             localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockMessage", "contentTypeEditor_yesDelete"]).then(function (data) {
                 const overlay = {

From dc6c72c136831f6025e911a06baaf1fc0a394783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 22 Oct 2020 09:08:00 +0200
Subject: [PATCH 44/73] updates CSS selector to match latest

---
 .../src/less/components/umb-nested-content.less                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 7962981592..5f0a6a3c00 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -19,7 +19,7 @@
         yeah so this is a pain, but we must be super specific in targeting the mandatory property labels,
         otherwise all properties within a reqired, nested, nested content property will all appear mandatory
     */
-    > ng-form > .control-group > .umb-el-wrap > .control-header label:after {
+    .umb-property > ng-form > .control-group > .umb-el-wrap > .control-header label:after {
         content: '*';
         color: @red;
     }

From f3aad864133546793b3887eb7e917d41440e2b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 22 Oct 2020 09:08:00 +0200
Subject: [PATCH 45/73] updates CSS selector to match latest

(cherry picked from commit dc6c72c136831f6025e911a06baaf1fc0a394783)
---
 .../src/less/components/umb-nested-content.less                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 6ea5309d03..29a73bd524 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -19,7 +19,7 @@
         yeah so this is a pain, but we must be super specific in targeting the mandatory property labels,
         otherwise all properties within a reqired, nested, nested content property will all appear mandatory
     */
-    > ng-form > .control-group > .umb-el-wrap > .control-header label:after {
+    .umb-property > ng-form > .control-group > .umb-el-wrap > .control-header label:after {
         content: '*';
         color: @red;
     }

From c903a01f15c317625b1af435af8b1d0d932d3cbe Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 09:53:02 +0200
Subject: [PATCH 46/73] Revert "Revert "umb-confirmation directive: move
 trashcan into directive and address accessibility issues (#8198)""

This reverts commit 22a1423324fe1cdb2795e1dd8eb2a66faa97de8b.
---
 .../components/umbconfirmaction.directive.js  | 32 ++++++++------
 .../less/components/umb-confirm-action.less   |  5 +++
 .../components/tags/umb-tags-editor.html      |  5 +--
 .../views/components/umb-confirm-action.html  | 31 +++++++++-----
 .../views/components/umb-groups-builder.html  | 10 ++---
 .../src/views/propertyeditors/grid/grid.html  |  8 ++--
 .../listview/layouts.prevalues.html           | 42 +++++++++----------
 .../multipletextbox/multipletextbox.html      |  9 ++--
 8 files changed, 78 insertions(+), 64 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
index 1dcccda481..2f682205ad 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
@@ -14,10 +14,10 @@ The prompt can be opened in four direction up, down, left or right.</p>
     <div ng-controller="My.Controller as vm">
 
         <div class="my-action" style="position:relative;">
-            <i class="icon-trash" ng-click="vm.showPrompt()"></i>
             <umb-confirm-action
-                ng-if="vm.promptIsVisible"
+                show="vm.promptIsVisible"
                 direction="left"
+                on-delete="vm.showPrompt()"
                 on-confirm="vm.confirmAction()"
                 on-cancel="vm.hidePrompt()">
             </umb-confirm-action>
@@ -71,17 +71,23 @@ The prompt can be opened in four direction up, down, left or right.</p>
 
     function link(scope, el, attr, ctrl) {
 
-      scope.clickConfirm = function() {
-          if(scope.onConfirm) {
-              scope.onConfirm();
-          }
-      };
+        scope.clickButton = function (event) {
+            if(scope.onDelete) {
+                scope.onDelete({$event: event});
+            }
+        }
 
-      scope.clickCancel = function() {
-          if(scope.onCancel) {
-              scope.onCancel();
-          }
-      };
+        scope.clickConfirm = function() {
+            if(scope.onConfirm) {
+                scope.onConfirm();
+            }
+        };
+
+        scope.clickCancel = function() {
+            if(scope.onCancel) {
+                scope.onCancel();
+            }
+        };
 
     }
 
@@ -91,6 +97,8 @@ The prompt can be opened in four direction up, down, left or right.</p>
       templateUrl: 'views/components/umb-confirm-action.html',
       scope: {
         direction: "@",
+        show: "<",
+        onDelete: "&?",
         onConfirm: "&",
         onCancel: "&"
       },
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
index 112194f012..a6548123ac 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
@@ -1,3 +1,8 @@
+//WRAPPER 
+.umb_confirm-action {
+    display: inline-block;
+}
+
 // OVERLAY
 .umb_confirm-action__overlay {
     position: absolute;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
index 6251d0eed1..cce613782e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
@@ -12,10 +12,9 @@
             <span ng-repeat="tag in vm.viewModel track by $index" class="label label-primary tag" ng-keyup="vm.onKeyUpOnTag(tag, $event)" tabindex="0">
                 <span ng-bind-html="tag"></span>
 
-                <i class="icon-trash" ng-click="vm.showPrompt($index, tag)" localize="title" title="@buttons_deleteTag"></i>
-
-                <umb-confirm-action ng-if="vm.promptIsVisible === $index"
+                <umb-confirm-action show="vm.promptIsVisible === $index"
                                     direction="left"
+                                    on-delete="vm.showPrompt($index, tag)"
                                     on-confirm="vm.removeTag(tag)"
                                     on-cancel="vm.hidePrompt()">
                 </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
index 1b88c9f988..39864c26fd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
@@ -1,22 +1,31 @@
-<div class="umb_confirm-action__overlay"
-     ng-class="{
-     '-top': direction === 'top',
-     '-right': direction === 'right',
-     '-bottom': direction === 'bottom',
-     '-left': direction === 'left'}"
-     on-outside-click="clickCancel()">
+<div class="umb_confirm-action">
+    <button ng-if="onDelete" type="button" class="btn-icon" ng-click="clickButton($event)" localize="title" title="@general_delete">
+        <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
+        <span class="sr-only">
+            <localize key="general_delete">Delete</localize>
+        </span>
+    </button>
 
-        <button class="umb_confirm-action__overlay-action -confirm btn-reset" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm" type="button">
-            <i class="icon-check" aria-hidden="true"></i>
+     <div class="umb_confirm-action__overlay"
+        ng-class="{
+        '-top': direction === 'top',
+        '-right': direction === 'right',
+        '-bottom': direction === 'bottom',
+        '-left': direction === 'left'}"
+        on-outside-click="clickCancel()" ng-if="show">
+
+        <button type="button" class="btn-reset umb_confirm-action__overlay-action -confirm" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm">
+            <umb-icon icon="icon-check" class="icon-check"></umb-icon>
             <span class="sr-only">
                 <localize key="buttons_confirmActionConfirm">Confirm</localize>
             </span>
         </button>
 
-        <button class="umb_confirm-action__overlay-action -cancel btn-reset"  ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel" type="button">
-            <i class="icon-delete" aria-hidden="true"></i>
+        <button type="button" class="btn-reset umb_confirm-action__overlay-action -cancel" ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel">
+            <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
             <span class="sr-only">
                 <localize key="buttons_confirmActionCancel">Cancel</localize>
             </span>
         </button>
+    </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 2fdef77928..d722fba7be 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -101,10 +101,10 @@
                     </ng-form>
 
                     <div class="umb-group-builder__group-remove" ng-if="!sortingMode && canRemoveGroup(tab)">
-                        <i class="icon-trash" ng-click="togglePrompt(tab)"></i>
                         <umb-confirm-action
-                            ng-if="tab.deletePrompt"
+                            show="tab.deletePrompt"
                             direction="left"
+                            on-delete="togglePrompt(tab)"
                             on-confirm="removeGroup($index)"
                             on-cancel="hidePrompt(tab)">
                         </umb-confirm-action>
@@ -266,12 +266,10 @@
 
                                     <!-- delete property -->
                                     <div ng-if="!property.locked" class="umb-group-builder__property-action">
-                                        <button aria-label="Delete property" class="btn-icon" ng-click="togglePrompt(property)">
-                                            <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
-                                        </button>
                                         <umb-confirm-action
-                                            ng-if="property.deletePrompt"
+                                            show="property.deletePrompt"
                                             direction="left"
+                                            on-delete="togglePrompt(property)"
                                             on-confirm="deleteProperty(tab, $index)"
                                             on-cancel="hidePrompt(property)">
                                         </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 0ef24157fe..56e8811133 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -95,10 +95,10 @@
                                    </div>
 
                                     <div class="cell-tools-remove row-tool">
-                                        <button class="icon-trash btn-reset" ng-click="togglePrompt(row)" type="button"></button>
                                         <umb-confirm-action
-                                            ng-if="row.deletePrompt"
+                                            show="row.deletePrompt"
                                             direction="left"
+                                            on-delete="togglePrompt(row)"
                                             on-confirm="removeRow(section, $index)"
                                             on-cancel="hidePrompt(row)">
                                         </umb-confirm-action>
@@ -209,9 +209,9 @@
                                                                           </div>
 
                                                                           <div class="umb-control-tool">
-                                                                              <button class="umb-control-tool-icon icon-trash btn-reset" ng-click="togglePrompt(control)" type="button"></button>
-                                                                              <umb-confirm-action ng-if="control.deletePrompt"
+                                                                              <umb-confirm-action show="control.deletePrompt"
                                                                                                   direction="left"
+                                                                                                  on-delete="togglePrompt(control)"
                                                                                                   on-confirm="removeControl(area, $index)"
                                                                                                   on-cancel="hidePrompt(control)">
                                                                               </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
index 4527458d16..c33c3e840e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
@@ -2,9 +2,9 @@
 
    <div class="list-view-layouts-container">
 
-       <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
+   <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
 
-           <div class="list-view-layout" ng-repeat="layout in model.value">
+      <div class="list-view-layout" ng-repeat="layout in model.value">
 
                <i class="icon-navigation list-view-layout__sort-handle" aria-hidden="true" aria-label="Sort"></i>
 
@@ -14,45 +14,43 @@
                        <span class="list-view-layout__icon">
                            <i class="{{layout.icon}}" aria-hidden="true"></i>
                        </span>
-                   </button>
+            </button>
 
-                   <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
+            <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
                        <i class="{{layout.icon}}" aria-hidden="true"></i>
-                   </div>
+            </div>
 
-               </div>
+         </div>
 
-               <div class="list-view-layout__name">
-                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
-                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{layout.name}}</span>
-                   <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
-               </div>
+         <div class="list-view-layout__name">
+            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{ layout.name }}</span>
+            <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
+         </div>
 
-               <div class="list-view-layout__path">
-                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
-               </div>
+         <div class="list-view-layout__path">
+            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
+         </div>
 
-               <div>
+         <div>
                    <umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>
 
                    <div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
-                       <button type="button" class="btn-icon" ng-click="vm.showPrompt(layout)" aria-label="Remove">
-                           <i class="icon-trash" aria-hidden="true"></i>
-                       </button>
-                       <umb-confirm-action ng-if="layout.deletePrompt"
+                       <umb-confirm-action show="layout.deletePrompt"
                                            direction="left"
+                                           on-delete="vm.showPrompt(layout)"
                                            on-confirm="vm.removeLayout($index, layout)"
                                            on-cancel="vm.hidePrompt(layout)">
                        </umb-confirm-action>
                    </div>
-               </div>
+         </div>
 
-           </div>
+      </div>
 
        </div>
 
       <button type="button" class="list-view-add-layout mt2" ng-click="vm.addLayout()">Add layout</button>
 
-   </div>
+    </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index d1c202b867..6a9826ac3c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -10,15 +10,12 @@
 
           <div class="icon-wrapper">
               <i class="icon icon-navigation handle" aria-hidden="true" localize="title" title="@general_move"></i>
-  
+
               <div class="umb-multiple-textbox__confirm" ng-show="model.value.length > model.config.min">
-                  <button type="button" class="umb-multiple-textbox__confirm-action" ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
-                      <i class="icon-trash" aria-hidden="true"></i>
-                  </button>
-  
                   <umb-confirm-action
-                      ng-if="promptIsVisible === $index"
+                      show="promptIsVisible === $index"
                       direction="left"
+                      on-delete="showPrompt($index, item)"
                       on-confirm="remove($index)"
                       on-cancel="hidePrompt()">
                   </umb-confirm-action>

From 174909d735a5ab453ec29d181eb97699e8ea6b46 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 10:43:37 +0200
Subject: [PATCH 47/73] Takes the last commit from #9216 to make
 umb-confirm-action backwards compatible

---
 .../common/directives/components/umbconfirmaction.directive.js  | 2 +-
 .../src/views/components/umb-confirm-action.html                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
index 2f682205ad..e04fa47152 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
@@ -97,7 +97,7 @@ The prompt can be opened in four direction up, down, left or right.</p>
       templateUrl: 'views/components/umb-confirm-action.html',
       scope: {
         direction: "@",
-        show: "<",
+        show: "<?",
         onDelete: "&?",
         onConfirm: "&",
         onCancel: "&"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
index 39864c26fd..4a76fe5b34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
@@ -12,7 +12,7 @@
         '-right': direction === 'right',
         '-bottom': direction === 'bottom',
         '-left': direction === 'left'}"
-        on-outside-click="clickCancel()" ng-if="show">
+        on-outside-click="clickCancel()" ng-if="show !== false">
 
         <button type="button" class="btn-reset umb_confirm-action__overlay-action -confirm" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm">
             <umb-icon icon="icon-check" class="icon-check"></umb-icon>

From 094897704c7147cf3f93c855721eefaf763174a0 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 10:56:49 +0200
Subject: [PATCH 48/73] Need null checks for Keys in case packages had been
 created without keys before

---
 src/Umbraco.Core/Packaging/PackageDataInstallation.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index d669600c44..1320f33a50 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -604,7 +604,8 @@ namespace Umbraco.Core.Packaging
             var defaultTemplateElement = infoElement.Element("DefaultTemplate");
 
             contentType.Name = infoElement.Element("Name").Value;
-            contentType.Key = new Guid(infoElement.Element("Key").Value);
+            if (infoElement.Element("Key") != null)
+                contentType.Key = new Guid(infoElement.Element("Key").Value);
             contentType.Icon = infoElement.Element("Icon").Value;
             contentType.Thumbnail = infoElement.Element("Thumbnail").Value;
             contentType.Description = infoElement.Element("Description").Value;
@@ -784,7 +785,6 @@ namespace Umbraco.Core.Packaging
                 var propertyType = new PropertyType(dataTypeDefinition, property.Element("Alias").Value)
                 {
                     Name = property.Element("Name").Value,
-                    Key = new Guid(property.Element("Key").Value),
                     Description = (string)property.Element("Description"),
                     Mandatory = property.Element("Mandatory") != null
                         ? property.Element("Mandatory").Value.ToLowerInvariant().Equals("true")
@@ -802,6 +802,8 @@ namespace Umbraco.Core.Packaging
                         ? (ContentVariation)Enum.Parse(typeof(ContentVariation), property.Element("Variations").Value)
                         : ContentVariation.Nothing
                 };
+                if (property.Element("Key") != null)
+                    propertyType.Key = new Guid(property.Element("Key").Value);
 
                 var tab = (string)property.Element("Tab");
                 if (string.IsNullOrEmpty(tab))

From 3025fbd8b6680e0059fb7c8164e465095fb83345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 22 Oct 2020 11:16:37 +0200
Subject: [PATCH 49/73] further progress, need to switch branch.

---
 .../common/services/blockeditor.service.js    | 34 +++++++---
 .../blockeditormodelobject.service.js         |  4 ++
 .../src/common/services/clipboard.service.js  | 66 +++++++++++++------
 .../umbBlockListPropertyEditor.component.js   | 16 +++--
 4 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
index 08c9803ff3..122d430165 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
@@ -57,6 +57,23 @@
                 }
             }
         }
+        function removeBlockReferences(obj) {
+            for (var k in obj) {
+                if(k === "contentUdi") {
+                    delete obj[k];
+                } else if(k === "settingsUdi") {
+                    delete obj[k];
+                } else {
+                    // lets crawl through all properties of layout to make sure get captured all `contentUdi` and `settingsUdi` properties.
+                    var propType = typeof obj[k];
+                    if(propType != null && (propType === "object" || propType === "array")) {
+                        removeBlockReferences(obj[k])
+                    }
+                }
+            }
+        }
+
+
         function elementTypeBlockResolver(obj, propPasteResolverMethod) {
             // we could filter for specific Property Editor Aliases, but as the Block Editor structure can be used by many Property Editor we do not in this code know a good way to detect that this is a Block Editor and will therefor leave it to the value structure to determin this.
             rawBlockResolver(obj.value, propPasteResolverMethod);
@@ -97,29 +114,26 @@
         clipboardService.registerPastePropertyResolver(rawBlockResolver, clipboardService.TYPES.RAW);
 
 
-        function blockResolver(block, propPasteResolverMethod) {
+        function provideNewUdisForBlockResolver(block, propPasteResolverMethod) {
+
+            if(block.layout) {
+                // We do not support layout child blocks currently, these should be stripped out as we only will be copying a single entry.
+                removeBlockReferences(block.layout);
+            }
 
             if(block.data) {
-
                 // Make new UDI for content-element
                 block.data.udi = block.layout.contentUdi = udiService.create("element");
-
-                // run resolvers for inner properties of this Blocks content data.
-                propPasteResolverMethod(block.data, clipboardService.TYPES.RAW);
             }
 
             if(block.settingsData) {
-
                 // Make new UDI for settings-element
                 block.settingsData.udi = block.layout.settingsUdi = udiService.create("element");
-
-                // run resolvers for inner properties of this Blocks settings data.
-                propPasteResolverMethod(block.settingsData, clipboardService.TYPES.RAW);
             }
 
         }
 
-        clipboardService.registerPastePropertyResolver(blockResolver, clipboardService.TYPES.BLOCK);
+        clipboardService.registerPastePropertyResolver(provideNewUdisForBlockResolver, clipboardService.TYPES.BLOCK);
 
     }]);
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
index ac6bfb9135..57aaeaa42d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
@@ -783,8 +783,12 @@
              */
             createFromBlockData: function (blockData) {
 
+                console.log("createFromBlockData", blockData);
+
                 blockData = clipboardService.parseContentForPaste(blockData, clipboardService.TYPES.BLOCK);
 
+                console.log("createFromBlockData", blockData);
+
                 // As the blockData is a cloned object we can use its layout part for our layout entry.
                 var layoutEntry = blockData.layout;
                 if (layoutEntry === null) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 105e3b1ee6..6eb8503319 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -10,7 +10,7 @@
  * The service has a set way for defining a data-set by a entryType and alias, which later will be used to retrive the posible entries for a paste scenario.
  *
  */
-function clipboardService(notificationsService, eventsService, localStorageService, iconHelper) {
+function clipboardService($window, notificationsService, eventsService, localStorageService, iconHelper) {
 
 
     const TYPES = {};
@@ -22,21 +22,35 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     var pastePropertyResolvers = {};
     var clipboardTypeResolvers = {};
 
-    clipboardTypeResolvers[TYPES.ELEMENT_TYPE] = function(data, propMethod) {
-        for (var t = 0; t < data.variants[0].tabs.length; t++) {
-            var tab = data.variants[0].tabs[t];
+    clipboardTypeResolvers[TYPES.ELEMENT_TYPE] = function(element, propMethod) {
+        for (var t = 0; t < element.variants[0].tabs.length; t++) {
+            var tab = element.variants[0].tabs[t];
             for (var p = 0; p < tab.properties.length; p++) {
                 var prop = tab.properties[p];
                 propMethod(prop, TYPES.ELEMENT_TYPE);
             }
         }
     }
-    clipboardTypeResolvers[TYPES.BLOCK] = function(data, propMethod) {
-        if (data.data != null) {
-            clipboardTypeResolvers[TYPES.RAW](data.data, propMethod);
+    clipboardTypeResolvers[TYPES.BLOCK] = function (block, propMethod) {
+
+        propMethod(block, TYPES.BLOCK);
+
+        if(block.data) {
+            Object.keys(block.data).forEach( key => {
+                if(key === 'udi' || key === 'contentTypeKey') {
+                    return;
+                }
+                propMethod(block.data[key], TYPES.RAW);
+            });
         }
-        if (data.settingsData != null) {
-            clipboardTypeResolvers[TYPES.RAW](data.settingsData, propMethod);
+
+        if(block.settingsData) {
+            Object.keys(block.settingsData).forEach( key => {
+                if(key === 'udi' || key === 'contentTypeKey') {
+                    return;
+                }
+                propMethod(block.settingsData[key], TYPES.RAW);
+            });
         }
     }
     clipboardTypeResolvers[TYPES.RAW] = function(data, propMethod) {
@@ -45,7 +59,6 @@ function clipboardService(notificationsService, eventsService, localStorageServi
         }
     }
 
-
     var STORAGE_KEY = "umbClipboardService";
 
     var retriveStorage = function() {
@@ -73,10 +86,13 @@ function clipboardService(notificationsService, eventsService, localStorageServi
         var storageString = JSON.stringify(storage);
 
         try {
+            // Check that we can parse the JSON:
             var storageJSON = JSON.parse(storageString);
+
+            // Store the string:
             localStorageService.set(STORAGE_KEY, storageString);
 
-            eventsService.emit("clipboardService.storageUpdate");
+            //eventsService.emit("clipboardService.storageUpdate");
 
             return true;
         } catch(e) {
@@ -91,11 +107,11 @@ function clipboardService(notificationsService, eventsService, localStorageServi
 
         type = type || "raw";
         var resolvers = clearPropertyResolvers[type];
-
-        for (var i=0; i<resolvers.length; i++) {
-            resolvers[i](prop, resolvePropertyForStorage);
+        if (resolvers) {
+            for (var i=0; i<resolvers.length; i++) {
+                resolvers[i](prop, resolvePropertyForStorage);
+            }
         }
-
     }
 
     var prepareEntryForStorage = function(type, entryData, firstLevelClearupMethod) {
@@ -132,9 +148,10 @@ function clipboardService(notificationsService, eventsService, localStorageServi
 
         type = type || "raw";
         var resolvers = pastePropertyResolvers[type];
-
-        for (var i=0; i<resolvers.length; i++) {
-            resolvers[i](prop, resolvePropertyForPaste);
+        if (resolvers) {
+            for (var i=0; i<resolvers.length; i++) {
+                resolvers[i](prop, resolvePropertyForPaste);
+            }
         }
     }
 
@@ -163,7 +180,7 @@ function clipboardService(notificationsService, eventsService, localStorageServi
         var cloneData = Utilities.copy(pasteEntryData);
 
         var typeResolver = clipboardTypeResolvers[type];
-        if(typeResolver) {
+        if (typeResolver) {
             typeResolver(cloneData, resolvePropertyForPaste);
         } else {
             console.warn("Umbraco.service.clipboardService has no type resolver for '" + type + "'.");
@@ -437,6 +454,17 @@ function clipboardService(notificationsService, eventsService, localStorageServi
 
 
 
+
+
+    $window.addEventListener("storage", localStorageChanged);
+    function localStorageChanged() {
+        console.log("clipboardService.storageUpdate");
+        // TODO: Check if its the right value that was changed...
+        eventsService.emit("clipboardService.storageUpdate");
+    }
+
+
+
     return service;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index 7cac113b6f..f22ecd8d97 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -527,7 +527,7 @@
             var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(
                 (entry) => {
                     // No need to clone the data as its begin handled by the clipboardService.
-                    return {"layout": block.layout, "data": entry.$block.data, "settingsData":entry.$block.settingsData}
+                    return {"layout": entry.$block.layout, "data": entry.$block.data, "settingsData":entry.$block.settingsData}
                 }
             );
 
@@ -537,16 +537,21 @@
             // remove dublicates
             aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
 
-            var contentNodeName = "";
+            var contentNodeName = "?";
+            var contentNodeIcon = null;
             if(vm.umbVariantContent) {
                 contentNodeName = vm.umbVariantContent.editor.content.name;
-                contentNodeIcon = vm.umbVariantContent.editor.content.icon;
+                if(vm.umbVariantContentEditors) {
+                    contentNodeIcon = vm.umbVariantContentEditors.content.icon.split(" ")[0];
+                }
             } else if (vm.umbElementEditorContent) {
                 contentNodeName = vm.umbElementEditorContent.model.documentType.name;
-                contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon;
+                contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
+                console.log(vm.umbElementEditorContent.model.documentType)
             }
 
-            console.log("contentNodeIcon", contentNodeIcon)
+
+            console.log("check that we get the right contentNodeIcon", contentNodeIcon)
 
             localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, contentNodeName]).then(function(localizedLabel) {
                 clipboardService.copyArray(clipboardService.TYPES.BLOCK, aliases, elementTypesToCopy, localizedLabel, contentNodeIcon || "icon-thumbnail-list", vm.model.id);
@@ -566,6 +571,7 @@
                 layoutEntry = modelObject.createFromElementType(pasteEntry);
             } else if (pasteType === clipboardService.TYPES.BLOCK) {
                 layoutEntry = modelObject.createFromBlockData(pasteEntry);
+                console.log("pasteEntry", pasteEntry)
             } else {
                 // Not a supported paste type.
                 return false;

From f3af025c794a2a06349e75a9666e12eabcb20c91 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 12:33:19 +0200
Subject: [PATCH 50/73] Revert "Takes the last commit from #9216 to make
 umb-confirm-action backwards compatible"

This reverts commit 174909d735a5ab453ec29d181eb97699e8ea6b46.
---
 .../common/directives/components/umbconfirmaction.directive.js  | 2 +-
 .../src/views/components/umb-confirm-action.html                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
index e04fa47152..2f682205ad 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
@@ -97,7 +97,7 @@ The prompt can be opened in four direction up, down, left or right.</p>
       templateUrl: 'views/components/umb-confirm-action.html',
       scope: {
         direction: "@",
-        show: "<?",
+        show: "<",
         onDelete: "&?",
         onConfirm: "&",
         onCancel: "&"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
index 4a76fe5b34..39864c26fd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
@@ -12,7 +12,7 @@
         '-right': direction === 'right',
         '-bottom': direction === 'bottom',
         '-left': direction === 'left'}"
-        on-outside-click="clickCancel()" ng-if="show !== false">
+        on-outside-click="clickCancel()" ng-if="show">
 
         <button type="button" class="btn-reset umb_confirm-action__overlay-action -confirm" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm">
             <umb-icon icon="icon-check" class="icon-check"></umb-icon>

From 81cbe365f6944a507015e1757cc3ad2f25ac133f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 12:33:45 +0200
Subject: [PATCH 51/73] Revert "Revert "Revert "umb-confirmation directive:
 move trashcan into directive and address accessibility issues (#8198)"""

This reverts commit c903a01f15c317625b1af435af8b1d0d932d3cbe.
---
 .../components/umbconfirmaction.directive.js  | 32 ++++++--------
 .../less/components/umb-confirm-action.less   |  5 ---
 .../components/tags/umb-tags-editor.html      |  5 ++-
 .../views/components/umb-confirm-action.html  | 31 +++++---------
 .../views/components/umb-groups-builder.html  | 10 +++--
 .../src/views/propertyeditors/grid/grid.html  |  8 ++--
 .../listview/layouts.prevalues.html           | 42 ++++++++++---------
 .../multipletextbox/multipletextbox.html      |  9 ++--
 8 files changed, 64 insertions(+), 78 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
index 2f682205ad..1dcccda481 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
@@ -14,10 +14,10 @@ The prompt can be opened in four direction up, down, left or right.</p>
     <div ng-controller="My.Controller as vm">
 
         <div class="my-action" style="position:relative;">
+            <i class="icon-trash" ng-click="vm.showPrompt()"></i>
             <umb-confirm-action
-                show="vm.promptIsVisible"
+                ng-if="vm.promptIsVisible"
                 direction="left"
-                on-delete="vm.showPrompt()"
                 on-confirm="vm.confirmAction()"
                 on-cancel="vm.hidePrompt()">
             </umb-confirm-action>
@@ -71,23 +71,17 @@ The prompt can be opened in four direction up, down, left or right.</p>
 
     function link(scope, el, attr, ctrl) {
 
-        scope.clickButton = function (event) {
-            if(scope.onDelete) {
-                scope.onDelete({$event: event});
-            }
-        }
+      scope.clickConfirm = function() {
+          if(scope.onConfirm) {
+              scope.onConfirm();
+          }
+      };
 
-        scope.clickConfirm = function() {
-            if(scope.onConfirm) {
-                scope.onConfirm();
-            }
-        };
-
-        scope.clickCancel = function() {
-            if(scope.onCancel) {
-                scope.onCancel();
-            }
-        };
+      scope.clickCancel = function() {
+          if(scope.onCancel) {
+              scope.onCancel();
+          }
+      };
 
     }
 
@@ -97,8 +91,6 @@ The prompt can be opened in four direction up, down, left or right.</p>
       templateUrl: 'views/components/umb-confirm-action.html',
       scope: {
         direction: "@",
-        show: "<",
-        onDelete: "&?",
         onConfirm: "&",
         onCancel: "&"
       },
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
index a6548123ac..112194f012 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
@@ -1,8 +1,3 @@
-//WRAPPER 
-.umb_confirm-action {
-    display: inline-block;
-}
-
 // OVERLAY
 .umb_confirm-action__overlay {
     position: absolute;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
index cce613782e..6251d0eed1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
@@ -12,9 +12,10 @@
             <span ng-repeat="tag in vm.viewModel track by $index" class="label label-primary tag" ng-keyup="vm.onKeyUpOnTag(tag, $event)" tabindex="0">
                 <span ng-bind-html="tag"></span>
 
-                <umb-confirm-action show="vm.promptIsVisible === $index"
+                <i class="icon-trash" ng-click="vm.showPrompt($index, tag)" localize="title" title="@buttons_deleteTag"></i>
+
+                <umb-confirm-action ng-if="vm.promptIsVisible === $index"
                                     direction="left"
-                                    on-delete="vm.showPrompt($index, tag)"
                                     on-confirm="vm.removeTag(tag)"
                                     on-cancel="vm.hidePrompt()">
                 </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
index 39864c26fd..1b88c9f988 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
@@ -1,31 +1,22 @@
-<div class="umb_confirm-action">
-    <button ng-if="onDelete" type="button" class="btn-icon" ng-click="clickButton($event)" localize="title" title="@general_delete">
-        <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
-        <span class="sr-only">
-            <localize key="general_delete">Delete</localize>
-        </span>
-    </button>
+<div class="umb_confirm-action__overlay"
+     ng-class="{
+     '-top': direction === 'top',
+     '-right': direction === 'right',
+     '-bottom': direction === 'bottom',
+     '-left': direction === 'left'}"
+     on-outside-click="clickCancel()">
 
-     <div class="umb_confirm-action__overlay"
-        ng-class="{
-        '-top': direction === 'top',
-        '-right': direction === 'right',
-        '-bottom': direction === 'bottom',
-        '-left': direction === 'left'}"
-        on-outside-click="clickCancel()" ng-if="show">
-
-        <button type="button" class="btn-reset umb_confirm-action__overlay-action -confirm" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm">
-            <umb-icon icon="icon-check" class="icon-check"></umb-icon>
+        <button class="umb_confirm-action__overlay-action -confirm btn-reset" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm" type="button">
+            <i class="icon-check" aria-hidden="true"></i>
             <span class="sr-only">
                 <localize key="buttons_confirmActionConfirm">Confirm</localize>
             </span>
         </button>
 
-        <button type="button" class="btn-reset umb_confirm-action__overlay-action -cancel" ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel">
-            <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
+        <button class="umb_confirm-action__overlay-action -cancel btn-reset"  ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel" type="button">
+            <i class="icon-delete" aria-hidden="true"></i>
             <span class="sr-only">
                 <localize key="buttons_confirmActionCancel">Cancel</localize>
             </span>
         </button>
-    </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index d722fba7be..2fdef77928 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -101,10 +101,10 @@
                     </ng-form>
 
                     <div class="umb-group-builder__group-remove" ng-if="!sortingMode && canRemoveGroup(tab)">
+                        <i class="icon-trash" ng-click="togglePrompt(tab)"></i>
                         <umb-confirm-action
-                            show="tab.deletePrompt"
+                            ng-if="tab.deletePrompt"
                             direction="left"
-                            on-delete="togglePrompt(tab)"
                             on-confirm="removeGroup($index)"
                             on-cancel="hidePrompt(tab)">
                         </umb-confirm-action>
@@ -266,10 +266,12 @@
 
                                     <!-- delete property -->
                                     <div ng-if="!property.locked" class="umb-group-builder__property-action">
+                                        <button aria-label="Delete property" class="btn-icon" ng-click="togglePrompt(property)">
+                                            <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
+                                        </button>
                                         <umb-confirm-action
-                                            show="property.deletePrompt"
+                                            ng-if="property.deletePrompt"
                                             direction="left"
-                                            on-delete="togglePrompt(property)"
                                             on-confirm="deleteProperty(tab, $index)"
                                             on-cancel="hidePrompt(property)">
                                         </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 56e8811133..0ef24157fe 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -95,10 +95,10 @@
                                    </div>
 
                                     <div class="cell-tools-remove row-tool">
+                                        <button class="icon-trash btn-reset" ng-click="togglePrompt(row)" type="button"></button>
                                         <umb-confirm-action
-                                            show="row.deletePrompt"
+                                            ng-if="row.deletePrompt"
                                             direction="left"
-                                            on-delete="togglePrompt(row)"
                                             on-confirm="removeRow(section, $index)"
                                             on-cancel="hidePrompt(row)">
                                         </umb-confirm-action>
@@ -209,9 +209,9 @@
                                                                           </div>
 
                                                                           <div class="umb-control-tool">
-                                                                              <umb-confirm-action show="control.deletePrompt"
+                                                                              <button class="umb-control-tool-icon icon-trash btn-reset" ng-click="togglePrompt(control)" type="button"></button>
+                                                                              <umb-confirm-action ng-if="control.deletePrompt"
                                                                                                   direction="left"
-                                                                                                  on-delete="togglePrompt(control)"
                                                                                                   on-confirm="removeControl(area, $index)"
                                                                                                   on-cancel="hidePrompt(control)">
                                                                               </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
index c33c3e840e..4527458d16 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
@@ -2,9 +2,9 @@
 
    <div class="list-view-layouts-container">
 
-   <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
+       <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
 
-      <div class="list-view-layout" ng-repeat="layout in model.value">
+           <div class="list-view-layout" ng-repeat="layout in model.value">
 
                <i class="icon-navigation list-view-layout__sort-handle" aria-hidden="true" aria-label="Sort"></i>
 
@@ -14,43 +14,45 @@
                        <span class="list-view-layout__icon">
                            <i class="{{layout.icon}}" aria-hidden="true"></i>
                        </span>
-            </button>
+                   </button>
 
-            <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
+                   <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
                        <i class="{{layout.icon}}" aria-hidden="true"></i>
-            </div>
+                   </div>
 
-         </div>
+               </div>
 
-         <div class="list-view-layout__name">
-            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
-                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{ layout.name }}</span>
-            <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
-         </div>
+               <div class="list-view-layout__name">
+                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{layout.name}}</span>
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
+               </div>
 
-         <div class="list-view-layout__path">
-            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
-         </div>
+               <div class="list-view-layout__path">
+                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
+               </div>
 
-         <div>
+               <div>
                    <umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>
 
                    <div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
-                       <umb-confirm-action show="layout.deletePrompt"
+                       <button type="button" class="btn-icon" ng-click="vm.showPrompt(layout)" aria-label="Remove">
+                           <i class="icon-trash" aria-hidden="true"></i>
+                       </button>
+                       <umb-confirm-action ng-if="layout.deletePrompt"
                                            direction="left"
-                                           on-delete="vm.showPrompt(layout)"
                                            on-confirm="vm.removeLayout($index, layout)"
                                            on-cancel="vm.hidePrompt(layout)">
                        </umb-confirm-action>
                    </div>
-         </div>
+               </div>
 
-      </div>
+           </div>
 
        </div>
 
       <button type="button" class="list-view-add-layout mt2" ng-click="vm.addLayout()">Add layout</button>
 
-    </div>
+   </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index 6a9826ac3c..d1c202b867 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -10,12 +10,15 @@
 
           <div class="icon-wrapper">
               <i class="icon icon-navigation handle" aria-hidden="true" localize="title" title="@general_move"></i>
-
+  
               <div class="umb-multiple-textbox__confirm" ng-show="model.value.length > model.config.min">
+                  <button type="button" class="umb-multiple-textbox__confirm-action" ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
+                      <i class="icon-trash" aria-hidden="true"></i>
+                  </button>
+  
                   <umb-confirm-action
-                      show="promptIsVisible === $index"
+                      ng-if="promptIsVisible === $index"
                       direction="left"
-                      on-delete="showPrompt($index, item)"
                       on-confirm="remove($index)"
                       on-cancel="hidePrompt()">
                   </umb-confirm-action>

From a6101ce499749d5f569537d3519dbcfe3c07dde1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 22 Oct 2020 17:16:05 +1100
Subject: [PATCH 52/73] Merge branch 'dawoe-temp_8879' into v8/contrib

(cherry picked from commit 35bf59dee41bd6033abecfd56e95d5ac794e5d84)
---
 src/Umbraco.Examine/ContentIndexPopulator.cs  | 83 ++++++++++++++++---
 src/Umbraco.Examine/IUmbracoContentIndex.cs   | 14 ++++
 src/Umbraco.Examine/IndexPopulator.cs         | 11 ++-
 src/Umbraco.Examine/UmbracoContentIndex.cs    |  2 +-
 .../UmbracoExamine/IndexInitializer.cs        |  2 +-
 5 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Examine/ContentIndexPopulator.cs b/src/Umbraco.Examine/ContentIndexPopulator.cs
index 99ff4d7f87..01a7046723 100644
--- a/src/Umbraco.Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Examine/ContentIndexPopulator.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Examine;
 using Umbraco.Core;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Blocks;
 using Umbraco.Core.Services;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
@@ -15,7 +16,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// Performs the data lookups required to rebuild a content index
     /// </summary>
-    public class ContentIndexPopulator : IndexPopulator<IUmbracoContentIndex>
+    public class ContentIndexPopulator : IndexPopulator<IUmbracoContentIndex2>
     {
         private readonly IContentService _contentService;
         private readonly IValueSetBuilder<IContent> _contentValueSetBuilder;
@@ -58,6 +59,12 @@ namespace Umbraco.Examine
             _parentId = parentId;
         }
 
+        public override bool IsRegistered(IUmbracoContentIndex2 index)
+        {
+            // check if it should populate based on published values
+            return _publishedValuesOnly == index.PublishedValuesOnly;
+        }
+
         protected override void PopulateIndexes(IReadOnlyList<IIndex> indexes)
         {
             if (indexes.Count == 0) return;
@@ -70,21 +77,24 @@ namespace Umbraco.Examine
             {
                 contentParentId = _parentId.Value;
             }
+
+            if (_publishedValuesOnly)
+            {
+                IndexPublishedContent(contentParentId, pageIndex, pageSize, indexes);
+            }
+            else
+            {
+                IndexAllContent(contentParentId, pageIndex, pageSize, indexes);
+            }
+        }
+
+        protected void IndexAllContent(int contentParentId, int pageIndex, int pageSize, IReadOnlyList<IIndex> indexes)
+        {
             IContent[] content;
 
             do
             {
-                if (!_publishedValuesOnly)
-                {
-                    content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _).ToArray();
-                }
-                else
-                {
-                    //add the published filter
-                    //note: We will filter for published variants in the validator
-                    content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _,
-                        _publishedQuery, Ordering.By("Path", Direction.Ascending)).ToArray();
-                }
+                content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _).ToArray();
 
                 if (content.Length > 0)
                 {
@@ -96,5 +106,54 @@ namespace Umbraco.Examine
                 pageIndex++;
             } while (content.Length == pageSize);
         }
+
+        protected void IndexPublishedContent(int contentParentId, int pageIndex, int pageSize,
+            IReadOnlyList<IIndex> indexes)
+        {
+            IContent[] content;
+
+            var publishedPages = new HashSet<int>();
+
+            do
+            {
+                //add the published filter
+                //note: We will filter for published variants in the validator
+                content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _, _publishedQuery,
+                    Ordering.By("Path", Direction.Ascending)).ToArray();
+
+                
+                if (content.Length > 0)
+                {
+                    var indexableContent = new List<IContent>();
+
+                    foreach (var item in content)
+                    {
+                        if (item.Level == 1)
+                        {
+                            // first level pages are always published so no need to filter them
+                            indexableContent.Add(item);
+                            publishedPages.Add(item.Id);
+                        }
+                        else
+                        {
+                            if (publishedPages.Contains(item.ParentId))
+                            {
+                                // only index when parent is published
+                                publishedPages.Add(item.Id);
+                                indexableContent.Add(item);
+                            }
+                        }
+                    }
+
+                    // ReSharper disable once PossibleMultipleEnumeration
+                    foreach (var index in indexes)
+                        index.IndexItems(_contentValueSetBuilder.GetValueSets(indexableContent.ToArray()));
+                }
+
+                pageIndex++;
+            } while (content.Length == pageSize);
+        }
     }
+
+
 }
diff --git a/src/Umbraco.Examine/IUmbracoContentIndex.cs b/src/Umbraco.Examine/IUmbracoContentIndex.cs
index 3181ff663e..b718ec6bce 100644
--- a/src/Umbraco.Examine/IUmbracoContentIndex.cs
+++ b/src/Umbraco.Examine/IUmbracoContentIndex.cs
@@ -2,6 +2,20 @@ using Examine;
 
 namespace Umbraco.Examine
 {
+    /// <summary>
+    /// Marker interface for indexes of Umbraco content
+    /// </summary>
+    /// <remarks>
+    /// This is a backwards compat change, in next major version remove the need for this and just have a single interface
+    /// </remarks>
+    public interface IUmbracoContentIndex2 : IUmbracoContentIndex
+    {
+        bool PublishedValuesOnly { get; }
+    }
+
+    /// <summary>
+    /// Marker interface for indexes of Umbraco content
+    /// </summary>
     public interface IUmbracoContentIndex : IIndex
     {
 
diff --git a/src/Umbraco.Examine/IndexPopulator.cs b/src/Umbraco.Examine/IndexPopulator.cs
index f9d4d85dc8..bfd757f9be 100644
--- a/src/Umbraco.Examine/IndexPopulator.cs
+++ b/src/Umbraco.Examine/IndexPopulator.cs
@@ -13,9 +13,16 @@ namespace Umbraco.Examine
     {
         public override bool IsRegistered(IIndex index)
         {
-            if (base.IsRegistered(index)) return true;
-            return index is TIndex;
+            if (base.IsRegistered(index))
+                return true;
+
+            if (!(index is TIndex casted))
+                return false;
+
+            return IsRegistered(casted);
         }
+
+        public virtual bool IsRegistered(TIndex index) => true;
     }
 
     public abstract class IndexPopulator : IIndexPopulator
diff --git a/src/Umbraco.Examine/UmbracoContentIndex.cs b/src/Umbraco.Examine/UmbracoContentIndex.cs
index 67e430b4e9..88033b1407 100644
--- a/src/Umbraco.Examine/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine/UmbracoContentIndex.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// An indexer for Umbraco content and media
     /// </summary>
-    public class UmbracoContentIndex : UmbracoExamineIndex, IUmbracoContentIndex
+    public class UmbracoContentIndex : UmbracoExamineIndex, IUmbracoContentIndex2
     {
         public const string VariesByCultureFieldName = SpecialFieldPrefix + "VariesByCulture";
         protected ILocalizationService LanguageService { get; }
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index e9f18d8947..1a288b423c 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.UmbracoExamine
         public static ContentIndexPopulator GetContentIndexRebuilder(PropertyEditorCollection propertyEditors, IContentService contentService, IScopeProvider scopeProvider, bool publishedValuesOnly)
         {
             var contentValueSetBuilder = GetContentValueSetBuilder(propertyEditors, scopeProvider, publishedValuesOnly);
-            var contentIndexDataSource = new ContentIndexPopulator(true, null, contentService, scopeProvider.SqlContext, contentValueSetBuilder);
+            var contentIndexDataSource = new ContentIndexPopulator(publishedValuesOnly, null, contentService, scopeProvider.SqlContext, contentValueSetBuilder);
             return contentIndexDataSource;
         }
 

From 22a7f94921ab5ebb9e8ba61fb68f78617925b929 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 22 Oct 2020 17:28:45 +1100
Subject: [PATCH 53/73] Merge branch 'temp_8879' of
 https://github.com/dawoe/Umbraco-CMS into v8/contrib

(cherry picked from commit 069529e9e25aec2be0131f3fb9710ca6328ec99d)
---
 src/Umbraco.Examine/ContentIndexPopulator.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Examine/ContentIndexPopulator.cs b/src/Umbraco.Examine/ContentIndexPopulator.cs
index 01a7046723..837c230313 100644
--- a/src/Umbraco.Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Examine/ContentIndexPopulator.cs
@@ -98,9 +98,13 @@ namespace Umbraco.Examine
 
                 if (content.Length > 0)
                 {
+                    var valueSets = _contentValueSetBuilder.GetValueSets(content).ToList();
+
                     // ReSharper disable once PossibleMultipleEnumeration
                     foreach (var index in indexes)
-                        index.IndexItems(_contentValueSetBuilder.GetValueSets(content));
+                    {
+                        index.IndexItems(valueSets);
+                    }
                 }
 
                 pageIndex++;
@@ -145,9 +149,11 @@ namespace Umbraco.Examine
                         }
                     }
 
+                    var valueSets = _contentValueSetBuilder.GetValueSets(indexableContent.ToArray()).ToList();
+
                     // ReSharper disable once PossibleMultipleEnumeration
                     foreach (var index in indexes)
-                        index.IndexItems(_contentValueSetBuilder.GetValueSets(indexableContent.ToArray()));
+                        index.IndexItems(valueSets);
                 }
 
                 pageIndex++;

From 843ea1d8540fa8c37850e43a8a35e5dd10cdef63 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 13:56:15 +0200
Subject: [PATCH 54/73] Bump version to 8.6.6

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 91765e57cf..687030ad13 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.6.5")]
-[assembly: AssemblyInformationalVersion("8.6.5")]
+[assembly: AssemblyFileVersion("8.6.6")]
+[assembly: AssemblyInformationalVersion("8.6.6")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5975ee52a1..e8c31f4665 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8650</DevelopmentServerPort>
+          <DevelopmentServerPort>8660</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8650</IISUrl>
+          <IISUrl>http://localhost:8660</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 3bb01e94184f04d736103dd12f1a7e22a718d1d1 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 14:10:19 +0200
Subject: [PATCH 55/73] Bump version to 8.7.1

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 5587979a6c..087e5a3a55 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.7.0")]
-[assembly: AssemblyInformationalVersion("8.7.0")]
+[assembly: AssemblyFileVersion("8.7.1")]
+[assembly: AssemblyInformationalVersion("8.7.1")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 577e735a76..eb3159fa43 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -346,9 +346,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8700</DevelopmentServerPort>
+          <DevelopmentServerPort>8710</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8700</IISUrl>
+          <IISUrl>http://localhost:8710</IISUrl>
           <DevelopmentServerPort>8660</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:8660</IISUrl>

From e368607a4dd5e4ac0662981225ad0d3ece692670 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 14:15:57 +0200
Subject: [PATCH 56/73] Bump version to 8.8.1

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 3f512bc65a..154bb31db1 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.8.0")]
-[assembly: AssemblyInformationalVersion("8.8.0")]
+[assembly: AssemblyFileVersion("8.8.1")]
+[assembly: AssemblyInformationalVersion("8.8.1")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 8b194f4481..baf4cd9673 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -346,9 +346,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8800</DevelopmentServerPort>
+          <DevelopmentServerPort>8810</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8800</IISUrl>
+          <IISUrl>http://localhost:8810</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 9202550537721ad924cc4f1712366762ee27138e Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Oct 2020 14:25:57 +0200
Subject: [PATCH 57/73] Remove unused usings

---
 src/Umbraco.Examine/ContentIndexPopulator.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Examine/ContentIndexPopulator.cs b/src/Umbraco.Examine/ContentIndexPopulator.cs
index 837c230313..3736ba1dae 100644
--- a/src/Umbraco.Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Examine/ContentIndexPopulator.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Examine;
-using Umbraco.Core;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.Blocks;
 using Umbraco.Core.Services;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
@@ -125,7 +123,7 @@ namespace Umbraco.Examine
                 content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _, _publishedQuery,
                     Ordering.By("Path", Direction.Ascending)).ToArray();
 
-                
+
                 if (content.Length > 0)
                 {
                     var indexableContent = new List<IContent>();

From 310c8ec92451f21fd5eed52cfa84c0b00f35c38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 22 Oct 2020 15:02:25 +0200
Subject: [PATCH 58/73] finish feature + clean up

---
 .../blockeditormodelobject.service.js         |  4 ---
 .../umbBlockListPropertyEditor.component.js   | 32 +++++++++----------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
index 57aaeaa42d..ac6bfb9135 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
@@ -783,12 +783,8 @@
              */
             createFromBlockData: function (blockData) {
 
-                console.log("createFromBlockData", blockData);
-
                 blockData = clipboardService.parseContentForPaste(blockData, clipboardService.TYPES.BLOCK);
 
-                console.log("createFromBlockData", blockData);
-
                 // As the blockData is a cloned object we can use its layout part for our layout entry.
                 var layoutEntry = blockData.layout;
                 if (layoutEntry === null) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index f22ecd8d97..d766808049 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -486,10 +486,11 @@
                         icon: entry.icon
                     }
                 }
-                if(Array.isArray(pasteEntry.data) === false) {
-                    pasteEntry.blockConfigModel = modelObject.getScaffoldFromAlias(entry.alias);
-                } else {
-                    pasteEntry.blockConfigModel = {};
+                if(Array.isArray(entry.data) === false) {
+                    var scaffold = modelObject.getScaffoldFromAlias(entry.alias);
+                    if(scaffold) {
+                        pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(scaffold.contentTypeKey);
+                    }
                 }
                 blockPickerModel.clipboardItems.push(pasteEntry);
             });
@@ -505,10 +506,8 @@
                         icon: entry.icon
                     }
                 }
-                if(Array.isArray(pasteEntry.data) === false) {
-                    pasteEntry.blockConfigModel = modelObject.getScaffoldFromAlias(entry.alias);
-                } else {
-                    pasteEntry.blockConfigModel = {};
+                if(Array.isArray(entry.data) === false) {
+                    pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(entry.data.data.contentTypeKey);
                 }
                 blockPickerModel.clipboardItems.push(pasteEntry);
             });
@@ -524,17 +523,19 @@
 
         var requestCopyAllBlocks = function() {
 
+            var aliases = [];
+
             var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(
                 (entry) => {
+
+                    aliases.push(entry.$block.content.contentTypeAlias);
+
                     // No need to clone the data as its begin handled by the clipboardService.
                     return {"layout": entry.$block.layout, "data": entry.$block.data, "settingsData":entry.$block.settingsData}
                 }
             );
 
-            // list aliases
-            var aliases = elementTypesToCopy.map(content => content.contentTypeAlias);
-
-            // remove dublicates
+            // remove dublicate aliases
             aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
 
             var contentNodeName = "?";
@@ -543,16 +544,14 @@
                 contentNodeName = vm.umbVariantContent.editor.content.name;
                 if(vm.umbVariantContentEditors) {
                     contentNodeIcon = vm.umbVariantContentEditors.content.icon.split(" ")[0];
+                } else if (vm.umbElementEditorContent) {
+                    contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
                 }
             } else if (vm.umbElementEditorContent) {
                 contentNodeName = vm.umbElementEditorContent.model.documentType.name;
                 contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
-                console.log(vm.umbElementEditorContent.model.documentType)
             }
 
-
-            console.log("check that we get the right contentNodeIcon", contentNodeIcon)
-
             localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, contentNodeName]).then(function(localizedLabel) {
                 clipboardService.copyArray(clipboardService.TYPES.BLOCK, aliases, elementTypesToCopy, localizedLabel, contentNodeIcon || "icon-thumbnail-list", vm.model.id);
             });
@@ -571,7 +570,6 @@
                 layoutEntry = modelObject.createFromElementType(pasteEntry);
             } else if (pasteType === clipboardService.TYPES.BLOCK) {
                 layoutEntry = modelObject.createFromBlockData(pasteEntry);
-                console.log("pasteEntry", pasteEntry)
             } else {
                 // Not a supported paste type.
                 return false;

From 99e2990d07e56b85c4cb313808f6ba685184321f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 22 Oct 2020 15:07:45 +0200
Subject: [PATCH 59/73] Emit event if localStorage changes from another tab

---
 .../src/common/services/clipboard.service.js               | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 6eb8503319..85d70b530c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -92,7 +92,7 @@ function clipboardService($window, notificationsService, eventsService, localSto
             // Store the string:
             localStorageService.set(STORAGE_KEY, storageString);
 
-            //eventsService.emit("clipboardService.storageUpdate");
+            eventsService.emit("clipboardService.storageUpdate");
 
             return true;
         } catch(e) {
@@ -454,12 +454,9 @@ function clipboardService($window, notificationsService, eventsService, localSto
 
 
 
-
-
+    // Fires if LocalStorage was changed from another tab than this one.
     $window.addEventListener("storage", localStorageChanged);
     function localStorageChanged() {
-        console.log("clipboardService.storageUpdate");
-        // TODO: Check if its the right value that was changed...
         eventsService.emit("clipboardService.storageUpdate");
     }
 

From 5b9e2dbad811b87239b60b1afc0eaea8662bc888 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 13 Oct 2020 15:36:39 +0200
Subject: [PATCH 60/73] Revert "umb-confirmation directive: move trashcan into
 directive and address accessibility issues (#8198)"

This reverts commit 1cd79d81af821470de2123e1c6febe2980d98111.

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html

(cherry picked from commit f9b49fc5f35dfd331388df76b24b91d6c11c9b2b)
(cherry picked from commit 22a1423324fe1cdb2795e1dd8eb2a66faa97de8b)
---
 .../components/umbconfirmaction.directive.js  | 32 ++++++--------
 .../less/components/umb-confirm-action.less   |  5 ---
 .../components/tags/umb-tags-editor.html      |  5 ++-
 .../views/components/umb-confirm-action.html  | 31 +++++---------
 .../views/components/umb-groups-builder.html  | 10 +++--
 .../src/views/propertyeditors/grid/grid.html  |  8 ++--
 .../listview/layouts.prevalues.html           | 42 ++++++++++---------
 .../multipletextbox/multipletextbox.html      |  9 ++--
 8 files changed, 64 insertions(+), 78 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
index 2f682205ad..1dcccda481 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
@@ -14,10 +14,10 @@ The prompt can be opened in four direction up, down, left or right.</p>
     <div ng-controller="My.Controller as vm">
 
         <div class="my-action" style="position:relative;">
+            <i class="icon-trash" ng-click="vm.showPrompt()"></i>
             <umb-confirm-action
-                show="vm.promptIsVisible"
+                ng-if="vm.promptIsVisible"
                 direction="left"
-                on-delete="vm.showPrompt()"
                 on-confirm="vm.confirmAction()"
                 on-cancel="vm.hidePrompt()">
             </umb-confirm-action>
@@ -71,23 +71,17 @@ The prompt can be opened in four direction up, down, left or right.</p>
 
     function link(scope, el, attr, ctrl) {
 
-        scope.clickButton = function (event) {
-            if(scope.onDelete) {
-                scope.onDelete({$event: event});
-            }
-        }
+      scope.clickConfirm = function() {
+          if(scope.onConfirm) {
+              scope.onConfirm();
+          }
+      };
 
-        scope.clickConfirm = function() {
-            if(scope.onConfirm) {
-                scope.onConfirm();
-            }
-        };
-
-        scope.clickCancel = function() {
-            if(scope.onCancel) {
-                scope.onCancel();
-            }
-        };
+      scope.clickCancel = function() {
+          if(scope.onCancel) {
+              scope.onCancel();
+          }
+      };
 
     }
 
@@ -97,8 +91,6 @@ The prompt can be opened in four direction up, down, left or right.</p>
       templateUrl: 'views/components/umb-confirm-action.html',
       scope: {
         direction: "@",
-        show: "<",
-        onDelete: "&?",
         onConfirm: "&",
         onCancel: "&"
       },
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
index a6548123ac..112194f012 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
@@ -1,8 +1,3 @@
-//WRAPPER 
-.umb_confirm-action {
-    display: inline-block;
-}
-
 // OVERLAY
 .umb_confirm-action__overlay {
     position: absolute;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
index cce613782e..6251d0eed1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
@@ -12,9 +12,10 @@
             <span ng-repeat="tag in vm.viewModel track by $index" class="label label-primary tag" ng-keyup="vm.onKeyUpOnTag(tag, $event)" tabindex="0">
                 <span ng-bind-html="tag"></span>
 
-                <umb-confirm-action show="vm.promptIsVisible === $index"
+                <i class="icon-trash" ng-click="vm.showPrompt($index, tag)" localize="title" title="@buttons_deleteTag"></i>
+
+                <umb-confirm-action ng-if="vm.promptIsVisible === $index"
                                     direction="left"
-                                    on-delete="vm.showPrompt($index, tag)"
                                     on-confirm="vm.removeTag(tag)"
                                     on-cancel="vm.hidePrompt()">
                 </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
index 39864c26fd..1b88c9f988 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
@@ -1,31 +1,22 @@
-<div class="umb_confirm-action">
-    <button ng-if="onDelete" type="button" class="btn-icon" ng-click="clickButton($event)" localize="title" title="@general_delete">
-        <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
-        <span class="sr-only">
-            <localize key="general_delete">Delete</localize>
-        </span>
-    </button>
+<div class="umb_confirm-action__overlay"
+     ng-class="{
+     '-top': direction === 'top',
+     '-right': direction === 'right',
+     '-bottom': direction === 'bottom',
+     '-left': direction === 'left'}"
+     on-outside-click="clickCancel()">
 
-     <div class="umb_confirm-action__overlay"
-        ng-class="{
-        '-top': direction === 'top',
-        '-right': direction === 'right',
-        '-bottom': direction === 'bottom',
-        '-left': direction === 'left'}"
-        on-outside-click="clickCancel()" ng-if="show">
-
-        <button type="button" class="btn-reset umb_confirm-action__overlay-action -confirm" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm">
-            <umb-icon icon="icon-check" class="icon-check"></umb-icon>
+        <button class="umb_confirm-action__overlay-action -confirm btn-reset" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm" type="button">
+            <i class="icon-check" aria-hidden="true"></i>
             <span class="sr-only">
                 <localize key="buttons_confirmActionConfirm">Confirm</localize>
             </span>
         </button>
 
-        <button type="button" class="btn-reset umb_confirm-action__overlay-action -cancel" ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel">
-            <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
+        <button class="umb_confirm-action__overlay-action -cancel btn-reset"  ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel" type="button">
+            <i class="icon-delete" aria-hidden="true"></i>
             <span class="sr-only">
                 <localize key="buttons_confirmActionCancel">Cancel</localize>
             </span>
         </button>
-    </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index d722fba7be..2fdef77928 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -101,10 +101,10 @@
                     </ng-form>
 
                     <div class="umb-group-builder__group-remove" ng-if="!sortingMode && canRemoveGroup(tab)">
+                        <i class="icon-trash" ng-click="togglePrompt(tab)"></i>
                         <umb-confirm-action
-                            show="tab.deletePrompt"
+                            ng-if="tab.deletePrompt"
                             direction="left"
-                            on-delete="togglePrompt(tab)"
                             on-confirm="removeGroup($index)"
                             on-cancel="hidePrompt(tab)">
                         </umb-confirm-action>
@@ -266,10 +266,12 @@
 
                                     <!-- delete property -->
                                     <div ng-if="!property.locked" class="umb-group-builder__property-action">
+                                        <button aria-label="Delete property" class="btn-icon" ng-click="togglePrompt(property)">
+                                            <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
+                                        </button>
                                         <umb-confirm-action
-                                            show="property.deletePrompt"
+                                            ng-if="property.deletePrompt"
                                             direction="left"
-                                            on-delete="togglePrompt(property)"
                                             on-confirm="deleteProperty(tab, $index)"
                                             on-cancel="hidePrompt(property)">
                                         </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 56e8811133..0ef24157fe 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -95,10 +95,10 @@
                                    </div>
 
                                     <div class="cell-tools-remove row-tool">
+                                        <button class="icon-trash btn-reset" ng-click="togglePrompt(row)" type="button"></button>
                                         <umb-confirm-action
-                                            show="row.deletePrompt"
+                                            ng-if="row.deletePrompt"
                                             direction="left"
-                                            on-delete="togglePrompt(row)"
                                             on-confirm="removeRow(section, $index)"
                                             on-cancel="hidePrompt(row)">
                                         </umb-confirm-action>
@@ -209,9 +209,9 @@
                                                                           </div>
 
                                                                           <div class="umb-control-tool">
-                                                                              <umb-confirm-action show="control.deletePrompt"
+                                                                              <button class="umb-control-tool-icon icon-trash btn-reset" ng-click="togglePrompt(control)" type="button"></button>
+                                                                              <umb-confirm-action ng-if="control.deletePrompt"
                                                                                                   direction="left"
-                                                                                                  on-delete="togglePrompt(control)"
                                                                                                   on-confirm="removeControl(area, $index)"
                                                                                                   on-cancel="hidePrompt(control)">
                                                                               </umb-confirm-action>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
index c33c3e840e..4527458d16 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
@@ -2,9 +2,9 @@
 
    <div class="list-view-layouts-container">
 
-   <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
+       <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
 
-      <div class="list-view-layout" ng-repeat="layout in model.value">
+           <div class="list-view-layout" ng-repeat="layout in model.value">
 
                <i class="icon-navigation list-view-layout__sort-handle" aria-hidden="true" aria-label="Sort"></i>
 
@@ -14,43 +14,45 @@
                        <span class="list-view-layout__icon">
                            <i class="{{layout.icon}}" aria-hidden="true"></i>
                        </span>
-            </button>
+                   </button>
 
-            <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
+                   <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
                        <i class="{{layout.icon}}" aria-hidden="true"></i>
-            </div>
+                   </div>
 
-         </div>
+               </div>
 
-         <div class="list-view-layout__name">
-            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
-                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{ layout.name }}</span>
-            <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
-         </div>
+               <div class="list-view-layout__name">
+                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{layout.name}}</span>
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
+               </div>
 
-         <div class="list-view-layout__path">
-            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
-         </div>
+               <div class="list-view-layout__path">
+                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
+               </div>
 
-         <div>
+               <div>
                    <umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>
 
                    <div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
-                       <umb-confirm-action show="layout.deletePrompt"
+                       <button type="button" class="btn-icon" ng-click="vm.showPrompt(layout)" aria-label="Remove">
+                           <i class="icon-trash" aria-hidden="true"></i>
+                       </button>
+                       <umb-confirm-action ng-if="layout.deletePrompt"
                                            direction="left"
-                                           on-delete="vm.showPrompt(layout)"
                                            on-confirm="vm.removeLayout($index, layout)"
                                            on-cancel="vm.hidePrompt(layout)">
                        </umb-confirm-action>
                    </div>
-         </div>
+               </div>
 
-      </div>
+           </div>
 
        </div>
 
       <button type="button" class="list-view-add-layout mt2" ng-click="vm.addLayout()">Add layout</button>
 
-    </div>
+   </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index 6a9826ac3c..d1c202b867 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -10,12 +10,15 @@
 
           <div class="icon-wrapper">
               <i class="icon icon-navigation handle" aria-hidden="true" localize="title" title="@general_move"></i>
-
+  
               <div class="umb-multiple-textbox__confirm" ng-show="model.value.length > model.config.min">
+                  <button type="button" class="umb-multiple-textbox__confirm-action" ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
+                      <i class="icon-trash" aria-hidden="true"></i>
+                  </button>
+  
                   <umb-confirm-action
-                      show="promptIsVisible === $index"
+                      ng-if="promptIsVisible === $index"
                       direction="left"
-                      on-delete="showPrompt($index, item)"
                       on-confirm="remove($index)"
                       on-cancel="hidePrompt()">
                   </umb-confirm-action>

From 2d931877bebef333928d9423e59f1822f0524ae8 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 23 Oct 2020 14:41:09 +0200
Subject: [PATCH 61/73] Bump version to 8.8.1

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 3f512bc65a..154bb31db1 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.8.0")]
-[assembly: AssemblyInformationalVersion("8.8.0")]
+[assembly: AssemblyFileVersion("8.8.1")]
+[assembly: AssemblyInformationalVersion("8.8.1")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 8b194f4481..baf4cd9673 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -346,9 +346,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8800</DevelopmentServerPort>
+          <DevelopmentServerPort>8810</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8800</IISUrl>
+          <IISUrl>http://localhost:8810</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From cb902c4e08487d8eb8157cde749d36117ef8665a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Fri, 23 Oct 2020 15:08:27 +0200
Subject: [PATCH 62/73] Fail if settings elementType isnt supported + concept
 for inner-blocks + debounce for storage update

---
 .../blockeditormodelobject.service.js         | 22 ++++++++++++++++++-
 .../src/common/services/clipboard.service.js  | 20 +++++++++++++----
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
index ac6bfb9135..dbbaac95db 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
@@ -791,7 +791,15 @@
                     return null;
                 }
 
+                var blockConfiguration;
+
                 if (blockData.data) {
+                    // Ensure that we support the alias:
+                    blockConfiguration = this.getBlockConfiguration(blockData.data.contentTypeKey);
+                    if(blockConfiguration === null) {
+                        return null;
+                    }
+
                     this.value.contentData.push(blockData.data);
                 } else {
                     // We do not have data, this cannot be succesful paste.
@@ -799,7 +807,19 @@
                 }
 
                 if (blockData.settingsData) {
-                    this.value.settingsData.push(blockData.settingsData);
+                    // Ensure that we support the alias:
+                    if(blockConfiguration.settingsElementTypeKey) {
+                        // If we have settings for this Block Configuration, we need to check that they align, if we dont we do not want to fail.
+                        if(blockConfiguration.settingsElementTypeKey === blockData.settingsData.contentTypeKey) {
+                            this.value.settingsData.push(blockData.settingsData);
+                        } else {
+                            // Settings ElementType does not align, so we will fail.
+                            return null;
+                        }
+                    } else {
+                        // We do not have settings currently, so lets get rid of the settings part and move on with the paste.
+                        delete layoutEntry.settingUdi;
+                    }
                 }
 
                 return layoutEntry;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 85d70b530c..0da1867cbd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -52,6 +52,18 @@ function clipboardService($window, notificationsService, eventsService, localSto
                 propMethod(block.settingsData[key], TYPES.RAW);
             });
         }
+
+        /*
+        // Concept for supporting Block that contains other Blocks.
+        // Missing clearifications:
+        // How do we ensure that the inner blocks of a block is supported in the new scenario. Not that likely but still relevant, so conciderations should be made.
+        if(block.references) {
+            // A Block clipboard entry can contain other Block Clipboard Entries, here we will make sure to resolve those identical to the main entry.
+            for (var r = 0; r < block.references.length; r++) {
+                clipboardTypeResolvers[TYPES.BLOCK](block.references[r], propMethod);
+            }
+        }
+        */
     }
     clipboardTypeResolvers[TYPES.RAW] = function(data, propMethod) {
         for (var p = 0; p < data.length; p++) {
@@ -453,12 +465,12 @@ function clipboardService($window, notificationsService, eventsService, localSto
     };
 
 
+    var emitClipboardStorageUpdate = _.debounce(function(e) {
+        eventsService.emit("clipboardService.storageUpdate");
+    }, 1000);
 
     // Fires if LocalStorage was changed from another tab than this one.
-    $window.addEventListener("storage", localStorageChanged);
-    function localStorageChanged() {
-        eventsService.emit("clipboardService.storageUpdate");
-    }
+    $window.addEventListener("storage", emitClipboardStorageUpdate);
 
 
 

From b63944b9ef6bf2f0189a12683d3eaae481db1f02 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 13 Oct 2020 15:36:39 +0200
Subject: [PATCH 63/73] Revert "Adds icons from App_Plugins/**/Icons/*.svg
 (#8884)"

This reverts commit d7bf980f121995fd62aa38c4efce71c1deda209e.
---
 src/Umbraco.Core/Services/IIconService.cs |  4 +-
 src/Umbraco.Web/Services/IconService.cs   | 63 +++++------------------
 2 files changed, 14 insertions(+), 53 deletions(-)

diff --git a/src/Umbraco.Core/Services/IIconService.cs b/src/Umbraco.Core/Services/IIconService.cs
index 72174a0504..963edb22a5 100644
--- a/src/Umbraco.Core/Services/IIconService.cs
+++ b/src/Umbraco.Core/Services/IIconService.cs
@@ -9,13 +9,13 @@ namespace Umbraco.Core.Services
         /// Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
         /// </summary>
         /// <param name="iconName"></param>
-        /// <returns><see cref="IconModel"/></returns>
+        /// <returns></returns>
         IconModel GetIcon(string iconName);
 
         /// <summary>
         /// Gets a list of all svg icons found at at the global icons path.
         /// </summary>
-        /// <returns>A list of <see cref="IconModel"/></returns>
+        /// <returns></returns>
         IList<IconModel> GetAllIcons();
     }
 }
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index ba6692c7b9..206af296f9 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -19,11 +19,13 @@ namespace Umbraco.Web.Services
             _globalSettings = globalSettings;
         }
 
+
         /// <inheritdoc />
         public IList<IconModel> GetAllIcons()
         {
             var icons = new List<IconModel>();
-            var iconNames = GetAllIconNames();
+            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
+            var iconNames = directory.GetFiles("*.svg");
 
             iconNames.OrderBy(f => f.Name).ToList().ForEach(iconInfo =>
             {
@@ -43,56 +45,36 @@ namespace Umbraco.Web.Services
         {
             return string.IsNullOrWhiteSpace(iconName)
                 ? null
-                : CreateIconModel(iconName.StripFileExtension());
+                : CreateIconModel(iconName.StripFileExtension(), IOHelper.MapPath($"{_globalSettings.IconsPath}/{iconName}.svg"));
         }
 
         /// <summary>
         /// Gets an IconModel using values from a FileInfo model
         /// </summary>
         /// <param name="fileInfo"></param>
-        /// <returns><see cref="IconModel"/></returns>
-        private IconModel GetIcon(FileSystemInfo fileInfo)
+        /// <returns></returns>
+        private IconModel GetIcon(FileInfo fileInfo)
         {
             return fileInfo == null || string.IsNullOrWhiteSpace(fileInfo.Name)
                 ? null
                 : CreateIconModel(fileInfo.Name.StripFileExtension(), fileInfo.FullName);
         }
 
-        /// <summary>
-        /// Gets an IconModel containing the icon name and SvgString
-        /// </summary>
-        /// <param name="iconName"></param>
-        /// <returns><see cref="IconModel"/></returns>
-        private IconModel CreateIconModel(string iconName)
-        {
-            if (string.IsNullOrWhiteSpace(iconName))
-                return null;
-
-            var iconNames = GetAllIconNames();
-            var iconPath = iconNames.FirstOrDefault(x => x.Name.InvariantEquals($"{iconName}.svg"))?.FullName;
-            return iconPath == null
-                ? null
-                : CreateIconModel(iconName, iconPath);
-        }
-
         /// <summary>
         /// Gets an IconModel containing the icon name and SvgString
         /// </summary>
         /// <param name="iconName"></param>
         /// <param name="iconPath"></param>
-        /// <returns><see cref="IconModel"/></returns>
-        private static IconModel CreateIconModel(string iconName, string iconPath)
+        /// <returns></returns>
+        private IconModel CreateIconModel(string iconName, string iconPath)
         {
-            if (string.IsNullOrWhiteSpace(iconPath))
-                return null;
+            var sanitizer = new HtmlSanitizer();
+            sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
+            sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
+            sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
 
             try
             {
-                var sanitizer = new HtmlSanitizer();
-                sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
-                sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
-                sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
-
                 var svgContent = System.IO.File.ReadAllText(iconPath);
                 var sanitizedString = sanitizer.Sanitize(svgContent);
 
@@ -109,26 +91,5 @@ namespace Umbraco.Web.Services
                 return null;
             }
         }
-
-        private IEnumerable<FileInfo> GetAllIconNames()
-        {
-            // add icons from plugins
-            var appPlugins = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.AppPlugins));
-            var pluginIcons = appPlugins.Exists == false
-                ? new List<FileInfo>()
-                : appPlugins.GetDirectories()
-                    // Find all directories in App_Plugins that are named "Icons" and get a list of SVGs from them
-                    .SelectMany(x => x.GetDirectories("Icons", SearchOption.AllDirectories))
-                    .SelectMany(x => x.GetFiles("*.svg", SearchOption.TopDirectoryOnly));
-
-            // add icons from IconsPath if not already added from plugins
-            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
-            var iconNames = directory.GetFiles("*.svg")
-                .Where(x => pluginIcons.Any(i => i.Name == x.Name) == false);
-
-            iconNames = iconNames.Concat(pluginIcons).ToList();
-
-            return iconNames;
-        }
     }
 }

From 016f883ee39715c5a0318cdaea5f4cb66172925e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 2 Nov 2020 13:29:27 +0000
Subject: [PATCH 64/73] Update
 src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js

---
 .../src/common/services/clipboard.service.js                   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 0da1867cbd..862f58507d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -55,7 +55,7 @@ function clipboardService($window, notificationsService, eventsService, localSto
 
         /*
         // Concept for supporting Block that contains other Blocks.
-        // Missing clearifications:
+        // Missing clarifications:
         // How do we ensure that the inner blocks of a block is supported in the new scenario. Not that likely but still relevant, so conciderations should be made.
         if(block.references) {
             // A Block clipboard entry can contain other Block Clipboard Entries, here we will make sure to resolve those identical to the main entry.
@@ -479,4 +479,3 @@ function clipboardService($window, notificationsService, eventsService, localSto
 
 
 angular.module("umbraco.services").factory("clipboardService", clipboardService);
-

From 99441789d80268a1e91c341d7aa63408b272e8d5 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 2 Nov 2020 13:30:02 +0000
Subject: [PATCH 65/73] Update
 src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js

---
 .../src/common/services/clipboard.service.js                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 862f58507d..83fd3d08c2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -56,7 +56,7 @@ function clipboardService($window, notificationsService, eventsService, localSto
         /*
         // Concept for supporting Block that contains other Blocks.
         // Missing clarifications:
-        // How do we ensure that the inner blocks of a block is supported in the new scenario. Not that likely but still relevant, so conciderations should be made.
+        // How do we ensure that the inner blocks of a block is supported in the new scenario. Not that likely but still relevant, so considerations should be made.
         if(block.references) {
             // A Block clipboard entry can contain other Block Clipboard Entries, here we will make sure to resolve those identical to the main entry.
             for (var r = 0; r < block.references.length; r++) {

From 3a41861aa0c04475c40b00964b7df9a6c77a5709 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 2 Nov 2020 13:34:34 +0000
Subject: [PATCH 66/73] Update
 src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js

---
 .../blocklist/umbBlockListPropertyEditor.component.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index d766808049..fb0018d099 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -535,7 +535,7 @@
                 }
             );
 
-            // remove dublicate aliases
+            // remove duplicate aliases
             aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
 
             var contentNodeName = "?";

From 9c820c7939c7b9f87245affce9f499df736c6b4f Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 2 Nov 2020 13:37:27 +0000
Subject: [PATCH 67/73] Update
 src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js

---
 .../src/common/services/blockeditormodelobject.service.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
index dbbaac95db..decd5cbad5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
@@ -776,7 +776,7 @@
             },
             /**
              * @ngdoc method
-             * @name createFromRawData
+             * @name createFromBlockData
              * @methodOf umbraco.services.blockEditorModelObject
              * @description Insert data from raw models
              * @return {Object | null} Layout entry object, to be inserted at a decired location in the layout object. Or ´null´ if the given ElementType isnt supported by the block configuration.

From 223b19cbd81b1dd9dce9be757d1b96f261e9b48b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 2 Nov 2020 18:43:35 +0100
Subject: [PATCH 68/73] Fix for
 https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language
 and segment into account

---
 .../Repositories/Implement/ContentRepositoryBase.cs    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 77d114abe1..a7b23d95cb 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -1010,6 +1010,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// <param name="publishedVersionId"></param>
         /// <param name="edited"></param>
         /// <param name="editedCultures"></param>
+
         protected void ReplacePropertyValues(TEntity entity, int versionId, int publishedVersionId, out bool edited, out HashSet<string> editedCultures)
         {
             // Replace the property data.
@@ -1018,18 +1019,20 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             var propDataSql = SqlContext.Sql().Select("*").From<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == versionId).ForUpdate();
             var existingPropData = Database.Fetch<PropertyDataDto>(propDataSql);
-            var propertyTypeToPropertyData = new Dictionary<(int propertyTypeId, int versionId), PropertyDataDto>();
+            var propertyTypeToPropertyData = new Dictionary<(int propertyTypeId, int versionId, int? languageId, string segment), PropertyDataDto>();
             var existingPropDataIds = new List<int>();
             foreach (var p in existingPropData)
             {
                 existingPropDataIds.Add(p.Id);
-                propertyTypeToPropertyData[(p.PropertyTypeId, p.VersionId)] = p;
+                propertyTypeToPropertyData[(p.PropertyTypeId, p.VersionId, p.LanguageId, p.Segment)] = p;
             }
             var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishedVersionId, entity.Properties, LanguageRepository, out edited, out editedCultures);
+
             foreach (var propertyDataDto in propertyDataDtos)
             {
+
                 // Check if this already exists and update, else insert a new one
-                if (propertyTypeToPropertyData.TryGetValue((propertyDataDto.PropertyTypeId, propertyDataDto.VersionId), out var propData))
+                if (propertyTypeToPropertyData.TryGetValue((propertyDataDto.PropertyTypeId, propertyDataDto.VersionId, propertyDataDto.LanguageId, propertyDataDto.Segment), out var propData))
                 {
                     propertyDataDto.Id = propData.Id;
                     Database.Update(propertyDataDto);
@@ -1049,6 +1052,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             {
                 Database.Execute(SqlContext.Sql().Delete<PropertyDataDto>().WhereIn<PropertyDataDto>(x => x.Id, existingPropDataIds));
             }
+
         }
 
         private class NodeIdKey

From 9cda7d1b5ae377c8641eea95cb07a6abe163863d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 2 Nov 2020 18:43:35 +0100
Subject: [PATCH 69/73] Fix for
 https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language
 and segment into account

(cherry picked from commit 223b19cbd81b1dd9dce9be757d1b96f261e9b48b)
---
 .../Repositories/Implement/ContentRepositoryBase.cs    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 2ea4914aaa..05df4efb4e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -893,6 +893,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// <param name="publishedVersionId"></param>
         /// <param name="edited"></param>
         /// <param name="editedCultures"></param>
+
         protected void ReplacePropertyValues(TEntity entity, int versionId, int publishedVersionId, out bool edited, out HashSet<string> editedCultures)
         {
             // Replace the property data.
@@ -901,18 +902,20 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             var propDataSql = SqlContext.Sql().Select("*").From<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == versionId).ForUpdate();
             var existingPropData = Database.Fetch<PropertyDataDto>(propDataSql);
-            var propertyTypeToPropertyData = new Dictionary<(int propertyTypeId, int versionId), PropertyDataDto>();
+            var propertyTypeToPropertyData = new Dictionary<(int propertyTypeId, int versionId, int? languageId, string segment), PropertyDataDto>();
             var existingPropDataIds = new List<int>();
             foreach (var p in existingPropData)
             {
                 existingPropDataIds.Add(p.Id);
-                propertyTypeToPropertyData[(p.PropertyTypeId, p.VersionId)] = p;
+                propertyTypeToPropertyData[(p.PropertyTypeId, p.VersionId, p.LanguageId, p.Segment)] = p;
             }
             var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishedVersionId, entity.Properties, LanguageRepository, out edited, out editedCultures);
+
             foreach (var propertyDataDto in propertyDataDtos)
             {
+
                 // Check if this already exists and update, else insert a new one
-                if (propertyTypeToPropertyData.TryGetValue((propertyDataDto.PropertyTypeId, propertyDataDto.VersionId), out var propData))
+                if (propertyTypeToPropertyData.TryGetValue((propertyDataDto.PropertyTypeId, propertyDataDto.VersionId, propertyDataDto.LanguageId, propertyDataDto.Segment), out var propData))
                 {
                     propertyDataDto.Id = propData.Id;
                     Database.Update(propertyDataDto);
@@ -932,6 +935,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             {
                 Database.Execute(SqlContext.Sql().Delete<PropertyDataDto>().WhereIn<PropertyDataDto>(x => x.Id, existingPropDataIds));
             }
+
         }
 
         private class NodeIdKey

From 67367fe111720063ca7a7a95bc1a3645bb2bc29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Tue, 3 Nov 2020 13:38:54 +0100
Subject: [PATCH 70/73] display an error message if settings does not align.

---
 .../src/common/services/blockeditormodelobject.service.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
index decd5cbad5..8a2b230a27 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
@@ -13,7 +13,7 @@
 (function () {
     'use strict';
 
-    function blockEditorModelObjectFactory($interpolate, $q, udiService, contentResource, localizationService, umbRequestHelper, clipboardService) {
+    function blockEditorModelObjectFactory($interpolate, $q, udiService, contentResource, localizationService, umbRequestHelper, clipboardService, notificationsService) {
 
         /**
          * Simple mapping from property model content entry to editing model,
@@ -813,7 +813,7 @@
                         if(blockConfiguration.settingsElementTypeKey === blockData.settingsData.contentTypeKey) {
                             this.value.settingsData.push(blockData.settingsData);
                         } else {
-                            // Settings ElementType does not align, so we will fail.
+                            notificationsService.error("Clipboard", "Couldn't paste because settings-data is not compatible.");
                             return null;
                         }
                     } else {

From 54ad4c248155aa0f17cdb41f1b8b1bab90c09afa Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 4 Nov 2020 11:19:32 +0100
Subject: [PATCH 71/73] Bump version to 8.8.2

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 154bb31db1..9ea8419e15 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.8.1")]
-[assembly: AssemblyInformationalVersion("8.8.1")]
+[assembly: AssemblyFileVersion("8.8.2")]
+[assembly: AssemblyInformationalVersion("8.8.2")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index baf4cd9673..5ff224f449 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -346,9 +346,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8810</DevelopmentServerPort>
+          <DevelopmentServerPort>8820</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8810</IISUrl>
+          <IISUrl>http://localhost:8820</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 466f59c8d4fd376291e264bc02c1c453b3feed35 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 4 Nov 2020 11:21:50 +0100
Subject: [PATCH 72/73] Bump version to 8.9.1

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 082414399c..1c59137aac 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.9.0")]
-[assembly: AssemblyInformationalVersion("8.9.0")]
+[assembly: AssemblyFileVersion("8.9.1")]
+[assembly: AssemblyInformationalVersion("8.9.1")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5f99e7f9bf..8ea1fd87b7 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -346,12 +346,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8900</DevelopmentServerPort>
+          <DevelopmentServerPort>8910</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8900</IISUrl>
-          <DevelopmentServerPort>8820</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8820</IISUrl>
+          <IISUrl>http://localhost:8910</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 0608862da9119a3bf9a95663325cf3d562681263 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 4 Nov 2020 11:25:45 +0100
Subject: [PATCH 73/73] Revert "Adds icons from App_Plugins/**/Icons/*.svg
 (#8884)"

This reverts commit d7bf980f121995fd62aa38c4efce71c1deda209e.
---
 src/Umbraco.Core/Services/IIconService.cs |  4 +-
 src/Umbraco.Web/Services/IconService.cs   | 63 +++++------------------
 2 files changed, 14 insertions(+), 53 deletions(-)

diff --git a/src/Umbraco.Core/Services/IIconService.cs b/src/Umbraco.Core/Services/IIconService.cs
index 72174a0504..963edb22a5 100644
--- a/src/Umbraco.Core/Services/IIconService.cs
+++ b/src/Umbraco.Core/Services/IIconService.cs
@@ -9,13 +9,13 @@ namespace Umbraco.Core.Services
         /// Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
         /// </summary>
         /// <param name="iconName"></param>
-        /// <returns><see cref="IconModel"/></returns>
+        /// <returns></returns>
         IconModel GetIcon(string iconName);
 
         /// <summary>
         /// Gets a list of all svg icons found at at the global icons path.
         /// </summary>
-        /// <returns>A list of <see cref="IconModel"/></returns>
+        /// <returns></returns>
         IList<IconModel> GetAllIcons();
     }
 }
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index ba6692c7b9..206af296f9 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -19,11 +19,13 @@ namespace Umbraco.Web.Services
             _globalSettings = globalSettings;
         }
 
+
         /// <inheritdoc />
         public IList<IconModel> GetAllIcons()
         {
             var icons = new List<IconModel>();
-            var iconNames = GetAllIconNames();
+            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
+            var iconNames = directory.GetFiles("*.svg");
 
             iconNames.OrderBy(f => f.Name).ToList().ForEach(iconInfo =>
             {
@@ -43,56 +45,36 @@ namespace Umbraco.Web.Services
         {
             return string.IsNullOrWhiteSpace(iconName)
                 ? null
-                : CreateIconModel(iconName.StripFileExtension());
+                : CreateIconModel(iconName.StripFileExtension(), IOHelper.MapPath($"{_globalSettings.IconsPath}/{iconName}.svg"));
         }
 
         /// <summary>
         /// Gets an IconModel using values from a FileInfo model
         /// </summary>
         /// <param name="fileInfo"></param>
-        /// <returns><see cref="IconModel"/></returns>
-        private IconModel GetIcon(FileSystemInfo fileInfo)
+        /// <returns></returns>
+        private IconModel GetIcon(FileInfo fileInfo)
         {
             return fileInfo == null || string.IsNullOrWhiteSpace(fileInfo.Name)
                 ? null
                 : CreateIconModel(fileInfo.Name.StripFileExtension(), fileInfo.FullName);
         }
 
-        /// <summary>
-        /// Gets an IconModel containing the icon name and SvgString
-        /// </summary>
-        /// <param name="iconName"></param>
-        /// <returns><see cref="IconModel"/></returns>
-        private IconModel CreateIconModel(string iconName)
-        {
-            if (string.IsNullOrWhiteSpace(iconName))
-                return null;
-
-            var iconNames = GetAllIconNames();
-            var iconPath = iconNames.FirstOrDefault(x => x.Name.InvariantEquals($"{iconName}.svg"))?.FullName;
-            return iconPath == null
-                ? null
-                : CreateIconModel(iconName, iconPath);
-        }
-
         /// <summary>
         /// Gets an IconModel containing the icon name and SvgString
         /// </summary>
         /// <param name="iconName"></param>
         /// <param name="iconPath"></param>
-        /// <returns><see cref="IconModel"/></returns>
-        private static IconModel CreateIconModel(string iconName, string iconPath)
+        /// <returns></returns>
+        private IconModel CreateIconModel(string iconName, string iconPath)
         {
-            if (string.IsNullOrWhiteSpace(iconPath))
-                return null;
+            var sanitizer = new HtmlSanitizer();
+            sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
+            sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
+            sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
 
             try
             {
-                var sanitizer = new HtmlSanitizer();
-                sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
-                sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
-                sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
-
                 var svgContent = System.IO.File.ReadAllText(iconPath);
                 var sanitizedString = sanitizer.Sanitize(svgContent);
 
@@ -109,26 +91,5 @@ namespace Umbraco.Web.Services
                 return null;
             }
         }
-
-        private IEnumerable<FileInfo> GetAllIconNames()
-        {
-            // add icons from plugins
-            var appPlugins = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.AppPlugins));
-            var pluginIcons = appPlugins.Exists == false
-                ? new List<FileInfo>()
-                : appPlugins.GetDirectories()
-                    // Find all directories in App_Plugins that are named "Icons" and get a list of SVGs from them
-                    .SelectMany(x => x.GetDirectories("Icons", SearchOption.AllDirectories))
-                    .SelectMany(x => x.GetFiles("*.svg", SearchOption.TopDirectoryOnly));
-
-            // add icons from IconsPath if not already added from plugins
-            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
-            var iconNames = directory.GetFiles("*.svg")
-                .Where(x => pluginIcons.Any(i => i.Name == x.Name) == false);
-
-            iconNames = iconNames.Concat(pluginIcons).ToList();
-
-            return iconNames;
-        }
     }
 }