release 1.5.0 (#54)

* feat: merge in and update internal release

* feat: update version

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@boomerang-io/carbon-addons-boomerang-react",
   "description": "Carbon Addons for Boomerang apps",
-  "version": "1.4.1",
+  "version": "1.5.0-beta.12",
   "author": {
     "name": "Tim Bula",
     "email": "timrbula@gmail.com"
@@ -72,7 +72,7 @@
     "prop-types": "^15.7.2",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^5.3.0",
     "yup": "^0.32.11"
   },
   "devDependencies": {
@@ -96,7 +96,7 @@
     "@testing-library/jest-dom": "^5.11.6",
     "@testing-library/react": "11.2.1",
     "autoprefixer": "^9.4.4",
-    "axios": "^0.19.2",
+    "axios": "^0.24.0",
     "axios-mock-adapter": "^1.17.0",
     "babel-core": "^7.0.0-bridge.0",
     "carbon-components": "^10.25.0",
@@ -113,15 +113,15 @@
     "lint-staged": "^8.1.0",
     "mock-socket": "^9.0.3",
     "moment-timezone": "^0.5.26",
-    "node-sass": "^4.13.1",
+    "node-sass": "^6.0.1",
     "npm-run-all": "^4.1.5",
     "object-assign": "^4.1.1",
     "prettier": "2.0.5",
     "promise": "^8.0.2",
     "prop-types": "^15.7.2",
-    "react": "16.14.0",
-    "react-dom": "16.14.0",
-    "react-router-dom": "^5.2.0",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-router-dom": "^5.3.0",
     "react-scripts": "^4.0.1",
     "react-test-renderer": "16.13.1",
     "rimraf": "^3.0.2",

src/components/Feedback/Feedback.js

@@ -45,8 +45,8 @@ class Feedback extends Component {
                     .
                   </p>
                   <p>
-                    For now, you must have an IBM email address and you will need to register with a
-                    password during your first visit.
+                    For now, you must have an {this.props.platformOrganization} email address and
+                    you will need to register with a password during your first visit.
                   </p>
                   <p>
                     You will have the opportunity to see other public ideas, vote on them and track
@@ -69,6 +69,8 @@ class Feedback extends Component {
 }
 
 Feedback.propTypes = {
+  platformName: PropTypes.string,
+  platformOrganization: PropTypes.string,
   sendIdeasUrl: PropTypes.string,
 };
 

src/components/Feedback/Feedback.stories.js

@@ -2,11 +2,14 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import Feedback from './Feedback';
 
-
 storiesOf('Feedback', module).add('default', () => {
   return (
     <>
-      <Feedback platformName="IBM Boomerang" sendIdeasUrl="https://ideas.ibm.com" />
+      <Feedback
+        platformName="IBM Boomerang"
+        sendIdeasUrl="https://ideas.ibm.com"
+        platformOrganization="IBM"
+      />
     </>
   );
 });

src/components/HeaderMenuItem/HeaderMenuItem.js

@@ -59,7 +59,7 @@ HeaderMenuItem.propTypes = {
     'information',
     'locked',
     'launch',
-    'idea'
+    'idea',
   ]),
   /**
    *

src/components/UIShell/UIShell.js

@@ -43,6 +43,7 @@ UIShell.propTypes = {
     features: PropTypes.shape({
       'consent.enabled': PropTypes.bool,
       'docs.enabled': PropTypes.bool,
+      'feedback.enabled': PropTypes.bool,
       'metering.enabled': PropTypes.bool,
       'notifications.enabled': PropTypes.bool,
       'support.enabled': PropTypes.bool,
@@ -59,8 +60,10 @@ UIShell.propTypes = {
       baseServicesUrl: PropTypes.string,
       communityUrl: PropTypes.string,
       displayLogo: PropTypes.bool,
+      feedbackUrl: PropTypes.string,
       name: PropTypes.string,
       platformName: PropTypes.string,
+      platformOrganization: PropTypes.string,
       privateTeams: PropTypes.bool,
       sendIdeasUrl: PropTypes.string,
       sendMail: PropTypes.bool,
@@ -191,7 +194,7 @@ function UIShell({
    */
   const finalBaseUrl = platform?.baseEnvUrl || baseLaunchEnvUrl;
   const finalBaseServiceUrl = platform?.baseServicesUrl || baseServiceUrl;
-  const finalSendIdeasUrl = platform?.sendIdeasUrl || 'https://ideas.ibm.com';
+  const finalSendIdeasUrl = platform?.feedbackUrl || 'https://ideas.ibm.com';
   const isLogoEnabled = platform?.displayLogo || renderLogo;
   const isSupportEnabled = Boolean(features?.['support.enabled']);
   const isFeedbackEnabled = Boolean(features?.['feedback.enabled']);
@@ -261,7 +264,14 @@ function UIShell({
               text="Flow Documentation"
             />
           ),
-          isFeedbackEnabled && <Feedback sendIdeasUrl={finalSendIdeasUrl} key="Feedback" />,
+          isFeedbackEnabled && (
+            <Feedback
+              key="Feedback"
+              platformName={platform.platformName}
+              platformOrganization={platform.platformOrganization}
+              sendIdeasUrl={finalSendIdeasUrl}
+            />
+          ),
         ].filter(Boolean)}
         profileChildren={[
           Boolean(user?.id) && (

src/components/UIShell/UIShell.stories.js

@@ -61,6 +61,8 @@ storiesOf('UIShell', module)
             version: text('platform.version', '5.0.0'),
             signOutUrl: 'https://ibm.com',
             communityUrl: 'https://developer.ibm.com',
+            platformName: text('platform.platformName', 'IBM Boomerang'),
+            platformOrganization: text('platform.platformOrganization', 'IBM'),
           },
           platformMessage: {
             kind: text('platformMessage.kind', 'info'),