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

fix some renaming gone wrong

Browse Source
This commit is contained in:
Mads Rasmussen
2023-11-19 12:58:27 +01:00
committed by Jacob Overgaard
parent 3df85ff695
commit f2ffa94b6a
17 changed files with 68 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.ts
View File

@@ -2,7 +2,7 @@ import { UmbContextDiscriminator, UmbContextToken } from '../token/context-token
import {
isUmbContextProvideEventType,
//isUmbContextUnprovidedEventType,
umbContextProvideEventType,
UMB_CONTEXT_PROVIDE_EVENT_TYPE,
//umbContextUnprovidedEventType,
} from '../provide/context-provide.event.js';
import { UmbContextRequestEventImplementation, UmbContextCallback } from './context-request.event.js';
@@ -11,9 +11,7 @@ import { UmbContextRequestEventImplementation, UmbContextCallback } from './cont
* @export
* @class UmbContextConsumer
*/
export class UmbContextConsumer<
BaseType = unknown,
ResultType extends BaseType = BaseType> {
export class UmbContextConsumer<BaseType = unknown, ResultType extends BaseType = BaseType> {
#callback?: UmbContextCallback<ResultType>;
#promise?: Promise<ResultType>;
#promiseResolver?: (instance: ResultType) => void;
@@ -37,20 +35,20 @@ ResultType extends BaseType = BaseType> {
constructor(
protected hostElement: EventTarget,
contextAlias: string | UmbContextToken<BaseType, ResultType>,
callback?: UmbContextCallback<ResultType>
callback?: UmbContextCallback<ResultType>,
) {
this.#contextAlias = contextAlias.toString();
this.#callback = callback;
this.#discriminator = (contextAlias as UmbContextToken<BaseType, ResultType>).getDiscriminator?.();
}
protected _onResponse = (instance: BaseType): boolean => {
if (this.#instance === instance) {
return false;
}
if(this.#discriminator) {
if (this.#discriminator) {
// Notice if discriminator returns false, we do not want to setInstance.
if(this.#discriminator(instance)) {
if (this.#discriminator(instance)) {
this.setInstance(instance as unknown as ResultType);
return true;
}
@@ -89,14 +87,14 @@ ResultType extends BaseType = BaseType> {
public hostConnected() {
// TODO: We need to use closets application element. We need this in order to have separate Backoffice running within or next to each other.
window.addEventListener(umbContextProvideEventType, this.#handleNewProvider);
window.addEventListener(UMB_CONTEXT_PROVIDE_EVENT_TYPE, this.#handleNewProvider);
//window.addEventListener(umbContextUnprovidedEventType, this.#handleRemovedProvider);
this.request();
}
public hostDisconnected() {
// TODO: We need to use closets application element. We need this in order to have separate Backoffice running within or next to each other.
window.removeEventListener(umbContextProvideEventType, this.#handleNewProvider);
window.removeEventListener(UMB_CONTEXT_PROVIDE_EVENT_TYPE, this.#handleNewProvider);
//window.removeEventListener(umbContextUnprovidedEventType, this.#handleRemovedProvider);
}

6
src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provide.event.ts
View File

@@ -1,6 +1,6 @@
import { UmbContextToken } from '../token/context-token.js';
export const UMB_CONTEXT_PROVIDER_EVENT_TYPE = 'umb:context-provide';
export const UMB_CONTEXT_PROVIDE_EVENT_TYPE = 'umb:context-provide';
/**
* @export
@@ -18,12 +18,12 @@ export interface UmbContextProvideEvent extends Event {
*/
export class UmbContextProvideEventImplementation extends Event implements UmbContextProvideEvent {
public constructor(public readonly contextAlias: string | UmbContextToken) {
super(UMB_CONTEXT_PROVIDER_EVENT_TYPE, { bubbles: true, composed: true });
super(UMB_CONTEXT_PROVIDE_EVENT_TYPE, { bubbles: true, composed: true });
}
}
export const isUmbContextProvideEventType = (event: Event): event is UmbContextProvideEventImplementation => {
return event.type === UMB_CONTEXT_PROVIDER_EVENT_TYPE;
return event.type === UMB_CONTEXT_PROVIDE_EVENT_TYPE;
};
export const UMB_CONTEXT_UNPROVIDED_EVENT_TYPE = 'umb:context-unprovided';

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/document/item.handlers.ts
View File

@@ -1,10 +1,10 @@
const { rest } = window.MockServiceWorker;
import { umbDocumentData } from '../../data/document.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.get(umbracoPath(`${slug}/item`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}/item`), (req, res, ctx) => {
const ids = req.url.searchParams.getAll('id');
if (!ids) return;
const items = umbDocumentData.getItems(ids);

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/document/permission.handlers.ts
View File

@@ -1,11 +1,11 @@
const { rest } = window.MockServiceWorker;
import { umbDocumentData } from '../../data/document.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
// TODO: temp handlers until we have a real API
export const handlers = [
rest.get(umbracoPath(`${slug}/:id/permissions`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}/:id/permissions`), (req, res, ctx) => {
const id = req.params.id as string;
if (!id) return;
const response = umbDocumentData.getUserPermissionsForDocument(id);

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group/collection.handlers.ts
View File

@@ -1,10 +1,10 @@
const { rest } = window.MockServiceWorker;
import { umbUserGroupData } from '../../data/user-group.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const collectionHandlers = [
rest.get(umbracoPath(`${slug}`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}`), (req, res, ctx) => {
const response = umbUserGroupData.getAll();
return res(ctx.status(200), ctx.json(response));
}),

10
src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group/detail.handlers.ts
View File

@@ -1,10 +1,10 @@
const { rest } = window.MockServiceWorker;
import { umbUserGroupData } from '../../data/user-group.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const detailHandlers = [
rest.post(umbracoPath(`${slug}`), async (req, res, ctx) => {
rest.post(umbracoPath(`${UMB_SLUG}`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;
@@ -13,7 +13,7 @@ export const detailHandlers = [
return res(ctx.status(200));
}),
rest.get(umbracoPath(`${slug}/:id`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}/:id`), (req, res, ctx) => {
const id = req.params.id as string;
if (!id) return;
@@ -22,7 +22,7 @@ export const detailHandlers = [
return res(ctx.status(200), ctx.json(dataType));
}),
rest.put(umbracoPath(`${slug}/:id`), async (req, res, ctx) => {
rest.put(umbracoPath(`${UMB_SLUG}/:id`), async (req, res, ctx) => {
const id = req.params.id as string;
if (!id) return;
const data = await req.json();
@@ -33,7 +33,7 @@ export const detailHandlers = [
return res(ctx.status(200));
}),
rest.delete<string>(umbracoPath(`${slug}/:id`), async (req, res, ctx) => {
rest.delete<string>(umbracoPath(`${UMB_SLUG}/:id`), async (req, res, ctx) => {
const id = req.params.id as string;
if (!id) return;

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group/item.handlers.ts
View File

@@ -1,10 +1,10 @@
const { rest } = window.MockServiceWorker;
import { umbUserGroupData } from '../../data/user-group.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const itemHandlers = [
rest.get(umbracoPath(`${slug}/item`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}/item`), (req, res, ctx) => {
const ids = req.url.searchParams.getAll('id');
if (!ids) return;
const items = umbUserGroupData.getItems(ids);

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/change-password.handlers.ts
View File

@@ -1,10 +1,10 @@
const { rest } = window.MockServiceWorker;
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { ChangePasswordUserRequestModel } from '@umbraco-cms/backoffice/backend-api';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.post<ChangePasswordUserRequestModel>(umbracoPath(`${slug}/change-password/:id`), async (req, res, ctx) => {
rest.post<ChangePasswordUserRequestModel>(umbracoPath(`${UMB_SLUG}/change-password/:id`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;
if (!data.newPassword) return;

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/current.handlers.ts
View File

@@ -1,10 +1,10 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.get(umbracoPath(`${slug}/current`), (_req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}/current`), (_req, res, ctx) => {
const loggedInUser = umbUsersData.getCurrentUser();
return res(ctx.status(200), ctx.json(loggedInUser));
}),

12
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts
View File

@@ -1,15 +1,15 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.get(umbracoPath(`${slug}`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}`), (req, res, ctx) => {
const response = umbUsersData.getAll();
return res(ctx.status(200), ctx.json(response));
}),
rest.post(umbracoPath(`${slug}`), async (req, res, ctx) => {
rest.post(umbracoPath(`${UMB_SLUG}`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;
@@ -18,7 +18,7 @@ export const handlers = [
return res(ctx.status(200), ctx.json(response));
}),
rest.get(umbracoPath(`${slug}/:id`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}/:id`), (req, res, ctx) => {
const id = req.params.id as string;
if (!id) return;
@@ -27,7 +27,7 @@ export const handlers = [
return res(ctx.status(200), ctx.json(item));
}),
rest.put(umbracoPath(`${slug}/:id`), async (req, res, ctx) => {
rest.put(umbracoPath(`${UMB_SLUG}/:id`), async (req, res, ctx) => {
const id = req.params.id as string;
if (!id) return;
const data = await req.json();
@@ -38,7 +38,7 @@ export const handlers = [
return res(ctx.status(200));
}),
rest.delete<string>(umbracoPath(`${slug}/:id`), async (req, res, ctx) => {
rest.delete<string>(umbracoPath(`${UMB_SLUG}/:id`), async (req, res, ctx) => {
const id = req.params.id as string;
if (!id) return;

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts
View File

@@ -1,11 +1,11 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { DisableUserRequestModel } from '@umbraco-cms/backoffice/backend-api';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.post<DisableUserRequestModel>(umbracoPath(`${slug}/disable`), async (req, res, ctx) => {
rest.post<DisableUserRequestModel>(umbracoPath(`${UMB_SLUG}/disable`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;
if (!data.userIds) return;

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts
View File

@@ -1,11 +1,11 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { EnableUserRequestModel } from '@umbraco-cms/backoffice/backend-api';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.post<EnableUserRequestModel>(umbracoPath(`${slug}/enable`), async (req, res, ctx) => {
rest.post<EnableUserRequestModel>(umbracoPath(`${UMB_SLUG}/enable`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;
if (!data.userIds) return;

43
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/filter.handlers.ts
View File

@@ -1,30 +1,29 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.get(umbracoPath(`${slug}/filter`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}/filter`), (req, res, ctx) => {
const skip = Number(req.url.searchParams.get('skip'));
const take = Number(req.url.searchParams.get('take'));
const orderBy = req.url.searchParams.get('orderBy');
const orderDirection = req.url.searchParams.get('orderDirection');
const userGroupIds = req.url.searchParams.getAll('userGroupIds');
const userStates = req.url.searchParams.getAll('userStates');
const filter = req.url.searchParams.get('filter');
const skip = Number(req.url.searchParams.get('skip'));
const take = Number(req.url.searchParams.get('take'));
const orderBy = req.url.searchParams.get('orderBy');
const orderDirection = req.url.searchParams.get('orderDirection');
const userGroupIds = req.url.searchParams.getAll('userGroupIds');
const userStates = req.url.searchParams.getAll('userStates');
const filter = req.url.searchParams.get('filter');
const options = {
skip: skip || undefined,
take: take || undefined,
orderBy: orderBy || undefined,
orderDirection: orderDirection || undefined,
userGroupIds: userGroupIds.length > 0 ? userGroupIds : undefined,
userStates: userStates.length > 0 ? userStates : undefined,
filter: filter || undefined,
};
const options = {
skip: skip || undefined,
take: take || undefined,
orderBy: orderBy || undefined,
orderDirection: orderDirection || undefined,
userGroupIds: userGroupIds.length > 0 ? userGroupIds : undefined,
userStates: userStates.length > 0 ? userStates : undefined,
filter: filter || undefined,
};
const response = umbUsersData.filter(options);
return res(ctx.status(200), ctx.json(response));
}),
const response = umbUsersData.filter(options);
return res(ctx.status(200), ctx.json(response));
}),
];

6
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts
View File

@@ -1,11 +1,11 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { InviteUserRequestModel } from '@umbraco-cms/backoffice/backend-api';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.post<InviteUserRequestModel>(umbracoPath(`${slug}/invite`), async (req, res, ctx) => {
rest.post<InviteUserRequestModel>(umbracoPath(`${UMB_SLUG}/invite`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;
@@ -14,7 +14,7 @@ export const handlers = [
return res(ctx.status(200));
}),
rest.post<any>(umbracoPath(`${slug}/invite/resend`), async (req, res, ctx) => {
rest.post<any>(umbracoPath(`${UMB_SLUG}/invite/resend`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/item.handlers.ts
View File

@@ -1,10 +1,10 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.get(umbracoPath(`${slug}/item`), (req, res, ctx) => {
rest.get(umbracoPath(`${UMB_SLUG}/item`), (req, res, ctx) => {
const ids = req.url.searchParams.getAll('id');
if (!ids) return;
const items = umbUsersData.getItems(ids);

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/set-user-groups.handlers.ts
View File

@@ -1,10 +1,10 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.post(umbracoPath(`${slug}/set-user-groups`), async (req, res, ctx) => {
rest.post(umbracoPath(`${UMB_SLUG}/set-user-groups`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts
View File

@@ -1,11 +1,11 @@
const { rest } = window.MockServiceWorker;
import { umbUsersData } from '../../data/user.data.js';
import { slug } from './slug.js';
import { UMB_SLUG } from './slug.js';
import { UnlockUsersRequestModel } from '@umbraco-cms/backoffice/backend-api';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
export const handlers = [
rest.post<UnlockUsersRequestModel>(umbracoPath(`${slug}/unlock`), async (req, res, ctx) => {
rest.post<UnlockUsersRequestModel>(umbracoPath(`${UMB_SLUG}/unlock`), async (req, res, ctx) => {
const data = await req.json();
if (!data) return;
if (!data.userIds) return;