Skip to content

Commit

Permalink
Merge pull request #969 from umbraco/feature/new-models-20231107
Browse files Browse the repository at this point in the history
Regenerate server models
  • Loading branch information
iOvergaard authored Nov 8, 2023
2 parents 19e302a + 3b0c24d commit 566ea3e
Show file tree
Hide file tree
Showing 30 changed files with 56 additions and 91 deletions.
9 changes: 6 additions & 3 deletions src/apps/backoffice/components/backoffice-main.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,15 @@ export class UmbBackofficeMainElement extends UmbLitElement {
this.requestUpdate('_routes', oldValue);
}

private _onRouteChange = (event: UmbRouterSlotChangeEvent) => {
private _onRouteChange = async (event: UmbRouterSlotChangeEvent) => {
const currentPath = event.target.localActiveViewPath || '';
const section = this._sections.find((s) => this._routePrefix + (s.manifest as any).meta.pathname === currentPath);

Check warning on line 80 in src/apps/backoffice/components/backoffice-main.element.ts

View workflow job for this annotation

GitHub Actions / build (20)

Unexpected any. Specify a different type
if (!section) return;
this._backofficeContext?.setActiveSectionAlias(section.alias);
this._provideSectionContext(section.manifest as any);
await section.asPromise();
if(section.manifest) {
this._backofficeContext?.setActiveSectionAlias(section.alias);
this._provideSectionContext(section.manifest);
}
};

private _provideSectionContext(sectionManifest: ManifestSection) {
Expand Down
4 changes: 2 additions & 2 deletions src/apps/installer/shared/utils.story-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { UmbInstallerContext } from '../installer.context.js';
import { html } from '@umbraco-cms/backoffice/external/lit';
import { html, type TemplateResult } from '@umbraco-cms/backoffice/external/lit';

export const installerContextProvider = (story: any, installerContext = new UmbInstallerContext()) => html`
export const installerContextProvider = (story: () => Node | string | TemplateResult, installerContext = new UmbInstallerContext()) => html`
<umb-context-provider
style="display: block;margin: 2rem 25%;padding: 1rem;border: 1px solid #ddd;"
key="umbInstallerContext"
Expand Down
23 changes: 11 additions & 12 deletions src/external/backend-api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ export type { AuditLogWithUsernameResponseModel } from './models/AuditLogWithUse
export { AuditTypeModel } from './models/AuditTypeModel';
export type { ChangePasswordUserRequestModel } from './models/ChangePasswordUserRequestModel';
export type { ConsentLevelPresentationModel } from './models/ConsentLevelPresentationModel';
export type { ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel } from './models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel';
export type { ContentForDocumentResponseModel } from './models/ContentForDocumentResponseModel';
export { ContentStateModel } from './models/ContentStateModel';
export type { ContentTreeItemResponseModel } from './models/ContentTreeItemResponseModel';
export type { ContentTypeCleanupModel } from './models/ContentTypeCleanupModel';
export type { ContentTypeCompositionModel } from './models/ContentTypeCompositionModel';
export { ContentTypeCompositionTypeModel } from './models/ContentTypeCompositionTypeModel';
export type { ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel } from './models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel';
export type { ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel } from './models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel';
export type { ContentTypeForDocumentTypeResponseModel } from './models/ContentTypeForDocumentTypeResponseModel';
export type { ContentTypeForMediaTypeResponseModel } from './models/ContentTypeForMediaTypeResponseModel';
export type { ContentTypeSortModel } from './models/ContentTypeSortModel';
export type { ContentUrlInfoModel } from './models/ContentUrlInfoModel';
export type { CopyDataTypeRequestModel } from './models/CopyDataTypeRequestModel';
export type { CopyDocumentRequestModel } from './models/CopyDocumentRequestModel';
export type { CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel';
export type { CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel';
export type { CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel } from './models/CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel';
export type { CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel } from './models/CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel';
export type { CreateContentForDocumentRequestModel } from './models/CreateContentForDocumentRequestModel';
export type { CreateContentForMediaRequestModel } from './models/CreateContentForMediaRequestModel';
export type { CreateContentTypeForDocumentTypeRequestModel } from './models/CreateContentTypeForDocumentTypeRequestModel';
export type { CreateContentTypeForMediaTypeRequestModel } from './models/CreateContentTypeForMediaTypeRequestModel';
export type { CreateDataTypeRequestModel } from './models/CreateDataTypeRequestModel';
export type { CreateDictionaryItemRequestModel } from './models/CreateDictionaryItemRequestModel';
export type { CreateDocumentRequestModel } from './models/CreateDocumentRequestModel';
Expand Down Expand Up @@ -126,7 +126,6 @@ export type { LanguageResponseModel } from './models/LanguageResponseModel';
export type { LinkedLoginModel } from './models/LinkedLoginModel';
export type { LinkedLoginsRequestModel } from './models/LinkedLoginsRequestModel';
export type { LoggerResponseModel } from './models/LoggerResponseModel';
export type { LoginRequestModel } from './models/LoginRequestModel';
export type { LogLevelCountsReponseModel } from './models/LogLevelCountsReponseModel';
export { LogLevelModel } from './models/LogLevelModel';
export type { LogMessagePropertyPresentationModel } from './models/LogMessagePropertyPresentationModel';
Expand Down Expand Up @@ -274,10 +273,10 @@ export type { TextFileViewModelBaseModel } from './models/TextFileViewModelBaseM
export type { TourStatusModel } from './models/TourStatusModel';
export type { TreeItemPresentationModel } from './models/TreeItemPresentationModel';
export type { UnlockUsersRequestModel } from './models/UnlockUsersRequestModel';
export type { UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel';
export type { UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel';
export type { UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel } from './models/UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel';
export type { UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel } from './models/UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel';
export type { UpdateContentForDocumentRequestModel } from './models/UpdateContentForDocumentRequestModel';
export type { UpdateContentForMediaRequestModel } from './models/UpdateContentForMediaRequestModel';
export type { UpdateContentTypeForDocumentTypeRequestModel } from './models/UpdateContentTypeForDocumentTypeRequestModel';
export type { UpdateContentTypeForMediaTypeRequestModel } from './models/UpdateContentTypeForMediaTypeRequestModel';
export type { UpdateDataTypeRequestModel } from './models/UpdateDataTypeRequestModel';
export type { UpdateDictionaryItemRequestModel } from './models/UpdateDictionaryItemRequestModel';
export type { UpdateDocumentNotificationsRequestModel } from './models/UpdateDocumentNotificationsRequestModel';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import type { DocumentValueModel } from './DocumentValueModel';
import type { DocumentVariantResponseModel } from './DocumentVariantResponseModel';

export type ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel = {
export type ContentForDocumentResponseModel = {
values?: Array<DocumentValueModel>;
variants?: Array<DocumentVariantResponseModel>;
id?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel';
import type { DocumentTypePropertyTypeContainerResponseModel } from './DocumentTypePropertyTypeContainerResponseModel';
import type { DocumentTypePropertyTypeResponseModel } from './DocumentTypePropertyTypeResponseModel';

export type ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel = {
export type ContentTypeForDocumentTypeResponseModel = {
alias?: string;
name?: string;
description?: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel';
import type { MediaTypePropertyTypeContainerResponseModel } from './MediaTypePropertyTypeContainerResponseModel';
import type { MediaTypePropertyTypeResponseModel } from './MediaTypePropertyTypeResponseModel';

export type ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel = {
export type ContentTypeForMediaTypeResponseModel = {
alias?: string;
name?: string;
description?: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import type { DocumentValueModel } from './DocumentValueModel';
import type { DocumentVariantRequestModel } from './DocumentVariantRequestModel';

export type CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel = {
export type CreateContentForDocumentRequestModel = {
values?: Array<DocumentValueModel>;
variants?: Array<DocumentVariantRequestModel>;
id?: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import type { MediaValueModel } from './MediaValueModel';
import type { MediaVariantRequestModel } from './MediaVariantRequestModel';

export type CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel = {
export type CreateContentForMediaRequestModel = {
values?: Array<MediaValueModel>;
variants?: Array<MediaVariantRequestModel>;
id?: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel';
import type { CreateDocumentTypePropertyTypeContainerRequestModel } from './CreateDocumentTypePropertyTypeContainerRequestModel';
import type { CreateDocumentTypePropertyTypeRequestModel } from './CreateDocumentTypePropertyTypeRequestModel';

export type CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel = {
export type CreateContentTypeForDocumentTypeRequestModel = {
alias?: string;
name?: string;
description?: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel';
import type { CreateMediaTypePropertyTypeContainerRequestModel } from './CreateMediaTypePropertyTypeContainerRequestModel';
import type { CreateMediaTypePropertyTypeRequestModel } from './CreateMediaTypePropertyTypeRequestModel';

export type CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel = {
export type CreateContentTypeForMediaTypeRequestModel = {
alias?: string;
name?: string;
description?: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
/* tslint:disable */
/* eslint-disable */

import type { CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel';
import type { CreateContentForDocumentRequestModel } from './CreateContentForDocumentRequestModel';

export type CreateDocumentRequestModel = (CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel & {
export type CreateDocumentRequestModel = (CreateContentForDocumentRequestModel & {
contentTypeId?: string;
templateId?: string | null;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
/* eslint-disable */

import type { ContentTypeCleanupModel } from './ContentTypeCleanupModel';
import type { CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel } from './CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel';
import type { CreateContentTypeForDocumentTypeRequestModel } from './CreateContentTypeForDocumentTypeRequestModel';

export type CreateDocumentTypeRequestModel = (CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel & {
export type CreateDocumentTypeRequestModel = (CreateContentTypeForDocumentTypeRequestModel & {
allowedTemplateIds?: Array<string>;
defaultTemplateId?: string | null;
cleanup?: ContentTypeCleanupModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
/* tslint:disable */
/* eslint-disable */

import type { CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel';
import type { CreateContentForMediaRequestModel } from './CreateContentForMediaRequestModel';

export type CreateMediaRequestModel = (CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel & {
export type CreateMediaRequestModel = (CreateContentForMediaRequestModel & {
contentTypeId?: string;
});

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* tslint:disable */
/* eslint-disable */

import type { CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel } from './CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel';
import type { CreateContentTypeForMediaTypeRequestModel } from './CreateContentTypeForMediaTypeRequestModel';

export type CreateMediaTypeRequestModel = CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel;
export type CreateMediaTypeRequestModel = CreateContentTypeForMediaTypeRequestModel;

Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ import type { ItemResponseModelBaseModel } from './ItemResponseModelBaseModel';
export type DocumentItemResponseModel = (ItemResponseModelBaseModel & {
icon?: string | null;
contentTypeId?: string;
isTrashed?: boolean;
});

5 changes: 3 additions & 2 deletions src/external/backend-api/src/models/DocumentResponseModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
/* tslint:disable */
/* eslint-disable */

import type { ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel } from './ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel';
import type { ContentForDocumentResponseModel } from './ContentForDocumentResponseModel';
import type { ContentUrlInfoModel } from './ContentUrlInfoModel';

export type DocumentResponseModel = (ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel & {
export type DocumentResponseModel = (ContentForDocumentResponseModel & {
urls?: Array<ContentUrlInfoModel>;
templateId?: string | null;
isTrashed?: boolean;
});

Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
/* eslint-disable */

import type { ContentTypeCleanupModel } from './ContentTypeCleanupModel';
import type { ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel } from './ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel';
import type { ContentTypeForDocumentTypeResponseModel } from './ContentTypeForDocumentTypeResponseModel';

export type DocumentTypeResponseModel = (ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel & {
export type DocumentTypeResponseModel = (ContentTypeForDocumentTypeResponseModel & {
allowedTemplateIds?: Array<string>;
defaultTemplateId?: string | null;
cleanup?: ContentTypeCleanupModel;
Expand Down
10 changes: 0 additions & 10 deletions src/external/backend-api/src/models/LoginRequestModel.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ import type { ItemResponseModelBaseModel } from './ItemResponseModelBaseModel';

export type MediaItemResponseModel = (ItemResponseModelBaseModel & {
icon?: string | null;
isTrashed?: boolean;
});

4 changes: 2 additions & 2 deletions src/external/backend-api/src/models/MediaTypeResponseModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* tslint:disable */
/* eslint-disable */

import type { ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel } from './ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel';
import type { ContentTypeForMediaTypeResponseModel } from './ContentTypeForMediaTypeResponseModel';

export type MediaTypeResponseModel = ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel;
export type MediaTypeResponseModel = ContentTypeForMediaTypeResponseModel;

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import type { DocumentValueModel } from './DocumentValueModel';
import type { DocumentVariantRequestModel } from './DocumentVariantRequestModel';

export type UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel = {
export type UpdateContentForDocumentRequestModel = {
values?: Array<DocumentValueModel>;
variants?: Array<DocumentVariantRequestModel>;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import type { MediaValueModel } from './MediaValueModel';
import type { MediaVariantRequestModel } from './MediaVariantRequestModel';

export type UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel = {
export type UpdateContentForMediaRequestModel = {
values?: Array<MediaValueModel>;
variants?: Array<MediaVariantRequestModel>;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel';
import type { UpdateDocumentTypePropertyTypeContainerRequestModel } from './UpdateDocumentTypePropertyTypeContainerRequestModel';
import type { UpdateDocumentTypePropertyTypeRequestModel } from './UpdateDocumentTypePropertyTypeRequestModel';

export type UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel = {
export type UpdateContentTypeForDocumentTypeRequestModel = {
alias?: string;
name?: string;
description?: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel';
import type { UpdateMediaTypePropertyTypeContainerRequestModel } from './UpdateMediaTypePropertyTypeContainerRequestModel';
import type { UpdateMediaTypePropertyTypeRequestModel } from './UpdateMediaTypePropertyTypeRequestModel';

export type UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel = {
export type UpdateContentTypeForMediaTypeRequestModel = {
alias?: string;
name?: string;
description?: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
/* tslint:disable */
/* eslint-disable */

import type { UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel';
import type { UpdateContentForDocumentRequestModel } from './UpdateContentForDocumentRequestModel';

export type UpdateDocumentRequestModel = (UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel & {
export type UpdateDocumentRequestModel = (UpdateContentForDocumentRequestModel & {
templateId?: string | null;
});

Loading

0 comments on commit 566ea3e

Please sign in to comment.