Skip to content

Commit

Permalink
fix tests page header changes
Browse files Browse the repository at this point in the history
Signed-off-by: Riya Saxena <[email protected]>
  • Loading branch information
riysaxen-amzn committed Aug 14, 2024
1 parent 9ebcf49 commit d48f441
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 96 deletions.
6 changes: 4 additions & 2 deletions public/pages/Channels/Channels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,11 @@ export class Channels extends MDSEnabledComponent<ChannelsProps, ChannelsState>
onSelectionChange: this.onSelectionChange,
};

const { HeaderControl } = this.props.navigationUI;
const navigationUI = this.props?.navigationUI || {};
const { HeaderControl } = navigationUI;
const showActionsInHeader = this.props.showActionsInHeader;
const { setAppRightControls, setAppLeftControls } = this.props.application;
const appllication = this.props?.application || {};
const { setAppRightControls, setAppLeftControls } = appllication;

const headerControls = [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,29 @@

exports[`<ChannelDetails/> spec handles a non-existing channel 1`] = `
<div>
<div
aria-live="polite"
class="euiGlobalToastList euiGlobalToastList--right"
role="region"
/>
<div
class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
style="max-width: 1316px;"
>
<div>
<h1
class="euiTitle euiTitle--large"
>
-
</h1>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<h1
class="euiTitle euiTitle--large"
>
-
</h1>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
style="padding-bottom: 5px;"
/>
</div>
class="euiFlexItem euiFlexItem--flexGrowZero"
style="padding-bottom: 5px;"
/>
<div
class="euiFlexItem"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
</div>
<div
class="euiFlexItem"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
</div>
<div
class="euiSpacer euiSpacer--l"
Expand Down Expand Up @@ -173,45 +157,29 @@ exports[`<ChannelDetails/> spec handles a non-existing channel 1`] = `

exports[`<ChannelDetails/> spec renders a specific channel 1`] = `
<div>
<div
aria-live="polite"
class="euiGlobalToastList euiGlobalToastList--right"
role="region"
/>
<div
class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
style="max-width: 1316px;"
>
<div>
<h1
class="euiTitle euiTitle--large"
>
-
</h1>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<h1
class="euiTitle euiTitle--large"
>
-
</h1>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
style="padding-bottom: 5px;"
/>
</div>
class="euiFlexItem euiFlexItem--flexGrowZero"
style="padding-bottom: 5px;"
/>
<div
class="euiFlexItem"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
</div>
<div
class="euiFlexItem"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
</div>
<div
class="euiSpacer euiSpacer--l"
Expand Down Expand Up @@ -343,9 +311,28 @@ exports[`<ChannelDetails/> spec renders a specific channel 1`] = `
`;

exports[`<ChannelDetails/> spec renders the component 1`] = `
<div
aria-live="polite"
class="euiGlobalToastList euiGlobalToastList--right"
role="region"
/>
<div>
<h1
class="euiTitle euiTitle--large"
>
-
</h1>
<div
class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
style="padding-bottom: 5px;"
/>
<div
class="euiFlexItem"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
/>
</div>
</div>
`;
6 changes: 4 additions & 2 deletions public/pages/Channels/components/details/ChannelDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,11 @@ export function ChannelDetails(props: ChannelDetailsProps) {
},
];

const { HeaderControl } = props.navigationUI;
const navigationUI = props?.navigationUI || {};
const { HeaderControl } = navigationUI;
const showActionsInHeader = props.showActionsInHeader;
const { setAppRightControls, setAppLeftControls } = props.application;
const appllication = props?.application || {};
const { setAppRightControls, setAppLeftControls } = appllication;

return (
<>
Expand Down
6 changes: 4 additions & 2 deletions public/pages/CreateChannel/CreateChannel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,11 @@ export function CreateChannel(props: CreateChannelsProps) {
roleArn: [],
});

const { HeaderControl } = props.navigationUI;
const navigationUI = props?.navigationUI || {};
const { HeaderControl } = navigationUI;
const showActionsInHeader = props.showActionsInHeader;
const { setAppDescriptionControls } = props.application;
const appllication = props?.application || {};
const { setAppDescriptionControls } = appllication;

useEffect(() => {
coreContext.chrome.setBreadcrumbs([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,11 @@ export class RecipientGroupsTable extends Component<
onSelectionChange: this.onSelectionChange,
};

const { HeaderControl } = this.props.navigationUI;
const navigationUI = this.props?.navigationUI || {};
const { HeaderControl } = navigationUI;
const showActionsInHeader = this.props.showActionsInHeader;
const { setAppRightControls, setAppLeftControls } = this.props.application;
const appllication = this.props?.application || {};
const { setAppRightControls, setAppLeftControls } = appllication;

const actions = [
{
Expand Down
26 changes: 13 additions & 13 deletions public/pages/Main/Main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export default class Main extends Component<MainProps, MainState> {
<ModalProvider>
<NavigationMenuContext.Provider
value={{
navigationUI: this.props.navigation.ui,
navigationUI: this.props.navigation?.ui,
showActionsInHeader: core.uiSettings.get('home:useNewHomePage'),
application: core.application
}}
Expand Down Expand Up @@ -373,7 +373,7 @@ export default class Main extends Component<MainProps, MainState> {
render={(routeProps: RouteComponentProps) => (
<CreateChannel
{...routeProps}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -385,7 +385,7 @@ export default class Main extends Component<MainProps, MainState> {
<CreateChannel
{...routeProps}
edit={true}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -396,7 +396,7 @@ export default class Main extends Component<MainProps, MainState> {
render={(routeProps: RouteComponentProps<{ id: string }>) => (
<ChannelDetails
{...routeProps}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -408,7 +408,7 @@ export default class Main extends Component<MainProps, MainState> {
<Channels
{...routeProps}
notificationService={services?.notificationService as NotificationService}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -420,7 +420,7 @@ export default class Main extends Component<MainProps, MainState> {
<EmailSenders
{...routeProps}
notificationService={services?.notificationService as NotificationService}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -432,7 +432,7 @@ export default class Main extends Component<MainProps, MainState> {
<EmailGroups
{...routeProps}
notificationService={services?.notificationService as NotificationService}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -443,7 +443,7 @@ export default class Main extends Component<MainProps, MainState> {
render={(routeProps: RouteComponentProps) => (
<CreateSender
{...routeProps}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -455,7 +455,7 @@ export default class Main extends Component<MainProps, MainState> {
<CreateSender
{...routeProps}
edit={true}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -466,7 +466,7 @@ export default class Main extends Component<MainProps, MainState> {
render={(routeProps: RouteComponentProps) => (
<CreateSESSender
{...routeProps}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -478,7 +478,7 @@ export default class Main extends Component<MainProps, MainState> {
<CreateSESSender
{...routeProps}
edit={true}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -489,7 +489,7 @@ export default class Main extends Component<MainProps, MainState> {
render={(routeProps: RouteComponentProps) => (
<CreateRecipientGroup
{...routeProps}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand All @@ -501,7 +501,7 @@ export default class Main extends Component<MainProps, MainState> {
<CreateRecipientGroup
{...routeProps}
edit={true}
navigationUI={this.props.navigation.ui} // Pass values from NavigationMenuContext
navigationUI={this.props.navigation?.ui} // Pass values from NavigationMenuContext
showActionsInHeader={core.uiSettings.get('home:useNewHomePage')} // Pass values from NavigationMenuContext
application={core.application} // Pass values from NavigationMenuContext
/>
Expand Down

0 comments on commit d48f441

Please sign in to comment.