Merge branch 'main' into v15/feature/disable-readonly-when-unpulish-and-publish

madsrasmussen · web-flow · commit da1652a67c1a · 2024-10-29T17:17:34.000+01:00
diff --git a/src/packages/core/components/history/history-item.element.ts b/src/packages/core/components/history/history-item.element.ts
@@ -63,6 +63,7 @@ export class UmbHistoryItemElement extends UmbLitElement {
 			.user-info div {
 				display: flex;
 				flex-direction: column;
+				min-width: var(--uui-size-60);
 			}
 
 			.detail {
diff --git a/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts b/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts
@@ -478,7 +478,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 		const ownedTab = this.#tabsStructureHelper.isOwnerChildContainer(tab.id!) ?? false;
 
 		return html`<uui-tab
-			label=${tab.name && tab.name !== '' ? tab.name : 'unnamed'}
+			label=${tab.name && tab.name !== '' ? tab.name : 'Unnamed'}
 			.active=${tabActive}
 			href=${path}
 			data-umb-tab-id=${ifDefined(tab.id)}
@@ -489,10 +489,12 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 
 	renderTabInner(tab: UmbPropertyTypeContainerModel, tabActive: boolean, ownedTab: boolean) {
 		// TODO: Localize this:
+		const hasTabName = tab.name && tab.name !== '';
+		const tabName = hasTabName ? tab.name : 'Unnamed';
 		if (this._sortModeActive) {
 			return html`<div class="tab">
 				${ownedTab
-					? html`<uui-icon name="icon-navigation" class="drag-${tab.id}"> </uui-icon>${tab.name!}
+					? html`<uui-icon name="icon-navigation" class="drag-${tab.id}"> </uui-icon>${tabName}
 							<uui-input
 								label="sort order"
 								type="number"
@@ -512,6 +514,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 					label=${tab.name!}
 					value="${tab.name!}"
 					auto-width
+					minlength="1"
 					@change=${(e: InputEvent) => this.#tabNameChanged(e, tab)}
 					@input=${(e: InputEvent) => this.#tabNameChanged(e, tab)}
 					@blur=${(e: FocusEvent) => this.#tabNameBlur(e, tab)}>
@@ -521,7 +524,11 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 		}
 
 		if (ownedTab) {
-			return html`<div class="not-active">${tab.name!} ${this.renderDeleteFor(tab)}</div>`;
+			return html`<div class="not-active">
+				<span class=${hasTabName ? '' : 'invaild'}>${hasTabName ? tab.name : 'Unnamed'}</span> ${this.renderDeleteFor(
+					tab,
+				)}
+			</div>`;
 		} else {
 			return html`<div class="not-active"><uui-icon name="icon-merge"></uui-icon>${tab.name!}</div>`;
 		}
@@ -630,6 +637,10 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 				gap: var(--uui-size-space-3);
 			}
 
+			.invaild {
+				color: var(--uui-color-danger, #d42054);
+			}
+
 			.trash {
 				opacity: 1;
 				transition: opacity 100ms;
@@ -640,7 +651,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 				transition: opacity 100ms;
 			}
 
-			uui-input:not(:focus, :hover) {
+			uui-input:not(:focus, :hover, :invalid) {
 				border: 1px solid transparent;
 			}
 
diff --git a/src/packages/core/icon-registry/icon-dictionary.json b/src/packages/core/icon-registry/icon-dictionary.json
@@ -366,6 +366,10 @@
 			"name": "icon-circuits",
 			"file": "circuit-board.svg"
 		},
+		{
+			"name": "icon-clear-formatting",
+			"file": "remove-formatting.svg"
+		},
 		{
 			"name": "icon-client",
 			"file": "user.svg",
diff --git a/src/packages/core/icon-registry/icons.ts b/src/packages/core/icon-registry/icons.ts
@@ -355,6 +355,10 @@ name: "icon-circuits",
 
 path: () => import("./icons/icon-circuits.js"),
 },{
+name: "icon-clear-formatting",
+
+path: () => import("./icons/icon-clear-formatting.js"),
+},{
 name: "icon-client",
 legacy: true,
 path: () => import("./icons/icon-client.js"),
diff --git a/src/packages/core/icon-registry/icons/icon-clear-formatting.ts b/src/packages/core/icon-registry/icons/icon-clear-formatting.ts
@@ -0,0 +1,18 @@
+export default `<!-- @license lucide-static v0.446.0 - ISC -->
+<svg
+  class="lucide lucide-remove-formatting"
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="1.75"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M4 7V4h16v3" />
+  <path d="M5 20h6" />
+  <path d="M13 4 8 20" />
+  <path d="m15 15 5 5" />
+  <path d="m20 15-5 5" />
+</svg>
+`;
diff --git a/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts b/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts
@@ -169,6 +169,7 @@ export class UmbDataTypePickerFlowDataTypePickerModalElement extends UmbModalBas
 				grid-template-rows: 40px 1fr;
 				height: 100%;
 				width: 100%;
+				word-break: break-word;
 			}
 			.icon {
 				font-size: 2em;
diff --git a/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
@@ -448,6 +448,7 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<
 				grid-template-rows: 40px 1fr;
 				height: 100%;
 				width: 100%;
+				word-break: break-word;
 			}
 
 			#item-grid .item .icon {
diff --git a/src/packages/documents/documents/repository/index.ts b/src/packages/documents/documents/repository/index.ts
@@ -1,6 +1,7 @@
 export { UmbDocumentDetailRepository, UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS } from './detail/index.js';
 export { UmbDocumentItemRepository, UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS } from './item/index.js';
 export { UmbDocumentPublishingRepository, UMB_DOCUMENT_PUBLISHING_REPOSITORY_ALIAS } from './publishing/index.js';
+export { UmbDocumentUrlRepository, UMB_DOCUMENT_URL_REPOSITORY_ALIAS } from './url/index.js';
 export { UmbDocumentPreviewRepository } from './preview/index.js';
 
 export type { UmbDocumentItemModel } from './item/types.js';
diff --git a/src/packages/documents/documents/repository/manifests.ts b/src/packages/documents/documents/repository/manifests.ts
@@ -1,5 +1,11 @@
 import { manifests as detailManifests } from './detail/manifests.js';
 import { manifests as itemManifests } from './item/manifests.js';
 import { manifests as publishingManifests } from './publishing/manifests.js';
+import { manifests as urlManifests } from './url/manifests.js';
 
-export const manifests: Array<UmbExtensionManifest> = [...detailManifests, ...itemManifests, ...publishingManifests];
+export const manifests: Array<UmbExtensionManifest> = [
+	...detailManifests,
+	...itemManifests,
+	...publishingManifests,
+	...urlManifests,
+];
diff --git a/src/packages/documents/documents/repository/url/constants.ts b/src/packages/documents/documents/repository/url/constants.ts
@@ -0,0 +1,2 @@
+export const UMB_DOCUMENT_URL_REPOSITORY_ALIAS = 'Umb.Repository.Document.Url';
+export const UMB_DOCUMENT_URL_STORE_ALIAS = 'Umb.Store.Document.Url';
diff --git a/src/packages/documents/documents/repository/url/document-url.repository.ts b/src/packages/documents/documents/repository/url/document-url.repository.ts
@@ -0,0 +1,13 @@
+import type { UmbDocumentUrlsModel } from './types.js';
+import { UMB_DOCUMENT_URL_STORE_CONTEXT } from './document-url.store.context-token.js';
+import { UmbDocumentUrlServerDataSource } from './document-url.server.data-source.js';
+import { UmbItemRepositoryBase } from '@umbraco-cms/backoffice/repository';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+
+export class UmbDocumentUrlRepository extends UmbItemRepositoryBase<UmbDocumentUrlsModel> {
+	constructor(host: UmbControllerHost) {
+		super(host, UmbDocumentUrlServerDataSource, UMB_DOCUMENT_URL_STORE_CONTEXT);
+	}
+}
+
+export { UmbDocumentUrlRepository as api };
diff --git a/src/packages/documents/documents/repository/url/document-url.server.data-source.ts b/src/packages/documents/documents/repository/url/document-url.server.data-source.ts
@@ -0,0 +1,29 @@
+import type { UmbDocumentUrlsModel } from './types.js';
+import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
+import type { DocumentUrlInfoResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+
+/**
+ * A server data source for Document URLs
+ * @class UmbDocumentUrlServerDataSource
+ * @implements {DocumentTreeDataSource}
+ */
+export class UmbDocumentUrlServerDataSource extends UmbItemServerDataSourceBase<
+	DocumentUrlInfoResponseModel,
+	UmbDocumentUrlsModel
+> {
+	/**
+	 * Creates an instance of UmbDocumentUrlServerDataSource.
+	 * @param {UmbControllerHost} host - The controller host for this controller to be appended to
+	 * @memberof UmbDocumentUrlServerDataSource
+	 */
+	constructor(host: UmbControllerHost) {
+		super(host, { getItems, mapper });
+	}
+}
+
+/* eslint-disable local-rules/no-direct-api-import */
+const getItems = (uniques: Array<string>) => DocumentService.getDocumentUrls({ id: uniques });
+
+const mapper = (item: DocumentUrlInfoResponseModel): UmbDocumentUrlsModel => ({ unique: item.id, urls: item.urlInfos });
diff --git a/src/packages/documents/documents/repository/url/document-url.store.context-token.ts b/src/packages/documents/documents/repository/url/document-url.store.context-token.ts
@@ -0,0 +1,4 @@
+import type UmbDocumentUrlStore from './document-url.store.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+
+export const UMB_DOCUMENT_URL_STORE_CONTEXT = new UmbContextToken<UmbDocumentUrlStore>('UmbDocumentUrlStore');
diff --git a/src/packages/documents/documents/repository/url/document-url.store.ts b/src/packages/documents/documents/repository/url/document-url.store.ts
@@ -0,0 +1,23 @@
+import type { UmbDocumentDetailModel } from '../../types.js';
+import { UMB_DOCUMENT_URL_STORE_CONTEXT } from './document-url.store.context-token.js';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UmbItemStoreBase } from '@umbraco-cms/backoffice/store';
+
+/**
+ * @class UmbDocumentUrlStore
+ * @augments {UmbStoreBase}
+ * @description - Data Store for Document URLs
+ */
+
+export class UmbDocumentUrlStore extends UmbItemStoreBase<UmbDocumentDetailModel> {
+	/**
+	 * Creates an instance of UmbDocumentUrlStore.
+	 * @param {UmbControllerHost} host - The controller host for this controller to be appended to
+	 * @memberof UmbDocumentUrlStore
+	 */
+	constructor(host: UmbControllerHost) {
+		super(host, UMB_DOCUMENT_URL_STORE_CONTEXT.toString());
+	}
+}
+
+export default UmbDocumentUrlStore;
diff --git a/src/packages/documents/documents/repository/url/index.ts b/src/packages/documents/documents/repository/url/index.ts
@@ -0,0 +1,2 @@
+export { UmbDocumentUrlRepository } from './document-url.repository.js';
+export { UMB_DOCUMENT_URL_REPOSITORY_ALIAS } from './constants.js';
diff --git a/src/packages/documents/documents/repository/url/manifests.ts b/src/packages/documents/documents/repository/url/manifests.ts
@@ -0,0 +1,18 @@
+import { UMB_DOCUMENT_URL_REPOSITORY_ALIAS, UMB_DOCUMENT_URL_STORE_ALIAS } from './constants.js';
+import type { ManifestItemStore, ManifestRepository } from '@umbraco-cms/backoffice/extension-registry';
+
+const urlRepository: ManifestRepository = {
+	type: 'repository',
+	alias: UMB_DOCUMENT_URL_REPOSITORY_ALIAS,
+	name: 'Document Url Repository',
+	api: () => import('./document-url.repository.js'),
+};
+
+const urlStore: ManifestItemStore = {
+	type: 'itemStore',
+	alias: UMB_DOCUMENT_URL_STORE_ALIAS,
+	name: 'Document Url Store',
+	api: () => import('./document-url.store.js'),
+};
+
+export const manifests = [urlRepository, urlStore];
diff --git a/src/packages/documents/documents/repository/url/types.ts b/src/packages/documents/documents/repository/url/types.ts
@@ -0,0 +1,9 @@
+export interface UmbDocumentUrlsModel {
+	unique: string;
+	urls: Array<UmbDocumentUrlModel>;
+}
+
+export interface UmbDocumentUrlModel {
+	culture?: string | null;
+	url?: string;
+}
diff --git a/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts b/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
diff --git a/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-links.element.ts b/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-links.element.ts
diff --git a/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-reference.element.ts b/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-reference.element.ts
diff --git a/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts b/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts
diff --git a/src/packages/tiptap/components/input-tiptap/tiptap-toolbar.element.ts b/src/packages/tiptap/components/input-tiptap/tiptap-toolbar.element.ts
diff --git a/src/packages/tiptap/extensions/manifests.ts b/src/packages/tiptap/extensions/manifests.ts
diff --git a/src/packages/tiptap/extensions/toolbar/clear-formatting.extension.ts b/src/packages/tiptap/extensions/toolbar/clear-formatting.extension.ts

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ export class UmbHistoryItemElement extends UmbLitElement {`
`63`	`63`	`.user-info div {`
`64`	`64`	`display: flex;`
`65`	`65`	`flex-direction: column;`
	`66`	`+ min-width: var(--uui-size-60);`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`.detail {`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ export class UmbDataTypePickerFlowDataTypePickerModalElement extends UmbModalBas`
`169`	`169`	`grid-template-rows: 40px 1fr;`
`170`	`170`	`height: 100%;`
`171`	`171`	`width: 100%;`
	`172`	`+ word-break: break-word;`
`172`	`173`	`}`
`173`	`174`	`.icon {`
`174`	`175`	`font-size: 2em;`
Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,7 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<`
`448`	`448`	`grid-template-rows: 40px 1fr;`
`449`	`449`	`height: 100%;`
`450`	`450`	`width: 100%;`
	`451`	`+ word-break: break-word;`
`451`	`452`	`}`
`452`	`453`
`453`	`454`	`#item-grid .item .icon {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export const UMB_DOCUMENT_URL_REPOSITORY_ALIAS = 'Umb.Repository.Document.Url';`
	`2`	`+export const UMB_DOCUMENT_URL_STORE_ALIAS = 'Umb.Store.Document.Url';`