From 3488a7bd77dfab8a582160aee5fd04db3a167960 Mon Sep 17 00:00:00 2001 From: Dombrowski Date: Thu, 7 Sep 2023 13:34:10 +0200 Subject: [PATCH 01/13] Creation of AFF type UIPG --- file-formats/uipg/README.md | 5 + .../examples/(ui2)flp_demo_page.uipg.json | 229 +++++++++++++++++ .../uipg/type/zif_aff_uipg_v1.intf.abap | 167 ++++++++++++ .../uipg/type/zif_aff_uipg_v1.intf.json | 7 + file-formats/uipg/uipg-v1.json | 243 ++++++++++++++++++ 5 files changed, 651 insertions(+) create mode 100644 file-formats/uipg/README.md create mode 100644 file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json create mode 100644 file-formats/uipg/type/zif_aff_uipg_v1.intf.abap create mode 100644 file-formats/uipg/type/zif_aff_uipg_v1.intf.json create mode 100644 file-formats/uipg/uipg-v1.json diff --git a/file-formats/uipg/README.md b/file-formats/uipg/README.md new file mode 100644 index 000000000..9d703b7e7 --- /dev/null +++ b/file-formats/uipg/README.md @@ -0,0 +1,5 @@ +# UIPG File Format + +File | Cardinality | Definition | Schema | Example +:--- | :--- | :--- | :--- | :--- +`.uipg.json` | 1 | [`zif_aff_uipg_v1.intf.abap`](./type/zif_aff_uipg_v1.intf.abap) | [`uipg-v1.json`](./uipg-v1.json) | [/ui2/flp_demo_page.uipg.json](./examples//ui2/flp_demo_page.uipg.json) diff --git a/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json b/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json new file mode 100644 index 000000000..e1e3e8036 --- /dev/null +++ b/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json @@ -0,0 +1,229 @@ +{ + "formatVersion": "1", + "header": { + "description": "UI2 FLP Demo - Test Page", + "originalLanguage": "en" + }, + "generalInformation": { + "title": "UI2 FLP Demo - Test Page", + "description": "This page is used for testing the pages runtime" + }, + "sections": [ + { + "id": "id-1566210576050-45", + "title": "Custom & Dynamic Tiles", + "items": [ + { + "id": "00O2TIH53H32S6MBXW7CNI5UX", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_TILE_TYPES", + "tileId": "00O2TR99M0M2CG9A3QQQSRILN", + "tileDisplayFormat": "", + "tmCatalogType": "" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNIC6H", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", + "tileId": "00O2TIH53H34ATOKOBI78HSAT", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", + "tmId": "00O2TIH53H34ATOKOQK5LN79H" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNIII1", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_TILE_TYPES", + "tileId": "00O2TIH53H32KCRLQQ0N2LS33", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmId": "00O2TR99M0M2CFROG2SBFAVCC" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNIOTL", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_PAGE_COMPOSITION", + "tileId": "00O2TIH53H32S2V2L1LMYJKDQ", + "tileDisplayFormat": "", + "tmCatalogType": "" + } + } + ] + }, + { + "id": "id-1566214947284-79", + "title": "Navigation", + "items": [ + { + "id": "00O2TIH53H32S6MBXW7CNIV55", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", + "tileId": "00O2TIH53H34ATOKKYF3GFMV5", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", + "tmId": "00O2TIH53H34ATOKKOFCWT7Y7" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNJ1GP", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileId": "00O2TIRMU88BQCQ5RDZWPE3R1", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmId": "00O2TIRMU88BQCQ5BICIVK9D8" + } + } + ] + }, + { + "id": "id-1566215847905-200", + "title": "Empty Group 1" + }, + { + "id": "id-1566215854800-201", + "title": "Empty Group 2" + }, + { + "id": "id-1566214976737-80", + "title": "Application Dependencies", + "items": [ + { + "id": "00O2TIH53H32S6MBXW7CNJ7S9", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tileId": "00O2TR99M0M2FG8PAVERE5Y6X", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tmId": "00O2TR99M0M2FG8OPKFG65MAX" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNJE3T", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tileId": "00O2TR99M0M2FG8PJ7NM5WCX8", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tmId": "00O2TR99M0M2FG8OSDFPPKROS" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNJKFD", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tileId": "00O2TR99M0M46KL4UDA5UXC6W", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tmId": "00O2TR99M0M46KL4RJ04WN5YQ" + } + } + ] + }, + { + "id": "id-1566215082839-82", + "title": "App Personalization", + "items": [ + { + "id": "00O2TIH53H32S6MBXW7CNJQQX", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileId": "00O2TR99M0M2CFRLX119LRGXY", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmId": "00O2TR99M0M2CFRNRKRQZL88Y" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNJX2H", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileId": "00O2TR99M0M2CFRLX0DBYV1JA", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmId": "00O2TR99M0M2CFRNTOF27F8JP" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNK3E1", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileId": "00O2TR99M0M2CFRMNPODMDLFC", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmId": "00O2TR99M0M2CFRNVLK5FQ3NS" + } + } + ] + }, + { + "id": "id-1566215110400-83", + "title": "App State", + "items": [ + { + "id": "00O2TIH53H32S6MBXW7CNK9PL", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileId": "00O2TR99M0M2CFRMVU6Y78NGL", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmId": "00O2TR99M0M2CFROG2SBFAVCC" + } + } + ] + }, + { + "id": "id-1566215201774-84", + "title": "WDA & WebGUI", + "items": [ + { + "id": "00O2TIH53H32S6MBXW7CNKG15", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_WDA_GUI", + "tileId": "00O2TR99M0M42Q9E2AF196A2D", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_WDA_GUI", + "tmId": "00O2TR99M0M42Q9ELFP30JMOE" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNKMCP", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_WDA_GUI", + "tileId": "00O2TR99M0M2CG7HQSW9YW5N1", + "tileDisplayFormat": "", + "tmCatalogId": "/UI2/FLP_DEMO_WDA_GUI", + "tmId": "00O2TR99M0M2CG7HLUUA24E4K" + } + } + ] + }, + { + "id": "id-1566215863686-202", + "title": "URL Tiles", + "items": [ + { + "id": "00O2TIH53H32S6MBXW7CNKSO9", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_EXT_NAV", + "tileId": "00O2TR99M0M2CFA8A0PYWDCK8", + "tileDisplayFormat": "", + "tmCatalogType": "" + } + }, + { + "id": "00O2TIH53H32S6MBXW7CNKYZT", + "tileAssignment": { + "tileCatalogId": "/UI2/FLP_DEMO_DOCUMENTATION", + "tileId": "00O2TIH53H32S2V2VHIJ067MZ", + "tileDisplayFormat": "", + "tmCatalogType": "" + } + } + ] + } + ] +} diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap new file mode 100644 index 000000000..fed9be854 --- /dev/null +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -0,0 +1,167 @@ +interface zif_aff_uipg_v1 + public. + + types: + "!

General Information

+ "! General information + begin of ty_general_information, + "!

Title

+ "! Title of the page template + "! $required + title type zif_aff_types_v1=>ty_description_100, + "!

Description

+ "! Additional description + description type zif_aff_types_v1=>ty_description_100, + "!

Merge ID

+ "! Merge ID + merge_id type c length 35, + end of ty_general_information. + + "!

Catalog Type

+ "! Catalog type + "! $values {@link /ui2/zif_aff_uipg_v1:co_catalog_type} + "! $default {@link /ui2/if_afzif_aff_uipg_v1atalog_type.standard} + types ty_catalog_type type c length 3. + + constants: + "!

Catalog Type

+ "! catalog type + begin of co_catalog_type, + "!

Standard Catalog

+ "! Standard catalog + "! $enumValue 'CAT' + standard type ty_catalog_type value 'CAT', + end of co_catalog_type. + + "!

Tile Display Format

+ "! Tile display format + "! $values {@link /ui2/if_aff_uipzif_aff_uipg_v1isplay_format} + "! $default {@link /ui2/if_aff_uipg_v1.zif_aff_uipg_v1y_format.standard} + types ty_tile_display_format type c length 2. + + constants: + "!

Tile Display Format

+ "! Tile display format + begin of co_tile_display_format, + "!

Standard Tile

+ "! Standard tile + "! $enumValue 'TI' + standard type ty_tile_display_format value 'TI', + "!

Wide Tile

+ "! Wide tile + "! $enumValue 'TW' + wide type ty_tile_display_format value 'TW', + "!

Flat Tile

+ "! Flat tile + "! $enumValue 'FT' + flat type ty_tile_display_format value 'FT', + "!

Flat Wide

+ "! Flat wide + "! $enumValue 'FW' + flat_wide type ty_tile_display_format value 'FW', + "!

Link

+ "! link + "! $enumValue 'LK' + link type ty_tile_display_format value 'LK', + end of co_tile_display_format. + + types: + "!

Page Section

+ "! Page Section + begin of ty_tile_assignment, + "!

Tile Catalog Id

+ "! Tile catalog id + tile_catalog_id type c length 35, + "!

Tile Catalog Type

+ "! Tile catalog type + tile_catalog_type type ty_catalog_type, + "!

Tile Id

+ "! Tile id + tile_id type c length 50, + "!

Tile Display Format

+ "! tile display format + tile_display_format type ty_tile_display_format, + "!

