@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.macros/test/sap/fe/macros/jest/__snapshots__/FilterBarMacro.spec.ts.snap

@@ -11,8 +11,8 @@ exports[`Filter Bar templating 1 SearchRestriction=false, do not show search fie
     filterChanged=\\".handlers.onFiltersChanged\\"
   >
     <!--
-			By using @FE we introduce a dependency between macro and sap fe converters.
-			This dependency will be removed after FilterBar refactoring
+			By using @FE, SAP Fiori elements introduces a dependency between the building block and our converters.
+			This dependency will be removed after the refactoring of the FilterBar
 		-->
     <control:FilterBar
       xmlns:control=\\"sap.fe.core.controls\\"
@@ -30,6 +30,7 @@ exports[`Filter Bar templating 1 SearchRestriction=false, do not show search fie
       initialLayout=\\"compact\\"
       xmlns:ns2=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
       ns2:localId=\\"FilterBar\\"
+      ns2:hideBasicSearch=\\"true\\"
       ns2:showDraftEditState=\\"true\\"
       ns2:useSemanticDateRange=\\"true\\"
       ns2:selectionFields='{\\"ui5object\\":true}'
@@ -86,7 +87,7 @@ exports[`Filter Bar templating 1 SearchRestriction=false, do not show search fie
 "
 `;
 
-exports[`Filter Bar templating 1 With event handlers 1`] = `
+exports[`Filter Bar templating 1 With Custom Filters added from the macro 1`] = `
 "<root>
   <macro:FilterBarAPI
     xmlns:macro=\\"sap.fe.macros\\"
@@ -97,8 +98,8 @@ exports[`Filter Bar templating 1 With event handlers 1`] = `
     filterChanged=\\".handlers.onFiltersChanged\\"
   >
     <!--
-			By using @FE we introduce a dependency between macro and sap fe converters.
-			This dependency will be removed after FilterBar refactoring
+			By using @FE, SAP Fiori elements introduces a dependency between the building block and our converters.
+			This dependency will be removed after the refactoring of the FilterBar
 		-->
     <control:FilterBar
       xmlns:control=\\"sap.fe.core.controls\\"
@@ -111,18 +112,624 @@ exports[`Filter Bar templating 1 With event handlers 1`] = `
       p13nMode=\\"Item,Value\\"
       search=\\"API.handleSearch($event)\\"
       filtersChanged=\\"API.handleFilterChanged($event)\\"
+      filterConditions='{\\"StringProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[\\"abc\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"IntegerProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[1],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"$editState\\":[{\\"operator\\":\\"DRAFT_EDIT_STATE\\",\\"values\\":[\\"ALL\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}]}'
       suspendSelection=\\"false\\"
       showMessages=\\"false\\"
       initialLayout=\\"compact\\"
       xmlns:ns2=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
       ns2:localId=\\"FilterBar\\"
+      ns2:hideBasicSearch=\\"false\\"
       ns2:showDraftEditState=\\"true\\"
       ns2:useSemanticDateRange=\\"true\\"
-      ns2:selectionFields='{\\"ui5object\\":true,\\"customData\\":[{\\"$PropertyPath\\":\\"StringProperty\\"},{\\"$PropertyPath\\":\\"IntegerProperty\\"},{\\"$PropertyPath\\":\\"NumberProperty\\"},{\\"$PropertyPath\\":\\"DateProperty\\"},{\\"$PropertyPath\\":\\"PropertyWithValueHelp\\"}]}'
+      ns2:selectionFields='{\\"ui5object\\":true,\\"customData\\":[{\\"key\\":\\"StringProperty\\",\\"annotationPath\\":\\"/RootEntity/StringProperty\\",\\"conditionPath\\":\\"StringProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"String Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"IntegerProperty\\",\\"annotationPath\\":\\"/RootEntity/IntegerProperty\\",\\"conditionPath\\":\\"IntegerProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Integer Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"NumberProperty\\",\\"annotationPath\\":\\"/RootEntity/NumberProperty\\",\\"conditionPath\\":\\"NumberProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Number Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"DateProperty\\",\\"annotationPath\\":\\"/RootEntity/DateProperty\\",\\"conditionPath\\":\\"DateProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Date Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithValueHelp\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithValueHelp\\",\\"conditionPath\\":\\"PropertyWithValueHelp\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Property with Value Help\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"ID\\",\\"annotationPath\\":\\"/RootEntity/ID\\",\\"conditionPath\\":\\"ID\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"ID\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"BooleanProperty\\",\\"annotationPath\\":\\"/RootEntity/BooleanProperty\\",\\"conditionPath\\":\\"BooleanProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Boolean Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TimeProperty\\",\\"annotationPath\\":\\"/RootEntity/TimeProperty\\",\\"conditionPath\\":\\"TimeProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Time Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithUnit\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithUnit\\",\\"conditionPath\\":\\"PropertyWithUnit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithCurrency\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithCurrency\\",\\"conditionPath\\":\\"PropertyWithCurrency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Unit\\",\\"annotationPath\\":\\"/RootEntity/Unit\\",\\"conditionPath\\":\\"Unit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Currency\\",\\"annotationPath\\":\\"/RootEntity/Currency\\",\\"conditionPath\\":\\"Currency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextProperty\\",\\"annotationPath\\":\\"/RootEntity/TextProperty\\",\\"conditionPath\\":\\"TextProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextOnlyProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextOnlyProperty\\",\\"conditionPath\\":\\"TextArrangementTextOnlyProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextOnlyProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextLastProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextLastProperty\\",\\"conditionPath\\":\\"TextArrangementTextLastProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextLastProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextFirstProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextFirstProperty\\",\\"conditionPath\\":\\"TextArrangementTextFirstProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextFirstProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextSeparateProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextSeparateProperty\\",\\"conditionPath\\":\\"TextArrangementTextSeparateProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextSeparateProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Criticality\\",\\"annotationPath\\":\\"/RootEntity/Criticality\\",\\"conditionPath\\":\\"Criticality\\",\\"availability\\":\\"Default\\",\\"label\\":null,\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"type\\":\\"Slot\\",\\"position\\":{\\"placement\\":\\"After\\",\\"anchor\\":\\"Criticality\\"},\\"caseSensitive\\":true}]}'
+      ns2:entityType=\\"/RootEntity/\\"
+    >
+      <control:dependents>
+        <!-- Create the value help dialogs for the FilterBar as dependents of the FilterBar -->
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/StringProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/DateProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/Criticality\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+      </control:dependents>
+      <!--
+			The search field is enabled when
+			* it is not hidden using the property hideBasisSearch
+			* there is no SearchRestrictions
+			* the SearchRestrictions has Searchable === true
+			-->
+      <control:basicSearchField>
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          placeholder=\\"Search\\"
+          conditions=\\"{$filters&gt;/conditions/$search}\\"
+          dataType=\\"Edm.String\\"
+          maxConditions=\\"1\\"
+        />
+      </control:basicSearchField>
+      <control:filterItems>
+        <!-- TODO if I don't put that into the condition model how can it be part of variants? Talk to filter bar team -->
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          label=\\"Editing Status\\"
+          maxConditions=\\"1\\"
+          id=\\"FilterBar::FilterField::DraftEditingStatus\\"
+          operators=\\"DRAFT_EDIT_STATE\\"
+          dataType=\\"Edm.String\\"
+          conditions=\\"{$filters&gt;/conditions/$editState}\\"
+          fieldHelp=\\"FilterBar::FilterFieldValueHelp::DraftEditingStatus\\"
+          display=\\"Description\\"
+        >
+          <mdc:dependents>
+            <mdcField:ListFieldHelp
+              xmlns:mdcField=\\"sap.ui.mdc.field\\"
+              ns1:require=\\"{DraftEditState: 'sap/fe/macros/filter/DraftEditState'}\\"
+              id=\\"FilterBar::FilterFieldValueHelp::DraftEditingStatus\\"
+              useFirstMatch=\\"true\\"
+            >
+              <ns1:ListItem key=\\"ALL\\" text=\\"All\\" />
+              <ns1:ListItem
+                key=\\"ALL_HIDING_DRAFTS\\"
+                text=\\"All (Hiding Drafts)\\"
+              />
+              <ns1:ListItem key=\\"UNCHANGED\\" text=\\"Unchanged\\" />
+              <ns1:ListItem key=\\"OWN_DRAFT\\" text=\\"Own Draft\\" />
+              <ns1:ListItem key=\\"LOCKED\\" text=\\"Locked by Another User\\" />
+              <ns1:ListItem
+                key=\\"UNSAVED_CHANGES\\"
+                text=\\"Unsaved Changes by Another User\\"
+              />
+            </mdcField:ListFieldHelp>
+          </mdc:dependents>
+        </mdc:FilterField>
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/StringProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/DateProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          id=\\"FilterBar::CustomFilterField::Criticality\\"
+          delegate=\\"{name: 'sap/ui/mdc/odata/v4/FieldBaseDelegate'}\\"
+          dataType=\\"Edm.Int32\\"
+          maxConditions=\\"-1\\"
+          conditions=\\"{$filters&gt;/conditions/Criticality}\\"
+          fieldHelp=\\"undefined\\"
+          binding=\\"{filterValues&gt;/Criticality}\\"
+          ns2:isSlot=\\"true\\"
+        >
+          <RatingIndicator
+            id=\\"MyCustomRatingIndicatorId\\"
+            value=\\"{path: 'filterValues&gt;', type: 'sap.fe.macros.filter.type.Value'}\\"
+          />
+        </mdc:FilterField>
+      </control:filterItems>
+    </control:FilterBar>
+  </macro:FilterBarAPI>
+</root>
+"
+`;
+
+exports[`Filter Bar templating 1 With Deafult Value Annotations 1`] = `
+"<root>
+  <macro:FilterBarAPI
+    xmlns:macro=\\"sap.fe.macros\\"
+    id=\\"FilterBar\\"
+    metaPath=\\"/RootEntity/@com.sap.vocabularies.UI.v1.SelectionFields#SF1\\"
+    contextPath=\\"/RootEntity/\\"
+    search=\\".handlers.onSearch\\"
+    filterChanged=\\".handlers.onFiltersChanged\\"
+  >
+    <!--
+			By using @FE, SAP Fiori elements introduces a dependency between the building block and our converters.
+			This dependency will be removed after the refactoring of the FilterBar
+		-->
+    <control:FilterBar
+      xmlns:control=\\"sap.fe.core.controls\\"
+      xmlns:ns1=\\"sap.ui.core\\"
+      ns1:require=\\"{API: 'sap/fe/macros/FilterBarAPI'}\\"
+      id=\\"FilterBar-content\\"
+      liveMode=\\"false\\"
+      delegate=\\"{name:'sap/fe/macros/FilterBarDelegate'}\\"
+      showAdaptFiltersButton=\\"true\\"
+      p13nMode=\\"Item,Value\\"
+      search=\\"API.handleSearch($event)\\"
+      filtersChanged=\\"API.handleFilterChanged($event)\\"
+      filterConditions='{\\"StringProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[\\"abc\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"IntegerProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[1],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"$editState\\":[{\\"operator\\":\\"DRAFT_EDIT_STATE\\",\\"values\\":[\\"ALL\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}]}'
+      suspendSelection=\\"false\\"
+      showMessages=\\"false\\"
+      initialLayout=\\"compact\\"
+      xmlns:ns2=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
+      ns2:localId=\\"FilterBar\\"
+      ns2:hideBasicSearch=\\"false\\"
+      ns2:showDraftEditState=\\"true\\"
+      ns2:useSemanticDateRange=\\"true\\"
+      ns2:selectionFields='{\\"ui5object\\":true,\\"customData\\":[{\\"key\\":\\"StringProperty\\",\\"annotationPath\\":\\"/RootEntity/StringProperty\\",\\"conditionPath\\":\\"StringProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"String Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"IntegerProperty\\",\\"annotationPath\\":\\"/RootEntity/IntegerProperty\\",\\"conditionPath\\":\\"IntegerProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Integer Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"NumberProperty\\",\\"annotationPath\\":\\"/RootEntity/NumberProperty\\",\\"conditionPath\\":\\"NumberProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Number Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"DateProperty\\",\\"annotationPath\\":\\"/RootEntity/DateProperty\\",\\"conditionPath\\":\\"DateProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Date Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithValueHelp\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithValueHelp\\",\\"conditionPath\\":\\"PropertyWithValueHelp\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Property with Value Help\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"ID\\",\\"annotationPath\\":\\"/RootEntity/ID\\",\\"conditionPath\\":\\"ID\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"ID\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"BooleanProperty\\",\\"annotationPath\\":\\"/RootEntity/BooleanProperty\\",\\"conditionPath\\":\\"BooleanProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Boolean Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TimeProperty\\",\\"annotationPath\\":\\"/RootEntity/TimeProperty\\",\\"conditionPath\\":\\"TimeProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Time Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithUnit\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithUnit\\",\\"conditionPath\\":\\"PropertyWithUnit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithCurrency\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithCurrency\\",\\"conditionPath\\":\\"PropertyWithCurrency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Unit\\",\\"annotationPath\\":\\"/RootEntity/Unit\\",\\"conditionPath\\":\\"Unit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Currency\\",\\"annotationPath\\":\\"/RootEntity/Currency\\",\\"conditionPath\\":\\"Currency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextProperty\\",\\"annotationPath\\":\\"/RootEntity/TextProperty\\",\\"conditionPath\\":\\"TextProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextOnlyProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextOnlyProperty\\",\\"conditionPath\\":\\"TextArrangementTextOnlyProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextOnlyProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextLastProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextLastProperty\\",\\"conditionPath\\":\\"TextArrangementTextLastProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextLastProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextFirstProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextFirstProperty\\",\\"conditionPath\\":\\"TextArrangementTextFirstProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextFirstProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextSeparateProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextSeparateProperty\\",\\"conditionPath\\":\\"TextArrangementTextSeparateProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextSeparateProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Criticality\\",\\"annotationPath\\":\\"/RootEntity/Criticality\\",\\"conditionPath\\":\\"Criticality\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Criticality\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true}]}'
+      ns2:entityType=\\"/RootEntity/\\"
+    >
+      <control:dependents>
+        <!-- Create the value help dialogs for the FilterBar as dependents of the FilterBar -->
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/StringProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/DateProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+      </control:dependents>
+      <!--
+			The search field is enabled when
+			* it is not hidden using the property hideBasisSearch
+			* there is no SearchRestrictions
+			* the SearchRestrictions has Searchable === true
+			-->
+      <control:basicSearchField>
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          placeholder=\\"Search\\"
+          conditions=\\"{$filters&gt;/conditions/$search}\\"
+          dataType=\\"Edm.String\\"
+          maxConditions=\\"1\\"
+        />
+      </control:basicSearchField>
+      <control:filterItems>
+        <!-- TODO if I don't put that into the condition model how can it be part of variants? Talk to filter bar team -->
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          label=\\"Editing Status\\"
+          maxConditions=\\"1\\"
+          id=\\"FilterBar::FilterField::DraftEditingStatus\\"
+          operators=\\"DRAFT_EDIT_STATE\\"
+          dataType=\\"Edm.String\\"
+          conditions=\\"{$filters&gt;/conditions/$editState}\\"
+          fieldHelp=\\"FilterBar::FilterFieldValueHelp::DraftEditingStatus\\"
+          display=\\"Description\\"
+        >
+          <mdc:dependents>
+            <mdcField:ListFieldHelp
+              xmlns:mdcField=\\"sap.ui.mdc.field\\"
+              ns1:require=\\"{DraftEditState: 'sap/fe/macros/filter/DraftEditState'}\\"
+              id=\\"FilterBar::FilterFieldValueHelp::DraftEditingStatus\\"
+              useFirstMatch=\\"true\\"
+            >
+              <ns1:ListItem key=\\"ALL\\" text=\\"All\\" />
+              <ns1:ListItem
+                key=\\"ALL_HIDING_DRAFTS\\"
+                text=\\"All (Hiding Drafts)\\"
+              />
+              <ns1:ListItem key=\\"UNCHANGED\\" text=\\"Unchanged\\" />
+              <ns1:ListItem key=\\"OWN_DRAFT\\" text=\\"Own Draft\\" />
+              <ns1:ListItem key=\\"LOCKED\\" text=\\"Locked by Another User\\" />
+              <ns1:ListItem
+                key=\\"UNSAVED_CHANGES\\"
+                text=\\"Unsaved Changes by Another User\\"
+              />
+            </mdcField:ListFieldHelp>
+          </mdc:dependents>
+        </mdc:FilterField>
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/StringProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/DateProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+      </control:filterItems>
+    </control:FilterBar>
+  </macro:FilterBarAPI>
+</root>
+"
+`;
+
+exports[`Filter Bar templating 1 With Default Annotations 1`] = `
+"<root>
+  <macro:FilterBarAPI
+    xmlns:macro=\\"sap.fe.macros\\"
+    id=\\"FilterBar\\"
+    metaPath=\\"/RootEntity/@com.sap.vocabularies.UI.v1.SelectionFields#SF1\\"
+    contextPath=\\"/RootEntity/\\"
+    search=\\".handlers.onSearch\\"
+    filterChanged=\\".handlers.onFiltersChanged\\"
+  >
+    <!--
+			By using @FE, SAP Fiori elements introduces a dependency between the building block and our converters.
+			This dependency will be removed after the refactoring of the FilterBar
+		-->
+    <control:FilterBar
+      xmlns:control=\\"sap.fe.core.controls\\"
+      xmlns:ns1=\\"sap.ui.core\\"
+      ns1:require=\\"{API: 'sap/fe/macros/FilterBarAPI'}\\"
+      id=\\"FilterBar-content\\"
+      liveMode=\\"false\\"
+      delegate=\\"{name:'sap/fe/macros/FilterBarDelegate'}\\"
+      showAdaptFiltersButton=\\"true\\"
+      p13nMode=\\"Item,Value\\"
+      search=\\"API.handleSearch($event)\\"
+      filtersChanged=\\"API.handleFilterChanged($event)\\"
+      filterConditions='{\\"StringProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[\\"abc\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"IntegerProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[1],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"$editState\\":[{\\"operator\\":\\"DRAFT_EDIT_STATE\\",\\"values\\":[\\"ALL\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}]}'
+      suspendSelection=\\"false\\"
+      showMessages=\\"false\\"
+      initialLayout=\\"compact\\"
+      xmlns:ns2=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
+      ns2:localId=\\"FilterBar\\"
+      ns2:hideBasicSearch=\\"false\\"
+      ns2:showDraftEditState=\\"true\\"
+      ns2:useSemanticDateRange=\\"true\\"
+      ns2:selectionFields='{\\"ui5object\\":true,\\"customData\\":[{\\"key\\":\\"StringProperty\\",\\"annotationPath\\":\\"/RootEntity/StringProperty\\",\\"conditionPath\\":\\"StringProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"String Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"IntegerProperty\\",\\"annotationPath\\":\\"/RootEntity/IntegerProperty\\",\\"conditionPath\\":\\"IntegerProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Integer Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"NumberProperty\\",\\"annotationPath\\":\\"/RootEntity/NumberProperty\\",\\"conditionPath\\":\\"NumberProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Number Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"DateProperty\\",\\"annotationPath\\":\\"/RootEntity/DateProperty\\",\\"conditionPath\\":\\"DateProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Date Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithValueHelp\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithValueHelp\\",\\"conditionPath\\":\\"PropertyWithValueHelp\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Property with Value Help\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"ID\\",\\"annotationPath\\":\\"/RootEntity/ID\\",\\"conditionPath\\":\\"ID\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"ID\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"BooleanProperty\\",\\"annotationPath\\":\\"/RootEntity/BooleanProperty\\",\\"conditionPath\\":\\"BooleanProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Boolean Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TimeProperty\\",\\"annotationPath\\":\\"/RootEntity/TimeProperty\\",\\"conditionPath\\":\\"TimeProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Time Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithUnit\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithUnit\\",\\"conditionPath\\":\\"PropertyWithUnit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithCurrency\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithCurrency\\",\\"conditionPath\\":\\"PropertyWithCurrency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Unit\\",\\"annotationPath\\":\\"/RootEntity/Unit\\",\\"conditionPath\\":\\"Unit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Currency\\",\\"annotationPath\\":\\"/RootEntity/Currency\\",\\"conditionPath\\":\\"Currency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextProperty\\",\\"annotationPath\\":\\"/RootEntity/TextProperty\\",\\"conditionPath\\":\\"TextProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextOnlyProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextOnlyProperty\\",\\"conditionPath\\":\\"TextArrangementTextOnlyProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextOnlyProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextLastProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextLastProperty\\",\\"conditionPath\\":\\"TextArrangementTextLastProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextLastProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextFirstProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextFirstProperty\\",\\"conditionPath\\":\\"TextArrangementTextFirstProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextFirstProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextSeparateProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextSeparateProperty\\",\\"conditionPath\\":\\"TextArrangementTextSeparateProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextSeparateProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Criticality\\",\\"annotationPath\\":\\"/RootEntity/Criticality\\",\\"conditionPath\\":\\"Criticality\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Criticality\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true}]}'
+      ns2:entityType=\\"/RootEntity/\\"
+    >
+      <control:dependents>
+        <!-- Create the value help dialogs for the FilterBar as dependents of the FilterBar -->
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/StringProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/DateProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+      </control:dependents>
+      <!--
+			The search field is enabled when
+			* it is not hidden using the property hideBasisSearch
+			* there is no SearchRestrictions
+			* the SearchRestrictions has Searchable === true
+			-->
+      <control:basicSearchField>
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          placeholder=\\"Search\\"
+          conditions=\\"{$filters&gt;/conditions/$search}\\"
+          dataType=\\"Edm.String\\"
+          maxConditions=\\"1\\"
+        />
+      </control:basicSearchField>
+      <control:filterItems>
+        <!-- TODO if I don't put that into the condition model how can it be part of variants? Talk to filter bar team -->
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          label=\\"Editing Status\\"
+          maxConditions=\\"1\\"
+          id=\\"FilterBar::FilterField::DraftEditingStatus\\"
+          operators=\\"DRAFT_EDIT_STATE\\"
+          dataType=\\"Edm.String\\"
+          conditions=\\"{$filters&gt;/conditions/$editState}\\"
+          fieldHelp=\\"FilterBar::FilterFieldValueHelp::DraftEditingStatus\\"
+          display=\\"Description\\"
+        >
+          <mdc:dependents>
+            <mdcField:ListFieldHelp
+              xmlns:mdcField=\\"sap.ui.mdc.field\\"
+              ns1:require=\\"{DraftEditState: 'sap/fe/macros/filter/DraftEditState'}\\"
+              id=\\"FilterBar::FilterFieldValueHelp::DraftEditingStatus\\"
+              useFirstMatch=\\"true\\"
+            >
+              <ns1:ListItem key=\\"ALL\\" text=\\"All\\" />
+              <ns1:ListItem
+                key=\\"ALL_HIDING_DRAFTS\\"
+                text=\\"All (Hiding Drafts)\\"
+              />
+              <ns1:ListItem key=\\"UNCHANGED\\" text=\\"Unchanged\\" />
+              <ns1:ListItem key=\\"OWN_DRAFT\\" text=\\"Own Draft\\" />
+              <ns1:ListItem key=\\"LOCKED\\" text=\\"Locked by Another User\\" />
+              <ns1:ListItem
+                key=\\"UNSAVED_CHANGES\\"
+                text=\\"Unsaved Changes by Another User\\"
+              />
+            </mdcField:ListFieldHelp>
+          </mdc:dependents>
+        </mdc:FilterField>
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/StringProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/DateProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+      </control:filterItems>
+    </control:FilterBar>
+  </macro:FilterBarAPI>
+</root>
+"
+`;
+
+exports[`Filter Bar templating 1 With Default Annotations and Selection Variants 1`] = `
+"<root>
+  <macro:FilterBarAPI
+    xmlns:macro=\\"sap.fe.macros\\"
+    id=\\"FilterBar\\"
+    metaPath=\\"/RootEntity/@com.sap.vocabularies.UI.v1.SelectionFields#SF1\\"
+    contextPath=\\"/RootEntity/\\"
+    search=\\".handlers.onSearch\\"
+    filterChanged=\\".handlers.onFiltersChanged\\"
+  >
+    <!--
+			By using @FE, SAP Fiori elements introduces a dependency between the building block and our converters.
+			This dependency will be removed after the refactoring of the FilterBar
+		-->
+    <control:FilterBar
+      xmlns:control=\\"sap.fe.core.controls\\"
+      xmlns:ns1=\\"sap.ui.core\\"
+      ns1:require=\\"{API: 'sap/fe/macros/FilterBarAPI'}\\"
+      id=\\"FilterBar-content\\"
+      liveMode=\\"false\\"
+      delegate=\\"{name:'sap/fe/macros/FilterBarDelegate'}\\"
+      showAdaptFiltersButton=\\"true\\"
+      p13nMode=\\"Item,Value\\"
+      search=\\"API.handleSearch($event)\\"
+      filtersChanged=\\"API.handleFilterChanged($event)\\"
+      filterConditions='{\\"StringProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[\\"abc\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"IntegerProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[1],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"$editState\\":[{\\"operator\\":\\"DRAFT_EDIT_STATE\\",\\"values\\":[\\"ALL\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}]}'
+      suspendSelection=\\"false\\"
+      showMessages=\\"false\\"
+      initialLayout=\\"compact\\"
+      xmlns:ns2=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
+      ns2:localId=\\"FilterBar\\"
+      ns2:hideBasicSearch=\\"false\\"
+      ns2:showDraftEditState=\\"true\\"
+      ns2:useSemanticDateRange=\\"true\\"
+      ns2:selectionFields='{\\"ui5object\\":true,\\"customData\\":[{\\"key\\":\\"StringProperty\\",\\"annotationPath\\":\\"/RootEntity/StringProperty\\",\\"conditionPath\\":\\"StringProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"String Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"IntegerProperty\\",\\"annotationPath\\":\\"/RootEntity/IntegerProperty\\",\\"conditionPath\\":\\"IntegerProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Integer Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"NumberProperty\\",\\"annotationPath\\":\\"/RootEntity/NumberProperty\\",\\"conditionPath\\":\\"NumberProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Number Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"DateProperty\\",\\"annotationPath\\":\\"/RootEntity/DateProperty\\",\\"conditionPath\\":\\"DateProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Date Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithValueHelp\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithValueHelp\\",\\"conditionPath\\":\\"PropertyWithValueHelp\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Property with Value Help\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"ID\\",\\"annotationPath\\":\\"/RootEntity/ID\\",\\"conditionPath\\":\\"ID\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"ID\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"BooleanProperty\\",\\"annotationPath\\":\\"/RootEntity/BooleanProperty\\",\\"conditionPath\\":\\"BooleanProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Boolean Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TimeProperty\\",\\"annotationPath\\":\\"/RootEntity/TimeProperty\\",\\"conditionPath\\":\\"TimeProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Time Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithUnit\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithUnit\\",\\"conditionPath\\":\\"PropertyWithUnit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithCurrency\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithCurrency\\",\\"conditionPath\\":\\"PropertyWithCurrency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Unit\\",\\"annotationPath\\":\\"/RootEntity/Unit\\",\\"conditionPath\\":\\"Unit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Currency\\",\\"annotationPath\\":\\"/RootEntity/Currency\\",\\"conditionPath\\":\\"Currency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextProperty\\",\\"annotationPath\\":\\"/RootEntity/TextProperty\\",\\"conditionPath\\":\\"TextProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextOnlyProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextOnlyProperty\\",\\"conditionPath\\":\\"TextArrangementTextOnlyProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextOnlyProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextLastProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextLastProperty\\",\\"conditionPath\\":\\"TextArrangementTextLastProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextLastProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextFirstProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextFirstProperty\\",\\"conditionPath\\":\\"TextArrangementTextFirstProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextFirstProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextSeparateProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextSeparateProperty\\",\\"conditionPath\\":\\"TextArrangementTextSeparateProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextSeparateProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Criticality\\",\\"annotationPath\\":\\"/RootEntity/Criticality\\",\\"conditionPath\\":\\"Criticality\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Criticality\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true}]}'
       ns2:entityType=\\"/RootEntity/\\"
     >
       <control:dependents>
         <!-- Create the value help dialogs for the FilterBar as dependents of the FilterBar -->
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/StringProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/DateProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
       </control:dependents>
       <!--
 			The search field is enabled when
@@ -130,6 +737,15 @@ exports[`Filter Bar templating 1 With event handlers 1`] = `
 			* there is no SearchRestrictions
 			* the SearchRestrictions has Searchable === true
 			-->
+      <control:basicSearchField>
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          placeholder=\\"Search\\"
+          conditions=\\"{$filters&gt;/conditions/$search}\\"
+          dataType=\\"Edm.String\\"
+          maxConditions=\\"1\\"
+        />
+      </control:basicSearchField>
       <control:filterItems>
         <!-- TODO if I don't put that into the condition model how can it be part of variants? Talk to filter bar team -->
         <mdc:FilterField
@@ -165,6 +781,56 @@ exports[`Filter Bar templating 1 With event handlers 1`] = `
             </mdcField:ListFieldHelp>
           </mdc:dependents>
         </mdc:FilterField>
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/StringProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/DateProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
       </control:filterItems>
     </control:FilterBar>
   </macro:FilterBarAPI>
@@ -183,8 +849,8 @@ exports[`Filter Bar templating 1 Without Draft Root - Do not show edit status fi
     filterChanged=\\".handlers.onFiltersChanged\\"
   >
     <!--
-			By using @FE we introduce a dependency between macro and sap fe converters.
-			This dependency will be removed after FilterBar refactoring
+			By using @FE, SAP Fiori elements introduces a dependency between the building block and our converters.
+			This dependency will be removed after the refactoring of the FilterBar
 		-->
     <control:FilterBar
       xmlns:control=\\"sap.fe.core.controls\\"
@@ -202,6 +868,7 @@ exports[`Filter Bar templating 1 Without Draft Root - Do not show edit status fi
       initialLayout=\\"compact\\"
       xmlns:ns2=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
       ns2:localId=\\"FilterBar\\"
+      ns2:hideBasicSearch=\\"false\\"
       ns2:showDraftEditState=\\"false\\"
       ns2:useSemanticDateRange=\\"true\\"
       ns2:selectionFields='{\\"ui5object\\":true,\\"customData\\":[{\\"$PropertyPath\\":\\"StringProperty\\"},{\\"$PropertyPath\\":\\"IntegerProperty\\"},{\\"$PropertyPath\\":\\"NumberProperty\\"},{\\"$PropertyPath\\":\\"DateProperty\\"},{\\"$PropertyPath\\":\\"PropertyWithValueHelp\\"}]}'
@@ -241,8 +908,8 @@ exports[`Filter Bar templating 1 Without attaching event handlers 1`] = `
     contextPath=\\"/RootEntity/\\"
   >
     <!--
-			By using @FE we introduce a dependency between macro and sap fe converters.
-			This dependency will be removed after FilterBar refactoring
+			By using @FE, SAP Fiori elements introduces a dependency between the building block and our converters.
+			This dependency will be removed after the refactoring of the FilterBar
 		-->
     <control:FilterBar
       xmlns:control=\\"sap.fe.core.controls\\"
@@ -255,18 +922,55 @@ exports[`Filter Bar templating 1 Without attaching event handlers 1`] = `
       p13nMode=\\"Item,Value\\"
       search=\\"API.handleSearch($event)\\"
       filtersChanged=\\"API.handleFilterChanged($event)\\"
+      filterConditions='{\\"StringProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[\\"abc\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"IntegerProperty\\":[{\\"operator\\":\\"EQ\\",\\"values\\":[1],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}],\\"$editState\\":[{\\"operator\\":\\"DRAFT_EDIT_STATE\\",\\"values\\":[\\"ALL\\"],\\"isEmpty\\":null,\\"validated\\":\\"Validated\\"}]}'
       suspendSelection=\\"false\\"
       showMessages=\\"false\\"
       initialLayout=\\"compact\\"
       xmlns:ns2=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
       ns2:localId=\\"FilterBar\\"
+      ns2:hideBasicSearch=\\"false\\"
       ns2:showDraftEditState=\\"true\\"
       ns2:useSemanticDateRange=\\"true\\"
-      ns2:selectionFields='{\\"ui5object\\":true,\\"customData\\":[{\\"$PropertyPath\\":\\"StringProperty\\"},{\\"$PropertyPath\\":\\"IntegerProperty\\"},{\\"$PropertyPath\\":\\"NumberProperty\\"},{\\"$PropertyPath\\":\\"DateProperty\\"},{\\"$PropertyPath\\":\\"PropertyWithValueHelp\\"}]}'
+      ns2:selectionFields='{\\"ui5object\\":true,\\"customData\\":[{\\"key\\":\\"StringProperty\\",\\"annotationPath\\":\\"/RootEntity/StringProperty\\",\\"conditionPath\\":\\"StringProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"String Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"IntegerProperty\\",\\"annotationPath\\":\\"/RootEntity/IntegerProperty\\",\\"conditionPath\\":\\"IntegerProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Integer Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"NumberProperty\\",\\"annotationPath\\":\\"/RootEntity/NumberProperty\\",\\"conditionPath\\":\\"NumberProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Number Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"DateProperty\\",\\"annotationPath\\":\\"/RootEntity/DateProperty\\",\\"conditionPath\\":\\"DateProperty\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Date Property\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithValueHelp\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithValueHelp\\",\\"conditionPath\\":\\"PropertyWithValueHelp\\",\\"availability\\":\\"Default\\",\\"label\\":\\"Property with Value Help\\",\\"group\\":\\"\\",\\"groupLabel\\":\\"\\",\\"isParameter\\":false,\\"caseSensitive\\":true},{\\"key\\":\\"ID\\",\\"annotationPath\\":\\"/RootEntity/ID\\",\\"conditionPath\\":\\"ID\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"ID\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"BooleanProperty\\",\\"annotationPath\\":\\"/RootEntity/BooleanProperty\\",\\"conditionPath\\":\\"BooleanProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Boolean Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TimeProperty\\",\\"annotationPath\\":\\"/RootEntity/TimeProperty\\",\\"conditionPath\\":\\"TimeProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Time Property\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithUnit\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithUnit\\",\\"conditionPath\\":\\"PropertyWithUnit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"PropertyWithCurrency\\",\\"annotationPath\\":\\"/RootEntity/PropertyWithCurrency\\",\\"conditionPath\\":\\"PropertyWithCurrency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Property With Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Unit\\",\\"annotationPath\\":\\"/RootEntity/Unit\\",\\"conditionPath\\":\\"Unit\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Unit\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Currency\\",\\"annotationPath\\":\\"/RootEntity/Currency\\",\\"conditionPath\\":\\"Currency\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Currency\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextProperty\\",\\"annotationPath\\":\\"/RootEntity/TextProperty\\",\\"conditionPath\\":\\"TextProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextOnlyProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextOnlyProperty\\",\\"conditionPath\\":\\"TextArrangementTextOnlyProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextOnlyProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextLastProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextLastProperty\\",\\"conditionPath\\":\\"TextArrangementTextLastProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextLastProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextFirstProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextFirstProperty\\",\\"conditionPath\\":\\"TextArrangementTextFirstProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextFirstProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"TextArrangementTextSeparateProperty\\",\\"annotationPath\\":\\"/RootEntity/TextArrangementTextSeparateProperty\\",\\"conditionPath\\":\\"TextArrangementTextSeparateProperty\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"TextArrangementTextSeparateProperty\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true},{\\"key\\":\\"Criticality\\",\\"annotationPath\\":\\"/RootEntity/Criticality\\",\\"conditionPath\\":\\"Criticality\\",\\"availability\\":\\"Adaptation\\",\\"label\\":\\"Criticality\\",\\"group\\":\\"RootEntity\\",\\"groupLabel\\":\\"RootEntity\\",\\"caseSensitive\\":true}]}'
       ns2:entityType=\\"/RootEntity/\\"
     >
       <control:dependents>
         <!-- Create the value help dialogs for the FilterBar as dependents of the FilterBar -->
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/StringProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/DateProperty\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
+        <macro:ValueHelp
+          idPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          conditionModel=\\"$filters\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          filterFieldValueHelp=\\"true\\"
+          useSemanticDateRange=\\"true\\"
+        />
       </control:dependents>
       <!--
 			The search field is enabled when
@@ -274,6 +978,15 @@ exports[`Filter Bar templating 1 Without attaching event handlers 1`] = `
 			* there is no SearchRestrictions
 			* the SearchRestrictions has Searchable === true
 			-->
+      <control:basicSearchField>
+        <mdc:FilterField
+          xmlns:mdc=\\"sap.ui.mdc\\"
+          placeholder=\\"Search\\"
+          conditions=\\"{$filters&gt;/conditions/$search}\\"
+          dataType=\\"Edm.String\\"
+          maxConditions=\\"1\\"
+        />
+      </control:basicSearchField>
       <control:filterItems>
         <!-- TODO if I don't put that into the condition model how can it be part of variants? Talk to filter bar team -->
         <mdc:FilterField
@@ -309,6 +1022,56 @@ exports[`Filter Bar templating 1 Without attaching event handlers 1`] = `
             </mdcField:ListFieldHelp>
           </mdc:dependents>
         </mdc:FilterField>
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/StringProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/IntegerProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/NumberProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/DateProperty\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
+        <internalMacro:FilterField
+          xmlns:internalMacro=\\"sap.fe.macros.internal\\"
+          idPrefix=\\"FilterBar::FilterField\\"
+          vhIdPrefix=\\"FilterBar::FilterFieldValueHelp\\"
+          property=\\"/RootEntity/PropertyWithValueHelp\\"
+          _valueList=\\"{_valueList&gt;}\\"
+          contextPath=\\"{contextPath&gt;}\\"
+          useSemanticDateRange=\\"true\\"
+          settings='{\\"ui5object\\":true}'
+        />
       </control:filterItems>
     </control:FilterBar>
   </macro:FilterBarAPI>