From 9aeb9a18b65f74a7cb00e60aeb83b1e4c4d7ffef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20M=C3=B8ller=20Jensen?= Date: Thu, 1 Sep 2022 16:08:38 +0200 Subject: [PATCH] add isTrashed to node and entity --- .../src/mocks/data/data.ts | 11 ++++++++++- .../src/mocks/data/entities.ts | 17 +++++++++++++++++ .../src/mocks/data/entity.data.ts | 1 + .../src/mocks/data/node.data.ts | 6 ++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts index 4e5fda8456..88adc3312d 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts @@ -1,7 +1,7 @@ import { entities } from './entities'; // Temp mocked database -export class UmbData { +export class UmbData { private _data: Array = []; constructor(data: Array) { @@ -32,6 +32,15 @@ export class UmbData { return saveItems; } + trash(key: string) { + const item = this.getByKey(key); + if (!item) return; + + item.isTrashed = true; + this._updateEntity(item); + return item; + } + private _updateEntity(saveItem: T) { // TODO consider deep merge const entityIndex = entities.findIndex((item) => item.key === saveItem.key); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/entities.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/entities.ts index 3d53eaeb3b..c3d774665b 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/entities.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/entities.ts @@ -8,6 +8,7 @@ export const entities: Array = [ parentKey: '24fcd88a-d1bb-423b-b794-8a94dcddcb6a', name: 'Member 1', hasChildren: false, + isTrashed: false, }, { id: 2, @@ -16,6 +17,7 @@ export const entities: Array = [ parentKey: '24fcd88a-d1bb-423b-b794-8a94dcddcb6a', name: 'Member 2', hasChildren: true, + isTrashed: false, }, { id: 3, @@ -24,6 +26,7 @@ export const entities: Array = [ parentKey: '06c6919c-6fa7-4aa5-8214-0582c721c472', name: 'Member 3', hasChildren: false, + isTrashed: false, }, { id: 4, @@ -32,6 +35,7 @@ export const entities: Array = [ type: 'memberGroup', name: 'Member Group 1', hasChildren: false, + isTrashed: false, }, { id: 5, @@ -40,6 +44,7 @@ export const entities: Array = [ type: 'memberGroup', name: 'Member Group 2', hasChildren: false, + isTrashed: false, }, { id: 1245, @@ -47,6 +52,7 @@ export const entities: Array = [ parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', name: 'Text', hasChildren: false, + isTrashed: false, type: 'dataType', }, { @@ -55,6 +61,7 @@ export const entities: Array = [ parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', name: 'Textarea', hasChildren: false, + isTrashed: false, type: 'dataType', }, { @@ -63,6 +70,7 @@ export const entities: Array = [ parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', name: 'My JS Property Editor', hasChildren: false, + isTrashed: false, type: 'dataType', }, { @@ -71,6 +79,7 @@ export const entities: Array = [ parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', name: 'Context Example', hasChildren: false, + isTrashed: false, type: 'dataType', }, { @@ -79,6 +88,7 @@ export const entities: Array = [ parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', name: 'Content Picker (DataType)', hasChildren: false, + isTrashed: false, type: 'dataType', }, { @@ -87,6 +97,7 @@ export const entities: Array = [ name: 'Document Type 1', type: 'documentType', hasChildren: false, + isTrashed: false, parentKey: '055a17d0-525a-4d06-9f75-92dc174ab0bd', }, { @@ -95,6 +106,7 @@ export const entities: Array = [ name: 'Document Type 2', type: 'documentType', hasChildren: false, + isTrashed: false, parentKey: '055a17d0-525a-4d06-9f75-92dc174ab0bd', }, { @@ -104,6 +116,7 @@ export const entities: Array = [ type: 'media', icon: 'picture', hasChildren: false, + isTrashed: false, parentKey: '', }, { @@ -113,6 +126,7 @@ export const entities: Array = [ name: 'Media 2', icon: 'picture', hasChildren: false, + isTrashed: false, parentKey: '', }, { @@ -122,6 +136,7 @@ export const entities: Array = [ type: 'document', icon: 'document', hasChildren: false, + isTrashed: false, parentKey: '', }, { @@ -131,6 +146,7 @@ export const entities: Array = [ type: 'document', icon: 'favorite', hasChildren: false, + isTrashed: false, parentKey: '', }, { @@ -140,6 +156,7 @@ export const entities: Array = [ type: 'document', icon: 'document', hasChildren: false, + isTrashed: false, parentKey: '', }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts index ff9ffe9c9d..af65ec1c3c 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts @@ -9,6 +9,7 @@ export interface Entity { type: string; hasChildren: boolean; // TODO: Should this be here? parentKey: string; + isTrashed: boolean; } // Temp mocked database diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/node.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/node.data.ts index 3edaf52f3f..4dabf392df 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/node.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/node.data.ts @@ -9,6 +9,7 @@ export interface NodeEntity { properties: Array; data: Array; variants: Array; // TODO: define variant data + isTrashed: boolean; //layout?: any; // TODO: define layout type - make it non-optional } @@ -35,6 +36,7 @@ export const data: Array = [ { id: 1, key: '74e4008a-ea4f-4793-b924-15e02fd380d1', + isTrashed: false, name: 'Document 1', type: 'document', icon: 'document', @@ -85,6 +87,7 @@ export const data: Array = [ { id: 2, key: '74e4008a-ea4f-4793-b924-15e02fd380d2', + isTrashed: false, name: 'Document 2', type: 'document', icon: 'favorite', @@ -148,6 +151,7 @@ export const data: Array = [ { id: 3, key: 'cdd30288-2d1c-41b4-89a9-61647b4a10d5', + isTrashed: false, name: 'Document 3', type: 'document', icon: 'document', @@ -170,6 +174,7 @@ export const data: Array = [ { id: 2001, key: 'f2f81a40-c989-4b6b-84e2-057cecd3adc1', + isTrashed: false, name: 'Media 1', type: 'media', icon: 'picture', @@ -192,6 +197,7 @@ export const data: Array = [ { id: 2002, key: '69431027-8867-45bf-a93b-72bbdabfb177', + isTrashed: false, type: 'media', name: 'Media 2', icon: 'picture',