@sap/ux-specification 1.90.15 → 1.90.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (230) hide show
  1. package/CHANGELOG.md +99 -11
  2. package/dist/documentation/runDocu-min.js +1 -1
  3. package/dist/documentation/styleDocu.css +4 -5
  4. package/dist/documentation/v2/v2-AnalyticalListPage.html +1 -1
  5. package/dist/documentation/v2/v2-ApplicationV2.html +1 -1
  6. package/dist/documentation/v2/v2-ListReport.html +1 -1
  7. package/dist/documentation/v2/v2-ObjectPage.html +1 -1
  8. package/dist/documentation/v2/v2-OverviewPage.html +1 -1
  9. package/dist/documentation/v4/v4-AnalyticalListPage.html +1 -1
  10. package/dist/documentation/v4/v4-ApplicationV4.html +1 -1
  11. package/dist/documentation/v4/v4-ListReport.html +1 -1
  12. package/dist/documentation/v4/v4-ObjectPage.html +1 -1
  13. package/dist/index-min.js +1 -1
  14. package/dist/schemas/v2/AnalyticalListPageConfig.json +148 -40
  15. package/dist/schemas/v2/ListReportConfig.json +162 -32
  16. package/dist/schemas/v2/ObjectPageConfig.json +252 -56
  17. package/dist/schemas/v2/OverviewPageConfig.json +298 -196
  18. package/dist/schemas/v4/AnalyticalListPageConfig.json +46 -70
  19. package/dist/schemas/v4/ListReportConfig.json +46 -70
  20. package/dist/schemas/v4/ObjectPageConfig.json +49 -76
  21. package/dist/scripts/extractDocu.js +18 -8
  22. package/dist/scripts/extractDocu.js.map +1 -1
  23. package/dist/scripts/runDocu.js +105 -89
  24. package/dist/scripts/runDocu.js.map +1 -1
  25. package/dist/scripts/to-json-schema.js +31 -37
  26. package/dist/scripts/to-json-schema.js.map +1 -1
  27. package/dist/specification/v2/index-min.js +1 -1
  28. package/dist/specification/v4/index-min.js +1 -1
  29. package/dist/src/api.js +9 -9
  30. package/dist/src/api.js.map +1 -1
  31. package/dist/src/apiTypes.d.ts +5 -2
  32. package/dist/src/specification/schemaAccess.js +1 -3
  33. package/dist/src/specification/schemaAccess.js.map +1 -1
  34. package/dist/src/specification/v2/controls/Action.d.ts +71 -0
  35. package/dist/src/specification/v2/controls/{FormAction.js → Action.js} +1 -1
  36. package/dist/src/specification/v2/controls/Action.js.map +1 -0
  37. package/dist/src/specification/v2/controls/Card.d.ts +20 -72
  38. package/dist/src/specification/v2/controls/Card.js.map +1 -1
  39. package/dist/src/specification/v2/controls/FilterBar.d.ts +48 -6
  40. package/dist/src/specification/v2/controls/FilterBar.js +24 -0
  41. package/dist/src/specification/v2/controls/FilterBar.js.map +1 -1
  42. package/dist/src/specification/v2/controls/Footer.d.ts +20 -0
  43. package/dist/src/specification/v2/controls/{ObjectPageFooter.js → Footer.js} +1 -1
  44. package/dist/src/specification/v2/controls/Footer.js.map +1 -0
  45. package/dist/src/specification/v2/controls/ObjectPageForm.d.ts +1 -2
  46. package/dist/src/specification/v2/controls/ObjectPageHeader.d.ts +1 -1
  47. package/dist/src/specification/v2/controls/ObjectPageTable.d.ts +4 -0
  48. package/dist/src/specification/v2/controls/ObjectPageToolBar.d.ts +1 -5
  49. package/dist/src/specification/v2/controls/Table.d.ts +13 -10
  50. package/dist/src/specification/v2/controls/Table.js.map +1 -1
  51. package/dist/src/specification/v2/controls/ToolBar.d.ts +1 -8
  52. package/dist/src/specification/v2/controls/index.d.ts +8 -10
  53. package/dist/src/specification/v2/controls/index.js +2 -2
  54. package/dist/src/specification/v2/controls/index.js.map +1 -1
  55. package/dist/src/specification/v2/pages/AnalyticalListPageConfig.d.ts +2 -1
  56. package/dist/src/specification/v2/pages/ListReportConfig.d.ts +3 -2
  57. package/dist/src/specification/v4/controls/ObjectPageFooter.d.ts +2 -2
  58. package/dist/src/specification/v4/controls/ObjectPageSection.d.ts +7 -7
  59. package/dist/src/specification/v4/controls/ObjectPageTable.d.ts +5 -6
  60. package/dist/src/specification/v4/controls/Table.d.ts +3 -7
  61. package/dist/src/specification/v4/webapp/manifest/ManifestSettings.d.ts +51 -13
  62. package/dist/src/specification/v4/webapp/manifest/ManifestSettings.js +6 -0
  63. package/dist/src/specification/v4/webapp/manifest/ManifestSettings.js.map +1 -1
  64. package/dist/src/specification/v4/webapp/manifest/sapUiPageV4.d.ts +2 -1
  65. package/dist/src/specification/v4/webapp/manifest/sapUiPageV4.js.map +1 -1
  66. package/dist/src/sync/common/appProvider.js.map +1 -1
  67. package/dist/src/sync/common/decoration/control.d.ts +11 -1
  68. package/dist/src/sync/common/decoration/control.js +29 -3
  69. package/dist/src/sync/common/decoration/control.js.map +1 -1
  70. package/dist/src/sync/common/decoration/factory.js +2 -4
  71. package/dist/src/sync/common/decoration/factory.js.map +1 -1
  72. package/dist/src/sync/common/generate/index.d.ts +1 -0
  73. package/dist/src/sync/common/generate/index.js +1 -0
  74. package/dist/src/sync/common/generate/index.js.map +1 -1
  75. package/dist/src/sync/common/generate/objectPage.d.ts +8 -0
  76. package/dist/src/sync/common/generate/objectPage.js +28 -12
  77. package/dist/src/sync/common/generate/objectPage.js.map +1 -1
  78. package/dist/src/sync/common/generate/utils.d.ts +67 -0
  79. package/dist/src/sync/common/generate/utils.js +221 -0
  80. package/dist/src/sync/common/generate/utils.js.map +1 -0
  81. package/dist/src/sync/common/i18n.json +2 -0
  82. package/dist/src/sync/common/import/utils.d.ts +8 -1
  83. package/dist/src/sync/common/import/utils.js +14 -3
  84. package/dist/src/sync/common/import/utils.js.map +1 -1
  85. package/dist/src/sync/common/importProject.js +19 -28
  86. package/dist/src/sync/common/importProject.js.map +1 -1
  87. package/dist/src/sync/common/types.d.ts +29 -15
  88. package/dist/src/sync/common/types.js +25 -1
  89. package/dist/src/sync/common/types.js.map +1 -1
  90. package/dist/src/sync/common/utils.d.ts +6 -33
  91. package/dist/src/sync/common/utils.js +25 -131
  92. package/dist/src/sync/common/utils.js.map +1 -1
  93. package/dist/src/sync/v2/export/controls/Action.d.ts +29 -0
  94. package/dist/src/sync/v2/export/controls/Action.js +127 -0
  95. package/dist/src/sync/v2/export/controls/Action.js.map +1 -0
  96. package/dist/src/sync/v2/export/controls/Card.d.ts +3 -7
  97. package/dist/src/sync/v2/export/controls/Card.js +15 -43
  98. package/dist/src/sync/v2/export/controls/Card.js.map +1 -1
  99. package/dist/src/sync/v2/export/controls/FilterBar.d.ts +7 -3
  100. package/dist/src/sync/v2/export/controls/FilterBar.js +36 -22
  101. package/dist/src/sync/v2/export/controls/FilterBar.js.map +1 -1
  102. package/dist/src/sync/v2/export/controls/FormAction.js +3 -2
  103. package/dist/src/sync/v2/export/controls/FormAction.js.map +1 -1
  104. package/dist/src/sync/v2/export/controls/Fragment.d.ts +1 -1
  105. package/dist/src/sync/v2/export/controls/Fragment.js +244 -168
  106. package/dist/src/sync/v2/export/controls/Fragment.js.map +1 -1
  107. package/dist/src/sync/v2/export/controls/ObjectPageFooterAction.d.ts +9 -0
  108. package/dist/src/sync/v2/export/controls/ObjectPageFooterAction.js +62 -0
  109. package/dist/src/sync/v2/export/controls/ObjectPageFooterAction.js.map +1 -0
  110. package/dist/src/sync/v2/export/controls/ObjectPageHeaderAction.js +11 -29
  111. package/dist/src/sync/v2/export/controls/ObjectPageHeaderAction.js.map +1 -1
  112. package/dist/src/sync/v2/export/controls/ObjectPageSectionsV2.d.ts +2 -2
  113. package/dist/src/sync/v2/export/controls/ObjectPageSectionsV2.js +4 -4
  114. package/dist/src/sync/v2/export/controls/ObjectPageSectionsV2.js.map +1 -1
  115. package/dist/src/sync/v2/export/controls/ObjectPageTable.d.ts +3 -1
  116. package/dist/src/sync/v2/export/controls/ObjectPageTable.js +15 -0
  117. package/dist/src/sync/v2/export/controls/ObjectPageTable.js.map +1 -1
  118. package/dist/src/sync/v2/export/controls/ObjectPageToolBarAction.d.ts +9 -0
  119. package/dist/src/sync/v2/export/controls/ObjectPageToolBarAction.js +61 -0
  120. package/dist/src/sync/v2/export/controls/ObjectPageToolBarAction.js.map +1 -0
  121. package/dist/src/sync/v2/export/controls/Table.d.ts +4 -4
  122. package/dist/src/sync/v2/export/controls/Table.js +16 -21
  123. package/dist/src/sync/v2/export/controls/Table.js.map +1 -1
  124. package/dist/src/sync/v2/export/controls/TableColumn.d.ts +18 -2
  125. package/dist/src/sync/v2/export/controls/TableColumn.js +126 -1
  126. package/dist/src/sync/v2/export/controls/TableColumn.js.map +1 -1
  127. package/dist/src/sync/v2/export/controls/ToolBar.d.ts +4 -0
  128. package/dist/src/sync/v2/export/controls/ToolBar.js +6 -0
  129. package/dist/src/sync/v2/export/controls/ToolBar.js.map +1 -0
  130. package/dist/src/sync/v2/export/controls/index.d.ts +12 -8
  131. package/dist/src/sync/v2/export/controls/index.js +12 -8
  132. package/dist/src/sync/v2/export/controls/index.js.map +1 -1
  133. package/dist/src/sync/v2/export/export.js +134 -111
  134. package/dist/src/sync/v2/export/export.js.map +1 -1
  135. package/dist/src/sync/v2/export/exportPage.js +3 -2
  136. package/dist/src/sync/v2/export/exportPage.js.map +1 -1
  137. package/dist/src/sync/v2/export/manifest.js +2 -5
  138. package/dist/src/sync/v2/export/manifest.js.map +1 -1
  139. package/dist/src/sync/v2/export/pages/AnalyticalListPage.d.ts +2 -1
  140. package/dist/src/sync/v2/export/pages/AnalyticalListPage.js +3 -0
  141. package/dist/src/sync/v2/export/pages/AnalyticalListPage.js.map +1 -1
  142. package/dist/src/sync/v2/export/pages/ListReport.d.ts +3 -2
  143. package/dist/src/sync/v2/export/pages/ListReport.js +3 -0
  144. package/dist/src/sync/v2/export/pages/ListReport.js.map +1 -1
  145. package/dist/src/sync/v2/export/view-controller-generator.d.ts +16 -21
  146. package/dist/src/sync/v2/export/view-controller-generator.js +20 -36
  147. package/dist/src/sync/v2/export/view-controller-generator.js.map +1 -1
  148. package/dist/src/sync/v2/generate/analyticalListReport.js +16 -8
  149. package/dist/src/sync/v2/generate/analyticalListReport.js.map +1 -1
  150. package/dist/src/sync/v2/generate/listReport.d.ts +8 -0
  151. package/dist/src/sync/v2/generate/listReport.js +26 -6
  152. package/dist/src/sync/v2/generate/listReport.js.map +1 -1
  153. package/dist/src/sync/v2/generate/objectPage.d.ts +1 -6
  154. package/dist/src/sync/v2/generate/objectPage.js +208 -126
  155. package/dist/src/sync/v2/generate/objectPage.js.map +1 -1
  156. package/dist/src/sync/v2/generate/utils.d.ts +16 -12
  157. package/dist/src/sync/v2/generate/utils.js +235 -98
  158. package/dist/src/sync/v2/generate/utils.js.map +1 -1
  159. package/dist/src/sync/v2/import/common/index.d.ts +29 -4
  160. package/dist/src/sync/v2/import/common/index.js +330 -56
  161. package/dist/src/sync/v2/import/common/index.js.map +1 -1
  162. package/dist/src/sync/v2/import/controls/table.js +3 -2
  163. package/dist/src/sync/v2/import/controls/table.js.map +1 -1
  164. package/dist/src/sync/v2/import/pages/analyticalListPage.js +27 -5
  165. package/dist/src/sync/v2/import/pages/analyticalListPage.js.map +1 -1
  166. package/dist/src/sync/v2/import/pages/listReport.d.ts +0 -5
  167. package/dist/src/sync/v2/import/pages/listReport.js +21 -100
  168. package/dist/src/sync/v2/import/pages/listReport.js.map +1 -1
  169. package/dist/src/sync/v2/import/pages/objectPage.d.ts +1 -1
  170. package/dist/src/sync/v2/import/pages/objectPage.js +443 -303
  171. package/dist/src/sync/v2/import/pages/objectPage.js.map +1 -1
  172. package/dist/src/sync/v2/import/utils.d.ts +4 -6
  173. package/dist/src/sync/v2/import/utils.js +32 -11
  174. package/dist/src/sync/v2/import/utils.js.map +1 -1
  175. package/dist/src/sync/v2/types.d.ts +28 -2
  176. package/dist/src/sync/v2/types.js +14 -0
  177. package/dist/src/sync/v2/types.js.map +1 -1
  178. package/dist/src/sync/v4/export/controls/ObjectPageCustomSection.js +5 -1
  179. package/dist/src/sync/v4/export/controls/ObjectPageCustomSection.js.map +1 -1
  180. package/dist/src/sync/v4/export/controls/ObjectPageTable.js +2 -2
  181. package/dist/src/sync/v4/export/controls/ObjectPageTableColumn.d.ts +4 -7
  182. package/dist/src/sync/v4/export/controls/ObjectPageTableColumn.js +3 -33
  183. package/dist/src/sync/v4/export/controls/ObjectPageTableColumn.js.map +1 -1
  184. package/dist/src/sync/v4/export/controls/Table.js +1 -1
  185. package/dist/src/sync/v4/export/controls/TableColumn.d.ts +3 -6
  186. package/dist/src/sync/v4/export/controls/TableColumn.js +3 -33
  187. package/dist/src/sync/v4/export/controls/TableColumn.js.map +1 -1
  188. package/dist/src/sync/v4/export/controls/ToolBar.d.ts +5 -1
  189. package/dist/src/sync/v4/export/controls/ToolBar.js +3 -0
  190. package/dist/src/sync/v4/export/controls/ToolBar.js.map +1 -1
  191. package/dist/src/sync/v4/export/export.js +36 -25
  192. package/dist/src/sync/v4/export/export.js.map +1 -1
  193. package/dist/src/sync/v4/export/pages/AnalyticalListPage.d.ts +2 -2
  194. package/dist/src/sync/v4/export/pages/ListReport.d.ts +2 -2
  195. package/dist/src/sync/v4/export/pages/ObjectPage.d.ts +2 -2
  196. package/dist/src/sync/v4/export/types.d.ts +4 -0
  197. package/dist/src/sync/v4/generate/generate.d.ts +4 -2
  198. package/dist/src/sync/v4/generate/generate.js +15 -6
  199. package/dist/src/sync/v4/generate/generate.js.map +1 -1
  200. package/dist/src/sync/v4/generate/listReport.d.ts +9 -7
  201. package/dist/src/sync/v4/generate/listReport.js +93 -22
  202. package/dist/src/sync/v4/generate/listReport.js.map +1 -1
  203. package/dist/src/sync/v4/generate/objectPage.js +111 -81
  204. package/dist/src/sync/v4/generate/objectPage.js.map +1 -1
  205. package/dist/src/sync/v4/import/app/appProvider.js +2 -2
  206. package/dist/src/sync/v4/import/app/appProvider.js.map +1 -1
  207. package/dist/src/sync/v4/import/pages/analyticalListPage.d.ts +2 -2
  208. package/dist/src/sync/v4/import/pages/analyticalListPage.js +0 -1
  209. package/dist/src/sync/v4/import/pages/analyticalListPage.js.map +1 -1
  210. package/dist/src/sync/v4/import/pages/listReport.d.ts +4 -6
  211. package/dist/src/sync/v4/import/pages/listReport.js +57 -36
  212. package/dist/src/sync/v4/import/pages/listReport.js.map +1 -1
  213. package/dist/src/sync/v4/import/pages/objectPage.d.ts +2 -2
  214. package/dist/src/sync/v4/import/pages/objectPage.js +21 -18
  215. package/dist/src/sync/v4/import/pages/objectPage.js.map +1 -1
  216. package/dist/src/sync/v4/import/utils.js +6 -5
  217. package/dist/src/sync/v4/import/utils.js.map +1 -1
  218. package/dist/src/sync/v4/utils/utils.d.ts +15 -2
  219. package/dist/src/sync/v4/utils/utils.js +65 -26
  220. package/dist/src/sync/v4/utils/utils.js.map +1 -1
  221. package/dist/test/unit/utils.test.d.ts +1 -1
  222. package/package.json +11 -10
  223. package/dist/src/specification/v2/controls/FormAction.d.ts +0 -27
  224. package/dist/src/specification/v2/controls/FormAction.js.map +0 -1
  225. package/dist/src/specification/v2/controls/ObjectPageFooter.d.ts +0 -11
  226. package/dist/src/specification/v2/controls/ObjectPageFooter.js.map +0 -1
  227. package/dist/src/specification/v2/controls/ObjectPageHeaderAction.d.ts +0 -27
  228. package/dist/src/specification/v2/controls/ObjectPageHeaderAction.js +0 -3
  229. package/dist/src/specification/v2/controls/ObjectPageHeaderAction.js.map +0 -1
  230. package/dist/test/test-utils/metadataParser.d.ts +0 -19
