MC-40873: Product is shown as Out of Stock on CMS page when Category Permissions are enabled

Author: yelahin-serhiy

app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php

@@ -153,6 +153,7 @@ public function getCurrentProductData()
         $this->productRenderCollectorComposite
             ->collect($product, $productRender);
         $data = $this->hydrator->extract($productRender);
+        $data['is_available'] = $product->isAvailable();
 
         $currentProductData = [
             'items' => [

app/code/Magento/Catalog/view/base/web/js/product/addtocart-button.js

@@ -55,6 +55,16 @@ define([
             return row['is_salable'];
         },
 
+        /**
+         * Depends on this option, stock status text can be "In stock" or "Out Of Stock"
+         *
+         * @param {Object} row
+         * @returns {Boolean}
+         */
+        isAvailable: function (row) {
+            return row['is_available'];
+        },
+
         /**
          * Depends on this option, "Add to cart" button can be shown or hide. Depends on  backend configuration
          *

app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html

@@ -15,10 +15,10 @@
         </button>
     </if>
 
-    <ifnot args="isSalable($row())">
+    <if args="isAvailable($row()) === false">
         <div class="stock unavailable">
             <text args="$t('Availability')"/>
             <span translate="'Out of stock'"/>
         </div>
-    </ifnot>
+    </if>
 </if>