yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/users-section' of https://github.com/umbraco/Umbraco.CMS.Backoffice into feature/users-section

Browse Source
This commit is contained in:
Mads Rasmussen
2022-10-10 10:26:56 +02:00
parent 1a74e48af6 0bfede0bb3
commit 01dc5e061b
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
View File

@@ -6,10 +6,10 @@ import { Subscription } from 'rxjs';
import { ifDefined } from 'lit-html/directives/if-defined.js';
import { UmbContextProviderMixin, UmbContextConsumerMixin } from '../../../core/context';
import UmbSectionViewUsersElement from '../../sections/users/views/users/section-view-users.element';
import '../../property-editors/content-picker/property-editor-content-picker.element';
import { UmbUserStore } from '../../../core/stores/user/user.store';
import type { UserDetails } from '../../../core/models';
import { UmbUserContext } from './user.context';
import '../../property-editor-uis/content-picker/property-editor-ui-content-picker.element';
import '../shared/editor-entity-layout/editor-entity-layout.element';
import { getTagLookAndColor } from '../../sections/users/user-extensions';
@@ -180,12 +180,12 @@ export class UmbEditorUserElement extends UmbContextProviderMixin(UmbContextCons
<div>
<b>Content start nodes</b>
<div class="faded-text">Limit the content tree to specific start nodes</div>
<umb-property-editor-content-picker></umb-property-editor-content-picker>
<umb-property-editor-ui-content-picker></umb-property-editor-ui-content-picker>
</div>
<div>
<b>Media start nodes</b>
<div class="faded-text">Limit the media library to specific start nodes</div>
<umb-property-editor-content-picker></umb-property-editor-content-picker>
<umb-property-editor-ui-content-picker></umb-property-editor-ui-content-picker>
</div>
</div>
</uui-box>

21
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts
View File

@@ -82,12 +82,6 @@ export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(L
private _usersContext?: UmbSectionViewUsersElement;
private _selectionSubscription?: Subscription;
constructor() {
super();
this.setupHeaderIntersectionObserver();
}
connectedCallback(): void {
super.connectedCallback();
@@ -107,21 +101,6 @@ export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(L
this._selectionSubscription?.unsubscribe();
}
public setupHeaderIntersectionObserver() {
requestAnimationFrame(() => {
const el = this.shadowRoot?.querySelector('#sticky-top');
if (el) {
const options = { threshold: [1] };
const callback = (entries: IntersectionObserverEntry[]) =>
entries[0].target.classList.toggle('header-shadow', entries[0].intersectionRatio < 1);
const observer = new IntersectionObserver(callback, options);
observer.observe(el);
}
});
}
private _toggleViewType() {
const isList = window.location.pathname.split('/').pop() === 'list';