@umbraco/playwright-testhelpers 2.0.0-beta.6 → 2.0.0-beta.61

package/dist/lib/helpers/ContentUiHelper.js

@@ -0,0 +1,229 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ContentUiHelper = void 0;
+const test_1 = require("@playwright/test");
+const UiBaseLocators_1 = require("./UiBaseLocators");
+class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
+    contentNameTxt;
+    saveAndPublishBtn;
+    actionsBtn;
+    publishBtn;
+    unpublishBtn;
+    actionMenuForContentBtn;
+    openedModal;
+    textstringTxt;
+    infoTab;
+    linkContent;
+    historyItems;
+    generalItem;
+    publicationStatus;
+    createdDate;
+    editDocumentTypeBtn;
+    addTemplateBtn;
+    id;
+    cultureAndHostnamesBtn;
+    cultureLanguageDropdownBox;
+    addNewDomainBtn;
+    domainTxt;
+    domainLanguageDropdownBox;
+    deleteDomainBtn;
+    reloadChildrenThreeDotsBtn;
+    contentTree;
+    richTextAreaTxt;
+    textAreaTxt;
+    plusIconBtn;
+    enterTagTxt;
+    menuItemTree;
+    domainComboBox;
+    confirmToUnpublishBtn;
+    saveModalBtn;
+    documentTypeNode;
+    createDocumentBlueprintBtn;
+    constructor(page) {
+        super(page);
+        this.contentNameTxt = page.locator('#name-input input');
+        this.saveAndPublishBtn = page.getByLabel('Save And Publish');
+        this.actionsBtn = page.getByLabel('Actions', { exact: true });
+        this.publishBtn = page.getByLabel('Publish', { exact: true });
+        this.unpublishBtn = page.getByLabel('Unpublish', { exact: true });
+        this.actionMenuForContentBtn = page.locator('#header [label="Open actions menu"]');
+        this.openedModal = page.locator('uui-modal-container[backdrop]');
+        this.textstringTxt = page.locator('umb-property-editor-ui-text-box #input');
+        this.reloadChildrenThreeDotsBtn = page.getByRole('button', { name: 'Reload children...' });
+        this.contentTree = page.locator('umb-tree[alias="Umb.Tree.Document"]');
+        this.richTextAreaTxt = page.frameLocator('iframe[title="Rich Text Area"]').locator('#tinymce');
+        this.textAreaTxt = page.locator('umb-property-editor-ui-textarea textarea');
+        this.plusIconBtn = page.locator('#icon-add svg');
+        this.enterTagTxt = page.getByPlaceholder('Enter tag');
+        this.menuItemTree = page.locator('umb-menu-item-tree-default');
+        this.confirmToUnpublishBtn = page.locator('umb-document-unpublish-modal').getByLabel('Unpublish');
+        this.documentTypeNode = page.locator('uui-ref-node-document-type');
+        this.createDocumentBlueprintBtn = page.getByLabel('Create Document Blueprint');
+        // Info tab
+        this.infoTab = page.getByRole('tab', { name: 'Info' });
+        this.linkContent = page.locator('.link-content');
+        this.historyItems = page.locator('umb-history-item');
+        this.generalItem = page.locator('.general-item');
+        this.publicationStatus = this.generalItem.filter({ hasText: 'Publication Status' }).locator('uui-tag');
+        this.createdDate = this.generalItem.filter({ hasText: 'Created' }).locator('umb-localize-date');
+        this.editDocumentTypeBtn = this.generalItem.filter({ hasText: 'Document Type' }).locator('#button');
+        this.addTemplateBtn = this.generalItem.filter({ hasText: 'Template' }).locator('#button');
+        this.id = this.generalItem.filter({ hasText: 'Id' }).locator('span');
+        // Culure and Hostname
+        this.cultureAndHostnamesBtn = page.getByLabel('Culture and Hostnames');
+        this.cultureLanguageDropdownBox = page.locator('[headline="Culture"]').getByLabel('combobox-input');
+        this.addNewDomainBtn = page.getByLabel('Add new domain');
+        this.domainTxt = page.getByLabel('Domain', { exact: true });
+        this.domainLanguageDropdownBox = page.locator('[headline="Domains"]').getByLabel('combobox-input');
+        this.deleteDomainBtn = page.locator('[headline="Domains"] [name="icon-trash"] svg');
+        this.domainComboBox = page.locator('#domains uui-combobox');
+        this.saveModalBtn = this.sidebarModal.getByLabel('Save', { exact: true });
+    }
+    async enterContentName(name) {
+        await (0, test_1.expect)(this.contentNameTxt).toBeVisible();
+        await this.contentNameTxt.clear();
+        await this.contentNameTxt.fill(name);
+    }
+    async clickSaveAndPublishButton() {
+        await this.saveAndPublishBtn.click();
+    }
+    async clickActionsButton() {
+        await this.actionsBtn.click();
+    }
+    async clickPublishButton() {
+        await this.publishBtn.click();
+    }
+    async clickUnpublishButton() {
+        await this.unpublishBtn.click();
+    }
+    async clickReloadChildrenThreeDotsButton() {
+        await this.reloadChildrenThreeDotsBtn.click();
+    }
+    async clickActionsMenuAtRoot() {
+        await this.actionMenuForContentBtn.click();
+    }
+    async openContent(contentName) {
+        await this.menuItemTree.getByText(contentName, { exact: true }).click();
+    }
+    async clickActionsMenuForContent(name) {
+        await this.clickActionsMenuForName(name);
+    }
+    async clickCaretButtonForContentName(name) {
+        await this.menuItemTree.filter({ hasText: name }).last().locator('#caret-button').last().click();
+    }
+    async waitForModalVisible() {
+        await this.openedModal.waitFor({ state: 'attached' });
+    }
+    async waitForModalHidden() {
+        await this.openedModal.waitFor({ state: 'hidden' });
+    }
+    async enterTextstring(text) {
+        await this.textstringTxt.clear();
+        await this.textstringTxt.fill(text);
+    }
+    async doesContentTreeHaveName(contentName) {
+        await (0, test_1.expect)(this.contentTree).toContainText(contentName);
+    }
+    async enterRichTextArea(value) {
+        await (0, test_1.expect)(this.richTextAreaTxt).toBeVisible();
+        await this.richTextAreaTxt.fill(value);
+    }
+    async enterTextArea(value) {
+        await (0, test_1.expect)(this.textAreaTxt).toBeVisible();
+        await this.textAreaTxt.fill(value);
+    }
+    async addTags(tagName) {
+        await this.plusIconBtn.click();
+        await this.enterTagTxt.fill(tagName);
+        await this.enterTagTxt.press('Enter');
+    }
+    async addContentPicker(contentName) {
+        await this.clickChooseButton();
+        await this.sidebarModal.getByText(contentName).click();
+        await this.chooseModalBtn.click();
+    }
+    async clickConfirmToUnpublishButton() {
+        await this.confirmToUnpublishBtn.click();
+    }
+    async clickCreateDocumentBlueprintButton() {
+        await this.createDocumentBlueprintBtn.click();
+    }
+    // Info Tab
+    async clickInfoTab() {
+        await this.infoTab.click({ force: true });
+    }
+    async doesLinkHaveText(text) {
+        await (0, test_1.expect)(this.linkContent).toHaveText(text);
+    }
+    async doesHistoryHaveText(text) {
+        await (0, test_1.expect)(this.historyItems).toHaveText(text);
+    }
+    async doesPublicationStatusHaveText(text) {
+        await (0, test_1.expect)(this.publicationStatus).toHaveText(text);
+    }
+    async doesCreatedDateHaveText(text) {
+        await (0, test_1.expect)(this.createdDate).toHaveText(text);
+    }
+    async doesIdHaveText(text) {
+        await (0, test_1.expect)(this.id).toHaveText(text);
+    }
+    async clickEditDocumentTypeButton() {
+        await this.editDocumentTypeBtn.click();
+    }
+    async clickAddTemplateButton() {
+        await this.addTemplateBtn.click();
+    }
+    async clickDocumentTypeByName(documentTypeName) {
+        await this.page.locator('uui-ref-node-document-type[name="' + documentTypeName + '"]').click();
+    }
+    async clickTemplateByName(templateName) {
+        await this.page.locator('uui-ref-node[name="' + templateName + '"]').click();
+    }
+    async isDocumentTypeModalVisible(documentTypeName) {
+        await (0, test_1.expect)(this.sidebarModal.locator('umb-document-type-workspace-editor [value="' + documentTypeName + '"]')).toBeVisible();
+    }
+    async isTemplateModalVisible(templateName) {
+        await (0, test_1.expect)(this.sidebarModal.getByText(templateName)).toBeVisible();
+    }
+    async clickEditTemplateByName(templateName) {
+        await this.page.locator('uui-ref-node[name="' + templateName + '"]').getByLabel('Choose').click();
+    }
+    async changeTemplate(oldTemplate, newTemplate) {
+        await this.clickEditTemplateByName(oldTemplate);
+        await this.sidebarModal.getByLabel(newTemplate).click();
+        await this.chooseModalBtn.click();
+    }
+    async isTemplateNameDisabled(templateName) {
+        await (0, test_1.expect)(this.sidebarModal.getByLabel(templateName)).toBeDisabled();
+    }
+    // Culture and Hostnames
+    async clickCultureAndHostnamesButton() {
+        await this.cultureAndHostnamesBtn.click();
+    }
+    async selectCultureLanguageOption(option) {
+        await this.cultureLanguageDropdownBox.click();
+        await this.page.getByText(option).click();
+    }
+    async selectDomainLanguageOption(option, index = 0) {
+        await this.domainLanguageDropdownBox.nth(index).click();
+        await this.domainComboBox.nth(index).getByText(option).click();
+    }
+    async clickAddNewDomainButton() {
+        await this.addNewDomainBtn.click();
+    }
+    async enterDomain(value, index = 0) {
+        await this.domainTxt.nth(index).clear();
+        await this.domainTxt.nth(index).fill(value);
+    }
+    async clickDeleteDomainButton() {
+        await this.deleteDomainBtn.first().click();
+    }
+    async clickSaveModalButton() {
+        await this.saveModalBtn.click();
+    }
+    async chooseDocumentType(documentTypeName) {
+        await this.documentTypeNode.filter({ hasText: documentTypeName }).click();
+    }
+}
+exports.ContentUiHelper = ContentUiHelper;
+//# sourceMappingURL=ContentUiHelper.js.map

