(feat) Restore side navigation #417
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import { BehaviorSubject } from 'rxjs'; | ||
| import { type FormPage } from '../../types'; | ||
|
|
||
| class PageObserver { | ||
|
There was a problem hiding this comment. A couple of points here:
|
||
| private scrollablePagesSubject = new BehaviorSubject<Array<FormPage>>([]); | ||
| private pagesWithErrorsSubject = new BehaviorSubject<Set<string>>(new Set()); | ||
| private activePagesSubject = new BehaviorSubject<Set<string>>(new Set()); | ||
| private evaluatedPagesVisibilitySubject = new BehaviorSubject<boolean>(null); | ||
|
|
||
| setEvaluatedPagesVisibility(evaluatedPagesVisibility: boolean) { | ||
| this.evaluatedPagesVisibilitySubject.next(evaluatedPagesVisibility); | ||
| } | ||
|
|
||
| updateScrollablePages(newPages: Array<FormPage>) { | ||
| this.scrollablePagesSubject.next(newPages); | ||
| } | ||
|
|
||
| updatePagesWithErrors(newErrors: string[]) { | ||
| this.pagesWithErrorsSubject.next(new Set(newErrors)); | ||
| } | ||
|
|
||
| addActivePage(pageId: string) { | ||
| const currentActivePages = this.activePagesSubject.value; | ||
| currentActivePages.add(pageId); | ||
| this.activePagesSubject.next(currentActivePages); | ||
| } | ||
|
|
||
| removeInactivePage(pageId: string) { | ||
| const currentActivePages = this.activePagesSubject.value; | ||
| currentActivePages.delete(pageId); | ||
| this.activePagesSubject.next(currentActivePages); | ||
| } | ||
|
|
||
| getActivePagesObservable() { | ||
| return this.activePagesSubject.asObservable(); | ||
| } | ||
|
|
||
| getScrollablePagesObservable() { | ||
| return this.scrollablePagesSubject.asObservable(); | ||
| } | ||
|
|
||
| getPagesWithErrorsObservable() { | ||
| return this.pagesWithErrorsSubject.asObservable(); | ||
| } | ||
|
|
||
| getEvaluatedPagesVisibilityObservable() { | ||
| return this.evaluatedPagesVisibilitySubject.asObservable(); | ||
| } | ||
|
|
||
| clear() { | ||
| this.scrollablePagesSubject.next([]); | ||
| this.pagesWithErrorsSubject.next(new Set()); | ||
| this.activePagesSubject.next(new Set()); | ||
| this.evaluatedPagesVisibilitySubject.next(false); | ||
| } | ||
| } | ||
|
|
||
| export const pageObserver = new PageObserver(); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,134 +1,108 @@ | ||
| import React from 'react'; | ||
| import classNames from 'classnames'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { Button } from '@carbon/react'; | ||
| import { type FormPage, type SessionMode } from '../../types'; | ||
| import styles from './sidebar.scss'; | ||
| import { usePageObserver } from './usePageObserver'; | ||
| import { useCurrentActivePage } from './useCurrentActivePage'; | ||
| import { isPageContentVisible } from '../../utils/form-helper'; | ||
| import { InlineLoading } from '@carbon/react'; | ||
|
|
||
| interface SidebarProps { | ||
| defaultPage: string; | ||
| isFormSubmitting: boolean; | ||
| sessionMode: SessionMode; | ||
| onCancel: () => void; | ||
| handleClose: () => void; | ||
| hideFormCollapseToggle: () => void; | ||
| } | ||
|
|
||
| const Sidebar: React.FC<SidebarProps> = ({ | ||
| defaultPage, | ||
| isFormSubmitting, | ||
| sessionMode, | ||
| onCancel, | ||
| handleClose, | ||
| hideFormCollapseToggle, | ||
| }) => { | ||
| const { t } = useTranslation(); | ||
| const { pages, pagesWithErrors, activePages, evaluatedPagesVisibility } = usePageObserver(); | ||
| const { currentActivePage, requestPage } = useCurrentActivePage({ | ||
| pages, | ||
| defaultPage, | ||
| activePages, | ||
| evaluatedPagesVisibility, | ||
| }); | ||
|
|
||
| return ( | ||
| <div className={styles.sidebar}> | ||
| {pages | ||
| .filter((page) => isPageContentVisible(page)) | ||
| .map((page) => ( | ||
| <PageLink | ||
| key={page.id} | ||
| page={page} | ||
| currentActivePage={currentActivePage} | ||
| pagesWithErrors={pagesWithErrors} | ||
| requestPage={requestPage} | ||
| /> | ||
| ))} | ||
| {sessionMode !== 'view' && <hr className={styles.divider} />} | ||
|
There was a problem hiding this comment. There might be a use case for There was a problem hiding this comment. I'm not sure of the use case but currently, the sidenav isn't supported in "embedded-view" |
||
|
|
||
| <div className={styles.sideNavActions}> | ||
| {sessionMode !== 'view' && ( | ||
| <Button className={styles.saveButton} disabled={isFormSubmitting} type="submit"> | ||
| {isFormSubmitting ? ( | ||
| <InlineLoading description={t('submitting', 'Submitting') + '...'} /> | ||
| ) : ( | ||
| <span>{`${t('save', 'Save')}`}</span> | ||
| )} | ||
| </Button> | ||
| )} | ||
| <Button | ||
| className={classNames(styles.closeButton, { | ||
| [styles.topMargin]: sessionMode === 'view', | ||
| })} | ||
| kind="tertiary" | ||
| onClick={() => { | ||
| onCancel?.(); | ||
| handleClose?.(); | ||
| hideFormCollapseToggle(); | ||
| }}> | ||
| {sessionMode === 'view' ? t('close', 'Close') : t('cancel', 'Cancel')} | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| interface PageLinkProps { | ||
| page: FormPage; | ||
| currentActivePage: string; | ||
| pagesWithErrors: string[]; | ||
| requestPage: (page: string) => void; | ||
| } | ||
|
|
||
| function PageLink({ page, currentActivePage, pagesWithErrors, requestPage }: PageLinkProps) { | ||
| const isActive = page.id === currentActivePage; | ||
| const hasError = pagesWithErrors.includes(page.id); | ||
| return ( | ||
| <div | ||
| className={classNames(styles.pageLink, { | ||
| [styles.activePage]: isActive && !hasError, | ||
| [styles.errorPage]: hasError && !isActive, | ||
| [styles.activeErrorPage]: hasError && isActive, | ||
| })}> | ||
| <button | ||
| onClick={(e) => { | ||
| e.preventDefault(); | ||
| requestPage(page.id); | ||
| }}> | ||
| <span>{page.label}</span> | ||
| </button> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Sidebar; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't changing this to a
useMemobe a better option for this?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the useEffect is ideal for this scenario.