Commit Graph

587 Commits

Author SHA1 Message Date
Paul Johnson
6a2a5d7fc9 Bugfixes for MNTP / EntityController (#11685)
* Added EntityController.GetUrlsByIds support for int & guid + update MNTP

Fixes issue with MNTP (for 8.18) in a partial view macro - GH #11631

Renamed GetUrlsByUdis to match, don't do this in v9 as it would be
breaking there, instead mark it obsolete.

TODO: v9 ensure integration test coverage, more painful here as no
WebApplicationFactory.

* Added partial test coverage for GetUrlsByIds.

This doesn't actually work in the backoffice because of GH #11448

So lets fix that next.

* Failing test demonstrating #11448

* Fix for #11448 getByIds doesn't work as expected.

ParameterSwapControllerActionSelectorAttribute - cached body survived between requests.

* Expand on sync vs async comment for future confused souls.

* Might aswell cache parsed json vs string for performance

* Make ParameterSwapControllerActionSelector remarks more accurate.

* Share deserialized request body between action constraint and model binder

* Be more defensive with RequestBodyAsJObject HttpContext item

Only store if deserialize success.
Don't assume key being present means can cast as JObject.

* Nest constant a little deeper.

* Final defensive tweak
2021-11-25 13:47:59 +01:00
Bjarke Berg
b0a4a92f57 ContentVersion cleanup backoffice UI (#11637) (#11644)
* ContentVersion cleanup backoffice UI (#11637)

* init rollback ui prototype

* add busy state to button, deselect version, add pagination status

* add localisation

* style current version

* disable rollback button when nothing is selected

* stop click event

* Endpoints for paginated content versions.
Light on tests, tight on time.

* Endpoints to "pin" content versions

* camel case json output.
Not sure why json formatter not set for controller, bit risky to add it now

* wire up paging

* wire up pin/unpin

* rename getPagedRollbackVersions to getPagedContentVersions

* prevent selection of current version and current draft

* add current draft and current version to UI

* remove pointer if the row is not selectable

* Improve warning for globally disabled cleanup feature.

* Fix current loses prevent cleanup state on publish.

* Added umbracoLog audit entries for "pin" / "unpin"

* Match v9 defaults for keepVersions settings

* Fix - losing preventCleanup on save current with content changes

* update pin/unpin button labels

* fix pagination bug

* add missing "

* always send culture when a doc type can vary

Co-authored-by: Mads Rasmussen <madsr@hey.com>
# Conflicts:
#	src/Umbraco.Core/ContentEditing/ContentVersionMetaViewModel.cs
#	src/Umbraco.Core/Models/HistoricContentVersionMeta.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
#	src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Umbraco.Web.csproj

* Added tests

* Misc - missed translation update

* Bugfix - DocumentVersionRepository.Get should not join culture variation

* Bugfix - Missing write lock

* Removed unnecessary view model

* Misc - kill some warnings

* Misc - Kill some more warnings

* Fixed cypress rollback test

* Bugfix - Policy returns items to delete not items to keep.
Switch to inverse behavior.

# Conflicts:
#	src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs

Co-authored-by: Paul Johnson <pmj@umbraco.com>
2021-11-16 13:04:31 +01:00
Bjarke Berg
169fc7c12f Merge pull request #11609 from umbraco/v9/bugfix/AB14726-fix-user-invite
Fix sending invite emails
2021-11-15 13:13:31 +01:00
Andy Butland
808ba62b34 Added suggestions from code review. 2021-11-15 12:58:23 +01:00
Elitsa Marinovska
b8cd731b0d Don't send null but fall back to the user's email in case SMPT settings are not configured in appsettings 2021-11-11 15:07:51 +01:00
Bjarke Berg
7f061bd818 Merge pull request #11570 from umbraco/v9/feature/merge_v9_contrib_03-11-2021
V9: Merge `v9/contrib` 03-11-2021
2021-11-03 14:54:59 +01:00
Sebastiaan Janssen
692f952293 Merge branch 'v9/contrib' into v9/dev
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
2021-11-03 13:05:43 +01:00
Bjarke Berg
353686361b Merge branch 'v9/9.0' into v9/dev 2021-11-03 13:01:52 +01:00
Bjarke Berg
c3ebbe23fd Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_03-11-2021
# Conflicts:
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configurations/LanguageXmlTests.cs
2021-11-03 08:44:12 +01:00
Bjarke Berg
bf5f1364fd Fix build after merge 2021-10-29 10:14:52 +02:00
Bjarke Berg
02bf61667d Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8_29-10-2021
# Conflicts:
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
2021-10-29 09:52:39 +02:00
Bjarke Berg
7261091271 Merge remote-tracking branch 'origin/v8/dev' into v9/feature/v8_merge_22_10_2021
# Conflicts:
#	src/Umbraco.Core/Exceptions/InvalidCompositionException.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
#	src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
#	src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web/Editors/MemberGroupController.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/NuCacheRebuildTests.cs
2021-10-22 08:51:01 +02:00
Bjarke Berg
3e7aa299a3 https://github.com/umbraco/Umbraco-CMS/issues/11427
Ensure there can't be duplicate culture codes in languages dropdown
2021-10-21 09:51:05 +02:00
Bjarke Berg
56595a7fc7 Merge v8/dev 20-10-2021 (#11426)
* Adjust icon in umb-checkbox and ensure icon is centered

* Missing nl translation for blockEditor_addBlock

* Implement icon parameter for doctype editor (#11008)

* fix: implement icon parameter for doctype editor

issue #10108

* fix: move color from icon to class attribute

* fix: removed defined colors, defaulting to the standard dark grey (ie "no color picked" in icon picker)

* cleaned up unused dependencies, double quotes to single, removed unused 'color' param from the create methods, and use shorthand object creation in createDocType (if the key has the same name as the variable passed as a prop, we only need to pass the key name)

* fix comment

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>

* Align sortable handle vertically in multivalues prevalue editor

* 10341: Use different picker for content types (#10896)

* 10341: Use different picker for content types

* use es6 where possible (inc removing underscore for teeny tiny performance improvement)

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>

* Falling back to contentTypeName when Block List label is empty (#10963)

* Falling back to contentTypeName when Block List label is empty

* Adding $contentTypeName variable for Block List labels

* Fix incorrect attribute

* Grid: Add button styling fix (#10978)

* Add missing focus styling

* Ensure add button is perfectly rounded and remove unused / uneeded CSS.

* Remove redundant border-color property

* Revert removal of unused css

Co-authored-by: BatJan <jaskov@gmail.com>
Co-authored-by: Jan Skovgaard Olsen <jso@co3.dk>

* Create content template localization (#10945)

* Don't use self-closing element for custom HTML elements

* Use button element for close/cancel in copy dialog

* Update localization of "createBlueprintFrom"

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>

* Cleanup examine search results, and adds ability to toggle fields (#9141)

* Cleanup examine search results, and adds ability to toggle fields

* update table to use joinarray filter with one-time binding to avoid recalculating filter values, updated filter to not explode when array arg is null

* fix failing tests - improve filter to not fail on non-array params, update tests accordingly

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>

* Add EntityController GetUrlsByUdis

Enables loading multiple URLs in a single request for Media & Documents

* Update content picker to use GetUrlsByUdis

* Allows replacing MainDom with alternate DB

There are some cases where there is a complex hosting strategy and folks want a readonly database and are hosting on Azure. In that case, it is not entirely possible to have a readonly Umbraco database because SqlMainDom is required and part of that requirement is to have read/write access to the umbraco key value table.
This PR allows for the default MainDom to be replaced and to allow for an SqlMainDomLock to use an alternate connection string so that a separate read/write database can be used.

* Remove inherited property group id/key when local properties are added (#11231)

* Remove inherited property group id/key when local properties are added

* Rebind saved content type values

* Remove inherited from save group

* Rename parameter for clarity

* Removes annoying wait text, which causes layout jank

* v8: Backoffice Welsh language translation updates (#11240)

* Updated the Welsh language file to include newly added keys (based on the en us language file)

* Updated the searchInputDescription key

* Updated the endTitle key

* Use medium sized overlay

* Use umb-icon component for icons in content type groups and tabs

* fixes wrong reference to enterSubmitFolder method in ng-keydown

* 11251: Don't add default dashboard to url

* Fix preview of SVG when height and width not are set

* If caching a published document, make sure you use the published Name… (#11313)

* If caching a published document, make sure you use the published Name. Closes #11074.

* Fix case of new node

Co-authored-by: Moore, Douglas S <Douglas.Moore@opm.gov>

* Added missing Italian translations (#11197)

* Resolve incorrect ContentSavedState for failed publish

Closes #11290 (for v8)

* add modelValue validation for server to correctly update validation errors

* 11048: Bugfix for groups and properties that get replaced (#11257)

(cherry picked from commit 1605dc10bd)

* Icon fallback to `icon-document` for existing document types (#11283)

* Align create buttons styling (#11352)

* Added button for cancelling dictionary create action

* Use hideMenu

* Align dictionary create with the other creates

* Align import documenttype

* Align for data type folder create

* Align document type create buttons

* Forgot small ng-show

* Align create media folder buttons

* Align create macro buttons

* Align create relation buttons

* Align create partial view macro folder buttons

* Align partial view folder create buttons

* Align create scripts folder buttons

* Align create scripts folder buttons

* Use primary instead of success

* V8: Duplicate MemberGroup names cause MemberGroup mixup (#11291)

* Prevented duplicate member group names

* Added English lang

* Updated 'Exist' typo

* add labels in FR and NL

* Adding property group aliases to ex.message

* Adding invalid prop group aliases as ModelState errors, so we don't introduce breaking changes

* Pointing the actual reason for invalidating composition

* Validate all content type dependencies and throw a single InvalidCompositionException

* Rename based on review comments

* Update composition validation error messages

* Update InvalidCompositionException message

* Allow switching property editor from numeric to slider (#11287)

* Make it possible to change from numeric/decimal property editor to slider without breaking editor

* Formatting

* Enables friendly pasting in multipletextbox

* UI API docs: Added reset rules for .close class

* UI API docs: Fixed incorrect method name

* 11331: Check property on instance if id is not set yet

* Fixed cypress tests

Co-authored-by: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Co-authored-by: Corné Strijkert <cornestrijkert@hotmail.com>
Co-authored-by: Søren Gregersen <soreng@gmail.com>
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
Co-authored-by: patrickdemooij9 <patrickdemooij98@hotmail.com>
Co-authored-by: Callum Whyte <hey@callumwhyte.com>
Co-authored-by: Jan Skovgaard <1932158+BatJan@users.noreply.github.com>
Co-authored-by: BatJan <jaskov@gmail.com>
Co-authored-by: Jan Skovgaard Olsen <jso@co3.dk>
Co-authored-by: Søren Kottal <sk@ecreo.dk>
Co-authored-by: Paul Johnson <pmj@umbraco.com>
Co-authored-by: Shannon <sdeminick@gmail.com>
Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
Co-authored-by: Ronald Barendse <ronald@barend.se>
Co-authored-by: Owain Jones <owain.jones@method4.co.uk>
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
Co-authored-by: Doug Moore <lordscarlet@idledreams.net>
Co-authored-by: Moore, Douglas S <Douglas.Moore@opm.gov>
Co-authored-by: Martino Gabrielli <39855999+ZioTino@users.noreply.github.com>
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
Co-authored-by: Jamie Townsend <jamie.townsend@unitstack.co.uk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Anders Bjerner <abjerner@skybrud.dk>
2021-10-20 13:12:46 +02:00
Nikolaj Geisle
48003e0b70 Check ancestors for published culture
Fixed issue where if you were 3 levels deep and published only 1 culture, warning wouldn't fire
2021-10-15 11:48:15 +02:00
Nikolaj Geisle
76a8d4c474 Added logging in test 2021-10-14 14:07:31 +02:00
Nikolaj Geisle
7379387b2e Added logging 2021-10-14 13:30:22 +02:00
Nikolaj Geisle
4c616dc71d Merge branch 'v9/dev' into v9/feature/add-notifcation-for-url-collision 2021-10-14 13:02:11 +02:00
Berg
5fe30c746c Fixed breaking change! 2021-10-12 08:08:03 +02:00
nikolajlauridsen
161fc7d456 Use hashset instead of list for assigned domains
We don't care about dupes
2021-10-08 14:55:44 +02:00
nikolajlauridsen
5a82d8ee2e Also display warning when publishing with descendants 2021-10-08 11:35:56 +02:00
nikolajlauridsen
8e7fb897d1 Use proper notifications instead of event messages 2021-10-08 11:24:10 +02:00
nikolajlauridsen
11bfef4750 Add unit test 2021-10-07 14:12:37 +02:00
nikolajlauridsen
ae39256a84 Specify constructor for DI 2021-10-07 12:49:36 +02:00
Nikolaj Geisle
70831bb0c0 Update src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs 2021-10-07 10:46:54 +02:00
Nikolaj Geisle
09a35ef96c Fixed breaking change 2021-10-07 09:51:04 +02:00
Nikolaj Geisle
4446de915e Merge branch 'v9/dev' into v9/feature/debug-dashboard 2021-10-07 08:16:25 +02:00
nikolajlauridsen
9e5520f8c1 Only warn about cultures actually being published 2021-10-06 14:49:49 +02:00
nikolajlauridsen
a8bd71ba7e Check ancestors for any configured domains 2021-10-06 14:31:42 +02:00
nikolajlauridsen
a60594440a Localize speech bubble text 2021-10-06 12:57:21 +02:00
nikolajlauridsen
740dfcc531 Verify that published culture has domain 2021-10-06 12:26:18 +02:00
nikolajlauridsen
1921fd8a76 Verify that root node has domains when multilingual content is published 2021-10-06 11:37:03 +02:00
Bjarke Berg
114ab93a6a Moved endpoint to new controller to avoid issue with too hard access requirements (#11264)
* Fixed https://github.com/umbraco/Umbraco-CMS/issues/11258

Moved endpoint and obsoleted the old one to avoid breaking changes..
The issue is the auth policies cannot be overridden.. You need all of them, and the controller requires you to have access to member types

* Update src/Umbraco.Web.BackOffice/Controllers/MemberTypeQueryController.cs

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
2021-10-06 10:20:50 +02:00
Bjarke Berg
02d89ce613 https://github.com/umbraco/Umbraco-CMS/issues/11263
Fixes issue where we used the current users email when sending invite emails. Now we use the one from SMTP settings like in v8
2021-10-04 19:40:32 +02:00
Nikolaj Geisle
45badbd36b Apply suggestions from code review
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
2021-10-04 11:31:38 +02:00
Nikolaj Geisle
22ca290884 Added Unit Tests 2021-09-30 15:51:21 +02:00
Nikolaj Geisle
95568b21af Updated to display framework 2021-09-30 13:36:54 +02:00
Nikolaj Geisle
4ea1f46f2b Implemented variable data instead of hardcoded 2021-09-30 13:09:04 +02:00
Bjarke Berg
452097d975 Fixed issue with Paths-integers being converted using local culture. (#11180)
* Fixed issue with Paths-integers being converted using local culture.

* Align with the old implementation

* Use int.TryParse insteaad of TryConvertTo when we do not want culture specific parsing

* More fixes for cultures and fixed wrong test. Users should be part of all groups to have access

* Fix casing for requested file

* Force tests to not use NLS

* try force tests to not use NLS

* try force tests to not use NLS

* Force tests on windows to run ICU

* More fixes for invariant int parsing

* Change key on actions/emptyRecycleBin, so the casing aligns with the view file, that is named emptyrecyclebin.html

* Fixed casing issue

* use Attempt to align with other code
2021-09-24 16:42:31 +01:00
Bjarke Berg
d007fa0012 Add folderkeys to package xml. (#11172)
* Add folderkeys to package xml.

* Cleanup

* Use folderKeys to find child

* Fix potential issue with when no folder

* Fixed logic issue.

Co-authored-by: Andy Butland <abutland73@gmail.com>
2021-09-22 23:52:09 +02:00
Bjarke Berg
68d4d76da2 Use Invariant when toString userIds 2021-09-20 11:30:09 +02:00
Bjarke Berg
e2ab9a2285 Clean up 2021-09-17 08:29:34 +02:00
Bjarke Berg
39faf63f9c Fixed tryParse 2021-09-15 13:40:08 +02:00
Bjarke Berg
f68717c1c8 Temp commit 2021-09-14 22:13:39 +02:00
Nikolaj Geisle
088d87bac6 Merge pull request #11064 from umbraco/v9/bugfix/10650-fix_issue_with_upgrading_while_in_backoffice
Add redirect to /umbraco if you are not in run state.
2021-09-10 10:50:41 +02:00
Bjarke Berg
0db6d542ea Cleanup 2021-09-10 09:24:11 +02:00
Mole
dd03b25a43 Merge pull request #11054 from umbraco/v9/bugfix/#10403-Fixed-Notification-with-UmbracoAuthorizedController
v9: Bugfix - Implemented attribute changes in controller
2021-09-10 09:18:06 +02:00
Bjarke Berg
41aabd2515 https://github.com/umbraco/Umbraco-CMS/issues/10650 - Added redirect in backoffice controller if you are not in run state. 2021-09-09 15:37:13 +02:00
Bjarke Berg
1d55d50809 Merge pull request #11046 from umbraco/v9/feature/merge_v8.17-rc
Merge 8.17 RC into V9, cleanup/refactor property groups/tabs API
2021-09-08 19:17:02 +02:00
Bjarke Berg
42e27450d9 Merge pull request #11053 from umbraco/v9/bugfix/add_missing_action
V9: Fixed missing action
2021-09-08 19:16:47 +02:00