@sap-ux/fiori-elements-writer 0.18.13 → 0.18.15

package/dist/data/defaults.js

@@ -17,7 +17,7 @@ const defaultModelName = 'mainModel'; // UI5 default model name is '' but some f
  * @returns Updated template settings
  */
 function setDefaultTemplateSettings(template, odataVersion) {
-    var _a, _b;
+    var _a, _b, _c;
     const templateSettings = template.settings;
     if (template.type === types_1.TemplateType.AnalyticalListPage) {
         const alpSettings = template.settings;
@@ -42,6 +42,15 @@ function setDefaultTemplateSettings(template, odataVersion) {
             return templateSettings;
         }
     }
+    else if (template.type === types_1.TemplateType.ListReportObjectPage || template.type === types_1.TemplateType.Worklist) {
+        const tableSettings = template.settings;
+        Object.assign(templateSettings, {
+            tableType: (_c = tableSettings.tableType) !== null && _c !== void 0 ? _c : types_1.TableType.RESPONSIVE // Overrides the UI5 default: ''
+        });
+        if (tableSettings.tableType !== types_1.TableType.TREE) {
+            delete tableSettings.hierarchyQualifier;
+        }
+    }
     return templateSettings;
 }
 exports.setDefaultTemplateSettings = setDefaultTemplateSettings;
@@ -81,7 +90,7 @@ function setAppDefaults(feApp) {
         feApp.ui5.minUI5Version =
             (_h = feApp.ui5.version) !== null && _h !== void 0 ? _h : templateAttributes_1.TemplateTypeAttributes[feApp.template.type].minimumUi5Version[feApp.service.version];
     }
