Skip to content

Commit 5e3e06e

Browse files
authored
Merge pull request #448 from TeskaLabs/hotfix/on-help-button-in-header
Hotfix on help button render
2 parents acf6284 + df55517 commit 5e3e06e

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Releases
66

7+
- v24.39-alpha2
78
- v24.39-alpha
89

910
### Breaking change
@@ -132,6 +133,7 @@
132133

133134
### Hotfix
134135

136+
- Hotfix on displaying the Help button (INDIGO Sprint 240913, [!448](https://github.com/TeskaLabs/asab-webui/pull/448))
135137
- Hotfix on DateTime component - Invalid date in timeToString formatting, preventing app failure (INDIGO Sprint 230804, [!443](https://github.com/TeskaLabs/asab-webui/pull/443))
136138

137139

src/containers/Header/index.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,16 @@ export function Header(props) {
3131
useEffect(() => {
3232
window.addEventListener('resize', handleResize);
3333
return () => window.removeEventListener('resize', handleResize);
34-
}, [windowDimensions])
34+
}, [windowDimensions]);
35+
36+
// Avoid rendering Help button for SeaCatAuthModule
37+
const HelpButtonComponent = React.memo(function HelpButtonComponent(props) {
38+
if (props.app?.Modules?.some(obj => obj?.Name === 'SeaCatAuthModule')) {
39+
return null;
40+
} else {
41+
return <HelpButton />;
42+
}
43+
});
3544

3645
function handleResize () {
3746
setWindowDimensions({width: window.innerWidth});
@@ -56,7 +65,7 @@ export function Header(props) {
5665
{windowDimensions.width > 768 && <Breadcrumbs app={props.app}/>}
5766
<Nav className="ml-auto header-props" navbar>
5867
<PreviewFlag name={flag} />
59-
<HelpButton />
68+
<HelpButtonComponent app={props.app}/>
6069
<ThemeButton />
6170
{HeaderService.Items.map((item, idx) => (
6271
<NavItem key={idx}>
@@ -79,7 +88,7 @@ export function Header(props) {
7988
</div>
8089
<Nav className="ml-auto header-props" navbar>
8190
<PreviewFlag name={flag} />
82-
<HelpButton />
91+
<HelpButtonComponent app={props.app}/>
8392
<ThemeButton />
8493
{HeaderService.Items.map((item, idx) => (
8594
window.innerWidth < 1024 && item.componentProps.children !== undefined && item.componentProps.children === "LanguageDropdown" ?
@@ -123,7 +132,7 @@ export function Header(props) {
123132
(
124133
<Nav navbar>
125134
<PreviewFlag name={flag} />
126-
<HelpButton />
135+
<HelpButtonComponent app={props.app}/>
127136
<ThemeButton />
128137
{HeaderService.Items.map((item, idx) => (
129138
window.innerWidth > 500 ?
@@ -151,7 +160,7 @@ export function Header(props) {
151160
:
152161
<Nav className="header-props-sm" navbar>
153162
<PreviewFlag name={flag} />
154-
<HelpButton />
163+
<HelpButtonComponent app={props.app}/>
155164
<ThemeButton />
156165
{HeaderService.Items.map((item, idx) => (
157166
<NavItem key={idx}>

0 commit comments

Comments
 (0)