Merge pull request #65 from magento-cia/pre-release-develop-sync-120621

dvoskoboinikov · web-flow · commit 94439f805060 · 2021-12-08T14:24:23.000-06:00
Sync of 2.4.4-develop with 2.4-develop
diff --git a/AdobeStockAssetApi/Model/Asset/Command/DeleteByIdInterface.php b/AdobeStockAssetApi/Model/Asset/Command/DeleteByIdInterface.php
@@ -12,6 +12,8 @@
 
 /**
  * Used to delete an Adobe Stock asset data filtered by id from data storage.
+ *
+ * @api
  */
 interface DeleteByIdInterface
 {
diff --git a/AdobeStockAssetApi/Model/Asset/Command/LoadByIdInterface.php b/AdobeStockAssetApi/Model/Asset/Command/LoadByIdInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * Used to load Adobe Stock assets for gotten asset id.
+ *
+ * @api
  */
 interface LoadByIdInterface
 {
diff --git a/AdobeStockAssetApi/Model/Asset/Command/LoadByIdsInterface.php b/AdobeStockAssetApi/Model/Asset/Command/LoadByIdsInterface.php
@@ -12,6 +12,8 @@
 
 /**
  * Used for bulk load for Adobe Stock assets filtered by id.
+ *
+ * @api
  */
 interface LoadByIdsInterface
 {
diff --git a/AdobeStockAssetApi/Model/Asset/Command/SaveInterface.php b/AdobeStockAssetApi/Model/Asset/Command/SaveInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * Used to save an Adobe Stock asset data to data storage
+ *
+ * @api
  */
 interface SaveInterface
 {
diff --git a/AdobeStockAssetApi/Model/Category/Command/DeleteByIdInterface.php b/AdobeStockAssetApi/Model/Category/Command/DeleteByIdInterface.php
@@ -12,6 +12,8 @@
 
 /**
  * Used to delete an Adobe Stock asset category filtered by id from data storage.
+ *
+ * @api
  */
 interface DeleteByIdInterface
 {
diff --git a/AdobeStockAssetApi/Model/Category/Command/LoadByIdInterface.php b/AdobeStockAssetApi/Model/Category/Command/LoadByIdInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * Used to load an Adobe Stock asset category filtered by id
+ *
+ * @api
  */
 interface LoadByIdInterface
 {
diff --git a/AdobeStockAssetApi/Model/Category/Command/SaveInterface.php b/AdobeStockAssetApi/Model/Category/Command/SaveInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * Used to save an Adobe Stock asset category data to data storage
+ *
+ * @api
  */
 interface SaveInterface
 {
diff --git a/AdobeStockAssetApi/Model/Creator/Command/DeleteByIdInterface.php b/AdobeStockAssetApi/Model/Creator/Command/DeleteByIdInterface.php
@@ -12,6 +12,8 @@
 
 /**
  * Used to delete an Adobe Stock asset creator filtered by id from data storage.
+ *
+ * @api
  */
 interface DeleteByIdInterface
 {
diff --git a/AdobeStockAssetApi/Model/Creator/Command/LoadByIdInterface.php b/AdobeStockAssetApi/Model/Creator/Command/LoadByIdInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * Used to load an Adobe Stock asset creator filtered by id
+ *
+ * @api
  */
 interface LoadByIdInterface
 {
diff --git a/AdobeStockAssetApi/Model/Creator/Command/SaveInterface.php b/AdobeStockAssetApi/Model/Creator/Command/SaveInterface.php
@@ -13,6 +13,7 @@
 
 /**
  * Used to save an Adobe Stock asset creator data to data storage
+ * @api
  */
 interface SaveInterface
 {
diff --git a/AdobeStockClient/Model/SearchParameterProviderInterface.php b/AdobeStockClient/Model/SearchParameterProviderInterface.php
@@ -14,6 +14,8 @@
 
 /**
  * Class able to apply search criteria to SearchParameters completely or partially
+ *
+ * @api
  */
 interface SearchParameterProviderInterface
 {
diff --git a/AdobeStockClientApi/Api/ClientInterface.php b/AdobeStockClientApi/Api/ClientInterface.php
@@ -18,6 +18,8 @@
 
 /**
  * Adobe Stock API Client
+ *
+ * @api
  */
 interface ClientInterface
 {
diff --git a/AdobeStockImage/Test/Mftf/Test/StorefrontAdobeStockIntegrationApiSwaggerActionsExistTest.xml b/AdobeStockImage/Test/Mftf/Test/StorefrontAdobeStockIntegrationApiSwaggerActionsExistTest.xml
@@ -16,6 +16,9 @@
             <description value="Adobe stock actions are available on the Swagger page"/>
             <severity value="CRITICAL"/>
             <group value="developer_mode_only"/>
+            <skip>
+                <issueId value="AC-1842"/>
+            </skip>
         </annotations>
         <before>
             <getOTP stepKey="getOtpCode"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockLicensedImageViewLabelTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockLicensedImageViewLabelTest.xml
@@ -20,6 +20,7 @@
             <skip>
                 <issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockNotLicensedImageLicenseTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockNotLicensedImageLicenseTest.xml
@@ -18,6 +18,7 @@
             <description value="User can license Adobe Stock image"/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_integration_ims_signed"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSaveLicenseWithSavedPreviewTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSaveLicenseWithSavedPreviewTest.xml
@@ -18,6 +18,7 @@
             <skip>
                 <issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSaveLicensedTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSaveLicensedTest.xml
@@ -18,6 +18,7 @@
             <skip>
                 <issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml
@@ -20,6 +20,7 @@
                 <issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
             </skip>
             <group value="adobe_stock_integration_ims_signed"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSignInSignOutTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSignInSignOutTest.xml
@@ -23,6 +23,7 @@
             <skip>
                 <issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSignedInCreditsVisibleTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSignedInCreditsVisibleTest.xml
@@ -21,6 +21,7 @@
                 <issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
             </skip>
             <group value="adobe_stock_integration_ims_signed"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockTryLicenseAlreadyLicensedImageTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockTryLicenseAlreadyLicensedImageTest.xml
@@ -20,6 +20,7 @@
             <skip>
                 <issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyLicensedLabelTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyLicensedLabelTest.xml
@@ -20,6 +20,7 @@
             <description value="Admin should be able to save licensed image and not see unlicensed label"/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_media_gallery_ims_signed"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminViewsStockLicenseStatusTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminViewsStockLicenseStatusTest.xml
@@ -21,6 +21,7 @@
                 <issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
             </skip>
             <group value="adobe_stock_integration_ims_signed"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js
@@ -319,7 +319,7 @@ define([
             if (this.isMediaBrowser()) {
                 activeNode = this.getMageMediaBrowserData().activeNode;
 
-                activeNodePath = _.isUndefined(activeNode.path) ? '' : activeNode.path;
+                activeNodePath = _.isUndefined(activeNode.original.path) ? '' : activeNode.original.path;
             } else {
                 activeNodePath = this.imageDirectory().activeNode() || '';
             }
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/media-gallery.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/media-gallery.js
@@ -109,7 +109,7 @@ define([
                     folderPath = folderPath + '/' + folderPathParts[i];
                 }
                 pathId = Base64.idEncode(folderPath);
-                openFolderButton = $('.jstree li[data-id="' + pathId + '"]').children('.jstree-icon');
+                openFolderButton = $('.jstree li[data-id="' + pathId + '"].jstree-closed').children('.jstree-icon');
 
                 if (openFolderButton.length) {
                     openFolderButton.click();

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`
`13`	`13`	`/**`
`14`	`14`	`* Used to delete an Adobe Stock asset data filtered by id from data storage.`
	`15`	`+ *`
	`16`	`+ * @api`
`15`	`17`	`*/`
`16`	`18`	`interface DeleteByIdInterface`
`17`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Used to load Adobe Stock assets for gotten asset id.`
	`16`	`+ *`
	`17`	`+ * @api`
`16`	`18`	`*/`
`17`	`19`	`interface LoadByIdInterface`
`18`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Used to save an Adobe Stock asset creator data to data storage`
	`16`	`+ * @api`
`16`	`17`	`*/`
`17`	`18`	`interface SaveInterface`
`18`	`19`	`{`