From a9a3d134cd43b3833137359edca7fcbffdc600b1 Mon Sep 17 00:00:00 2001
From: Pierre Smits <pierre.smits@somonar.com>
Date: Mon, 18 Mar 2024 07:36:55 +0100
Subject: [PATCH] Improved: CATALOG - Move from hard-code menu location to
 parameterized (OFBIZ-12947) (#732)

Move the menu location in the various catalog screens from hard-coded to parameterized.

modified:
- CatalogScreens.xml
- CategoryScreens.xml
- CommonScreens.xml
- ConfigScreens.xml
- FeatureScreens.xml
- PriceScreens.xml
- ProductScreens.xml
- PromoScreens.xml
- ReviewScreens.xml
- StoreScreens.xml
- SubscriptionScreens.xml
- ThesaurusScreens.xml
---
 .../product/widget/catalog/CatalogScreens.xml |  6 ++--
 .../widget/catalog/CategoryScreens.xml        | 14 ++++----
 .../product/widget/catalog/CommonScreens.xml  | 34 +++++++++----------
 .../product/widget/catalog/ConfigScreens.xml  |  4 +--
 .../product/widget/catalog/FeatureScreens.xml |  4 +--
 .../product/widget/catalog/PriceScreens.xml   |  4 +--
 .../product/widget/catalog/ProductScreens.xml |  8 ++---
 .../product/widget/catalog/PromoScreens.xml   |  4 +--
 .../product/widget/catalog/ReviewScreens.xml  |  2 +-
 .../product/widget/catalog/StoreScreens.xml   |  2 +-
 .../widget/catalog/SubscriptionScreens.xml    |  2 +-
 .../widget/catalog/ThesaurusScreens.xml       |  2 +-
 12 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/applications/product/widget/catalog/CatalogScreens.xml b/applications/product/widget/catalog/CatalogScreens.xml
index 12be798246e..d3858aaad28 100644
--- a/applications/product/widget/catalog/CatalogScreens.xml
+++ b/applications/product/widget/catalog/CatalogScreens.xml
@@ -96,8 +96,8 @@ under the License.
             <widgets>
             <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                 <decorator-section name="body">
-                    <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
-                    <include-menu name="CatalogSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                    <include-menu name="CatalogTabBar" location="${parameters.mainMenuLocation}"/>
+                    <include-menu name="CatalogSubTabBar" location="${parameters.mainMenuLocation}"/>
                     <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
                     <screenlet title="${uiLabelMap.PageTitleEditProductCatalog}">
                         <label style="h3">${uiLabelMap.ProductCatalogEmptyWarning}</label>
@@ -195,7 +195,7 @@ under the License.
             <widgets>
                 <decorator-screen name="ShortcutDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <include-menu name="CatalogShortcutAppBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="CatalogShortcutAppBar" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
diff --git a/applications/product/widget/catalog/CategoryScreens.xml b/applications/product/widget/catalog/CategoryScreens.xml
index 300d5a270b2..7ff193802d1 100644
--- a/applications/product/widget/catalog/CategoryScreens.xml
+++ b/applications/product/widget/catalog/CategoryScreens.xml
@@ -28,7 +28,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
@@ -53,8 +53,8 @@ under the License.
                                         <not><if-empty field="productCategory"/></not>
                                     </condition>
                                     <widgets>
-                                        <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
-                                        <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                        <include-menu name="CategoryTabBar" location="${parameters.mainMenuLocation}"/>
+                                        <include-menu name="CategorySubTabBar" location="${parameters.mainMenuLocation}"/>
                                         <container>
                                             <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.categoryName} [${uiLabelMap.CommonId}:${productCategoryId}]  ${${extraFunctionName}}</label>
                                         </container>
@@ -65,7 +65,7 @@ under the License.
                                                 <if-compare operator="not-equals" value="EditCategory" field="tabButtonItem"/>
                                             </condition>
                                             <widgets>
