Skip to content

v10: Add data-element to umb property so we can find it #13199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikolajlauridsen merged 1 commit into from
Oct 13, 2022
Merged

v10: Add data-element to umb property so we can find it #13199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div class="control-header" ng-hide="vm.property.hideLabel === true">

<label class="control-label" for="{{vm.property.alias}}" ng-attr-title="{{vm.controlLabelTitle}}">{{vm.property.label}}<span ng-if="vm.property.validation.mandatory || vm.property.ncMandatory"><strong class="umb-control-required">*</strong></span></label>
<label data-element="property-label-{{vm.property.alias}}" class="control-label" for="{{vm.property.alias}}" ng-attr-title="{{vm.controlLabelTitle}}">{{vm.property.label}}<span ng-if="vm.property.validation.mandatory || vm.property.ncMandatory"><strong class="umb-control-required">*</strong></span></label>

<umb-property-actions actions="vm.propertyActions"></umb-property-actions>

Expand Down Expand Up @@ -41,11 +41,11 @@
<span ng-if="vm.property.variations === 'Culture' || vm.property.variations === 'CultureAndSegment'" class="umb-property-variant-label">
{{ vm.property.culture }}
</span>

<span ng-if="vm.property.variations === 'Culture' && vm.node.documentType.variations === 'CultureAndSegment'" class="umb-property-variant-label">
<localize key="languages_invariantSegmentProperty"></localize>
</span>

<span ng-if="vm.property.variations === 'Segment' || vm.property.variations === 'CultureAndSegment'" class="umb-property-variant-label">
<span>{{ vm.property.segment }}</span>
<span ng-if="!vm.property.segment">Default</span>
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<input type="hidden" name="partialView" ng-model="mandatoryViewValidator" ng-required="!model.macro.node" />

<button type="button"
id="{{vm.macroPartialViewPickerProperty.alias}}"
class="umb-node-preview-add"
ng-show="!model.macro.node"
ng-click="model.openViewPicker()">
Expand Down
2 changes: 1 addition & 1 deletion tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ test.describe('Macros', () => {
await form.locator(".btn-primary").click();

// Adds partial view to macro
await page.locator('[label="Macro partial view"]').click();
await page.locator('[data-element="property-label-macroPartialViewPickerProperty"]').click();
await page.locator('[data-element="tree-item-' + partialViewName + '.cshtml"]').click();

await umbracoUi.clickElement(umbracoUi.getButtonByLabelKey(ConstantHelper.buttons.save));
Expand Down