Skip to content

Commit

Permalink
Merge branch 'main' into feature/api-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
nielslyngsoe authored Mar 19, 2024
2 parents 77361b7 + 01c2668 commit 7bc8186
Show file tree
Hide file tree
Showing 349 changed files with 6,820 additions and 8,076 deletions.
40 changes: 40 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# .github/release.yml

changelog:
exclude:
labels:
- ignore-for-release
- duplicate
- wontfix
categories:
- title: 🙌 Notable Changes
labels:
- notable
- title: 💥 Breaking Changes
labels:
- category/breaking
- title: 🚀 New Features
labels:
- type/feature
- category/feature
- type/enhancement
- category/enhancement
- title: 🐛 Bug Fixes
labels:
- type/bug
- category/bug
- title: 📄 Documentation
labels:
- documentation
- title: 🏠 Internal
labels:
- internal
- title: 📦 Dependencies
labels:
- dependencies
- title: 🌈 A11Y
labels:
- accessibility
- title: Other Changes
labels:
- '*'
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user';
import { css, html, customElement, state, LitElement } from '@umbraco-cms/backoffice/external/lit';
import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
import { EXAMPLE_COUNTER_CONTEXT } from './counter-workspace-context';
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@umbraco-cms/backoffice",
"license": "MIT",
"version": "14.0.0-beta001",
"version": "14.0.0-beta002",
"type": "module",
"exports": {
".": null,
Expand Down
6 changes: 5 additions & 1 deletion src/assets/lang/da-dk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ export default {
languagesToSendForApproval: 'Hvilke sprog vil du gerne sende til godkendelse?',
languagesToSchedule: 'Hvilke sprog vil du gerne planlægge?',
languagesToUnpublish:
'Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil\n afpublicere alle sprog.\n ',
'Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil afpublicere alle sprog.',
resetFocalPoint: 'Nulstil fokuspunkt',
variantsWillBeSaved: 'Alle nye varianter vil blive gemt.',
publishRequiresVariants: 'De følgende varianter er krævet for at en udgivelse kan finde sted:',
Expand Down Expand Up @@ -2124,6 +2124,10 @@ export default {
'This item or its descendants is being referenced. Unpublishing can lead to broken links on your website. Please take the appropriate actions.',
deleteDisabledWarning: 'This item or its descendants is being referenced. Therefore, deletion has been disabled.',
listViewDialogWarning: 'The following items you are trying to %0% are referenced by other content.',
labelMoreReferences: (count: number) => {
if (count === 1) return '...og en mere';
return `...og ${count} andre`;
},
},
logViewer: {
deleteSavedSearch: 'Slet gemte søgning',
Expand Down
7 changes: 6 additions & 1 deletion src/assets/lang/en-us.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ export default {
'Publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.',
publishDescendantsWithVariantsHelp:
'Publish variants and variants of same type underneath and thereby making their content publicly available.',
noVariantsToProcess: 'There are no available variants',
releaseDate: 'Publish at',
unpublishDate: 'Unpublish at',
removeDate: 'Clear Date',
Expand Down Expand Up @@ -308,7 +309,7 @@ export default {
languagesToSendForApproval: 'What languages would you like to send for approval?',
languagesToSchedule: 'What languages would you like to schedule?',
languagesToUnpublish:
'Select the languages to unpublish. Unpublishing a mandatory language will\n unpublish all languages.\n ',
'Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.',
variantsWillBeSaved: 'All new variants will be saved.',
variantsToPublish: 'Which variants would you like to publish?',
variantsToSave: 'Choose which variants to be saved.',
Expand Down Expand Up @@ -2172,6 +2173,10 @@ export default {
'This item or its descendants is being referenced. Unpublishing can lead to broken links on your website. Please take the appropriate actions.',
deleteDisabledWarning: 'This item or its descendants is being referenced. Therefore, deletion has been disabled.',
listViewDialogWarning: 'The following items you are trying to %0% are referenced by other content.',
labelMoreReferences: (count: number) => {
if (count === 1) return '...and one more item';
return `...and ${count} more items`;
},
},
logViewer: {
deleteSavedSearch: 'Delete Saved Search',
Expand Down
3 changes: 3 additions & 0 deletions src/external/backend-api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,15 @@ export type { PagedProblemDetailsModel } from './models/PagedProblemDetailsModel
export type { PagedRedirectUrlResponseModel } from './models/PagedRedirectUrlResponseModel';
export type { PagedRelationItemResponseModel } from './models/PagedRelationItemResponseModel';
export type { PagedRelationResponseModel } from './models/PagedRelationResponseModel';
export type { PagedRelationTypeTreeItemResponseModel } from './models/PagedRelationTypeTreeItemResponseModel';
export type { PagedSavedLogSearchResponseModel } from './models/PagedSavedLogSearchResponseModel';
export type { PagedSearcherResponseModel } from './models/PagedSearcherResponseModel';
export type { PagedSearchResultResponseModel } from './models/PagedSearchResultResponseModel';
export type { PagedTagResponseModel } from './models/PagedTagResponseModel';
export type { PagedTelemetryResponseModel } from './models/PagedTelemetryResponseModel';
export type { PagedUserGroupResponseModel } from './models/PagedUserGroupResponseModel';
export type { PagedUserResponseModel } from './models/PagedUserResponseModel';
export type { PagedWebhookResponseModel } from './models/PagedWebhookResponseModel';
export type { PartialViewFolderResponseModel } from './models/PartialViewFolderResponseModel';
export type { PartialViewItemResponseModel } from './models/PartialViewItemResponseModel';
export type { PartialViewResponseModel } from './models/PartialViewResponseModel';
Expand Down Expand Up @@ -320,6 +322,7 @@ export type { RelationResponseModel } from './models/RelationResponseModel';
export type { RelationTypeBaseModel } from './models/RelationTypeBaseModel';
export type { RelationTypeItemResponseModel } from './models/RelationTypeItemResponseModel';
export type { RelationTypeResponseModel } from './models/RelationTypeResponseModel';
export type { RelationTypeTreeItemResponseModel } from './models/RelationTypeTreeItemResponseModel';
export type { RenamePartialViewRequestModel } from './models/RenamePartialViewRequestModel';
export type { RenameScriptRequestModel } from './models/RenameScriptRequestModel';
export type { RenameStylesheetRequestModel } from './models/RenameStylesheetRequestModel';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import type { ReferenceByIdModel } from './ReferenceByIdModel';

export type ContentTreeItemResponseModel = {
type: string;
hasChildren: boolean;
parent?: ReferenceByIdModel | null;
noAccess: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import type { DocumentTypeTreeItemResponseModel } from './DocumentTypeTreeItemRe
import type { FolderTreeItemResponseModel } from './FolderTreeItemResponseModel';
import type { MediaTypeTreeItemResponseModel } from './MediaTypeTreeItemResponseModel';
import type { NamedEntityTreeItemResponseModel } from './NamedEntityTreeItemResponseModel';
import type { RelationTypeTreeItemResponseModel } from './RelationTypeTreeItemResponseModel';

export type PagedNamedEntityTreeItemResponseModel = {
total: number;
items: Array<(NamedEntityTreeItemResponseModel | DataTypeTreeItemResponseModel | DocumentBlueprintTreeItemResponseModel | DocumentTypeTreeItemResponseModel | FolderTreeItemResponseModel | MediaTypeTreeItemResponseModel)>;
items: Array<(NamedEntityTreeItemResponseModel | DataTypeTreeItemResponseModel | DocumentBlueprintTreeItemResponseModel | DocumentTypeTreeItemResponseModel | FolderTreeItemResponseModel | MediaTypeTreeItemResponseModel | RelationTypeTreeItemResponseModel)>;
};

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { RelationTypeTreeItemResponseModel } from './RelationTypeTreeItemResponseModel';

export type PagedRelationTypeTreeItemResponseModel = {
total: number;
items: Array<RelationTypeTreeItemResponseModel>;
};

12 changes: 12 additions & 0 deletions src/external/backend-api/src/models/PagedWebhookResponseModel.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { WebhookResponseModel } from './WebhookResponseModel';

export type PagedWebhookResponseModel = {
total: number;
items: Array<WebhookResponseModel>;
};

Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@

import type { NamedItemResponseModelBaseModel } from './NamedItemResponseModelBaseModel';

export type RelationTypeItemResponseModel = NamedItemResponseModelBaseModel;
export type RelationTypeItemResponseModel = (NamedItemResponseModelBaseModel & {
isDeletable: boolean;
});

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export type RelationTypeResponseModel = (RelationTypeBaseModel & {
id: string;
alias?: string | null;
path: string;
isSystemRelationType: boolean;
isDeletable: boolean;
parentObjectTypeName?: string | null;
childObjectTypeName?: string | null;
});
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { NamedEntityTreeItemResponseModel } from './NamedEntityTreeItemResponseModel';

export type RelationTypeTreeItemResponseModel = (NamedEntityTreeItemResponseModel & {
isDeletable: boolean;
});

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

export type TreeItemPresentationModel = {
type: string;
hasChildren: boolean;
};

6 changes: 3 additions & 3 deletions src/external/backend-api/src/services/RelationTypeResource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* tslint:disable */
/* eslint-disable */
import type { CreateRelationTypeRequestModel } from '../models/CreateRelationTypeRequestModel';
import type { PagedNamedEntityTreeItemResponseModel } from '../models/PagedNamedEntityTreeItemResponseModel';
import type { PagedRelationTypeTreeItemResponseModel } from '../models/PagedRelationTypeTreeItemResponseModel';
import type { RelationTypeItemResponseModel } from '../models/RelationTypeItemResponseModel';
import type { RelationTypeResponseModel } from '../models/RelationTypeResponseModel';
import type { UpdateRelationTypeRequestModel } from '../models/UpdateRelationTypeRequestModel';
Expand Down Expand Up @@ -130,7 +130,7 @@ export class RelationTypeResource {
}

/**
* @returns PagedNamedEntityTreeItemResponseModel Success
* @returns PagedRelationTypeTreeItemResponseModel Success
* @throws ApiError
*/
public static getTreeRelationTypeRoot({
Expand All @@ -139,7 +139,7 @@ export class RelationTypeResource {
}: {
skip?: number,
take?: number,
}): CancelablePromise<PagedNamedEntityTreeItemResponseModel> {
}): CancelablePromise<PagedRelationTypeTreeItemResponseModel> {
return __request(OpenAPI, {
method: 'GET',
url: '/umbraco/management/api/v1/tree/relation-type/root',
Expand Down
25 changes: 25 additions & 0 deletions src/external/backend-api/src/services/WebhookResource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/* tslint:disable */
/* eslint-disable */
import type { CreateWebhookRequestModel } from '../models/CreateWebhookRequestModel';
import type { PagedWebhookResponseModel } from '../models/PagedWebhookResponseModel';
import type { UpdateWebhookRequestModel } from '../models/UpdateWebhookRequestModel';
import type { WebhookItemResponseModel } from '../models/WebhookItemResponseModel';
import type { WebhookResponseModel } from '../models/WebhookResponseModel';
Expand All @@ -13,6 +14,30 @@ import { request as __request } from '../core/request';

export class WebhookResource {

/**
* @returns PagedWebhookResponseModel Success
* @throws ApiError
*/
public static getWebhook({
skip,
take = 100,
}: {
skip?: number,
take?: number,
}): CancelablePromise<PagedWebhookResponseModel> {
return __request(OpenAPI, {
method: 'GET',
url: '/umbraco/management/api/v1/webhook',
query: {
'skip': skip,
'take': take,
},
errors: {
401: `The resource is protected and requires an authentication token`,
},
});
}

/**
* @returns string Created
* @throws ApiError
Expand Down
2 changes: 1 addition & 1 deletion src/libs/class-api/class.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export interface UmbClassInterface extends UmbControllerHost {
// This type dance checks if the Observable given could be undefined, if it potentially could be undefined it means that this potentially could return undefined and then call the callback with undefined. [NL]
source: ObservableType,
callback: ObserverCallback<SpecificT>,
controllerAlias?: UmbControllerAlias,
controllerAlias?: UmbControllerAlias | null,
): SpecificR;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/libs/class-api/class.mixin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const UmbClassMixin = <T extends ClassConstructor<EventTarget>>(superClas
// This type dance checks if the Observable given could be undefined, if it potentially could be undefined it means that this potentially could return undefined and then call the callback with undefined. [NL]
source: ObservableType,
callback: ObserverCallback<SpecificT>,
controllerAlias?: UmbControllerAlias,
controllerAlias?: UmbControllerAlias | null,
): SpecificR {
// Fallback to use a hash of the provided method, but only if the alias is undefined.
controllerAlias ??= controllerAlias === undefined ? simpleHashCode(callback.toString()) : undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/libs/element-api/element.mixin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const UmbElementMixin = <T extends HTMLElementConstructor>(superClass: T)
// This type dance checks if the Observable given could be undefined, if it potentially could be undefined it means that this potentially could return undefined and then call the callback with undefined. [NL]
source: ObservableType,
callback: ObserverCallback<SpecificT>,
controllerAlias?: UmbControllerAlias,
controllerAlias?: UmbControllerAlias | null,
): SpecificR {
// Fallback to use a hash of the provided method, but only if the alias is undefined.
controllerAlias ??= controllerAlias === undefined ? simpleHashCode(callback.toString()) : undefined;
Expand Down
17 changes: 15 additions & 2 deletions src/libs/extension-api/registry/extension.registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ export class UmbExtensionRegistry<
}

/**
* Get an observable that provides extensions matching the given alias.
* @param alias {string} - The alias of the extensions to get.
* Get an observable that provides an extension matching the given alias.
* @param alias {string} - The alias of the extension to get.
* @returns {Observable<T | undefined>} - An observable of the extension that matches the alias.
*/
byAlias<T extends ManifestBase = ManifestBase>(alias: string): Observable<T | undefined> {
Expand All @@ -267,6 +267,19 @@ export class UmbExtensionRegistry<
) as Observable<T | undefined>;
}

/**
* Get an extension that matches the given alias, this will not return an observable, it is a one of retrieval if it exists at the given point in time.
* @param alias {string} - The alias of the extension to get.
* @returns {<T | undefined>} - The extension manifest that matches the alias.
*/
getByAlias<T extends ManifestBase = ManifestBase>(alias: string): T | undefined {
const ext = this._extensions.getValue().find((ext) => ext.alias === alias) as T | undefined;
if (ext?.kind) {
return this.#mergeExtensionWithKinds([ext, this._kinds.getValue()]);
}
return ext;
}

/**
* Get an observable that provides extensions matching the given type and alias.
* @param type {string} - The type of the extensions to get.
Expand Down
4 changes: 2 additions & 2 deletions src/libs/observable-api/observer.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export class UmbObserverController<T = unknown> extends UmbObserver<T> implement
constructor(
host: UmbControllerHost,
source: Observable<T>,
callback: ObserverCallback<T>,
alias: UmbControllerAlias,
callback?: ObserverCallback<T>,
alias?: UmbControllerAlias,
) {
super(source, callback);
this.#host = host;
Expand Down
8 changes: 5 additions & 3 deletions src/libs/observable-api/observer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ export class UmbObserver<T> {
#callback!: ObserverCallback<T>;
#subscription!: Subscription;

constructor(source: Observable<T>, callback: ObserverCallback<T>) {
constructor(source: Observable<T>, callback?: ObserverCallback<T>) {
this.#source = source;
this.#subscription = source.subscribe(callback);
if (callback) {
this.#subscription = source.subscribe(callback);
}
}

/**
Expand Down Expand Up @@ -63,9 +65,9 @@ export class UmbObserver<T> {
destroy(): void {
if (this.#subscription) {
this.#subscription.unsubscribe();
(this.#source as any) = undefined;
(this.#callback as any) = undefined;
(this.#subscription as any) = undefined;
}
(this.#source as any) = undefined;
}
}
Loading

0 comments on commit 7bc8186

Please sign in to comment.