-                                                <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                                <include-menu name="CategorySubTabBar" location="${parameters.mainMenuLocation}"/>
                                             </widgets>
                                         </section>
                                     </fail-widgets>
@@ -170,8 +170,8 @@ under the License.
                                         <not><if-empty field="productCategory"/></not>
                                     </condition>
                                     <widgets>
-                                        <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
-                                        <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                        <include-menu name="CategoryTabBar" location="${parameters.mainMenuLocation}"/>
+                                        <include-menu name="CategorySubTabBar" location="${parameters.mainMenuLocation}"/>
                                         <container>
                                             <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}]  ${${extraFunctionName}}</label>
                                         </container>
@@ -182,7 +182,7 @@ under the License.
                                                 <if-compare operator="not-equals" value="EditCategory" field="tabButtonItem"/>
                                             </condition>
                                             <widgets>
-                                                <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                                <include-menu name="CategorySubTabBar" location="${parameters.mainMenuLocation}"/>
                                             </widgets>
                                         </section>
                                     </fail-widgets>
diff --git a/applications/product/widget/catalog/CommonScreens.xml b/applications/product/widget/catalog/CommonScreens.xml
index 057fe35c9da..00c6c3eb705 100644
--- a/applications/product/widget/catalog/CommonScreens.xml
+++ b/applications/product/widget/catalog/CommonScreens.xml
@@ -39,7 +39,7 @@ under the License.
                 <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
                 <set field="activeApp" value="catalogmgr" global="true"/>
                 <set field="applicationMenuName" value="CatalogAppBar" global="true"/>
-                <set field="applicationMenuLocation" value="component://product/widget/catalog/CatalogMenus.xml" global="true"/>
+                <set field="applicationMenuLocation" value="${parameters.mainMenuLocation}" global="true"/>
                 <set field="helpAnchor" from-field="helpAnchor" default-value="_catalog"/>
                 <set field="applicationTitle" from-field="uiLabelMap.ProductCatalogManagerApplication" global="true"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/>
@@ -58,7 +58,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <section>
@@ -90,8 +90,8 @@ under the License.
                                         <not><if-empty field="prodCatalog"/></not>
                                     </condition>
                                     <widgets>
-                                        <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
-                                        <include-menu name="CatalogSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                        <include-menu name="CatalogTabBar" location="${parameters.mainMenuLocation}"/>
+                                        <include-menu name="CatalogSubTabBar" location="${parameters.mainMenuLocation}"/>
                                         <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
                                     </widgets>
                                     <fail-widgets>
@@ -100,7 +100,7 @@ under the License.
                                                 <if-compare operator="not-equals" value="ProductCatalog" field="tabButtonItem"/>
                                             </condition>
                                             <widgets>
-                                                <include-menu name="CatalogSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                                <include-menu name="CatalogSubTabBar" location="${parameters.mainMenuLocation}"/>
                                             </widgets>
                                         </section>
                                     </fail-widgets>
@@ -122,7 +122,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <section>
@@ -153,12 +153,12 @@ under the License.
                                     <condition><not><if-empty field="productStore"/></not></condition>
                                     <widgets>
                                         <container>
-                                            <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                            <include-menu name="ProductStoreTabBar" location="${parameters.mainMenuLocation}"/>
                                             <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}]  ${${extraFunctionName}}</label>
                                         </container>
                                         <section>
                                             <widgets>
-                                                <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                                <include-menu name="ProductStoreSubTabBar" location="${parameters.mainMenuLocation}"/>
                                             </widgets>
                                         </section>
                                     </widgets>
@@ -183,7 +183,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="ProductStoreGroupTree"/>
@@ -199,7 +199,7 @@ under the License.
                                 </or>
                             </condition>
                             <widgets>
-                                <include-menu name="ProductStoreGroupButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                <include-menu name="ProductStoreGroupButtonBar" location="${parameters.mainMenuLocation}"/>
                                 <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>
