Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
- Fixed SSO login button not appearing after session timeout without manual refresh [#6988](https://github.com/ethyca/fides/pull/6988)
- Data Subject email identity no longer included in Generic DSR email list if the DSR was submitted on a policy that has more than just the erasure action type. [#6938](https://github.com/ethyca/fides/pull/6938)
- Fixed page width on Digest list page [#6992](https://github.com/ethyca/fides/pull/6992)
- Confirmation screen tree pagination on first level [#7000](https://github.com/ethyca/fides/pull/7000)

### Developer Experience
- Fixed Ant Design drawer z-index to allow modal overlays [#6987](https://github.com/ethyca/fides/pull/6987)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { CustomTreeDataNode } from "./types";
const findNodeParent = (data: CustomTreeDataNode[], key: string) => {
return data.find((node) => {
const { children } = node;

return children && !!children.find((child) => child.key.toString() === key);
});
};
Expand All @@ -25,17 +26,20 @@ const recFindNodeParent = (
data: CustomTreeDataNode[],
key: string,
): CustomTreeDataNode | null => {
return data.reduce(
(agg, current) => {
if (current.children) {
return (
findNodeParent(current.children, key) ??
recFindNodeParent(current.children, key)
);
}
return agg;
},
null as null | CustomTreeDataNode,
return (
findNodeParent(data, key) ??
data.reduce(
(agg, current) => {
if (current.children) {
return (
findNodeParent(current.children, key) ??
recFindNodeParent(current.children, key)
);
}
return agg;
},
null as null | CustomTreeDataNode,
)
);
};

Expand All @@ -54,6 +58,7 @@ export const MonitorTreeDataTitle = ({

if (node.key.toString().startsWith(TREE_NODE_LOAD_MORE_KEY_PREFIX)) {
const nodeParent = recFindNodeParent(treeData, node.key.toString());

return (
<Button
type="link"
Expand Down
Loading