Skip to content

Commit 24a1943

Browse files
feat(router): Fix after review and fixed Flow errors
1 parent 3d9d9d0 commit 24a1943

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/elements/content-sidebar/SidebarPanels.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ const MARK_NAME_JS_LOADING_METADATA_REDESIGNED = `${ORIGIN_METADATA_SIDEBAR_REDE
102102
const MARK_NAME_JS_LOADING_DOCGEN = `${ORIGIN_DOCGEN_SIDEBAR}${BASE_EVENT_NAME}`;
103103
const MARK_NAME_JS_LOADING_VERSIONS = `${ORIGIN_VERSIONS_SIDEBAR}${BASE_EVENT_NAME}`;
104104

105-
const URL_TO_FEED_ITEM_TYPE = { annotations: 'annotation', comments: 'comment', tasks: 'task' };
105+
const URL_TO_FEED_ITEM_TYPE = { annotations: 'annotation', comments: 'comment', tasks: 'task', versions: undefined };
106106

107107
const LoadableDetailsSidebar = SidebarUtils.getAsyncSidebarContent(SIDEBAR_VIEW_DETAILS, MARK_NAME_JS_LOADING_DETAILS);
108108
const LoadableActivitySidebar = SidebarUtils.getAsyncSidebarContent(
@@ -527,7 +527,7 @@ class SidebarPanelsRouterDisabled extends React.Component<Props, State> {
527527
}
528528
}
529529

530-
isVersionsNavigationPath = (navigation: InternalSidebarNavigation) => {
530+
isVersionsNavigationPath = (navigation?: InternalSidebarNavigation): boolean => {
531531
if (!navigation) {
532532
return false;
533533
}
@@ -632,7 +632,7 @@ class SidebarPanelsRouterDisabled extends React.Component<Props, State> {
632632

633633
// Determine default sidebar using the same logic as the router version
634634
if (showDefaultPanel) {
635-
return defaultPanel;
635+
return defaultPanel || null;
636636
} if (canShowBoxAISidebarPanel && shouldBoxAIBeDefaultPanel) {
637637
return SIDEBAR_VIEW_BOXAI;
638638
} if (hasDocGen) {
@@ -724,7 +724,10 @@ class SidebarPanelsRouterDisabled extends React.Component<Props, State> {
724724

725725
if (sidebarToRender) {
726726
if (sidebarToRender === SIDEBAR_VIEW_VERSIONS) {
727-
this.handlePanelRender(internalSidebarNavigation?.sidebar);
727+
const parentName = internalSidebarNavigation?.sidebar;
728+
if (parentName) {
729+
this.handlePanelRender(parentName);
730+
}
728731
} else {
729732
this.handlePanelRender(sidebarToRender);
730733
}

src/elements/content-sidebar/__tests__/SidebarPanels.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ describe('elements/content-sidebar/SidebarPanels', () => {
959959
${{ sidebar: 'details', activeFeedEntryType: 'versions' }} | ${true} | ${true} | ${false} | ${true} | ${true} | ${true} | ${true} | ${false} | ${'boxai'}
960960
${{ sidebar: 'details', activeFeedEntryType: 'versions', versionId: '1234' }} | ${true} | ${true} | ${false} | ${true} | ${true} | ${true} | ${true} | ${false} | ${'boxai'}
961961
${{ sidebar: 'metadata' }} | ${true} | ${true} | ${true} | ${false} | ${true} | ${true} | ${true} | ${false} | ${'boxai'}
962-
${{ sidebar: 'metadata', filteredTemplateIds: [1, 3] }} | ${true} | ${true} | ${true} | ${false} | ${true} | ${true} | ${true} | ${false} | ${'boxai'}
962+
${{ sidebar: 'metadata', filteredTemplateIds: ['1', '3'] }} | ${true} | ${true} | ${true} | ${false} | ${true} | ${true} | ${true} | ${false} | ${'boxai'}
963963
${{ sidebar: 'skills' }} | ${true} | ${true} | ${true} | ${true} | ${false} | ${true} | ${true} | ${false} | ${'boxai'}
964964
${{ sidebar: 'docgen' }} | ${true} | ${true} | ${true} | ${true} | ${true} | ${false} | ${true} | ${false} | ${'boxai'}
965965
${{ sidebar: 'boxai' }} | ${true} | ${true} | ${true} | ${true} | ${true} | ${true} | ${false} | ${false} | ${'docgen'}
@@ -1104,12 +1104,12 @@ describe('elements/content-sidebar/SidebarPanels', () => {
11041104
renderSidebarPanelsRouterDisabled({
11051105
internalSidebarNavigation: {
11061106
sidebar: 'metadata',
1107-
filteredTemplateIds: [123, 124],
1107+
filteredTemplateIds: ['123', '124'],
11081108
},
11091109
features: { metadata: { redesign: { enabled: true } } },
11101110
});
11111111
const metadataSidebar = screen.getByTestId('metadata-sidebar-redesigned');
1112-
expect(metadataSidebar).toHaveAttribute('data-filtered-template-ids', JSON.stringify([123, 124]));
1112+
expect(metadataSidebar).toHaveAttribute('data-filtered-template-ids', JSON.stringify(['123', '124']));
11131113
});
11141114

11151115
test('should render redesigned sidebar if it is enabled', () => {

0 commit comments

Comments
 (0)