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

user

Browse Source
This commit is contained in:
Niels Lyngsø
2022-12-16 11:21:16 +01:00
parent 8f66c9e2e4
commit 835e633a84
13 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.test.ts
View File

@@ -1,18 +0,0 @@
import { expect, fixture, html } from '@open-wc/testing';
import { UmbEditorViewUsersGridElement } from './editor-view-users-grid.element';
import { defaultA11yConfig } from '@umbraco-cms/test-utils';
describe('UmbEditorViewUsersCreateElement', () => {
let element: UmbEditorViewUsersGridElement;
beforeEach(async () => {
element = await fixture(html`<umb-editor-view-users-grid></umb-editor-view-users-grid>`);
});
it('is defined with its own instance', () => {
expect(element).to.be.instanceOf(UmbEditorViewUsersGridElement);
});
it('passes the a11y audit', async () => {
await expect(element).shadowDom.to.be.accessible(defaultA11yConfig);
});
});

8
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts
View File

@@ -10,8 +10,8 @@ import type { UserDetails, UserEntity, UserGroupDetails, UserGroupEntity } from
import { UmbObserverMixin } from '@umbraco-cms/observable-api';
import { UmbUserGroupStore } from 'src/core/stores/user/user-group.store';
@customElement('umb-editor-view-users-grid')
export class UmbEditorViewUsersGridElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
@customElement('umb-workspace-view-users-grid')
export class UmbWorkspaceViewUsersGridElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
static styles = [
UUITextStyles,
css`
@@ -158,10 +158,10 @@ export class UmbEditorViewUsersGridElement extends UmbContextConsumerMixin(UmbOb
}
}
export default UmbEditorViewUsersGridElement;
export default UmbWorkspaceViewUsersGridElement;
declare global {
interface HTMLElementTagNameMap {
'umb-editor-view-users-grid': UmbEditorViewUsersGridElement;
'umb-workspace-view-users-grid': UmbWorkspaceViewUsersGridElement;
}
}

18
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/workspace-view-users-grid.test.ts Normal file
View File

@@ -0,0 +1,18 @@
import { expect, fixture, html } from '@open-wc/testing';
import { UmbWorkspaceViewUsersGridElement } from './workspace-view-users-grid.element';
import { defaultA11yConfig } from '@umbraco-cms/test-utils';
describe('UmbWorkspaceViewUsersCreateElement', () => {
let element: UmbWorkspaceViewUsersGridElement;
beforeEach(async () => {
element = await fixture(html`<umb-workspace-view-users-grid></umb-workspace-view-users-grid>`);
});
it('is defined with its own instance', () => {
expect(element).to.be.instanceOf(UmbWorkspaceViewUsersGridElement);
});
it('passes the a11y audit', async () => {
await expect(element).shadowDom.to.be.accessible(defaultA11yConfig);
});
});

8
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/workspace-view-users-table.element.ts
View File

@@ -19,8 +19,8 @@ import './column-layouts/name/user-table-name-column-layout.element';
import './column-layouts/status/user-table-status-column-layout.element';
import { UmbUserGroupStore } from 'src/core/stores/user/user-group.store';
@customElement('umb-editor-view-users-table')
export class UmbEditorViewUsersTableElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
@customElement('umb-workspace-view-users-table')
export class UmbWorkspaceViewUsersTableElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
static styles = [
UUITextStyles,
css`
@@ -184,10 +184,10 @@ export class UmbEditorViewUsersTableElement extends UmbContextConsumerMixin(UmbO
}
}
export default UmbEditorViewUsersTableElement;
export default UmbWorkspaceViewUsersTableElement;
declare global {
interface HTMLElementTagNameMap {
'umb-editor-view-users-table': UmbEditorViewUsersTableElement;
'umb-workspace-view-users-table': UmbWorkspaceViewUsersTableElement;
}
}

12
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts
View File

