Commit Graph

33004 Commits

Author SHA1 Message Date
Shannon
bbbb7a052b Getting close, adds tests, fixese the key being set on the block, gets errors clearing, now need to make the UI behave. 2020-07-10 18:06:11 +10:00
Shannon
00c83182e7 get validation path prefixes matching in serverValidationManager 2020-07-10 12:22:22 +10:00
Shannon
bd3bc81b7c Gets validation paths generated and tested 2020-07-10 09:25:20 +10:00
Shannon
0722adba2f WIP - with lots of notes 2020-07-10 08:44:43 +10:00
Shannon
f4e31e1dba Ensures valid/non valid errors are handled all the time with the serverValidationManager (need to write tests for that), tries to recursively clear property errors, thought that works it clears errors when there are other child nested errors, need to rethink some things. 2020-07-07 14:40:55 +10:00
Shannon
6004d7adaa seems to work with inline now 2020-07-07 13:03:54 +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
Shannon
7a482a1a9f Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/block-editor-list-validation 2020-07-06 20:31:35 +10:00
Warren Buckley
4e8feae35b Merge pull request #8381 from umbraco/v8/feature/block-list-more-solid
V8/feature/block list more solid
2020-07-03 12:50:12 +01:00
Niels Lyngsø
b017b3f1b6 improve test script 2020-07-03 12:22:23 +02:00
Niels Lyngsø
9f208a0ff1 improve existence, destroy and watchers 2020-07-03 12:22:14 +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ø
c74b03a1b6 check for object before prop 2020-07-01 20:10:28 +02:00
Niels Lyngsø
f1c5e19124 no need for var twice 2020-07-01 20:10:08 +02:00
Warren Buckley
d4898b58e0 Merge pull request #8368 from umbraco/v8/feature/block-list-hideContentinOverlay-v2
V8/feature/block list hide contentin overlay v2
2020-07-01 13:40:30 +01:00
Niels Lyngsø
69c2ab20ff correct behaviour 2020-07-01 11:45:45 +02:00
Niels Lyngsø
22aa76d6b1 remove unused line 2020-07-01 10:33:13 +02:00
Niels Lyngsø
d2678135fe bail out if we dont have settings. 2020-07-01 10:32:20 +02:00
Niels Lyngsø
8f7194df36 remove line 2020-07-01 10:30:20 +02:00
Niels Lyngsø
5debb4a11b option to hide content editor in overlay 2020-07-01 10:28:02 +02:00
Claus
f0efc7f0c0 Merge pull request #8366 from umbraco/v8/bugfix/improve-block-list-default-razor
Improve block list default razor view
2020-07-01 09:19:33 +02:00
Warren Buckley
5173a7b589 Remove try/catch block as it will make it hard for people to see what the issue when using the Razor view when building sites 2020-07-01 08:07:30 +01:00
Warren Buckley
b31ffea429 Merge pull request #8358 from umbraco/v8/bugfix/8273-block-list-inline-doctype-creation
BlockEditor Fix - Parse on contentType key
2020-07-01 07:26:57 +01:00
Shannon
a8a1bb2a55 manually merge in benj PR 2020-07-01 15:01:55 +10:00
Shannon
1b69620ffc Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/block-editor-list-validation
# Conflicts:
#	src/Umbraco.Core/Models/Blocks/IBlockElement.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/udi.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
#	src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
#	src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-block.component.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-scoped-block.component.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
#	src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
#	src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/BlockListPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/BlockEditorConverter.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
2020-07-01 14:52:29 +10:00
Shannon
086d7b6e23 ensures the udi structure works always for the validation key 2020-07-01 13:00:56 +10:00
Shannon
7c6cf3710b Gets the inherited property validation working from the server side. 2020-07-01 12:44:34 +10:00
Shannon
2fc6ed10fb Gets inherited property validation working but will switch this to server side 2020-07-01 12:10:12 +10:00
Niels Lyngsø
e2b7043d3c check for $block.data, to verify that the blockObject is not in a destroyed state. 2020-06-30 15:59:06 +02:00
Niels Lyngsø
26fa38c536 use one-way binding 2020-06-30 15:45:20 +02:00
Niels Lyngsø
38e8a93b28 parse on contentType key 2020-06-30 13:36:17 +02: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
459904ffdd Gets unique keys working per nested property 2020-06-30 10:49:31 +10:00
Shannon
8eb467affa New validation structure + tests working 2020-06-29 21:55:54 +10:00
Shannon
2af99c48d8 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/common/infiniteeditors/blockeditor/blockeditor.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.content.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-block.component.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
2020-06-29 15:02:26 +10:00
Shannon
2df481332b commits wip to resume later. 2020-06-29 14:51:57 +10:00
Niels Lyngsø
7ceb965f1f split in multiple lines 2020-06-26 16:14:17 +02:00
Niels Lyngsø
7f3923d9b5 make binding one-way 2020-06-26 16:11:42 +02:00
Niels Lyngsø
0c7f8469d9 remove not very used vars 2020-06-26 16:06:10 +02:00
Niels Lyngsø
cb98a4a82e corrected spelling mistake 2020-06-26 16:02:26 +02:00
Niels Lyngsø
9104570dcb rename inline method name 2020-06-26 15:32:02 +02:00
Niels Lyngsø
f44e7280d4 remove unused controller 2020-06-26 15:29:45 +02:00
Niels Lyngsø
975fbbfa3f remove comment 2020-06-26 15:29:37 +02:00
Niels Lyngsø
a46acaf16c remove comment 2020-06-26 15:24:33 +02:00
Niels Lyngsø
04fba15db1 correct js docs name 2020-06-26 15:22:48 +02:00
Niels Lyngsø
5313baf991 mark Umbraco.BlockList as unsupported inside Nested Content 2020-06-26 15:15:53 +02:00
Niels Lyngsø
a84fc1cfa8 keep elementTypes up to date through the EventService. 2020-06-26 15:15:27 +02:00
Niels Lyngsø
26e30189ab corrected file path 2020-06-26 14:45:36 +02:00