@umbraco-cms/backoffice 14.0.0-631d8769 → 14.0.0-709b3cbf

package/dist-cms/mocks/data/document.data.js

@@ -460,7 +460,7 @@ export const data = [
                 publishDate: '2023-02-06T15:32:24.957009',
                 culture: 'en-us',
                 segment: null,
-                name: 'Blog post B',
+                name: 'Simple Document',
                 createDate: '2023-02-06T15:32:05.350038',
                 updateDate: '2023-02-06T15:32:24.957009',
             },
@@ -538,7 +538,29 @@ export const treeData = [
         isEdited: false,
         isTrashed: false,
     },
+    {
+        name: 'Trashed',
+        type: 'document',
+        icon: 'document',
+        hasChildren: false,
+        id: 'trashed-document-id',
+        isContainer: false,
+        parentId: null,
+        noAccess: false,
+        isProtected: false,
+        isPublished: false,
+        isEdited: false,
+        isTrashed: true,
+    },
 ];
+const createDocumentItem = (item) => {
+    return {
+        id: item.id,
+        name: item.variants?.[0].name,
+        contentTypeId: item.contentTypeId,
+    };
+};
+// TODO: look into making a combined document model so we don't need to maintain two+ data sets.
 // Temp mocked database
 // TODO: all properties are optional in the server schema. I don't think this is correct.
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -566,14 +588,26 @@ class UmbDocumentData extends UmbEntityData {
         });
         return result;
     }
+    trash(ids) {
+        const result = super.trash(ids);
+        this.treeData = this.treeData.map((x) => {
+            if (x.id && ids.includes(x.id)) {
+                return { ...x, isTrashed: true };
+            }
+            else {
+                return x;
+            }
+        });
+        return result;
+    }
     getTreeRoot() {
-        const items = this.treeData.filter((item) => item.parentId === null);
+        const items = this.treeData.filter((item) => item.parentId === null && item.isTrashed === false);
         const treeItems = items.map((item) => item);
         const total = items.length;
         return { items: treeItems, total };
     }
