Commit Graph

10514 Commits

Author SHA1 Message Date
Niels Lyngsø
0c4e962ce8 rename contentTypeKey to contentElementTypeKey 2020-08-05 21:21:00 +02:00
Shannon Deminick
2c6f290dc0 Ensure that we validate all properties for a block based on it's element type properties, not just the property values that are POSTed (#8589) 2020-08-05 11:03:02 +02:00
Warren Buckley
576c98f782 Merge pull request #8561 from umbraco/v8/bugfix/block-list-model-updates-7570
Changes c# model for block list editor to be much simpler.
2020-08-05 08:39:34 +01:00
Shannon Deminick
6c4449eecd better null checking for config validation limits (#8588) 2020-08-05 09:06:40 +02:00
Shannon
c7d42d94d0 Changes c# model for block list editor to be much simpler. 2020-08-03 22:02:10 +10:00
Shannon
8b19e11b58 Implements server side min/max count checks and fixes the display of the error message 2020-07-28 17:05:45 +10:00
Shannon
e4334c86bf Merge branch 'v8/feature/block-list-data-structure-v3' into v8/feature/block-list-settings-validation 2020-07-28 15:36:16 +10:00
Shannon
cf442f78c0 updates prop value converter to filter out all content/settings blocks outside of the layout from reaching razor + test 2020-07-28 15:33:54 +10:00
Shannon
9e9f8863c2 Ensures validation works for settings data, now to test other scenarios. 2020-07-24 00:42:37 +10:00
Shannon
ad9d0fad4f Adds notes with links back to PR about server side validation 2020-07-23 23:06:58 +10:00
Shannon
06afab9893 Adds some warning logs for when data is removed 2020-07-23 23:04:11 +10:00
Shannon
e01f36514b fixes tests 2020-07-23 22:14:06 +10:00
Shannon
925ffb1f9b Merge branch 'v8/feature/block-editor-list-validation' into v8/feature/block-list-data-structure-v3 2020-07-23 16:55:27 +10:00
Shannon
f77961ca6e Fixes tests 2020-07-23 16:42:53 +10:00
Shannon
f7a831f054 Fixes some JS issues with new data format, streamlines the blockeditor data format serialization in c#, implements To/FromEditor methods 2020-07-23 16:03:35 +10:00
Shannon
5bc80e2d84 Adds tests for settings and changes to strongly typed guid 2020-07-21 16:24:48 +10:00
Shannon
a194d1db4a first phase of new data format done in c# 2020-07-21 15:50:11 +10:00
Shannon
51118699df couple TODOs 2020-07-20 16:39:00 +10:00
Shannon
c8c9cfa7f2 Merge branch 'v8/8.7' into v8/feature/block-editor-list-validation 2020-07-20 16:08:55 +10:00
Shannon
c8488b6683 Merge branch 'v8/8.6' into v8/8.7
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
2020-07-20 16:08:07 +10:00
Shannon
5c91774ae9 ensure culture carries through to child model state and ensure language culture is carried through on the block content scaffolds 2020-07-16 18:52:53 +10:00
Shannon
bd3bc81b7c Gets validation paths generated and tested 2020-07-10 09:25:20 +10:00
Shannon
191060f930 Merge branch 'v8/8.6' into v8/bugfix/sqlmaindom-updates 2020-07-09 16:33:44 +10:00
Shannon
0196e55c19 Cherry picks fix #7994 for #5151 2020-07-09 16:33:01 +10:00
Shannon
e1757178b9 Fixes our sql azure transient fault detection to be inline with current standards, adds a scope for the health check schedule tasks 2020-07-08 17:26:31 +10:00
Shannon
8814875b95 fixes error logging 2020-07-08 13:43:20 +10:00
Shannon
c4e7929e68 Converts umbProperty to a component, gets nested valPropertyMsg validators clearing (as a prototype), need to check TODOs, test inline editing, etc... 2020-07-07 12:50:15 +10:00
Sebastiaan Janssen
de3d0e9f11 Merge pull request #7021 from stevemegson/v8/pr/member-cmsContentNu
OnMemberRefreshedEntity stores data as published rather than edited

(cherry picked from commit a9bb1ff49e)
2020-07-02 10:36:45 +02:00
Shannon
6c13fb3af3 Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/block-editor-list-validation
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
2020-07-02 15:29:13 +10:00
Shannon
9649b22e0d remvoes comments and unneeded code 2020-07-02 15:13:05 +10:00
Niels Lyngsø
5debb4a11b option to hide content editor in overlay 2020-07-01 10:28:02 +02:00
Shannon
7c6cf3710b Gets the inherited property validation working from the server side. 2020-07-01 12:44:34 +10:00
Shannon Deminick
df3dc32de6 Block Editor List (#8273)
* add style to create-option in itempicker + removing overflow hidden

* style adjustment

* clean up of html

* correct sentence to use the number 7

* correct overlays, so they can use size

* numberrange prevalue editor

* add confirmRemove overlay

* correcting primary btn colors

* move confirmMessage below content of overlay.

* min max validation for numberrange

* remove comment

* improved actions for block list

* use file tree for view picker

* style adjustment to border of creator item in item-picker

* vertical align

* clean up + validation limit range

* rename ElementTypes to Blocks

* implement block list editor

* renaming

* use Chrome Headless for unit tests

* test for blockEditorService

* safer code

* block list editor

* rename view to overlayView

* block editor work

* Revert "rename view to overlayView"

This reverts commit 5b910c178a.

* block editor implementation

* sync models

* block list editor copy paste feature

* order var declarations

* remove unused paste function

* block list editor better naming

* simpler label generation

* clean up

* compile config for test mode

* Chrome Debug for VS code

* promise test working

* space change

* another two tests

* more tests for block list editor

* provide key on blockModel for angularJS performance optimization

* syncronization from infinite editing layers

* use an isolated scope

* more tests

* fix C# test

* remove unused block watcher component

* clean css

* only show on hover or focus for block-actions

* clean up and prepare for implementing settings

* remove console

* Add ability to render block list editor using Grid style rendering extension

* Enable Block List Editor settings editing

* Add Stacked Content to Block List migration

* Block Editor: Clean-up, refactoring, one step closer being ready for Content-Apps

* changes naming to Submit, to avoid misunderstanding.

* use a common variable on the block model for isOpen, to be able to make Actions show when open.

* NotSupported property editor, to be used when an editor is not supported in the given context.

* remove unused controller

* Hide group header if only one group is presented

* rename notsupport property editor css class

* smaller header for property group

* hide description if no description is presented

* css adjustments

* Inline create button styling: Better spacing, darker blue color for Focus Outline, moving the plus icon to mouse position for better visual appearance.

* css correction

* Add references for picked items

* Revert commit 45e892f350 - Changes api to GetData

* Use the .Data propertry as opposed to GetData in this PartialView

* Fix block list test failures

* Just parsing layout as model for partial views.

* minor adjustments

* Remove DB migrations so that they can be reviewed as a block

* Add migrations for new block editor

* Update default rendering partial view

* Add error handling to default template

* Handle color picker data in stacked content

* BlockList PreValue Editor opens configurations as overlay

* translation for prevalue editor property group headlines

* blockcard corrections

* block list prevalue corrections

* revert agressive clean up

* Block Picker

* MaxPropertyWidth PreValue + Implementation

* Incorporate latest block list editor changes, update migration for changed configuration

* Change declared converter type

* Handle invalid data type references

* Remove code duplicated from PR #7957

* use ElementModel for the ContentModel of an ElementType. So we can use ElementTypeModel for the ModelDefinition aka. the Type.

* do still show itempicker for BlockConfiguration even though there is no ElementTypes to pick. This enables the option to create a new ElementType to be used.

* use the right wrapper, for correct spacing

* parse item

* correct fallback for label

* removed unused callback

* paste feature for block-picker

* localize block-picker tabs

* Slightly change for shadow on block-picker item hover

* Localization of BlockEditor Settings Tab

* localizationService

* only filter when more than 8 items available

* Add multiple blocks if hold down CTRL or SuperKey

* adds notes

* ability to add a scoped stylesheet for block view

* make scoped block draggable + style adjustments

* provide index for custom view

* rename contentModel to data + rename layoutModel to layout

* clean up

* more localization

* openSettings option for block editor

* minor changes for a better developer experience

* paste mistake corrected

* only manipulate content-content-app if its present

* make small overlays slightly bigger

* moved block list entry editor into block list editor folder

* limit labelinterpretator to only runs ones pr. edit. and lets make sure to have a label thought we dont have any properties.

* fixed inline views gulp watcher

* changed vm to a better controller instance name

* make watch for views work again.

* able to re run watch

* make js up to date

* fix white background of image-picker

* media-picker container class

* loading indication

* adjust unit tests to latest interface

* getting started on JS Docs

* converting code to use contentTypeKey instead of contentTypeAlias, still missing a few TODOs.

* revert change

* add todo

* use Guid for Key

* use key

* Updates the caching layer to handle GUID keys for content types while preserving backwards compat, fixes unit tests, removes the strongly typed lists for the block editor value since it's unecessary

* Reverts the nested content changes, fixes up the GetEmptyByKey

* Returns ContentTypeKey from the server, updates js to use this everywhere and fix all js tests.

* Allows key in SimpleContentType

* correct for the new spelling

* appended this. since the method is a non-static class method.

* only add background-image if value isnt null

* simplifyed limits validation

* clean up

* no need to execute a digest.

* define the full model for new configurations

* removed setDataFromBlockModel and general clean up and added documentation

* default size should be medium

* use retriveValuesFrom method to transfer data.

* ability to disable an navigation item

* createElementTypeAndCallback working again for settings.

* still have the ability to retrive a scaffold model by alias, since we are still using alias in clipboard service.

* disable clipboard tab if no available paste options

* ups, should stay as alias

* disable clipboard when empty

* use property alias for content add button

* use a grey that can be seen on top of grey and on top of white.

* some accessibility improvements

* rename entry to block

* appended ' and added space in Element Type

* use background color for hover to corospond with active state

* make nested content unsupported

* Moving BlockEditorModelObject into its own file for Documentation purpose. Same goes for renaming BlockModel to BlockObject. and a lot of documentation written.

* fix links in js docs

* added a blocklistentryeditor for unsupported blocks

* ability to retrive the $scope from UmbVariantContentEditors, needed for Block Editor to get a scope existing across variants and splitview.

* Appending the block objects to layout, to share it across variants and in split-view.

* removed trailing comma

* Unsupported block

* Dont copy unsupported blocks

* use grey color for unsupported block

* text correction

* we dont have this fallback anymore

* sort properties

* Text change

* css correction

* use active to determine if an inline editor is expanded. To enable the inline editor to be expanded on creation.

* using udi instead of key.

* bringing the runtime block key back

* live editing ability

* live editing for settings data

* call formSubmit before property editor are removed from DOM. Both for overlay-editing and inline-editing. Fire an postFormSubmitting event after formSubmitting event to let editors know that data could have been updated.

* make sure settings object exists

* only set active to false if it was false before opening the editor.

* update test with new scope parameter

* move destroy responsibility to blockObject

* rename onDestroy to destroy

* added some JS-Docs

* correction jsDocs

* Update ElementType Resource to not use hardcoded URL but to use the Umbraco.Sys.ServerVariables.umbracoUrls instead

* Remove partially completed ConvertToElement migration, fixed in issue 7939 instead.

* Remove external property editor migration

* corrected naming of umbBlockListScopedBlock and umbBlockListBlock

* correct ngdoc type

* removed vscode specific configuration of karma

* Finished Todo, gets name of documentType if copying all entities in an infinite editor

* changed comment from TODO to something that explains the state.

* stop tracking build output files.

* rename files to match file name conventions

* this should not happen.

* remove dublicated code

* rename requestCopyBlock to copyBlock

* make sure images does not repeat.

* scale thumbnail for block showcase

* renamed blockcard.component to umb-block-card and moved it.

* removed inline style

* correct style location

* corrected filepath

* corrected file path

* keep elementTypes up to date through the EventService.

* mark Umbraco.BlockList as unsupported inside Nested Content

* correct js docs name

* remove comment

* remove comment

* remove unused controller

* rename inline method name

* corrected spelling mistake

* remove not very used vars

* make binding one-way

* split in multiple lines

* corrected default rendering

* removing documentation that is relevant for developers of new block editors. this documentation will be transfered to Our documentation.

* added danish translation

* corrected blog to blok

* Remove invalid using statement

* use native forEach

Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
Co-authored-by: Benjamin Carleski <benjamin@proworks.com>
Co-authored-by: Warren Buckley <warren@umbraco.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
Co-authored-by: Claus <claus@claus.nu>
2020-06-30 10:52:42 +01:00
Shannon
88700e9707 fixes name, refactors a lot of serverValidationManager so it's structure is maintainable, moves more logic there from directives so it can be tested more easily, finally got the first result working. 2020-06-30 19:12:21 +10:00
Shannon
8eb467affa New validation structure + tests working 2020-06-29 21:55:54 +10:00
Shannon
2df481332b commits wip to resume later. 2020-06-29 14:51:57 +10:00
Shannon
e948879760 Starting to get somewhere, validation results are now being returned for nested items 2020-06-26 15:23:46 +10:00
Shannon
8acc6ed5b4 Fixes all the block editor deserialization processes 2020-06-26 15:02:02 +10:00
Shannon
8ee9ac7e16 Merge remote-tracking branch 'origin/v8/feature/block-editor-list' into v8/feature/block-editor-list-validation
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
2020-06-26 10:48:42 +10:00
Warren Buckley
c53ea9382f Update ElementType Resource to not use hardcoded URL but to use the Umbraco.Sys.ServerVariables.umbracoUrls instead 2020-06-24 11:21:24 +01:00
Warren Buckley
cb7f4a964c Merge branch 'v8/8.7' into v8/feature/block-editor-list 2020-06-24 10:22:52 +01:00
Shannon Deminick
ee7d62e583 Fixes #7148 - ensures we only check for SurfaceController routes (#8322)
* See https://github.com/umbraco/Umbraco-CMS/issues/7148 for bug report and reason for fork and PR.

* Fixes #7148 - ensures we only check for SurfaceController routes

When finding the SurfaceController to post back to when using BeginUmbracoForm we weren't specifically checking for only SurfaceControllers routes since we just assumed it would be a SurfaceController route. This is problematic if using a SurfaceController simultaneously as an IRenderController with a custom front-end route since it will fail to find that controller to post back to. This is fixed by further filtering the controllers looked up to only include SurfaceControllers.

Co-authored-by: Colin Wiseman <sayhi@codeitwise.co.uk>
2020-06-24 10:22:10 +02:00
Niels Lyngsø
79e5ccb8d8 no message 2020-06-24 09:16:48 +02:00
Sebastiaan Janssen
fee6ef0fb0 Merge branch 'v8/contrib' into v8/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
2020-06-24 09:05:22 +02:00
Shannon
020835390d Merge remote-tracking branch 'origin/v8/feature/block-editor-list' into v8/feature/block-editor-list-validation
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
2020-06-24 11:56:43 +10:00
Shannon
29aaabcc6e Gets the c# side of things working for complex validation for complex editors 2020-06-24 10:20:25 +10:00
Shannon
80bbfaf7be Finally, making some sense out of all this craziness 2020-06-23 13:34:19 +10:00
Shannon
5128084511 Getting a little further, the test output is actually correct! so now we can start tweaking it the way we want and cleaning up a bit of code. 2020-06-23 00:27:01 +10:00
Niels Lyngsø
218b8c4069 live editing ability 2020-06-22 14:34:46 +02:00
patrickdemooij9
591575b47d Added content apps for document types (#8187)
* Added content apps for document types

* PR Feedback updates

* Updated the javascript code to use Utilities

* Replace tolowercase comparison with localeCompare
2020-06-19 18:10:16 +01:00