@umbraco-cms/backoffice 14.0.0-d335c2c2 → 14.0.0-d542ed7d

package/dist-cms/mocks/data/media-type.data.js

@@ -2,7 +2,6 @@ import { UmbEntityData } from './entity.data.js';
 import { createFolderTreeItem } from './utils.js';
 export const data = [
     {
-        $type: 'media-type',
         name: 'Media Type 1',
         type: 'media-type',
         hasChildren: false,
@@ -10,12 +9,10 @@ export const data = [
         isContainer: false,
         parentId: null,
         isFolder: false,
-        icon: '',
         alias: 'mediaType1',
         properties: [],
     },
     {
-        $type: 'media-type',
         name: 'Media Type 2',
         type: 'media-type',
         hasChildren: false,
@@ -23,7 +20,6 @@ export const data = [
         isContainer: false,
         parentId: null,
         isFolder: false,
-        icon: '',
         alias: 'mediaType2',
         properties: [],
     },

package/dist-cms/mocks/data/media.data.d.ts

@@ -1,12 +1,12 @@
 import type { MediaDetails } from '../../packages/media/media/index.js';
 import { UmbEntityData } from './entity.data.js';
-import { ContentTreeItemResponseModel, PagedContentTreeItemResponseModel } from '../../external/backend-api/index.js';
+import { ContentTreeItemResponseModel, PagedMediaTreeItemResponseModel } from '../../external/backend-api/index.js';
 export declare const data: Array<MediaDetails>;
 declare class UmbMediaData extends UmbEntityData<MediaDetails> {
     #private;
     constructor();
-    getTreeRoot(): PagedContentTreeItemResponseModel;
-    getTreeItemChildren(id: string): PagedContentTreeItemResponseModel;
+    getTreeRoot(): PagedMediaTreeItemResponseModel;
+    getTreeItemChildren(id: string): PagedMediaTreeItemResponseModel;
     getTreeItem(ids: Array<string>): Array<ContentTreeItemResponseModel>;
     move(ids: Array<string>, destinationKey: string): void;
 }

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

@@ -3,10 +3,8 @@ import { UmbEntityData } from './entity.data.js';
 import { createContentTreeItem } from './utils.js';
 export const data = [
     {
-        $type: '',
         name: 'Flipped Car',
         type: 'media',
-        icon: 'picture',
         hasChildren: false,
         id: 'f2f81a40-c989-4b6b-84e2-057cecd3adc1',
         isContainer: false,
@@ -30,10 +28,8 @@ export const data = [
         variants: [],
     },
     {
-        $type: '',
         name: 'Umbracoffee',
         type: 'media',
-        icon: 'picture',
         hasChildren: false,
         id: '69431027-8867-45bf-a93b-72bbdabfb177',
         isContainer: false,
@@ -57,10 +53,8 @@ export const data = [
         variants: [],
     },
     {
-        $type: '',
         name: 'People',
         type: 'media',
-        icon: 'folder',
         hasChildren: true,
         id: '69461027-8867-45bf-a93b-72bbdabfb177',
         isContainer: true,
@@ -72,10 +66,8 @@ export const data = [
         variants: [],
     },
     {
-        $type: '',
         name: 'Products',
         type: 'media',
-        icon: 'folder',
         hasChildren: true,
         id: '69461027-8867-45bf-a93b-5224dabfb177',
         isContainer: true,
@@ -87,10 +79,8 @@ export const data = [
         variants: [],
     },
     {
-        $type: '',
         name: 'John Smith',
         type: 'media',
-        icon: 'picture',
         hasChildren: false,
         id: '69431027-8867-45s7-a93b-7uibdabfb177',
         isContainer: false,
@@ -114,10 +104,8 @@ export const data = [
         variants: [],
     },
     {
-        $type: '',
         name: 'Jane Doe',
         type: 'media',
-        icon: 'picture',
         hasChildren: false,
         id: '69431027-8867-45s7-a93b-7uibdabf2147',
         isContainer: false,
@@ -141,10 +129,8 @@ export const data = [
         variants: [],
     },
     {
-        $type: '',
         name: 'A very nice hat',
         type: 'media',
-        icon: 'picture',
         hasChildren: false,
         id: '694hdj27-8867-45s7-a93b-7uibdabf2147',
         isContainer: false,
@@ -168,10 +154,8 @@ export const data = [
         variants: [],
     },
     {
-        $type: '',
         name: 'Fancy old chair',
         type: 'media',
-        icon: 'picture',
         hasChildren: false,
         id: '694hdj27-1237-45s7-a93b-7uibdabfas47',
         isContainer: false,

package/dist-cms/mocks/data/member-group.data.js

@@ -2,10 +2,8 @@ import { UmbEntityData } from './entity.data.js';
 import { createEntityTreeItem } from './utils.js';
 export const data = [
     {
-        $type: '',
         name: 'Member Group AAA',
         type: 'member-group',
-        icon: 'umb:document',
         hasChildren: false,
         id: '76708ccd-4179-464c-b694-6969149dd9f9',
         isContainer: false,

package/dist-cms/mocks/data/member-type.data.js

@@ -2,10 +2,8 @@ import { UmbData } from './data.js';
 import { createEntityTreeItem } from './utils.js';
 export const data = [
     {
-        $type: '',
         name: 'Member Type 1',
         type: 'member-type',
-        icon: 'icon-user',
         hasChildren: false,
         id: 'd59be02f-1df9-4228-aa1e-01917d806cda',
         isContainer: false,

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

@@ -2,10 +2,8 @@ import { UmbEntityData } from './entity.data.js';
 import { createEntityTreeItem } from './utils.js';
 export const data = [
     {
-        $type: '',
         name: 'Member AAA',
         type: 'member',
-        icon: 'umb:user',
         hasChildren: false,
         id: 'aaa08ccd-4179-464c-b634-6969149dd9f9',
         isContainer: false,

package/dist-cms/mocks/data/partial-views.data.js

@@ -6,7 +6,6 @@ export const data = [
         isFolder: true,
         name: 'blockgrid',
         type: 'partial-view',
-        icon: 'umb:folder',
         hasChildren: true,
     },
     {
@@ -14,7 +13,6 @@ export const data = [
         isFolder: true,
         name: 'blocklist',
         type: 'partial-view',
-        icon: 'umb:folder',
         hasChildren: true,
     },
     {
@@ -22,7 +20,6 @@ export const data = [
         isFolder: true,
         name: 'grid',
         type: 'partial-view',
-        icon: 'umb:folder',
         hasChildren: true,
     },
     {
@@ -30,7 +27,6 @@ export const data = [
         isFolder: false,
         name: 'area.cshtml',
         type: 'partial-view',
-        icon: 'umb:article',
         hasChildren: false,
     },
     {
@@ -38,7 +34,6 @@ export const data = [
         isFolder: false,
         name: 'items.cshtml',
         type: 'partial-view',
-        icon: 'umb:article',
         hasChildren: false,
     },
     {
@@ -46,7 +41,6 @@ export const data = [
         isFolder: false,
         name: 'default.cshtml',
         type: 'partial-view',
-        icon: 'umb:article',
         hasChildren: false,
     },
     {
@@ -54,7 +48,6 @@ export const data = [
         isFolder: false,
         name: 'editors',
         type: 'partial-view',
-        icon: 'umb:folder',
         hasChildren: false,
     },
     {
@@ -62,7 +55,6 @@ export const data = [
         isFolder: false,
         name: 'items.cshtml',
         type: 'partial-view',
-        icon: 'umb:article',
         hasChildren: false,
     },
 ];

package/dist-cms/mocks/data/relation-type.data.js

@@ -71,47 +71,37 @@ export const data = [
 export const treeData = [
     {
         id: 'e0d39ff5-71d8-453f-b682-9d8d31ee5e06',
-        $type: 'EntityTreeItemViewModel',
         isContainer: false,
         parentId: null,
         name: 'Relate Document On Copy',
-        icon: 'umb:trafic',
         type: 'relation-type',
     },
     {
         id: 'ac68cde6-763f-4231-a751-1101b57defd2',
-        $type: 'EntityTreeItemViewModel',
         isContainer: false,
         parentId: null,
         name: 'Relate Parent Document On Delete',
-        icon: 'umb:trafic',
         type: 'relation-type',
     },
     {
         id: '6f9b800c-762c-42d4-85d9-bf40a77d689e',
-        $type: 'EntityTreeItemViewModel',
         isContainer: false,
         parentId: null,
         name: 'Relate Parent Media Folder On Delete',
-        icon: 'umb:trafic',
         type: 'relation-type',
     },
     {
         id: 'd421727d-43de-4205-b4c6-037404f309ad',
-        $type: 'EntityTreeItemViewModel',
         isContainer: false,
         parentId: null,
         name: 'Related Media',
-        icon: 'umb:trafic',
         type: 'relation-type',
     },
     {
         id: 'e9a0a28e-2d5b-4229-ac00-66f2df230513',
-        $type: 'EntityTreeItemViewModel',
         isContainer: false,
         parentId: null,
         name: 'Related Document',
-        icon: 'umb:trafic',
         type: 'relation-type',
     },
 ];

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

@@ -6,7 +6,6 @@ export const data = [
         isFolder: false,
         name: 'Stylesheet File 1.css',
         type: 'stylesheet',
-        icon: 'umb:brackets',
         hasChildren: false,
         content: `Stylesheet content 1`,
     },
@@ -15,7 +14,6 @@ export const data = [
         isFolder: false,
         name: 'Stylesheet File 2.css',
         type: 'stylesheet',
-        icon: 'umb:brackets',
         hasChildren: false,
         content: `Stylesheet content 2`,
     },
@@ -24,7 +22,6 @@ export const data = [
         isFolder: true,
         name: 'Folder 1',
         type: 'stylesheet',
-        icon: 'umb:folder',
         hasChildren: true,
         content: `Stylesheet content 3`,
     },
@@ -33,7 +30,6 @@ export const data = [
         isFolder: false,
         name: 'Stylesheet File 3.css',
         type: 'stylesheet',
-        icon: 'umb:brackets',
         hasChildren: false,
         content: `Stylesheet content 3`,
     },

package/dist-cms/mocks/data/template.data.d.ts

@@ -1,41 +1,22 @@
 import { UmbEntityData } from './entity.data.js';
-import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel, TemplateResponseModel, TemplateScaffoldResponseModel, CreateTemplateRequestModel, TemplateItemResponseModel } from '../../external/backend-api/index.js';
+import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel, TemplateResponseModel, TemplateScaffoldResponseModel, CreateTemplateRequestModel, TemplateItemResponseModel, TemplateQuerySettingsResponseModel, TemplateQueryResultResponseModel } from '../../external/backend-api/index.js';
 type TemplateDBItem = TemplateResponseModel & EntityTreeItemResponseModel;
 export declare const data: Array<TemplateDBItem>;
 export declare const createTemplateScaffold: (masterTemplateAlias: string) => string;
-export declare const templateQuerySettings: {
-    contentTypeAliases: never[];
-    properties: {
-        alias: string;
-        type: string;
-    }[];
-    operators: {
-        operator: string;
-        applicableTypes: string[];
-    }[];
-};
+export declare const templateQueryResult: TemplateQueryResultResponseModel;
+export declare const templateQuerySettings: TemplateQuerySettingsResponseModel;
 declare class UmbTemplateData extends UmbEntityData<TemplateDBItem> {
     constructor();
     getById(id: string): TemplateResponseModel | undefined;
     getItemById(id: string): TemplateItemResponseModel | null;
     getScaffold(masterTemplateId?: string | null): TemplateScaffoldResponseModel;
     getItems(ids: string[]): TemplateItemResponseModel[];
-    getTemplateQuerySettings: () => {
-        contentTypeAliases: never[];
-        properties: {
-            alias: string;
-            type: string;
-        }[];
-        operators: {
-            operator: string;
-            applicableTypes: string[];
-        }[];
-    };
+    getTemplateQuerySettings: () => TemplateQuerySettingsResponseModel;
+    getTemplateQueryResult: () => TemplateQueryResultResponseModel;
     create(templateData: CreateTemplateRequestModel): {
         name?: string | undefined;
         alias?: string | undefined;
         content?: string | null | undefined;
-        $type: string;
         id: string;
     };
     update(template: TemplateResponseModel): TemplateResponseModel;

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

@@ -1,9 +1,9 @@
 import { UmbEntityData } from './entity.data.js';
 import { createEntityTreeItem } from './utils.js';
 import { UmbId } from '../../packages/core/id/index.js';
+import { TemplateQueryPropertyTypeModel, OperatorModel, } from '../../external/backend-api/index.js';
 const createTemplate = (dbItem) => {
     return {
-        $type: '',
         id: dbItem.id,
         name: dbItem.name,
         alias: dbItem.alias,
@@ -18,13 +18,11 @@ const createTemplateItem = (dbItem) => ({
 });
 export const data = [
     {
-        $type: '',
         id: '2bf464b6-3aca-4388-b043-4eb439cc2643',
         isContainer: false,
         parentId: null,
         name: 'Doc 1',
         type: 'template',
-        icon: 'umb:layout',
         hasChildren: false,
         alias: 'Doc1',
         content: `@using Umbraco.Extensions
@@ -42,39 +40,33 @@ export const data = [
 		</div>`,
     },
     {
-        $type: '',
         id: '9a84c0b3-03b4-4dd4-84ac-706740ac0f71',
         isContainer: false,
         parentId: null,
         name: 'Test',
         type: 'template',
-        icon: 'umb:layout',
         hasChildren: true,
         alias: 'Test',
         content: '@using Umbraco.Cms.Web.Common.PublishedModels;\n@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.Test>\r\n@using ContentModels = Umbraco.Cms.Web.Common.PublishedModels;\r\n@{\r\n\tLayout = null;\r\n}',
     },
     {
-        $type: '',
         id: '9a84c0b3-03b4-4dd4-84ac-706740ac0f72',
         isContainer: false,
         parentId: '9a84c0b3-03b4-4dd4-84ac-706740ac0f71',
         masterTemplateId: '9a84c0b3-03b4-4dd4-84ac-706740ac0f71',
         name: 'Child',
         type: 'template',
-        icon: 'umb:layout',
         hasChildren: false,
         alias: 'Test',
         content: '@using Umbraco.Cms.Web.Common.PublishedModels;\n@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.Test>\r\n@using ContentModels = Umbraco.Cms.Web.Common.PublishedModels;\r\n@{\r\n\tLayout = "Test.cshtml";\r\n}',
     },
     {
-        $type: '',
         id: '9a84c0b3-03b4-4dd4-84ac-706740acwerer0f72',
         isContainer: false,
         parentId: '9a84c0b3-03b4-4dd4-84ac-706740ac0f71',
         name: 'Has Master Template',
         masterTemplateId: '9a84c0b3-03b4-4dd4-84ac-706740ac0f71',
         type: 'template',
-        icon: 'umb:layout',
         hasChildren: false,
         alias: 'hasMasterTemplate',
         content: '@using Umbraco.Cms.Web.Common.PublishedModels;\n@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.Test>\r\n@using ContentModels = Umbraco.Cms.Web.Common.PublishedModels;\r\n@{\r\n\tLayout = "Test.cshtml";\r\n}',
@@ -87,58 +79,79 @@ export const createTemplateScaffold = (masterTemplateAlias) => {
 	Layout = ${masterTemplateAlias};
 }`;
 };
+//prettier-ignore
+const templateQueryExpressions = [
+    `Umbraco.ContentAtRoot().FirstOrDefault()
+.ChildrenOfType("docTypeWithTemplate")
+.Where(x => x.IsVisible())`,
+    `Umbraco.Content(Guid.Parse("0b3498dc-255a-4d62-aa4f-ef7bff333544"))
+.ChildrenOfType("docTypeWithTemplate")
+.Where(x => x.IsVisible())`,
+    `Umbraco.ContentAtRoot().FirstOrDefault()
+.ChildrenOfType("docTypeWithTemplate")
+.Where(x => (x.Id != -6))
+.Where(x => x.IsVisible())
+.OrderBy(x => x.UpdateDate)`,
+];
+const randomIndex = () => Math.floor(Math.random() * 3);
+export const templateQueryResult = {
+    queryExpression: templateQueryExpressions[randomIndex()],
+    sampleResults: [],
+    resultCount: 0,
+    executionTime: 0,
+};
 export const templateQuerySettings = {
-    contentTypeAliases: [],
+    contentTypeAliases: ['docTypeWithTemplate', 'propertyTypeWithTemplate', 'somethingElse'],
     properties: [
         {
             alias: 'Id',
-            type: 'Integer',
+            type: TemplateQueryPropertyTypeModel.INTEGER,
         },
         {
             alias: 'Name',
-            type: 'String',
+            type: TemplateQueryPropertyTypeModel.STRING,
         },
         {
             alias: 'CreateDate',
-            type: 'DateTime',
+            type: TemplateQueryPropertyTypeModel.DATE_TIME,
         },
         {
             alias: 'UpdateDate',
-            type: 'DateTime',
+            type: TemplateQueryPropertyTypeModel.DATE_TIME,
         },
     ],
     operators: [
         {
-            operator: 'Equals',
-            applicableTypes: ['Integer', 'String'],
+            operator: OperatorModel.EQUALS,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.STRING],
         },
         {
-            operator: 'NotEquals',
-            applicableTypes: ['Integer', 'String'],
+            operator: OperatorModel.NOT_EQUALS,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.STRING],
         },
         {
-            operator: 'LessThan',
-            applicableTypes: ['Integer', 'DateTime'],
+            operator: OperatorModel.LESS_THAN,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.DATE_TIME],
         },
         {
-            operator: 'LessThanEqualTo',
-            applicableTypes: ['Integer', 'DateTime'],
+            operator: OperatorModel.GREATER_THAN_EQUAL_TO,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.DATE_TIME],
         },
         {
-            operator: 'GreaterThan',
-            applicableTypes: ['Integer', 'DateTime'],
+            operator: OperatorModel.GREATER_THAN,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.DATE_TIME],
         },
         {
-            operator: 'GreaterThanEqualTo',
-            applicableTypes: ['Integer', 'DateTime'],
+            operator: OperatorModel.GREATER_THAN_EQUAL_TO,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.DATE_TIME],
         },
         {
-            operator: 'Contains',
-            applicableTypes: ['String'],
+            operator: OperatorModel.CONTAINS,
+            applicableTypes: [TemplateQueryPropertyTypeModel.STRING],
         },
         {
-            operator: 'NotContains',
-            applicableTypes: ['String'],
+            operator: OperatorModel.NOT_CONTAINS,
+            applicableTypes: [TemplateQueryPropertyTypeModel.STRING],
         },
     ],
 };
@@ -147,6 +160,7 @@ class UmbTemplateData extends UmbEntityData {
     constructor() {
         super(data);
         this.getTemplateQuerySettings = () => templateQuerySettings;
+        this.getTemplateQueryResult = () => templateQueryResult;
     }
     getById(id) {
         const item = this.data.find((item) => item.id === id);
@@ -168,7 +182,6 @@ class UmbTemplateData extends UmbEntityData {
     }
     create(templateData) {
         const template = {
-            $type: '',
             id: UmbId.new(),
             ...templateData,
         };

package/dist-cms/mocks/data/user-groups.data.js

@@ -13,7 +13,6 @@ class UmbUserGroupsData extends UmbEntityData {
 }
 export const data = [
     {
-        $type: 'UserGroupResponseModel',
         id: 'c630d49e-4e7b-42ea-b2bc-edc0edacb6b1',
         name: 'Administrators',
         icon: 'umb:medal',

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

@@ -17,7 +17,6 @@ class UmbUsersData extends UmbData {
     getCurrentUser() {
         const firstUser = this.data[0];
         return {
-            $type: 'CurrentUserResponseModel',
             id: firstUser.id,
             name: firstUser.name,
             email: firstUser.email,
@@ -69,7 +68,6 @@ export const data = [
     {
         id: 'bca6c733-a63d-4353-a271-9a8b6bcca8bd',
         type: 'user',
-        $type: 'UserResponseModel',
         contentStartNodeIds: [],
         mediaStartNodeIds: [],
         name: 'Umbraco User',
@@ -87,7 +85,6 @@ export const data = [
     {
         id: '82e11d3d-b91d-43c9-9071-34d28e62e81d',
         type: 'user',
-        $type: 'UserResponseModel',
         contentStartNodeIds: [],
         mediaStartNodeIds: [],
         name: 'Amelie Walker',
@@ -105,7 +102,6 @@ export const data = [
     {
         id: 'aa1d83a9-bc7f-47d2-b288-58d8a31f5017',
         type: 'user',
-        $type: 'UserResponseModel',
         contentStartNodeIds: [],
         mediaStartNodeIds: [],
         name: 'Oliver Kim',
@@ -123,7 +119,6 @@ export const data = [
     {
         id: 'ff2f4a50-d3d4-4bc4-869d-c7948c160e54',
         type: 'user',
-        $type: 'UserResponseModel',
         contentStartNodeIds: [],
         mediaStartNodeIds: [],
         name: 'Eliana Nieves',
@@ -141,7 +136,6 @@ export const data = [
     {
         id: 'c290c6d9-9f12-4838-8567-621b52a178de',
         type: 'user',
-        $type: 'UserResponseModel',
         contentStartNodeIds: [],
         mediaStartNodeIds: [],
         name: 'Jasmine Patel',

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

@@ -1,9 +1,7 @@
 export const createEntityTreeItem = (item) => {
     return {
-        $type: '',
         name: item.name,
         type: item.type,
-        icon: item.icon,
         hasChildren: item.hasChildren,
         id: item.id,
         isContainer: item.isContainer,
@@ -13,7 +11,6 @@ export const createEntityTreeItem = (item) => {
 export const createFolderTreeItem = (item) => {
     return {
         ...createEntityTreeItem(item),
-        $type: 'FolderTreeItemResponseModel',
         isFolder: item.isFolder,
     };
 };
@@ -30,7 +27,6 @@ export const createContentTreeItem = (item) => {
 export const createDocumentTreeItem = (item) => {
     return {
         ...createContentTreeItem(item),
-        $type: 'DocumentTreeItemViewModel',
         type: 'document',
         icon: 'document',
         name: item.variants?.[0].name ?? '',
@@ -54,7 +50,6 @@ export const createFileSystemTreeItem = (item) => {
     return {
         name: item.name,
         type: item.type,
-        icon: item.icon,
         hasChildren: item.hasChildren,
         path: item.path,
         isFolder: item.isFolder,

package/dist-cms/mocks/handlers/dictionary.handlers.js

@@ -6,14 +6,12 @@ const uploadResponse = {
 };
 /// TODO: get correct type
 const importResponse = {
-    $type: '',
     parentId: null,
     name: 'Uploaded dictionary',
     id: 'b7e7d0ab-53ba-485d-dddd-12537f9925cb',
     hasChildren: false,
     type: 'dictionary-item',
     isContainer: false,
-    icon: 'umb:book-alt',
     translations: [
         {
             isoCode: 'en',