@zohodesk/library-platform 1.0.1 → 1.1.0-exp.1

package/es/library/custom-component/adapters/gateways/service/Service.js

@@ -1,11 +1,11 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import DispatchUseCase from "../../../usecases/interactors/DispatchUseCase";
-import InitializeUseCase from "../../../usecases/interactors/InitializeUseCase";
-import MountUsecase from "../../../usecases/interactors/MountUseCase";
-import UnmountUsecase from "../../../usecases/interactors/UnmountUseCase";
-import UpdatePropertyUseCase from "../../../usecases/interactors/UpdatePropertyUseCase";
-import UpdateStateUseCase from "../../../usecases/interactors/UpdateStateUseCase";
+import DispatchUseCase from "../../../applications/usecases/DispatchUseCase";
+import InitializeUseCase from "../../../applications/usecases/InitializeUseCase";
+import MountUsecase from "../../../applications/usecases/MountUseCase";
+import UnmountUsecase from "../../../applications/usecases/UnmountUseCase";
+import UpdatePropertyUseCase from "../../../applications/usecases/UpdatePropertyUseCase";
+import UpdateStateUseCase from "../../../applications/usecases/UpdateStateUseCase";
 
 class Service {
   constructor(dependencies) {

package/es/library/custom-component/{usecases → applications}/entities-factory/BehavioursFactory.js

@@ -1,4 +1,4 @@
-import Behaviour from "../../entities/Behaviour";
+import Behaviour from "../../domain/entities/Behaviour";
 import EventHandlersFactory from "./EventHandlersFactory";
 import PropertiesFactory from "./PropertiesFactory";
 /* eslint-disable max-lines-per-function, @zohodesk/architecturerules/no-returnStatement-rule */

package/es/library/custom-component/{usecases → applications}/entities-factory/ComponentFactory.js

@@ -1,6 +1,6 @@
-import Component from "../../entities/Component";
-import LifeCycleAction from "../../entities/LifeCycleAction";
-import State from "../../entities/State";
+import Component from "../../domain/entities/Component";
+import LifeCycleAction from "../../domain/entities/LifeCycleAction";
+import State from "../../domain/entities/State";
 import EventHandlersFactory from "./EventHandlersFactory";
 import BehavioursFactory from "./BehavioursFactory";
 import PropertiesFactory from "./PropertiesFactory";

package/es/library/custom-component/{usecases → applications}/entities-factory/EventHandlersFactory.js

@@ -1,4 +1,4 @@
-import EventHandlers from "../../entities/EventHandlers";
+import EventHandlers from "../../domain/entities/EventHandlers";
 export default function EventHandlersFactory(eventHandlers) {
   let eventHandlerMap = new Map();
   Object.keys(eventHandlers).forEach(key => {

package/es/library/custom-component/{usecases → applications}/entities-factory/PropertiesFactory.js

@@ -1,5 +1,5 @@
-import Properties from "../../entities/Properties";
-import Property from "../../entities/Property";
+import Properties from "../../domain/entities/Properties";
+import Property from "../../domain/entities/Property";
 export default function PropertiesFactory(_ref) {
   let {
     properties,
@@ -7,7 +7,13 @@ export default function PropertiesFactory(_ref) {
   } = _ref;
   let propertyMap = new Map();
   Object.keys(properties).forEach(key => {
-    let property = new Property(properties[key]);
+    let propertyData = properties[key];
+
+    if (propertyData.name === undefined) {
+      propertyData.name = key;
+    }
+
+    let property = new Property(propertyData);
     propertyMap.set(key, property);
   });
   let propertiesObject = new Properties(propertyMap, componentName);

package/es/library/custom-component/{usecases/interactors → applications/usecases}/UnmountUseCase.js

@@ -12,8 +12,8 @@ class UnmountUsecase extends AbstractUseCase {
     let unmountAction = component.getUnmountAction();
 
     try {
-      eventManager.unSubscribe(eventHanlders);
       eventManager.dispatch(unmountAction);
+      eventManager.unSubscribe(eventHanlders);
       repository.clear();
     } catch (e) {
       presenter.setError([]);

package/es/library/custom-component/{entities → domain/entities}/Component.js

@@ -28,9 +28,19 @@ export default class Component {
     this._behavioursProperties = {};
   }
 
+  getAllBehavioursPropertiesWithValue() {
+    let output = {};
+    Object.keys(this._behavioursProperties).forEach((value, key) => {
+      output[value] = this._behavioursProperties[value].getValue();
+    });
+    return output;
+  }
+
   mergeStateAndProps() {
     return { ...this._state.getState(),
-      properties: this._properties.getAllPropertiesValue()
+      properties: { ...this._properties.getAllPropertiesValue(),
+        ...this.getAllBehavioursPropertiesWithValue()
+      }
     };
   }
 
@@ -103,17 +113,30 @@ export default class Component {
       if (this._behavioursProperties[key]) {
         let property = this._behavioursProperties[key];
         let optionalSchema = property.getTypeMetadata().schema;
-        return this._properties.validateSingleProperty(jsonValidator, key, newProps[key], optionalSchema);
+
+        let isValid = this._properties.validateSingleProperty(jsonValidator, key, newProps[key], optionalSchema);
+
+        if (isValid) {
+          property.updateValue(newProps[key]);
+        } // return isValid
+
       } else if (this._properties.findProperty(key)) {
         let property = this._properties.findProperty(key);
 
         let schema = property.getTypeMetadata().schema;
-        return this._properties.validateSingleProperty(jsonValidator, key, newProps[key], schema);
+
+        let isValid = this._properties.validateSingleProperty(jsonValidator, key, newProps[key], schema);
+
+        if (isValid) {
+          property.updateValue(newProps[key]);
+        } // return isValid
+
       } else {
         throw new Error(`props '${key}' not exist `);
       }
-    });
-    return this._properties.updateAllPropertiesValue(jsonValidator, newProps);
+    }); // return this._properties.updateAllPropertiesValue(jsonValidator, newProps);
+
+    return true;
   }
 
   updateState(state) {
@@ -137,10 +160,14 @@ export default class Component {
 
     const properties = this._properties.getAllPropertiesValue();
 
+    const behavioursProperties = this.getAllBehavioursPropertiesWithValue();
     const behaviours = this.getAllBehavioursInitialState();
+    let allProperties = { ...properties,
+      ...behavioursProperties
+    };
 
     const initialState = this._stateInitializer({
-      properties
+      properties: allProperties
     });
 
     this.updateState({ ...initialState,
@@ -149,7 +176,9 @@ export default class Component {
   }
 
   getProperties() {
-    return this._properties.getAllPropertiesValue();
+    return { ...this._properties.getAllPropertiesValue(),
+      ...this.getAllBehavioursPropertiesWithValue()
+    };
   }
 
   getEventHandlersWrapper() {

package/es/library/custom-component/{entities → domain/entities}/DefaultAppendToActionPayload.js

@@ -1,10 +1,10 @@
 export default {
-  name: "appendToActionPayload",
+  name: 'appendToActionPayload',
   required: false,
   defaultValue: null,
   typeMetadata: {
     schema: {
-      type: "object"
+      type: 'object'
     }
   }
 };

package/es/library/custom-component/{entities → domain/entities}/Properties.js

@@ -2,7 +2,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import Property from "./Property";
 import defaultAppendToActionPayload from "./DefaultAppendToActionPayload";
-import getRefPropertySchema from "../../../cc/component/properties/getRefPropertySchema";
+import getRefPropertySchema from "../../../../cc/component/properties/getRefPropertySchema";
 export default class Properties {
   constructor(properties, componentName) {
     this.componentName = componentName;
@@ -27,18 +27,17 @@ export default class Properties {
 
 
   updateAllPropertiesValue(validator, propertyValue) {
-    this.validateProperties(validator, propertyValue);
-
+    // this.validateProperties(validator, propertyValue);
     if (!this.isEqual(propertyValue)) {
       let isChanged = false;
       Object.keys(propertyValue).forEach(key => {
         let property = this.findProperty(key);
 
         if (property.getValue() == null || property.getValue() == undefined) {
-          property.updateValue(propertyValue[key]);
+          // property.updateValue(propertyValue[key]);
           isChanged = true;
         } else if (property.getValue() != propertyValue[key]) {
-          property.updateValue(propertyValue[key]);
+          // property.updateValue(propertyValue[key]);
           isChanged = true;
         }
       });

package/es/library/custom-component/frameworks/ui/__testcases__/CreateCustomComponent.spec.js

@@ -0,0 +1,106 @@
+/* eslint-disable react/prop-types */
+import React from 'react';
+import createCustomComponent from "../createCustomComponent";
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+
+let View = (_ref, ref) => {
+  let {
+    state
+  } = _ref;
+  return /*#__PURE__*/React.createElement("div", {
+    ref: ref,
+    "data-testid": "custom-component",
+    "data-title": state.properties.title
+  }, "Hey");
+};
+
+let mockComponentCC = {
+  name: 'mockComponent',
+  View: View,
+  properties: {},
+  eventHandlers: {
+    "mockComponent#MOUNT": jest.fn(),
+    "mockComponent#UN_MOUNT": jest.fn(),
+    "mockComponent#UPDATE_PROPERTIES": jest.fn()
+  },
+  properties: {
+    title: {
+      name: 'titile',
+      defaultValue: 'default',
+      typeMetadata: {
+        schema: {
+          type: 'string'
+        }
+      }
+    }
+  },
+  behaviour: [{
+    name: 'test',
+    properties: {},
+    setInitialState: () => ({}),
+    eventHandlers: {}
+  }]
+};
+describe('createCustomComponent integration test', () => {
+  // basic rendering test
+  it('should mount the component and check the rendering', () => {
+    const CustomComponent = createCustomComponent(mockComponentCC);
+    let {
+      container
+    } = render( /*#__PURE__*/React.createElement(CustomComponent, null));
+    expect(container).toBeInTheDocument();
+  }); // test if the ref is passed to the component
+
+  it('should pass the ref to the component', () => {
+    const CustomComponent = createCustomComponent(mockComponentCC);
+    let ref = /*#__PURE__*/React.createRef();
+    render( /*#__PURE__*/React.createElement(CustomComponent, {
+      ref: ref
+    }));
+    expect(typeof ref.current).toBe('object');
+  });
+  it('should pass props to the custom component', () => {
+    const CustomComponent = createCustomComponent(mockComponentCC);
+    render( /*#__PURE__*/React.createElement(CustomComponent, null));
+    const component = screen.getByTestId('custom-component');
+    expect(component).toHaveAttribute('data-testid', 'custom-component');
+  });
+  it('should initialize custom behavior state', () => {
+    const CustomComponent = createCustomComponent(mockComponentCC);
+    render( /*#__PURE__*/React.createElement(CustomComponent, null));
+    const {
+      behaviour
+    } = mockComponentCC;
+    expect(behaviour[0].setInitialState()).toEqual({});
+  });
+  it('should call the MOUNT event handler on mounting', () => {
+    const CustomComponent = createCustomComponent(mockComponentCC);
+    render( /*#__PURE__*/React.createElement(CustomComponent, null));
+    expect(mockComponentCC.eventHandlers['mockComponent#MOUNT']).toHaveBeenCalled();
+  });
+  it('should update component when props change and update property event', () => {
+    const CustomComponent = createCustomComponent(mockComponentCC);
+    const {
+      rerender
+    } = render( /*#__PURE__*/React.createElement(CustomComponent, {
+      title: "Initial Title"
+    }));
+    let component = screen.getByTestId('custom-component');
+    expect(component).toHaveAttribute('data-title', 'Initial Title');
+    rerender( /*#__PURE__*/React.createElement(CustomComponent, {
+      title: "Updated Title"
+    }));
+    component = screen.getByTestId('custom-component');
+    expect(component).toHaveAttribute('data-title', 'Updated Title');
+    expect(mockComponentCC.eventHandlers['mockComponent#UPDATE_PROPERTIES']).toHaveBeenCalled();
+  });
+  it('should clean up properly on unmount', () => {
+    const CustomComponent = createCustomComponent(mockComponentCC);
+    const {
+      unmount
+    } = render( /*#__PURE__*/React.createElement(CustomComponent, null));
+    unmount();
+    expect(mockComponentCC.eventHandlers['mockComponent#UN_MOUNT']).toHaveBeenCalled();
+  });
+});

package/es/library/dot/components/action-location/frameworks/ui/ActionComponentMapping.js

@@ -0,0 +1,5 @@
+import ActionIcon from "../../../../legacy-to-new-arch/action-icon/frameworks/ui/ActionIcon";
+const ActionComponentMapping = {
+  'ActionIcon': ActionIcon
+};
+export default ActionComponentMapping;

package/es/library/dot/components/action-location/frameworks/ui/ActionLocationView.js

@@ -1,38 +1,17 @@
 import React from 'react';
-import Flex from '@zohodesk/layout/es/Flex/Flex';
 import ComponentRegistry from "../../../../../custom-component/frameworks/ui/ComponentRegistry";
-import ActionIcon from "../../../../legacy-to-new-arch/action-icon/ActionIcon";
-const defaultUiMapping = {
-  ActionIcon: ActionIcon
-};
+import ActionsRenderer from "../../../actions-renderer/frameworks/ui/ActionsRenderer";
 export default function ActionLocationView(_ref, ref) {
   let {
     state
   } = _ref;
   const {
-    actions
+    actions,
+    type
   } = state.properties;
-  return /*#__PURE__*/React.createElement(Flex, {
-    ref: ref,
-    $flag_fullsize: true,
-    $ui_displayMode: "flex",
-    $ui_alignItems: "center",
-    $ui_justifyContent: "end"
-  }, actions.map((action, index) => {
-    const {
-      type,
-      properties,
-      eventMappings
-    } = action;
-    /* eslint-disable-next-line @zohodesk/architecturerules/no-defaultProps-rule */
-
-    const ActionUiType = defaultUiMapping[type] || ComponentRegistry.get(type);
-    return /*#__PURE__*/React.createElement(ActionUiType, {
-      key: index,
-      ...properties,
-      appendToActionPayload: {
-        eventMappings
-      }
-    });
-  }));
+  const ActionsRendererComponent = ComponentRegistry.get(type) || ActionsRenderer;
+  return /*#__PURE__*/React.createElement(ActionsRendererComponent, {
+    actions: actions,
+    getRef: ref
+  });
 }

package/es/library/dot/components/actions-renderer/frameworks/ui/ActionsRenderer.js

@@ -0,0 +1,9 @@
+import { createCustomComponent } from "../../../../../custom-component";
+import ActionLocationProperties from "../../../../../../cc/action-location/Properties";
+import ActionsRendererView from "./ActionsRendererView";
+export default createCustomComponent({
+  name: 'ActionsRenderer',
+  properties: ActionLocationProperties,
+  eventHandlers: {},
+  View: ActionsRendererView
+});

package/es/library/dot/components/actions-renderer/frameworks/ui/ActionsRendererView.js

@@ -0,0 +1,37 @@
+import React from 'react';
+import ComponentRegistry from "../../../../../custom-component/frameworks/ui/ComponentRegistry";
+import ActionComponentMapping from "../../../action-location/frameworks/ui/ActionComponentMapping";
+import Flex from '@zohodesk/layout/es/Flex/Flex';
+
+function ActionsRendererView(_ref, ref) {
+  let {
+    state
+  } = _ref;
+  const {
+    actions
+  } = state.properties;
+  return /*#__PURE__*/React.createElement(Flex, {
+    ref: ref,
+    $ui_displayMode: "inline",
+    $ui_alignItems: "center"
+  }, actions.map((action, index) => {
+    const {
+      type,
+      properties,
+      eventMappings
+    } = action;
+    /* eslint-disable-next-line @zohodesk/architecturerules/no-defaultProps-rule */
+
+    const ActionUiType = ActionComponentMapping[type] || ComponentRegistry.get(type);
+    return /*#__PURE__*/React.createElement(ActionUiType, {
+      key: index,
+      ...properties,
+      appendToActionPayload: {
+        eventMappings
+      }
+    });
+  }));
+}
+
+;
+export default ActionsRendererView;

package/es/library/dot/components/table-list/frameworks/ui/sub-components/Rows.js

@@ -1,7 +1,5 @@
 import React from 'react';
 import Row from "./row/Row";
-const emptyArray = Object.freeze([]);
-const emptyObject = {};
 
 function Rows(_ref) {
   let {
@@ -25,15 +23,13 @@ function getRowProps(row, headers, isFlexibleColumns, isSelectionEnabled, resize
     isSelected,
     isSelectable,
     selectionTooltip,
-    clickAction,
-    rowActions
+    rowActionLocation
   } = row;
   const updatedColumns = getUpdatedColumns(columns, headers);
   return {
     id,
-    columns: updatedColumns || emptyArray,
-    clickAction: clickAction || emptyObject,
-    rowActions: rowActions || emptyArray,
+    columns: updatedColumns,
+    rowActionLocation,
     isSelected,
     isSelectable,
     selectionTooltip,

package/es/library/dot/components/table-list/frameworks/ui/sub-components/header/HeaderData.js

@@ -29,15 +29,17 @@ function HeaderData(_ref) {
       $ui_size: size,
       $ui_align: alignment,
       $data_width: resizedWidth,
-      $flag_flexible: isFlexibleColumns
+      $flag_flexible: isFlexibleColumns,
+      $a11yAttributes_container: {
+        'aria-sort': sortable ? sortedBy : 'none'
+      }
     }, /*#__PURE__*/React.createElement(HeaderText, {
       id: id,
       name: name,
       text: text,
       sortable: sortable,
       sortedBy: sortedBy,
-      sortTooltip: sortTooltip // Yet to be implemented
-      ,
+      sortTooltip: sortTooltip,
       dispatch: dispatch
     }), /*#__PURE__*/React.createElement(ColumnResizer, {
       isResizerEnabled: isResizerEnabled,

package/es/library/dot/components/table-list/frameworks/ui/sub-components/row/Row.js

@@ -25,11 +25,15 @@ function RowView(_ref, ref) {
   const {
     id,
     columns,
-    rowActions,
+    rowActionLocation,
     isFlexibleColumns,
     resizedColumnsWidth,
     hasActions
   } = state.properties;
+  const {
+    type,
+    actions
+  } = rowActionLocation;
   return /*#__PURE__*/React.createElement(TableRow, {
     key: id,
     ref: ref,
@@ -54,8 +58,8 @@ function RowView(_ref, ref) {
     isFlexibleColumns
   }), renderRowActions({
     hasActions,
-    rowActions,
-    dispatch
+    type,
+    actions
   }));
 }
 
@@ -94,13 +98,13 @@ function renderColumns(_ref3) {
 function renderRowActions(_ref4) {
   let {
     hasActions,
-    rowActions,
-    dispatch
+    actions,
+    type
   } = _ref4;
   return /*#__PURE__*/React.createElement(RowActions, {
     hasActions: hasActions,
-    actions: rowActions,
-    dispatch: dispatch
+    type: type,
+    actions: actions
   });
 }
 

package/es/library/dot/components/table-list/frameworks/ui/sub-components/row/RowActions.js

@@ -4,13 +4,16 @@ import ActionLocation from "../../../../../action-location/frameworks/ui/ActionL
 export default function RowActions(_ref) {
   let {
     hasActions,
+    type = '',
     actions
   } = _ref;
 
+  // TODO: Need to fix the defaultValue from properties => CC
   if (hasActions) {
     return /*#__PURE__*/React.createElement(TableAction, {
       $ui_size: "medium"
     }, /*#__PURE__*/React.createElement(ActionLocation, {
+      type: type,
       actions: actions
     }));
   }

package/es/library/dot/legacy-to-new-arch/action-icon/{ActionIcon.js → frameworks/ui/ActionIcon.js}

@@ -1,5 +1,5 @@
-import { createCustomComponent } from "../../../custom-component";
-import Properties from "../../../../cc/action-icon/Properties";
+import { createCustomComponent } from "../../../../../custom-component";
+import Properties from "../../../../../../cc/action-icon/Properties";
 import ActionIconView from "./ActionIconView";
 const ActionIcon = createCustomComponent({
   name: 'ActionIcon',

package/es/library/dot/legacy-to-new-arch/action-icon/{ActionIconView.js → frameworks/ui/ActionIconView.js}

@@ -1,6 +1,8 @@
 import React from 'react';
 import ActionIcon from '@zohodesk-private/desk-components/es/ActionIcon/ActionIcon';
-import Constants from "../../../../cc/action-icon/Constants";
+import Constants from "../../../../../../cc/action-icon/Constants"; // @ts-ignore
+
+import style from "./css/ActionIcon.module.css";
 export default function ActionIconView(_ref, ref) {
   let {
     state,
@@ -9,22 +11,26 @@ export default function ActionIconView(_ref, ref) {
   const {
     icon,
     label,
-    hoverVariant
+    hoverVariant,
+    isDisabled,
+    isVisible
   } = state.properties;
   const {
     dispatch
   } = helpers;
   return /*#__PURE__*/React.createElement("span", {
-    ref: ref
+    ref: ref,
+    className: isVisible ? '' : style.hide
   }, /*#__PURE__*/React.createElement(ActionIcon, {
     $ui_iconName: icon,
     $ui_hoverVariant: hoverVariant,
     $flag_gap: true,
+    $flag_disabled: isDisabled,
     $i18n_tooltip: label,
-    $event_onClick: () => {
+    $event_onClick: !isDisabled ? () => {
       dispatch({
         type: Constants.ACTION_ICON_CLICKED
       });
-    }
+    } : null
   }));
 }

package/es/library/dot/legacy-to-new-arch/action-icon/frameworks/ui/css/ActionIcon.module.css

@@ -0,0 +1,3 @@
+.hide {
+    display: none
+}

package/es/library/dot/legacy-to-new-arch/index.js

@@ -6,4 +6,4 @@ export { default as Link } from "./link/frameworks/ui/Link";
 export { default as Switch } from "./switch/frameworks/ui/Switch";
 export { default as Tags } from "./tags/frameworks/ui/Tags";
 export { default as Text } from "./text/frameworks/ui/Text";
-export { default as ActionIcon } from "./action-icon/ActionIcon";
+export { default as ActionIcon } from "./action-icon/frameworks/ui/ActionIcon";

package/es/platform/zdata-broker/adapters/gateways/Repository.js

@@ -1,6 +1,6 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import DataBrokerFactory from "../../usecases/entities-factory/DataBrokerFactory";
+import DataBrokerFactory from "../../applications/entities-factory/DataBrokerFactory";
 export default class Repository {
   constructor() {
     _defineProperty(this, "state", void 0);

package/es/platform/zdata-broker/adapters/gateways/Service.js

@@ -1,10 +1,10 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import RegisterUseCase from "../../usecases/interactors/RegisterUseCase";
-import ExecuteActionUseCase from "../../usecases/interactors/ExecuteActionUseCase";
-import FailureUseCase from "../../usecases/interactors/FailureUseCase";
-import SuccessUseCase from "../../usecases/interactors/SuccessUseCase";
-import NoContentUseCase from "../../usecases/interactors/NoContentUseCase";
+import RegisterUseCase from "../../applications/usecases/RegisterUseCase";
+import ExecuteActionUseCase from "../../applications/usecases/ExecuteActionUseCase";
+import FailureUseCase from "../../applications/usecases/FailureUseCase";
+import SuccessUseCase from "../../applications/usecases/SuccessUseCase";
+import NoContentUseCase from "../../applications/usecases/NoContentUseCase";
 export default class Service {
   constructor(dependencies) {
     _defineProperty(this, "registerUseCase", void 0);

package/es/platform/zdata-broker/adapters/gateways/TemplateHelpers.js

@@ -17,6 +17,27 @@ export default class TemplateHelpers {
     });
   }
 
+  isOnlyTemplateVariables(inputString) {
+    return /^{{(.*?)}}$/.test(inputString);
+  }
+
+  replaceTemplateVariablesInObject(properties, replacementObj) {
+    const replaced = {};
+    Object.entries(properties).forEach(_ref => {
+      let [key, value] = _ref;
+
+      if (typeof value === 'string' && this.isOnlyTemplateVariables(value)) {
+        const path = value.replace(/{{(.*?)}}/g, '$1');
+        replaced[key] = this.getPathValue(path, replacementObj);
+      } else if (typeof value === 'string' && value.includes('{{')) {
+        replaced[key] = this.replaceTemplateVariables(value, replacementObj);
+      } else {
+        replaced[key] = value;
+      }
+    });
+    return replaced;
+  }
+
   objectToQueryString(obj) {
     return Object.keys(obj).map(key => encodeURIComponent(key) + '=' + encodeURIComponent(obj[key])).join('&');
   }

package/es/platform/zdata-broker/{usecases → applications}/entities-factory/APITemplatesFactory.js

@@ -1,5 +1,5 @@
-import APITemplate from "../../entities/APITemplate";
-import APITemplates from "../../entities/APITemplates";
+import APITemplate from "../../domain/entities/APITemplate";
+import APITemplates from "../../domain/entities/APITemplates";
 export default class APITemplatesFactory {
   static create(httpTemplates, templateHelpers) {
     const apiTemplatesMap = new Map();