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

move type fixing

Browse Source
This commit is contained in:
Mads Rasmussen
2023-02-10 12:09:59 +01:00
parent 10728b6c81
commit 49afad0b8e
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/repository/member-group.repository.ts
View File

@@ -5,7 +5,7 @@ import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN } from '
import { UmbContextConsumerController } from '@umbraco-cms/context-api';
import type { MemberGroupDetails } from '@umbraco-cms/models';
import { ProblemDetailsModel } from '@umbraco-cms/backend-api';
import type { UmbTreeRepository } from '@umbraco-cms/models';
import type { UmbTreeRepository } from '@umbraco-cms/repository';
export class UmbMemberGroupRepository implements UmbTreeRepository {
#host: UmbControllerHostInterface;

16
src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts
View File

@@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '../collection.context';
import { UmbLitElement } from '@umbraco-cms/element';
import { EntityTreeItem } from '@umbraco-cms/backend-api';
import { EntityTreeItemModel } from '@umbraco-cms/backend-api';
@customElement('umb-collection-view-media-grid')
export class UmbCollectionViewsMediaGridElement extends UmbLitElement {
@@ -65,12 +65,12 @@ export class UmbCollectionViewsMediaGridElement extends UmbLitElement {
];
@state()
private _mediaItems?: Array<EntityTreeItem>;
private _mediaItems?: Array<EntityTreeItemModel>;
@state()
private _selection: Array<string> = [];
private _collectionContext?: UmbCollectionContext<EntityTreeItem>;
private _collectionContext?: UmbCollectionContext<EntityTreeItemModel>;
constructor() {
super();
@@ -115,31 +115,31 @@ export class UmbCollectionViewsMediaGridElement extends UmbLitElement {
});
}
private _handleOpenItem(mediaItem: EntityTreeItem) {
private _handleOpenItem(mediaItem: EntityTreeItemModel) {
//TODO: Fix when we have dynamic routing
history.pushState(null, '', 'section/media/media/edit/' + mediaItem.key);
}
private _handleSelect(mediaItem: EntityTreeItem) {
private _handleSelect(mediaItem: EntityTreeItemModel) {
if (mediaItem.key) {
this._collectionContext?.select(mediaItem.key);
}
}
private _handleDeselect(mediaItem: EntityTreeItem) {
private _handleDeselect(mediaItem: EntityTreeItemModel) {
if (mediaItem.key) {
this._collectionContext?.deselect(mediaItem.key);
}
}
private _isSelected(mediaItem: EntityTreeItem) {
private _isSelected(mediaItem: EntityTreeItemModel) {
if (mediaItem.key) {
return this._selection.includes(mediaItem.key);
}
return false;
}
private _renderMediaItem(item: EntityTreeItem) {
private _renderMediaItem(item: EntityTreeItemModel) {
const name = item.name || '';
//TODO: fix the file extension when media items have a file extension.
return html`<uui-card-media

4
src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts
View File

@@ -13,7 +13,7 @@ import {
} from '../../components/table';
import type { MediaDetails } from '@umbraco-cms/models';
import { UmbLitElement } from '@umbraco-cms/element';
import { EntityTreeItem } from '@umbraco-cms/backend-api';
import { EntityTreeItemModel } from '@umbraco-cms/backend-api';
@customElement('umb-collection-view-media-table')
export class UmbCollectionViewMediaTableElement extends UmbLitElement {
@@ -36,7 +36,7 @@ export class UmbCollectionViewMediaTableElement extends UmbLitElement {
];
@state()
private _mediaItems?: Array<EntityTreeItem>;
private _mediaItems?: Array<EntityTreeItemModel>;
@state()
private _tableConfig: UmbTableConfig = {

17
src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.repository.ts
View File

@@ -8,7 +8,7 @@ import { UmbTemplateTreeStore, UMB_TEMPLATE_TREE_STORE_CONTEXT_TOKEN } from '../
import { UmbControllerHostInterface } from '@umbraco-cms/controller';
import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN } from '@umbraco-cms/notification';
import { UmbContextConsumerController } from '@umbraco-cms/context-api';
import { ProblemDetails, Template } from '@umbraco-cms/backend-api';
import { ProblemDetailsModel, TemplateModel } from '@umbraco-cms/backend-api';
import { UmbDetailRepository } from 'libs/repository/detail-repository.interface';
import { UmbTreeRepository } from 'libs/repository/tree-repository.interface';
@@ -16,7 +16,7 @@ import { UmbTreeRepository } from 'libs/repository/tree-repository.interface';
/* We need to create a new instance of the repository from within the element context. We want the notifications to be displayed in the right context. */
// element -> context -> repository -> (store) -> data source
// All methods should be async and return a promise. Some methods might return an observable as part of the promise response.
export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailRepository<Template> {
export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailRepository<TemplateModel> {
#init;
#host: UmbControllerHostInterface;
@@ -68,7 +68,7 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailReposi
await this.#init;
if (!parentKey) {
const error: ProblemDetails = { title: 'Parent key is missing' };
const error: ProblemDetailsModel = { title: 'Parent key is missing' };
return { data: undefined, error };
}
@@ -85,7 +85,7 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailReposi
await this.#init;
if (!keys) {
const error: ProblemDetails = { title: 'Keys are missing' };
const error: ProblemDetailsModel = { title: 'Keys are missing' };
return { data: undefined, error };
}
@@ -118,7 +118,8 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailReposi
throw new Error('Parent key is missing');
}
return this.#detailDataSource.createScaffold(parentKey);
// TODO: add parent key to create scaffold
return this.#detailDataSource.createScaffold();
}
async requestDetails(key: string) {
@@ -127,7 +128,7 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailReposi
// TODO: should we show a notification if the key is missing?
// Investigate what is best for Acceptance testing, cause in that perspective a thrown error might be the best choice?
if (!key) {
const error: ProblemDetails = { title: 'Key is missing' };
const error: ProblemDetailsModel = { title: 'Key is missing' };
return { error };
}
const { data, error } = await this.#detailDataSource.get(key);
@@ -141,7 +142,7 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailReposi
// Could potentially be general methods:
async createDetail(template: Template) {
async createDetail(template: TemplateModel) {
await this.#init;
if (!template || !template.key) {
@@ -163,7 +164,7 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailReposi
return { error };
}
async saveDetail(template: Template) {
async saveDetail(template: TemplateModel) {
await this.#init;
if (!template || !template.key) {