@sap-ux/preview-middleware 0.25.34 → 0.25.37

package/dist/client/cpe/changes/service.js

@@ -370,6 +370,88 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
       }
     }
 
+    /**
+     * Build a PendingGenericChange and track config change path if applicable.
+     *
+     * @param changeDefinition - change definition object
+     * @param changeType - the change type string
+     * @param handler - the generic change handler
+     * @param isActive - whether the change is currently active
+     * @param fileName - file name of the change
+     * @param textBundle - i18n text bundle
+     * @returns Promise resolving to PendingGenericChange
+     */
+    async buildGenericChange(changeDefinition, changeType, handler, isActive, fileName, textBundle) {
+      const {
+        properties,
+        changeTitle,
+        controlId,
+        changeType: type,
+        subtitle
+      } = await handler(changeDefinition, {
+        textBundle,
+        appComponent: this.options.rta.getRootControlInstance(),
+        configPropertyControlIdMap: this.configPropertyControlIdMap
+      });
+      const genericChange = {
+        kind: GENERIC_CHANGE_KIND,
+        type: 'pending',
+        changeType: type ?? changeType,
+        ...(subtitle && {
+          subtitle
+        }),
+        isActive,
+        title: textBundle.getText(changeTitle),
+        fileName,
+        ...(controlId && {
+          controlId
+        }),
+        properties
+      };
+      if (changeType === 'appdescr_fe_changePageConfiguration') {
+        const configChangePath = changeDefinition.content.entityPropertyChange.propertyPath;
+        if (genericChange.isActive) {
+          this.configPropertyPath.add(configChangePath);
+        } else {
+          // remove value from set if change is undone
+          this.configPropertyPath.delete(configChangePath);
+        }
+        this.trackPendingConfigChanges(genericChange);
+      }
+      return genericChange;
+    }
+
+    /**
+     * Build a fallback PendingChange for changes without a registered handler.
+     *
+     * @param changeType - the change type string
+     * @param selectorId - optional selector/control ID
+     * @param isActive - whether the change is currently active
+     * @param fileName - file name of the change
+     * @returns PendingChange
+     */
+    buildFallbackChange(changeType, selectorId, isActive, fileName) {
+      const title = TITLE_MAP[changeType] ?? '';
+      let result = {
+        type: PENDING_CHANGE_TYPE,
+        kind: UNKNOWN_CHANGE_KIND,
+        ...(title && {
+          title
+        }),
+        changeType,
+        isActive,
+        fileName
+      };
+      if (selectorId) {
+        result = {
+          ...result,
+          kind: 'control',
+          controlId: selectorId
+        };
+      }
+      return result;
+    }
+
     /**
      * Prepares the type of change based on the command and other parameters.
      *
@@ -391,65 +473,11 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
         fileName
       } = changeDefinition;
       const handler = GENERIC_CHANGE_HANDLER[changeType];
+      const isActive = index >= inactiveCommandCount;
       if (handler) {
-        const {
-          properties,
-          changeTitle,
-          controlId,
-          changeType: type,
-          subtitle
-        } = await handler(changeDefinition, {
-          textBundle,
-          appComponent: this.options.rta.getRootControlInstance(),
-          configPropertyControlIdMap: this.configPropertyControlIdMap
-        });
-        const genericChange = {
-          kind: GENERIC_CHANGE_KIND,
-          type: 'pending',
-          changeType: type ?? changeType,
-          ...(subtitle && {
-            subtitle
-          }),
-          isActive: index >= inactiveCommandCount,
-          title: textBundle.getText(changeTitle),
-          fileName,
-          ...(controlId && {
-            controlId
-          }),
-          properties
-        };
-        if (changeType === 'appdescr_fe_changePageConfiguration') {
-          const configChangePath = changeDefinition.content.entityPropertyChange.propertyPath;
-          if (genericChange.isActive) {
-            this.configPropertyPath.add(configChangePath);
-          } else {
-            // remove value from set if change is undone
-            this.configPropertyPath.delete(configChangePath);
-          }
-          this.trackPendingConfigChanges(genericChange);
-        }
-        return genericChange;
-      } else {
-        const title = TITLE_MAP[changeType] ?? '';
-        let result = {
-          type: PENDING_CHANGE_TYPE,
-          kind: UNKNOWN_CHANGE_KIND,
-          ...(title && {
-            title
-          }),
-          changeType,
-          isActive: index >= inactiveCommandCount,
-          fileName
-        };
-        if (selectorId) {
-          result = {
-            ...result,
-            kind: 'control',
-            controlId: selectorId
-          };
-        }
-        return result;
+        return this.buildGenericChange(changeDefinition, changeType, handler, isActive, fileName, textBundle);
       }
+      return this.buildFallbackChange(changeType, selectorId, isActive, fileName);
     }
 
     /**

package/dist/client/cpe/changes/service.ts

@@ -433,6 +433,94 @@ export class ChangeService extends EventTarget {
         }
     }
 
+    /**
+     * Build a PendingGenericChange and track config change path if applicable.
+     *
+     * @param changeDefinition - change definition object
+     * @param changeType - the change type string
+     * @param handler - the generic change handler
+     * @param isActive - whether the change is currently active
+     * @param fileName - file name of the change
+     * @param textBundle - i18n text bundle
+     * @returns Promise resolving to PendingGenericChange
+     */
+    private async buildGenericChange(
+        changeDefinition: ChangeDefinition,
+        changeType: string,
+        handler: ChangeHandler<GenericChange>,
+        isActive: boolean,
+        fileName: string,
+        textBundle: Awaited<ReturnType<typeof getTextBundle>>
+    ): Promise<PendingGenericChange> {
+        const {
+            properties,
+            changeTitle,
+            controlId,
+            changeType: type,
+            subtitle
+        } = await handler(changeDefinition as unknown as GenericChange, {
+            textBundle,
+            appComponent: this.options.rta.getRootControlInstance(),
+            configPropertyControlIdMap: this.configPropertyControlIdMap
+        });
+        const genericChange: PendingGenericChange = {
+            kind: GENERIC_CHANGE_KIND,
+            type: 'pending',
+            changeType: type ?? changeType,
+            ...(subtitle && { subtitle }),
+            isActive,
+            title: textBundle.getText(changeTitle),
+            fileName,
+            ...(controlId && { controlId }),
+            properties
+        };
+        if (changeType === 'appdescr_fe_changePageConfiguration') {
+            const configChangePath = (changeDefinition as ConfigChange).content.entityPropertyChange.propertyPath;
+            if (genericChange.isActive) {
+                this.configPropertyPath.add(configChangePath);
+            } else {
+                // remove value from set if change is undone
+                this.configPropertyPath.delete(configChangePath);
+            }
+            this.trackPendingConfigChanges(genericChange);
+        }
+        return genericChange;
+    }
+
+    /**
+     * Build a fallback PendingChange for changes without a registered handler.
+     *
+     * @param changeType - the change type string
+     * @param selectorId - optional selector/control ID
+     * @param isActive - whether the change is currently active
+     * @param fileName - file name of the change
+     * @returns PendingChange
+     */
+    private buildFallbackChange(
+        changeType: string,
+        selectorId: string | undefined,
+        isActive: boolean,
+        fileName: string
+    ): PendingChange {
+        const title = TITLE_MAP[changeType] ?? '';
+        let result: PendingChange = {
+            type: PENDING_CHANGE_TYPE,
+            kind: UNKNOWN_CHANGE_KIND,
+            ...(title && { title }),
+            changeType,
+            isActive,
+            fileName
+        };
+        if (selectorId) {
+            result = {
+                ...result,
+                kind: 'control',
+                controlId: selectorId
+            };
+        }
+        return result;
+    }
+
     /**
      * Prepares the type of change based on the command and other parameters.
      *
@@ -462,60 +550,11 @@ export class ChangeService extends EventTarget {
         const changeDefinition = change.getDefinition ? change.getDefinition() : (change.getJson() as ChangeDefinition);
         const { fileName } = changeDefinition;
         const handler = GENERIC_CHANGE_HANDLER[changeType as ChangeType] as unknown as ChangeHandler<GenericChange>;
+        const isActive = index >= inactiveCommandCount;
         if (handler) {
-            const {
-                properties,
-                changeTitle,
-                controlId,
-                changeType: type,
-                subtitle
-            } = await handler(changeDefinition as unknown as GenericChange, {
-                textBundle,
-                appComponent: this.options.rta.getRootControlInstance(),
-                configPropertyControlIdMap: this.configPropertyControlIdMap
-            });
-            const genericChange: PendingGenericChange = {
-                kind: GENERIC_CHANGE_KIND,
-                type: 'pending',
-                changeType: type ?? changeType,
-                ...(subtitle && { subtitle }),
-                isActive: index >= inactiveCommandCount,
-                title: textBundle.getText(changeTitle),
-                fileName,
-                ...(controlId && { controlId }),
-                properties
-            };
-            if (changeType === 'appdescr_fe_changePageConfiguration') {
-                const configChangePath = (changeDefinition as ConfigChange).content.entityPropertyChange.propertyPath;
-                if (genericChange.isActive) {
-                        this.configPropertyPath.add(configChangePath);
-                } else {
-                    // remove value from set if change is undone
-                    this.configPropertyPath.delete(configChangePath);
-                }
-                this.trackPendingConfigChanges(genericChange);
-            }
-            return genericChange;
-        } else {
-            const title = TITLE_MAP[changeType] ?? '';
-            let result: PendingChange = {
-                type: PENDING_CHANGE_TYPE,
-                kind: UNKNOWN_CHANGE_KIND,
-                ...(title && { title }),
-                changeType,
-                isActive: index >= inactiveCommandCount,
-                fileName
-            };
-
-            if (selectorId) {
-                result = {
-                    ...result,
-                    kind: 'control',
-                    controlId: selectorId
-                };
-            }
-            return result;
+            return this.buildGenericChange(changeDefinition, changeType, handler, isActive, fileName, textBundle);
         }
+        return this.buildFallbackChange(changeType, selectorId, isActive, fileName);
     }
 
     /**

package/dist/client/cpe/control-data.js

@@ -169,14 +169,188 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
       return rawValue;
     }
   }
+  /**
+   * Build the documentation object for a configuration (manifest) property.
+   *
+   * @param property - manifest property
+   * @returns PropertyDocumentation
+   */
+  function buildConfigPropertyDocumentation(property) {
+    const defValue = ['undefined', 'null'].includes(String(property.defaultValue)) ? '-' : String(property.defaultValue);
+    return {
+      description: property.description,
+      propertyName: property.id,
+      type: property.type,
+      defaultValue: defValue || '-'
+    };
+  }
+
+  /**
+   * Process a manifest configuration property.
+   *
+   * @param property - manifest property
+   * @param control - ui5 control
+   * @returns ProcessedProperty or undefined if the property should be skipped
+   */
+  function processConfigProperty(property, control) {
+    const analyzedType = analyzeManifestProperty(property);
+    if (!analyzedType || property?.restrictedTo?.length && !property?.restrictedTo?.includes(getV4PageType(control))) {
+      return undefined;
+    }
+    return {
+      analyzedType,
+      isEnabled: true,
+      value: property.value,
+      propertyType: PropertyType.Configuration,
+      docu: buildConfigPropertyDocumentation(property)
+    };
+  }
+
+  /**
+   * Process a UI5 control property.
+   *
+   * @param property - control metadata property
+   * @param control - ui5 control
+   * @param hasStableId - whether the control has a stable ID
+   * @param controlProperties - overlay design-time property config
+   * @param controlOverlay - element overlay
+   * @returns ProcessedProperty or undefined if the property should be skipped
+   */
+  function processControlProperty(property, control, hasStableId, controlProperties, controlOverlay) {
+    const analyzedType = analyzePropertyType(property);
+    if (!analyzedType) {
+      return undefined;
+    }
+    const ignore = controlProperties?.[property.name]?.ignore ?? false;
+
+    //updating i18n text for the control if bindingInfo has bindingString
+    const controlNewData = {
+      id: control.getId(),
+      name: property.name,
+      newValue: control.getProperty(property.name)
+    };
+    const bindingInfo = control.getBindingInfo(controlNewData.name);
+    if (bindingInfo?.bindingString !== undefined) {
+      controlNewData.newValue = bindingInfo.bindingString;
+    }
+
+    // A property is enabled if:
+    // 1. The property supports changes
+    // 2. The control has stable ID
+    // 3. It is not configured to be ignored in design time
+    // 4. And control overlay is selectable
+    return {
+      analyzedType,
+      isEnabled: isControlEnabled(analyzedType, hasStableId, ignore, controlOverlay),
+      value: normalizeObjectPropertyValue(controlNewData.newValue),
+      propertyType: PropertyType.ControlProperty
+    };
+  }
+
+  /**
+   * Build a ControlProperty entry from an analyzed property.
+   *
+   * @param property - the raw property (manifest or control metadata)
+   * @param processed - the processed property data
+   * @param selectedControlName - name of the UI5 control class
+   * @returns ControlProperty or undefined if the type is not supported
+   */
+  function buildPropertyEntry(property, processed, selectedControlName) {
+    const {
+      analyzedType,
+      isEnabled,
+      value,
+      propertyType,
+      docu
+    } = processed;
+    const isIcon = testIconPattern(property.name) && selectedControlName !== 'sap.m.Image' && analyzedType.ui5Type === 'sap.ui.core.URI';
+    const ui5Type = analyzedType.ui5Type || undefined;
+    const readableName = convertCamelCaseToPascalCase(property.name);
+    const docuSpread = docu ? {
+      documentation: docu
+    } : {};
+    switch (analyzedType.primitiveType) {
+      case 'enum':
+        {
+          const values = analyzedType.enumValues ?? {};
+          const options = Object.keys(values).map(key => ({
+            key,
+            text: values[key]
+          }));
+          return {
+            type: STRING_VALUE_TYPE,
+            editor: DROPDOWN_EDITOR_TYPE,
+            propertyType,
+            name: property.name,
+            readableName,
+            value: value,
+            isEnabled,
+            ui5Type,
+            options,
+            ...docuSpread
+          };
+        }
+      case 'string':
+        return {
+          type: STRING_VALUE_TYPE,
+          editor: INPUT_EDITOR_TYPE,
+          propertyType,
+          name: property.name,
+          readableName,
+          value: value,
+          isEnabled,
+          isIcon,
+          ui5Type,
+          ...docuSpread
+        };
+      case 'int':
+        return {
+          type: INTEGER_VALUE_TYPE,
+          editor: INPUT_EDITOR_TYPE,
+          propertyType,
+          name: property.name,
+          readableName,
+          value: value,
+          isEnabled,
+          ui5Type,
+          ...docuSpread
+        };
+      case 'float':
+        return {
+          type: FLOAT_VALUE_TYPE,
+          editor: INPUT_EDITOR_TYPE,
+          propertyType,
+          name: property.name,
+          readableName,
+          value: value,
+          isEnabled,
+          ui5Type,
+          ...docuSpread
+        };
+      case 'boolean':
+        return {
+          type: BOOLEAN_VALUE_TYPE,
+          editor: CHECKBOX_EDITOR_TYPE,
+          propertyType,
+          name: property.name,
+          readableName,
+          value: value,
+          isEnabled,
+          ui5Type,
+          ...docuSpread
+        };
+      default:
+        return undefined;
+    }
+  }
+
   /**
    * Build control data.
    *
    * @param control - ui5 control
    * @param changeService - Changeservice for change stack event handling.
    * @param controlOverlay - element overlay
-   * @param includeDocumentation - include documentation flag
-   * @returns Promise<Control>
+   * @returns Control
    */
   function buildControlData(control, changeService, controlOverlay) {
     const controlMetadata = control.getMetadata();
@@ -185,174 +359,25 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
     const overlayData = controlOverlay?.getDesignTimeMetadata().getData();
     const controlProperties = controlOverlay ? overlayData?.properties : undefined;
     const manifestProperties = getManifestProperties(control, changeService, controlOverlay);
-    // Add the control's properties/manifest properties
     const allProperties = {
       ...controlMetadata.getAllProperties(),
       ...manifestProperties
     };
-    let propertyType;
-    const propertyNames = Object.keys(allProperties);
     const properties = [];
-    for (const propertyName of propertyNames) {
+    for (const propertyName of Object.keys(allProperties)) {
       const property = allProperties[propertyName];
-      let analyzedType;
-      let isEnabled;
-      let value;
-      if (property && 'configuration' in property) {
-        propertyType = PropertyType.Configuration;
-        analyzedType = analyzeManifestProperty(property);
-        if (!analyzedType || property?.restrictedTo?.length && !property?.restrictedTo?.includes(getV4PageType(control))) {
-          continue;
-        }
-        isEnabled = true;
-        value = property.value;
-      } else {
-        propertyType = PropertyType.ControlProperty;
-        // the default behavior is that the property is enabled
-        // meaning it's not ignored during design time
-        analyzedType = analyzePropertyType(property);
-        if (!analyzedType) {
-          continue;
-        }
-        let ignore = false;
-        if (controlProperties?.[property.name]) {
-          // check whether the property should be ignored in design time or not
-          // if it's 'undefined' then it's not considered when building isEnabled because it's 'true'
-          ignore = controlProperties[property.name].ignore;
-        }
-
-        //updating i18n text for the control if bindingInfo has bindingString
-        const controlNewData = {
-          id: control.getId(),
-          name: property.name,
-          newValue: control.getProperty(property.name)
-        };
-        const bindingInfo = control.getBindingInfo(controlNewData.name);
-        if (bindingInfo?.bindingString !== undefined) {
-          controlNewData.newValue = bindingInfo.bindingString;
-        }
-
-        // A property is enabled if:
-        // 1. The property supports changes
-        // 2. The control has stable ID
-        // 3. It is not configured to be ignored in design time
-        // 4. And control overlay is selectable
-        isEnabled = isControlEnabled(analyzedType, hasStableId, ignore, controlOverlay);
-        value = normalizeObjectPropertyValue(controlNewData.newValue);
-      }
-      const isIcon = testIconPattern(property.name) && selectedControlName !== 'sap.m.Image' && analyzedType.ui5Type === 'sap.ui.core.URI';
-      const ui5Type = analyzedType.ui5Type || undefined;
-      const readableName = convertCamelCaseToPascalCase(property.name);
-      let docu;
-      if ('configuration' in property) {
-        const defValue = ['undefined', 'null'].includes(String(property.defaultValue)) ? '-' : String(property.defaultValue);
-        docu = {
-          description: property.description,
-          propertyName: property.id,
-          type: property.type,
-          defaultValue: defValue || '-'
-        };
+      const processed = property && 'configuration' in property ? processConfigProperty(property, control) : processControlProperty(property, control, hasStableId, controlProperties, controlOverlay);
+      if (!processed) {
+        continue;
       }
-      switch (analyzedType.primitiveType) {
-        case 'enum':
-          {
-            const values = analyzedType.enumValues ?? {};
-            const options = Object.keys(values).map(key => ({
-              key,
-              text: values[key]
-            }));
-            properties.push({
-              type: STRING_VALUE_TYPE,
-              editor: DROPDOWN_EDITOR_TYPE,
-              propertyType,
-              name: property.name,
-              readableName,
-              value: value,
-              isEnabled,
-              ui5Type,
-              options,
-              ...(docu && {
-                documentation: docu
-              })
-            });
-            break;
-          }
-        case 'string':
-          {
-            properties.push({
-              type: STRING_VALUE_TYPE,
-              editor: INPUT_EDITOR_TYPE,
-              propertyType,
-              name: property.name,
-              readableName,
-              value: value,
-              isEnabled,
-              isIcon,
-              ui5Type,
-              ...(docu && {
-                documentation: docu
-              })
-            });
-            break;
-          }
-        case 'int':
-          {
-            properties.push({
-              type: INTEGER_VALUE_TYPE,
-              editor: INPUT_EDITOR_TYPE,
-              propertyType,
-              name: property.name,
-              readableName,
-              value: value,
-              isEnabled,
-              ui5Type,
-              ...(docu && {
-                documentation: docu
-              })
-            });
-            break;
-          }
-        case 'float':
-          {
-            properties.push({
-              type: FLOAT_VALUE_TYPE,
-              editor: INPUT_EDITOR_TYPE,
-              propertyType,
-              name: property.name,
-              readableName,
-              value: value,
-              isEnabled,
-              ui5Type,
-              ...(docu && {
-                documentation: docu
-              })
-            });
-            break;
-          }
-        case 'boolean':
-          {
-            properties.push({
-              type: BOOLEAN_VALUE_TYPE,
-              editor: CHECKBOX_EDITOR_TYPE,
-              propertyType,
-              name: property.name,
-              readableName,
-              value: value,
-              isEnabled,
-              ui5Type,
-              ...(docu && {
-                documentation: docu
-              })
-            });
-            break;
-          }
+      const entry = buildPropertyEntry(property, processed, selectedControlName);
+      if (entry) {
+        properties.push(entry);
       }
     }
     return {
       id: control.getId(),
-      //the id of the underlying control/aggregation
       type: selectedControlName,
-      //the name of the ui5 class of the control/aggregation
       properties: [...properties].sort((a, b) => a.name > b.name ? 1 : -1),
       name: selectedControlName
     };

package/dist/client/cpe/control-data.ts

@@ -200,14 +200,217 @@ interface NewControlData {
     newValue: unknown;
 }
 
+type PropertyDocumentation = {
+    defaultValue: string;
+    description: string;
+    propertyName: string;
+    type?: string;
+    propertyType?: string;
+};
+
+interface ProcessedProperty {
+    analyzedType: AnalyzedType;
+    isEnabled: boolean;
+    value: unknown;
+    propertyType: PropertyType;
+    docu?: PropertyDocumentation;
+}
+
+/**
+ * Build the documentation object for a configuration (manifest) property.
+ *
+ * @param property - manifest property
+ * @returns PropertyDocumentation
+ */
+function buildConfigPropertyDocumentation(property: MergedSetting): PropertyDocumentation {
+    const defValue = ['undefined', 'null'].includes(String(property.defaultValue))
+        ? '-'
+        : String(property.defaultValue);
+    return {
+        description: property.description,
+        propertyName: property.id,
+        type: property.type,
+        defaultValue: defValue || '-'
+    };
+}
+
+/**
+ * Process a manifest configuration property.
+ *
+ * @param property - manifest property
+ * @param control - ui5 control
+ * @returns ProcessedProperty or undefined if the property should be skipped
+ */
+function processConfigProperty(property: MergedSetting, control: ManagedObject): ProcessedProperty | undefined {
+    const analyzedType = analyzeManifestProperty(property);
+    if (
+        !analyzedType ||
+        (property?.restrictedTo?.length &&
+            !property?.restrictedTo?.includes(getV4PageType(control) as TemplateType))
+    ) {
+        return undefined;
+    }
+    return {
+        analyzedType,
+        isEnabled: true,
+        value: property.value,
+        propertyType: PropertyType.Configuration,
+        docu: buildConfigPropertyDocumentation(property)
+    };
+}
+
+/**
+ * Process a UI5 control property.
+ *
+ * @param property - control metadata property
+ * @param control - ui5 control
+ * @param hasStableId - whether the control has a stable ID
+ * @param controlProperties - overlay design-time property config
+ * @param controlOverlay - element overlay
+ * @returns ProcessedProperty or undefined if the property should be skipped
+ */
+function processControlProperty(
+    property: ManagedObjectMetadataProperties,
+    control: ManagedObject,
+    hasStableId: boolean,
+    controlProperties: Record<string, { ignore: boolean }> | undefined,
+    controlOverlay: ElementOverlay | undefined
+): ProcessedProperty | undefined {
+    const analyzedType = analyzePropertyType(property);
+    if (!analyzedType) {
+        return undefined;
+    }
+    const ignore = controlProperties?.[property.name]?.ignore ?? false;
+
+    //updating i18n text for the control if bindingInfo has bindingString
+    const controlNewData: NewControlData = {
+        id: control.getId(),
+        name: property.name,
+        newValue: control.getProperty(property.name)
+    };
+    const bindingInfo: { bindingString?: string } = control.getBindingInfo(controlNewData.name) as {
+        bindingString?: string;
+    };
+    if (bindingInfo?.bindingString !== undefined) {
+        controlNewData.newValue = bindingInfo.bindingString;
+    }
+
+    // A property is enabled if:
+    // 1. The property supports changes
+    // 2. The control has stable ID
+    // 3. It is not configured to be ignored in design time
+    // 4. And control overlay is selectable
+    return {
+        analyzedType,
+        isEnabled: isControlEnabled(analyzedType, hasStableId, ignore, controlOverlay),
+        value: normalizeObjectPropertyValue(controlNewData.newValue),
+        propertyType: PropertyType.ControlProperty
+    };
+}
+
+/**
+ * Build a ControlProperty entry from an analyzed property.
+ *
+ * @param property - the raw property (manifest or control metadata)
+ * @param processed - the processed property data
+ * @param selectedControlName - name of the UI5 control class
+ * @returns ControlProperty or undefined if the type is not supported
+ */
+function buildPropertyEntry(
+    property: ManagedObjectMetadataProperties | MergedSetting,
+    processed: ProcessedProperty,
+    selectedControlName: string
+): ControlProperty | undefined {
+    const { analyzedType, isEnabled, value, propertyType, docu } = processed;
+    const isIcon =
+        testIconPattern(property.name) &&
+        selectedControlName !== 'sap.m.Image' &&
+        analyzedType.ui5Type === 'sap.ui.core.URI';
+    const ui5Type = analyzedType.ui5Type || undefined;
+    const readableName = convertCamelCaseToPascalCase(property.name);
+    const docuSpread = docu ? { documentation: docu } : {};
+
+    switch (analyzedType.primitiveType) {
+        case 'enum': {
+            const values = analyzedType.enumValues ?? {};
+            const options: { key: string; text: string }[] = Object.keys(values).map((key) => ({
+                key,
+                text: values[key]
+            }));
+            return {
+                type: STRING_VALUE_TYPE,
+                editor: DROPDOWN_EDITOR_TYPE,
+                propertyType,
+                name: property.name,
+                readableName,
+                value: value as string,
+                isEnabled,
+                ui5Type,
+                options,
+                ...docuSpread
+            };
+        }
+        case 'string':
+            return {
+                type: STRING_VALUE_TYPE,
+                editor: INPUT_EDITOR_TYPE,
+                propertyType,
+                name: property.name,
+                readableName,
+                value: value as string,
+                isEnabled,
+                isIcon,
+                ui5Type,
+                ...docuSpread
+            };
+        case 'int':
+            return {
+                type: INTEGER_VALUE_TYPE,
+                editor: INPUT_EDITOR_TYPE,
+                propertyType,
+                name: property.name,
+                readableName,
+                value: value as number,
+                isEnabled,
+                ui5Type,
+                ...docuSpread
+            };
+        case 'float':
+            return {
+                type: FLOAT_VALUE_TYPE,
+                editor: INPUT_EDITOR_TYPE,
+                propertyType,
+                name: property.name,
+                readableName,
+                value: value as number,
+                isEnabled,
+                ui5Type,
+                ...docuSpread
+            };
+        case 'boolean':
+            return {
+                type: BOOLEAN_VALUE_TYPE,
+                editor: CHECKBOX_EDITOR_TYPE,
+                propertyType,
+                name: property.name,
+                readableName,
+                value: value as boolean,
+                isEnabled,
+                ui5Type,
+                ...docuSpread
+            };
+        default:
+            return undefined;
+    }
+}
+
 /**
  * Build control data.
  *
  * @param control - ui5 control
  * @param changeService - Changeservice for change stack event handling.
  * @param controlOverlay - element overlay
- * @param includeDocumentation - include documentation flag
- * @returns Promise<Control>
+ * @returns Control
  */
 export function buildControlData(
     control: ManagedObject,
@@ -218,182 +421,37 @@ export function buildControlData(
     const selectedControlName = controlMetadata.getName();
     const hasStableId = Utils.checkControlId(control);
     const overlayData = controlOverlay?.getDesignTimeMetadata().getData();
-
     const controlProperties = controlOverlay ? overlayData?.properties : undefined;
+
     const manifestProperties = getManifestProperties(control, changeService, controlOverlay);
-    // Add the control's properties/manifest properties
     const allProperties = {
         ...(controlMetadata.getAllProperties() as unknown as {
             [name: string]: ManagedObjectMetadataProperties;
         }),
         ...manifestProperties
     };
-    let propertyType;
-    const propertyNames = Object.keys(allProperties);
+
     const properties: ControlProperty[] = [];
-    for (const propertyName of propertyNames) {
+    for (const propertyName of Object.keys(allProperties)) {
         const property = allProperties[propertyName];
-        let analyzedType;
-        let isEnabled: boolean;
-        let value: unknown;
-        if (property && 'configuration' in property) {
-            propertyType = PropertyType.Configuration;
-            analyzedType = analyzeManifestProperty(property);
-            if (
-                !analyzedType ||
-                (property?.restrictedTo?.length &&
-                    !property?.restrictedTo?.includes(getV4PageType(control) as TemplateType))
-            ) {
-                continue;
-            }
-            isEnabled = true;
-            value = property.value;
-        } else {
-            propertyType = PropertyType.ControlProperty;
-            // the default behavior is that the property is enabled
-            // meaning it's not ignored during design time
-            analyzedType = analyzePropertyType(property);
-            if (!analyzedType) {
-                continue;
-            }
-            let ignore = false;
-            if (controlProperties?.[property.name]) {
-                // check whether the property should be ignored in design time or not
-                // if it's 'undefined' then it's not considered when building isEnabled because it's 'true'
-                ignore = controlProperties[property.name].ignore;
-            }
-
-            //updating i18n text for the control if bindingInfo has bindingString
-            const controlNewData: NewControlData = {
-                id: control.getId(),
-                name: property.name,
-                newValue: control.getProperty(property.name)
-            };
-            const bindingInfo: { bindingString?: string } = control.getBindingInfo(controlNewData.name) as {
-                bindingString?: string;
-            };
-            if (bindingInfo?.bindingString !== undefined) {
-                controlNewData.newValue = bindingInfo.bindingString;
-            }
-
-            // A property is enabled if:
-            // 1. The property supports changes
-            // 2. The control has stable ID
-            // 3. It is not configured to be ignored in design time
-            // 4. And control overlay is selectable
-            isEnabled = isControlEnabled(analyzedType, hasStableId, ignore, controlOverlay);
+        const processed =
+            property && 'configuration' in property
+                ? processConfigProperty(property, control)
+                : processControlProperty(property, control, hasStableId, controlProperties, controlOverlay);
 
-            value = normalizeObjectPropertyValue(controlNewData.newValue);
+        if (!processed) {
+            continue;
         }
-        const isIcon =
-            testIconPattern(property.name) &&
-            selectedControlName !== 'sap.m.Image' &&
-            analyzedType.ui5Type === 'sap.ui.core.URI';
-        const ui5Type = analyzedType.ui5Type || undefined;
-        const readableName = convertCamelCaseToPascalCase(property.name);
-        let docu:
-            | {
-                  defaultValue: string;
-                  description: string;
-                  propertyName: string;
-                  type?: string;
-                  propertyType?: string;
-              }
-            | undefined;
-        if ('configuration' in property) {
-            const defValue = ['undefined', 'null'].includes(String(property.defaultValue))
-                ? '-'
-                : String(property.defaultValue);
-            docu = {
-                description: property.description,
-                propertyName: property.id,
-                type: property.type,
-                defaultValue: defValue || '-'
-            };
-        }
-        switch (analyzedType.primitiveType) {
-            case 'enum': {
-                const values = analyzedType.enumValues ?? {};
-                const options: { key: string; text: string }[] = Object.keys(values).map((key) => ({
-                    key,
-                    text: values[key]
-                }));
-                properties.push({
-                    type: STRING_VALUE_TYPE,
-                    editor: DROPDOWN_EDITOR_TYPE,
-                    propertyType,
-                    name: property.name,
-                    readableName,
-                    value: value as string,
-                    isEnabled,
-                    ui5Type,
-                    options,
-                    ...(docu && { documentation: docu })
-                });
-                break;
-            }
-            case 'string': {
-                properties.push({
-                    type: STRING_VALUE_TYPE,
-                    editor: INPUT_EDITOR_TYPE,
-                    propertyType,
-                    name: property.name,
-                    readableName,
-                    value: value as string,
-                    isEnabled,
-                    isIcon,
-                    ui5Type,
-                    ...(docu && { documentation: docu })
-                });
-                break;
-            }
-            case 'int': {
-                properties.push({
-                    type: INTEGER_VALUE_TYPE,
-                    editor: INPUT_EDITOR_TYPE,
-                    propertyType,
-                    name: property.name,
-                    readableName,
-                    value: value as number,
-                    isEnabled,
-                    ui5Type,
-                    ...(docu && { documentation: docu })
-                });
-                break;
-            }
-            case 'float': {
-                properties.push({
-                    type: FLOAT_VALUE_TYPE,
-                    editor: INPUT_EDITOR_TYPE,
-                    propertyType,
-                    name: property.name,
-                    readableName,
-                    value: value as number,
-                    isEnabled,
-                    ui5Type,
-                    ...(docu && { documentation: docu })
-                });
-                break;
-            }
-            case 'boolean': {
-                properties.push({
-                    type: BOOLEAN_VALUE_TYPE,
-                    editor: CHECKBOX_EDITOR_TYPE,
-                    propertyType,
-                    name: property.name,
-                    readableName,
-                    value: value as boolean,
-                    isEnabled,
-                    ui5Type,
-                    ...(docu && { documentation: docu })
-                });
-                break;
-            }
+
+        const entry = buildPropertyEntry(property, processed, selectedControlName);
+        if (entry) {
+            properties.push(entry);
         }
     }
+
     return {
-        id: control.getId(), //the id of the underlying control/aggregation
-        type: selectedControlName, //the name of the ui5 class of the control/aggregation
+        id: control.getId(),
+        type: selectedControlName,
         properties: [...properties].sort((a, b) => (a.name > b.name ? 1 : -1)),
         name: selectedControlName
     };

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "0.25.34",
+  "version": "0.25.37",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,14 +27,14 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.13.6",
-    "@sap-ux/adp-tooling": "0.18.125",
-    "@sap-ux/btp-utils": "1.1.14",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.23",
+    "@sap-ux/adp-tooling": "0.18.128",
     "@sap-ux/feature-toggle": "0.3.8",
+    "@sap-ux/btp-utils": "1.1.14",
     "@sap-ux/logger": "0.8.5",
-    "@sap-ux/project-access": "1.36.1",
-    "@sap-ux/system-access": "0.7.9",
-    "@sap-ux/i18n": "0.3.10"
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.24",
+    "@sap-ux/project-access": "1.36.2",
+    "@sap-ux/system-access": "0.7.10",
+    "@sap-ux/i18n": "0.3.11"
   },
   "devDependencies": {
     "@sap-ux-private/playwright": "0.2.15",
@@ -53,10 +53,10 @@
     "nock": "14.0.11",
     "npm-run-all2": "8.0.4",
     "supertest": "7.2.2",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.25.34",
-    "@sap-ux/axios-extension": "1.25.33",
-    "@sap-ux/store": "1.5.13",
-    "@sap-ux/ui5-info": "0.13.20"
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.25.37",
+    "@sap-ux/axios-extension": "1.25.34",
+    "@sap-ux/ui5-info": "0.13.20",
+    "@sap-ux/store": "1.5.13"
   },
   "peerDependencies": {
     "express": "4"