package/dist/lib/helpers/ContentUiHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContentUiHelper.js","sourceRoot":"","sources":["../../../lib/helpers/ContentUiHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import {Page, Locator, expect} from \"@playwright/test\";\nimport {UiBaseLocators} from \"./UiBaseLocators\";\n\nexport class ContentUiHelper extends UiBaseLocators {\n  private readonly contentNameTxt: Locator;\n  private readonly saveAndPublishBtn: Locator;\n  private readonly actionsBtn: Locator;\n  private readonly publishBtn: Locator;\n  private readonly unpublishBtn: Locator;\n  private readonly actionMenuForContentBtn: Locator;\n  private readonly openedModal: Locator;\n  private readonly textstringTxt: Locator;\n  private readonly infoTab: Locator;\n  private readonly linkContent: Locator;\n  private readonly historyItems: Locator;\n  private readonly generalItem: Locator;\n  private readonly publicationStatus: Locator;\n  private readonly createdDate: Locator;\n  private readonly editDocumentTypeBtn: Locator;\n  private readonly addTemplateBtn: Locator;\n  private readonly id: Locator;\n  private readonly cultureAndHostnamesBtn: Locator;\n  private readonly cultureLanguageDropdownBox: Locator;\n  private readonly addNewDomainBtn: Locator;\n  private readonly domainTxt: Locator;\n  private readonly domainLanguageDropdownBox: Locator;\n  private readonly deleteDomainBtn: Locator;\n  private readonly reloadChildrenThreeDotsBtn: Locator;\n  private readonly contentTree: Locator;\n  private readonly richTextAreaTxt: Locator;\n  private readonly textAreaTxt: Locator;\n  private readonly plusIconBtn: Locator;\n  private readonly enterTagTxt: Locator;\n  private readonly menuItemTree: Locator;\n  private readonly domainComboBox: Locator;\n  private readonly confirmToUnpublishBtn: Locator;\n  private readonly saveModalBtn: Locator;\n  private readonly documentTypeNode: Locator;\n  private readonly createDocumentBlueprintBtn: Locator;\n\n  constructor(page: Page) {\n    super(page);\n    this.contentNameTxt = page.locator('#name-input input');\n    this.saveAndPublishBtn = page.getByLabel('Save And Publish');\n    this.actionsBtn = page.getByLabel('Actions', {exact: true});\n    this.publishBtn = page.getByLabel('Publish', {exact: true});\n    this.unpublishBtn = page.getByLabel('Unpublish', {exact: true});\n    this.actionMenuForContentBtn = page.locator('#header [label=\"Open actions menu\"]');\n    this.openedModal = page.locator('uui-modal-container[backdrop]');\n    this.textstringTxt = page.locator('umb-property-editor-ui-text-box #input');\n    this.reloadChildrenThreeDotsBtn = page.getByRole('button', {name: 'Reload children...'});\n    this.contentTree = page.locator('umb-tree[alias=\"Umb.Tree.Document\"]');\n    this.richTextAreaTxt = page.frameLocator('iframe[title=\"Rich Text Area\"]').locator('#tinymce');\n    this.textAreaTxt = page.locator('umb-property-editor-ui-textarea textarea');\n    this.plusIconBtn = page.locator('#icon-add svg');\n    this.enterTagTxt = page.getByPlaceholder('Enter tag');\n    this.menuItemTree = page.locator('umb-menu-item-tree-default');\n    this.confirmToUnpublishBtn = page.locator('umb-document-unpublish-modal').getByLabel('Unpublish');\n    this.documentTypeNode = page.locator('uui-ref-node-document-type');\n    this.createDocumentBlueprintBtn = page.getByLabel('Create Document Blueprint');\n    // Info tab\n    this.infoTab = page.getByRole('tab', {name: 'Info'});\n    this.linkContent = page.locator('.link-content');\n    this.historyItems = page.locator('umb-history-item');\n    this.generalItem = page.locator('.general-item');\n    this.publicationStatus = this.generalItem.filter({hasText: 'Publication Status'}).locator('uui-tag');\n    this.createdDate = this.generalItem.filter({hasText: 'Created'}).locator('umb-localize-date');\n    this.editDocumentTypeBtn = this.generalItem.filter({hasText: 'Document Type'}).locator('#button');\n    this.addTemplateBtn = this.generalItem.filter({hasText: 'Template'}).locator('#button');\n    this.id = this.generalItem.filter({hasText: 'Id'}).locator('span');\n    // Culure and Hostname\n    this.cultureAndHostnamesBtn = page.getByLabel('Culture and Hostnames');\n    this.cultureLanguageDropdownBox = page.locator('[headline=\"Culture\"]').getByLabel('combobox-input');\n    this.addNewDomainBtn = page.getByLabel('Add new domain');\n    this.domainTxt = page.getByLabel('Domain', { exact: true });\n    this.domainLanguageDropdownBox = page.locator('[headline=\"Domains\"]').getByLabel('combobox-input');\n    this.deleteDomainBtn = page.locator('[headline=\"Domains\"] [name=\"icon-trash\"] svg');\n    this.domainComboBox = page.locator('#domains uui-combobox');\n    this.saveModalBtn = this.sidebarModal.getByLabel('Save', {exact: true});\n  }\n\n  async enterContentName(name: string) {\n    await expect(this.contentNameTxt).toBeVisible();\n    await this.contentNameTxt.clear();\n    await this.contentNameTxt.fill(name);\n  }\n\n  async clickSaveAndPublishButton() {\n    await this.saveAndPublishBtn.click();\n  }\n\n  async clickActionsButton() {\n    await this.actionsBtn.click();\n  }\n\n  async clickPublishButton() {\n    await this.publishBtn.click();\n  }\n\n  async clickUnpublishButton() {\n    await this.unpublishBtn.click();\n  }\n\n  async clickReloadChildrenThreeDotsButton() {\n    await this.reloadChildrenThreeDotsBtn.click();\n  }\n\n  async clickActionsMenuAtRoot() {\n    await this.actionMenuForContentBtn.click();\n  }\n\n  async openContent(contentName: string) {\n    await this.menuItemTree.getByText(contentName, {exact: true}).click();\n  }\n\n  async clickActionsMenuForContent(name: string) {\n    await this.clickActionsMenuForName(name);\n  }\n\n  async clickCaretButtonForContentName(name: string) {\n    await this.menuItemTree.filter({hasText: name}).last().locator('#caret-button').last().click();\n  }\n\n  async waitForModalVisible() {\n    await this.openedModal.waitFor({state: 'attached'});\n  }\n\n  async waitForModalHidden() {\n    await this.openedModal.waitFor({state: 'hidden'});\n  }\n\n  async enterTextstring(text: string) {\n    await this.textstringTxt.clear();\n    await this.textstringTxt.fill(text);\n  }\n\n  async doesContentTreeHaveName(contentName: string) {\n    await expect(this.contentTree).toContainText(contentName);\n  }\n\n  async enterRichTextArea(value: string) {\n    await expect(this.richTextAreaTxt).toBeVisible();\n    await this.richTextAreaTxt.fill(value);\n  }\n\n  async enterTextArea(value: string) {\n    await expect(this.textAreaTxt).toBeVisible();\n    await this.textAreaTxt.fill(value);\n  }\n\n  async addTags(tagName: string) {\n    await this.plusIconBtn.click();\n    await this.enterTagTxt.fill(tagName);\n    await this.enterTagTxt.press('Enter');\n  }\n\n  async addContentPicker(contentName: string) {\n    await this.clickChooseButton();\n    await this.sidebarModal.getByText(contentName).click();\n    await this.chooseModalBtn.click();\n  }\n\n  async clickConfirmToUnpublishButton() {\n    await this.confirmToUnpublishBtn.click();\n  }\n\n  async clickCreateDocumentBlueprintButton() {\n    await this.createDocumentBlueprintBtn.click();\n  }\n\n  // Info Tab\n  async clickInfoTab() {\n    await this.infoTab.click({force: true});\n  }\n\n  async doesLinkHaveText(text: string) {\n    await expect(this.linkContent).toHaveText(text);\n  }\n\n  async doesHistoryHaveText(text: string) {\n    await expect(this.historyItems).toHaveText(text);\n  }\n\n  async doesPublicationStatusHaveText(text: string) {\n    await expect(this.publicationStatus).toHaveText(text);\n  }\n\n  async doesCreatedDateHaveText(text: string) {\n    await expect(this.createdDate).toHaveText(text);\n  }\n\n  async doesIdHaveText(text: string) {\n    await expect(this.id).toHaveText(text);\n  }\n\n  async clickEditDocumentTypeButton() {\n    await this.editDocumentTypeBtn.click();\n  }\n\n  async clickAddTemplateButton() {\n    await this.addTemplateBtn.click();\n  }\n\n  async clickDocumentTypeByName(documentTypeName:string) {\n    await this.page.locator('uui-ref-node-document-type[name=\"' + documentTypeName + '\"]').click();\n  }\n\n  async clickTemplateByName(templateName:string) {\n    await this.page.locator('uui-ref-node[name=\"' + templateName + '\"]').click();\n  }\n\n  async isDocumentTypeModalVisible(documentTypeName: string) {\n    await expect(this.sidebarModal.locator('umb-document-type-workspace-editor [value=\"' + documentTypeName + '\"]')).toBeVisible();\n  }\n\n  async isTemplateModalVisible(templateName: string) {\n    await expect(this.sidebarModal.getByText(templateName)).toBeVisible();\n  }\n\n  async clickEditTemplateByName(templateName:string) {\n    await this.page.locator('uui-ref-node[name=\"' + templateName + '\"]').getByLabel('Choose').click();\n  }\n\n  async changeTemplate(oldTemplate: string, newTemplate: string) {\n    await this.clickEditTemplateByName(oldTemplate);\n    await this.sidebarModal.getByLabel(newTemplate).click();\n    await this.chooseModalBtn.click();\n  }\n\n  async isTemplateNameDisabled(templateName:string) {\n    await expect(this.sidebarModal.getByLabel(templateName)).toBeDisabled();\n  }\n\n  // Culture and Hostnames\n  async clickCultureAndHostnamesButton() {\n    await this.cultureAndHostnamesBtn.click();\n  }\n\n  async selectCultureLanguageOption(option: string) {\n    await this.cultureLanguageDropdownBox.click();\n    await this.page.getByText(option).click();\n  }\n\n  async selectDomainLanguageOption(option: string, index: number = 0) {\n    await this.domainLanguageDropdownBox.nth(index).click();\n    await this.domainComboBox.nth(index).getByText(option).click();\n  }\n\n  async clickAddNewDomainButton() {\n    await this.addNewDomainBtn.click();\n  }\n\n  async enterDomain(value: string, index: number = 0) {\n    await this.domainTxt.nth(index).clear();\n    await this.domainTxt.nth(index).fill(value);\n  }\n\n  async clickDeleteDomainButton() {\n    await this.deleteDomainBtn.first().click();\n  }\n\n  async clickSaveModalButton() {\n    await this.saveModalBtn.click();\n  }\n\n  async chooseDocumentType(documentTypeName: string) {\n    await this.documentTypeNode.filter({hasText: documentTypeName}).click();\n  }\n}\n"]}