@@ -12,23 +12,43 @@ const i18next_1 = __importDefault(require("i18next"));
12
12
  const extensionLogger_1 = require("../../../../extensionLogger");
13
13
  const factory_1 = require("../../export/factory");
14
14
  /**
15
- * Adds manifest settings to the config.json of LR or ALP V4
15
+ * Imports the content of annotation-based as well as custom columns
16
+ * @param {ListReportConfig | AnalyticalListPageConfig} config - the configuration to be filled
17
+ * @param {ImportListReportV4Parameters} importParameters - object comprising all input data
18
+ * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
19
+ * @param {PageTypeV4} pageType - page type
20
+ * @param {SapUiAppPageV4} page - page in manifest
21
+ */
22
+ function transferColumns(config, importParameters, factory, pageType, page) {
23
+ config.table.columns = {};
24
+ const lineItems = importParameters.jsonSchema['definitions']['LineItems'];
25
+ if (lineItems) {
26
+ for (const columnKey in lineItems.properties) {
27
+ const column = importParameters.jsonSchema['definitions']['LineItems'].properties[columnKey];
28
+ const schemaPropertyName = column.$ref.split(common_2.DEFINITION_LINK_PREFIX)[1];
29
+ config.table.columns[columnKey] = factory.createInstance(pageType, schemaPropertyName);
30
+ utils_1.transferSettingsOfObject(config.table.columns[columnKey], importParameters.manifest, importParameters.jsonSchema['definitions'][schemaPropertyName], page.id, [columnKey]);
31
+ if (Object.keys(config.table.columns[columnKey]).length === 0) {
32
+ delete config.table.columns[columnKey];
33
+ }
34
+ }
35
+ }
36
+ else {
37
+ extensionLogger_1.log(importParameters.logger, {
38
+ severity: "error" /* Error */,
39
+ message: i18next_1.default.t('NOLINEITEMS')
40
+ });
41
+ }
42
+ }
43
+ /**
44
+ * Import table toolbar actions of list report
45
+ * @param {ImportListReportV4Parameters} importParameters - object comprising all input data
16
46
  * @param {ListReportConfig | AnalyticalListPageConfig} config - the configuration to be filled
17
- * @param {Manifest} manifest - manifest.json of the app
18
- * @param {object} jsonSchema - the app-specific schema
19
47
  * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
20
48
  * @param {SapUiAppPageV4} page - page in manifest
21
49
  * @param {PageTypeV4} pageType - page type
22
- * @param {ExtensionLogger} logger - instance for logging exceptions
23
50
  */