@@ -3,13 +3,13 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { customElement, state } from 'lit/decorators.js';
import { BehaviorSubject, Observable } from 'rxjs';
import type { IRoute, IRoutingInfo } from 'router-slot';
import UmbWorkspaceEntityElement from '../../../../workspaces/shared/workspace-entity/workspace-entity.element';
import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api';
import './list-view-layouts/table/editor-view-users-table.element';
import './list-view-layouts/grid/editor-view-users-grid.element';
import './editor-view-users-selection.element';
import './editor-view-users-invite.element';
import '../../../../workspaces/shared/workspace-entity/workspace-entity.element';
import './list-view-layouts/table/workspace-view-users-table.element';
import './list-view-layouts/grid/workspace-view-users-grid.element';
import './workspace-view-users-selection.element';
import './workspace-view-users-invite.element';
import type { UserDetails } from '@umbraco-cms/models';
import { UmbObserverMixin } from '@umbraco-cms/observable-api';
import { UmbUserStore } from 'src/core/stores/user/user.store';
@@ -31,7 +31,7 @@ export class UmbSectionViewUsersElement extends UmbContextProviderMixin(
private _routes: IRoute[] = [
{
path: 'overview',
component: () => import('./editor-view-users-overview.element'),
component: () => import('./workspace-view-users-overview.element'),
},
{
path: `:entityType/:key`,

8
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-create.element.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/workspace-view-users-create.element.ts
View File

@@ -9,8 +9,8 @@ import { UmbModalLayoutElement, UmbNotificationDefaultData, UmbNotificationServi
import { UmbUserStore } from '@umbraco-cms/stores/user/user.store';
export type UsersViewType = 'list' | 'grid';
@customElement('umb-editor-view-users-create')
export class UmbEditorViewUsersCreateElement extends UmbContextConsumerMixin(UmbModalLayoutElement) {
@customElement('umb-workspace-view-users-create')
export class UmbWorkspaceViewUsersCreateElement extends UmbContextConsumerMixin(UmbModalLayoutElement) {
static styles = [
UUITextStyles,
css`
@@ -203,10 +203,10 @@ export class UmbEditorViewUsersCreateElement extends UmbContextConsumerMixin(Umb
}
}
export default UmbEditorViewUsersCreateElement;
export default UmbWorkspaceViewUsersCreateElement;
declare global {
interface HTMLElementTagNameMap {
'umb-editor-view-users-create': UmbEditorViewUsersCreateElement;
'umb-workspace-view-users-create': UmbWorkspaceViewUsersCreateElement;
}
}

10
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.test.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/workspace-view-users-create.test.ts
View File

@@ -1,16 +1,16 @@
import { expect, fixture, html } from '@open-wc/testing';
//TODO: Test has been commented out while we figure out how to setup import maps for the test environment
// import { defaultA11yConfig } from '@umbraco-cms/test-utils';
// import UmbEditorViewUsersOverviewElement from './editor-view-users-overview.element';
// import UmbWorkspaceViewUsersCreateElement from './editor-view-users-create.element';
// describe('UmbEditorViewUsersOverviewElement', () => {
// let element: UmbEditorViewUsersOverviewElement;
// describe('UmbWorkspaceViewUsersCreateElement', () => {
// let element: UmbWorkspaceViewUsersCreateElement;
// beforeEach(async () => {
// element = await fixture(html`<umb-editor-view-users-overview></umb-editor-view-users-overview>`);
// element = await fixture(html`<umb-workspace-view-users-create></umb-workspace-view-users-create>`);
// });
// it('is defined with its own instance', () => {
// expect(element).to.be.instanceOf(UmbEditorViewUsersOverviewElement);
// expect(element).to.be.instanceOf(UmbWorkspaceViewUsersCreateElement);
// });
// it('passes the a11y audit', async () => {

8
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/workspace-view-users-invite.element.ts
View File

@@ -8,8 +8,8 @@ import { UmbModalLayoutElement } from '@umbraco-cms/services';
import { UmbUserStore } from '@umbraco-cms/stores/user/user.store';
export type UsersViewType = 'list' | 'grid';
@customElement('umb-editor-view-users-invite')
export class UmbEditorViewUsersInviteElement extends UmbContextConsumerMixin(UmbModalLayoutElement) {
@customElement('umb-workspace-view-users-invite')
export class UmbWorkspaceViewUsersInviteElement extends UmbContextConsumerMixin(UmbModalLayoutElement) {
static styles = [
UUITextStyles,
css`
@@ -183,10 +183,10 @@ export class UmbEditorViewUsersInviteElement extends UmbContextConsumerMixin(Umb
}
}
export default UmbEditorViewUsersInviteElement;
export default UmbWorkspaceViewUsersInviteElement;
declare global {
interface HTMLElementTagNameMap {
'umb-editor-view-users-invite': UmbEditorViewUsersInviteElement;
'umb-workspace-view-users-invite': UmbWorkspaceViewUsersInviteElement;
}
}

10
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-create.test.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/workspace-view-users-invite.test.ts
View File

@@ -1,16 +1,16 @@
import { expect, fixture, html } from '@open-wc/testing';
//TODO: Test has been commented out while we figure out how to setup import maps for the test environment
// import UmbWorkspaceViewUsersInviteElement from './editor-view-users-invite.element';
// import { defaultA11yConfig } from '@umbraco-cms/test-utils';
// import UmbEditorViewUsersCreateElement from './editor-view-users-create.element';
// describe('UmbEditorViewUsersCreateElement', () => {
// let element: UmbEditorViewUsersCreateElement;
// describe('UmbWorkspaceViewUsersInviteElement', () => {
// let element: UmbWorkspaceViewUsersInviteElement;
// beforeEach(async () => {
// element = await fixture(html`<umb-editor-view-users-create></umb-editor-view-users-create>`);
// element = await fixture(html`<umb-workspace-view-users-invite></umb-workspace-view-users-invite>`);
// });
// it('is defined with its own instance', () => {
// expect(element).to.be.instanceOf(UmbEditorViewUsersCreateElement);
// expect(element).to.be.instanceOf(UmbWorkspaceViewUsersInviteElement);
// });
// it('passes the a11y audit', async () => {

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

@@ -8,16 +8,16 @@ import type { UmbSectionViewUsersElement } from './section-view-users.element';
import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
import { UmbObserverMixin } from '@umbraco-cms/observable-api';
import './list-view-layouts/table/editor-view-users-table.element';
import './list-view-layouts/grid/editor-view-users-grid.element';
import './editor-view-users-selection.element';
import './editor-view-users-invite.element';
import './editor-view-users-create.element';
import './list-view-layouts/table/workspace-view-users-table.element';
import './list-view-layouts/grid/workspace-view-users-grid.element';
import './workspace-view-users-selection.element';
import './workspace-view-users-invite.element';
import './workspace-view-users-create.element';
import { UmbModalService } from '@umbraco-cms/services';
export type UsersViewType = 'list' | 'grid';
@customElement('umb-editor-view-users-overview')
export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
@customElement('umb-workspace-view-users-overview')
export class UmbWorkspaceViewUsersOverviewElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
static styles = [
UUITextStyles,
css`
@@ -90,11 +90,11 @@ export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(U
private _routes: IRoute[] = [
{
path: 'grid',
component: () => import('./list-view-layouts/grid/editor-view-users-grid.element'),
component: () => import('./list-view-layouts/grid/workspace-view-users-grid.element'),
},
{
path: 'list',
component: () => import('./list-view-layouts/table/editor-view-users-table.element'),
component: () => import('./list-view-layouts/table/workspace-view-users-table.element'),
},
{
path: '**',
@@ -136,7 +136,7 @@ export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(U
private _renderSelection() {
if (this._selection.length === 0) return nothing;
return html`<umb-editor-view-users-selection></umb-editor-view-users-selection>`;
return html`<umb-workspace-view-users-selection></umb-workspace-view-users-selection>`;
}
private _handleTogglePopover(event: PointerEvent) {
@@ -163,9 +163,9 @@ export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(U
private _showInviteOrCreate() {
let modal = undefined;
if (this.isCloud) {
modal = document.createElement('umb-editor-view-users-invite');
modal = document.createElement('umb-workspace-view-users-invite');
} else {
modal = document.createElement('umb-editor-view-users-create');
modal = document.createElement('umb-workspace-view-users-create');
}
this._modalService?.open(modal, { type: 'dialog' });
}
@@ -228,10 +228,10 @@ export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(U
}
}
export default UmbEditorViewUsersOverviewElement;
export default UmbWorkspaceViewUsersOverviewElement;
declare global {
interface HTMLElementTagNameMap {
'umb-editor-view-users-overview': UmbEditorViewUsersOverviewElement;
'umb-workspace-view-users-overview': UmbWorkspaceViewUsersOverviewElement;
}
}

10
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.test.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/workspace-view-users-overview.test.ts
View File

@@ -1,16 +1,16 @@
import { expect, fixture, html } from '@open-wc/testing';
//TODO: Test has been commented out while we figure out how to setup import maps for the test environment
// import UmbEditorViewUsersSelectionElement from './editor-view-users-selection.element';
// import { defaultA11yConfig } from '@umbraco-cms/test-utils';
// import UmbWorkspaceViewUsersOverviewElement from './editor-view-users-overview.element';
// describe('UmbEditorViewUsersSelectionElement', () => {
// let element: UmbEditorViewUsersSelectionElement;
// describe('UmbWorkspaceViewUsersOverviewElement', () => {
// let element: UmbWorkspaceViewUsersOverviewElement;
// beforeEach(async () => {
// element = await fixture(html`<umb-editor-view-users-selection></umb-editor-view-users-selection>`);
// element = await fixture(html`<umb-workspace-view-users-overview></umb-workspace-view-users-overview>`);
// });
// it('is defined with its own instance', () => {
// expect(element).to.be.instanceOf(UmbEditorViewUsersSelectionElement);
// expect(element).to.be.instanceOf(UmbWorkspaceViewUsersOverviewElement);
// });
// it('passes the a11y audit', async () => {

8
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.element.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/workspace-view-users-selection.element.ts
View File

@@ -6,8 +6,8 @@ import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
import { UmbObserverMixin } from '@umbraco-cms/observable-api';
import { UmbUserStore } from '@umbraco-cms/stores/user/user.store';
@customElement('umb-editor-view-users-selection')
export class UmbEditorViewUsersSelectionElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
@customElement('umb-workspace-view-users-selection')
export class UmbWorkspaceViewUsersSelectionElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
static styles = [
UUITextStyles,
css`
@@ -74,10 +74,10 @@ export class UmbEditorViewUsersSelectionElement extends UmbContextConsumerMixin(
}
}
export default UmbEditorViewUsersSelectionElement;
export default UmbWorkspaceViewUsersSelectionElement;
declare global {
interface HTMLElementTagNameMap {
'umb-editor-view-users-selection': UmbEditorViewUsersSelectionElement;
'umb-workspace-view-users-selection': UmbWorkspaceViewUsersSelectionElement;
}
}

10
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.test.ts → src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/workspace-view-users-selection.test.ts
View File

@@ -1,16 +1,16 @@
import { expect, fixture, html } from '@open-wc/testing';
//TODO: Test has been commented out while we figure out how to setup import maps for the test environment
// import UmbEditorViewUsersInviteElement from './editor-view-users-invite.element';
// import UmbWorkspaceViewUsersSelectionElement from './editor-view-users-selection.element';
// import { defaultA11yConfig } from '@umbraco-cms/test-utils';
// describe('UmbEditorViewUsersInviteElement', () => {
// let element: UmbEditorViewUsersInviteElement;
// describe('UmbWorkspaceViewUsersSelectionElement', () => {
// let element: UmbWorkspaceViewUsersSelectionElement;
// beforeEach(async () => {
// element = await fixture(html`<umb-editor-view-users-invite></umb-editor-view-users-invite>`);
// element = await fixture(html`<umb-workspace-view-users-selection></umb-workspace-view-users-selection>`);
// });
// it('is defined with its own instance', () => {
// expect(element).to.be.instanceOf(UmbEditorViewUsersInviteElement);
// expect(element).to.be.instanceOf(UmbWorkspaceViewUsersSelectionElement);
// });
// it('passes the a11y audit', async () => {