From 01b80cabcfb8fc6155139e2d243abdaf5010cd99 Mon Sep 17 00:00:00 2001
From: Ben Schumacher <ben.schumacher@mattermost.com>
Date: Mon, 7 Dec 2020 20:42:27 +0100
Subject: [PATCH] [MM-30969] Drop aria-label from Marketplace item description
 (#7133)

* Drop aria-label from Marketplace item description

* Add general aria-label
---
 .../marketplace_item.test.js.snap             | 102 ++++++++++++++++--
 .../marketplace_item/marketplace_item.js      |   6 +-
 .../marketplace_item/marketplace_item.test.js |  11 ++
 3 files changed, 105 insertions(+), 14 deletions(-)

diff --git a/components/plugin_marketplace/marketplace_item/__snapshots__/marketplace_item.test.js.snap b/components/plugin_marketplace/marketplace_item/__snapshots__/marketplace_item.test.js.snap
index 7d28856d626e..6d9c88793346 100644
--- a/components/plugin_marketplace/marketplace_item/__snapshots__/marketplace_item.test.js.snap
+++ b/components/plugin_marketplace/marketplace_item/__snapshots__/marketplace_item.test.js.snap
@@ -32,7 +32,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render 1`] = `
         </span>
       </a>
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -114,7 +114,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render installed plug
         </span>
       </a>
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -194,7 +194,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render when not from
         </span>
       </a>
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -276,7 +276,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render with empty lis
         </span>
       </a>
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -326,6 +326,86 @@ exports[`components/MarketplaceItem MarketplaceItem should render with empty lis
 </Fragment>
 `;
 
+exports[`components/MarketplaceItem MarketplaceItem should render with no plugin description 1`] = `
+<Fragment>
+  <div
+    className="more-modal__row more-modal__row--link"
+    id="marketplace-plugin-id"
+    key="id"
+  >
+    <div
+      className="icon__plugin icon__plugin--background"
+    >
+      <img
+        src="icon"
+      />
+    </div>
+    <div
+      className="more-modal__details"
+    >
+      <a
+        aria-label="name"
+        className="style--none more-modal__row--link"
+        href="http://example.com"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        name
+        <span
+          className="light subtitle"
+        >
+          (1.0.0)
+        </span>
+      </a>
+      <a
+        aria-label="Plugin's website"
+        className="style--none more-modal__row--link"
+        href="http://example.com"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        <p
+          className="more-modal__description"
+        />
+      </a>
+      <UpdateDetails
+        installedVersion=""
+        isInstalling={false}
+        onUpdate={[Function]}
+        version="1.0.0"
+      />
+    </div>
+    <div
+      className="more-modal__actions"
+    >
+      <button
+        className="btn btn-primary"
+        disabled={false}
+        onClick={[Function]}
+      >
+        <LoadingWrapper
+          loading={false}
+          text="Installing..."
+        >
+          <FormattedMessage
+            defaultMessage="Install"
+            id="marketplace_modal.list.Install"
+          />
+        </LoadingWrapper>
+      </button>
+    </div>
+    <UpdateConfirmationModal
+      installedVersion=""
+      name="name"
+      onCancel={[Function]}
+      onUpdate={[Function]}
+      show={false}
+      version="1.0.0"
+    />
+  </div>
+</Fragment>
+`;
+
 exports[`components/MarketplaceItem MarketplaceItem should render with no plugin icon 1`] = `
 <Fragment>
   <div
@@ -354,7 +434,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render with no plugin
         </span>
       </a>
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -442,7 +522,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render with one label
         url="http://example.com/info"
       />
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -524,7 +604,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render with server er
         </span>
       </a>
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -618,7 +698,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render with two label
         url="http://example.com/info2"
       />
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -700,7 +780,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render with update an
         </span>
       </a>
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -782,7 +862,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render with update av
         </span>
       </a>
       <a
-        aria-label="test plugin"
+        aria-label="Plugin's website"
         className="style--none more-modal__row--link"
         href="http://example.com"
         rel="noopener noreferrer"
@@ -859,7 +939,7 @@ exports[`components/MarketplaceItem MarketplaceItem should render wtih no homepa
         </span>
       </span>
       <span
-        aria-label="test plugin"
+        aria-label="Plugin\\\\'s website"
         className="style--none"
       >
         <p
diff --git a/components/plugin_marketplace/marketplace_item/marketplace_item.js b/components/plugin_marketplace/marketplace_item/marketplace_item.js
index 517ddc7cfbb3..22c436eeea89 100644
--- a/components/plugin_marketplace/marketplace_item/marketplace_item.js
+++ b/components/plugin_marketplace/marketplace_item/marketplace_item.js
@@ -268,7 +268,7 @@ export default class MarketplaceItem extends React.PureComponent {
     static propTypes = {
         id: PropTypes.string.isRequired,
         name: PropTypes.string.isRequired,
-        description: PropTypes.string.isRequired,
+        description: PropTypes.string,
         version: PropTypes.string.isRequired,
         homepageUrl: PropTypes.string,
         releaseNotesUrl: PropTypes.string,
@@ -443,7 +443,7 @@ export default class MarketplaceItem extends React.PureComponent {
                     </a>
                     {labels}
                     <a
-                        aria-label={this.props.description.toLowerCase()}
+                        aria-label="Plugin's website"
                         className='style--none more-modal__row--link'
                         target='_blank'
                         rel='noopener noreferrer'
@@ -464,7 +464,7 @@ export default class MarketplaceItem extends React.PureComponent {
                     </span>
                     {labels}
                     <span
-                        aria-label={this.props.description.toLowerCase()}
+                        aria-label="Plugin\'s website"
                         className='style--none'
                     >
                         {description}
diff --git a/components/plugin_marketplace/marketplace_item/marketplace_item.test.js b/components/plugin_marketplace/marketplace_item/marketplace_item.test.js
index 1fe60658d6d9..9cc9e392f003 100644
--- a/components/plugin_marketplace/marketplace_item/marketplace_item.test.js
+++ b/components/plugin_marketplace/marketplace_item/marketplace_item.test.js
@@ -223,6 +223,17 @@ describe('components/MarketplaceItem', () => {
             expect(wrapper).toMatchSnapshot();
         });
 
+        test('should render with no plugin description', () => {
+            const props = {...baseProps};
+            delete props.description;
+
+            const wrapper = shallow(
+                <MarketplaceItem {...props}/>,
+            );
+
+            expect(wrapper).toMatchSnapshot();
+        });
+
         test('should render with no plugin icon', () => {
             const props = {...baseProps};
             delete props.iconData;