package/dist/lib/helpers/DataTypeApiHelper.d.ts

@@ -2,29 +2,29 @@ import { ApiHelpers } from "./ApiHelpers";
 export declare class DataTypeApiHelper {
     api: ApiHelpers;
     constructor(api: ApiHelpers);
-    ensureNameNotExistsAtRoot(name: string): Promise<void | import("playwright-core").APIResponse | null>;
     get(id: string): Promise<any>;
-    getByNameAtRoot(name: string): Promise<any>;
-    create(name: string, propertyEditorAlias: string, values: {
+    create(name: string, editorAlias: string, values: {
         alias: string;
         value: string;
-    }[], parentId?: string, propertyEditorUiAlias?: string): Promise<string | undefined>;
+    }[], parentId?: string, editorUiAlias?: string, id?: string): Promise<string | undefined>;
     update(id: string, dataType: any): Promise<import("playwright-core").APIResponse>;
     delete(id: string): Promise<import("playwright-core").APIResponse>;
-    deleteByNameAtRoot(name: string): Promise<import("playwright-core").APIResponse | null>;
+    getAllAtRoot(): Promise<import("playwright-core").APIResponse>;
+    doesExist(id: string): Promise<boolean>;
     getItems(ids: string[]): Promise<any>;
-    getAllAtRoot(): Promise<any>;
-    exists(id: string): Promise<boolean>;
-    nameExistsAtRoot(name: string): Promise<boolean>;
+    getByName(name: string): Promise<any>;
+    ensureNameNotExists(name: string): Promise<import("playwright-core").APIResponse | null>;
+    doesNameExist(name: string): Promise<any>;
     moveToFolder(dataTypeId: string, folderId: string): Promise<import("playwright-core").APIResponse>;
     copyToFolder(dataTypeId: string, folderId: string): Promise<string | undefined>;
     getFolder(id: string): Promise<any>;
-    folderExists(id: string): Promise<boolean>;
-    getFolderByName(name: string): Promise<any>;
-    createFolder(name: string, parentId?: string): Promise<string | undefined>;
-    updateFolder(id: string, dataTypeFolder: any): Promise<import("playwright-core").APIResponse>;
+    createFolder(name: string, parentId?: string, id?: string): Promise<string | undefined>;
+    renameFolder(id: string, name: string): Promise<import("playwright-core").APIResponse>;
     deleteFolder(id: string): Promise<import("playwright-core").APIResponse>;
-    deleteFolderByName(name: string): Promise<import("playwright-core").APIResponse | null>;
+    doesFolderExist(id: string): Promise<boolean>;
     getChildren(id: string): Promise<any>;
-    recurseFolderChildren(id: string): Promise<void>;
+    private recurseDeleteChildren;
+    private recurseChildren;
+    save(dataType: any): Promise<string | undefined>;
+    createDateTypeDataType(name: string): Promise<string | undefined>;
 }

