Commit Graph

67734 Commits

Author SHA1 Message Date
Jacob Overgaard
24e872f0d5 Merge remote-tracking branch 'origin/release/15.1' into v15/dev 2024-12-04 14:00:47 +01:00
Jacob Overgaard
34cad5ffef fix: Blocks do not work in the rich text editors (#17711)
* fix: do not add attributes or html elements to custom elements before they are created

Due to the way browsers treat custom elements, they are not allowed to add attributes and/or child elements upon creation. They must wait until the `connectedCallback`. That means any controller that wants to add elements should also wait until the host is connected (`hostConnected`).

* test: add generic tests for rte block elements

* chore: cleanup imports
2024-12-04 12:28:10 +01:00
Mads Rasmussen
e8d46340ac Hotfix: Don't request urls every time the document name updates (#17710)
* split observables so we don't request url when variantsOptions changes

* clean up events +  debounce requests

* add loading state

* clear lookup before requesting new urls
2024-12-04 11:04:02 +01:00
Mads Rasmussen
9f9aaa6f16 do not set icon color if item is active 2024-12-04 11:01:24 +01:00
Niels Lyngsø
594036c3d9 make blocks auto expose on insert (#17724) 2024-12-04 10:59:47 +01:00
Nikolaj Geisle
9ff67a33ed Add content to TreeAccessTemplate (#17694) 2024-12-04 10:57:14 +01:00
Niels Lyngsø
3caffa2756 Ensure all UMB_ constants is exported (#17683)
* export consts

* remove lexer

* init work on test for all consts to be exported

* temporary solution to working test

* fix test

* fix one consts

* update package-lock

* remove imports

* fix auto generation of test

* correct test

* important mistake correction

* fix workspace

* fix webhooks

* fix users

* UMB_CREATE_USER_CLIENT_CREDENTIAL_MODAL_ALIAS

* fix user group

* fix tree const exports

* tiptap const exports

* fix templates consts export

* tags

* stylesheets

* static files

* settings

* static file system

* section

* search

* scripts

* fix tsc

* relation

* relation-type

* recycle bin

* property type

* picker

* partial views

* tsc corrections

* fix circular

* package

* member

* member type

* move constants to constants file

* member group + documnet type

* media

* media-type

* revert tsconfig change

* log viewer

* language

* imaging

* healt check

* entity actions

* user permissions

* adjust test text

* document

* update consts

* document type etc

* blueprint

* dictionary

* data-type

* current-user

* culture

* content-type

* circular dependency

* block-list

* block-grid

* fix type import

* auto lint fixes

* fix tsc

* update test

* make sure always to call check-const-generation

* fix circular dependencies

* consts for content package
2024-12-04 10:39:06 +01:00
Mole
8ea0267ebc Fix integration test output (#17682)
* Change output

* Fix teardown output
2024-12-04 09:57:02 +01:00
Andreas Zerbst
07c236cdc2 Bumped version of testhelpers 2024-12-04 08:44:22 +01:00
Andreas Zerbst
ece803a6b3 V15 QA added parallelization for the integration tests (#17713)
* Added parallelization for our integration tests

* Updated yaml

* Moved filter command to variable definition

* Escape quotes

* Updated testFilter

* Added testFilter for SQlite

* Cleaned up filter

* Added comments

(cherry picked from commit 2f2da4854a)
2024-12-04 08:42:45 +01:00
Andreas Zerbst
3cf90ac6b4 V15 QA add parallelization of e2e tests (#17691)
* Tries parallelizing the E2E tests

* Updated variable

* Updated SqlServer

* Updated playwright config

* Bumped to use 3 shards

* Implemented shards on nightly pipeline

* Fixed indentation

* Added a smokeTest

* Updated test to run

* Added test command

* Update Templates.spec.ts

(cherry picked from commit 303758d1b2)
2024-12-04 08:41:29 +01:00
Andreas Zerbst
e87cd0a1bc V15 QA updated E2E tests to match changes (#17625)
* Updated locators

* Added waits

* Updated clickDeleteButton

* Bumped version

(cherry picked from commit 01a19b8a9f)
2024-12-04 08:41:24 +01:00
Andreas Zerbst
2f2da4854a V15 QA added parallelization for the integration tests (#17713)
* Added parallelization for our integration tests

* Updated yaml

* Moved filter command to variable definition

* Escape quotes

* Updated testFilter

* Added testFilter for SQlite

* Cleaned up filter

* Added comments
2024-12-03 17:35:24 +01:00
Bjarke Berg
2f388b3f91 Fixes https://github.com/umbraco/Umbraco-CMS/issues/17614 (#17687) 2024-12-03 13:50:36 +01:00
Mole
380f3f7e87 Clear elements cache instead of refreshing it (#17708) 2024-12-03 13:40:05 +01:00
Nhu Dinh
394bbde4b0 V15 Added acceptance tests for Tiptap data type (#17675)
* Added tests for Tiptap data type

* Removed tests for adding a toolbar item as the drag and drop is not working

* Fixed the variable name

* Added tests for TinyMCE data type

* Added tests for RTE data type

* Updated tests for delete toolbar row in Tiptap

* Updated tests for rich text editor data type

* Updated tests for tiny MCE data type

* Updated tests for content with tiny MCE rich text editor

* Renamed tests as there are 2 types of rich text editor

* Bumped version

* Make all data type tests in the pipeline

* Updated tests for Tiptap and TinyMCE due to api helper changes

* Fixed comments

* Update TinyMCE.spec.ts

Removed line

* Reverted

---------

Co-authored-by: Andreas Zerbst <73799582+andr317c@users.noreply.github.com>
2024-12-03 15:58:17 +07:00
Mads Rasmussen
437fcba4e5 fix: store first rte value (#17699) 2024-12-02 21:23:39 +01:00
Mads Rasmussen
8141b6b07e Hotfix: unnecessary Discard Changes dialog for RTEs (#17692)
* remove code duplication

* remove unused code

* allow value to be undefined

* dot not build model if we have no markup

* do update the layout value if we don't get any layouts

* reset internals if there are no value

* clear value if tiny mce doesn't have any markup

* clear value if tip tap doesn't have any markup

* add method to check if tip tap element is empty

* use method to check for empty tip tap
2024-12-02 14:48:28 +01:00
Andreas Zerbst
303758d1b2 V15 QA add parallelization of e2e tests (#17691)
* Tries parallelizing the E2E tests

* Updated variable

* Updated SqlServer

* Updated playwright config

* Bumped to use 3 shards

* Implemented shards on nightly pipeline

* Fixed indentation

* Added a smokeTest

* Updated test to run

* Added test command

* Update Templates.spec.ts
2024-12-02 14:48:15 +01:00
Andreas Zerbst
01a19b8a9f V15 QA updated E2E tests to match changes (#17625)
* Updated locators

* Added waits

* Updated clickDeleteButton

* Bumped version
2024-12-02 12:00:54 +01:00
Jacob Overgaard
ceafa83cc7 build: update the repository link 2024-11-29 15:36:28 +01:00
Jacob Overgaard
42f62d30df build: use the backoffice template in both build jobs 2024-11-29 14:55:35 +01:00
Mads Rasmussen
5b1d72e802 Chore: Enable MSW in web/test-runner + add tests for state manager + isCurrentUser util (#17584)
* add tests for UmbEntityWorkspaceDataManager

* add tests for umbObjectToPropertyValueArray

* remove unused

* split into individual files

* get from window

* fix import

* setup msw

* temp removal of different mock states

* add service worker

* add tests for isCurrentUser util

* Update package.json

* silence more text logs

* fix race condition

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
2024-11-29 13:21:00 +01:00
Mads Rasmussen
c4b0bdeadf Bugfix: Redirect when server file is renamed (#17663)
* make args protected + type generic

* add rename event

* get new name and unique from modal

* dispatch event when file is renamed

* get unique from entity context

* poc redirect after rename

* move logic to controller

* dont render code editor if content is undefined

* remove unused styling

* set unique after create

* use replace state

* set additionalOptions for rename action

* Update workspace-redirect.controller.ts

* add focus to name input

* add rename redirect controller

* clean up

* split render methods

* Update script-workspace.context.ts

* implement EntityDetailWorkspaceBase for stylesheets

* remove unused

* don't render code editor if there is no content

* add rename redirect controller

---------

Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
2024-11-29 13:12:31 +01:00
nikolajlauridsen
c0cef3493c Bump version 2024-11-29 12:22:13 +01:00
Bjarke Berg
07d77aa465 Optimize Azure pipeline (#17674)
* Only fetch single commit

* Hopefully fixes Nerdbank.GitVersioning.GitException: Shallow clone lacks the objects required to calculate version height. Use full clones or clones with a history at least as deep as the last version height resetting change.

* Do not checkout again

* More test pipeline

* Another attempt

* yet another attempt

* more attempts

* Revert "more attempts"

This reverts commit 5694d97ba620e90fdeea287936f58002f2a5ddba.

* Test without building backoffice and login explicitly

* Fix mem leak in integration tests

* Fixes sqlserver lock test
2024-11-29 12:21:36 +01:00
Bjarke Berg
bce58a5a25 Optimize Azure pipeline (#17674)
* Only fetch single commit

* Hopefully fixes Nerdbank.GitVersioning.GitException: Shallow clone lacks the objects required to calculate version height. Use full clones or clones with a history at least as deep as the last version height resetting change.

* Do not checkout again

* More test pipeline

* Another attempt

* yet another attempt

* more attempts

* Revert "more attempts"

This reverts commit 5694d97ba620e90fdeea287936f58002f2a5ddba.

* Test without building backoffice and login explicitly

* Fix mem leak in integration tests

* Fixes sqlserver lock test
2024-11-29 12:20:19 +01:00
nikolajlauridsen
61d5105c61 Bump version 2024-11-29 09:19:55 +01:00
nikolajlauridsen
d1d2d73f19 Merge remote-tracking branch 'origin/release/15.1' into v15/dev 2024-11-29 09:19:29 +01:00
Nhu Dinh
428c91725b V15 QA Added acceptance tests for rendering content with different uploaded files (#17660)
* Added tests for rendering content with upload file

* Bumped version

* Make all tests for rendering content run in the pipeline

* Fixed command

* Reverted
2024-11-29 10:41:10 +07:00
Elitsa Marinovska
f7d719af06 V15: Utilizing content type filtering for navigation data instead of .OfType<T>() (#17639)
* Implement GetContentTypeAliasForType which will replace the need for .OfType<T>();

* Refactor EnumerateAncestorsOrSelfInternal to be generic and extracting checks

* Add types to implementation referencing the old non-generic method

* Using

* Replace Ancestors.OfType<T> implementation

* Refactor EnumerateDescendantsOrSelfInternal to be generic

* Fixing references by adding IPublishedContent type param

* Cleanup + removing unused method

* Replace Descendants.OfType<T> implementation

* Remove unnecessary enumeration

* Updating Children.OfType<T>() implementation

* Adding correct types

* Fixing SiblingsAndSelf implementation

* Refactor TryYieldSelfOfType

* Remove nested checks

* Add comments and retrieval of content type alias from T in the private helper methods

* Simplify implementation based on review comments

* Add case when you get all root keys without a type

* Refactoring

* Renaming + review comments

* Rewrite SiblingsAndSelf

---------

Co-authored-by: kjac <kja@umbraco.dk>
2024-11-28 17:18:18 +01:00
nikolajlauridsen
3203f64c2d Bump version to test template 2024-11-28 12:26:38 +01:00
nikolajlauridsen
6507497307 Revert "Hardcode version to have a working build"
This reverts commit fba183d816.
2024-11-28 12:25:53 +01:00
nikolajlauridsen
afe9604920 Don't pack template.json 2024-11-28 10:12:13 +01:00
Niels Lyngsø
3dbb626cfb Merge branch 'release/15.1' into v15/dev 2024-11-27 19:39:25 +01:00
Niels Lyngsø
7177a29b5d build(deps): update @umbraco-ui/uui from 1.12.1 to 1.12.2 (#17657)
* update uui

* remove temp fix

* revert mockServiceWorker change

* fix document collection paths
2024-11-27 17:18:44 +01:00
Sven Geusens
c29e0e92ed Fix merge issues 2024-11-27 16:20:18 +01:00
Sven Geusens
c2f16b7eb0 Merge branch 'v14/dev' into v15/dev
# Conflicts:
#	Directory.Packages.props
#	build/azure-pipelines.yml
#	src/Umbraco.Core/MonitorLock.cs
#	src/Umbraco.PublishedCache.NuCache/ContentStore.cs
#	src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.PublishedCache.NuCache/SnapDictionary.cs
#	src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs
#	src/Umbraco.Web.UI.Client~v14_dev
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowAtRoot.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowVaryByCulture.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedTemplates.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithListViewContent.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/ListViewMedia.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/CreatedPackages.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/PackagesPackages.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithApprovedColor.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithCheckboxList.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithContentPicker.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithDatePicker.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithDropdown.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithImageCropper.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithNumeric.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithRadiobox.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithTags.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithTextarea.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithTextstring.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithTrueFalse.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeTemplatesTab.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/UICulture.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MemberSection.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/UserGroups.spec.ts
2024-11-27 15:10:20 +01:00
Sven Geusens
28756d449b Rectify v13 in v14 merge 2024-11-27 14:35:22 +01:00
Sven Geusens
38a96db369 Merge branch 'v13/dev' into v14/dev
# Conflicts:
#	src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs
#	src/Umbraco.Core/Models/AuditItem.cs
#	src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditRepository.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/rte-blockeditor-clipboard.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/user.service.js
#	src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
#	src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.html
#	src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umbimagepreview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.html
#	src/Umbraco.Web.UI.Client~HEAD
#	src/Umbraco.Web.UI.Login/package-lock.json
#	src/Umbraco.Web.UI.Login/package.json
#	src/Umbraco.Web.UI.Login/src/auth.element.ts
#	src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts
#	src/Umbraco.Web.UI.Login/src/index.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs
2024-11-27 14:04:41 +01:00
nikolajlauridsen
fba183d816 Hardcode version to have a working build 2024-11-27 12:43:14 +01:00
Jacob Overgaard
44ec0e66d9 V15: Debug missing contexts (#17645)
* fix: wait a frame before calculating events, which allows the debug callback to "fill up" the instances map

* Revert "fix: wait a frame before calculating events, which allows the debug callback to "fill up" the instances map"

This reverts commit a8a2bdbb053866ee88d35d076dd897bdf0a65826.

* fix: assign the inner object (`event.instances`) directly to a state and perform the "massaging" only when it updates

this ensures that any live changes to the inner object are reflected in the UI
2024-11-27 12:22:36 +01:00
Kenn Jacobsen
444c87469c Add ASCII file name conversion (#17580)
(cherry picked from commit 4590739fa5)
(cherry picked from commit 3d1505d4c6)
2024-11-27 09:23:54 +01:00
Kenn Jacobsen
3d1505d4c6 Add ASCII file name conversion (#17580)
(cherry picked from commit 4590739fa5)
2024-11-27 09:14:26 +01:00
Nikolaj Geisle
5200181ea2 make system media types clonable (#17641) 2024-11-27 07:33:13 +01:00
Sven Geusens
a1ea203281 Merge branch 'v10/dev' into v13/dev
# Conflicts:
#	src/Directory.Packages.props
#	src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
2024-11-26 21:08:22 +01:00
Lee Kelleher
4f3f2efbdc Adds UFM Link component (#17636)
to support the Multi-URL Picker editor.
2024-11-26 14:45:09 +01:00
Lee Kelleher
bea12b7a50 UFM: ContentName, adds support for Media Picker (#17635) 2024-11-26 14:34:40 +01:00
Elitsa Marinovska
334cb4701f Apply content type filter on self as well (#17581) 2024-11-26 13:14:26 +01:00
nikolajlauridsen
75f1beed9d Fix version number 2024-11-26 12:24:31 +01:00