Commit Graph

118 Commits

Author SHA1 Message Date
Sebastiaan Janssen
809fd81982 Merge branch 'v8/dev' into v8/contrib
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
2021-05-11 10:57:57 +02:00
Patrick de Mooij
499d22aa20 Move the SetWeight logic to WeightedCollectionBuilderBase so other collections can use it too 2021-05-11 14:56:25 +10:00
Niels Lyngsø
1a5b88525b Media Picker v3 (#9461)
* set input file accept

* Use PreValue file extensions for limiting the files to be chosen in file input

* Current state for Warren to review

* This should fix up what you need Niels

* update csproj

* use empty string if fileExtensions is undefined

* public interface

* initial work

* local crops

* translations

* translation correction

* fix misspeling

* some progress

* filter media picker

* align media card grid items correctly

* responsive media cropper

* always be able to scale 3 times smallest scale

* making image cropper property editor responsive

* scroll to scale

* adjust slider look

* rearrange parts of mediaentryeditor

* test helper

* styling

* move controls inside umb-image-crop

* seperate umg-cropper-gravity styling

* corrected layout

* more ui refinement

* keep the idea of mandatory out for now.

* remove double ;

* removed testing code

* JSON Property Value Convertor now has an array of property editors to exclude

* Property Value Convertor for Media Picker 3 aka Media Picker with Local Crops

* Experimenting on best approach to retrieve local crop in razor view when iterating over picked media items

* Update ValueConvertor to use ImageCropperValue as part of the model for views as alot of existing CropUrls can then use it

* Update extension methods to take an ImageCropperValue model (localCropData)

* Forgot to update CSProj for new ValueConvertor

* New GetCropUrl @Url.GetCropUrl(crop.Alias, media.LocalCrops) as oppposed to @Url.GetCropUrl(media.LocalCrops, cropAlias:crop.Alias, useCropDimensions: true)

* Remove dupe item in CSProj

* Use a contains as an opposed to Array.IndexOf

* various corrections, SingleMode based on max 1, remove double checkerBackground, enforce validation for Crops, changed error indication

* mediapicker v3

* correct version

* fixing file ext label text color

* clipboard features for MediaPicker v3

* highlight not allowed types

* highlight trashed as an error

* Media Types Video, Sound, Document and Vector Image

* Rename to Audio and VectorGraphics

* Add (SVG) in the name for Vector Graphics

* adding CSV to Documents

* remove this commented code.

* remove this commented code

* number range should not go below 0, at-least as default until we make that configurable.

* use min not ng-min

* description for local crops

* Error/Limits highlighting reactive

* visual adjustments

* Enabling opening filtered folders + corrected select hover states

* Varous fixes to resolve issues with unit tests.

* Refactor MediaType Documents to only contain Article file type

* mark as build-in

* predefined MediaPicker3 DataTypes, renaming v2 to "old"

* set scale bar current value after min and max has been set

* added missing }

* update when focal point is dragged

* adjusted styling for Image Cropper property editor

* correcting comment

* remove todo - message for trashed media items works

* Changed parameter ordering

* Introduced new extension method on MediaWithCrops to get croppings urls in with full path

* Reintroducing Single Item Mode

* use Multiple instead of SingleMode

* renaming and adding multiple to preconfigured datatypes

* Change existing media picker to use the Clipboard type MEDIA, enabling shared functionality.

* clean up unused clipboard parts

* adjusted to new amount

* correcting test

* Fix unit test

* Move MediaWithCrops to separate file and move to Core.Models

* parseContentForPaste

* clean up

* ensure crops is an array.

* actively enable focal points, so we dont set focal points that aren't used.

* only accept files that matches file extensions from Umbraco Settings

* Cleanup

* Add references from MediaPicker3 to media

* corrections from various feedback

* remove comment

* correct wording

* use windowResizeListener

