@umbraco/playwright-testhelpers 16.0.5 → 16.0.7

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

@@ -57,7 +57,7 @@ export declare class DataTypeApiHelper {
     createBlockGridWithLayoutStylesheet(blockGridName: string, stylesheetName: string): Promise<string | undefined>;
     createBlockGridWithAnAreaInABlock(blockGridName: string, contentElementTypeId: string, areaAlias?: string, createButtonLabel?: string, columnSpan?: number, rowSpan?: number, minAllowed?: number, maxAllowed?: number): Promise<string | undefined>;
     createBlockGridWithAnAreaInABlockWithAllowInAreas(blockGridName: string, contentElementTypeId: string, areaAlias?: string, allowInAreas?: boolean, createButtonLabel?: string, columnSpan?: number, rowSpan?: number, minAllowed?: number, maxAllowed?: number): Promise<string | undefined>;
-    createBlockGridWithAnAreaInABlockWithAllowInAreasAndASecondBlock(blockGridName: string, contentElementTypeId: string, secondContentElementTypeId: string, areaAlias?: string, allowInAreas?: boolean, createButtonLabel?: string, columnSpan?: number, rowSpan?: number, minAllowed?: number, maxAllowed?: number): Promise<string | undefined>;
+    createBlockGridWithAnAreaInABlockWithAllowInAreasAndASecondBlock(blockGridName: string, contentElementTypeId: string, secondContentElementTypeId: string, areaAlias?: string, allowInAreas?: boolean, createButtonLabel?: string, columnSpan?: number, rowSpan?: number, minAllowed?: number, maxAllowed?: number, secondBlockAllowAtRoot?: boolean, secondBlockAllowInAreas?: boolean): Promise<string | undefined>;
     createBlockGridWithAnAreaInABlockWithACreateLabel(blockGridName: string, contentElementTypeId: string, createButtonLabel?: string, areaAlias?: string): Promise<string | undefined>;
     createBlockGridWithAnAreaInABlockWithColumnSpanAndRowSpan(blockGridName: string, contentElementTypeId: string, columnSpan?: number, rowSpan?: number, areaAlias?: string, createButtonLabel?: string): Promise<string | undefined>;
     createBlockGridWithAnAreaInABlockWithMinAndMaxAllowed(blockGridName: string, contentElementTypeId: string, secondContentElementTypeId: string, minAllowed?: number, maxAllowed?: number, areaAlias?: string, createButtonLabel?: string): Promise<string | undefined>;
@@ -68,6 +68,7 @@ export declare class DataTypeApiHelper {
     createBlockGridWithPermissions(blockGridName: string, contentElementTypeId: string, toAllowInRoot?: boolean, toAllowInAreas?: boolean): Promise<string | undefined>;
     createBlockGridWithSizeOptions(blockGridName: string, contentElementTypeId: string, columnSpans?: number, minRowSpan?: number, maxRowSpan?: number): Promise<string | undefined>;
     createBlockGridWithABlockWithInlineEditingModeAndABlockWithAnArea(blockGridName: string, firstBlockElementTypeId: string, inlineEditing: boolean, secondBlockElementTypeId: string, areaAlias?: string): Promise<string | undefined>;
+    getBlockGridAreaKeyFromBlock(blockGridName: string, elementTypeKey: string, areaAlias: string): Promise<any>;
     doesBlockEditorContainBlocksWithContentTypeIds(blockEditorName: string, elementTypeIds: string[]): Promise<boolean>;
     doesBlockEditorContainBlocksWithSettingsTypeIds(blockEditorName: string, elementTypeIds: string[]): Promise<boolean>;
     isLiveEditingModeEnabledForBlockEditor(blockEditorName: string, enabled: boolean): Promise<boolean>;

package/dist/lib/helpers/DataTypeApiHelper.js

@@ -470,7 +470,7 @@ class DataTypeApiHelper {
             .build();
         return await this.save(blockGrid);
     }
-    async createBlockGridWithAnAreaInABlockWithAllowInAreasAndASecondBlock(blockGridName, contentElementTypeId, secondContentElementTypeId, areaAlias = 'area', allowInAreas = false, createButtonLabel = 'CreateLabel', columnSpan = 6, rowSpan = 1, minAllowed = 0, maxAllowed = 2) {
+    async createBlockGridWithAnAreaInABlockWithAllowInAreasAndASecondBlock(blockGridName, contentElementTypeId, secondContentElementTypeId, areaAlias = 'area', allowInAreas = false, createButtonLabel = 'CreateLabel', columnSpan = 6, rowSpan = 1, minAllowed = 0, maxAllowed = 2, secondBlockAllowAtRoot = true, secondBlockAllowInAreas = true) {
         await this.ensureNameNotExists(blockGridName);
         const blockGrid = new json_models_builders_1.BlockGridDataTypeBuilder()
             .withName(blockGridName)
@@ -489,7 +489,8 @@ class DataTypeApiHelper {
             .done()
             .addBlock()
             .withContentElementTypeKey(secondContentElementTypeId)
-            .withAllowInAreas(true)
+            .withAllowAtRoot(secondBlockAllowAtRoot)
+            .withAllowInAreas(secondBlockAllowInAreas)
             .done()
             .build();
         return await this.save(blockGrid);
@@ -606,6 +607,13 @@ class DataTypeApiHelper {
             .build();
         return await this.save(blockGrid);
     }
+    async getBlockGridAreaKeyFromBlock(blockGridName, elementTypeKey, areaAlias) {
+        const blockGrid = await this.getByName(blockGridName);
+        const blocksValue = blockGrid.values.find(value => value.alias === 'blocks');
+        const block = blocksValue.value.find(block => block.contentElementTypeKey === elementTypeKey);
+        const area = block.areas.find(area => area.alias === areaAlias);
+        return area.key;
+    }
     async doesBlockEditorContainBlocksWithContentTypeIds(blockEditorName, elementTypeIds) {
         if (!elementTypeIds || elementTypeIds.length === 0) {
             return false;