package/dist/lib/helpers/DataTypeApiHelper.js

@@ -1,81 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataTypeApiHelper = void 0;
+const json_models_builders_1 = require("@umbraco/json-models-builders");
 class DataTypeApiHelper {
     api;
     constructor(api) {
         this.api = api;
     }
-    async ensureNameNotExistsAtRoot(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.isFolder == false) {
-                    return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + sb.id);
-                }
-                else {
-                    if (sb.hasChildren == true) {
-                        return await this.recurseFolderChildren(sb.id);
-                    }
-                    else {
-                        return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + sb.id);
-                    }
-                }
-            }
-        }
-        return null;
-    }
     async get(id) {
         const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
-        const json = await response.json();
-        if (json !== null) {
-            return json;
-        }
-        return null;
-    }
-    async getByNameAtRoot(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.id !== null) {
-                    const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + sb.id);
-                    return response.json();
-                }
-            }
-        }
-        return null;
+        return await response.json();
     }
-    async create(name, propertyEditorAlias, values, parentId, propertyEditorUiAlias) {
+    async create(name, editorAlias, values, parentId, editorUiAlias, id) {
         const dataType = {
             "name": name,
-            "propertyEditorAlias": propertyEditorAlias,
-            "propertyEditorUiAlias": propertyEditorUiAlias,
+            "editorAlias": editorAlias,
+            "editorUiAlias": editorUiAlias,
             "values": values,
-            "parentId": parentId
+            "id": id,
+            "parent": parentId ? { "id": parentId } : null
         };
         const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type', dataType);
         // Returns the id of the created dataType
-        return response.headers().location.split("/").pop();
+        return response.headers().location.split("v1/data-type/").pop();
     }
     async update(id, dataType) {
-        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id, dataType);
+        const updateDataType = {
+            "name": dataType.name,
+            "editorAlias": dataType.editorAlias,
+            "editorUiAlias": dataType.editorUiAlias,
+            "values": dataType.values,
+        };
+        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id, updateDataType);
     }
     async delete(id) {
         return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
     }
