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

prettier

Browse Source
This commit is contained in:
Niels Lyngsø
2023-06-08 15:35:16 +02:00
parent e729a592d1
commit ee53331453
5 changed files with 60 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

@@ -39,8 +39,8 @@
"@types/lodash-es": "^4.17.6",
"@types/mocha": "^10.0.0",
"@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^5.59.2",
"@typescript-eslint/parser": "^5.57.0",
"@typescript-eslint/eslint-plugin": "^5.59.9",
"@typescript-eslint/parser": "^5.59.9",
"@web/dev-server-esbuild": "^0.3.3",
"@web/dev-server-import-maps": "^0.0.7",
"@web/dev-server-rollup": "^0.3.21",
@@ -6115,15 +6115,15 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin": {
"version": "5.59.8",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.8.tgz",
"integrity": "sha512-JDMOmhXteJ4WVKOiHXGCoB96ADWg9q7efPWHRViT/f09bA8XOMLAVHHju3l0MkZnG1izaWXYmgvQcUjTRcpShQ==",
"version": "5.59.9",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz",
"integrity": "sha512-4uQIBq1ffXd2YvF7MAvehWKW3zVv/w+mSfRAu+8cKbfj3nwzyqJLNcZJpQ/WZ1HLbJDiowwmQ6NO+63nCA+fqA==",
"dev": true,
"dependencies": {
"@eslint-community/regexpp": "^4.4.0",
"@typescript-eslint/scope-manager": "5.59.8",
"@typescript-eslint/type-utils": "5.59.8",
"@typescript-eslint/utils": "5.59.8",
"@typescript-eslint/scope-manager": "5.59.9",
"@typescript-eslint/type-utils": "5.59.9",
"@typescript-eslint/utils": "5.59.9",
"debug": "^4.3.4",
"grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
@@ -6182,14 +6182,14 @@
"dev": true
},
"node_modules/@typescript-eslint/parser": {
"version": "5.59.8",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.8.tgz",
"integrity": "sha512-AnR19RjJcpjoeGojmwZtCwBX/RidqDZtzcbG3xHrmz0aHHoOcbWnpDllenRDmDvsV0RQ6+tbb09/kyc+UT9Orw==",
"version": "5.59.9",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.9.tgz",
"integrity": "sha512-FsPkRvBtcLQ/eVK1ivDiNYBjn3TGJdXy2fhXX+rc7czWl4ARwnpArwbihSOHI2Peg9WbtGHrbThfBUkZZGTtvQ==",
"dev": true,
"dependencies": {
"@typescript-eslint/scope-manager": "5.59.8",
"@typescript-eslint/types": "5.59.8",
"@typescript-eslint/typescript-estree": "5.59.8",
"@typescript-eslint/scope-manager": "5.59.9",
"@typescript-eslint/types": "5.59.9",
"@typescript-eslint/typescript-estree": "5.59.9",
"debug": "^4.3.4"
},
"engines": {
@@ -6209,13 +6209,13 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
"version": "5.59.8",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.8.tgz",
"integrity": "sha512-/w08ndCYI8gxGf+9zKf1vtx/16y8MHrZs5/tnjHhMLNSixuNcJavSX4wAiPf4aS5x41Es9YPCn44MIe4cxIlig==",
"version": "5.59.9",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz",
"integrity": "sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "5.59.8",
"@typescript-eslint/visitor-keys": "5.59.8"
"@typescript-eslint/types": "5.59.9",
"@typescript-eslint/visitor-keys": "5.59.9"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -6226,13 +6226,13 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
"version": "5.59.8",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.8.tgz",
"integrity": "sha512-+5M518uEIHFBy3FnyqZUF3BMP+AXnYn4oyH8RF012+e7/msMY98FhGL5SrN29NQ9xDgvqCgYnsOiKp1VjZ/fpA==",
"version": "5.59.9",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.9.tgz",
"integrity": "sha512-ksEsT0/mEHg9e3qZu98AlSrONAQtrSTljL3ow9CGej8eRo7pe+yaC/mvTjptp23Xo/xIf2mLZKC6KPv4Sji26Q==",
"dev": true,
"dependencies": {
"@typescript-eslint/typescript-estree": "5.59.8",
"@typescript-eslint/utils": "5.59.8",
"@typescript-eslint/typescript-estree": "5.59.9",
"@typescript-eslint/utils": "5.59.9",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -6253,9 +6253,9 @@
}
},
"node_modules/@typescript-eslint/types": {
"version": "5.59.8",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.8.tgz",
"integrity": "sha512-+uWuOhBTj/L6awoWIg0BlWy0u9TyFpCHrAuQ5bNfxDaZ1Ppb3mx6tUigc74LHcbHpOHuOTOJrBoAnhdHdaea1w==",
"version": "5.59.9",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.9.tgz",
"integrity": "sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -6266,13 +6266,13 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
"version": "5.59.8",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.8.tgz",
"integrity": "sha512-Jy/lPSDJGNow14vYu6IrW790p7HIf/SOV1Bb6lZ7NUkLc2iB2Z9elESmsaUtLw8kVqogSbtLH9tut5GCX1RLDg==",
"version": "5.59.9",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz",
"integrity": "sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "5.59.8",
"@typescript-eslint/visitor-keys": "5.59.8",
"@typescript-eslint/types": "5.59.9",
"@typescript-eslint/visitor-keys": "5.59.9",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -6326,17 +6326,17 @@
"dev": true
},
"node_modules/@typescript-eslint/utils": {
"version": "5.59.8",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.8.tgz",
"integrity": "sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg==",
"version": "5.59.9",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.9.tgz",
"integrity": "sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12",
"@typescript-eslint/scope-manager": "5.59.8",
"@typescript-eslint/types": "5.59.8",
"@typescript-eslint/typescript-estree": "5.59.8",
"@typescript-eslint/scope-manager": "5.59.9",
"@typescript-eslint/types": "5.59.9",
"@typescript-eslint/typescript-estree": "5.59.9",
"eslint-scope": "^5.1.1",
"semver": "^7.3.7"
},
@@ -6385,12 +6385,12 @@
"dev": true
},
"node_modules/@typescript-eslint/visitor-keys": {
"version": "5.59.8",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.8.tgz",
"integrity": "sha512-pJhi2ms0x0xgloT7xYabil3SGGlojNNKjK/q6dB3Ey0uJLMjK2UDGJvHieiyJVW/7C3KI+Z4Q3pEHkm4ejA+xQ==",
"version": "5.59.9",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz",
"integrity": "sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "5.59.8",
"@typescript-eslint/types": "5.59.9",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {

4
src/Umbraco.Web.UI.Client/package.json
View File

@@ -148,8 +148,8 @@
"@types/lodash-es": "^4.17.6",
"@types/mocha": "^10.0.0",
"@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^5.59.2",
"@typescript-eslint/parser": "^5.57.0",
"@typescript-eslint/eslint-plugin": "^5.59.9",
"@typescript-eslint/parser": "^5.59.9",
"@web/dev-server-esbuild": "^0.3.3",
"@web/dev-server-import-maps": "^0.0.7",
"@web/dev-server-rollup": "^0.3.21",

7
src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts
View File

@@ -24,8 +24,7 @@ export class UmbEntityData<T extends UmbEntityBase> extends UmbData<T> {
}
insert(item: T) {
console.log('insert', item)
console.log('insert', item);
// TODO: Remove this fix when all types come with an ID them selfs.
if (!item.id) {
@@ -44,9 +43,8 @@ export class UmbEntityData<T extends UmbEntityBase> extends UmbData<T> {
}
save(id: string, saveItem: T) {
// We need the ID in our data:
saveItem = {...saveItem, id: id};
saveItem = { ...saveItem, id: id };
const foundIndex = this.data.findIndex((item) => item.id === id);
if (foundIndex !== -1) {
@@ -101,7 +99,6 @@ export class UmbEntityData<T extends UmbEntityBase> extends UmbData<T> {
const item = this.data[itemIndex];
if (!item) return;
// TODO: revisit this code, seems like something we can solve smarter/type safer now:
const itemKeys = Object.keys(item);
const newItem = {};

18
src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-container-structure-helper.class.ts
View File

@@ -114,7 +114,7 @@ export class UmbContentTypeContainerStructureHelper {
this.#structure.containersByNameAndType(this._ownerName, this._ownerType),
(ownerALikeContainers) => {
this.#containers.next([]);
this._ownerContainers = ownerALikeContainers.filter(x => x.id === this._ownerId) || [];
this._ownerContainers = ownerALikeContainers.filter((x) => x.id === this._ownerId) || [];
this._ownerAlikeContainers = ownerALikeContainers || [];
if (this._ownerAlikeContainers.length > 0) {
this._observeChildContainerProperties();
@@ -211,26 +211,20 @@ export class UmbContentTypeContainerStructureHelper {
return await this.#structure.removeContainer(null, groupId);
}
async partialUpdateContainer(
containerId: string,
partialUpdate: Partial<PropertyTypeContainerModelBaseModel>
) {
async partialUpdateContainer(containerId: string, partialUpdate: Partial<PropertyTypeContainerModelBaseModel>) {
await this.#init;
if (!this.#structure || !containerId || !partialUpdate) return;
return await this.#structure.updateContainer(null, containerId, partialUpdate);
}
async updateContainerName(
containerId: string,
containerParentId: string | null,
name: string
) {
async updateContainerName(containerId: string, containerParentId: string | null, name: string) {
await this.#init;
if (!this.#structure) return;
const newName = this.#structure.makeContainerNameUniqueForOwnerDocument(name, this._childType, containerParentId) ?? name;
const newName =
this.#structure.makeContainerNameUniqueForOwnerDocument(name, this._childType, containerParentId) ?? name;
return await this.partialUpdateContainer(containerId, {name: newName});
return await this.partialUpdateContainer(containerId, { name: newName });
}
}

12
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.element.ts
View File

@@ -1,6 +1,6 @@
import { UmbDocumentTypeWorkspaceContext } from './document-type-workspace.context.js';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { html , customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbRoute, UmbRouterSlotInitEvent, generateRoutePathBuilder } from '@umbraco-cms/backoffice/router';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -48,9 +48,13 @@ export class UmbDocumentTypeWorkspaceElement extends UmbLitElement {
];
render() {
return html` <umb-router-slot .routes=${this._routes} @init=${(event: UmbRouterSlotInitEvent) => {
this.#routerPath = event.target.absoluteRouterPath;
}}></umb-router-slot> `;
return html`
<umb-router-slot
.routes=${this._routes}
@init=${(event: UmbRouterSlotInitEvent) => {
this.#routerPath = event.target.absoluteRouterPath;
}}></umb-router-slot>
`;
}
static styles = [UUITextStyles];