-    // if not explictly disabled, enable the SAP Fiori tools
+    // if not explicitly disabled, enable the SAP Fiori tools
     feApp.appOptions = (_j = feApp.appOptions) !== null && _j !== void 0 ? _j : {};
     if (feApp.appOptions.sapux !== false) {
         feApp.appOptions.sapux = true;

package/dist/index.js

@@ -88,7 +88,7 @@ function generate(basePath, data, fs) {
     return __awaiter(this, void 0, void 0, function* () {
         // Clone rather than modifying callers refs
         const feApp = (0, cloneDeep_1.default)(data);
-        // Ensure input data contains at least the manadatory properties required for app genertation
+        // Ensure input data contains at least the mandatory properties required for app generation
         (0, validate_1.validateRequiredProperties)(feApp);
         (0, defaults_1.setAppDefaults)(feApp);
         fs = yield (0, ui5_application_writer_1.generate)(basePath, feApp, fs);

package/dist/types.d.ts

@@ -29,7 +29,8 @@ export interface EntityConfig {
 export declare enum TableType {
     GRID = "GridTable",
     ANALYTICAL = "AnalyticalTable",
-    RESPONSIVE = "ResponsiveTable"
+    RESPONSIVE = "ResponsiveTable",
+    TREE = "TreeTable"
 }
 export declare enum TableSelectionMode {
     NONE = "None",
@@ -37,14 +38,19 @@ export declare enum TableSelectionMode {
     MULTI = "Multi",
     SINGLE = "Single"
 }
-export interface LROPSettings {
+export interface TableSettings {
+    tableType?: TableType;
+    qualifier?: string;
+    hierarchyQualifier?: string;
+}
+export interface LROPSettings extends TableSettings {
     entityConfig: EntityConfig;
 }
 export interface FPMSettings {
     entityConfig: EntityConfig;
     pageName: string;
 }
-export interface WorklistSettings {
+export interface WorklistSettings extends TableSettings {
     entityConfig: EntityConfig;
 }
 export interface FEOPSettings {
@@ -53,9 +59,8 @@ export interface FEOPSettings {
 export interface OVPSettings {
     filterEntityType: string;
 }
-export interface ALPSettings {
+export interface ALPSettings extends TableSettings {
     entityConfig: EntityConfig;
-    tableType?: TableType;
 }
 export interface ALPSettingsV2 extends ALPSettings {
     smartVariantManagement?: boolean;

package/dist/types.js

@@ -30,6 +30,7 @@ var TableType;
     TableType["GRID"] = "GridTable";
     TableType["ANALYTICAL"] = "AnalyticalTable";
     TableType["RESPONSIVE"] = "ResponsiveTable";
+    TableType["TREE"] = "TreeTable";
 })(TableType || (exports.TableType = TableType = {}));
 var TableSelectionMode;
 (function (TableSelectionMode) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-elements-writer",
   "description": "SAP Fiori elements application writer",
-  "version": "0.18.13",
+  "version": "0.18.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -28,8 +28,8 @@
     "read-pkg-up": "7.0.1",
     "semver": "7.5.4",
     "@sap-ux/odata-service-writer": "0.16.4",
-    "@sap-ux/ui5-application-writer": "0.26.7",
     "@sap-ux/fe-fpm-writer": "0.24.9",
+    "@sap-ux/ui5-application-writer": "0.26.7",
     "@sap-ux/ui5-config": "0.22.1",
     "@sap-ux/ui5-test-writer": "0.3.2"
   },

package/templates/v2/alp/extend/webapp/manifest.json

@@ -17,15 +17,15 @@
                         "condensedTableLayout": true,
                         "showGoButtonOnFilterBar": true,
                         <% if (locals.tableType) { %>
-                        "tableType": "<%- tableType %>",<% } %>
+                        "tableType": "<%- locals.tableType %>",<% } %>
                         <% if (locals.qualifier) { %>
-                        "qualifier": "<%- qualifier %>",<% } %>
+                        "qualifier": "<%- locals.qualifier %>",<% } %>
                         <% if (locals.autoHide !== undefined) { %>
-                        "autoHide": <%- autoHide %>,<% } %>
+                        "autoHide": <%- locals.autoHide %>,<% } %>
                         <% if (locals.smartVariantManagement !== undefined) { %>
-                        "smartVariantManagement": <%- smartVariantManagement %>,<% } %>
+                        "smartVariantManagement": <%- locals.smartVariantManagement %>,<% } %>
                         "tableSettings": {<% if (locals.multiSelect !== undefined) { %>
-                            "multiSelect": <%- multiSelect %><% } %>
+                            "multiSelect": <%- locals.multiSelect %><% } %>
                         },
                         "keyPerformanceIndicators": {}
                     }

package/templates/v2/lrop/extend/webapp/manifest.json

@@ -21,7 +21,10 @@
                             "dateSettings": {
                                 "useDateRange": true
                             }
-                        }
+                        }<% if (tableType) { %>,
+                        "tableSettings": {
+                            "type": "<%- tableType %>"
+                          }<% } %> 
                     }
                 },
                 "pages": {

package/templates/v4/lrop/extend/webapp/manifest.json

@@ -37,15 +37,19 @@
                                         "route": "<%- entityConfig.mainEntityName %>ObjectPage"
                                     }
                                 }
-                            }<% if (type === 'alp') { %>,
+                            }<% if (locals.tableType) { %>,
                             "controlConfiguration": {
                                 "@com.sap.vocabularies.UI.v1.LineItem": {
                                     "tableSettings": {
-                                        "type": "<%- tableType %>",
-                                        "selectionMode": "<%- selectionMode %>"
+                                        "type": "<%- tableType %>"
+                                        <% if (locals.qualifier) { %>,"qualifier": "<%- locals.qualifier %>"<% } %>                                        
+                                        <% if (type === 'alp'){ %>,"selectionMode": "<%- locals.selectionMode %>"<% } %>
+                                        <% if (locals.hierarchyQualifier){ %>,"hierarchyQualifier": "<%- locals.hierarchyQualifier %>"<% } %>                                        
                                     }
                                 }
-                            },
+                            }
+                            <% } %> 
+                            <% if (type === 'alp'){ %>,
                             "views": {
                                 "paths": [{
                                     "primary": [