@@ -217,7 +217,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar"/>
@@ -229,7 +229,7 @@ under the License.
                                 <if-has-permission permission="CATALOG" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <include-menu name="ShippingTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                <include-menu name="ShippingTabBar" location="${parameters.mainMenuLocation}"/>
                                 <container>
                                     <label style="h1">${uiLabelMap[labelTitleProperty]}</label>
                                 </container>
@@ -364,7 +364,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <section>
@@ -397,7 +397,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar"/>
@@ -408,7 +408,7 @@ under the License.
                                 <if-has-permission permission="CATALOG" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <include-menu name="ImageManagementTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                <include-menu name="ImageManagementTabBar" location="${parameters.mainMenuLocation}"/>
                                 <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>
@@ -456,8 +456,8 @@ under the License.
                             <condition><not><if-empty field="productStore"/></not></condition>
                             <widgets>
                                 <container>
-                                    <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
-                                    <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                    <include-menu name="ProductStoreTabBar" location="${parameters.mainMenuLocation}"/>
+                                    <include-menu name="ProductStoreSubTabBar" location="${parameters.mainMenuLocation}"/>
                                     <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}]  ${${extraFunctionName}}</label>
                                 </container>
                                 <include-portal-page id="ProductStoreFacility"/>
diff --git a/applications/product/widget/catalog/ConfigScreens.xml b/applications/product/widget/catalog/ConfigScreens.xml
index 066cb9f56a7..691b0a8294f 100644
--- a/applications/product/widget/catalog/ConfigScreens.xml
+++ b/applications/product/widget/catalog/ConfigScreens.xml
@@ -25,7 +25,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
@@ -41,7 +41,7 @@ under the License.
                                     <condition><not><if-empty field="configItemId"/></not></condition>
                                     <widgets>
                                         <container>
-                                            <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                            <include-menu name="ConfigItemTabBar" location="${parameters.mainMenuLocation}"/>
                                             <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${configItem.configItemName} [${uiLabelMap.CommonId}:${configItemId}]  ${${extraFunctionName}}</label>
                                         </container>
                                         <container style="button-bar">
diff --git a/applications/product/widget/catalog/FeatureScreens.xml b/applications/product/widget/catalog/FeatureScreens.xml
index 35c244f802e..5f3993e6837 100644
--- a/applications/product/widget/catalog/FeatureScreens.xml
+++ b/applications/product/widget/catalog/FeatureScreens.xml
@@ -25,7 +25,7 @@
             <widgets>
                 <decorator-screen name="main-decorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
@@ -41,7 +41,7 @@
                                 </or>
                             </condition>
                             <widgets>
-                                <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                <include-menu name="FeaturesTabBar" location="${parameters.mainMenuLocation}"/>
                                 <container style="button-bar"><link target="CreateProductFeature" text="${uiLabelMap.ProductNewFeatureCategory}" style="buttontext create"/></container>
                                 <decorator-section-include name="body"/>
                             </widgets>
diff --git a/applications/product/widget/catalog/PriceScreens.xml b/applications/product/widget/catalog/PriceScreens.xml
index 5a928910a78..3e597aca1b0 100644
--- a/applications/product/widget/catalog/PriceScreens.xml
+++ b/applications/product/widget/catalog/PriceScreens.xml
@@ -25,7 +25,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
@@ -81,7 +81,7 @@ under the License.
                 <decorator-screen name="CommonPriceDecorator">
                     <decorator-section name="body">
                         <platform-specific><html><html-template multi-block="true" location="component://product/template/price/SetPriceRulesCondEventJs.ftl"/></html></platform-specific>
-                        <include-menu name="PriceRulesButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="PriceRulesButtonBar" location="${parameters.mainMenuLocation}"/>
                         <screenlet title="${uiLabelMap.ProductPriceRuleId} [${parameters.productPriceRuleId}]">
                             <label style="h6" text="${uiLabelMap.ProductConditionsActionsRemoveBefore}"/>
                             <horizontal-separator/>