24
- function addSettings(importParameters, config, factory, page, pageType) {
25
- // Tranfer page level settings with sync rules
26
- utils_1.transferSettingsOfObject(config, importParameters.manifest, importParameters.jsonSchema, page.id, []);
27
- // Check table settings from target structure
28
- config.table = factory.createInstance(pageType, 'Table');
29
- utils_1.transferSettingsOfObject(config.table, importParameters.manifest, importParameters.jsonSchema['definitions']['Table'], page.id, []);
30
- config.table.toolBar = factory.createInstance(pageType, 'ToolBar', { actions: {} });
31
- utils_1.transferSettingsOfObject(config.table.toolBar, importParameters.manifest, importParameters.jsonSchema['definitions'][common_2.TOOLBAR], page.id, []);
51
+ function importActions(importParameters, config, factory, pageType, page) {
32
52
  if (importParameters.jsonSchema['definitions']['Actions<LineItems>']) {
33
53
  for (const actionKey in importParameters.jsonSchema['definitions']['Actions<LineItems>'].properties) {
34
54
  config.table.toolBar.actions[actionKey] = factory.createInstance(pageType, 'ToolBarAction');
@@ -39,31 +59,29 @@ function addSettings(importParameters, config, factory, page, pageType) {
39
59
  }
40
60
  }
41
61
  }
62
+ }
63
+ /**
64
+ * Adds manifest settings to the config.json of LR or ALP V4
65
+ * @param {ImportListReportV4Parameters} importParameters - object comprising all input data
66
+ * @param {ListReportConfig | AnalyticalListPageConfig} config - the configuration to be filled
67
+ * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
68
+ * @param {SapUiAppPageV4} page - page in manifest
69
+ * @param {PageTypeV4} pageType - page type
70
+ */
71
+ function addSettings(importParameters, config, factory, page, pageType) {
72
+ // Tranfer page level settings with sync rules
73
+ utils_1.transferSettingsOfObject(config, importParameters.manifest, importParameters.jsonSchema, page.id, []);
74
+ // Check table settings from target structure
75
+ config.table = factory.createInstance(pageType, 'Table');
76
+ utils_1.transferSettingsOfObject(config.table, importParameters.manifest, importParameters.jsonSchema['definitions']['Table'], page.id, []);
77
+ config.table.toolBar = factory.createInstance(pageType, 'ToolBar', { actions: {} });
78
+ utils_1.transferSettingsOfObject(config.table.toolBar, importParameters.manifest, importParameters.jsonSchema['definitions'][common_2.DefinitionName.ToolBarLR], page.id, []);
79
+ importActions(importParameters, config, factory, pageType, page);
42
80
  //Filterbar:
43
81
  config.filterBar = factory.createInstance(pageType, 'FilterBar');
44
82
  utils_1.transferSettingsOfObject(config.filterBar, importParameters.manifest, importParameters.jsonSchema['definitions']['FilterBar'], page.id, []);
45
83
  //transfer columns
46
- config.table.columns = {};
47
- if (importParameters.jsonSchema['definitions']['LineItems']) {
48
- for (const columnKey in importParameters.jsonSchema['definitions']['LineItems'].properties) {
49
- const column = importParameters.jsonSchema['definitions']['LineItems'].properties[columnKey];
50
- if (!column.template) {
51
- config.table.columns[columnKey] = factory.createInstance(pageType, 'TableColumn');
52
- utils_1.transferSettingsOfObject(config.table.columns[columnKey], importParameters.manifest, importParameters.jsonSchema['definitions']['TableColumn'], page.id, [columnKey]);
53
- if (Object.keys(config.table.columns[columnKey]).length === 0) {
54
- delete config.table.columns[columnKey];
55
- }
56
- }
57
- }
58
- }
59
- else {
60
- extensionLogger_1.log(importParameters.logger, {
61
- severity: "error" /* Error */,
62
- message: i18next_1.default.t('NOLINEITEMS')
63
- });
64
- return;
65
- }
66
- return config;
84
+ transferColumns(config, importParameters, factory, pageType, page);
67
85
  }
68
86
  exports.addSettings = addSettings;
69
87
  /**
@@ -75,6 +93,9 @@ exports.addSettings = addSettings;
75
93
  function createListReportConfig(importParameters) {
76
94
  // Initialize i18next
77
95
  i18n_1.initI18n();
96
+ if (!importParameters.jsonSchema) {
97
+ return;
98
+ }
78
99
  if (!importParameters.manifest[v4_1.ManifestSection.ui5] || !importParameters.manifest[v4_1.ManifestSection.ui5]['routing']) {
79
100
  extensionLogger_1.log(importParameters.logger, {
80
101
  severity: "error" /* Error */,
@@ -101,13 +122,13 @@ function createListReportConfig(importParameters) {
101
122
  const factory = new factory_1.MetadataInstanceFactoryV4();
102
123
  //Instantiate Page
103
124
  const config = factory.createPageInstance(common_1.PageTypeV4.ListReport);
104
- Object.keys(v4Pages).forEach((key) => {
125
+ for (const key in v4Pages) {
105
126
  const v4Page = v4Pages[key];
106
127
  if ('name' in v4Page && common_2.getPageTypeV4(v4Page.name) === common_1.PageTypeV4.ListReport) {
107
128
  addSettings(importParameters, config, factory, v4Page, common_1.PageTypeV4.ListReport);
108
- return;
129
+ break;
109
130
  }
110
- });
131
+ }
111
132
  return config;
112
133
  }
113
134
  exports.createListReportConfig = createListReportConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"listReport.js","sourceRoot":"","sources":["../../../../../../src/sync/v4/import/pages/listReport.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"listReport.js","sourceRoot":"","sources":["../../../../../../src/sync/v4/import/pages/listReport.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { ObjectPageConfig } from '../../../../specification/v4/';
1
+ import { ObjectPageConfig as ObjectPageConfigV4 } from '../../../../specification/v4/';
2
2
  import { ImportObjectPageV4Parameters } from '../../../../apiTypes';
3
3
  /**
4
4
  * External API: Create configuration (file content) for a V4 object page
@@ -7,4 +7,4 @@ import { ImportObjectPageV4Parameters } from '../../../../apiTypes';
7
7
  *
8
8
  * @returns {ObjectPageConfig} config - the object page configuration
9
9
  */
10
- export declare function createObjectPageConfigV4(importParameters: ImportObjectPageV4Parameters): ObjectPageConfig | undefined;
10
+ export declare function createObjectPageConfigV4(importParameters: ImportObjectPageV4Parameters): ObjectPageConfigV4 | undefined;
@@ -16,19 +16,30 @@ const factory_1 = require("../../export/factory");
16
16
  * @param {ImportObjectPageV4Parameters} importParameters - object comprising all input data
17
17
  * @param manifestSection - section of the manifest.json
18
18
  * @param configPart - the given part of the object page config
19
- * @param sectionId - ID of the given object page section
19
+ * @param sectionId - converted ID of the given object page section
20
+ * @param manifestSectionId - ID of the given object page section in manifest
20
21
  * @param {MetadataInstanceInterface} factory - factory, for generating the access to reflect-metadata
21
22
  * @param v4Page - page definition in V4 format
22
23
  */
23
- function fillTableColumnsInConfig(importParameters, manifestSection, configPart, sectionId, factory, v4Page) {
24
+ function fillTableColumnsInConfig(importParameters, manifestSection, configPart, sectionId, manifestSectionId, factory, v4Page) {
24
25
  if (manifestSection['columns']) {
25
26
  configPart[sectionId].table.columns = {};
26
- const manifestSectionId = sectionId.replace(/::/g, '/');
27
- for (const columnKey in manifestSection['columns']) {
28
- const column = manifestSection['columns'][columnKey];
29
- if (!column.template) {
30
- configPart[sectionId].table.columns[columnKey] = factory.createInstance(common_1.PageTypeV4.ObjectPage, 'ObjectPageTableColumn');
31
- utils_1.transferSettingsOfObject(configPart[sectionId].table.columns[columnKey], importParameters.manifest, importParameters.jsonSchema['definitions']['ObjectPageTableColumn'], v4Page.id, [columnKey], manifestSectionId);
27
+ let tableDefinition;
28
+ const lineItems = importParameters.jsonSchema['definitions'][sectionId.replace(/#/g, '::')];
29
+ if (lineItems) {
30
+ for (const columnKey in lineItems.properties) {
31
+ const columnInSchema = lineItems.properties[columnKey];
32
+ if (columnInSchema.$ref.indexOf(common_2.DefinitionName.CustomColumnOP) > -1) {
33
+ tableDefinition = common_2.DefinitionName.CustomColumnOP;
34
+ }
35
+ else {
36
+ tableDefinition = common_2.DefinitionName.ObjectPageTableColumn;
37
+ }
38
+ const columnInConfig = factory.createInstance(common_1.PageTypeV4.ObjectPage, tableDefinition);
39
+ utils_1.transferSettingsOfObject(columnInConfig, importParameters.manifest, importParameters.jsonSchema['definitions'][tableDefinition], v4Page.id, [columnKey], manifestSectionId);
40
+ if (Object.keys(columnInConfig).length > 0) {
41
+ configPart[sectionId].table.columns[columnKey] = columnInConfig;
42
+ }
32
43
  }
33
44
  }
34
45
  }
@@ -66,7 +77,7 @@ function fillTableActionsInConfig(importParameters, sectionId, configPart, facto
66
77
  function fillTableInConfig(importParameters, manifestSettings, configPart, sectionId, factory, v4Page) {
67
78
  const manifestSectionId = sectionId.replace(/::/g, '/');
68
79
  const manifestSection = manifestSettings.controlConfiguration[manifestSectionId];
69
- if (manifestSection && manifestSection['tableSettings']) {
80
+ if (manifestSection) {
70
81
  // Data needs to be transferred
71
82
  configPart[sectionId] = {};
72
83
  configPart[sectionId].table = factory.createInstance(common_1.PageTypeV4.ObjectPage, 'ObjectPageTable');
@@ -75,16 +86,8 @@ function fillTableInConfig(importParameters, manifestSettings, configPart, secti
75
86
  configPart[sectionId].table.toolBar = factory.createInstance(common_1.PageTypeV4.ObjectPage, 'ToolBar', {
76
87
  actions: {}
77
88
  });
78
- // Nothing to transfer yet
79
- /*transferSettingsOfObject(
80
- configPart[sectionId].table.toolBar,
81
- importParameters.manifest,
82
- importParameters.jsonSchema['definitions'][`ToolBar<${sectionId}>`],
83
- v4Page.id,
84
- []
85
- );*/
86
89
  fillTableActionsInConfig(importParameters, sectionId, configPart, factory, v4Page);
87
- fillTableColumnsInConfig(importParameters, manifestSection, configPart, sectionId, factory, v4Page);
90
+ fillTableColumnsInConfig(importParameters, manifestSection, configPart, sectionId, manifestSectionId, factory, v4Page);
88
91
  }
89
92
  }
90
93
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"objectPage.js","sourceRoot":"","sources":["../../../../../../src/sync/v4/import/pages/objectPage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"objectPage.js","sourceRoot":"","sources":["../../../../../../src/sync/v4/import/pages/objectPage.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const common_1 = require("../../common");
4
4
  const decorators_1 = require("../../common/decoration/decorators");
5
- const common_2 = require("../../common");
6
5
  /**
7
6
  * Transfers settings from manifest to object page config
8
7
  * @param configPart - part of the configuration to be filled
@@ -17,15 +16,17 @@ function transferSettingsOfObject(configPart, manifest, appSchema, pageKey, brea
17
16
  return;
18
17
  }
19
18
  let manifestSection = {};
20
- const deprecatedProperties = configPart.getDeprecated ? configPart.getDeprecated() : [];
19
+ const deprecatedProperties = configPart.getDeprecated;
21
20
  const targetAnnotationEncoded = sectionId && sectionId.replace('/', '::');
22
21
  for (const propertyKey in appSchema['properties']) {
23
22
  const syncRule = decorators_1.getReflectMetadata(configPart, propertyKey);
24
23
  if (syncRule === null || syncRule === void 0 ? void 0 : syncRule.manifest) {
25
24
  const path = syncRule.manifest.path([pageKey], manifest, targetAnnotationEncoded, breadcrumbs[0]);
26
- manifestSection = common_2.getManifestSectionByPathV4(manifest, path, sectionId, targetAnnotationEncoded);
27
- common_1.importProperty(syncRule, manifestSection, propertyKey, configPart, sectionId);
28
- common_2.checkDeprecatedProperties(deprecatedProperties, manifestSection, path, logger);
25
+ manifestSection = common_1.getManifestSectionByPathV4(manifest, path, sectionId, targetAnnotationEncoded, true);
26
+ if (manifestSection && Object.keys(manifestSection).length > 0) {
27
+ common_1.importProperty(syncRule, manifestSection, propertyKey, configPart, sectionId);
28
+ common_1.checkDeprecatedProperties(deprecatedProperties, manifestSection, path, logger);
29
+ }
29
30
  }
30
31
  }
31
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/sync/v4/import/utils.ts"],"names":[],"mappings":";;AACA,yCAAoE;AACpE,mEAAwE;AACxE,yCAAqF;AAGrF;;;;;;;;GAQG;AACH,SAAgB,wBAAwB,CACpC,UAAkC,EAClC,QAAkB,EAClB,SAAiB,EACjB,OAAe,EACf,WAAqB,EACrB,SAAkB,EAClB,MAAwB;IAExB,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO;KACV;IACD,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,MAAM,oBAAoB,GAA2B,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAChH,MAAM,uBAAuB,GAAG,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAE1E,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE;QAC/C,MAAM,QAAQ,GAAG,+BAAkB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAE7D,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,EAAE;YACpB,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,uBAAuB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAClG,eAAe,GAAG,mCAA0B,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,uBAAuB,CAAC,CAAC;YACjG,uBAAc,CAAC,QAAQ,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;YAC9E,kCAAyB,CAAC,oBAAoB,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SAClF;KACJ;AACL,CAAC;AA1BD,4DA0BC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/sync/v4/import/utils.ts"],"names":[],"mappings":";;AACA,yCAAqG;AACrG,mEAAwE;AAGxE;;;;;;;;GAQG;AACH,SAAgB,wBAAwB,CACpC,UAAkC,EAClC,QAAkB,EAClB,SAAiB,EACjB,OAAe,EACf,WAAqB,EACrB,SAAkB,EAClB,MAAwB;IAExB,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO;KACV;IACD,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,MAAM,oBAAoB,GAAG,UAAU,CAAC,aAAa,CAAC;IACtD,MAAM,uBAAuB,GAAG,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAE1E,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE;QAC/C,MAAM,QAAQ,GAAG,+BAAkB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAE7D,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,EAAE;YACpB,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,uBAAuB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAClG,eAAe,GAAG,mCAA0B,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,CAAC,CAAC;YACvG,IAAI,eAAe,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5D,uBAAc,CAAC,QAAQ,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;gBAC9E,kCAAyB,CAAC,oBAAoB,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;aAClF;SACJ;KACJ;AACL,CAAC;AA5BD,4DA4BC"}
@@ -1,4 +1,7 @@
1
- import { AnnotationTerm, ConverterOutput, EntityType, LineItem, SelectionFields, DataFieldForActionAbstractTypes } from '@sap-ux/vocabularies-types';
1
+ import { AnnotationTerm, ConverterOutput, EntityType, LineItem, DataFieldForActionAbstractTypes, SelectionFields } from '@sap-ux/vocabularies-types';
2
+ import { EntitySet } from '@sap-ux/annotation-converter';
3
+ import { ExtensionLogger } from '../../..';
4
+ import { SapUiAppPageV4 } from '../../../v4';
2
5
  /**
3
6
  * Processes a LineItem record of type DataFieldForCation during app schema generation
4
7
  * @param appSchema - the app specific schema that shall get enhanced
@@ -26,5 +29,15 @@ export declare function addSelectionFields(entityType: EntityType, appSchema: ob
26
29
  * @param actionDefinitionName - indicates the prefix for the definition, dpending on the page type
27
30
  * @param lineItemId - optional: in case of OP the paramter must be passed to distinguish the OP tables;
28
31
  * in case of LR or ALP no ID is passed, 'LineItems' is taken then.
32
+ * @param customColumnRef - schema reference to custom column definition.
29
33
  */
30
- export declare function addLineItemsType(appSchema: object, lineItemAnnotation: AnnotationTerm<LineItem>, entityType: EntityType, oDataServiceAVT: ConverterOutput, columnDefinitionName: string, lineItemId?: string): void;
34
+ export declare function addLineItemsType(appSchema: object, lineItemAnnotation: AnnotationTerm<LineItem>, entityType: EntityType, oDataServiceAVT: ConverterOutput, columnDefinitionName?: string, lineItemId?: string): void;
35
+ /**
36
+ * Find the relevant V4 page under the routing targets of manifest,json
37
+ * @param pages - list of all pages in manifest
38
+ * @param pageName - search criterion: page name
39
+ * @param entitySet - search criterion: entty set
40
+ * @param logger - logger for messages
41
+ * @returns the page definition in manifest (if found)
42
+ */
43
+ export declare function findPageV4(pages: SapUiAppPageV4[], pageName: string, entitySet: EntitySet, logger: ExtensionLogger): SapUiAppPageV4 | undefined;
@@ -1,8 +1,14 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  const utils_1 = require("../../common/utils");
4
7
  const StableIdHelper_1 = require("./StableIdHelper");
5
8
  const common_1 = require("../../common");
9
+ const i18next_1 = __importDefault(require("i18next"));
10
+ const __1 = require("../../..");
11
+ const v4_1 = require("../../../v4");
6
12
  /**
7
13
  * Processes a LineItem record of type DataFieldForCation during app schema generation
8
14
  * @param appSchema - the app specific schema that shall get enhanced
@@ -31,12 +37,11 @@ function handleActionRecord(appSchema, entityType, actions, lineItemPath, lineIt
31
37
  }
32
38
  }
33
39
  exports.handleActionRecord = handleActionRecord;
34
- function handleLineItemRecord(lineItem, appSchema, columnDefinitionName, entityType, i, oDataServiceAVT) {
35
- var _a, _b;
40
+ function handleLineItemRecord(lineItem, appSchema, columnDefinitionName, entityType, propertyIndex, oDataServiceAVT) {
41
+ var _a, _b, _c, _d, _e;
36
42
  const lineItemId = lineItem['lineItemId'];
37
43
  const lineItemRecord = lineItem['lineItemRecord'];
38
- const lineItemPath = lineItem['lineItemPath'];
39
- if (lineItemRecord['Target'] && lineItemRecord['Target']['value']) {
44
+ if ((_a = lineItemRecord['Target']) === null || _a === void 0 ? void 0 : _a['value']) {
40
45
  const regex = `@${utils_1.findAlias(common_1.UIVOCABULARY, oDataServiceAVT)}.`;
41
46
  lineItemRecord['Target']['value'] = lineItemRecord['Target']['value'].replace(regex, '@');
42
47
  }
@@ -46,12 +51,12 @@ function handleLineItemRecord(lineItem, appSchema, columnDefinitionName, entityT
46
51
  $ref: utils_1.DEFINITION_LINK_PREFIX + columnDefinitionName,
47
52
  description: utils_1.getDatafieldDescription(lineItemRecord, entityType),
48
53
  // Custom property in schema - for object properties ordering purpose
49
- propertyIndex: i,
50
- annotationPath: `${lineItemPath}/${i}`,
54
+ propertyIndex,
55
+ annotationPath: `${lineItem['lineItemPath']}/${propertyIndex}`,
51
56
  annotationType: lineItemRecord === null || lineItemRecord === void 0 ? void 0 : lineItemRecord.$Type
52
57
  };
53
- if (lineItemRecord.$Type === 'com.sap.vocabularies.UI.v1.DataField') {
54
- appSchema['definitions'][lineItemId]['properties'][schemaKey].dataType = (_b = (_a = lineItemRecord['Value']) === null || _a === void 0 ? void 0 : _a.$target) === null || _b === void 0 ? void 0 : _b.type.replace('Edm.', '');
58
+ if ((_c = (_b = lineItemRecord['Value']) === null || _b === void 0 ? void 0 : _b.$target) === null || _c === void 0 ? void 0 : _c.type) {
59
+ appSchema['definitions'][lineItemId]['properties'][schemaKey].dataType = (_e = (_d = lineItemRecord['Value']) === null || _d === void 0 ? void 0 : _d.$target) === null || _e === void 0 ? void 0 : _e.type.replace('Edm.', '');
55
60
  }
56
61
  }
57
62
  }
@@ -65,7 +70,7 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
65
70
  const selectionFieldsDefinition = appSchema['definitions'].SelectionFields;
66
71
  selectionFieldsDefinition.additionalProperties = false;
67
72
  selectionFieldsDefinition.properties = {};
68
- selectionFieldsDefinition.annotationPath = utils_1.createAnnotationPath(entityType.fullyQualifiedName, "com.sap.vocabularies.UI.v1.SelectionFields" /* SelectionFields */);
73
+ selectionFieldsDefinition.annotationPath = common_1.createAnnotationPath(entityType.fullyQualifiedName, "com.sap.vocabularies.UI.v1.SelectionFields" /* SelectionFields */);
69
74
  if (!selectionFieldsAnnotation) {
70
75
  return;
71
76
  }
@@ -75,7 +80,7 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
75
80
  let description = selectionField.value;
76
81
  const fieldDefinition = 'SelectionField::' + common_1.prepareRef(selectionField.value);
77
82
  if (selectionField.type === 'PropertyPath') {
78
- description = utils_1.getLabelForPropertyPath(selectionField, entityType);
83
+ description = common_1.getLabelForPropertyPath(selectionField, entityType);
79
84
  }
80
85
  selectionFieldsDefinition['properties'][fieldDefinition] = {
81
86
  $ref: utils_1.DEFINITION_LINK_PREFIX + fieldDefinition,
@@ -93,7 +98,6 @@ function addSelectionFields(entityType, appSchema, selectionFieldsAnnotation) {
93
98
  };
94
99
  i++;
95
100
  });
96
- return;
97
101
  }
98
102
  exports.addSelectionFields = addSelectionFields;
99
103
  /**
@@ -106,26 +110,61 @@ exports.addSelectionFields = addSelectionFields;
106
110
  * @param actionDefinitionName - indicates the prefix for the definition, dpending on the page type
107
111
  * @param lineItemId - optional: in case of OP the paramter must be passed to distinguish the OP tables;
108
112
  * in case of LR or ALP no ID is passed, 'LineItems' is taken then.
113
+ * @param customColumnRef - schema reference to custom column definition.
109
114
  */
110
- function addLineItemsType(appSchema, lineItemAnnotation, entityType, oDataServiceAVT, columnDefinitionName, lineItemId) {
111
- appSchema['definitions'][columnDefinitionName] = JSON.parse(JSON.stringify(appSchema['definitions']['GenericColumns']['additionalProperties'].anyOf[0]));
115
+ function addLineItemsType(appSchema, lineItemAnnotation, entityType, oDataServiceAVT, columnDefinitionName = v4_1.DefinitionName.TableColumn, lineItemId) {
112
116
  // Add the correct lineItem definition
113
117
  lineItemId = lineItemId || 'LineItems';
114
- const { actions, lineItemPath } = utils_1.addCommonLineItemDefinitions(appSchema, lineItemAnnotation, entityType, lineItemId);
115
- if (lineItemAnnotation) {
116
- let i = 0;
117
- lineItemAnnotation.forEach((lineItemRecord) => {
118
- if (lineItemRecord.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ &&
119
- (lineItemRecord.Inline !== true || lineItemRecord.Determining === true)) {
120
- handleActionRecord(appSchema, entityType, actions, lineItemPath, lineItemRecord, lineItemId, i);
121
- }
122
- else {
123
- const lineItem = { lineItemRecord: lineItemRecord, lineItemId: lineItemId, lineItemPath: lineItemPath };
124
- handleLineItemRecord(lineItem, appSchema, columnDefinitionName, entityType, i, oDataServiceAVT);
118
+ const { actions, lineItemPath } = common_1.addCommonLineItemDefinitions(appSchema, lineItemAnnotation, entityType, lineItemId);
119
+ if (!lineItemAnnotation) {
120
+ return;
121
+ }
122
+ let i = 0;
123
+ lineItemAnnotation.forEach((lineItemRecord) => {
124
+ if ((lineItemRecord.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ ||
125
+ lineItemRecord.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) &&
126
+ (lineItemRecord.Inline !== true || lineItemRecord.Determining === true)) {
127
+ handleActionRecord(appSchema, entityType, actions, lineItemPath, lineItemRecord, lineItemId, i);
128
+ }
129
+ else {
130
+ const lineItem = { lineItemRecord: lineItemRecord, lineItemId: lineItemId, lineItemPath: lineItemPath };
131
+ const columnDefinition = lineItemRecord.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */
132
+ ? `${columnDefinitionName}Action`
133
+ : columnDefinitionName;
134
+ handleLineItemRecord(lineItem, appSchema, columnDefinition, entityType, i, oDataServiceAVT);
135
+ }
136
+ i++;
137
+ });
138
+ }
139
+ exports.addLineItemsType = addLineItemsType;
140
+ /**
141
+ * Find the relevant V4 page under the routing targets of manifest,json
142
+ * @param pages - list of all pages in manifest
143
+ * @param pageName - search criterion: page name
144
+ * @param entitySet - search criterion: entty set
145
+ * @param logger - logger for messages
146
+ * @returns the page definition in manifest (if found)
147
+ */
148
+ function findPageV4(pages, pageName, entitySet, logger) {
149
+ var _a, _b;
150
+ let v4Page;
151
+ for (const i in pages) {
152
+ if (((_b = (_a = pages[i].options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.entitySet) === entitySet.name && pages[i].name === pageName) {
153
+ v4Page = pages[i];
154
+ break;
155
+ }
156
+ }
157
+ if (!v4Page) {
158
+ __1.log(logger, {
159
+ severity: "error" /* Error */,
160
+ message: i18next_1.default.t('NOENTITYSET', { entitySet }),
161
+ location: {
162
+ path: common_1.MANIFESTPATH,
163
+ range: [__1.ManifestSection.generic]
125
164
  }
126
- i++;
127
165
  });
128
166
  }
167
+ return v4Page;
129
168
  }
130
- exports.addLineItemsType = addLineItemsType;
169
+ exports.findPageV4 = findPageV4;
131
170
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/sync/v4/utils/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/sync/v4/utils/utils.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- export {};
1
+ export declare function readAndPushFlexChange(flexChanges: string[], action: string, projectPath: string[], fakeFlexChange?: boolean): void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sap/ux-specification",
3
- "version": "1.90.15",
3
+ "version": "1.90.19",
4
4
  "displayName": "SAP Fiori tools - Specification",
5
5
  "description": "SAP Fiori tools - Specification",
6
6
  "files": [
@@ -17,14 +17,16 @@
17
17
  "yarn": ">=1.22.5"
18
18
  },
19
19
  "scripts": {
20
- "clean": "rimraf ./dist ./schemas",
21
- "build": "yarn run clean && tsc --project ./tsconfig.build.json && yarn run create-json-schemas && yarn copy-json-schemas && webpack --color --config webpack.prod.js && yarn copy-templates && yarn run generate-html-prod && rimraf ../schemas",
22
- "watch": "yarn run clean && tsc --project ./tsconfig.build.json && yarn run create-json-schemas && yarn copy-json-schemas && yarn copy-templates && webpack --color --config webpack.dev.js",
20
+ "clean": "rimraf ./dist ./schemas ../schemas",
21
+ "build": "yarn run clean && tsc --project ./tsconfig.build.json && yarn run create-json-schemas && yarn copy-json-schemas && webpack --color --config webpack.prod.js && yarn copy-templates && yarn run generate-html-prod",
22
+ "build:dev": "yarn run clean && tsc --project ./tsconfig.build.json && yarn run create-json-schemas && yarn copy-json-schemas && webpack --color --config webpack.prod.js && yarn copy-templates",
23
+ "watch": "yarn run clean && tsc --project ./tsconfig.build.json && yarn run create-json-schemas && yarn copy-json-schemas && webpack --color --config webpack.dev.js && yarn copy-templates",
23
24
  "watch-docu": "yarn run generate-html-dev",
24
25
  "create-json-schemas": "node dist/scripts/to-json-schema.js",
25
26
  "copy-json-schemas": "cpy schemas/** dist --parents",
26
27
  "copy-templates": "cpy src/sync/v2/export/templates/** dist/templates",
27
- "test": "jest --colors && node ../../scripts/scov.js reports/test/unit/coverage/lcov.info",
28
+ "test": "jest && node ../../scripts/scov.js reports/test/unit/coverage/lcov.info",
29
+ "test:ci": "jest --ci --forceExit --detectOpenHandles && node ../../scripts/scov.js reports/test/unit/coverage/lcov.info",
28
30
  "update-snapshots": "jest --updateSnapshot",
29
31
  "lint": "eslint . --ext .ts",
30
32
  "lint:summary": "eslint . --ext .ts -f summary",
@@ -46,9 +48,8 @@
46
48
  "@sap-ux/annotation-converter": "0.3.39",
47
49
  "@sap-ux/edmx-parser": "0.3.39",
48
50
  "@sap-ux/vocabularies-types": "0.3.39",
49
- "@sap/edm-converters": "1.0.40",
50
- "@sapui5/ts-types": "1.90.9",
51
- "@types/d3": "7.0.0",
51
+ "@sapui5/ts-types": "1.90.11",
52
+ "@types/d3": "7.1.0",
52
53
  "@types/jest": "26.0.23",
53
54
  "@types/jquery": "3.5.6",
54
55
  "@types/sax": "1.2.1",
@@ -57,7 +58,7 @@
57
58
  "@ui5/flexibility-utils": "0.1.3",
58
59
  "ajv": "6.12.6",
59
60
  "cpy-cli": "3.1.1",
60
- "d3": "7.0.1",
61
+ "d3": "7.1.1",
61
62
  "deepmerge": "4.2.2",
62
63
  "ejs": "3.1.6",
63
64
  "eslint": "7.18.0",
@@ -79,7 +80,7 @@
79
80
  "source-map-loader": "1.0.0",
80
81
  "terser-webpack-plugin": "4.2.3",
81
82
  "ts-jest": "26.5.6",
82
- "ts-json-schema-generator": "0.93.0",
83
+ "ts-json-schema-generator": "0.96.0",
83
84
  "ts-loader": "9.1.2",
84
85
  "ts-node": "9.1.1",
85
86
  "typescript": "3.8.3",