Target Mapping Catalog Id

+ "! Target Mapping catalog id + tm_catalog_id type c length 35, + "!

Target Mapping Catalog Type

+ "! Target Mapping catalog type + tm_catalog_type type ty_catalog_type, + "!

Target Mapping Id

+ "! Target Mapping id + tm_id type c length 50, + end of ty_tile_assignment. + + "!

Item Assignment Type

+ "! Item assignment type + "! $values {@link /ui2/if_aff_uipg_v1.data:zif_aff_uipg_v1$default {@link /ui2/if_aff_uipg_v1.data:co_itzif_aff_uipg_v1es ty_item_type type c length 2. + + constants: + "!

Item Assignment Type

+ "! Item assignment type + begin of co_item_type, + "!

Tile

+ "! Tile + "! $enumValue 'TI' + tile type ty_item_type value 'TI', + end of co_item_type. + + types: + "!

Page Section Item Assignment

+ "! Page Section Item Assignment + begin of ty_item, + "!

ID

+ "! Id of the Assignment + id type c length 35, + "!

Type

+ "! Type of the Assignment + type type ty_item_type, + "!

ID

+ "! Id of the Page Section + tile_assignment type ty_tile_assignment, + end of ty_item, + + ty_items type standard table of ty_item with default key. " TODO do we need an index property or can we rely on the order of the table? + + types: + "!

Page Section

+ "! Page Section + begin of ty_section, + "!

ID

+ "! Id of the Page Section + id type c length 35, + "!

Title

+ "! Section title + title type c length 100, + "!

Items

+ "! Assigned Page Section Items + items type ty_items, + end of ty_section, + + ty_sections type standard table of ty_section with default key. " TODO do we need an index property or can we rely on the order of the table? + + types: + "!

Fiori Launchpad Page Template

+ "! Fiori launchpad page template + begin of ty_main, + "!

Format Version

+ "! Format version + "! $required + format_version type zif_aff_types_v1=>ty_format_version, + + "!

Header

+ "! Header + "! $required + header type zif_aff_types_v1=>ty_header_100_cloud, + + "!

General Information

+ "! General information + "! $required + general_information type ty_general_information, + + "!

Page Templates

+ "! Assigned SAP Fiori launchpad page templates + sections type ty_sections, + end of ty_main. + +endinterface. diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.json b/file-formats/uipg/type/zif_aff_uipg_v1.intf.json new file mode 100644 index 000000000..6b4f2c4d4 --- /dev/null +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.json @@ -0,0 +1,7 @@ +{ + "formatVersion": "1", + "header": { + "description": "Page Template: AFF Type v.1", + "originalLanguage": "en" + } +} diff --git a/file-formats/uipg/uipg-v1.json b/file-formats/uipg/uipg-v1.json new file mode 100644 index 000000000..5dd304763 --- /dev/null +++ b/file-formats/uipg/uipg-v1.json @@ -0,0 +1,243 @@ +{ + "$comment": "This file is autogenerated, do not edit manually, see https://github.com/SAP/abap-file-formats for more information.", + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/SAP/abap-file-formats/blob/main/file-formats/uipg/uipg-v1.json", + "title": "Fiori Launchpad Page Template", + "description": "Fiori launchpad page template", + "type": "object", + "properties": { + "formatVersion": { + "title": "Format Version", + "description": "Format version", + "type": "string", + "const": "1" + }, + "header": { + "title": "Header", + "description": "Header", + "type": "object", + "properties": { + "description": { + "title": "Description", + "description": "Description of the ABAP object", + "type": "string", + "maxLength": 100 + }, + "originalLanguage": { + "title": "Original Language", + "description": "Original language of the ABAP object", + "type": "string", + "minLength": 2, + "maxLength": 2, + "pattern": "^[a-z]+$" + }, + "abapLanguageVersion": { + "title": "ABAP Language Version", + "description": "ABAP language version", + "type": "string", + "enum": [ + "standard", + "cloudDevelopment" + ], + "enumTitles": [ + "Standard", + "ABAP Cloud Development" + ], + "enumDescriptions": [ + "Standard", + "ABAP cloud development" + ], + "default": "standard" + } + }, + "additionalProperties": false, + "required": [ + "description", + "originalLanguage" + ] + }, + "generalInformation": { + "title": "General Information", + "description": "General information", + "type": "object", + "properties": { + "title": { + "title": "Title", + "description": "Title of the page template", + "type": "string", + "maxLength": 100 + }, + "description": { + "title": "Description", + "description": "Additional description", + "type": "string", + "maxLength": 100 + }, + "mergeId": { + "title": "Merge ID", + "description": "Merge ID", + "type": "string", + "maxLength": 35 + } + }, + "additionalProperties": false, + "required": [ + "title" + ] + }, + "sections": { + "title": "Page Sections", + "description": "Sections of the Page Template", + "type": "array", + "items": { + "title": "Page Section", + "description": "Page Section", + "type": "object", + "properties": { + "id": { + "title": "ID", + "description": "Id of the Page Section", + "type": "string", + "maxLength": 35 + }, + "title": { + "title": "Title", + "description": "Section title", + "type": "string", + "maxLength": 100 + }, + "items": { + "title": "Items", + "description": "Assigned Page Section Items", + "type": "array", + "items": { + "title": "Page Section Item Assignment", + "description": "Page Section Item Assignment", + "type": "object", + "properties": { + "id": { + "title": "ID", + "description": "Id of the Assignment", + "type": "string", + "maxLength": 35 + }, + "type": { + "title": "Type", + "description": "Type of the Assignment", + "type": "string", + "enum": [ + "TI" + ], + "enumTitles": [ + "Tile" + ], + "enumDescriptions": [ + "Tile" + ], + "default": "TI" + }, + "tileAssignment": { + "title": "ID", + "description": "Id of the Page Section", + "type": "object", + "properties": { + "tileCatalogId": { + "title": "Tile Catalog Id", + "description": "Tile catalog id", + "type": "string", + "maxLength": 35 + }, + "tileCatalogType": { + "title": "Tile Catalog Type", + "description": "Tile catalog type", + "type": "string", + "enum": [ + "CAT" + ], + "enumTitles": [ + "Standard Catalog" + ], + "enumDescriptions": [ + "Standard catalog" + ], + "default": "CAT" + }, + "tileId": { + "title": "Tile Id", + "description": "Tile id", + "type": "string", + "maxLength": 50 + }, + "tileDisplayFormat": { + "title": "Tile Display Format", + "description": "tile display format", + "type": "string", + "enum": [ + "TI", + "TW", + "FT", + "FW", + "LK" + ], + "enumTitles": [ + "Standard Tile", + "Wide Tile", + "Flat Tile", + "Flat Wide", + "Link" + ], + "enumDescriptions": [ + "Standard tile", + "Wide tile", + "Flat tile", + "Flat wide", + "link" + ], + "default": "TI" + }, + "tmCatalogId": { + "title": "Target Mapping Catalog Id", + "description": "Target Mapping catalog id", + "type": "string", + "maxLength": 35 + }, + "tmCatalogType": { + "title": "Target Mapping Catalog Type", + "description": "Target Mapping catalog type", + "type": "string", + "enum": [ + "CAT" + ], + "enumTitles": [ + "Standard Catalog" + ], + "enumDescriptions": [ + "Standard catalog" + ], + "default": "CAT" + }, + "tmId": { + "title": "Target Mapping Id", + "description": "Target Mapping id", + "type": "string", + "maxLength": 50 + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + } + } + }, + "additionalProperties": false + } + } + }, + "additionalProperties": false, + "required": [ + "formatVersion", + "header", + "generalInformation" + ] +} From 828b58b2f883bcecb3cb41d9d86371d5e83f3134 Mon Sep 17 00:00:00 2001 From: Dombrowski Date: Thu, 7 Sep 2023 13:45:40 +0200 Subject: [PATCH 02/13] Run ABAP cleaner on Interface --- .../uipg/type/zif_aff_uipg_v1.intf.abap | 122 +++++++++--------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index fed9be854..a5832ccd9 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -1,167 +1,167 @@ -interface zif_aff_uipg_v1 - public. +INTERFACE zif_aff_uipg_v1 + PUBLIC. - types: + TYPES: "!

General Information

"! General information - begin of ty_general_information, + BEGIN OF ty_general_information, "!

Title

"! Title of the page template "! $required - title type zif_aff_types_v1=>ty_description_100, + title TYPE zif_aff_types_v1=>ty_description_100, "!

Description

"! Additional description - description type zif_aff_types_v1=>ty_description_100, + description TYPE zif_aff_types_v1=>ty_description_100, "!

Merge ID

"! Merge ID - merge_id type c length 35, - end of ty_general_information. + merge_id TYPE c LENGTH 35, + END OF ty_general_information. "!

Catalog Type

"! Catalog type "! $values {@link /ui2/zif_aff_uipg_v1:co_catalog_type} "! $default {@link /ui2/if_afzif_aff_uipg_v1atalog_type.standard} - types ty_catalog_type type c length 3. + TYPES ty_catalog_type TYPE c LENGTH 3. - constants: + CONSTANTS: "!

Catalog Type

"! catalog type - begin of co_catalog_type, + BEGIN OF co_catalog_type, "!

Standard Catalog

"! Standard catalog "! $enumValue 'CAT' - standard type ty_catalog_type value 'CAT', - end of co_catalog_type. + standard TYPE ty_catalog_type VALUE 'CAT', + END OF co_catalog_type. "!

Tile Display Format

"! Tile display format "! $values {@link /ui2/if_aff_uipzif_aff_uipg_v1isplay_format} "! $default {@link /ui2/if_aff_uipg_v1.zif_aff_uipg_v1y_format.standard} - types ty_tile_display_format type c length 2. + TYPES ty_tile_display_format TYPE c LENGTH 2. - constants: + CONSTANTS: "!

Tile Display Format

"! Tile display format - begin of co_tile_display_format, + BEGIN OF co_tile_display_format, "!

Standard Tile

"! Standard tile "! $enumValue 'TI' - standard type ty_tile_display_format value 'TI', + standard TYPE ty_tile_display_format VALUE 'TI', "!

Wide Tile

"! Wide tile "! $enumValue 'TW' - wide type ty_tile_display_format value 'TW', + wide TYPE ty_tile_display_format VALUE 'TW', "!

Flat Tile

"! Flat tile "! $enumValue 'FT' - flat type ty_tile_display_format value 'FT', + flat TYPE ty_tile_display_format VALUE 'FT', "!

Flat Wide

"! Flat wide "! $enumValue 'FW' - flat_wide type ty_tile_display_format value 'FW', + flat_wide TYPE ty_tile_display_format VALUE 'FW', "!

Link

"! link "! $enumValue 'LK' - link type ty_tile_display_format value 'LK', - end of co_tile_display_format. + link TYPE ty_tile_display_format VALUE 'LK', + END OF co_tile_display_format. - types: + TYPES: "!

Page Section

"! Page Section - begin of ty_tile_assignment, + BEGIN OF ty_tile_assignment, "!

Tile Catalog Id

"! Tile catalog id - tile_catalog_id type c length 35, + tile_catalog_id TYPE c LENGTH 35, "!

Tile Catalog Type

"! Tile catalog type - tile_catalog_type type ty_catalog_type, + tile_catalog_type TYPE ty_catalog_type, "!

Tile Id

"! Tile id - tile_id type c length 50, + tile_id TYPE c LENGTH 50, "!

Tile Display Format

"! tile display format - tile_display_format type ty_tile_display_format, + tile_display_format TYPE ty_tile_display_format, "!

Target Mapping Catalog Id

"! Target Mapping catalog id - tm_catalog_id type c length 35, + tm_catalog_id TYPE c LENGTH 35, "!

Target Mapping Catalog Type

"! Target Mapping catalog type - tm_catalog_type type ty_catalog_type, + tm_catalog_type TYPE ty_catalog_type, "!

Target Mapping Id

"! Target Mapping id - tm_id type c length 50, - end of ty_tile_assignment. + tm_id TYPE c LENGTH 50, + END OF ty_tile_assignment. "!

Item Assignment Type

"! Item assignment type - "! $values {@link /ui2/if_aff_uipg_v1.data:zif_aff_uipg_v1$default {@link /ui2/if_aff_uipg_v1.data:co_itzif_aff_uipg_v1es ty_item_type type c length 2. + "! $values {@link /ui2/if_aff_uipg_v1.data:zif_aff_uipg_v1$default {@link /ui2/if_aff_uipg_v1.data:co_itzif_aff_uipg_v1ES ty_item_type TYPE c LENGTH 2. - constants: + CONSTANTS: "!

Item Assignment Type

"! Item assignment type - begin of co_item_type, + BEGIN OF co_item_type, "!

Tile

"! Tile "! $enumValue 'TI' - tile type ty_item_type value 'TI', - end of co_item_type. + tile TYPE ty_item_type VALUE 'TI', + END OF co_item_type. - types: + TYPES: "!

Page Section Item Assignment

"! Page Section Item Assignment - begin of ty_item, + BEGIN OF ty_item, "!

ID

"! Id of the Assignment - id type c length 35, + id TYPE c LENGTH 35, "!

Type

"! Type of the Assignment - type type ty_item_type, + type TYPE ty_item_type, "!

ID

"! Id of the Page Section - tile_assignment type ty_tile_assignment, - end of ty_item, + tile_assignment TYPE ty_tile_assignment, + END OF ty_item, - ty_items type standard table of ty_item with default key. " TODO do we need an index property or can we rely on the order of the table? + ty_items TYPE STANDARD TABLE OF ty_item WITH DEFAULT KEY. - types: + TYPES: "!

Page Section

"! Page Section - begin of ty_section, + BEGIN OF ty_section, "!

ID

"! Id of the Page Section - id type c length 35, + id TYPE c LENGTH 35, "!

Title

"! Section title - title type c length 100, + title TYPE c LENGTH 100, "!

Items

"! Assigned Page Section Items - items type ty_items, - end of ty_section, + items TYPE ty_items, + END OF ty_section, - ty_sections type standard table of ty_section with default key. " TODO do we need an index property or can we rely on the order of the table? + ty_sections TYPE STANDARD TABLE OF ty_section WITH DEFAULT KEY. - types: + TYPES: "!

Fiori Launchpad Page Template

"! Fiori launchpad page template - begin of ty_main, + BEGIN OF ty_main, "!

Format Version

"! Format version "! $required - format_version type zif_aff_types_v1=>ty_format_version, + format_version TYPE zif_aff_types_v1=>ty_format_version, "!

Header

"! Header "! $required - header type zif_aff_types_v1=>ty_header_100_cloud, + header TYPE zif_aff_types_v1=>ty_header_100_cloud, "!

General Information

"! General information "! $required - general_information type ty_general_information, + general_information TYPE ty_general_information, - "!

Page Templates

- "! Assigned SAP Fiori launchpad page templates - sections type ty_sections, - end of ty_main. + "!

Page Sections

+ "! Sections of the Page Template + sections TYPE ty_sections, + END OF ty_main. -endinterface. +ENDINTERFACE. From 2312f230f772043ee4f8e699c1e65157598e437f Mon Sep 17 00:00:00 2001 From: Dombrowski Date: Fri, 8 Sep 2023 09:54:41 +0200 Subject: [PATCH 03/13] Manual Adjustment to generated artifacts --- .../examples/(ui2)flp_demo_page.uipg.json | 59 +++++++++++-------- .../uipg/type/zif_aff_uipg_v1.intf.abap | 12 ++-- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json b/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json index e1e3e8036..f1df3f428 100644 --- a/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json +++ b/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json @@ -17,9 +17,8 @@ "id": "00O2TIH53H32S6MBXW7CNI5UX", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_TILE_TYPES", - "tileId": "00O2TR99M0M2CG9A3QQQSRILN", - "tileDisplayFormat": "", - "tmCatalogType": "" + "tileCatalogType": "CAT", + "tileId": "00O2TR99M0M2CG9A3QQQSRILN" } }, { @@ -27,8 +26,9 @@ "tileAssignment": { "tileCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", "tileId": "00O2TIH53H34ATOKOBI78HSAT", - "tileDisplayFormat": "", + "tileCatalogType": "CAT", "tmCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", + "tmCatalogType": "CAT", "tmId": "00O2TIH53H34ATOKOQK5LN79H" } }, @@ -36,9 +36,10 @@ "id": "00O2TIH53H32S6MBXW7CNIII1", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_TILE_TYPES", + "tileCatalogType": "CAT", "tileId": "00O2TIH53H32KCRLQQ0N2LS33", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M2CFROG2SBFAVCC" } }, @@ -46,9 +47,8 @@ "id": "00O2TIH53H32S6MBXW7CNIOTL", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_PAGE_COMPOSITION", - "tileId": "00O2TIH53H32S2V2L1LMYJKDQ", - "tileDisplayFormat": "", - "tmCatalogType": "" + "tileCatalogType": "CAT", + "tileId": "00O2TIH53H32S2V2L1LMYJKDQ" } } ] @@ -61,9 +61,10 @@ "id": "00O2TIH53H32S6MBXW7CNIV55", "tileAssignment": { "tileCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", + "tileCatalogType": "CAT", "tileId": "00O2TIH53H34ATOKKYF3GFMV5", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", + "tmCatalogType": "CAT", "tmId": "00O2TIH53H34ATOKKOFCWT7Y7" } }, @@ -71,9 +72,10 @@ "id": "00O2TIH53H32S6MBXW7CNJ1GP", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileCatalogType": "CAT", "tileId": "00O2TIRMU88BQCQ5RDZWPE3R1", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmCatalogType": "CAT", "tmId": "00O2TIRMU88BQCQ5BICIVK9D8" } } @@ -95,9 +97,10 @@ "id": "00O2TIH53H32S6MBXW7CNJ7S9", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tileCatalogType": "CAT", "tileId": "00O2TR99M0M2FG8PAVERE5Y6X", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M2FG8OPKFG65MAX" } }, @@ -105,9 +108,10 @@ "id": "00O2TIH53H32S6MBXW7CNJE3T", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tileCatalogType": "CAT", "tileId": "00O2TR99M0M2FG8PJ7NM5WCX8", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M2FG8OSDFPPKROS" } }, @@ -115,9 +119,10 @@ "id": "00O2TIH53H32S6MBXW7CNJKFD", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tileCatalogType": "CAT", "tileId": "00O2TR99M0M46KL4UDA5UXC6W", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M46KL4RJ04WN5YQ" } } @@ -131,9 +136,10 @@ "id": "00O2TIH53H32S6MBXW7CNJQQX", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileCatalogType": "CAT", "tileId": "00O2TR99M0M2CFRLX119LRGXY", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M2CFRNRKRQZL88Y" } }, @@ -141,9 +147,10 @@ "id": "00O2TIH53H32S6MBXW7CNJX2H", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmCatalogType": "CAT", "tileId": "00O2TR99M0M2CFRLX0DBYV1JA", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M2CFRNTOF27F8JP" } }, @@ -151,9 +158,10 @@ "id": "00O2TIH53H32S6MBXW7CNK3E1", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmCatalogType": "CAT", "tileId": "00O2TR99M0M2CFRMNPODMDLFC", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileCatalogType": "CAT", "tmId": "00O2TR99M0M2CFRNVLK5FQ3NS" } } @@ -167,9 +175,10 @@ "id": "00O2TIH53H32S6MBXW7CNK9PL", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tileCatalogType": "CAT", "tileId": "00O2TR99M0M2CFRMVU6Y78NGL", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M2CFROG2SBFAVCC" } } @@ -183,9 +192,10 @@ "id": "00O2TIH53H32S6MBXW7CNKG15", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_WDA_GUI", + "tileCatalogType": "CAT", "tileId": "00O2TR99M0M42Q9E2AF196A2D", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_WDA_GUI", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M42Q9ELFP30JMOE" } }, @@ -193,9 +203,10 @@ "id": "00O2TIH53H32S6MBXW7CNKMCP", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_WDA_GUI", + "tileCatalogType": "CAT", "tileId": "00O2TR99M0M2CG7HQSW9YW5N1", - "tileDisplayFormat": "", "tmCatalogId": "/UI2/FLP_DEMO_WDA_GUI", + "tmCatalogType": "CAT", "tmId": "00O2TR99M0M2CG7HLUUA24E4K" } } @@ -209,18 +220,16 @@ "id": "00O2TIH53H32S6MBXW7CNKSO9", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_EXT_NAV", - "tileId": "00O2TR99M0M2CFA8A0PYWDCK8", - "tileDisplayFormat": "", - "tmCatalogType": "" + "tileCatalogType": "CAT", + "tileId": "00O2TR99M0M2CFA8A0PYWDCK8" } }, { "id": "00O2TIH53H32S6MBXW7CNKYZT", "tileAssignment": { "tileCatalogId": "/UI2/FLP_DEMO_DOCUMENTATION", - "tileId": "00O2TIH53H32S2V2VHIJ067MZ", - "tileDisplayFormat": "", - "tmCatalogType": "" + "tileCatalogType": "CAT", + "tileId": "00O2TIH53H32S2V2VHIJ067MZ" } } ] diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index a5832ccd9..00fe5f45a 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -19,8 +19,8 @@ INTERFACE zif_aff_uipg_v1 "!

