@sap-ux/ui5-test-writer 0.7.97 → 0.7.98

package/dist/types.d.ts

@@ -135,6 +135,11 @@ export type AppFeatures = {
     objectPages?: ObjectPageFeatures[];
     fpm?: FPMFeatures;
 };
+export type FormField = {
+    fieldGroupQualifier?: string;
+    field?: string;
+    targetAnnotation?: string;
+};
 export type HeaderSectionFeatureData = {
     facetId?: string;
     title?: string;
@@ -143,10 +148,7 @@ export type HeaderSectionFeatureData = {
     microChart?: boolean;
     form?: boolean;
     stashed?: boolean | string;
-    fields?: {
-        fieldGroupQualifier?: string;
-        field?: string;
-    }[];
+    fields?: FormField[];
 };
 export interface ButtonState {
     visible: boolean;

package/dist/utils/modelUtils.d.ts

@@ -10,6 +10,7 @@ export interface AggregationItem extends TreeAggregation {
             name: string;
             value: string;
         }[];
+        dataType?: string;
     };
 }
 export interface FieldItem extends AggregationItem {

package/dist/utils/objectPageUtils.js

@@ -204,16 +204,38 @@ function getHeaderSectionFormFields(section) {
     if (fields) {
         Object.keys(fields).forEach((fieldKey) => {
             const field = fields[fieldKey];
-            if (field?.name) {
-                formFields.push({
-                    fieldGroupQualifier: getFieldGroupQualifier(formAggregation),
-                    field: field.schema.keys.find((key) => key.name === 'Value')?.value
-                });
+            const fieldData = getFormFieldData(field, formAggregation);
+            if (fieldData) {
+                formFields.push(fieldData);
             }
         });
     }
     return formFields;
 }
+/**
+ * Gets field data for a form field in a header section for OPA5 tests, including its identifier, bound property, and target annotation.
+ *
+ * @param field - field entry from ux specification
+ * @param formAggregation - form aggregation entry from ux specification, used to get field group qualifier for the field
+ * @returns field data including its identifier, bound property, and target annotation for OPA5 tests; can be undefined if the field type is not supported or necessary information is missing
+ */
+function getFormFieldData(field, formAggregation) {
+    if (!field.name) {
+        return undefined;
+    }
+    let [_, propertyName, targetAnnotation] = field.name.split('::');
+    // fall back to Value property in case of malformed or otherwise irregular field name
+    if (!propertyName) {
+        propertyName = field.schema.keys.find((key) => key.name === 'Value')?.value;
+    }
+    const fieldIdentifier = {
+        fieldGroupQualifier: getFieldGroupQualifier(formAggregation),
+        field: propertyName,
+        targetAnnotation: targetAnnotation
+    };
+    // avoid creating identifier if field property could not be determined
+    return fieldIdentifier.field ? fieldIdentifier : undefined;
+}
 /**
  * Gets the field group qualifier of a form aggregation for OPA5 tests.
  *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/ui5-test-writer",
   "description": "SAP UI5 tests writer",
-  "version": "0.7.97",
+  "version": "0.7.98",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,9 +27,9 @@
     "@sap/ux-specification": "1.144.0",
     "@sap-ux/edmx-parser": "0.10.0",
     "@sap-ux/annotation-converter": "0.10.21",
-    "@sap-ux/ui5-application-writer": "1.8.3",
     "@sap-ux/logger": "0.8.4",
-    "@sap-ux/project-access": "1.35.17"
+    "@sap-ux/project-access": "1.35.17",
+    "@sap-ux/ui5-application-writer": "1.8.3"
   },
   "devDependencies": {
     "@types/ejs": "3.1.5",

package/templates/v4/integration/ObjectPageJourney.js

@@ -51,6 +51,7 @@ sap.ui.define([
             Then.onThe<%- name%>.onHeader().iCheckFieldInFieldGroup({
                 fieldGroup: "FieldGroup::<%- field.fieldGroupQualifier %>",
                 field: "<%- field.field %>",
+                targetAnnotation: "<%- field.targetAnnotation %>"
             });
 <% }) -%>
 <% } -%>