diff --git a/package.json b/package.json index 2873e0ce..d80ce2d5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@boomerang-io/carbon-addons-boomerang-react", "description": "Carbon Addons for Boomerang apps", - "version": "2.0.8", + "version": "2.0.9", "author": { "name": "Tim Bula", "email": "timrbula@gmail.com" diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index 894f8a2d..580ed4b7 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -13,7 +13,6 @@ import { import { settings } from 'carbon-components'; import FocusTrap from 'focus-trap-react'; import { SkipToContent } from 'carbon-components-react'; -import window from 'window-or-global'; import PlatformNotificationsContainer from '../PlatformNotifications'; import HeaderMenu from '../HeaderMenu'; import NotificationsContainer from '../Notifications/NotificationsContainer'; @@ -308,16 +307,13 @@ class Header extends React.Component {
diff --git a/src/components/Header/HeaderListItem.js b/src/components/Header/HeaderListItem.js index 3f84cab9..f7bdd852 100644 --- a/src/components/Header/HeaderListItem.js +++ b/src/components/Header/HeaderListItem.js @@ -1,6 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; -import { Link } from 'react-router-dom'; +import React from 'react'; import cx from 'classnames'; import { settings } from 'carbon-components'; import window from 'window-or-global'; @@ -8,7 +7,7 @@ import window from 'window-or-global'; const { prefix } = settings; const HeaderListItem = (props) => { - const { children, className, href, isIcon, ariaExpanded, newNotifications, id, isCurrentNavLink, ...other } = props; + const { children, className, href, isIcon, ariaExpanded, newNotifications, id, ...other } = props; const headerListItemClasses = cx(`${prefix}--bmrg-header-list__item`, className); @@ -25,14 +24,6 @@ const HeaderListItem = (props) => { > {children}
- ) : isCurrentNavLink ? ( - - {children} - ) : ( { mock.onGet(`${BASE_URL}/launchpad/users`).reply(200, PROFILE_SETTINGS_DATA); mock.onPost(`${BASE_URL}/support/contact`).reply(200); return ( - - - + ], + platform: { + name: text('platform.name', 'IBM Boomerang Platform'), + 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'), + message: text('platformMessage.message', 'Message Goes Here'), + title: text('platformMessage.title', 'Testing Platform Title'), + }, + }} + onTutorialClick={action('Tutorial')} + skipToContentProps={{ href: '#id' }} + user={{ + name: 'test user', + email: 'test.user@ibm.com', + hasConsented: true, + status: 'active', + requestSummary: { + requireUserAction: 0, + submittedByUser: 17, + }, + }} + /> ); }; @@ -227,75 +225,73 @@ export const WithRightPanel = () => { mock.onGet(`${BASE_URL}/users/consents`).reply(200, PRIVACY_DATA); mock.onPost(`${BASE_URL}/support/contact`).reply(200); return ( - - , - component: ( -
- Custom content behaviour -
- ), - }} - user={{ - id: '1', - name: 'test user', - email: 'test.user@ibm.com', - hasConsented: true, - status: 'active', - requestSummary: { - requireUserAction: 11, - submittedByUser: 17, - }, - }} - /> - + ], + platform: { + name: text('platform.name', 'IBM Boomerang Platform'), + version: text('platform.version', '5.0.0'), + signOutUrl: 'https://ibm.com', + communityUrl: 'https://developer.ibm.com', + }, + platformMessage: { + kind: text('platformMessage.kind', 'info'), + message: text('platformMessage.message', 'Message Goes Here'), + title: text('platformMessage.title', 'Testing Platform Title'), + }, + }} + onTutorialClick={action('Tutorial')} + renderRightPanel={{ + icon: , + component: ( +
+ Custom content behaviour +
+ ), + }} + user={{ + id: '1', + name: 'test user', + email: 'test.user@ibm.com', + hasConsented: true, + status: 'active', + requestSummary: { + requireUserAction: 11, + submittedByUser: 17, + }, + }} + /> ); }; @@ -306,54 +302,52 @@ WithRightPanel.story = { export const UserNotConsented = () => { mock.onGet(`${BASE_URL}/users/consents`).reply(200, PRIVACY_DATA); return ( - - - + ], + platform: { + name: text('platform.name', 'IBM Boomerang Platform'), + version: text('platform.version', '5.0.0'), + signOutUrl: 'https://ibm.com', + communityUrl: 'https://developer.ibm.com', + }, + platformMessage: { + kind: text('platformMessage.kind', 'info'), + message: text('platformMessage.message', 'Message Goes Here'), + title: text('platformMessage.title', 'Testing Platform Title'), + }, + }} + onTutorialClick={action('Tutorial')} + user={{ + id: '1', + name: 'test user', + email: 'test.user@ibm.com', + hasConsented: false, + status: 'active', + }} + /> ); }; @@ -364,54 +358,52 @@ UserNotConsented.story = { export const UserPendingDeletion = () => { mock.onGet(`${BASE_URL}/users/consents`).reply(200, PRIVACY_DATA); return ( - - - + ], + platform: { + name: text('platform.name', 'IBM Boomerang Platform'), + version: text('platform.version', '5.0.0'), + signOutUrl: 'https://ibm.com', + communityUrl: 'https://developer.ibm.com', + }, + platformMessage: { + kind: text('platformMessage.kind', 'info'), + message: text('platformMessage.message', 'Message Goes Here'), + title: text('platformMessage.title', 'Testing Platform Title'), + }, + }} + onTutorialClick={action('Tutorial')} + user={{ + id: '1', + name: 'test user', + email: 'test.user@ibm.com', + hasConsented: false, + status: 'pending_deletion', + }} + /> ); };