-    getTreeItemChildren(id) {
-        const items = this.treeData.filter((item) => item.parentId === id);
+    getTreeItemChildrenOf(id) {
+        const items = this.treeData.filter((item) => item.parentId === id && item.isTrashed === false);
         const treeItems = items.map((item) => item);
         const total = items.length;
         return { items: treeItems, total };
@@ -582,6 +616,10 @@ class UmbDocumentData extends UmbEntityData {
         const items = this.treeData.filter((item) => ids.includes(item.id ?? ''));
         return items.map((item) => item);
     }
+    getItems(ids) {
+        const items = this.data.filter((item) => ids.includes(item.id ?? ''));
+        return items.map((item) => createDocumentItem(item));
+    }
     getDocumentByIdAllowedDocumentTypes(id) {
         const item = this.getById(id);
         if (item?.contentTypeId) {
@@ -599,5 +637,17 @@ class UmbDocumentData extends UmbEntityData {
         const total = items?.length;
         return { items, total };
     }
+    getRecycleBinRoot() {
+        const items = this.treeData.filter((item) => item.parentId === null && item.isTrashed === true);
+        const treeItems = items.map((item) => item);
+        const total = items.length;
+        return { items: treeItems, total };
+    }
+    getRecycleBinChildrenOf(parentId) {
+        const items = this.treeData.filter((item) => item.parentId === parentId && item.isTrashed === true);
+        const treeItems = items.map((item) => item);
+        const total = items.length;
+        return { items: treeItems, total };
+    }
 }
 export const umbDocumentData = new UmbDocumentData();

package/dist-cms/mocks/data/entity.data.js

@@ -51,8 +51,6 @@ export class UmbEntityData extends UmbData {
             const item = this.getById(id);
             if (!item)
                 return;
-            // TODO: how do we handle trashed items?
-            // TODO: remove ignore when we know how to handle trashed items.
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             item.isTrashed = true;

package/dist-cms/mocks/handlers/{document.handlers.js → document/document.handlers.js}

@@ -1,38 +1,37 @@
 const { rest } = window.MockServiceWorker;
-import { umbDocumentData } from '../data/document.data.js';
-import { umbracoPath } from '../../shared/utils/index.js';
+import { umbDocumentData } from '../../data/document.data.js';
+import { umbracoPath } from '../../../shared/utils/index.js';
 // TODO: add schema
 export const handlers = [
-    rest.post(umbracoPath('/document/trash'), async (req, res, ctx) => {
-        console.warn('Please move to schema');
-        const ids = await req.json();
-        const trashed = umbDocumentData.trash(ids);
-        return res(ctx.status(200), ctx.json(trashed));
-    }),
-    rest.get(umbracoPath('/tree/document/root'), (req, res, ctx) => {
-        const response = umbDocumentData.getTreeRoot();
+    rest.get(umbracoPath('/document/root/allowed-document-types'), (req, res, ctx) => {
+        const response = umbDocumentData.getAllowedDocumentTypesAtRoot();
         return res(ctx.status(200), ctx.json(response));
     }),
-    rest.get(umbracoPath('/tree/document/children'), (req, res, ctx) => {
-        const parentId = req.url.searchParams.get('parentId');
-        if (!parentId)
+    rest.put(umbracoPath('/document/:id/move-to-recycle-bin'), async (req, res, ctx) => {
+        const id = req.params.id;
+        umbDocumentData.trash([id]);
+        return res(ctx.status(200));
+    }),
+    rest.get(umbracoPath('/document/:id/allowed-document-types'), (req, res, ctx) => {
+        const id = req.params.id;
+        if (!id)
             return;
-        const response = umbDocumentData.getTreeItemChildren(parentId);
+        const response = umbDocumentData.getDocumentByIdAllowedDocumentTypes(id);
         return res(ctx.status(200), ctx.json(response));
     }),
-    rest.get(umbracoPath('/tree/document/item'), (req, res, ctx) => {
-        const ids = req.url.searchParams.getAll('id');
-        if (!ids)
+    rest.get(umbracoPath('/document/:id'), (req, res, ctx) => {
+        const id = req.params.id;
+        if (!id)
             return;
-        const items = umbDocumentData.getTreeItem(ids);
-        return res(ctx.status(200), ctx.json(items));
+        const document = umbDocumentData.getById(id);
+        return res(ctx.status(200), ctx.json(document));
     }),
-    rest.post(umbracoPath(`/document`), async (req, res, ctx) => {
-        const data = await req.json();
-        if (!data)
+    rest.delete(umbracoPath('/document/:id'), (req, res, ctx) => {
+        const id = req.params.id;
+        if (!id)
             return;
-        umbDocumentData.insert(data);
-        return res(ctx.status(200));
+        const document = umbDocumentData.getById(id);
+        return res(ctx.status(200), ctx.json(document));
     }),
     rest.put(umbracoPath(`/document/:id`), async (req, res, ctx) => {
         const id = req.params.id;
@@ -44,22 +43,11 @@ export const handlers = [
         const saved = umbDocumentData.save(id, data);
         return res(ctx.status(200), ctx.json(saved));
     }),
-    rest.get(umbracoPath('/document/root/allowed-document-types'), (req, res, ctx) => {
-        const response = umbDocumentData.getAllowedDocumentTypesAtRoot();
-        return res(ctx.status(200), ctx.json(response));
-    }),
-    rest.get(umbracoPath('/document/:id/allowed-document-types'), (req, res, ctx) => {
-        const id = req.params.id;
-        if (!id)
-            return;
-        const response = umbDocumentData.getDocumentByIdAllowedDocumentTypes(id);
-        return res(ctx.status(200), ctx.json(response));
-    }),
-    rest.get(umbracoPath('/document/:id'), (req, res, ctx) => {
-        const id = req.params.id;
-        if (!id)
+    rest.post(umbracoPath(`/document`), async (req, res, ctx) => {
+        const data = await req.json();
+        if (!data)
             return;
-        const document = umbDocumentData.getById(id);
-        return res(ctx.status(200), ctx.json(document));
+        umbDocumentData.insert(data);
+        return res(ctx.status(200));
     }),
 ];

package/dist-cms/mocks/handlers/document/index.d.ts

@@ -0,0 +1 @@
+export declare const handlers: import("msw").RestHandler<import("msw/lib/glossary-de6278a9.js").M<import("msw/lib/glossary-de6278a9.js").h>>[];

package/dist-cms/mocks/handlers/document/index.js

@@ -0,0 +1,5 @@
+import { handlers as recycleBinHandlers } from './recycle-bin.handlers.js';
+import { handlers as treeHandlers } from './tree.handlers.js';
+import { handlers as documentHandlers } from './document.handlers.js';
+import { handlers as itemHandlers } from './item.handlers.js';
+export const handlers = [...recycleBinHandlers, ...treeHandlers, ...itemHandlers, ...documentHandlers];

package/dist-cms/mocks/handlers/document/item.handlers.d.ts

@@ -0,0 +1 @@
+export declare const handlers: import("msw").RestHandler<import("msw/lib/glossary-de6278a9.js").M<import("msw/lib/glossary-de6278a9.js").h>>[];

package/dist-cms/mocks/handlers/document/item.handlers.js

@@ -0,0 +1,13 @@
+const { rest } = window.MockServiceWorker;
+import { umbDocumentData } from '../../data/document.data.js';
+import { slug } from './slug.js';
+import { umbracoPath } from '../../../shared/utils/index.js';
+export const handlers = [
+    rest.get(umbracoPath(`${slug}/item`), (req, res, ctx) => {
+        const ids = req.url.searchParams.getAll('id');
+        if (!ids)
+            return;
+        const items = umbDocumentData.getItems(ids);
+        return res(ctx.status(200), ctx.json(items));
+    }),
+];

package/dist-cms/mocks/handlers/document/recycle-bin.handlers.d.ts

@@ -0,0 +1 @@
+export declare const handlers: import("msw").RestHandler<import("msw/lib/glossary-de6278a9.js").M<import("msw/lib/glossary-de6278a9.js").h>>[];

package/dist-cms/mocks/handlers/document/recycle-bin.handlers.js

@@ -0,0 +1,16 @@
+const { rest } = window.MockServiceWorker;
+import { umbDocumentData } from '../../data/document.data.js';
+import { umbracoPath } from '../../../shared/utils/index.js';
+export const handlers = [
+    rest.get(umbracoPath(`/recycle-bin/document/root`), (req, res, ctx) => {
+        const response = umbDocumentData.getRecycleBinRoot();
+        return res(ctx.status(200), ctx.json(response));
+    }),
+    rest.get(umbracoPath(`/recycle-bin/document/children`), (req, res, ctx) => {
+        const parentId = req.url.searchParams.get('parentId');
+        if (!parentId)
+            return;
+        const response = umbDocumentData.getRecycleBinChildrenOf(parentId);
+        return res(ctx.status(200), ctx.json(response));
+    }),
+];

package/dist-cms/mocks/handlers/document/slug.d.ts

@@ -0,0 +1 @@
+export declare const slug = "/document";

package/dist-cms/mocks/handlers/document/slug.js

@@ -0,0 +1 @@
+export const slug = '/document';

package/dist-cms/mocks/handlers/document/tree.handlers.d.ts

@@ -0,0 +1 @@
+export declare const handlers: import("msw").RestHandler<import("msw/lib/glossary-de6278a9.js").M<import("msw/lib/glossary-de6278a9.js").h>>[];

package/dist-cms/mocks/handlers/document/tree.handlers.js

@@ -0,0 +1,16 @@
+const { rest } = window.MockServiceWorker;
+import { umbDocumentData } from '../../data/document.data.js';
+import { umbracoPath } from '../../../shared/utils/index.js';
+export const handlers = [
+    rest.get(umbracoPath('/tree/document/root'), (req, res, ctx) => {
+        const response = umbDocumentData.getTreeRoot();
+        return res(ctx.status(200), ctx.json(response));
+    }),
+    rest.get(umbracoPath('/tree/document/children'), (req, res, ctx) => {
+        const parentId = req.url.searchParams.get('parentId');
+        if (!parentId)
+            return;
+        const response = umbDocumentData.getTreeItemChildrenOf(parentId);
+        return res(ctx.status(200), ctx.json(response));
+    }),
+];

package/dist-cms/packages/core/components/input-list-base/input-list-base.js

@@ -42,7 +42,7 @@ export class UmbInputListBaseElement extends UmbLitElement {
     }
     renderButton() {
         return html `<uui-button id="add-button" look="placeholder" @click=${this._openPicker} label="open">
-			Add
+			${this.localize.term('general_add')}
 		</uui-button>`;
     }
     renderContent() {

package/dist-cms/packages/core/content-type/content-type-container-structure-helper.class.js

@@ -14,7 +14,7 @@ export class UmbContentTypeContainerStructureHelper {
         // Containers defined in data might be more than actual containers to display as we merge them by name.
         // Direct containers are the containers defining the total of this container(Multiple containers with the same name and type)
         this._ownerAlikeContainers = [];
-        // Owner containers are containers owned by the owner Document Type (The specific one up for editing)
+        // Owner containers are containers owned by the owner Content Type (The specific one up for editing)
         this._ownerContainers = [];
         // State containing the merged containers (only one pr. name):
         this.#containers = new UmbArrayState([], (x) => x.id);
@@ -172,7 +172,7 @@ export class UmbContentTypeContainerStructureHelper {
         await this.#init;
         if (!this.#structure)
             return;
-        const newName = this.#structure.makeContainerNameUniqueForOwnerDocument(name, this._childType, containerParentId) ?? name;
+        const newName = this.#structure.makeContainerNameUniqueForOwnerContentType(name, this._childType, containerParentId) ?? name;
         return await this.partialUpdateContainer(containerId, { name: newName });
     }
 }

package/dist-cms/packages/core/content-type/content-type-property-structure-helper.class.js

@@ -16,7 +16,7 @@ export class UmbContentTypePropertyStructureHelper {
         this.#propertyStructure.sortBy((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0));
     }
     get ownerDocumentTypes() {
-        return this.#structure?.documentTypes;
+        return this.#structure?.contentTypes;
     }
     setStructureManager(structure) {
         this.#structure = structure;

package/dist-cms/packages/core/content-type/content-type-structure-manager.class.d.ts

@@ -6,8 +6,8 @@ export type PropertyContainerTypes = 'Group' | 'Tab';
 type T = DocumentTypeResponseModel;
 export declare class UmbContentTypePropertyStructureManager<R extends UmbDetailRepository<T> = UmbDetailRepository<T>> {
     #private;
-    readonly documentTypes: import("rxjs").Observable<DocumentTypeResponseModel[]>;
-    private readonly _documentTypeContainers;
+    readonly contentTypes: import("rxjs").Observable<DocumentTypeResponseModel[]>;
+    private readonly _contentTypeContainers;
     constructor(host: UmbControllerHostElement, typeRepository: R);
     /**
      * loadType will load the node type and all inherited and composed types.
@@ -27,26 +27,26 @@ export declare class UmbContentTypePropertyStructureManager<R extends UmbDetailR
     create(): Promise<boolean>;
     private _ensureType;
     private _loadType;
-    _observeDocumentType(data: T): Promise<void>;
-    private _loadDocumentTypeCompositions;
+    _observeContentType(data: T): Promise<void>;
+    private _loadContentTypeCompositions;
     /** Public methods for consuming structure: */
-    ownerDocumentType(): import("rxjs").Observable<DocumentTypeResponseModel | undefined>;
-    getOwnerDocumentType(): DocumentTypeResponseModel | undefined;
-    updateOwnerDocumentType(entry: T): void;
+    ownerContentType(): import("rxjs").Observable<DocumentTypeResponseModel | undefined>;
+    getOwnerContentType(): DocumentTypeResponseModel | undefined;
+    updateOwnerContentType(entry: T): void;
     createContainer(contentTypeId: string | null, parentId?: string | null, type?: PropertyContainerTypes, sortOrder?: number): Promise<PropertyTypeContainerModelBaseModel>;
-    makeContainerNameUniqueForOwnerDocument(newName: string, containerType?: PropertyContainerTypes, parentId?: string | null): string | null;
-    updateContainer(documentTypeId: string | null, containerId: string, partialUpdate: Partial<PropertyTypeContainerModelBaseModel>): Promise<void>;
-    removeContainer(documentTypeKey: string | null, containerId?: string | null): Promise<void>;
+    makeContainerNameUniqueForOwnerContentType(newName: string, containerType?: PropertyContainerTypes, parentId?: string | null): string | null;
+    updateContainer(contentTypeId: string | null, containerId: string, partialUpdate: Partial<PropertyTypeContainerModelBaseModel>): Promise<void>;
+    removeContainer(contentTypeId: string | null, containerId?: string | null): Promise<void>;
     createPropertyScaffold(containerId?: string | null, sortOrder?: number): PropertyTypeModelBaseModel;
-    createProperty(documentTypeId: string | null, containerId?: string | null, sortOrder?: number): Promise<PropertyTypeModelBaseModel>;
-    insertProperty(documentTypeId: string | null, property: PropertyTypeModelBaseModel): Promise<void>;
-    removeProperty(documentTypeId: string | null, propertyId: string): Promise<void>;
-    updateProperty(documentTypeId: string | null, propertyId: string, partialUpdate: Partial<PropertyTypeModelBaseModel>): Promise<void>;
+    createProperty(contentTypeId: string | null, containerId?: string | null, sortOrder?: number): Promise<PropertyTypeModelBaseModel>;
+    insertProperty(contentTypeId: string | null, property: PropertyTypeModelBaseModel): Promise<void>;
+    removeProperty(contentTypeId: string | null, propertyId: string): Promise<void>;
+    updateProperty(contentTypeId: string | null, propertyId: string, partialUpdate: Partial<PropertyTypeModelBaseModel>): Promise<void>;
     propertyStructureById(propertyId: string): Promise<import("rxjs").Observable<PropertyTypeModelBaseModel | undefined>>;
     propertyStructureByAlias(propertyAlias: string): Promise<import("rxjs").Observable<PropertyTypeModelBaseModel | undefined>>;
     getPropertyStructureById(propertyId: string): Promise<PropertyTypeModelBaseModel | undefined>;
     getPropertyStructureByAlias(propertyAlias: string): Promise<PropertyTypeModelBaseModel | undefined>;
-    ownerDocumentTypeObservablePart<PartResult>(mappingFunction: MappingFunction<T, PartResult>): import("rxjs").Observable<PartResult | undefined>;
+    ownerContentTypeObservablePart<PartResult>(mappingFunction: MappingFunction<T, PartResult>): import("rxjs").Observable<PartResult | undefined>;
     hasPropertyStructuresOf(containerId: string | null): import("rxjs").Observable<boolean>;
     rootPropertyStructures(): import("rxjs").Observable<PropertyTypeModelBaseModel[]>;
     propertyStructuresOf(containerId: string | null): import("rxjs").Observable<PropertyTypeModelBaseModel[]>;