Catalog Type

"! Catalog type - "! $values {@link /ui2/zif_aff_uipg_v1:co_catalog_type} - "! $default {@link /ui2/if_afzif_aff_uipg_v1atalog_type.standard} + "! $values {@link zif_aff_uipg_v1.data:co_catalog_type} + "! $default {@link zif_aff_uipg_v1.data:co_catalog_type.standard} TYPES ty_catalog_type TYPE c LENGTH 3. CONSTANTS: @@ -35,8 +35,8 @@ INTERFACE zif_aff_uipg_v1 "!

Tile Display Format

"! Tile display format - "! $values {@link /ui2/if_aff_uipzif_aff_uipg_v1isplay_format} - "! $default {@link /ui2/if_aff_uipg_v1.zif_aff_uipg_v1y_format.standard} + "! $values {@link zif_aff_uipg_v1.data:co_tile_display_format} + "! $default {@link zif_aff_uipg_v1.data:co_tile_display_format.standard} TYPES ty_tile_display_format TYPE c LENGTH 2. CONSTANTS: @@ -94,7 +94,9 @@ INTERFACE zif_aff_uipg_v1 "!

Item Assignment Type

"! Item assignment type - "! $values {@link /ui2/if_aff_uipg_v1.data:zif_aff_uipg_v1$default {@link /ui2/if_aff_uipg_v1.data:co_itzif_aff_uipg_v1ES ty_item_type TYPE c LENGTH 2. + "! $values {@link zif_aff_uipg_v1.data:co_item_type} + "! $default {@link zif_aff_uipg_v1.data:co_item_type.tile} + TYPES ty_item_type TYPE c LENGTH 2. CONSTANTS: "!

Item Assignment Type

From 781c558640cc761d9eb07cbb4421c5e613d07e5a Mon Sep 17 00:00:00 2001 From: Dombrowski Date: Fri, 8 Sep 2023 10:53:31 +0200 Subject: [PATCH 04/13] Manual Adjustment to generated README --- file-formats/uipg/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/uipg/README.md b/file-formats/uipg/README.md index 9d703b7e7..00a47584b 100644 --- a/file-formats/uipg/README.md +++ b/file-formats/uipg/README.md @@ -2,4 +2,4 @@ File | Cardinality | Definition | Schema | Example :--- | :--- | :--- | :--- | :--- -`.uipg.json` | 1 | [`zif_aff_uipg_v1.intf.abap`](./type/zif_aff_uipg_v1.intf.abap) | [`uipg-v1.json`](./uipg-v1.json) | [/ui2/flp_demo_page.uipg.json](./examples//ui2/flp_demo_page.uipg.json) +`.uipg.json` | 1 | [`zif_aff_uipg_v1.intf.abap`](./type/zif_aff_uipg_v1.intf.abap) | [`uipg-v1.json`](./uipg-v1.json) | [/ui2/flp_demo_page.uipg.json](./examples/(ui2)flp_demo_page.uipg.json) From ec8269cfe6d9df3f881d91586ef06df8ab36cd26 Mon Sep 17 00:00:00 2001 From: Helge Dombrowski Date: Fri, 8 Sep 2023 13:55:20 +0200 Subject: [PATCH 05/13] Update file-formats/uipg/README.md Co-authored-by: Albert Mink --- file-formats/uipg/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/uipg/README.md b/file-formats/uipg/README.md index 00a47584b..580ffce2e 100644 --- a/file-formats/uipg/README.md +++ b/file-formats/uipg/README.md @@ -2,4 +2,4 @@ File | Cardinality | Definition | Schema | Example :--- | :--- | :--- | :--- | :--- -`.uipg.json` | 1 | [`zif_aff_uipg_v1.intf.abap`](./type/zif_aff_uipg_v1.intf.abap) | [`uipg-v1.json`](./uipg-v1.json) | [/ui2/flp_demo_page.uipg.json](./examples/(ui2)flp_demo_page.uipg.json) +`.uipg.json` | 1 | [`zif_aff_uipg_v1.intf.abap`](./type/zif_aff_uipg_v1.intf.abap) | [`uipg-v1.json`](./uipg-v1.json) | [(ui2)flp_demo_page.uipg.json](./examples/(ui2)flp_demo_page.uipg.json) From 0445b91c67c39e0d8c9889b6bbe2235c687ab138 Mon Sep 17 00:00:00 2001 From: Dombrowski Date: Wed, 20 Sep 2023 09:46:26 +0200 Subject: [PATCH 06/13] Implemented Feedback, slight restructure, better example --- file-formats/uipg/README.md | 2 +- .../examples/(ui2)flp_demo_page.uipg.json | 238 ------------------ .../z_page_template_example.uipg.json | 173 +++++++++++++ .../uipg/type/zif_aff_uipg_v1.intf.abap | 156 +++++++----- file-formats/uipg/uipg-v1.json | 188 +++++++------- 5 files changed, 371 insertions(+), 386 deletions(-) delete mode 100644 file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json create mode 100644 file-formats/uipg/examples/z_page_template_example.uipg.json diff --git a/file-formats/uipg/README.md b/file-formats/uipg/README.md index 580ffce2e..0759a12eb 100644 --- a/file-formats/uipg/README.md +++ b/file-formats/uipg/README.md @@ -2,4 +2,4 @@ File | Cardinality | Definition | Schema | Example :--- | :--- | :--- | :--- | :--- -`.uipg.json` | 1 | [`zif_aff_uipg_v1.intf.abap`](./type/zif_aff_uipg_v1.intf.abap) | [`uipg-v1.json`](./uipg-v1.json) | [(ui2)flp_demo_page.uipg.json](./examples/(ui2)flp_demo_page.uipg.json) +`.uipg.json` | 1 | [`zif_aff_uipg_v1.intf.abap`](./type/zif_aff_uipg_v1.intf.abap) | [`uipg-v1.json`](./uipg-v1.json) | [z_page_template_example.uipg.json](./examples/z_page_template_example.uipg.json) diff --git a/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json b/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json deleted file mode 100644 index f1df3f428..000000000 --- a/file-formats/uipg/examples/(ui2)flp_demo_page.uipg.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "formatVersion": "1", - "header": { - "description": "UI2 FLP Demo - Test Page", - "originalLanguage": "en" - }, - "generalInformation": { - "title": "UI2 FLP Demo - Test Page", - "description": "This page is used for testing the pages runtime" - }, - "sections": [ - { - "id": "id-1566210576050-45", - "title": "Custom & Dynamic Tiles", - "items": [ - { - "id": "00O2TIH53H32S6MBXW7CNI5UX", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_TILE_TYPES", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M2CG9A3QQQSRILN" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNIC6H", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", - "tileId": "00O2TIH53H34ATOKOBI78HSAT", - "tileCatalogType": "CAT", - "tmCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", - "tmCatalogType": "CAT", - "tmId": "00O2TIH53H34ATOKOQK5LN79H" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNIII1", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_TILE_TYPES", - "tileCatalogType": "CAT", - "tileId": "00O2TIH53H32KCRLQQ0N2LS33", - "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M2CFROG2SBFAVCC" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNIOTL", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_PAGE_COMPOSITION", - "tileCatalogType": "CAT", - "tileId": "00O2TIH53H32S2V2L1LMYJKDQ" - } - } - ] - }, - { - "id": "id-1566214947284-79", - "title": "Navigation", - "items": [ - { - "id": "00O2TIH53H32S6MBXW7CNIV55", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", - "tileCatalogType": "CAT", - "tileId": "00O2TIH53H34ATOKKYF3GFMV5", - "tmCatalogId": "/UI2/FLP_AUTOTEST_CDM_BC_TEST", - "tmCatalogType": "CAT", - "tmId": "00O2TIH53H34ATOKKOFCWT7Y7" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNJ1GP", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tileCatalogType": "CAT", - "tileId": "00O2TIRMU88BQCQ5RDZWPE3R1", - "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tmCatalogType": "CAT", - "tmId": "00O2TIRMU88BQCQ5BICIVK9D8" - } - } - ] - }, - { - "id": "id-1566215847905-200", - "title": "Empty Group 1" - }, - { - "id": "id-1566215854800-201", - "title": "Empty Group 2" - }, - { - "id": "id-1566214976737-80", - "title": "Application Dependencies", - "items": [ - { - "id": "00O2TIH53H32S6MBXW7CNJ7S9", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M2FG8PAVERE5Y6X", - "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M2FG8OPKFG65MAX" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNJE3T", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M2FG8PJ7NM5WCX8", - "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M2FG8OSDFPPKROS" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNJKFD", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_AppDependencies", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M46KL4UDA5UXC6W", - "tmCatalogId": "/UI2/FLP_DEMO_AppDependencies", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M46KL4RJ04WN5YQ" - } - } - ] - }, - { - "id": "id-1566215082839-82", - "title": "App Personalization", - "items": [ - { - "id": "00O2TIH53H32S6MBXW7CNJQQX", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M2CFRLX119LRGXY", - "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M2CFRNRKRQZL88Y" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNJX2H", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tmCatalogType": "CAT", - "tileId": "00O2TR99M0M2CFRLX0DBYV1JA", - "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M2CFRNTOF27F8JP" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNK3E1", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tmCatalogType": "CAT", - "tileId": "00O2TR99M0M2CFRMNPODMDLFC", - "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tileCatalogType": "CAT", - "tmId": "00O2TR99M0M2CFRNVLK5FQ3NS" - } - } - ] - }, - { - "id": "id-1566215110400-83", - "title": "App State", - "items": [ - { - "id": "00O2TIH53H32S6MBXW7CNK9PL", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M2CFRMVU6Y78NGL", - "tmCatalogId": "/UI2/FLP_DEMO_SAMPLEAPPS_UI5DK", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M2CFROG2SBFAVCC" - } - } - ] - }, - { - "id": "id-1566215201774-84", - "title": "WDA & WebGUI", - "items": [ - { - "id": "00O2TIH53H32S6MBXW7CNKG15", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_WDA_GUI", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M42Q9E2AF196A2D", - "tmCatalogId": "/UI2/FLP_DEMO_WDA_GUI", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M42Q9ELFP30JMOE" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNKMCP", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_WDA_GUI", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M2CG7HQSW9YW5N1", - "tmCatalogId": "/UI2/FLP_DEMO_WDA_GUI", - "tmCatalogType": "CAT", - "tmId": "00O2TR99M0M2CG7HLUUA24E4K" - } - } - ] - }, - { - "id": "id-1566215863686-202", - "title": "URL Tiles", - "items": [ - { - "id": "00O2TIH53H32S6MBXW7CNKSO9", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_EXT_NAV", - "tileCatalogType": "CAT", - "tileId": "00O2TR99M0M2CFA8A0PYWDCK8" - } - }, - { - "id": "00O2TIH53H32S6MBXW7CNKYZT", - "tileAssignment": { - "tileCatalogId": "/UI2/FLP_DEMO_DOCUMENTATION", - "tileCatalogType": "CAT", - "tileId": "00O2TIH53H32S2V2VHIJ067MZ" - } - } - ] - } - ] -} diff --git a/file-formats/uipg/examples/z_page_template_example.uipg.json b/file-formats/uipg/examples/z_page_template_example.uipg.json new file mode 100644 index 000000000..69f248a96 --- /dev/null +++ b/file-formats/uipg/examples/z_page_template_example.uipg.json @@ -0,0 +1,173 @@ +{ + "formatVersion": "1", + "header": { + "description": "Example Page Template (DT Tool Text)", + "originalLanguage": "en" + }, + "generalInformation": { + "title": "Example Page Template (UI Text)", + "description": "Example Page Template (DT Tool Text)", + "mergeId": "MY_MERGE_ID" + }, + "sections": [ + { + "id": "3WO90XZ1DX19DA1UD5RDXQXWK", + "title": "Section with different Visualization Types", + "items": [ + { + "id": "3WO90XZ1DX19DA1UD5RDXR484", + "tileAssignment": { + "tile": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "ET091D7N8BTE6UTVXBOTFDTSI" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "00O2TIH53H32KGY1WZ7S7GIW7" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXRAJO", + "tileAssignment": { + "tileDisplayFormat": "wide", + "tile": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "ET091D7N8BTE6UTVXN0D4SAAA" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "00O2TIH53H32KGY1X6LIHYLK7" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXRGV8", + "tileAssignment": { + "tileDisplayFormat": "link", + "tile": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "ET091D7N8BTE6UTVXXJQ0WUMS" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "00O2TIH53H32KGY1XM291XX2K" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXRN6S", + "tileAssignment": { + "tileDisplayFormat": "flat", + "tile": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "00O2TIH53H32KGY1S7ERAGFW4" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "00O2TIH53H32KGY1YAF7047FX" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXRTIC", + "tileAssignment": { + "tileDisplayFormat": "flatWide", + "tile": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "00O2TIH53H32KGY1RXJY9FBSE" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_DEMO_BC1_TEST", + "id": "00O2TIH53H32KGY1Y1PQ8RMI5" + } + } + } + ] + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXRZTW", + "title": "FLP Admin Tools", + "items": [ + { + "id": "3WO90XZ1DX19DA1UD5RDXS65G", + "tileAssignment": { + "tile": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIOMXHVBRBTHD" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H346T2QI5EPLELE3" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXSCH0", + "tileAssignment": { + "tile": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIONHWO4YHTH5" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIONMZ9XWT1O2" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXSISK", + "tileAssignment": { + "tile": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIOMKX5GMY17I" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIOM1H7UJ5NAF" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXSP44", + "tileAssignment": { + "tile": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIOMMI1LGK335" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIOMB07TNAE0A" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXSVFO", + "tileAssignment": { + "tile": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIOMVN3GTU4T3" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIOLZSJGGN02U" + } + } + }, + { + "id": "3WO90XZ1DX19DA1UD5RDXT1R8", + "tileAssignment": { + "tile": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H32GIOMEYERS87LB" + }, + "targetMapping": { + "catalogId": "/UI2/FLP_ADMIN", + "id": "00O2TIH53H346T2QFF5AM9K93" + } + } + } + ] + } + ] +} diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index 00fe5f45a..f991ddfed 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -5,33 +5,28 @@ INTERFACE zif_aff_uipg_v1 "!

General Information

"! General information BEGIN OF ty_general_information, + "!

Title

- "! Title of the page template + "! Title visible to the enduser "! $required title TYPE zif_aff_types_v1=>ty_description_100, + "!

Description

- "! Additional description + "! Description for design-time tools + "! $required description TYPE zif_aff_types_v1=>ty_description_100, + "!

Merge ID

- "! Merge ID + "! Merge ID for merging during run-time merge_id TYPE c LENGTH 35, + END OF ty_general_information. + "!

Catalog Type

"! Catalog type - "! $values {@link zif_aff_uipg_v1.data:co_catalog_type} - "! $default {@link zif_aff_uipg_v1.data:co_catalog_type.standard} - TYPES ty_catalog_type TYPE c LENGTH 3. + TYPES ty_catalog_type TYPE c LENGTH 3. - CONSTANTS: - "!

Catalog Type

- "! catalog type - BEGIN OF co_catalog_type, - "!

Standard Catalog

- "! Standard catalog - "! $enumValue 'CAT' - standard TYPE ty_catalog_type VALUE 'CAT', - END OF co_catalog_type. "!

Tile Display Format

"! Tile display format @@ -39,113 +34,149 @@ INTERFACE zif_aff_uipg_v1 "! $default {@link zif_aff_uipg_v1.data:co_tile_display_format.standard} TYPES ty_tile_display_format TYPE c LENGTH 2. + CONSTANTS: "!

Tile Display Format

"! Tile display format BEGIN OF co_tile_display_format, + "!

Standard Tile

"! Standard tile - "! $enumValue 'TI' standard TYPE ty_tile_display_format VALUE 'TI', + "!

Wide Tile

"! Wide tile - "! $enumValue 'TW' wide TYPE ty_tile_display_format VALUE 'TW', + "!

Flat Tile

"! Flat tile - "! $enumValue 'FT' flat TYPE ty_tile_display_format VALUE 'FT', - "!

Flat Wide

- "! Flat wide - "! $enumValue 'FW' + + "!

Flat Wide Tile

+ "! Flat wide tile flat_wide TYPE ty_tile_display_format VALUE 'FW', + "!

Link

- "! link - "! $enumValue 'LK' + "! Link link TYPE ty_tile_display_format VALUE 'LK', + END OF co_tile_display_format. + + TYPES: + "!

Catalog Item Reference

+ "! Catalog item reference + BEGIN OF ts_catalog_item_reference, + + "!

Catalog ID

+ "! Catalog ID + "! $required + catalog_id TYPE c LENGTH 35, + + "!

Catalog Type

+ "! Catalog type + "! $default 'CAT' + catalog_type TYPE ty_catalog_type, + + "!

Item ID

+ "! Item ID + "! $required + id TYPE c LENGTH 50, + + END OF ts_catalog_item_reference. + + TYPES: - "!

Page Section

- "! Page Section + "!

Tile Assignment

+ "! Tile assignment BEGIN OF ty_tile_assignment, - "!

Tile Catalog Id

- "! Tile catalog id - tile_catalog_id TYPE c LENGTH 35, - "!

Tile Catalog Type

- "! Tile catalog type - tile_catalog_type TYPE ty_catalog_type, - "!

Tile Id

- "! Tile id - tile_id TYPE c LENGTH 50, + "!

Tile Display Format

- "! tile display format + "! Describes how the tile is rendered during run-time tile_display_format TYPE ty_tile_display_format, - "!

Target Mapping Catalog Id

- "! Target Mapping catalog id - tm_catalog_id TYPE c LENGTH 35, - "!

Target Mapping Catalog Type

- "! Target Mapping catalog type - tm_catalog_type TYPE ty_catalog_type, - "!

Target Mapping Id

- "! Target Mapping id - tm_id TYPE c LENGTH 50, + + "!

Tile Reference

+ "! Tile reference + "! $required + tile TYPE ts_catalog_item_reference, + + "!

Target Mapping Reference

+ "! Target mapping reference + target_mapping TYPE ts_catalog_item_reference, + END OF ty_tile_assignment. + "!

Item Assignment Type

"! Item assignment type "! $values {@link zif_aff_uipg_v1.data:co_item_type} "! $default {@link zif_aff_uipg_v1.data:co_item_type.tile} - TYPES ty_item_type TYPE c LENGTH 2. + TYPES ty_item_assignment_type TYPE c LENGTH 2. + CONSTANTS: "!

Item Assignment Type

"! Item assignment type BEGIN OF co_item_type, - "!

Tile

- "! Tile - "! $enumValue 'TI' - tile TYPE ty_item_type VALUE 'TI', + + "!

Tile Assignment

+ "! Tile assignment + tile TYPE ty_item_assignment_type VALUE 'TI', + END OF co_item_type. + TYPES: - "!

Page Section Item Assignment

- "! Page Section Item Assignment + "!

Section Item Assignment

+ "! section item assignment BEGIN OF ty_item, + "!

ID

- "! Id of the Assignment + "! Item ID + "! $required id TYPE c LENGTH 35, + "!

Type

- "! Type of the Assignment - type TYPE ty_item_type, - "!

ID

- "! Id of the Page Section + "! Item assignment type + type TYPE ty_item_assignment_type, + + "!

Tile Assignment Properties

+ "! tile assignment properties tile_assignment TYPE ty_tile_assignment, + END OF ty_item, ty_items TYPE STANDARD TABLE OF ty_item WITH DEFAULT KEY. + TYPES: - "!

Page Section

- "! Page Section + "!

Section

+ "! section BEGIN OF ty_section, + "!

ID

- "! Id of the Page Section + "! Section ID + "! $required id TYPE c LENGTH 35, + "!

Title

"! Section title title TYPE c LENGTH 100, + "!

Items

- "! Assigned Page Section Items + "! Section items items TYPE ty_items, + END OF ty_section, ty_sections TYPE STANDARD TABLE OF ty_section WITH DEFAULT KEY. + TYPES: "!

Fiori Launchpad Page Template

"! Fiori launchpad page template BEGIN OF ty_main, + "!

Format Version

"! Format version "! $required @@ -161,9 +192,10 @@ INTERFACE zif_aff_uipg_v1 "! $required general_information TYPE ty_general_information, - "!

Page Sections

- "! Sections of the Page Template + "!

Sections

+ "! sections sections TYPE ty_sections, + END OF ty_main. ENDINTERFACE. diff --git a/file-formats/uipg/uipg-v1.json b/file-formats/uipg/uipg-v1.json index 5dd304763..5d7947812 100644 --- a/file-formats/uipg/uipg-v1.json +++ b/file-formats/uipg/uipg-v1.json @@ -63,40 +63,41 @@ "properties": { "title": { "title": "Title", - "description": "Title of the page template", + "description": "Title visible to the enduser", "type": "string", "maxLength": 100 }, "description": { "title": "Description", - "description": "Additional description", + "description": "Description for design-time tools", "type": "string", "maxLength": 100 }, "mergeId": { "title": "Merge ID", - "description": "Merge ID", + "description": "Merge ID for merging during run-time", "type": "string", "maxLength": 35 } }, "additionalProperties": false, "required": [ - "title" + "title", + "description" ] }, "sections": { - "title": "Page Sections", - "description": "Sections of the Page Template", + "title": "Sections", + "description": "sections", "type": "array", "items": { - "title": "Page Section", - "description": "Page Section", + "title": "Section", + "description": "section", "type": "object", "properties": { "id": { "title": "ID", - "description": "Id of the Page Section", + "description": "Section ID", "type": "string", "maxLength": 35 }, @@ -108,129 +109,146 @@ }, "items": { "title": "Items", - "description": "Assigned Page Section Items", + "description": "Section items", "type": "array", "items": { - "title": "Page Section Item Assignment", - "description": "Page Section Item Assignment", + "title": "Section Item Assignment", + "description": "section item assignment", "type": "object", "properties": { "id": { "title": "ID", - "description": "Id of the Assignment", + "description": "Item ID", "type": "string", "maxLength": 35 }, "type": { "title": "Type", - "description": "Type of the Assignment", + "description": "Item assignment type", "type": "string", "enum": [ - "TI" + "tile" ], "enumTitles": [ - "Tile" + "Tile Assignment" ], "enumDescriptions": [ - "Tile" + "Tile assignment" ], - "default": "TI" + "default": "tile" }, "tileAssignment": { - "title": "ID", - "description": "Id of the Page Section", + "title": "Tile Assignment Properties", + "description": "tile assignment properties", "type": "object", "properties": { - "tileCatalogId": { - "title": "Tile Catalog Id", - "description": "Tile catalog id", - "type": "string", - "maxLength": 35 - }, - "tileCatalogType": { - "title": "Tile Catalog Type", - "description": "Tile catalog type", - "type": "string", - "enum": [ - "CAT" - ], - "enumTitles": [ - "Standard Catalog" - ], - "enumDescriptions": [ - "Standard catalog" - ], - "default": "CAT" - }, - "tileId": { - "title": "Tile Id", - "description": "Tile id", - "type": "string", - "maxLength": 50 - }, "tileDisplayFormat": { "title": "Tile Display Format", - "description": "tile display format", + "description": "Describes how the tile is rendered during run-time", "type": "string", "enum": [ - "TI", - "TW", - "FT", - "FW", - "LK" + "standard", + "wide", + "flat", + "flatWide", + "link" ], "enumTitles": [ "Standard Tile", "Wide Tile", "Flat Tile", - "Flat Wide", + "Flat Wide Tile", "Link" ], "enumDescriptions": [ "Standard tile", "Wide tile", "Flat tile", - "Flat wide", - "link" + "Flat wide tile", + "Link" ], - "default": "TI" + "default": "standard" }, - "tmCatalogId": { - "title": "Target Mapping Catalog Id", - "description": "Target Mapping catalog id", - "type": "string", - "maxLength": 35 + "tile": { + "title": "Tile Reference", + "description": "Tile reference", + "type": "object", + "properties": { + "catalogId": { + "title": "Catalog ID", + "description": "Catalog ID", + "type": "string", + "maxLength": 35 + }, + "catalogType": { + "title": "Catalog Type", + "description": "Catalog type", + "type": "string", + "maxLength": 3, + "default": "CAT" + }, + "id": { + "title": "Item ID", + "description": "Item ID", + "type": "string", + "maxLength": 50 + } + }, + "additionalProperties": false, + "required": [ + "catalogId", + "id" + ] }, - "tmCatalogType": { - "title": "Target Mapping Catalog Type", - "description": "Target Mapping catalog type", - "type": "string", - "enum": [ - "CAT" - ], - "enumTitles": [ - "Standard Catalog" - ], - "enumDescriptions": [ - "Standard catalog" - ], - "default": "CAT" - }, - "tmId": { - "title": "Target Mapping Id", - "description": "Target Mapping id", - "type": "string", - "maxLength": 50 + "targetMapping": { + "title": "Target Mapping Reference", + "description": "Target mapping reference", + "type": "object", + "properties": { + "catalogId": { + "title": "Catalog ID", + "description": "Catalog ID", + "type": "string", + "maxLength": 35 + }, + "catalogType": { + "title": "Catalog Type", + "description": "Catalog type", + "type": "string", + "maxLength": 3, + "default": "CAT" + }, + "id": { + "title": "Item ID", + "description": "Item ID", + "type": "string", + "maxLength": 50 + } + }, + "additionalProperties": false, + "required": [ + "catalogId", + "id" + ] } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "tile" + ] } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "id" + ] } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "id" + ] } } }, From e0e76feb77f69a6a54ea10df1c1687da723eb00f Mon Sep 17 00:00:00 2001 From: Dombrowski Date: Wed, 20 Sep 2023 09:53:24 +0200 Subject: [PATCH 07/13] ts_catalog_item_reference-->ty_catalog_item_reference --- file-formats/uipg/type/zif_aff_uipg_v1.intf.abap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index f991ddfed..56b62af8b 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -66,7 +66,7 @@ INTERFACE zif_aff_uipg_v1 TYPES: "!

Catalog Item Reference

"! Catalog item reference - BEGIN OF ts_catalog_item_reference, + BEGIN OF ty_catalog_item_reference, "!

Catalog ID

"! Catalog ID @@ -83,7 +83,7 @@ INTERFACE zif_aff_uipg_v1 "! $required id TYPE c LENGTH 50, - END OF ts_catalog_item_reference. + END OF ty_catalog_item_reference. TYPES: @@ -98,11 +98,11 @@ INTERFACE zif_aff_uipg_v1 "!

Tile Reference

"! Tile reference "! $required - tile TYPE ts_catalog_item_reference, + tile TYPE ty_catalog_item_reference, "!

Target Mapping Reference

"! Target mapping reference - target_mapping TYPE ts_catalog_item_reference, + target_mapping TYPE ty_catalog_item_reference, END OF ty_tile_assignment. From 5479f84e31628e5ff12f793fad91a5d4490d45b3 Mon Sep 17 00:00:00 2001 From: Dombrowski Date: Thu, 21 Sep 2023 15:58:28 +0200 Subject: [PATCH 08/13] simplified names more --- .../z_page_template_example.uipg.json | 52 +++++----- .../uipg/type/zif_aff_uipg_v1.intf.abap | 62 ++++++------ file-formats/uipg/uipg-v1.json | 96 +++++++++---------- 3 files changed, 105 insertions(+), 105 deletions(-) diff --git a/file-formats/uipg/examples/z_page_template_example.uipg.json b/file-formats/uipg/examples/z_page_template_example.uipg.json index 69f248a96..bfb86b742 100644 --- a/file-formats/uipg/examples/z_page_template_example.uipg.json +++ b/file-formats/uipg/examples/z_page_template_example.uipg.json @@ -17,11 +17,11 @@ { "id": "3WO90XZ1DX19DA1UD5RDXR484", "tileAssignment": { - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "ET091D7N8BTE6UTVXBOTFDTSI" }, - "targetMapping": { + "targetMappingKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "00O2TIH53H32KGY1WZ7S7GIW7" } @@ -30,12 +30,12 @@ { "id": "3WO90XZ1DX19DA1UD5RDXRAJO", "tileAssignment": { - "tileDisplayFormat": "wide", - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "ET091D7N8BTE6UTVXN0D4SAAA" }, - "targetMapping": { + "tileDisplayFormat": "wide", + "targetMappingKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "00O2TIH53H32KGY1X6LIHYLK7" } @@ -44,12 +44,12 @@ { "id": "3WO90XZ1DX19DA1UD5RDXRGV8", "tileAssignment": { - "tileDisplayFormat": "link", - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "ET091D7N8BTE6UTVXXJQ0WUMS" }, - "targetMapping": { + "tileDisplayFormat": "link", + "targetMappingKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "00O2TIH53H32KGY1XM291XX2K" } @@ -58,12 +58,12 @@ { "id": "3WO90XZ1DX19DA1UD5RDXRN6S", "tileAssignment": { - "tileDisplayFormat": "flat", - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "00O2TIH53H32KGY1S7ERAGFW4" }, - "targetMapping": { + "tileDisplayFormat": "flat", + "targetMappingKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "00O2TIH53H32KGY1YAF7047FX" } @@ -72,12 +72,12 @@ { "id": "3WO90XZ1DX19DA1UD5RDXRTIC", "tileAssignment": { - "tileDisplayFormat": "flatWide", - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "00O2TIH53H32KGY1RXJY9FBSE" }, - "targetMapping": { + "tileDisplayFormat": "flatWide", + "targetMappingKey": { "catalogId": "/UI2/FLP_DEMO_BC1_TEST", "id": "00O2TIH53H32KGY1Y1PQ8RMI5" } @@ -92,11 +92,11 @@ { "id": "3WO90XZ1DX19DA1UD5RDXS65G", "tileAssignment": { - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIOMXHVBRBTHD" }, - "targetMapping": { + "targetMappingKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H346T2QI5EPLELE3" } @@ -105,11 +105,11 @@ { "id": "3WO90XZ1DX19DA1UD5RDXSCH0", "tileAssignment": { - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIONHWO4YHTH5" }, - "targetMapping": { + "targetMappingKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIONMZ9XWT1O2" } @@ -118,11 +118,11 @@ { "id": "3WO90XZ1DX19DA1UD5RDXSISK", "tileAssignment": { - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIOMKX5GMY17I" }, - "targetMapping": { + "targetMappingKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIOM1H7UJ5NAF" } @@ -131,11 +131,11 @@ { "id": "3WO90XZ1DX19DA1UD5RDXSP44", "tileAssignment": { - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIOMMI1LGK335" }, - "targetMapping": { + "targetMappingKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIOMB07TNAE0A" } @@ -144,11 +144,11 @@ { "id": "3WO90XZ1DX19DA1UD5RDXSVFO", "tileAssignment": { - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIOMVN3GTU4T3" }, - "targetMapping": { + "targetMappingKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIOLZSJGGN02U" } @@ -157,11 +157,11 @@ { "id": "3WO90XZ1DX19DA1UD5RDXT1R8", "tileAssignment": { - "tile": { + "tileKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H32GIOMEYERS87LB" }, - "targetMapping": { + "targetMappingKey": { "catalogId": "/UI2/FLP_ADMIN", "id": "00O2TIH53H346T2QFF5AM9K93" } diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index 56b62af8b..c08e92942 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -64,9 +64,9 @@ INTERFACE zif_aff_uipg_v1 TYPES: - "!

Catalog Item Reference

- "! Catalog item reference - BEGIN OF ty_catalog_item_reference, + "!

Catalog Item Key

+ "! Catalog item key + BEGIN OF ty_catalog_item_key, "!

Catalog ID

"! Catalog ID @@ -78,12 +78,12 @@ INTERFACE zif_aff_uipg_v1 "! $default 'CAT' catalog_type TYPE ty_catalog_type, - "!

Item ID

- "! Item ID + "!

Catalog Item ID

+ "! Catalog Item ID "! $required id TYPE c LENGTH 50, - END OF ty_catalog_item_reference. + END OF ty_catalog_item_key. TYPES: @@ -91,57 +91,57 @@ INTERFACE zif_aff_uipg_v1 "! Tile assignment BEGIN OF ty_tile_assignment, + "!

Tile Key

+ "! Tile key + "! $required + tile_key TYPE ty_catalog_item_key, + "!

Tile Display Format

"! Describes how the tile is rendered during run-time tile_display_format TYPE ty_tile_display_format, - "!

Tile Reference

- "! Tile reference - "! $required - tile TYPE ty_catalog_item_reference, - - "!

Target Mapping Reference

- "! Target mapping reference - target_mapping TYPE ty_catalog_item_reference, + "!

Target Mapping Key

+ "! Target mapping key + target_mapping_key TYPE ty_catalog_item_key, END OF ty_tile_assignment. - "!

Item Assignment Type

- "! Item assignment type + "!

Item Type

+ "! Item type "! $values {@link zif_aff_uipg_v1.data:co_item_type} - "! $default {@link zif_aff_uipg_v1.data:co_item_type.tile} - TYPES ty_item_assignment_type TYPE c LENGTH 2. + "! $default {@link zif_aff_uipg_v1.data:co_item_type.tile_assignment} + TYPES ty_item_type TYPE c LENGTH 2. CONSTANTS: - "!

Item Assignment Type

- "! Item assignment type + "!

Item Type

+ "! Item type BEGIN OF co_item_type, "!

Tile Assignment

"! Tile assignment - tile TYPE ty_item_assignment_type VALUE 'TI', + tile_assignment TYPE ty_item_type VALUE 'TI', END OF co_item_type. TYPES: - "!

Section Item Assignment

- "! section item assignment + "!

Item

+ "! Item BEGIN OF ty_item, "!

ID

- "! Item ID + "! ID "! $required id TYPE c LENGTH 35, "!

Type

- "! Item assignment type - type TYPE ty_item_assignment_type, + "! type + type TYPE ty_item_type, - "!

Tile Assignment Properties

- "! tile assignment properties + "!

Tile Assignment

+ "! tile assignment tile_assignment TYPE ty_tile_assignment, END OF ty_item, @@ -155,16 +155,16 @@ INTERFACE zif_aff_uipg_v1 BEGIN OF ty_section, "!

ID

- "! Section ID + "! ID "! $required id TYPE c LENGTH 35, "!

Title

- "! Section title + "! Title title TYPE c LENGTH 100, "!

Items

- "! Section items + "! Items items TYPE ty_items, END OF ty_section, diff --git a/file-formats/uipg/uipg-v1.json b/file-formats/uipg/uipg-v1.json index 5d7947812..f570ee0e9 100644 --- a/file-formats/uipg/uipg-v1.json +++ b/file-formats/uipg/uipg-v1.json @@ -97,37 +97,37 @@ "properties": { "id": { "title": "ID", - "description": "Section ID", + "description": "ID", "type": "string", "maxLength": 35 }, "title": { "title": "Title", - "description": "Section title", + "description": "Title", "type": "string", "maxLength": 100 }, "items": { "title": "Items", - "description": "Section items", + "description": "Items", "type": "array", "items": { - "title": "Section Item Assignment", - "description": "section item assignment", + "title": "Item", + "description": "Item", "type": "object", "properties": { "id": { "title": "ID", - "description": "Item ID", + "description": "ID", "type": "string", "maxLength": 35 }, "type": { "title": "Type", - "description": "Item assignment type", + "description": "type", "type": "string", "enum": [ - "tile" + "tileAssignment" ], "enumTitles": [ "Tile Assignment" @@ -135,13 +135,44 @@ "enumDescriptions": [ "Tile assignment" ], - "default": "tile" + "default": "tileAssignment" }, "tileAssignment": { - "title": "Tile Assignment Properties", - "description": "tile assignment properties", + "title": "Tile Assignment", + "description": "tile assignment", "type": "object", "properties": { + "tileKey": { + "title": "Tile Key", + "description": "Tile key", + "type": "object", + "properties": { + "catalogId": { + "title": "Catalog ID", + "description": "Catalog ID", + "type": "string", + "maxLength": 35 + }, + "catalogType": { + "title": "Catalog Type", + "description": "Catalog type", + "type": "string", + "maxLength": 3, + "default": "CAT" + }, + "id": { + "title": "Catalog Item ID", + "description": "Catalog Item ID", + "type": "string", + "maxLength": 50 + } + }, + "additionalProperties": false, + "required": [ + "catalogId", + "id" + ] + }, "tileDisplayFormat": { "title": "Tile Display Format", "description": "Describes how the tile is rendered during run-time", @@ -169,40 +200,9 @@ ], "default": "standard" }, - "tile": { - "title": "Tile Reference", - "description": "Tile reference", - "type": "object", - "properties": { - "catalogId": { - "title": "Catalog ID", - "description": "Catalog ID", - "type": "string", - "maxLength": 35 - }, - "catalogType": { - "title": "Catalog Type", - "description": "Catalog type", - "type": "string", - "maxLength": 3, - "default": "CAT" - }, - "id": { - "title": "Item ID", - "description": "Item ID", - "type": "string", - "maxLength": 50 - } - }, - "additionalProperties": false, - "required": [ - "catalogId", - "id" - ] - }, - "targetMapping": { - "title": "Target Mapping Reference", - "description": "Target mapping reference", + "targetMappingKey": { + "title": "Target Mapping Key", + "description": "Target mapping key", "type": "object", "properties": { "catalogId": { @@ -219,8 +219,8 @@ "default": "CAT" }, "id": { - "title": "Item ID", - "description": "Item ID", + "title": "Catalog Item ID", + "description": "Catalog Item ID", "type": "string", "maxLength": 50 } @@ -234,7 +234,7 @@ }, "additionalProperties": false, "required": [ - "tile" + "tileKey" ] } }, From 5958948e2f7b936b87651f2e30e57094e848da3c Mon Sep 17 00:00:00 2001 From: Dombrowski Date: Fri, 22 Sep 2023 11:31:11 +0200 Subject: [PATCH 09/13] Why is there a redundant description? O.o --- .../uipg/examples/z_page_template_example.uipg.json | 1 - file-formats/uipg/type/zif_aff_uipg_v1.intf.abap | 5 ----- file-formats/uipg/uipg-v1.json | 9 +-------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/file-formats/uipg/examples/z_page_template_example.uipg.json b/file-formats/uipg/examples/z_page_template_example.uipg.json index bfb86b742..b0df64289 100644 --- a/file-formats/uipg/examples/z_page_template_example.uipg.json +++ b/file-formats/uipg/examples/z_page_template_example.uipg.json @@ -6,7 +6,6 @@ }, "generalInformation": { "title": "Example Page Template (UI Text)", - "description": "Example Page Template (DT Tool Text)", "mergeId": "MY_MERGE_ID" }, "sections": [ diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index c08e92942..84e0a00ac 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -11,11 +11,6 @@ INTERFACE zif_aff_uipg_v1 "! $required title TYPE zif_aff_types_v1=>ty_description_100, - "!

Description

- "! Description for design-time tools - "! $required - description TYPE zif_aff_types_v1=>ty_description_100, - "!

Merge ID

"! Merge ID for merging during run-time merge_id TYPE c LENGTH 35, diff --git a/file-formats/uipg/uipg-v1.json b/file-formats/uipg/uipg-v1.json index f570ee0e9..62a2bada8 100644 --- a/file-formats/uipg/uipg-v1.json +++ b/file-formats/uipg/uipg-v1.json @@ -67,12 +67,6 @@ "type": "string", "maxLength": 100 }, - "description": { - "title": "Description", - "description": "Description for design-time tools", - "type": "string", - "maxLength": 100 - }, "mergeId": { "title": "Merge ID", "description": "Merge ID for merging during run-time", @@ -82,8 +76,7 @@ }, "additionalProperties": false, "required": [ - "title", - "description" + "title" ] }, "sections": { From 80442b779a552cdc1ca545442e3c8e6af0014e18 Mon Sep 17 00:00:00 2001 From: Helge Dombrowski Date: Tue, 26 Sep 2023 15:38:32 +0200 Subject: [PATCH 10/13] Update file-formats/uipg/type/zif_aff_uipg_v1.intf.abap Co-authored-by: Michael Schneider --- file-formats/uipg/type/zif_aff_uipg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index 84e0a00ac..a6f6f76f3 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -188,7 +188,7 @@ INTERFACE zif_aff_uipg_v1 general_information TYPE ty_general_information, "!

Sections

- "! sections + "! Sections sections TYPE ty_sections, END OF ty_main. From 343b4c694b000fb31d2248af900f968310397b96 Mon Sep 17 00:00:00 2001 From: Helge Dombrowski Date: Tue, 26 Sep 2023 15:38:39 +0200 Subject: [PATCH 11/13] Update file-formats/uipg/type/zif_aff_uipg_v1.intf.abap Co-authored-by: Michael Schneider --- file-formats/uipg/type/zif_aff_uipg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index a6f6f76f3..610d2a600 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -136,7 +136,7 @@ INTERFACE zif_aff_uipg_v1 type TYPE ty_item_type, "!

Tile Assignment

- "! tile assignment + "! Tile assignment tile_assignment TYPE ty_tile_assignment, END OF ty_item, From 04935b3152a00a0a64700df6af3211fbfc4f2e84 Mon Sep 17 00:00:00 2001 From: Helge Dombrowski Date: Tue, 26 Sep 2023 15:38:47 +0200 Subject: [PATCH 12/13] Update file-formats/uipg/type/zif_aff_uipg_v1.intf.abap Co-authored-by: Michael Schneider --- file-formats/uipg/type/zif_aff_uipg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap index 610d2a600..c0f4d5a2e 100644 --- a/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap +++ b/file-formats/uipg/type/zif_aff_uipg_v1.intf.abap @@ -132,7 +132,7 @@ INTERFACE zif_aff_uipg_v1 id TYPE c LENGTH 35, "!

Type

- "! type + "! Type type TYPE ty_item_type, "!

Tile Assignment

From 477e18f5c28e634a034ee7ec8f4c04a16f806440 Mon Sep 17 00:00:00 2001 From: Katharina Wurz Date: Mon, 2 Oct 2023 08:28:57 +0200 Subject: [PATCH 13/13] Fix schema --- file-formats/uipg/uipg-v1.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/file-formats/uipg/uipg-v1.json b/file-formats/uipg/uipg-v1.json index 62a2bada8..b26339637 100644 --- a/file-formats/uipg/uipg-v1.json +++ b/file-formats/uipg/uipg-v1.json @@ -81,7 +81,7 @@ }, "sections": { "title": "Sections", - "description": "sections", + "description": "Sections", "type": "array", "items": { "title": "Section", @@ -117,7 +117,7 @@ }, "type": { "title": "Type", - "description": "type", + "description": "Type", "type": "string", "enum": [ "tileAssignment" @@ -132,7 +132,7 @@ }, "tileAssignment": { "title": "Tile Assignment", - "description": "tile assignment", + "description": "Tile assignment", "type": "object", "properties": { "tileKey": {