Skip to content

907: Sort productBlock tree #1187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 13, 2024
Merged

907: Sort productBlock tree #1187

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26d2a52
907: Sort productBlock tree
Jun 12, 2024
464ab7d
907: Add changeset
Jun 13, 2024
2d53bb3
907: Pr comments
Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...s/orchestrator-ui-components/src/components/WfoSubscription/WfoSubscriptionDetailTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ export const WfoSubscriptionDetailTree = ({
<EuiFlexItem grow={true}>
{!tree && <WfoLoading />}
{tree && (
<WfoTree data={[tree]} depthList={depthList} />
<WfoTree
treeBlocks={[tree]}
depthList={depthList}
/>
)}
</EuiFlexItem>
</EuiFlexGroup>
Expand Down
7 changes: 4 additions & 3 deletions packages/orchestrator-ui-components/src/components/WfoTree/WfoTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import React, { FC, useEffect } from 'react';
import { TreeContext, TreeContextType } from '../../contexts';
import { TreeBlock } from '../../types';
import { WfoTreeBranch } from './WfoTreeBranch';
import { sortTreeBlockByLabel } from './treeUtils';

type WfoTreeProps = {
data: TreeBlock[];
treeBlocks: TreeBlock[];
depthList: number[];
};

export const WfoTree: FC<WfoTreeProps> = ({ data, depthList }) => {
export const WfoTree: FC<WfoTreeProps> = ({ treeBlocks, depthList }) => {
const { setDepths } = React.useContext(TreeContext) as TreeContextType;

useEffect(() => {
Expand All @@ -19,7 +20,7 @@ export const WfoTree: FC<WfoTreeProps> = ({ data, depthList }) => {

return (
<div style={{ width: '500px' }}>
{data.map((item) => (
{treeBlocks.sort(sortTreeBlockByLabel).map((item) => (
<WfoTreeBranch key={item.id} item={item} level={0} />
))}
</div>
Expand Down
13 changes: 10 additions & 3 deletions packages/orchestrator-ui-components/src/components/WfoTree/WfoTreeBranch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { EuiListGroup } from '@elastic/eui';
import { TreeContext, TreeContextType } from '../../contexts';
import { TreeBlock } from '../../types';
import { WfoTreeNode } from './WfoTreeNode';
import { sortTreeBlockByLabel } from './treeUtils';

type WfoTreeBranchProps = {
item: TreeBlock;
Expand All @@ -21,9 +22,15 @@ export const WfoTreeBranch: FC<WfoTreeBranchProps> = ({ item, level }) => {
if (hasChildren) {
const newLevel = level + 1;

return item.children.map((child) => (
<WfoTreeBranch key={child.id} item={child} level={newLevel} />
));
return item.children
.sort(sortTreeBlockByLabel)
.map((child) => (
<WfoTreeBranch
key={child.id}
item={child}
level={newLevel}
/>
));
}

return null;
Expand Down
13 changes: 13 additions & 0 deletions packages/orchestrator-ui-components/src/components/WfoTree/treeUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,16 @@ export function getWfoTreeNodeDepth(
}
}
}

export const sortTreeBlockByLabel = (
{ label: labelA }: TreeBlock,
{ label: labelB }: TreeBlock,
): number => {
if (labelA < labelB) {
return -1;
}
if (labelA > labelB) {
return 1;
}
return 0;
};