From d3b97ae23ceda5118e64b279a81771b1290988d0 Mon Sep 17 00:00:00 2001 From: Emma Garland Date: Fri, 10 Jul 2020 16:33:45 +0100 Subject: [PATCH 001/197] Tour Data progress is not in a cookie - it is stored in the database (what the User has completed so far) in a column in the umbracoUser table. Since we want to act like the tour has not been run before, at the start and end of each test we need to clean up by resetting the tour data so that the default user in the database hasn't already completed the tour. I used the similar command style from the umbraco-cypress-testhelpers project - we may want to move this out of the test itself, but I wanted to make sure this approach was right first. --- .../integration/Tour/backofficeTour.ts | 118 +++++++++++++----- 1 file changed, 84 insertions(+), 34 deletions(-) diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts index ed891a2eea..e3928e3c32 100644 --- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts +++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts @@ -1,49 +1,99 @@ /// + context('Backoffice Tour', () => { beforeEach(() => { + //arrange cy.umbracoLogin(Cypress.env('username'), Cypress.env('password')); + resetTourData(); }); it('Backoffice introduction tour should run', () => { - //arrange - cy.umbracoGlobalHelp().should("be.visible"); - //act - cy.umbracoGlobalHelp().click() + cy.umbracoGlobalHelp().should("be.visible"); + cy.umbracoGlobalHelp().click(); + runBackOfficeIntroTour(0, 'Start'); + //assert cy.get('[data-element="help-tours"]').should("be.visible"); - //act cy.get('[data-element="help-tours"]').click(); - //assert - cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').should("be.visible"); + cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: 60000 }).contains('17%'); + }); + + it('Backoffice introduction tour should run then rerun', () => { //act - cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').click(); - //assert - cy.get('.umb-tour-step', { timeout: 60000 }).should('be.visible'); - cy.get('.umb-tour-step__footer').should('be.visible'); - cy.get('.umb-tour-step__counter').should('be.visible'); - - for(let i=1;i<7;i++){ - cy.get('.umb-tour-step__counter').contains(i + '/12'); - cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click(); - } - cy.umbracoGlobalUser().click() - cy.get('.umb-tour-step__counter').contains('8/12'); - cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click(); - cy.get('.umb-tour-step__counter').contains('9/12'); - cy.get('.umb-overlay-drawer__align-right .umb-button').should('be.visible').click(); - cy.get('.umb-tour-step__counter').contains('10/12'); - cy.umbracoGlobalHelp().click() - - for(let i=11;i<13;i++){ - cy.get('.umb-tour-step__counter').contains(i + '/12'); - cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click(); - } - cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click(); - - //assert cy.umbracoGlobalHelp().should("be.visible"); - cy.get('[data-element="help-tours"] .umb-progress-circle').contains('17%'); - }); + cy.umbracoGlobalHelp().click(); + runBackOfficeIntroTour(0, 'Start'); + runBackOfficeIntroTour(17, 'Rerun'); + + //assert + 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: 60000 }).contains('17%'); + cy.umbracoGlobalHelp().should("be.visible"); + }); }); + +afterEach(() => { + //cleanup + resetTourData(); +}); + +function resetTourData() { + var tourStatus = + { + "alias": "umbIntroIntroduction", + "completed": false, + "disabled": false + }; + + cy.getCookie('UMB-XSRF-TOKEN', { log: false }).then((token) => { + cy.request({ + method: 'POST', + url: '/umbraco/backoffice/UmbracoApi/CurrentUser/PostSetUserTour', + followRedirect: false, + headers: { + ContentType: 'application/json', + 'X-UMB-XSRF-TOKEN': token.value, + }, + body: tourStatus, + }).then((resp) => { + return; + }); + }) +} + +function runBackOfficeIntroTour(percentageComplete, buttonText) { + 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: 60000 }).contains(percentageComplete + '%'); + 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); + cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').click(); + //act + cy.get('.umb-tour-step', { timeout: 60000 }).should('be.visible'); + cy.get('.umb-tour-step__footer').should('be.visible'); + cy.get('.umb-tour-step__counter').should('be.visible'); + + for (let i = 1; i < 7; i++) { + cy.get('.umb-tour-step__counter').contains(i + '/12'); + cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click(); + } + cy.umbracoGlobalUser().click() + cy.get('.umb-tour-step__counter', { timeout: 10000 }).contains('8/12'); + cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click(); + cy.get('.umb-tour-step__counter', { timeout: 10000 }).contains('9/12'); + cy.get('.umb-overlay-drawer__align-right .umb-button').should('be.visible').click(); + cy.get('.umb-tour-step__counter', { timeout: 10000 }).contains('10/12'); + cy.umbracoGlobalHelp().click() + + for (let i = 11; i < 13; i++) { + cy.get('.umb-tour-step__counter', { timeout: 10000 }).contains(i + '/12'); + cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click(); + } + cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click(); + + cy.umbracoGlobalHelp().should("be.visible"); +} \ No newline at end of file From 47986ec0f59a6f73544ac312739c4a79aa1fd66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 30 Jul 2020 15:01:29 +0200 Subject: [PATCH 002/197] limit control-label effect to the first control-label, these 3 new lines covers all cases that i could find in CMS. --- src/Umbraco.Web.UI.Client/src/less/mixins.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less index a87080a326..9739a90dae 100644 --- a/src/Umbraco.Web.UI.Client/src/less/mixins.less +++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less @@ -138,7 +138,9 @@ // additional targetting of the ng-invalid class. .formFieldState(@textColor: @gray-4, @borderColor: @gray-7, @backgroundColor: @gray-10) { // Set the text color - .control-label, + > .control-label, + > .umb-el-wrap > .control-label, + > .umb-el-wrap > .control-header > .control-label, .help-block, .help-inline { color: @textColor; From 55805eabc3ab87571f23b9f40e60cc8fa4b7ea6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 30 Jul 2020 15:26:40 +0200 Subject: [PATCH 003/197] make the required-star as bold as possible. --- src/Umbraco.Web.UI.Client/src/less/main.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less index ce20b8dc88..2354e96d38 100644 --- a/src/Umbraco.Web.UI.Client/src/less/main.less +++ b/src/Umbraco.Web.UI.Client/src/less/main.less @@ -272,6 +272,7 @@ label:not([for]) { /* CONTROL VALIDATION */ .umb-control-required { color: @controlRequiredColor; + font-weight: 900; } .controls-row { From 33afbb8af6c4cb9127d46a36d447adb3e99b69b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 30 Jul 2020 16:13:22 +0200 Subject: [PATCH 004/197] added validation-error badge to navigation item --- .../src/less/components/umb-editor-navigation-item.less | 8 ++++++++ .../components/editor/umb-editor-navigation-item.html | 1 + 2 files changed, 9 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less index cb673e3c6f..c2f3e0f04d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less @@ -101,6 +101,10 @@ height: 12px; min-width: 12px; } + &.--error-badge { + display: none; + font-weight: 900; + } } &-text { @@ -191,4 +195,8 @@ &::before { background-color: @red; } + .badge.--error-badge { + display: block; + } + } diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html index 484e0175c5..9e5669f443 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html @@ -9,6 +9,7 @@ {{ vm.item.name }}
{{vm.item.badge.count}}
+
!
    From 0e82ec9995c3af78d6dcffd6bc1efd9854150a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 31 Jul 2020 09:45:52 +0200 Subject: [PATCH 005/197] moved and changed validation css --- .../umb-editor-navigation-item.less | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less index c2f3e0f04d..b3720feb3d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less @@ -53,6 +53,22 @@ height: 4px; } } + + // Validation + .show-validation &.-has-error { + color: @red; + + &:hover { + color: @red !important; + } + + &::before { + background-color: @red; + } + .badge.--error-badge { + display: block; + } + } } &__action:active, @@ -186,17 +202,3 @@ } } } - -// Validation -.show-validation .umb-sub-views-nav-item__action.-has-error, -.show-validation .umb-sub-views-nav-item > a.-has-error { - color: @red; - - &::before { - background-color: @red; - } - .badge.--error-badge { - display: block; - } - -} From 20779dff017610c95acfb373bbde5a3f586c8c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 31 Jul 2020 10:47:01 +0200 Subject: [PATCH 006/197] speach bubble look for property-errors --- .../lib/bootstrap/less/alerts.less | 17 ++++++++++++ .../src/less/alerts.less | 27 +++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less index 0116b191b3..c999481032 100644 --- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less +++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less @@ -77,3 +77,20 @@ .alert-block p + p { margin-top: 5px; } + + +// Property error alerts +// ------------------------- +.alert.property-error { + &::after { + content:''; + position: absolute; + bottom:0; + left: 32px; + width: 0; + height: 0; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + border-top: 8px solid @warningBackground; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/less/alerts.less b/src/Umbraco.Web.UI.Client/src/less/alerts.less index 3907b59f58..3539e21064 100644 --- a/src/Umbraco.Web.UI.Client/src/less/alerts.less +++ b/src/Umbraco.Web.UI.Client/src/less/alerts.less @@ -7,6 +7,7 @@ // ------------------------- .alert { + position: relative; padding: 8px 35px 8px 14px; margin-bottom: @baseLineHeight; background-color: @warningBackground; @@ -98,3 +99,29 @@ .alert-block p + p { margin-top: 5px; } + + +// Property error alerts +// ------------------------- +.alert.property-error { + + display: inline-block; + font-size: 14px; + padding: 6px 16px 6px 12px; + margin-bottom: 6px; + + &::after { + content:''; + position: absolute; + bottom:-6px; + left: 6px; + width: 0; + height: 0; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-top: 6px solid; + } + &.alert-error::after { + border-top-color: @errorBackground; + } +} From 8d6cafa45635f3d8bebb0d7cce64741dc1827cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 31 Jul 2020 10:57:51 +0200 Subject: [PATCH 007/197] remove again, this is not begin used. --- .../lib/bootstrap/less/alerts.less | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less index c999481032..0116b191b3 100644 --- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less +++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less @@ -77,20 +77,3 @@ .alert-block p + p { margin-top: 5px; } - - -// Property error alerts -// ------------------------- -.alert.property-error { - &::after { - content:''; - position: absolute; - bottom:0; - left: 32px; - width: 0; - height: 0; - border-left: 8px solid transparent; - border-right: 8px solid transparent; - border-top: 8px solid @warningBackground; - } -} From bbe2d3a9b69b586ed40455dc3c87d2b57d988bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 31 Jul 2020 11:25:40 +0200 Subject: [PATCH 008/197] fixing create from element type, now that udi is changed to contentUdi --- .../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 fe57534ffb..d744f8277f 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 @@ -730,7 +730,7 @@ return null; } - var dataModel = getDataByUdi(layoutEntry.udi, this.value.contentData); + var dataModel = getDataByUdi(layoutEntry.contentUdi, this.value.contentData); if (dataModel === null) { return null; } From 16c66b5141bd30b6fc2c71a540372940f206f8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 31 Jul 2020 11:30:21 +0200 Subject: [PATCH 009/197] deleteAllBlocks fixed (dont know what up with whitespace now) --- .../umbBlockListPropertyEditor.component.js | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 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 327677c6b9..5d6b1dcd14 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 @@ -29,7 +29,7 @@ }); function BlockListController($scope, editorService, clipboardService, localizationService, overlayService, blockEditorService, udiService, serverValidationManager, angularHelper) { - + var unsubscribe = []; var modelObject; @@ -84,7 +84,7 @@ vm.validationLimit = vm.model.config.validationLimit; vm.listWrapperStyles = {}; - + if (vm.model.config.maxPropertyWidth) { vm.listWrapperStyles['max-width'] = vm.model.config.maxPropertyWidth; } @@ -100,7 +100,7 @@ } else if(vm.umbElementEditorContent && vm.umbElementEditorContent.getScope) { scopeOfExistence = vm.umbElementEditorContent.getScope(); } - + // Create Model Object, to manage our data for this Block Editor. modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, scopeOfExistence, $scope); modelObject.load().then(onLoaded); @@ -124,7 +124,7 @@ copyAllBlocksAction, deleteAllBlocksAction ]; - + if (vm.umbProperty) { vm.umbProperty.setPropertyActions(propertyActions); } @@ -132,7 +132,7 @@ // Called when we save the value, the server may return an updated data and our value is re-synced // we need to deal with that here so that our model values are all in sync so we basically re-initialize. - function onServerValueChanged(newVal, oldVal) { + function onServerValueChanged(newVal, oldVal) { // 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. @@ -142,13 +142,13 @@ modelObject.update(newVal, $scope); onLoaded(); } - + function setDirty() { if (vm.propertyForm) { vm.propertyForm.$setDirty(); } } - + function onLoaded() { // Store a reference to the layout model, because we need to maintain this model. @@ -161,7 +161,7 @@ // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject. if (entry.$block === undefined || entry.$block === null || entry.$block.data === undefined) { var block = getBlockObject(entry); - + // If this entry was not supported by our property-editor it would return 'null'. if (block !== null) { entry.$block = block; @@ -192,7 +192,7 @@ } function getDefaultViewForBlock(block) { - + if (block.config.unsupported === true) return "views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html"; @@ -207,8 +207,8 @@ if (block === null) return null; // ensure that the containing content variant language/culture is transfered along - // to the scaffolded content object representing this block. This is required for validation - // along with ensuring that the umb-property inheritance is constently maintained. + // to the scaffolded content object representing this block. This is required for validation + // along with ensuring that the umb-property inheritance is constently maintained. if (vm.umbVariantContent.editor.content.language) { block.content.language = vm.umbVariantContent.editor.content.language; // currently we only ever deal with invariant content for blocks so there's only one @@ -243,7 +243,7 @@ if (blockObject === null) { return false; } - + // If we reach this line, we are good to add the layoutEntry and blockObject to our models. // Add the Block Object to our layout entry. @@ -251,7 +251,7 @@ // add layout entry at the decired location in layout. vm.layout.splice(index, 0, layoutEntry); - + // lets move focus to this new block. vm.setBlockFocus(blockObject); @@ -271,7 +271,7 @@ var removed = vm.layout.splice(layoutIndex, 1); removed.forEach(x => { // remove any server validation errors associated - var guid = udiService.getKey(x.contentUdi); + var guid = udiService.getKey(x.contentUdi); serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" }); }); @@ -280,11 +280,11 @@ } function deleteAllBlocks() { - vm.layout.forEach(entry => { - deleteBlock(entry.$block); - }); + while(vm.layout.length) { + deleteBlock(vm.layout[0].$block); + }; } - + function activateBlock(blockObject) { blockObject.active = true; } @@ -317,7 +317,7 @@ if (blockObject.config.settingsElementTypeKey) { blockSettingsClone = Utilities.copy(blockObject.settings); } - + var blockEditorModel = { $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing $parentForm: parentForm || vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form) @@ -366,11 +366,11 @@ vm.showCreateDialog = showCreateDialog; function showCreateDialog(createIndex, $event) { - + if (vm.blockTypePicker) { return; } - + if (vm.availableBlockTypes.length === 0) { return; } @@ -405,7 +405,7 @@ if (blockPickerModel && blockPickerModel.selectedItem) { added = addNewBlock(createIndex, blockPickerModel.selectedItem.blockConfigModel.contentTypeKey); } - + if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) { editorService.close(); if (added && vm.layout.length > createIndex) { @@ -448,7 +448,7 @@ } ); }); - + var arrayEntriesForPaste = clipboardService.retriveEntriesOfType("elementTypeArray", vm.availableContentTypesAliases); arrayEntriesForPaste.forEach(function (entry) { blockPickerModel.clipboardItems.push( @@ -472,13 +472,13 @@ var requestCopyAllBlocks = function() { var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(entry => entry.$block.content); - + // list aliases var aliases = elementTypesToCopy.map(content => content.contentTypeAlias); // remove dublicates aliases = aliases.filter((item, index) => aliases.indexOf(item) === index); - + var contentNodeName = ""; if(vm.umbVariantContent) { contentNodeName = vm.umbVariantContent.editor.content.name; @@ -494,7 +494,7 @@ clipboardService.copy("elementType", block.content.contentTypeAlias, block.content, block.label); } function requestPasteFromClipboard(index, pasteEntry) { - + if (pasteEntry === undefined) { return false; } @@ -512,7 +512,7 @@ // set the BlockObject on our layout entry. layoutEntry.$block = blockObject; - + // insert layout entry at the decired location in layout. vm.layout.splice(index, 0, layoutEntry); @@ -565,7 +565,7 @@ copyBlock: copyBlock, requestDeleteBlock: requestDeleteBlock, deleteBlock: deleteBlock, - openSettingsForBlock: openSettingsForBlock + openSettingsForBlock: openSettingsForBlock } vm.sortableOptions = { @@ -594,15 +594,15 @@ var isMinRequirementGood = vm.validationLimit.min === null || vm.layout.length >= vm.validationLimit.min; vm.propertyForm.minCount.$setValidity("minCount", isMinRequirementGood); - + var isMaxRequirementGood = vm.validationLimit.max === null || vm.layout.length <= vm.validationLimit.max; vm.propertyForm.maxCount.$setValidity("maxCount", isMaxRequirementGood); - + } } unsubscribe.push($scope.$watch(() => vm.layout.length, onAmountOfBlocksChanged)); - + $scope.$on("$destroy", function () { for (const subscription of unsubscribe) { subscription(); From 47203f71117f1572031d4fe97977b8684a5f0cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 31 Jul 2020 14:05:07 +0200 Subject: [PATCH 010/197] discard changes dialog --- .../blockeditor/blockeditor.controller.js | 25 ++++++++++++++++++- src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 2 ++ src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 2 ++ .../Umbraco/config/lang/en_us.xml | 2 ++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js index f515cbb4ba..4d79ecb7b4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js @@ -1,6 +1,6 @@ angular.module("umbraco") .controller("Umbraco.Editors.BlockEditorController", - function ($scope, localizationService, formHelper) { + function ($scope, localizationService, formHelper, overlayService) { var vm = this; vm.model = $scope.model; @@ -67,6 +67,29 @@ angular.module("umbraco") // * It would have a 'commit' method to commit the removed errors - which we would call in the formHelper.submitForm when it's successful // * It would have a 'rollback' method to reset the removed errors - which we would call here + + if (vm.blockForm.$dirty === true) { + localizationService.localizeMany(["prompt_discardChanges", "blockEditor_blockHasChanges"]).then(function (localizations) { + const confirm = { + title: localizations[0], + view: "default", + content: localizations[1], + submitButtonLabelKey: "general_discard", + submitButtonStyle: "danger", + closeButtonLabelKey: "general_cancel", + submit: function () { + overlayService.close(); + vm.model.close(vm.model); + }, + close: function () { + overlayService.close(); + } + }; + overlayService.open(confirm); + }); + + return; + } // TODO: check if content/settings has changed and ask user if they are sure. vm.model.close(vm.model); } diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index e3d456dea7..a7957c5afd 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -647,6 +647,7 @@ Design Ordbog Dimensioner + Discard Ned Hent Rediger @@ -1851,6 +1852,7 @@ Mange hilsner fra Umbraco robotten Indstillinger Avanceret Skjuld indholds editoren + Du har lavet ændringer til dette indhold. Er du sikker på at du vil kassere dem? diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 8355c36bd1..d72ee33d6c 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -675,6 +675,7 @@ Design Dictionary Dimensions + Discard Down Download Edit @@ -2467,6 +2468,7 @@ To manage your website, simply open the Umbraco back office and start adding con Settings Advanced Force hide content editor + You have made changes to this content. Are you sure you want to discard them? What are Content Templates? 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 fccd11a5aa..cb31695268 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -682,6 +682,7 @@ Design Dictionary Dimensions + Discard Down Download Edit @@ -2487,6 +2488,7 @@ To manage your website, simply open the Umbraco back office and start adding con Settings Advanced Force hide content editor + You have made changes to this content. Are you sure you want to discard them? What are Content Templates? From d06c1e01a7e36eedfdd2bb34119b90afa7ab9f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 3 Aug 2020 11:27:32 +0200 Subject: [PATCH 011/197] Update da.xml translate to danish --- src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index a7957c5afd..997fa577b7 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -647,7 +647,7 @@ Design Ordbog Dimensioner - Discard + Kassér Ned Hent Rediger From c7d42d94d0c112b0b2650c3c22a6860aebee0739 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 3 Aug 2020 22:02:10 +1000 Subject: [PATCH 012/197] Changes c# model for block list editor to be much simpler. --- .../Models/Blocks/BlockEditorModel.cs | 36 ------------- ...istLayoutReference.cs => BlockListItem.cs} | 16 ++---- .../Models/Blocks/BlockListModel.cs | 53 +++++++++++++++---- src/Umbraco.Core/Umbraco.Core.csproj | 3 +- .../BlockListPropertyValueConverterTests.cs | 45 ++++++---------- .../BlockListTemplateExtensions.cs | 2 +- .../BlockListPropertyValueConverter.cs | 6 +-- 7 files changed, 68 insertions(+), 93 deletions(-) delete mode 100644 src/Umbraco.Core/Models/Blocks/BlockEditorModel.cs rename src/Umbraco.Core/Models/Blocks/{BlockListLayoutReference.cs => BlockListItem.cs} (65%) diff --git a/src/Umbraco.Core/Models/Blocks/BlockEditorModel.cs b/src/Umbraco.Core/Models/Blocks/BlockEditorModel.cs deleted file mode 100644 index fa5a29fece..0000000000 --- a/src/Umbraco.Core/Models/Blocks/BlockEditorModel.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Umbraco.Core.Models.PublishedContent; - -namespace Umbraco.Core.Models.Blocks -{ - /// - /// The base class for any strongly typed model for a Block editor implementation - /// - public abstract class BlockEditorModel - { - protected BlockEditorModel(IEnumerable contentData, IEnumerable settingsData) - { - ContentData = contentData ?? throw new ArgumentNullException(nameof(contentData)); - SettingsData = settingsData ?? new List(); - } - - public BlockEditorModel() - { - } - - - /// - /// The content data items of the Block List editor - /// - [DataMember(Name = "contentData")] - public IEnumerable ContentData { get; set; } = new List(); - - /// - /// The settings data items of the Block List editor - /// - [DataMember(Name = "settingsData")] - public IEnumerable SettingsData { get; set; } = new List(); - } -} diff --git a/src/Umbraco.Core/Models/Blocks/BlockListLayoutReference.cs b/src/Umbraco.Core/Models/Blocks/BlockListItem.cs similarity index 65% rename from src/Umbraco.Core/Models/Blocks/BlockListLayoutReference.cs rename to src/Umbraco.Core/Models/Blocks/BlockListItem.cs index f576bd927f..f4b5c489e7 100644 --- a/src/Umbraco.Core/Models/Blocks/BlockListLayoutReference.cs +++ b/src/Umbraco.Core/Models/Blocks/BlockListItem.cs @@ -7,10 +7,10 @@ namespace Umbraco.Core.Models.Blocks /// /// Represents a layout item for the Block List editor /// - [DataContract(Name = "blockListLayout", Namespace = "")] - public class BlockListLayoutReference : IBlockReference + [DataContract(Name = "block", Namespace = "")] + public class BlockListItem : IBlockReference { - public BlockListLayoutReference(Udi contentUdi, IPublishedElement content, Udi settingsUdi, IPublishedElement settings) + public BlockListItem(Udi contentUdi, IPublishedElement content, Udi settingsUdi, IPublishedElement settings) { ContentUdi = contentUdi ?? throw new ArgumentNullException(nameof(contentUdi)); Content = content ?? throw new ArgumentNullException(nameof(content)); @@ -33,19 +33,13 @@ namespace Umbraco.Core.Models.Blocks /// /// The content data item referenced /// - /// - /// This is ignored from serialization since it is just a reference to the actual data element - /// - [IgnoreDataMember] + [DataMember(Name = "content")] public IPublishedElement Content { get; } /// /// The settings data item referenced /// - /// - /// This is ignored from serialization since it is just a reference to the actual data element - /// - [IgnoreDataMember] + [DataMember(Name = "settings")] public IPublishedElement Settings { get; } } } diff --git a/src/Umbraco.Core/Models/Blocks/BlockListModel.cs b/src/Umbraco.Core/Models/Blocks/BlockListModel.cs index 0492cf0d73..9a5a3af22a 100644 --- a/src/Umbraco.Core/Models/Blocks/BlockListModel.cs +++ b/src/Umbraco.Core/Models/Blocks/BlockListModel.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; using System.Runtime.Serialization; using Umbraco.Core.Models.PublishedContent; @@ -8,26 +11,54 @@ namespace Umbraco.Core.Models.Blocks /// The strongly typed model for the Block List editor /// [DataContract(Name = "blockList", Namespace = "")] - public class BlockListModel : BlockEditorModel + public class BlockListModel : IReadOnlyList { + private readonly IReadOnlyList _layout = new List(); + public static BlockListModel Empty { get; } = new BlockListModel(); private BlockListModel() { } - public BlockListModel(IEnumerable contentData, IEnumerable settingsData, IEnumerable layout) - : base(contentData, settingsData) + public BlockListModel(IEnumerable layout) { - Layout = layout; + _layout = layout.ToList(); } - /// - /// The layout items of the Block List editor - /// - [DataMember(Name = "layout")] - public IEnumerable Layout { get; } = new List(); + public int Count => _layout.Count; + + /// + /// Get the block by index + /// + /// + /// + public BlockListItem this[int index] => _layout[index]; + + /// + /// Get the block by content Guid + /// + /// + /// + public BlockListItem this[Guid contentKey] => _layout.FirstOrDefault(x => x.Content.Key == contentKey); + + /// + /// Get the block by content element Udi + /// + /// + /// + public BlockListItem this[Udi contentUdi] + { + get + { + if (!(contentUdi is GuidUdi guidUdi)) return null; + return _layout.FirstOrDefault(x => x.Content.Key == guidUdi.Guid); + } + } + + public IEnumerator GetEnumerator() => _layout.GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - } } diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 73af567cbc..1b1ee4fb28 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -150,8 +150,7 @@ - - + diff --git a/src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs b/src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs index 23cc782106..959e059d59 100644 --- a/src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs +++ b/src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs @@ -154,15 +154,13 @@ namespace Umbraco.Tests.PropertyEditors var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(0, converted.ContentData.Count()); - Assert.AreEqual(0, converted.Layout.Count()); + Assert.AreEqual(0, converted.Count); json = string.Empty; converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(0, converted.ContentData.Count()); - Assert.AreEqual(0, converted.Layout.Count()); + Assert.AreEqual(0, converted.Count); } [Test] @@ -177,8 +175,7 @@ namespace Umbraco.Tests.PropertyEditors var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(0, converted.ContentData.Count()); - Assert.AreEqual(0, converted.Layout.Count()); + Assert.AreEqual(0, converted.Count); json = @"{ layout: {}, @@ -186,8 +183,7 @@ data: []}"; converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(0, converted.ContentData.Count()); - Assert.AreEqual(0, converted.Layout.Count()); + Assert.AreEqual(0, converted.Count); // Even though there is a layout, there is no data, so the conversion will result in zero elements in total json = @" @@ -205,8 +201,7 @@ data: []}"; converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(0, converted.ContentData.Count()); - Assert.AreEqual(0, converted.Layout.Count()); + Assert.AreEqual(0, converted.Count); // Even though there is a layout and data, the data is invalid (missing required keys) so the conversion will result in zero elements in total json = @" @@ -228,8 +223,7 @@ data: []}"; converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(0, converted.ContentData.Count()); - Assert.AreEqual(0, converted.Layout.Count()); + Assert.AreEqual(0, converted.Count); // Everthing is ok except the udi reference in the layout doesn't match the data so it will be empty json = @" @@ -252,8 +246,7 @@ data: []}"; converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(1, converted.ContentData.Count()); - Assert.AreEqual(0, converted.Layout.Count()); + Assert.AreEqual(0, converted.Count); } [Test] @@ -283,14 +276,12 @@ data: []}"; var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(1, converted.ContentData.Count()); - var item0 = converted.ContentData.ElementAt(0); + Assert.AreEqual(1, converted.Count); + var item0 = converted[0].Content; Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Key); Assert.AreEqual("Test1", item0.ContentType.Alias); - Assert.AreEqual(1, converted.Layout.Count()); - var layout0 = converted.Layout.ElementAt(0); - Assert.IsNull(layout0.Settings); - Assert.AreEqual(Udi.Parse("umb://element/1304E1DDAC87439684FE8A399231CB3D"), layout0.ContentUdi); + Assert.IsNull(converted[0].Settings); + Assert.AreEqual(Udi.Parse("umb://element/1304E1DDAC87439684FE8A399231CB3D"), converted[0].ContentUdi); } [Test] @@ -348,17 +339,15 @@ data: []}"; var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(3, converted.ContentData.Count()); - Assert.AreEqual(3, converted.SettingsData.Count()); - Assert.AreEqual(2, converted.Layout.Count()); + Assert.AreEqual(2, converted.Count); - var item0 = converted.Layout.ElementAt(0); + var item0 = converted[0]; Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Content.Key); Assert.AreEqual("Test1", item0.Content.ContentType.Alias); Assert.AreEqual(Guid.Parse("1F613E26CE274898908A561437AF5100"), item0.Settings.Key); Assert.AreEqual("Setting2", item0.Settings.ContentType.Alias); - var item1 = converted.Layout.ElementAt(1); + var item1 = converted[1]; Assert.AreEqual(Guid.Parse("0A4A416E-547D-464F-ABCC-6F345C17809A"), item1.Content.Key); Assert.AreEqual("Test2", item1.Content.ContentType.Alias); Assert.AreEqual(Guid.Parse("63027539B0DB45E7B70459762D4E83DD"), item1.Settings.Key); @@ -434,11 +423,9 @@ data: []}"; var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel; Assert.IsNotNull(converted); - Assert.AreEqual(2, converted.ContentData.Count()); - Assert.AreEqual(0, converted.SettingsData.Count()); - Assert.AreEqual(1, converted.Layout.Count()); + Assert.AreEqual(1, converted.Count); - var item0 = converted.Layout.ElementAt(0); + var item0 = converted[0]; Assert.AreEqual(Guid.Parse("0A4A416E-547D-464F-ABCC-6F345C17809A"), item0.Content.Key); Assert.AreEqual("Test2", item0.Content.ContentType.Alias); Assert.IsNull(item0.Settings); diff --git a/src/Umbraco.Web/BlockListTemplateExtensions.cs b/src/Umbraco.Web/BlockListTemplateExtensions.cs index 1754eb4fc4..413584bc8e 100644 --- a/src/Umbraco.Web/BlockListTemplateExtensions.cs +++ b/src/Umbraco.Web/BlockListTemplateExtensions.cs @@ -14,7 +14,7 @@ namespace Umbraco.Web public static MvcHtmlString GetBlockListHtml(this HtmlHelper html, BlockListModel model, string template = DefaultTemplate) { - if (model?.Layout == null || !model.Layout.Any()) return new MvcHtmlString(string.Empty); + if (model?.Count == 0) return new MvcHtmlString(string.Empty); var view = DefaultFolder + template; return html.Partial(view, model); diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs index 25b22e1a9c..0c90a41fbd 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs @@ -58,7 +58,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters var contentPublishedElements = new Dictionary(); var settingsPublishedElements = new Dictionary(); - var layout = new List(); + var layout = new List(); var value = (string)inter; if (string.IsNullOrWhiteSpace(value)) return BlockListModel.Empty; @@ -120,11 +120,11 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters settingsData = null; } - var layoutRef = new BlockListLayoutReference(contentGuidUdi, contentData, settingGuidUdi, settingsData); + var layoutRef = new BlockListItem(contentGuidUdi, contentData, settingGuidUdi, settingsData); layout.Add(layoutRef); } - var model = new BlockListModel(contentPublishedElements.Values, settingsPublishedElements.Values, layout); + var model = new BlockListModel(layout); return model; } } From b0ff73fd7573fdb76e22790a5ac4589ed192ed9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 3 Aug 2020 14:12:06 +0200 Subject: [PATCH 013/197] make badge bounce --- .../editor/umb-variant-switcher.less | 26 +++++++++++++++++++ .../umb-editor-navigation-item.less | 21 +++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less index 8dbc070856..eae25b273c 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less @@ -50,6 +50,19 @@ button.umb-variant-switcher__toggle { font-weight: bold; background-color: @errorBackground; color: @errorText; + + animation-duration: 1.4s; + animation-iteration-count: infinite; + animation-name: umb-variant-switcher__toggle--badge-bounce; + animation-timing-function: ease; + @keyframes umb-variant-switcher__toggle--badge-bounce { + 0% { transform: translateY(0); } + 20% { transform: translateY(-6px); } + 40% { transform: translateY(0); } + 55% { transform: translateY(-3px); } + 70% { transform: translateY(0); } + 100% { transform: translateY(0); } + } } } } @@ -226,6 +239,19 @@ button.umb-variant-switcher__toggle { font-weight: bold; background-color: @errorBackground; color: @errorText; + + animation-duration: 1.4s; + animation-iteration-count: infinite; + animation-name: umb-variant-switcher__name--badge-bounce; + animation-timing-function: ease; + @keyframes umb-variant-switcher__name--badge-bounce { + 0% { transform: translateY(0); } + 20% { transform: translateY(-6px); } + 40% { transform: translateY(0); } + 55% { transform: translateY(-3px); } + 70% { transform: translateY(0); } + 100% { transform: translateY(0); } + } } } } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less index b3720feb3d..2fc705b11b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less @@ -65,8 +65,25 @@ &::before { background-color: @red; } - .badge.--error-badge { - display: block; + + &:not(.is-active) { + .badge { + animation-duration: 1.4s; + animation-iteration-count: infinite; + animation-name: umb-sub-views-nav-item--badge-bounce; + animation-timing-function: ease; + @keyframes umb-sub-views-nav-item--badge-bounce { + 0% { transform: translateY(0); } + 20% { transform: translateY(-6px); } + 40% { transform: translateY(0); } + 55% { transform: translateY(-3px); } + 70% { transform: translateY(0); } + 100% { transform: translateY(0); } + } + } + .badge.--error-badge { + display: block; + } } } } From c9b0f20fa32cb067bd4d58a7ec47307d9e390803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 3 Aug 2020 14:13:38 +0200 Subject: [PATCH 014/197] move load to the buttom of init() --- .../umbBlockListPropertyEditor.component.js | 63 ++++++++++--------- 1 file changed, 32 insertions(+), 31 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 327677c6b9..3b54bca48a 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 @@ -29,7 +29,7 @@ }); function BlockListController($scope, editorService, clipboardService, localizationService, overlayService, blockEditorService, udiService, serverValidationManager, angularHelper) { - + var unsubscribe = []; var modelObject; @@ -84,7 +84,7 @@ vm.validationLimit = vm.model.config.validationLimit; vm.listWrapperStyles = {}; - + if (vm.model.config.maxPropertyWidth) { vm.listWrapperStyles['max-width'] = vm.model.config.maxPropertyWidth; } @@ -100,10 +100,6 @@ } else if(vm.umbElementEditorContent && vm.umbElementEditorContent.getScope) { scopeOfExistence = vm.umbElementEditorContent.getScope(); } - - // Create Model Object, to manage our data for this Block Editor. - modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, scopeOfExistence, $scope); - modelObject.load().then(onLoaded); copyAllBlocksAction = { labelKey: "clipboard_labelForCopyAllEntries", @@ -124,15 +120,20 @@ copyAllBlocksAction, deleteAllBlocksAction ]; - + if (vm.umbProperty) { vm.umbProperty.setPropertyActions(propertyActions); } + + // Create Model Object, to manage our data for this Block Editor. + modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, scopeOfExistence, $scope); + modelObject.load().then(onLoaded); + }; // Called when we save the value, the server may return an updated data and our value is re-synced // we need to deal with that here so that our model values are all in sync so we basically re-initialize. - function onServerValueChanged(newVal, oldVal) { + function onServerValueChanged(newVal, oldVal) { // 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. @@ -142,13 +143,13 @@ modelObject.update(newVal, $scope); onLoaded(); } - + function setDirty() { if (vm.propertyForm) { vm.propertyForm.$setDirty(); } } - + function onLoaded() { // Store a reference to the layout model, because we need to maintain this model. @@ -161,7 +162,7 @@ // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject. if (entry.$block === undefined || entry.$block === null || entry.$block.data === undefined) { var block = getBlockObject(entry); - + // If this entry was not supported by our property-editor it would return 'null'. if (block !== null) { entry.$block = block; @@ -192,7 +193,7 @@ } function getDefaultViewForBlock(block) { - + if (block.config.unsupported === true) return "views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html"; @@ -207,8 +208,8 @@ if (block === null) return null; // ensure that the containing content variant language/culture is transfered along - // to the scaffolded content object representing this block. This is required for validation - // along with ensuring that the umb-property inheritance is constently maintained. + // to the scaffolded content object representing this block. This is required for validation + // along with ensuring that the umb-property inheritance is constently maintained. if (vm.umbVariantContent.editor.content.language) { block.content.language = vm.umbVariantContent.editor.content.language; // currently we only ever deal with invariant content for blocks so there's only one @@ -243,7 +244,7 @@ if (blockObject === null) { return false; } - + // If we reach this line, we are good to add the layoutEntry and blockObject to our models. // Add the Block Object to our layout entry. @@ -251,7 +252,7 @@ // add layout entry at the decired location in layout. vm.layout.splice(index, 0, layoutEntry); - + // lets move focus to this new block. vm.setBlockFocus(blockObject); @@ -271,7 +272,7 @@ var removed = vm.layout.splice(layoutIndex, 1); removed.forEach(x => { // remove any server validation errors associated - var guid = udiService.getKey(x.contentUdi); + var guid = udiService.getKey(x.contentUdi); serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" }); }); @@ -284,7 +285,7 @@ deleteBlock(entry.$block); }); } - + function activateBlock(blockObject) { blockObject.active = true; } @@ -317,7 +318,7 @@ if (blockObject.config.settingsElementTypeKey) { blockSettingsClone = Utilities.copy(blockObject.settings); } - + var blockEditorModel = { $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing $parentForm: parentForm || vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form) @@ -366,11 +367,11 @@ vm.showCreateDialog = showCreateDialog; function showCreateDialog(createIndex, $event) { - + if (vm.blockTypePicker) { return; } - + if (vm.availableBlockTypes.length === 0) { return; } @@ -405,7 +406,7 @@ if (blockPickerModel && blockPickerModel.selectedItem) { added = addNewBlock(createIndex, blockPickerModel.selectedItem.blockConfigModel.contentTypeKey); } - + if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) { editorService.close(); if (added && vm.layout.length > createIndex) { @@ -448,7 +449,7 @@ } ); }); - + var arrayEntriesForPaste = clipboardService.retriveEntriesOfType("elementTypeArray", vm.availableContentTypesAliases); arrayEntriesForPaste.forEach(function (entry) { blockPickerModel.clipboardItems.push( @@ -472,13 +473,13 @@ var requestCopyAllBlocks = function() { var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(entry => entry.$block.content); - + // list aliases var aliases = elementTypesToCopy.map(content => content.contentTypeAlias); // remove dublicates aliases = aliases.filter((item, index) => aliases.indexOf(item) === index); - + var contentNodeName = ""; if(vm.umbVariantContent) { contentNodeName = vm.umbVariantContent.editor.content.name; @@ -494,7 +495,7 @@ clipboardService.copy("elementType", block.content.contentTypeAlias, block.content, block.label); } function requestPasteFromClipboard(index, pasteEntry) { - + if (pasteEntry === undefined) { return false; } @@ -512,7 +513,7 @@ // set the BlockObject on our layout entry. layoutEntry.$block = blockObject; - + // insert layout entry at the decired location in layout. vm.layout.splice(index, 0, layoutEntry); @@ -565,7 +566,7 @@ copyBlock: copyBlock, requestDeleteBlock: requestDeleteBlock, deleteBlock: deleteBlock, - openSettingsForBlock: openSettingsForBlock + openSettingsForBlock: openSettingsForBlock } vm.sortableOptions = { @@ -594,15 +595,15 @@ var isMinRequirementGood = vm.validationLimit.min === null || vm.layout.length >= vm.validationLimit.min; vm.propertyForm.minCount.$setValidity("minCount", isMinRequirementGood); - + var isMaxRequirementGood = vm.validationLimit.max === null || vm.layout.length <= vm.validationLimit.max; vm.propertyForm.maxCount.$setValidity("maxCount", isMaxRequirementGood); - + } } unsubscribe.push($scope.$watch(() => vm.layout.length, onAmountOfBlocksChanged)); - + $scope.$on("$destroy", function () { for (const subscription of unsubscribe) { subscription(); From 52fa96c82474c91d111f68a55e71dfbdfb86cd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 4 Aug 2020 10:00:39 +0200 Subject: [PATCH 015/197] append the drag class if a stylesheet is present. --- .../src/views/propertyeditors/blocklist/umb-block-list-row.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html index 55f849e4d0..bcbede231c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html @@ -3,6 +3,7 @@ Date: Tue, 4 Aug 2020 11:09:45 +0200 Subject: [PATCH 016/197] remove unused index from blockEditorModel for infinite editor --- .../umbBlockListPropertyEditor.component.js | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 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 327677c6b9..c702206393 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 @@ -29,7 +29,7 @@ }); function BlockListController($scope, editorService, clipboardService, localizationService, overlayService, blockEditorService, udiService, serverValidationManager, angularHelper) { - + var unsubscribe = []; var modelObject; @@ -84,7 +84,7 @@ vm.validationLimit = vm.model.config.validationLimit; vm.listWrapperStyles = {}; - + if (vm.model.config.maxPropertyWidth) { vm.listWrapperStyles['max-width'] = vm.model.config.maxPropertyWidth; } @@ -100,7 +100,7 @@ } else if(vm.umbElementEditorContent && vm.umbElementEditorContent.getScope) { scopeOfExistence = vm.umbElementEditorContent.getScope(); } - + // Create Model Object, to manage our data for this Block Editor. modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, scopeOfExistence, $scope); modelObject.load().then(onLoaded); @@ -124,7 +124,7 @@ copyAllBlocksAction, deleteAllBlocksAction ]; - + if (vm.umbProperty) { vm.umbProperty.setPropertyActions(propertyActions); } @@ -132,7 +132,7 @@ // Called when we save the value, the server may return an updated data and our value is re-synced // we need to deal with that here so that our model values are all in sync so we basically re-initialize. - function onServerValueChanged(newVal, oldVal) { + function onServerValueChanged(newVal, oldVal) { // 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. @@ -142,13 +142,13 @@ modelObject.update(newVal, $scope); onLoaded(); } - + function setDirty() { if (vm.propertyForm) { vm.propertyForm.$setDirty(); } } - + function onLoaded() { // Store a reference to the layout model, because we need to maintain this model. @@ -161,7 +161,7 @@ // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject. if (entry.$block === undefined || entry.$block === null || entry.$block.data === undefined) { var block = getBlockObject(entry); - + // If this entry was not supported by our property-editor it would return 'null'. if (block !== null) { entry.$block = block; @@ -192,7 +192,7 @@ } function getDefaultViewForBlock(block) { - + if (block.config.unsupported === true) return "views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html"; @@ -207,8 +207,8 @@ if (block === null) return null; // ensure that the containing content variant language/culture is transfered along - // to the scaffolded content object representing this block. This is required for validation - // along with ensuring that the umb-property inheritance is constently maintained. + // to the scaffolded content object representing this block. This is required for validation + // along with ensuring that the umb-property inheritance is constently maintained. if (vm.umbVariantContent.editor.content.language) { block.content.language = vm.umbVariantContent.editor.content.language; // currently we only ever deal with invariant content for blocks so there's only one @@ -243,7 +243,7 @@ if (blockObject === null) { return false; } - + // If we reach this line, we are good to add the layoutEntry and blockObject to our models. // Add the Block Object to our layout entry. @@ -251,7 +251,7 @@ // add layout entry at the decired location in layout. vm.layout.splice(index, 0, layoutEntry); - + // lets move focus to this new block. vm.setBlockFocus(blockObject); @@ -271,7 +271,7 @@ var removed = vm.layout.splice(layoutIndex, 1); removed.forEach(x => { // remove any server validation errors associated - var guid = udiService.getKey(x.contentUdi); + var guid = udiService.getKey(x.contentUdi); serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" }); }); @@ -284,7 +284,7 @@ deleteBlock(entry.$block); }); } - + function activateBlock(blockObject) { blockObject.active = true; } @@ -317,7 +317,7 @@ if (blockObject.config.settingsElementTypeKey) { blockSettingsClone = Utilities.copy(blockObject.settings); } - + var blockEditorModel = { $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing $parentForm: parentForm || vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form) @@ -325,7 +325,6 @@ openSettings: openSettings === true, liveEditing: liveEditing, title: blockObject.label, - index: blockIndex, view: "views/common/infiniteeditors/blockeditor/blockeditor.html", size: blockObject.config.editorSize || "medium", submit: function(blockEditorModel) { @@ -366,11 +365,11 @@ vm.showCreateDialog = showCreateDialog; function showCreateDialog(createIndex, $event) { - + if (vm.blockTypePicker) { return; } - + if (vm.availableBlockTypes.length === 0) { return; } @@ -405,7 +404,7 @@ if (blockPickerModel && blockPickerModel.selectedItem) { added = addNewBlock(createIndex, blockPickerModel.selectedItem.blockConfigModel.contentTypeKey); } - + if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) { editorService.close(); if (added && vm.layout.length > createIndex) { @@ -448,7 +447,7 @@ } ); }); - + var arrayEntriesForPaste = clipboardService.retriveEntriesOfType("elementTypeArray", vm.availableContentTypesAliases); arrayEntriesForPaste.forEach(function (entry) { blockPickerModel.clipboardItems.push( @@ -472,13 +471,13 @@ var requestCopyAllBlocks = function() { var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(entry => entry.$block.content); - + // list aliases var aliases = elementTypesToCopy.map(content => content.contentTypeAlias); // remove dublicates aliases = aliases.filter((item, index) => aliases.indexOf(item) === index); - + var contentNodeName = ""; if(vm.umbVariantContent) { contentNodeName = vm.umbVariantContent.editor.content.name; @@ -494,7 +493,7 @@ clipboardService.copy("elementType", block.content.contentTypeAlias, block.content, block.label); } function requestPasteFromClipboard(index, pasteEntry) { - + if (pasteEntry === undefined) { return false; } @@ -512,7 +511,7 @@ // set the BlockObject on our layout entry. layoutEntry.$block = blockObject; - + // insert layout entry at the decired location in layout. vm.layout.splice(index, 0, layoutEntry); @@ -565,7 +564,7 @@ copyBlock: copyBlock, requestDeleteBlock: requestDeleteBlock, deleteBlock: deleteBlock, - openSettingsForBlock: openSettingsForBlock + openSettingsForBlock: openSettingsForBlock } vm.sortableOptions = { @@ -594,15 +593,15 @@ var isMinRequirementGood = vm.validationLimit.min === null || vm.layout.length >= vm.validationLimit.min; vm.propertyForm.minCount.$setValidity("minCount", isMinRequirementGood); - + var isMaxRequirementGood = vm.validationLimit.max === null || vm.layout.length <= vm.validationLimit.max; vm.propertyForm.maxCount.$setValidity("maxCount", isMaxRequirementGood); - + } } unsubscribe.push($scope.$watch(() => vm.layout.length, onAmountOfBlocksChanged)); - + $scope.$on("$destroy", function () { for (const subscription of unsubscribe) { subscription(); From 7cbe50b2f156178d1432acc475a5f9b0e09ca261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 4 Aug 2020 11:23:13 +0200 Subject: [PATCH 017/197] need to define active always, in order for it to become false. --- .../blockeditor/blockeditor.controller.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js index f515cbb4ba..b8c6f1f27b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js @@ -23,17 +23,14 @@ angular.module("umbraco") if (contentApp) { if (vm.model.hideContent) { apps.splice(apps.indexOf(contentApp), 1); - } else if (vm.model.openSettings !== true) { - contentApp.active = true; } + contentApp.active = (vm.model.openSettings !== true); } if (vm.model.settings && vm.model.settings.variants) { var settingsApp = apps.find(entry => entry.alias === "settings"); if (settingsApp) { - if (vm.model.openSettings) { - settingsApp.active = true; - } + settingsApp.active = (vm.model.openSettings === true); } } @@ -55,7 +52,7 @@ angular.module("umbraco") vm.close = function () { if (vm.model && vm.model.close) { - // TODO: At this stage there could very well have been server errors that have been cleared + // TODO: At this stage there could very well have been server errors that have been cleared // but if we 'close' we are basically cancelling the value changes which means we'd want to cancel // all of the server errors just cleared. It would be possible to do that but also quite annoying. // The rudimentary way would be to: From 74f3b8073f3f84a6bbe884ce8fed5b094a379c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 4 Aug 2020 11:32:02 +0200 Subject: [PATCH 018/197] show state in submit button --- .../infiniteeditors/blockeditor/blockeditor.controller.js | 6 +++++- .../common/infiniteeditors/blockeditor/blockeditor.html | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js index f515cbb4ba..6dbf74f830 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js @@ -42,6 +42,7 @@ angular.module("umbraco") vm.submitAndClose = function () { if (vm.model && vm.model.submit) { + // always keep server validations since this will be a nested editor and server validations are global if (formHelper.submitForm({ scope: $scope, @@ -49,13 +50,16 @@ angular.module("umbraco") keepServerValidation: true })) { vm.model.submit(vm.model); + vm.saveButtonState = "success"; + } else { + vm.saveButtonState = "error"; } } } vm.close = function () { if (vm.model && vm.model.close) { - // TODO: At this stage there could very well have been server errors that have been cleared + // TODO: At this stage there could very well have been server errors that have been cleared // but if we 'close' we are basically cancelling the value changes which means we'd want to cancel // all of the server errors just cleared. It would be possible to do that but also quite annoying. // The rudimentary way would be to: diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html index de18f13d2c..dfcfd48887 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html @@ -44,7 +44,7 @@ From 8981fd9c6fd3cf5da771a759498e56e5fba55d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 4 Aug 2020 11:34:07 +0200 Subject: [PATCH 019/197] should check for value before checking the length or the value of first entry. --- .../dropdownFlexible/dropdownFlexible.controller.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js index afbb4feb20..4064df6a24 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js @@ -15,14 +15,14 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo //ensure this is a bool, old data could store zeros/ones or string versions $scope.model.config.multiple = Object.toBoolean($scope.model.config.multiple); - + //ensure when form is saved that we don't store [] or [null] as string values in the database when no items are selected $scope.$on("formSubmitting", function () { - if ($scope.model.value.length === 0 || $scope.model.value[0] === null) { + if ($scope.model.value && ($scope.model.value.length === 0 || $scope.model.value[0] === null)) { $scope.model.value = null; } }); - + function convertArrayToDictionaryArray(model){ //now we need to format the items in the dictionary because we always want to have an array var newItems = []; @@ -41,7 +41,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo var keys = _.keys($scope.model.config.items); for (var i = 0; i < vals.length; i++) { - var label = vals[i].value ? vals[i].value : vals[i]; + var label = vals[i].value ? vals[i].value : vals[i]; newItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: label }); } @@ -65,7 +65,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo else { throw "The items property must be either an array or a dictionary"; } - + //sort the values $scope.model.config.items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); }); @@ -80,7 +80,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo $scope.model.value = ""; } } - + // if we run in single mode we'll store the value in a local variable // so we can pass an array as the model as our PropertyValueEditor expects that $scope.model.singleDropdownValue = ""; From 041d6a91a8824f6d35ce69a2b9b4ecbc3b521fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 4 Aug 2020 12:57:05 +0200 Subject: [PATCH 020/197] use the right red for error borders, no need for it to be darker. --- src/Umbraco.Web.UI.Client/src/less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 2f627f3ab3..840c6d529f 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -481,7 +481,7 @@ @formErrorText: @errorBackground; @formErrorBackground: lighten(@errorBackground, 55%); -@formErrorBorder: darken(spin(@errorBackground, -10), 3%); +@formErrorBorder: @red; @formSuccessText: @successBackground; @formSuccessBackground: lighten(@successBackground, 48%); From ff3d0b177001b135c5452d2258a47926e1fd129c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 4 Aug 2020 12:57:21 +0200 Subject: [PATCH 021/197] append a badge for settings, and make sure it visible. --- .../umb-block-list-property-editor.less | 37 +++++++++++++++++++ .../blocklist/umb-block-list-row.html | 1 + 2 files changed, 38 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less index b6f3ace44c..0c92aef44b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less @@ -39,6 +39,9 @@ } } } +ng-form.ng-invalid-val-server-match-settings > .umb-block-list__block > .umb-block-list__block--actions { + opacity: 1; +} .umb-block-list__block--actions { position: absolute; z-index:999999999;// We always want to be on top of custom view, but we need to make sure we still are behind relevant Umbraco CMS UI. ToDo: Needs further testing. @@ -58,6 +61,40 @@ &:hover { color: @ui-action-discreet-type-hover; } + > .__error-badge { + position: absolute; + top: -2px; + right: -2px; + min-width: 8px; + color: @white; + background-color: @ui-active-type; + border: 2px solid @white; + border-radius: 50%; + font-size: 8px; + font-weight: bold; + padding: 2px; + line-height: 8px; + background-color: @red; + display: none; + font-weight: 900; + } + &.--error > .__error-badge { + display: block; + + animation-duration: 1.4s; + animation-iteration-count: infinite; + animation-name: umb-block-list__action--badge-bounce; + animation-timing-function: ease; + @keyframes umb-block-list__action--badge-bounce { + 0% { transform: translateY(0); } + 20% { transform: translateY(-4px); } + 40% { transform: translateY(0); } + 55% { transform: translateY(-2px); } + 70% { transform: translateY(0); } + 100% { transform: translateY(0); } + } + + } } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html index 55f849e4d0..a2c4b5c5b4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html @@ -19,6 +19,7 @@ Settings +
    !
    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 528ba1fd47..928e627fa3 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 @@ -225,16 +225,16 @@ block.hideContentInOverlay = block.config.forceHideContentEditorInOverlay === true || inlineEditing === true; block.showSettings = block.config.settingsElementTypeKey != null; - block.showCopy = vm.supportCopy && block.config.contentTypeKey != null;// if we have content, otherwise it doesn't make sense to copy. + block.showCopy = vm.supportCopy && block.config.contentElementTypeKey != null;// if we have content, otherwise it doesn't make sense to copy. return block; } - function addNewBlock(index, contentTypeKey) { + function addNewBlock(index, contentElementTypeKey) { // Create layout entry. (not added to property model jet.) - var layoutEntry = modelObject.create(contentTypeKey); + var layoutEntry = modelObject.create(contentElementTypeKey); if (layoutEntry === null) { return false; } @@ -403,7 +403,7 @@ submit: function(blockPickerModel, mouseEvent) { var added = false; if (blockPickerModel && blockPickerModel.selectedItem) { - added = addNewBlock(createIndex, blockPickerModel.selectedItem.blockConfigModel.contentTypeKey); + added = addNewBlock(createIndex, blockPickerModel.selectedItem.blockConfigModel.contentElementTypeKey); } if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) { diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js index 71404b5e85..4ce6f4e6b5 100644 --- a/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js +++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js @@ -11,7 +11,7 @@ beforeEach(module('umbraco.resources')); beforeEach(module('umbraco.mocks')); beforeEach(module('umbraco')); - + beforeEach(inject(function ($injector, mocksUtils, _$rootScope_, _$q_, _$timeout_) { mocksUtils.disableAuth(); @@ -41,7 +41,7 @@ })); - var blockConfigurationMock = { contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", label: "Test label", settingsElementTypeKey: null, view: "testview.html" }; + var blockConfigurationMock = { contentElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", label: "Test label", settingsElementTypeKey: null, view: "testview.html" }; var propertyModelMock = { layout: { @@ -60,7 +60,7 @@ ] }; - var blockWithSettingsConfigurationMock = { contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", label: "Test label", settingsElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", view: "testview.html" }; + var blockWithSettingsConfigurationMock = { contentElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", label: "Test label", settingsElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", view: "testview.html" }; var propertyModelWithSettingsMock = { layout: { "Umbraco.TestBlockEditor": [ @@ -105,17 +105,17 @@ it('getBlockConfiguration provide the requested block configurtion', function () { var modelObject = blockEditorService.createModelObject({}, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope); - expect(modelObject.getBlockConfiguration(blockConfigurationMock.contentTypeKey).label).toBe(blockConfigurationMock.label); + expect(modelObject.getBlockConfiguration(blockConfigurationMock.contentElementTypeKey).label).toBe(blockConfigurationMock.label); }); it('load provides data for itemPicker', function (done) { var modelObject = blockEditorService.createModelObject({}, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope); - modelObject.load().then(() => { + modelObject.load().then(() => { try { var itemPickerOptions = modelObject.getAvailableBlocksForBlockPicker(); expect(itemPickerOptions.length).toBe(1); - expect(itemPickerOptions[0].blockConfigModel.contentTypeKey).toBe(blockConfigurationMock.contentTypeKey); + expect(itemPickerOptions[0].blockConfigModel.contentElementTypeKey).toBe(blockConfigurationMock.contentElementTypeKey); done(); } catch (e) { done.fail(e); @@ -139,7 +139,7 @@ expect(layout).not.toBeUndefined(); expect(layout.length).toBe(1); expect(layout[0]).toBe(propertyModelMock.layout["Umbraco.TestBlockEditor"][0]); - expect(layout[0].udi).toBe(propertyModelMock.layout["Umbraco.TestBlockEditor"][0].udi); + expect(layout[0].contentUdi).toBe(propertyModelMock.layout["Umbraco.TestBlockEditor"][0].contentUdi); done(); } catch (e) { @@ -241,10 +241,10 @@ done(); }); - + } catch (e) { done.fail(e); - } + } }); $rootScope.$digest(); @@ -362,7 +362,7 @@ done(); }); - + }); $rootScope.$digest(); @@ -406,7 +406,7 @@ done(); }); - + } catch (e) { done.fail(e); } diff --git a/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs b/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs index bfbbc80179..e461da40dc 100644 --- a/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs +++ b/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs @@ -27,8 +27,7 @@ namespace Umbraco.Web.PropertyEditors [JsonProperty("thumbnail")] public string Thumbnail { get; set; } - // TODO: This is named inconsistently in JS but renaming it needs to be done in quite a lot of places, this should be contentElementTypeKey - [JsonProperty("contentTypeKey")] + [JsonProperty("contentElementTypeKey")] public Guid ContentElementTypeKey { get; set; } [JsonProperty("settingsElementTypeKey")] From 745e0b7990ea163598440af4624b206a7e12c26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 6 Aug 2020 14:43:27 +0200 Subject: [PATCH 029/197] fix js issue appearing when mouseLeave is undefined. --- .../views/common/overlays/itempicker/itempicker.controller.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js index 17184ae9a3..c06a9400e7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js @@ -26,7 +26,9 @@ function ItemPickerOverlay($scope, localizationService) { $scope.showTooltip = function(item, $event) { if (!item.tooltip) { - $scope.mouseLeave(); + if($scope.mouseLeave) { + $scope.mouseLeave(); + } return; } $scope.tooltip = { From 9370dacd16e87859c9ac3b2d06f058db1ca1ed93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 6 Aug 2020 15:30:01 +0200 Subject: [PATCH 030/197] remove console.log --- .../src/common/services/blockeditormodelobject.service.js | 1 - 1 file changed, 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 d3cec5e6af..9964dac343 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 @@ -397,7 +397,6 @@ var scaffoldKeys = []; this.blockConfigurations.forEach(blockConfiguration => { - console.log(blockConfiguration) scaffoldKeys.push(blockConfiguration.contentElementTypeKey); if (blockConfiguration.settingsElementTypeKey != null) { scaffoldKeys.push(blockConfiguration.settingsElementTypeKey); From f25ee0a369e503efe635e5c8762ee99b624d1001 Mon Sep 17 00:00:00 2001 From: Claus Date: Fri, 7 Aug 2020 10:00:08 +0200 Subject: [PATCH 031/197] Merge pull request #8605 from bjarnef/v8/bug/fix-self-closing-umb-toggle Fix self closing umb-toggle (cherry picked from commit f7588da5144a8da757693e1936d24e1e09b44921) --- .../content/overlays/publishdescendants.html | 18 ++++++++++++------ .../src/views/macros/views/settings.html | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html index 92373d00ff..2a983b229c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html @@ -8,10 +8,13 @@
    - + class="mr2"> + +
    @@ -25,10 +28,13 @@
    - + class="mr2"> + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html index eada93f497..9825a6f919 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html +++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html @@ -38,10 +38,10 @@ - + - + From d00c07592e73318bbc90bfe6fc571dce406cb680 Mon Sep 17 00:00:00 2001 From: Claus Date: Fri, 7 Aug 2020 12:42:28 +0200 Subject: [PATCH 032/197] merging over a bunch of fixes from contrib for element tags not correctly closed. --- .../templatesections/templatesections.html | 4 +- .../components/users/change-password.html | 6 +- .../src/views/content/overlays/publish.html | 5 +- .../overlays/publishdescendants.controller.js | 14 ++-- .../content/overlays/publishdescendants.html | 43 ++++++------ .../src/views/content/overlays/save.html | 15 ++-- .../src/views/content/overlays/schedule.html | 22 +++--- .../views/content/overlays/sendtopublish.html | 11 +-- .../src/views/content/overlays/unpublish.html | 19 +++-- .../src/views/content/protect.html | 15 +++- .../src/views/datatypes/delete.html | 11 +-- .../src/views/documenttypes/create.html | 6 +- .../src/views/logviewer/search.html | 6 +- .../src/views/packages/edit.html | 70 +++++++++++-------- .../listview/layouts.prevalues.html | 69 +++++++++--------- .../listview/orderDirection.prevalues.html | 14 +++- .../radiobuttons/radiobuttons.html | 7 +- .../propertyeditors/rte/rte.prevalues.html | 20 +++--- .../src/views/relationtypes/create.html | 10 ++- .../relationtypes/views/relationType.html | 12 +++- 20 files changed, 216 insertions(+), 163 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html index 045a1403e2..b4e8d7fbe8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html @@ -45,7 +45,9 @@
    - + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html index 38ea13eebb..b6e0b4c123 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html @@ -14,8 +14,10 @@ - + + {{changePasswordForm.resetPassword.errorMsg}} diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html index 4cf4444cfe..71e19651d6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html @@ -19,8 +19,8 @@ name="publishVariantSelector" model="variant.publish" on-change="vm.changeSelection(variant)" - server-validation-field="{{variant.htmlId}}" - > + server-validation-field="{{variant.htmlId}}"> + * @@ -38,6 +38,7 @@ {{publishVariantSelectorForm.publishVariantSelector.errorMsg}} + diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js index 095c4f3fe1..5d4cc7eec7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js @@ -5,23 +5,28 @@ var vm = this; - vm.includeUnpublished = false; + vm.includeUnpublished = $scope.model.includeUnpublished || false; vm.changeSelection = changeSelection; vm.toggleIncludeUnpublished = toggleIncludeUnpublished; - function onInit() { vm.variants = $scope.model.variants; - vm.displayVariants = vm.variants.slice(0);// shallow copy, we dont want to share the array-object(because we will be performing a sort method) but each entry should be shared (because we need validation and notifications). + vm.displayVariants = vm.variants.slice(0); // shallow copy, we don't want to share the array-object (because we will be performing a sort method) but each entry should be shared (because we need validation and notifications). vm.labels = {}; + // get localized texts for use in directives if (!$scope.model.title) { localizationService.localize("buttons_publishDescendants").then(function (value) { $scope.model.title = value; }); } + if (!vm.labels.includeUnpublished) { + localizationService.localize("content_includeUnpublished").then(function (value) { + vm.labels.includeUnpublished = value; + }); + } _.each(vm.variants, function (variant) { variant.isMandatory = isMandatoryFilter(variant); @@ -72,8 +77,9 @@ } function toggleIncludeUnpublished() { - console.log("toggleIncludeUnpublished") vm.includeUnpublished = !vm.includeUnpublished; + // make sure this value is pushed back to the scope + $scope.model.includeUnpublished = vm.includeUnpublished; } /** Returns true if publishing is possible based on if there are un-published mandatory languages */ diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html index 2a983b229c..cfc185818c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html @@ -6,15 +6,13 @@
    - - - +
    @@ -26,15 +24,13 @@
    - - - +
    @@ -44,11 +40,11 @@
    + name="publishVariantSelector" + model="variant.publish" + on-change="vm.changeSelection(variant)" + server-validation-field="{{variant.htmlId}}"> + * @@ -66,6 +62,7 @@ {{publishVariantSelectorForm.publishVariantSelector.errorMsg}} + diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html index dd6e96df95..661dd4162e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html @@ -18,13 +18,12 @@
    - + + * @@ -42,12 +41,12 @@ {{saveVariantSelectorForm.saveVariantSelector.errorMsg}} +
    -

    diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html index 8f515a10e4..fc2f24c648 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html @@ -88,13 +88,12 @@
    - + + * @@ -105,16 +104,14 @@ * + ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)"> - +
    - - -
    @@ -183,12 +180,9 @@
    -

    -
    - diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html index 91fa1799fc..abf39c6542 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html @@ -15,11 +15,11 @@
    + name="publishVariantSelector" + model="variant.publish" + on-change="vm.changeSelection(variant)" + server-validation-field="{{variant.htmlId}}"> + * @@ -37,6 +37,7 @@ {{publishVariantSelectorForm.publishVariantSelector.errorMsg}} + diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html index 94dd9fdac5..5ab32abf00 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html @@ -17,14 +17,13 @@
    - + + * @@ -42,17 +41,15 @@ {{publishVariantSelectorForm.publishVariantSelector.errorMsg}} +
    -

    - - diff --git a/src/Umbraco.Web.UI.Client/src/views/content/protect.html b/src/Umbraco.Web.UI.Client/src/views/content/protect.html index 6377fd7c65..6fb9f78e67 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/protect.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/protect.html @@ -19,7 +19,13 @@

    - + + +
    - + + +
    - + + on-confirm="vm.performDelete" + on-cancel="vm.cancel" + confirm-button-style="danger" + confirm-label-key="general_delete"> diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html index 5aba520b9b..1357965197 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html @@ -86,7 +86,8 @@ + text="Create template for the Parent Document Type"> + @@ -96,7 +97,8 @@ + text="Create template for the Item Document Type"> +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html index b4f910fd7b..6f828ac49f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html +++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html @@ -39,7 +39,11 @@
    - + + diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html index 9f91e1d0f7..45e2a4e376 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html @@ -122,73 +122,81 @@ on-remove="vm.removeContentItem()"> - + + + + -
    - + +
    - + +
    - + +
    - + +
    - + +
    - + +
    - + +
    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 15b66d856d..1240a61fbb 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 @@ -1,50 +1,49 @@
    -
    +
    -
    +
    - + -
    +
    - + + +
    + +
    -
    -
    -
    - -
    - - {{ layout.name }} - (system layout) -
    - -
    - -
    - -
    - -
    - - - +
    + + {{ layout.name }} + (system layout)
    -
    -
    +
    + +
    - +
    + +
    + + + +
    +
    -
    +
    + + + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html index 7ec0895936..b6028ad5bb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html @@ -2,10 +2,20 @@
    • - + +
    • - + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html index 1c3aa898db..82952193e7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html @@ -3,7 +3,12 @@
    • - + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html index ee2929e3ea..d70f469e6f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html @@ -2,22 +2,22 @@
    - + +
    - + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html index beb1962b4e..4d8d94e1aa 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html @@ -14,13 +14,19 @@
      • diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html index 043ced9a5f..100d8d9d09 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html +++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html @@ -11,10 +11,18 @@
      • - + +
      • - + +
      From d5f658f0c12f6213b565bcd029c41a6696cd9084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 7 Aug 2020 14:08:38 +0200 Subject: [PATCH 033/197] rename postFormSubmitting to formSubmittingFinalPhase --- .../services/blockeditormodelobject.service.js | 4 ++-- .../src/common/services/formhelper.service.js | 12 ++++++------ .../inlineblock/inlineblock.editor.controller.js | 4 ++-- 3 files changed, 10 insertions(+), 10 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 9964dac343..0e9abf8503 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 @@ -331,7 +331,7 @@ this.isolatedScope.blockObjects = {}; this.__watchers.push(this.isolatedScope.$on("$destroy", this.destroy.bind(this))); - this.__watchers.push(propertyEditorScope.$on("postFormSubmitting", this.sync.bind(this))); + this.__watchers.push(propertyEditorScope.$on("formSubmittingFinalPhase", this.sync.bind(this))); }; @@ -356,7 +356,7 @@ // re-create the watchers this.__watchers = []; this.__watchers.push(this.isolatedScope.$on("$destroy", this.destroy.bind(this))); - this.__watchers.push(propertyEditorScope.$on("postFormSubmitting", this.sync.bind(this))); + this.__watchers.push(propertyEditorScope.$on("formSubmittingFinalPhase", this.sync.bind(this))); }, /** diff --git a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js index 962961729b..c2f4fb6d68 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js @@ -17,10 +17,10 @@ function formHelper(angularHelper, serverValidationManager, notificationsService * @function * * @description - * Called by controllers when submitting a form - this ensures that all client validation is checked, + * Called by controllers when submitting a form - this ensures that all client validation is checked, * server validation is cleared, that the correct events execute and status messages are displayed. * This returns true if the form is valid, otherwise false if form submission cannot continue. - * + * * @param {object} args An object containing arguments for form submission */ submitForm: function (args) { @@ -45,7 +45,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService args.scope.$broadcast("formSubmitting", { scope: args.scope, action: args.action }); // Some property editors need to perform an action after all property editors have reacted to the formSubmitting. - args.scope.$broadcast("postFormSubmitting", { scope: args.scope, action: args.action }); + args.scope.$broadcast("formSubmittingFinalPhase", { scope: args.scope, action: args.action }); //then check if the form is valid if (!args.skipValidation) { @@ -73,7 +73,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService * * @description * Called by controllers when a form has been successfully submitted, this ensures the correct events are raised. - * + * * @param {object} args An object containing arguments for form submission */ resetForm: function (args) { @@ -109,7 +109,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService * @description * Needs to be called when a form submission fails, this will wire up all server validation errors in ModelState and * add the correct messages to the notifications. If a server error has occurred this will show a ysod. - * + * * @param {object} err The error object returned from the http promise */ handleError: function (err) { @@ -148,7 +148,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService * * @description * This wires up all of the server validation model state so that valServer and valServerField directives work - * + * * @param {object} err The error object returned from the http promise */ handleServerValidation: function (modelState) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js index c2c86ca824..06c1424838 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js @@ -12,8 +12,8 @@ // boardcast the formSubmitting event to trigger syncronization or none-live property-editors $scope.$broadcast("formSubmitting", { scope: $scope }); // Some property editors need to performe an action after all property editors have reacted to the formSubmitting. - $scope.$broadcast("postFormSubmitting", { scope: $scope }); - + $scope.$broadcast("formSubmittingFinalPhase", { scope: $scope }); + block.active = false; } else { $scope.api.activateBlock(block); From 015dc9944a773ef4cc3a185212aaadadc21ddb0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 7 Aug 2020 15:04:24 +0200 Subject: [PATCH 034/197] set settingsPreview when updated --- .../prevalue/blocklist.blockconfiguration.overlay.controller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js index cc3e85494a..b1937e718d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js @@ -100,6 +100,7 @@ }; vm.applySettingsToBlock = function(block, key) { block.settingsElementTypeKey = key; + vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey); }; vm.requestRemoveSettingsForBlock = function(block) { From 35b66529493058cbde8a0df806d9d11df82b0ec5 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Fri, 7 Aug 2020 23:37:32 +1000 Subject: [PATCH 035/197] Fix server validation issue with block editor due to cultures not being carried over correctly (#8594) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Niels Lyngsø --- .../application/umblogin.directive.js | 1 + .../components/content/edit.controller.js | 1 + .../validation/valformmanager.directive.js | 5 +- .../validation/valpropertymsg.directive.js | 10 ++- .../validation/valservermatch.directive.js | 2 + .../blockeditormodelobject.service.js | 3 +- .../services/contenteditinghelper.service.js | 3 + .../src/common/services/formhelper.service.js | 19 ++++- .../common/overlays/user/user.controller.js | 2 +- .../content.createblueprint.controller.js | 72 +++++++++---------- .../src/views/datatypes/create.controller.js | 3 +- .../datatypes/datatype.edit.controller.js | 1 + .../dictionary.create.controller.js | 3 +- .../dictionary/dictionary.edit.controller.js | 4 +- .../views/documenttypes/create.controller.js | 8 +-- .../src/views/languages/edit.controller.js | 2 +- .../views/macros/macros.create.controller.js | 3 +- .../views/macros/macros.edit.controller.js | 3 +- .../src/views/media/media.edit.controller.js | 1 + .../src/views/mediatypes/create.controller.js | 5 +- .../views/member/member.edit.controller.js | 2 +- .../src/views/membergroups/edit.controller.js | 1 + .../views/membertypes/create.controller.js | 4 +- .../src/views/packages/edit.controller.js | 3 +- .../partialviewmacros/create.controller.js | 3 +- .../views/partialviews/create.controller.js | 3 +- .../umbBlockListPropertyEditor.component.js | 45 ++++++++---- .../views/relationtypes/create.controller.js | 3 +- .../views/relationtypes/edit.controller.js | 3 +- .../src/views/scripts/create.controller.js | 11 +-- .../views/stylesheets/create.controller.js | 15 ++-- .../src/views/users/user.controller.js | 6 +- 32 files changed, 159 insertions(+), 91 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 c2b298ad24..43598593f4 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 @@ -168,6 +168,7 @@ vm.inviteStep = 2; }, function (err) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); formHelper.handleError(err); vm.invitedUserPasswordModel.buttonState = "error"; }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js index e3c2913e4e..d02c48750a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js @@ -581,6 +581,7 @@ eventsService.emit("content.unpublished", { content: $scope.content }); overlayService.close(); }, function (err) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); $scope.page.buttonGroupState = 'error'; handleHttpException(err); }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js index 47f1145600..77c26e066e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js @@ -159,9 +159,6 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location element.removeClass(SHOW_VALIDATION_CLASS_NAME); scope.showValidation = false; notifySubView(); - //clear form state as at this point we retrieve new data from the server - //and all validation will have cleared at this point - formCtrl.$setPristine(); })); var confirmed = false; @@ -238,6 +235,8 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location } }); + // TODO: I'm unsure why this exists, i believe this may be a hack for something like tinymce which might automatically + // change a form value on load but we need it to be $pristine? $timeout(function () { formCtrl.$setPristine(); }, 1000); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js index 979ac23bb3..26c0403f85 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js @@ -306,7 +306,15 @@ function valPropertyMsg(serverValidationManager, localizationService, angularHel formCtrl.$setValidity('valPropertyMsg', false); startWatch(); - + // This check is required in order to be able to reset ourselves and is typically for complex editor + // scenarios where the umb-property itself doesn't contain any ng-model controls which means that the + // above serverValidityResetter technique will not work to clear valPropertyMsg errors. + // In order for this to work we rely on the current form controller's $pristine state. This means that anytime + // the form is submitted whether there are validation errors or not the state must be reset... this is automatically + // taken care of with the formHelper.resetForm method that should be used in all cases. $pristine is required because it's + // a value that is cascaded to all form controls based on the hierarchy of child ng-model controls. This allows us to easily + // know if a value has changed. The alternative is what we used to do which was to put a deep $watch on the entire complex value + // which is hugely inefficient. if (propertyErrors.length === 1 && hadError && !formCtrl.$pristine) { var propertyValidationPath = umbPropCtrl.getValidationPath(); serverValidationManager.removePropertyError(propertyValidationPath, currentCulture, "", currentSegment); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js index 1b4c593735..5f8600c8c0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js @@ -54,6 +54,8 @@ function valServerMatch(serverValidationManager) { function bindCallback(validationKey, matchVal, matchType) { + if (!matchVal) return; + if (Utilities.isString(matchVal)) { matchVal = [matchVal]; // normalize to an array since the value can also natively be an array } 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 0e9abf8503..5cc717be46 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 @@ -351,7 +351,8 @@ // update our values this.value = propertyModelValue; this.value.layout = this.value.layout || {}; - this.value.data = this.value.data || []; + this.value.contentData = this.value.contentData || []; + this.value.settingsData = this.value.settingsData || []; // re-create the watchers this.__watchers = []; diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js index cda10ee6df..4ffd0c3c0b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js @@ -117,6 +117,9 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt return $q.resolve(data); }, function (err) { + + formHelper.resetForm({ scope: args.scope, hasErrors: true }); + self.handleSaveError({ showNotifications: args.showNotifications, softRedirect: args.softRedirect, diff --git a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js index c2f4fb6d68..5866e28b1e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js @@ -47,6 +47,9 @@ function formHelper(angularHelper, serverValidationManager, notificationsService // Some property editors need to perform an action after all property editors have reacted to the formSubmitting. args.scope.$broadcast("formSubmittingFinalPhase", { scope: args.scope, action: args.action }); + // Set the form state to submitted + currentForm.$setSubmitted(); + //then check if the form is valid if (!args.skipValidation) { if (currentForm.$invalid) { @@ -77,14 +80,28 @@ function formHelper(angularHelper, serverValidationManager, notificationsService * @param {object} args An object containing arguments for form submission */ resetForm: function (args) { + + var currentForm; + if (!args) { throw "args cannot be null"; } if (!args.scope) { throw "args.scope cannot be null"; } + if (!args.formCtrl) { + //try to get the closest form controller + currentForm = angularHelper.getRequiredCurrentForm(args.scope); + } + else { + currentForm = args.formCtrl; + } - args.scope.$broadcast("formSubmitted", { scope: args.scope }); + // Set the form state to pristine + currentForm.$setPristine(); + currentForm.$setUntouched(); + + args.scope.$broadcast(args.hasErrors ? "formSubmittedValidationFailed" : "formSubmitted", { scope: args.scope }); }, showNotifications: function (args) { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js index 8248d11863..115e2dd6a3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js @@ -160,7 +160,7 @@ angular.module("umbraco") }, 2000); }, function (err) { - + formHelper.resetForm({ scope: $scope, hasErrors: true }); formHelper.handleError(err); $scope.changePasswordButtonState = "error"; diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js index 9a2c845d49..afd844aa01 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js @@ -1,50 +1,50 @@ (function () { - function CreateBlueprintController( - $scope, - contentResource, - navigationService, - localizationService, - formHelper, - contentEditingHelper) { + function CreateBlueprintController( + $scope, + contentResource, + navigationService, + localizationService, + formHelper, + contentEditingHelper) { - $scope.message = { - name: $scope.currentNode.name - }; + $scope.message = { + name: $scope.currentNode.name + }; - localizationService.localize("blueprints_createBlueprintFrom", ["" + $scope.message.name + ""]).then(function (localizedVal) { - $scope.title = localizedVal; - }); + localizationService.localize("blueprints_createBlueprintFrom", ["" + $scope.message.name + ""]).then(function (localizedVal) { + $scope.title = localizedVal; + }); - $scope.cancel = function () { - navigationService.hideMenu(); - }; + $scope.cancel = function () { + navigationService.hideMenu(); + }; - $scope.create = function () { - if (formHelper.submitForm({ - scope: $scope, - formCtrl: this.blueprintForm - })) { + $scope.create = function () { + if (formHelper.submitForm({ + scope: $scope, + formCtrl: this.blueprintForm + })) { - contentResource.createBlueprintFromContent($scope.currentNode.id, $scope.message.name) - .then(function(data) { + contentResource.createBlueprintFromContent($scope.currentNode.id, $scope.message.name) + .then(function (data) { - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope }); - navigationService.hideMenu(); - }, - function(err) { - - contentEditingHelper.handleSaveError({ - err: err - }); + navigationService.hideMenu(); + }, + function (err) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); + contentEditingHelper.handleSaveError({ + err: err + }); + } + ); } - ); - } - }; - } + }; + } - angular.module("umbraco").controller("Umbraco.Editors.Content.CreateBlueprintController", CreateBlueprintController); + angular.module("umbraco").controller("Umbraco.Editors.Content.CreateBlueprintController", CreateBlueprintController); }()); diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js index 15e1a9402e..9bc602678e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js @@ -28,10 +28,11 @@ function DataTypeCreateController($scope, $location, navigationService, dataType var currPath = node.path ? node.path : "-1"; navigationService.syncTree({ tree: "datatypes", path: currPath + "," + folderId, forceReload: true, activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderFor }); }, function(err) { + formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderFor, hasErrors: true }); // TODO: Handle errors }); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js index 66983bbc05..a2af8c8239 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js @@ -128,6 +128,7 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic }, function(err) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); //NOTE: in the case of data type values we are setting the orig/new props // to be the same thing since that only really matters for content/media. contentEditingHelper.handleSaveError({ diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js index 82c4e6e7b5..2be4e522c3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js @@ -28,13 +28,14 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig navigationService.syncTree({ tree: "dictionary", path: currPath + "," + data, forceReload: true, activate: true }); // reset form state - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: this.createDictionaryForm }); // navigate to edit view var currentSection = appState.getSectionState("currentSection"); $location.path("/" + currentSection + "/dictionary/edit/" + data); }, function (err) { + formHelper.resetForm({ scope: $scope, formCtrl: this.createDictionaryForm, hasErrors: true }); if (err.data && err.data.message) { notificationsService.error(err.data.message); navigationService.hideMenu(); diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js index ea1ca00b21..7619c7abfc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js @@ -86,7 +86,7 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes dictionaryResource.save(vm.content, vm.nameDirty) .then(function (data) { - formHelper.resetForm({ scope: $scope, notifications: data.notifications }); + formHelper.resetForm({ scope: $scope }); bindDictionary(data); @@ -94,6 +94,8 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes }, function (err) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); + contentEditingHelper.handleSaveError({ err: err }); diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js index 732aa898a7..2348b43852 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js @@ -47,12 +47,13 @@ function DocumentTypesCreateController($scope, $location, navigationService, con activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm }); var section = appState.getSectionState("currentSection"); }, function (err) { + formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm, hasErrors: true }); $scope.error = err; }); @@ -83,9 +84,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con $location.search('create', null); $location.search('notemplate', null); - formHelper.resetForm({ - scope: $scope - }); + formHelper.resetForm({ scope: $scope, formCtrl: this.createDoctypeCollectionForm }); var section = appState.getSectionState("currentSection"); @@ -94,6 +93,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con }, function (err) { + formHelper.resetForm({ scope: $scope, formCtrl: this.createDoctypeCollectionForm, hasErrors: true }); $scope.error = err; //show any notifications diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js index 96441e6101..a030e0d77f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js @@ -161,7 +161,7 @@ }, function (err) { vm.page.saveButtonState = "error"; - + formHelper.resetForm({ scope: $scope, hasErrors: true }); formHelper.handleError(err); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js index e2559741a2..e8c5c550d0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js @@ -25,7 +25,7 @@ function MacrosCreateController($scope, $location, macroResource, navigationServ navigationService.syncTree({ tree: "macros", path: currPath + "," + data, forceReload: true, activate: true }); // reset form state - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: this.createMacroForm }); // navigate to edit view var currentSection = appState.getSectionState("currentSection"); @@ -33,6 +33,7 @@ function MacrosCreateController($scope, $location, macroResource, navigationServ }, function (err) { + formHelper.resetForm({ scope: $scope, formCtrl: this.createMacroForm, hasErrors: true }); if (err.data && err.data.message) { notificationsService.error(err.data.message); navigationService.hideMenu(); diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js index 3261739d36..127f566995 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js @@ -33,10 +33,11 @@ function MacrosEditController($scope, $q, $routeParams, macroResource, editorSta vm.page.saveButtonState = "busy"; macroResource.saveMacro(vm.macro).then(function (data) { - formHelper.resetForm({ scope: $scope, notifications: data.notifications }); + formHelper.resetForm({ scope: $scope }); bindMacro(data); vm.page.saveButtonState = "success"; }, function (error) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); contentEditingHelper.handleSaveError({ err: error }); diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js index a7ce67fc0b..c5d35ad241 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js @@ -206,6 +206,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource, }, function(err) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); contentEditingHelper.handleSaveError({ err: err, rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data) diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js index 8ff9106def..3b7e163840 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js @@ -30,11 +30,12 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT var currPath = node.path ? node.path : "-1"; navigationService.syncTree({ tree: "mediatypes", path: currPath + "," + folderId, forceReload: true, activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm }); var section = appState.getSectionState("currentSection"); - }, function(err) { + }, function (err) { + formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm, hasErrors: true }); $scope.error = err; }); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js index 3ec76deb8e..2cee0420cd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js @@ -208,7 +208,7 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: true }); }, function (err) { - + formHelper.resetForm({ scope: $scope, hasErrors: true }); contentEditingHelper.handleSaveError({ err: err, rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data) diff --git a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.controller.js index 00c6dfbba8..4602a5aa25 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.controller.js @@ -88,6 +88,7 @@ function MemberGroupsEditController($scope, $routeParams, appState, navigationSe }, function (err) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); contentEditingHelper.handleSaveError({ err: err }); diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js index adf6cbc8a6..d875442827 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js @@ -31,10 +31,10 @@ function MemberTypesCreateController($scope, $location, navigationService, membe var currPath = node.path ? node.path : "-1"; navigationService.syncTree({ tree: "membertypes", path: currPath + "," + folderId, forceReload: true, activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm }); }, function(err) { - + formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm, hasErrors: true }); // TODO: Handle errors }); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js index 63750ff0f2..de8ad6d1c4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js @@ -194,7 +194,7 @@ vm.package = updatedPackage; vm.buttonState = "success"; - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: editPackageForm }); if (create) { //if we are creating, then redirect to the correct url and reload @@ -204,6 +204,7 @@ } }, function (err) { + formHelper.resetForm({ scope: $scope, formCtrl: editPackageForm, hasErrors: true }); formHelper.handleError(err); vm.buttonState = "error"; }); diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js index 52b58d094d..a843f420c8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js @@ -46,12 +46,13 @@ activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: form }); var section = appState.getSectionState("currentSection"); }, function (err) { + formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true }); vm.createFolderError = err; }); diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js index fbde1d5a07..97aa059806 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js @@ -56,12 +56,13 @@ activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: form }); var section = appState.getSectionState("currentSection"); }, function(err) { + formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true }); vm.createFolderError = err; }); } 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 928e627fa3..89f7c5d4d0 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 @@ -202,23 +202,36 @@ return "views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html"; } + /** + * Ensure that the containing content variant languag and current property culture is transfered along + * to the scaffolded content object representing this block. + * This is required for validation along with ensuring that the umb-property inheritance is constently maintained. + * @param {any} content + */ + function ensureCultureData(content) { + + if (!content) return; + + if (vm.umbVariantContent.editor.content.language) { + // set the scaffolded content's language to the language of the current editor + content.language = vm.umbVariantContent.editor.content.language; + } + // currently we only ever deal with invariant content for blocks so there's only one + content.variants[0].tabs.forEach(tab => { + tab.properties.forEach(prop => { + // set the scaffolded property to the culture of the containing property + prop.culture = vm.umbProperty.property.culture; + }); + }); + } + function getBlockObject(entry) { var block = modelObject.getBlockObject(entry); if (block === null) return null; - // ensure that the containing content variant language/culture is transfered along - // to the scaffolded content object representing this block. This is required for validation - // along with ensuring that the umb-property inheritance is constently maintained. - if (vm.umbVariantContent.editor.content.language) { - block.content.language = vm.umbVariantContent.editor.content.language; - // currently we only ever deal with invariant content for blocks so there's only one - block.content.variants[0].tabs.forEach(tab => { - tab.properties.forEach(prop => { - prop.culture = vm.umbVariantContent.editor.content.language.culture; - }); - }); - } + ensureCultureData(block.content); + ensureCultureData(block.settings); // TODO: Why is there a '/' prefixed? that means this will never work with virtual directories block.view = (block.config.view ? "/" + block.config.view : getDefaultViewForBlock(block)); @@ -272,8 +285,12 @@ var removed = vm.layout.splice(layoutIndex, 1); removed.forEach(x => { // remove any server validation errors associated - var guid = udiService.getKey(x.contentUdi); - serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" }); + var guids = [udiService.getKey(x.contentUdi), (x.settingsUdi ? udiService.getKey(x.settingsUdi) : null)]; + guids.forEach(guid => { + if (guid) { + serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" }); + } + }) }); modelObject.removeDataAndDestroyModel(block); diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js index 71f59a9a1f..b2fbee4b36 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js @@ -36,11 +36,12 @@ function RelationTypeCreateController($scope, $location, relationTypeResource, n var currentPath = node.path ? node.path : "-1"; navigationService.syncTree({ tree: "relationTypes", path: currentPath + "," + data, forceReload: true, activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: this.createRelationTypeForm }); var currentSection = appState.getSectionState("currentSection"); $location.path("/" + currentSection + "/relationTypes/edit/" + data); }, function (err) { + formHelper.resetForm({ scope: $scope, formCtrl: this.createRelationTypeForm, hasErrors: true }); if (err.data && err.data.message) { notificationsService.error(err.data.message); navigationService.hideMenu(); diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js index 74b3e31b87..a39b48c278 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js @@ -116,12 +116,13 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource, vm.page.saveButtonState = "busy"; relationTypeResource.save(vm.relationType).then(function (data) { - formHelper.resetForm({ scope: $scope, notifications: data.notifications }); + formHelper.resetForm({ scope: $scope }); bindRelationType(data); vm.page.saveButtonState = "success"; }, function (error) { + formHelper.resetForm({ scope: $scope, hasErrors: true }); contentEditingHelper.handleSaveError({ err: error }); diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js index 096ae72e61..14d7e54a66 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js @@ -27,7 +27,7 @@ function createFolder(form) { - if (formHelper.submitForm({scope: $scope, formCtrl: form })) { + if (formHelper.submitForm({ scope: $scope, formCtrl: form })) { codefileResource.createContainer("scripts", node.id, vm.folderName).then(function (saved) { @@ -40,14 +40,15 @@ activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: form }); var section = appState.getSectionState("currentSection"); - }, function(err) { + }, function (err) { + + formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true }); + vm.createFolderError = err; - vm.createFolderError = err; - }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js index 6033a6bdc7..af80878c35 100644 --- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js @@ -22,14 +22,14 @@ $location.path("/settings/stylesheets/edit/" + node.id).search("create", "true").search("rtestyle", "true"); navigationService.hideMenu(); } - + function showCreateFolder() { vm.creatingFolder = true; } function createFolder(form) { - if (formHelper.submitForm({scope: $scope, formCtrl: form })) { + if (formHelper.submitForm({ scope: $scope, formCtrl: form })) { codefileResource.createContainer("stylesheets", node.id, vm.folderName).then(function (saved) { @@ -42,12 +42,13 @@ activate: true }); - formHelper.resetForm({ scope: $scope }); + formHelper.resetForm({ scope: $scope, formCtrl: form }); - }, function(err) { + }, function (err) { + + formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true }); + vm.createFolderError = err; - vm.createFolderError = err; - }); } @@ -57,7 +58,7 @@ const showMenu = true; navigationService.hideDialog(showMenu); } - + } angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.CreateController", StyleSheetsCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js index 19218d3d08..ac99e3d35d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js @@ -168,7 +168,9 @@ extendedSave(saved).then(function (result) { //if all is good, then reset the form formHelper.resetForm({ scope: $scope }); - }, Utilities.noop); + }, function () { + formHelper.resetForm({ scope: $scope, hasErrors: true }); + }); vm.user = _.omit(saved, "navigation"); //restore @@ -179,7 +181,7 @@ vm.page.saveButtonState = "success"; }, function (err) { - + formHelper.resetForm({ scope: $scope, hasErrors: true }); contentEditingHelper.handleSaveError({ err: err, showNotifications: true From 79478cd5e2d0aeb091379ae662c49c05613b1405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 7 Aug 2020 16:11:13 +0200 Subject: [PATCH 036/197] highlight validation issues for content part of blocks, first take. --- .../inlineblock/inlineblock.editor.html | 2 +- .../inlineblock/inlineblock.editor.less | 53 +++++++++++++++++-- .../labelblock/labelblock.editor.less | 40 +++++++++++++- 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html index 360eeed8c0..e5a46cbdeb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html @@ -6,7 +6,7 @@ ng-focus="block.focus"> - {{block.label}} + {{block.label}}
      diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less index 2be20946b8..08306deeba 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less @@ -22,6 +22,7 @@ background-color: white; .caret { + vertical-align: middle; transform: rotate(-90deg); transition: transform 80ms ease-out; } @@ -32,7 +33,8 @@ vertical-align: middle; } - span { + span.name { + position: relative; display: inline-block; vertical-align: middle; } @@ -54,10 +56,55 @@ } } - &.--error { - border-color: @formErrorBorder !important; + + ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > .umb-block-list__block--content > div > & { + > button { + color: @formErrorText; + span.caret { + border-top-color: @formErrorText; + } + } + } + ng-form.ng-invalid-val-server-match-content > .umb-block-list__block:not(.--active) > .umb-block-list__block--content > div > & { + > button { + span.name { + &::after { + content: "!"; + text-align: center; + position: absolute; + top: -6px; + right: -15px; + min-width: 10px; + color: @white; + background-color: @ui-active-type; + border: 2px solid @white; + border-radius: 50%; + font-size: 10px; + font-weight: bold; + padding: 2px; + line-height: 10px; + background-color: @formErrorText; + font-weight: 900; + + animation-duration: 1.4s; + animation-iteration-count: infinite; + animation-name: blockelement-inlineblock-editor--badge-bounce; + animation-timing-function: ease; + @keyframes blockelement-inlineblock-editor--badge-bounce { + 0% { transform: translateY(0); } + 20% { transform: translateY(-4px); } + 40% { transform: translateY(0); } + 55% { transform: translateY(-2px); } + 70% { transform: translateY(0); } + 100% { transform: translateY(0); } + } + } + } + } } } + + .blockelement-inlineblock-editor__inner { border-top: 1px solid @gray-8; background-color: @gray-12; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less index 51fb7242ef..f589249f97 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less @@ -24,6 +24,7 @@ } span { + position: relative; display: inline-block; vertical-align: middle; } @@ -39,7 +40,42 @@ background-color: @ui-active; } - &.--error { - border-color: @formErrorBorder !important; + ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > .umb-block-list__block--content > div > & { + color: @formErrorText; + } + ng-form.ng-invalid-val-server-match-content > .umb-block-list__block:not(.--active) > .umb-block-list__block--content > div > & { + span { + &::after { + content: "!"; + text-align: center; + position: absolute; + top: -6px; + right: -15px; + min-width: 10px; + color: @white; + background-color: @ui-active-type; + border: 2px solid @white; + border-radius: 50%; + font-size: 10px; + font-weight: bold; + padding: 2px; + line-height: 10px; + background-color: @formErrorText; + font-weight: 900; + + animation-duration: 1.4s; + animation-iteration-count: infinite; + animation-name: blockelement-inlineblock-editor--badge-bounce; + animation-timing-function: ease; + @keyframes blockelement-inlineblock-editor--badge-bounce { + 0% { transform: translateY(0); } + 20% { transform: translateY(-4px); } + 40% { transform: translateY(0); } + 55% { transform: translateY(-2px); } + 70% { transform: translateY(0); } + 100% { transform: translateY(0); } + } + } + } } } From 5d73949b7a75ad1ee923ce75d6be84c3dbe9a515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 10 Aug 2020 11:37:39 +0200 Subject: [PATCH 037/197] validation highlight for custom view --- .../umb-block-list-property-editor.less | 53 +++++++++++++++++-- .../blocklist/umb-block-list-row.html | 2 +- .../umbBlockListPropertyEditor.component.js | 1 + 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less index 0c92aef44b..0c7d58d245 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less @@ -99,11 +99,54 @@ ng-form.ng-invalid-val-server-match-settings > .umb-block-list__block > .umb-blo } .umb-block-list__block--content { - position: relative; - width: 100%; - min-height: @umb-block-list__item_minimum_height; - background-color: @white; - border-radius: @baseBorderRadius; + + > div { + position: relative; + width: 100%; + min-height: @umb-block-list__item_minimum_height; + background-color: @white; + border-radius: @baseBorderRadius; + box-sizing: border-box; + } + + &.--show-validation { + ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > & > div { + border: 2px solid @formErrorText; + border-radius: @baseBorderRadius; + &::after { + content: "!"; + position: absolute; + top: -12px; + right: -12px; + display: inline-flex; + align-items: center; + justify-content: center; + width: 18px; + height: 18px; + border-radius: 50%; + font-size: 13px; + text-align: center; + font-weight: bold; + background-color: @errorBackground; + color: @errorText; + border: 2px solid @white; + font-weight: 900; + + animation-duration: 1.4s; + animation-iteration-count: infinite; + animation-name: umb-block-list__block--content--badge-bounce; + animation-timing-function: ease; + @keyframes umb-block-list__block--content--badge-bounce { + 0% { transform: translateY(0); } + 20% { transform: translateY(-6px); } + 40% { transform: translateY(0); } + 55% { transform: translateY(-3px); } + 70% { transform: translateY(0); } + 100% { transform: translateY(0); } + } + } + } + } } .blockelement__draggable-element { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html index b76a5d583d..c2657985cf 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html @@ -3,7 +3,7 @@ Date: Mon, 3 Aug 2020 12:39:07 +0200 Subject: [PATCH 038/197] Fix issue with tour's next button not clickable when infinite editing bar is open --- src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml index bd8d23a851..68670b16d2 100644 --- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml @@ -72,16 +72,16 @@
      - - - - +
    - + + + + From 425d0ba544c897328c7efdf96c2532a49fbadef4 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 11 Aug 2020 16:17:58 +0200 Subject: [PATCH 039/197] Remove dependency on the testdata project in Web.UI #8616 --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 7b3a24512f..0de757531a 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -126,10 +126,6 @@ {52ac0ba8-a60e-4e36-897b-e8b97a54ed1c} Umbraco.ModelsBuilder.Embedded - - {fb5676ed-7a69-492c-b802-e7b24144c0fc} - Umbraco.TestData - {651e1350-91b6-44b7-bd60-7207006d7003} Umbraco.Web From ad166921a8d4d900d196901ca623993fccadd94d Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Tue, 11 Aug 2020 22:42:26 +0200 Subject: [PATCH 040/197] Updates Cypress to future latest --- src/Umbraco.Tests.AcceptanceTest/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json index 3b4177ce3f..376984b3b8 100644 --- a/src/Umbraco.Tests.AcceptanceTest/package.json +++ b/src/Umbraco.Tests.AcceptanceTest/package.json @@ -5,9 +5,9 @@ }, "devDependencies": { "cross-env": "^7.0.2", - "ncp": "^2.0.0", "cypress": "^4.9.0", - "umbraco-cypress-testhelpers": "1.0.0-beta-44" + "ncp": "^2.0.0", + "umbraco-cypress-testhelpers": "^1.0.0-beta-47" }, "dependencies": { "typescript": "^3.9.2" From 52500cce3891064d3d2ed09a67358fa53924b025 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Tue, 11 Aug 2020 22:43:16 +0200 Subject: [PATCH 041/197] Creates tests for content --- .../cypress/integration/Content/content.ts | 418 ++++++++++++++++++ 1 file changed, 418 insertions(+) create mode 100644 src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts new file mode 100644 index 0000000000..deeb21a4a9 --- /dev/null +++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts @@ -0,0 +1,418 @@ +/// +import { DocumentTypeBuilder } from 'umbraco-cypress-testhelpers'; +context('Content', () => { + + beforeEach(() => { + cy.umbracoLogin(Cypress.env('username'), Cypress.env('password')); + }); + + it('Copy content', () => { + const rootdocTypeName = "Test document type"; + const childDocTypeName = "Child test document type"; + const nodeName = "1) Home"; + const childNodeName = "1) Child"; + const anotherNodeName = "2) Home"; + + const childDocType = new DocumentTypeBuilder() + .withName(childDocTypeName) + .build(); + + cy.deleteAllContent(); + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName); + + cy.saveDocumentType(childDocType).then((generatedDocType) => + { + const rootDocType = new DocumentTypeBuilder() + .withName(rootdocTypeName) + .withAllowAsRoot(true) + .withAllowedContentTypes(generatedDocType["id"]) + .build(); + + cy.saveDocumentType(rootDocType); + }); + + cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick(); + + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + + // Type name + cy.umbracoEditorHeaderName(nodeName); + + // Save + cy.get('.btn-info').click(); + cy.umbracoSuccessNotification().should('be.visible'); + + // Add an item under root node + cy.umbracoTreeItem("content", [nodeName]).rightclick(); + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.umb-actions').first().click(); + cy.umbracoEditorHeaderName(childNodeName); + cy.get('.btn-info').click(); + + // Add second root node + cy.get('li .umb-tree-root:contains("Content")').rightclick(); + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + cy.umbracoEditorHeaderName(anotherNodeName); + cy.get('.btn-info').click(); + + // Copy node + cy.umbracoTreeItem("content", [nodeName, childNodeName]).rightclick({force:true}); + cy.umbracoContextMenuAction("action-copy").click(); + cy.get('.umb-pane [data-element="tree-item-' + anotherNodeName + '"]').click(); + cy.get('.umb-dialog-footer > .btn-primary').click(); + + // Assert + cy.get('.alert-success').should('exist'); + + // Clean up (content is automatically deleted when document types are gone) + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName); + }); + + it('Move content', () => { + const rootdocTypeName = "Test document type"; + const childDocTypeName = "Child test document type"; + const nodeName = "1) Home"; + const childNodeName = "1) Child"; + const anotherNodeName = "2) Home"; + + const childDocType = new DocumentTypeBuilder() + .withName(childDocTypeName) + .build(); + + cy.deleteAllContent(); + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName); + + cy.saveDocumentType(childDocType).then((generatedDocType) => + { + const rootDocType = new DocumentTypeBuilder() + .withName(rootdocTypeName) + .withAllowAsRoot(true) + .withAllowedContentTypes(generatedDocType["id"]) + .build(); + + cy.saveDocumentType(rootDocType); + }); + + cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick(); + + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + + // Type name + cy.umbracoEditorHeaderName(nodeName); + + // Save + cy.get('.btn-info').click(); + cy.umbracoSuccessNotification().should('be.visible'); + + // Add an item under root node + cy.umbracoTreeItem("content", [nodeName]).rightclick(); + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.umb-actions').first().click(); + cy.umbracoEditorHeaderName(childNodeName); + cy.get('.btn-info').click(); + + // Add second root node + cy.get('li .umb-tree-root:contains("Content")').rightclick(); + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + cy.umbracoEditorHeaderName(anotherNodeName); + cy.get('.btn-info').click(); + + // Move node + cy.umbracoTreeItem("content", [nodeName, childNodeName]).rightclick({force:true}); + cy.umbracoContextMenuAction("action-move").click(); + cy.get('.umb-pane [data-element="tree-item-' + anotherNodeName + '"]').click(); + cy.get('.umb-dialog-footer > .btn-primary').click(); + + // Assert + cy.get('.alert-success').should('exist'); + + // Clean up (content is automatically deleted when document types are gone) + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName); + }); + + it('Sort content', () => { + const rootdocTypeName = "Test document type"; + const childDocTypeName = "Child test document type"; + const nodeName = "1) Home"; + const firstChildNodeName = "1) Child"; + const secondChildNodeName = "2) Child"; + + const childDocType = new DocumentTypeBuilder() + .withName(childDocTypeName) + .build(); + + cy.deleteAllContent(); + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName); + + cy.saveDocumentType(childDocType).then((generatedDocType) => { + const rootDocType = new DocumentTypeBuilder() + .withName(rootdocTypeName) + .withAllowAsRoot(true) + .withAllowedContentTypes(generatedDocType["id"]) + .build(); + + cy.saveDocumentType(rootDocType); + }); + + cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick(); + + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + + // Type name + cy.umbracoEditorHeaderName(nodeName); + + // Save + cy.get('.btn-info').click(); + cy.umbracoSuccessNotification().should('be.visible'); + + // Add an item under root node + cy.umbracoTreeItem("content", [nodeName]).rightclick(); + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.umb-actions').first().click(); + cy.umbracoEditorHeaderName(firstChildNodeName); + cy.get('.btn-info').click(); + + // Add an item under root node + cy.umbracoTreeItem("content", [nodeName]).rightclick(); + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.umb-actions').first().click(); + cy.umbracoEditorHeaderName(secondChildNodeName); + cy.get('.btn-info').click(); + + // Sort nodes + cy.umbracoTreeItem("content", [nodeName]).rightclick({ force: true }); + cy.umbracoContextMenuAction("action-sort").click(); + + const offsetFirstElm = cy.get('.ui-sortable .ui-sortable-handle :nth-child(2)').eq(0).then($el => $el.offset()); + offsetFirstElm.then((offsetFirstElm) => { + const pageYFirst = Math.round(offsetFirstElm.top); + + const offsetSecondElm = cy.get('.ui-sortable .ui-sortable-handle :nth-child(2)').eq(1).then($el => $el.offset()); + offsetSecondElm.then((offset) => { + const pageX = Math.round(offset.left); + const pageY = Math.round(offset.top); + + cy.get('.table-sortable').find('tbody :nth-child(1)').eq(0) + .trigger('mousedown', { which: 1, pageX: pageX, pageY: pageYFirst }) + .trigger('mousemove', { which: 1, pageX: pageX, pageY: pageY }) + .trigger('mouseup'); + }) + }); + + // Save and close dialog + cy.get('.umb-modalcolumn .btn-success').click(); + cy.get('.umb-modalcolumn .btn-link').click(); + + // Assert + cy.get('.umb-tree-item [node="child"]').eq(0).should('contain.text', secondChildNodeName); + cy.get('.umb-tree-item [node="child"]').eq(1).should('contain.text', firstChildNodeName); + + // Clean up (content is automatically deleted when document types are gone) + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName); + }); + + it('Rollback content', () => { + const rootdocTypeName = "Test document type"; + const initialNodeName = "Home node"; + const nodeName = "Home"; + + const rootDocType = new DocumentTypeBuilder() + .withName(rootdocTypeName) + .withAllowAsRoot(true) + .build(); + + cy.deleteAllContent(); + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.saveDocumentType(rootDocType); + + cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick(); + + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + + // Type name + cy.umbracoEditorHeaderName(initialNodeName); + + // Save and publish + cy.get('.btn-success').first().click(); + cy.umbracoSuccessNotification().should('be.visible'); + + // Edit header + cy.get('#headerName').clear(); + cy.umbracoEditorHeaderName(nodeName); + + // Save and publish + cy.get('.btn-success').first().click(); + + // Rollback + cy.get('.umb-box-header :button').click(); + + cy.get('.umb-box-content > .ng-scope > .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') + .select(option); + }); + + cy.get('.umb-editor-footer-content__right-side > [button-style="success"] > .umb-button > .btn-success').click(); + + // 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('#headerName').should('have.value', initialNodeName); + + // Clean up (content is automatically deleted when document types are gone) + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName).wait(100); + }); + + it('View audit trail', () => { + const rootdocTypeName = "Test document type"; + const nodeName = "Home"; + const labelName = "Name"; + + const rootDocType = new DocumentTypeBuilder() + .withName(rootdocTypeName) + .withAllowAsRoot(true) + .addGroup() + .addTextBoxProperty() + .withLabel(labelName) + .done() + .done() + .build(); + + cy.deleteAllContent(); + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.saveDocumentType(rootDocType); + + cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick(); + + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + + // Type name + cy.umbracoEditorHeaderName(nodeName); + + // Save and publish + cy.get('.btn-success').first().click(); + cy.umbracoSuccessNotification().should('be.visible'); + + // Navigate to Info app + cy.get(':nth-child(2) > [ng-show="navItem.alias !== \'more\'"]').click(); + + // Assert + cy.get('.history').should('exist'); + + // Clean up (content is automatically deleted when document types are gone) + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + }); + + it('Save draft', () => { + const rootdocTypeName = "Test document type"; + const nodeName = "Home"; + + const rootDocType = new DocumentTypeBuilder() + .withName(rootdocTypeName) + .withAllowAsRoot(true) + .build(); + + cy.deleteAllContent(); + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.saveDocumentType(rootDocType); + + cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick(); + + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + + // Type name + cy.umbracoEditorHeaderName(nodeName); + + // Save + cy.get('.btn-info').click(); + cy.umbracoSuccessNotification().should('be.visible'); + + // Assert + cy.get('[data-element="node-info-status"]').find('.umb-badge').should('contain.text',"Draft"); + + // Clean up (content is automatically deleted when document types are gone) + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + }); + + it('Preview draft', () => { + const rootdocTypeName = "Test document type"; + const nodeName = "Home"; + + const rootDocType = new DocumentTypeBuilder() + .withName(rootdocTypeName) + .withAllowAsRoot(true) + .build(); + + cy.deleteAllContent(); + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.saveDocumentType(rootDocType); + + cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick(); + + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + + // Type name + cy.umbracoEditorHeaderName(nodeName); + + // Save + cy.get('.btn-info').click(); + + // Preview + cy.get('[alias="preview"]').should('be.visible').click(); + + // Assert + cy.umbracoSuccessNotification({ multiple: true }).should('be.visible'); + + // Clean up (content is automatically deleted when document types are gone) + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + }); + + it('Publish draft', () => { + const rootdocTypeName = "Test document type"; + const nodeName = "Home"; + + const rootDocType = new DocumentTypeBuilder() + .withName(rootdocTypeName) + .withAllowAsRoot(true) + .build(); + + cy.deleteAllContent(); + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + cy.saveDocumentType(rootDocType); + + cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick(); + + cy.umbracoContextMenuAction("action-create").click(); + cy.get('.menu-label').first().click(); + + // Type name + cy.umbracoEditorHeaderName(nodeName); + + // Save and publish + cy.get('.btn-success').first().click(); + cy.umbracoSuccessNotification().should('be.visible'); + + // Assert + cy.get('[data-element="node-info-status"]').find('.umb-badge').should('contain.text',"Published"); + + // Clean up (content is automatically deleted when document types are gone) + cy.umbracoEnsureDocumentTypeNameNotExists(rootdocTypeName); + }); +}); From a2dd9ad0c471c86f13e18205bd6eb827d02d9b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 12 Aug 2020 10:34:15 +0200 Subject: [PATCH 042/197] dont render input if not shown. --- .../src/views/components/editor/umb-editor-header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html index 7929f92371..26f03c97ca 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html @@ -42,7 +42,7 @@ localize="placeholder" placeholder="@placeholders_entername" name="headerName" - ng-show="!nameLocked" + ng-if="!nameLocked" ng-model="name" ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}" umb-auto-focus From 244d441dd45fc03ba5001e71dce0fb1904854da5 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 12 Aug 2020 12:04:19 +0100 Subject: [PATCH 043/197] Remove the if security check if access to settings section - seems we do not need to do this We check on the content node itself in the info tab for access to the doctype & template based on the section rather than the null presence of this property --- src/Umbraco.Web/Models/Mapping/CommonMapper.cs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Web/Models/Mapping/CommonMapper.cs b/src/Umbraco.Web/Models/Mapping/CommonMapper.cs index 1276a2a405..f7db17ff74 100644 --- a/src/Umbraco.Web/Models/Mapping/CommonMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/CommonMapper.cs @@ -49,18 +49,9 @@ namespace Umbraco.Web.Models.Mapping public ContentTypeBasic GetContentType(IContentBase source, MapperContext context) { - // TODO: We can resolve the UmbracoContext from the IValueResolver options! - // OMG - if (HttpContext.Current != null && Composing.Current.UmbracoContext != null && Composing.Current.UmbracoContext.Security.CurrentUser != null - && Composing.Current.UmbracoContext.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings))) - { - var contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(source); - var contentTypeBasic = context.Map(contentType); - - return contentTypeBasic; - } - //no access - return null; + var contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(source); + var contentTypeBasic = context.Map(contentType); + return contentTypeBasic; } public string GetTreeNodeUrl(IContentBase source) From 2896e260af489bcc230a1942cfd1acd0ef381994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 13 Aug 2020 07:37:53 +0200 Subject: [PATCH 044/197] Revert "dont render input if not shown." This reverts commit a2dd9ad0c471c86f13e18205bd6eb827d02d9b68. --- .../src/views/components/editor/umb-editor-header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html index 26f03c97ca..7929f92371 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html @@ -42,7 +42,7 @@ localize="placeholder" placeholder="@placeholders_entername" name="headerName" - ng-if="!nameLocked" + ng-show="!nameLocked" ng-model="name" ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}" umb-auto-focus From 00edd197f82e5a768772fb8d6e567183466abaaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 13 Aug 2020 08:13:32 +0200 Subject: [PATCH 045/197] added attribute name-required, which can be used to make name not required. Since the value defaults to true. --- .../components/editor/umbeditorheader.directive.js | 12 +++++++----- .../infiniteeditors/blockeditor/blockeditor.html | 1 + .../views/components/editor/umb-editor-header.html | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js index 58f799e5af..76687dc0d6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js @@ -188,6 +188,7 @@ Use this directive to construct a header inside the main editor window.
@param {string} name The content name. +@param {boolean=} nameRequired Require name to be defined. (True by default) @param {array=} tabs Array of tabs. See example above. @param {array=} navigation Array of sub views. See example above. @param {boolean=} nameLocked Set to true to lock the name. @@ -199,7 +200,7 @@ Use this directive to construct a header inside the main editor window. @param {boolean=} hideAlias Set to true to hide alias. @param {string=} description Add a description to the content. @param {boolean=} hideDescription Set to true to hide description. -@param {boolean=} setpagetitle If true the page title will be set to reflect the type of data the header is working with +@param {boolean=} setpagetitle If true the page title will be set to reflect the type of data the header is working with @param {string=} editorfor The localization to use to aid accessibility on the edit and create screen **/ @@ -207,7 +208,7 @@ Use this directive to construct a header inside the main editor window. 'use strict'; function EditorHeaderDirective(editorService, localizationService, editorState, $rootScope) { - + function link(scope, $injector) { scope.vm = {}; @@ -329,11 +330,11 @@ Use this directive to construct a header inside the main editor window. } scope.accessibility.a11yMessageVisible = !isEmptyOrSpaces(scope.accessibility.a11yMessage); scope.accessibility.a11yNameVisible = !isEmptyOrSpaces(scope.accessibility.a11yName); - + }); } - + function isEmptyOrSpaces(str) { return str === null || str===undefined || str.trim ===''; @@ -348,7 +349,7 @@ Use this directive to construct a header inside the main editor window. }); } - + var directive = { transclude: true, @@ -358,6 +359,7 @@ Use this directive to construct a header inside the main editor window. scope: { name: "=", nameLocked: "=", + nameRequired: "=?", menu: "=", hideActionsMenu: " From 2b73b3ddadcb13520e2b6e9858d68b8360ffe70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 13 Aug 2020 13:12:07 +0200 Subject: [PATCH 046/197] include PublishedPendingChanges as Published state. --- .../content/overlays/publish.controller.js | 21 ++++++++++--------- .../src/views/content/overlays/publish.html | 15 ++++++------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js index decf05be5f..37f005cd47 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js @@ -11,13 +11,13 @@ /** Returns true if publish meets the requirements of mandatory languages */ function canPublish() { - + var hasSomethingToPublish = false; for (var i = 0; i < vm.variants.length; i++) { var variant = vm.variants[i]; - // if varaint is mandatory and not already published: + // if varaint is mandatory and not already published, then we require it to be set to publish: if (variant.publish === false && notPublishedMandatoryFilter(variant)) { return false; } @@ -39,8 +39,9 @@ function hasAnyDataFilter(variant) { - if (variant.name == null || variant.name.length === 0) { - return false; + // if we have a name, then we have data. + if (variant.name != null && variant.name.length > 0) { + return true; } if(variant.isDirty === true) { @@ -77,7 +78,7 @@ } function notPublishedMandatoryFilter(variant) { - return variant.state !== "Published" && isMandatoryFilter(variant); + return variant.state !== "Published" && variant.state !== "PublishedPendingChanges" && isMandatoryFilter(variant); } function isMandatoryFilter(variant) { //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's @@ -98,11 +99,11 @@ vm.variants = $scope.model.variants; _.each(vm.variants, (variant) => { - + // reset to not be published variant.publish = false; variant.save = false; - + variant.isMandatory = isMandatoryFilter(variant); // If we have a variant thats not in the state of NotCreated, then we know we have adata and its not a new content node. @@ -112,12 +113,12 @@ }); _.each(vm.variants, (variant) => { - + // if this is a new node and we have data on this variant. if(vm.isNew === true && hasAnyDataFilter(variant)) { variant.save = true; } - + }); vm.availableVariants = vm.variants.filter(publishableVariantFilter); @@ -139,7 +140,7 @@ if (a.language.name < b.language.name) { return 1; } - } + } if (a.segment && b.segment) { if (a.segment > b.segment) { return -1; diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html index 71e19651d6..c3e0b90f5f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html @@ -21,19 +21,16 @@ on-change="vm.changeSelection(variant)" server-validation-field="{{variant.htmlId}}"> - - - * - - - - — {{variant.language.name}} - * + + + + — {{variant.language.name}} + * - - + {{publishVariantSelectorForm.publishVariantSelector.errorMsg}} From dde735f75cc96979f3707743fa5c1f1468906e79 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 13 Aug 2020 14:33:19 +0200 Subject: [PATCH 047/197] Sync some dependencies that have been updated in v8/contrib --- src/Umbraco.Web.UI.Client/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 21445e3cb3..454d081fe7 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -38,11 +38,11 @@ "lazyload-js": "1.0.0", "moment": "2.22.2", "ng-file-upload": "12.2.13", - "nouislider": "14.4.0", + "nouislider": "14.6.0", "npm": "^6.14.7", "signalr": "2.4.0", "spectrum-colorpicker": "1.8.0", - "tinymce": "4.9.10", + "tinymce": "4.9.11", "typeahead.js": "0.11.1", "underscore": "1.9.1" }, @@ -78,7 +78,7 @@ "karma-phantomjs-launcher": "1.0.4", "karma-spec-reporter": "0.0.32", "less": "3.10.3", - "lodash": "4.17.15", + "lodash": "4.17.19", "marked": "^0.7.0", "merge-stream": "2.0.0", "run-sequence": "2.2.1" From 6d6f525343c9f3794063cd96e78a36b39893540c Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 18 Aug 2020 12:43:29 +0100 Subject: [PATCH 048/197] Fix to ensure we use virtual paths for any blocks with custom views (#8597) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Niels Lyngsø Co-authored-by: Shannon --- .../services/umbrequesthelper.service.js | 31 ++++++++++--------- ...t.blockconfiguration.overlay.controller.js | 7 +++-- .../blocklist/umbblocklistblock.component.js | 23 +++++++------- .../services/umb-request-helper.spec.js | 28 +++++++++++++++++ 4 files changed, 59 insertions(+), 30 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js index 7b43b239ea..90125e7de6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js @@ -15,7 +15,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe * * @description * This will convert a virtual path (i.e. ~/App_Plugins/Blah/Test.html ) to an absolute path - * + * * @param {string} a virtual path, if this is already an absolute path it will just be returned, if this is a relative path an exception will be thrown */ convertVirtualToAbsolutePath: function(virtualPath) { @@ -31,6 +31,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe return Umbraco.Sys.ServerVariables.application.applicationPath + virtualPath.trimStart("~/"); }, + /** * @ngdoc method * @name umbraco.services.umbRequestHelper#dictionaryToQueryString @@ -39,7 +40,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe * * @description * This will turn an array of key/value pairs or a standard dictionary into a query string - * + * * @param {Array} queryStrings An array of key/value pairs */ dictionaryToQueryString: function (queryStrings) { @@ -76,9 +77,9 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe * * @description * This will return the webapi Url for the requested key based on the servervariables collection - * + * * @param {string} apiName The webapi name that is found in the servervariables["umbracoUrls"] dictionary - * @param {string} actionName The webapi action name + * @param {string} actionName The webapi action name * @param {object} queryStrings Can be either a string or an array containing key/value pairs */ getApiUrl: function (apiName, actionName, queryStrings) { @@ -103,7 +104,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe * * @description * This returns a promise with an underlying http call, it is a helper method to reduce - * the amount of duplicate code needed to query http resources and automatically handle any + * the amount of duplicate code needed to query http resources and automatically handle any * Http errors. See /docs/source/using-promises-resources.md * * @param {object} opts A mixed object which can either be a string representing the error message to be @@ -117,7 +118,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe * The error callback must return an object containing: {errorMsg: errorMessage, data: originalData, status: status } */ resourcePromise: function (httpPromise, opts) { - + /** The default success callback used if one is not supplied in the opts */ function defaultSuccess(data, status, headers, config) { //when it's successful, just return the data @@ -151,7 +152,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe return httpPromise.then(function (response) { - //invoke the callback + //invoke the callback var result = callbacks.success.apply(this, [response.data, response.status, response.headers, response.config]); formHelper.showNotifications(response.data); @@ -183,7 +184,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe overlayService.ysod(error); } else { - //show a simple error notification + //show a simple error notification notificationsService.error("Server error", "Contact administrator, see log for full details.
" + result.errorMsg + ""); } @@ -209,7 +210,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe * * @description * Used for saving content/media/members specifically - * + * * @param {Object} args arguments object * @returns {Promise} http promise object. */ @@ -233,7 +234,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe if (args.showNotifications === null || args.showNotifications === undefined) { args.showNotifications = true; } - + //save the active tab id so we can set it when the data is returned. var activeTab = _.find(args.content.tabs, function (item) { return item.active; @@ -300,7 +301,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe overlayService.ysod(error); } else { - //show a simple error notification + //show a simple error notification notificationsService.error("Server error", "Contact administrator, see log for full details.
" + response.data.ExceptionMessage + ""); } @@ -331,7 +332,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe }); } else if (!jsonData.key || !jsonData.value) { throw "jsonData object must have both a key and a value property"; } - + return $http({ method: 'POST', url: url, @@ -366,7 +367,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe return $q.reject(response); }); }, - + /** * @ngdoc method * @name umbraco.resources.contentResource#downloadFile @@ -374,7 +375,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe * * @description * Downloads a file to the client using AJAX/XHR - * + * * @param {string} httpPath the path (url) to the resource being downloaded * @returns {Promise} http promise object. */ @@ -388,7 +389,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe // Use an arraybuffer return $http.get(httpPath, { responseType: 'arraybuffer' }) .then(function (response) { - + var octetStreamMime = 'application/octet-stream'; var success = false; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js index b1937e718d..48c21b4009 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js @@ -160,7 +160,7 @@ }, select: function (node) { const filepath = decodeURIComponent(node.id.replace(/\+/g, " ")); - block.view = filepath; + block.view = "~/" + filepath; editorService.close(); }, close: function () { @@ -206,7 +206,7 @@ }, select: function (node) { const filepath = decodeURIComponent(node.id.replace(/\+/g, " ")); - block.stylesheet = filepath; + block.stylesheet = "~/" + filepath; editorService.close(); }, close: function () { @@ -252,7 +252,8 @@ return !(i.name.indexOf(".jpg") !== -1 || i.name.indexOf(".jpeg") !== -1 || i.name.indexOf(".png") !== -1 || i.name.indexOf(".svg") !== -1 || i.name.indexOf(".webp") !== -1 || i.name.indexOf(".gif") !== -1); }, select: function (file) { - block.thumbnail = file.name; + const id = decodeURIComponent(file.id.replace(/\+/g, " ")); + block.thumbnail = "~/" + id; editorService.close(); }, close: function () { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js index 4474dbd55c..64fd40459d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js @@ -5,11 +5,11 @@ * @ngdoc directive * @name umbraco.directives.directive:umbBlockListBlock * @description - * The component to render the view for a block. + * The component to render the view for a block. * If a stylesheet is used then this uses a ShadowDom to make a scoped element. * This way the backoffice styling does not collide with the block style. */ - + angular .module("umbraco") .component("umbBlockListBlock", { @@ -29,16 +29,16 @@ } ); - function BlockListBlockController($scope, $compile, $element) { + function BlockListBlockController($scope, $compile, $element, umbRequestHelper) { var model = this; model.$onInit = function () { - // This is ugly and is only necessary because we are not using components and instead + // This is ugly and is only necessary because we are not using components and instead // relying on ng-include. It is definitely possible to compile the contents - // of the view into the DOM using $templateCache and $http instead of using - // ng - include which means that the controllerAs flows directly to the view. - // This would mean that any custom components would need to be updated instead of relying on $scope. - // Guess we'll leave it for now but means all things need to be copied to the $scope and then all + // of the view into the DOM using $templateCache and $http instead of using + // ng - include which means that the controllerAs flows directly to the view. + // This would mean that any custom components would need to be updated instead of relying on $scope. + // Guess we'll leave it for now but means all things need to be copied to the $scope and then all // primitives need to be watched. $scope.block = model.block; @@ -48,8 +48,7 @@ $scope.valFormManager = model.valFormManager; if (model.stylesheet) { - // TODO: Not sure why this needs a prefixed /? this means it will never work in a virtual directory - model.stylesheet = "/" + model.stylesheet; + model.stylesheet = umbRequestHelper.convertVirtualToAbsolutePath(model.stylesheet); var shadowRoot = $element[0].attachShadow({ mode: 'open' }); shadowRoot.innerHTML = `