-    async deleteByNameAtRoot(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.id !== null) {
-                    return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + sb.id);
-                }
-            }
-        }
-        return null;
+    async getAllAtRoot() {
+        return await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
+    }
+    async doesExist(id) {
+        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
+        return response.status() === 200;
     }
     async getItems(ids) {
         let idArray = 'id=' + ids[0];
@@ -84,124 +50,139 @@ class DataTypeApiHelper {
             idArray += '&id=' + ids[i];
         }
         const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/item?' + idArray);
-        const json = await response.json();
-        if (json !== null) {
-            return json;
-        }
-        return null;
+        return await response.json();
     }
-    async getAllAtRoot() {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        if (json !== null) {
-            return json;
+    async getByName(name) {
+        const rootDataTypes = await this.getAllAtRoot();
+        const jsonDataTypes = await rootDataTypes.json();
+        for (const dataType of jsonDataTypes.items) {
+            if (dataType.name === name) {
+                return this.get(dataType.id);
+            }
+            else if (dataType.isContainer || dataType.hasChildren) {
+                const result = await this.recurseChildren(name, dataType.id, false);
+                if (result) {
+                    return result;
+                }
+            }
         }
-        return null;
-    }
-    async exists(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
-        return response.status() === 200;
+        return false;
     }
-    async nameExistsAtRoot(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                return true;
+    async ensureNameNotExists(name) {
+        const rootDataTypes = await this.getAllAtRoot();
+        const jsonDataTypes = await rootDataTypes.json();
+        for (const dataType of jsonDataTypes.items) {
+            if (dataType.name === name) {
+                if (dataType.isFolder) {
+                    return await this.recurseDeleteChildren(dataType);
+                }
+                return await this.delete(dataType.id);
+            }
+            else if (dataType.hasChildren) {
+                await this.recurseChildren(name, dataType.id, true);
             }
         }
-        return false;
+        return null;
+    }
+    async doesNameExist(name) {
+        return await this.getByName(name);
     }
     async moveToFolder(dataTypeId, folderId) {
         const folderIdBody = {
-            "targetId": folderId
+            "target": { id: folderId }
         };
-        return await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + dataTypeId + '/move', folderIdBody);
+        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + dataTypeId + '/move', folderIdBody);
     }
     async copyToFolder(dataTypeId, folderId) {
         const folderIdBody = {
-            "targetId": folderId
+            "target": { id: folderId }
         };
         const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + dataTypeId + '/copy', folderIdBody);
         // Returns the id of the copied dataType
-        return response.headers().location.split("/").pop();
+        return response.headers().location.split("v1/data-type/").pop();
     }
     // FOLDER
     async getFolder(id) {
         const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
         return await response.json();
     }