Co-authored-by: Warren Buckley <warren@umbraco.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
Co-authored-by: Andy Butland <abutland73@gmail.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2021-04-22 10:28:53 +02:00
Sebastiaan Janssen
f27a3be4e6 Fix unit tests after merging PR #9646 2021-02-21 10:30:17 +01: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
Sebastiaan Janssen
f33b4b7be5 Some cleanup and fixing the build 2020-05-26 11:49:35 +02:00
Sebastiaan Janssen
558ffaeba7 Move test and use params that are easier to distinguish 2020-05-26 09:18:09 +02:00
Daniël Knippers
5215a769fe Added unit test that fails before PR and succeeds after PR 2020-05-25 21:30:56 +02:00
Shannon
3553bb2aa3 Fixes CollectionBuilder's to ensure that each item in the collection is registered in DI with the same lifetime as the collection itself 2020-02-26 12:12:15 +11:00
Bjarke Berg
9d91402aca V8: Follow guidelines from .editorconfig (#6849)
* Removed unused variable

* Align usage of C# type keywords vs Universal type names. Now we use C# keywords all over.
2019-10-25 14:16:50 +01:00
Shannon
0c5b832627 fixing tests 2019-10-16 14:21:03 +11:00
pirvandr
174a1d731d # fix issue 6467: removed all the MacroContainer related files… (#6518) 2019-10-14 14:03:51 +02:00
Sebastiaan Janssen
82e11d7e0a Fix unit tests 2019-08-21 12:45:06 +02:00
Stephan
509b1151a2 Fix tests 2019-04-23 12:09:22 +02:00
Stephan
961cbf694e Simplify our Poco mappers 2019-03-29 09:46:36 +01:00
Stephan
13d97fffdf IFactory is resolvable 2019-03-11 17:14:07 +01:00
Bjarke Berg
ecfc8d819f #4379 - Merged Umbraco.Date into Umbraco.Datetime property editor (#4608) 2019-02-18 09:54:01 +01:00
Stephan
64154da4e4 Get LocalTempPath in GlobalSettings 2019-02-15 09:45:51 +01:00
Stephan
7660e9fb25 Reorganize composition code 2019-02-14 09:15:47 +01:00
Shannon
c04da30547 Merge branch 'temp8' into temp8-contentAndType
# Conflicts:
#	src/Umbraco.Core/Models/Content.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
2019-02-07 11:41:06 +11:00
Stephan
7863cd3ab7 Refactor OrderedCollectionBuilderBase AppendAfter to InsertAfter 2019-02-06 14:11:33 +01:00
Stephan
b260c18056 Refactor IContent vs IContentType 2019-02-06 13:06:31 +01:00
Shannon
febc788c20 Merge remote-tracking branch 'origin/temp8' into temp8-remove-legacy-controls
# Conflicts:
#	src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
2019-01-30 14:36:40 +11:00
Callum Whyte
1340a5ce4b Removing support for legacy webservices 2019-01-29 20:23:20 +01:00
Shannon
1897c0f162 moves package actions to correct namespace, no more _Legacy namespace 2019-01-29 23:31:59 +11:00
Shannon
2e527163f9 no more umbraco.presentation namespace! no more "page" class, has been refactored and renamed to what it actually is and internalized 2019-01-29 23:27:00 +11:00
Warren Buckley
633d9c6fb4 Merge pull request #4218 from umbraco/temp8-dashboards-collection
V8 - Remove dashboards.config - use CollectionBuilder
2019-01-28 14:47:44 +00:00
Stephan
c675708388 Refactor dashboards 2019-01-28 12:38:58 +01:00
Warren Buckley
117b836cd7 Merge pull request #4259 from umbraco/temp8-remove-related-links-with-migration
Remove related links and migrate existing data to Multi URL Picker
2019-01-28 09:42:56 +00:00
Chris Houston
193e24afd2 Fixing all the TODO, FIXME & HACK comments so they all follow the same layout. 2019-01-27 11:16:00 +01:00
Sebastiaan Janssen
5a896e7417 Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker)
(cherry picked from commit fedf0c78de)
2019-01-25 16:06:49 +01:00
Sebastiaan Janssen
9e0d2e5873 Revert "Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker)"
This reverts commit fedf0c78de.
2019-01-24 11:37:28 +01:00
Sebastiaan Janssen
fedf0c78de Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker) 2019-01-23 09:01:53 +01:00
Stephan
d9cc1f4cb8 Fix more tests 2019-01-22 18:25:02 +01:00
Warren Buckley
f6154a38d9 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Web.UI.Client/gulpfile.js
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
2019-01-21 11:17:14 +00:00
Stephan
876056f0bb Merge branch temp8 into temp8-appCaches 2019-01-18 14:54:08 +01:00
Stephan
0bee01e0ee Great AppCaches renaming 2019-01-17 11:01:23 +01:00
Shannon
3f89558ddb Fixing tests 2019-01-17 17:51:38 +11:00
Shannon
430c95dfad Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 2019-01-15 22:59:49 +11:00
Shannon
44ab0991ce Package installing is working 2019-01-15 22:08:08 +11:00
Warren Buckley
e27ea962d9 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-15 09:30:09 +00:00
Stephan
a68b19f1ee More composition / filesystems fixes 2019-01-14 14:28:19 +01:00
Shannon
c89b50f0b8 large refactor/cleanup of most of the old package installer logic dealing with persisting the installedPackages.config which is now in the services, creates new parsers and removes a ton of old code, changes fetching packages to be async, uses XElement instead of old XmlNode apis, next we need to do the actual package installer updates 2019-01-11 14:30:04 +11:00
Shannon
b8d2309b9c Gets the IPackageBuilder working and tested, now the controller can create and update packages, validation is also working, need to do some more tests for adding other entities , removes more of the old packaging code. 2019-01-10 17:18:47 +11:00
Warren Buckley
9ce35d25d2 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
2019-01-07 09:59:15 +00:00
Stephan
f6cd13488e Refactor collection builders to be nicer with DI 2019-01-04 09:34:08 +01:00
Lars-Erik Aabech
7cfe2115c0 Actually uses a scope in the ScopeBuilderCreatesScopedCollection tests 2019-01-04 00:15:06 +01:00
Stephan
7a37c8743b Add container tests 2019-01-03 11:41:40 +01:00
Warren Buckley
4651325d77 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
2019-01-01 19:08:59 +00:00
Stephan
bb9846a6ca Merge branch origin/temp8 into temp8-di2690 2018-12-21 10:58:38 +01:00