Commit Graph

263 Commits

Author SHA1 Message Date
Shannon
58331bbdef Fixes tests and issues causing test failures. 2020-07-29 18:46:01 +10:00
Shannon
692b8b819f fixes tests 2020-07-23 23:31:55 +10:00
Shannon
84dddd1869 fixes tests 2020-07-23 23:23:39 +10:00
Shannon
0e4bf55f84 Merge branch 'v8/feature/block-editor-list-validation' into v8/feature/block-list-data-structure-v3
# Conflicts:
#	src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js
2020-07-23 19:16:52 +10:00
Shannon
41dc30227f Fixes tests 2020-07-23 19:04:42 +10:00
Shannon
89b1552722 Merge branch 'v8/feature/block-editor-list-validation' into v8/feature/block-list-data-structure-v3 2020-07-21 13:19:11 +10:00
Shannon
b32d92ed07 Add valServerMatch which we now use to highlight block rows if they have errors. 2020-07-15 16:49:54 +10:00
Shannon
f4d8d0e28e adds ability to match suffix, prefix and contains for the serverValidationManager + tests 2020-07-15 15:08:17 +10:00
Shannon
74ab1c0262 Updates serverValidationManager to have different matching options, fixes unit tests, now need to write tests for the Suffix match 2020-07-14 18:09:46 +10:00
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
7a482a1a9f Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/block-editor-list-validation 2020-07-06 20:31:35 +10:00
Niels Lyngsø
290bb23fec update data structure to fit with data structure RFC v3 2020-07-03 13:41:23 +02:00
Niels Lyngsø
b017b3f1b6 improve test script 2020-07-03 12:22:23 +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
459904ffdd Gets unique keys working per nested property 2020-06-30 10:49:31 +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ø
cb98a4a82e corrected spelling mistake 2020-06-26 16:02:26 +02:00
Niels Lyngsø
bf12009b40 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/block-editor-list
# Conflicts:
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
2020-06-23 14:57:39 +02:00
Niels Lyngsø
eeea641009 update test with new scope parameter 2020-06-23 14:56:01 +02:00
Niels Lyngsø
3781182363 fix of npm run unit, plus begin able to test code that uses promises. 2020-06-19 09:41:19 +02:00
Niels Lyngsø
bfa07377b4 Moving BlockEditorModelObject into its own file for Documentation purpose. Same goes for renaming BlockModel to BlockObject. and a lot of documentation written. 2020-06-15 22:27:56 +02:00
Shannon
12755e5db6 Returns ContentTypeKey from the server, updates js to use this everywhere and fix all js tests. 2020-06-11 17:16:43 +10:00
Niels Lyngsø
aa447bc704 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/block-editor-list 2020-06-04 15:09:48 +02:00
Niels Lyngsø
b81f0b3eb6 converting code to use contentTypeKey instead of contentTypeAlias, still missing a few TODOs. 2020-06-04 11:05:21 +02:00
Niels Lyngsø
4a1a883314 adjust unit tests to latest interface 2020-06-02 14:05:07 +02:00
Niels Lyngsø
b630537327 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/block-editor-list
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
2020-05-28 11:36:56 +02:00
Niels Lyngsø
23fb9a2b58 inject LocalStorageModel 2020-05-27 11:14:30 +02:00
Bjarne Fyrstenborg
88c842ccda Add utility function equivalent to angular.fromJson (#8014) 2020-05-06 16:41:00 +02:00
Niels Lyngsø
871e50efb8 variant validation error test 2020-05-01 09:56:09 +02:00
Niels Lyngsø
2b5f3eeedd correcting test to parse segment attribute 2020-05-01 09:41:31 +02:00
Niels Lyngsø
678ceba1a8 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB6057-segment-feature
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
2020-04-27 12:58:29 +02:00
Niels Lyngsø
04a77aa7c0 rename contentModel to data + rename layoutModel to layout 2020-04-23 10:23:49 +02:00
Shannon
90b4d557c9 Adds a segment level validation key + updates tests 2020-04-17 16:12:04 +10:00
Jan Skovgaard
a5ff8a429b Replace angular.fromJson with JSON.parse (#7952) 2020-04-14 10:31:52 +02:00
Jan Skovgaard
90890cea33 Replace instances of angular.element() (#7951) 2020-04-14 10:28:16 +02:00
BatJan
bd26cb36ec Replace angular.copy with Utilities.copy 2020-04-14 10:20:09 +02:00
Mike Masey
b5b319f917 Convert angular.isArray to Utilities.isArray (#7934) 2020-04-10 18:34:23 +02:00
Mike Masey
318fcbe3ba V8: Angular Divorce: isString (#7929) 2020-04-10 18:24:08 +02:00
Matthew-Wise
76e4b6b301 Replaced angular.toJson with Utilities.toJson [#CanConHackathon] (#7924) 2020-04-10 18:07:37 +02:00
Adam Werner
db8004982f angular.isObject replace to Utilities.isObject 2020-04-10 17:20:51 +02:00
Adam Werner
a9834f055e angular.isDefined replace to Utilities.isDefined 2020-04-10 17:12:09 +02:00
Niels Lyngsø
ad93436178 more tests 2020-03-09 12:43:53 +01:00
Niels Lyngsø
bc97861316 more tests for block list editor 2020-03-05 17:38:14 +01:00
Niels Lyngsø
74165ae859 another two tests 2020-03-05 13:14:51 +01:00
Niels Lyngsø
d01d55b621 promise test working 2020-03-05 11:55:37 +01:00