-    async folderExists(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
-        return response.status() === 200;
-    }
-    async getFolderByName(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=true');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.id !== null) {
-                    const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + sb.id);
-                    return response.json();
-                }
-            }
-        }
-        return null;
-    }
-    async createFolder(name, parentId) {
+    async createFolder(name, parentId, id) {
         const folderData = {
             "name": name,
-            "parentId": parentId
+            "id": id,
+            "parent": parentId ? { "id": parentId } : null
         };
         const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder', folderData);
         // Returns the id of the created dataTypeFolder
-        return response.headers().location.split("/").pop();
+        return response.headers().location.split("v1/data-type/folder/").pop();
     }
-    async updateFolder(id, dataTypeFolder) {
-        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id, dataTypeFolder);
+    async renameFolder(id, name) {
+        const folderData = {
+            "name": name,
+        };
+        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id, folderData);
     }
     async deleteFolder(id) {
         return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
     }
-    async deleteFolderByName(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=true');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.id !== null) {
-                    return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + sb.id);
-                }
-            }
-        }
-        return null;
+    async doesFolderExist(id) {
+        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
+        return response.status() === 200;
     }
     async getChildren(id) {
         const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/children?parentId=' + id + '&skip=0&take=100&foldersOnly=false');
-        const json = await response.json();
-        if (json !== null) {
-            return json;
-        }
-        return null;
+        const items = await response.json();
+        return items.items;
     }