diff --git a/applications/product/widget/catalog/ProductScreens.xml b/applications/product/widget/catalog/ProductScreens.xml
index 167df2047ad..a2ad292841c 100644
--- a/applications/product/widget/catalog/ProductScreens.xml
+++ b/applications/product/widget/catalog/ProductScreens.xml
@@ -37,7 +37,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
@@ -62,8 +62,8 @@ under the License.
                                         <not><if-empty field="product"/></not>
                                     </condition>
                                     <widgets>
-                                        <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
-                                        <include-menu name="ProductSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                        <include-menu name="ProductTabBar" location="${parameters.mainMenuLocation}"/>
+                                        <include-menu name="ProductSubTabBar" location="${parameters.mainMenuLocation}"/>
                                         <image src="${product.smallImageUrl}" url-mode="content" alt="${product.internalName}" style="cssImgSmall"/>
                                         <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}]  ${${extraFunctionName}}</label>
                                     </widgets>
@@ -73,7 +73,7 @@ under the License.
                                                 <if-compare operator="not-equals" value="EditProduct" field="tabButtonItem"/>
                                             </condition>
                                             <widgets>
-                                                <include-menu name="ProductSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                                <include-menu name="ProductSubTabBar" location="${parameters.mainMenuLocation}"/>
                                             </widgets>
                                         </section>
                                     </fail-widgets>
diff --git a/applications/product/widget/catalog/PromoScreens.xml b/applications/product/widget/catalog/PromoScreens.xml
index d664116d1bb..dc78b509cc1 100644
--- a/applications/product/widget/catalog/PromoScreens.xml
+++ b/applications/product/widget/catalog/PromoScreens.xml
@@ -25,7 +25,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
@@ -39,7 +39,7 @@ under the License.
                                 <section>
                                     <condition><not><if-empty field="productPromoId"/></not></condition>
                                     <widgets>
-                                        <include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                                        <include-menu name="PromoTabBar" location="${parameters.mainMenuLocation}"/>
                                         <container style="button-bar">
                                             <link target="EditProductPromo" text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/>
                                         </container>
diff --git a/applications/product/widget/catalog/ReviewScreens.xml b/applications/product/widget/catalog/ReviewScreens.xml
index 55ddc166966..1b5801ec3dd 100644
--- a/applications/product/widget/catalog/ReviewScreens.xml
+++ b/applications/product/widget/catalog/ReviewScreens.xml
@@ -25,7 +25,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
diff --git a/applications/product/widget/catalog/StoreScreens.xml b/applications/product/widget/catalog/StoreScreens.xml
index a8d592ffc41..6bf6455a585 100644
--- a/applications/product/widget/catalog/StoreScreens.xml
+++ b/applications/product/widget/catalog/StoreScreens.xml
@@ -560,7 +560,7 @@ under the License.
             <widgets>
                 <container id="ProductStoreFacilityEditArea"/>
                 <screenlet title="${uiLabelMap.ProductStoreFacilityAssocList}" navigation-menu-name="ProductStoreFacility">
-                    <include-menu name="ProductStoreFacility" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                    <include-menu name="ProductStoreFacility" location="${parameters.mainMenuLocation}"/>
                     <include-grid name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/>
                 </screenlet>
             </widgets>
diff --git a/applications/product/widget/catalog/SubscriptionScreens.xml b/applications/product/widget/catalog/SubscriptionScreens.xml
index 6d18676ed41..6c9b0f44e12 100644
--- a/applications/product/widget/catalog/SubscriptionScreens.xml
+++ b/applications/product/widget/catalog/SubscriptionScreens.xml
@@ -31,7 +31,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
diff --git a/applications/product/widget/catalog/ThesaurusScreens.xml b/applications/product/widget/catalog/ThesaurusScreens.xml
index 5cceddffd62..9cac34b633d 100644
--- a/applications/product/widget/catalog/ThesaurusScreens.xml
+++ b/applications/product/widget/catalog/ThesaurusScreens.xml
@@ -25,7 +25,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                        <include-menu name="MainActionMenu" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
                     </decorator-section>
                     <decorator-section name="left-column">
                         <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>