-    async recurseFolderChildren(id) {
-        const parentDataType = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/children?parentId=' + id + '&skip=0&take=10000');
-        const itemsJson = await parentDataType.json();
-        for (const child of itemsJson.items) {
-            if (child.path !== null) {
-                if (child.isFolder == true) {
-                    if (child.hasChildren == true) {
-                        await this.recurseFolderChildren(child.path);
-                    }
-                    else {
-                        await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + child.id);
+    async recurseDeleteChildren(dataFolder) {
+        if (!dataFolder.hasChildren) {
+            return await this.deleteFolder(dataFolder.id);
+        }
+        const items = await this.getChildren(dataFolder.id);
+        for (const child of items) {
+            if (child.hasChildren) {
+                await this.recurseDeleteChildren(child);
+            }
+            else if (child.isFolder) {
+                await this.deleteFolder(child.id);
+            }
+            else {
+                await this.delete(child.id);
+            }
+        }
+        return await this.deleteFolder(dataFolder.id);
+    }
+    async recurseChildren(name, id, toDelete) {
+        const items = await this.getChildren(id);
+        for (const child of items) {
+            if (child.name === name) {
+                if (!toDelete) {
+                    if (child.isFolder) {
+                        return await this.getFolder(child.id);
                     }
+                    return await this.get(child.id);
                 }
-                else {
-                    await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + child.id);
+                if (child.isFolder) {
+                    return await this.recurseDeleteChildren(child);
                 }
+                return await this.delete(child.id);
+            }
+            else if (child.hasChildren) {
+                return await this.recurseChildren(name, child.id, toDelete);
             }
         }
-        await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
+        return false;
+    }
+    async save(dataType) {
+        const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type', dataType);
+        return response.headers().location.split("v1/data-type/").pop();
+    }
+    async createDateTypeDataType(name) {
+        await this.ensureNameNotExists(name);
+        const dataType = new json_models_builders_1.DatePickerDataTypeBuilder()
+            .withName(name)
+            .build();
+        return await this.save(dataType);
     }
 }
 exports.DataTypeApiHelper = DataTypeApiHelper;