Skip to content

Bug #16452: remove parent node above key/value attachments #3908

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

Open
mkhediri wants to merge 1 commit into
base: develop
Choose a base branch
from
+1 −53
Open

Bug #16452: remove parent node above key/value attachments #3908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions ...chive-search-criteria/components/filing-holding-scheme/filing-holding-scheme.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,19 +153,6 @@ export class FilingHoldingSchemeComponent implements OnInit, OnDestroy {

FilingHoldingSchemeHandler.setCountRecursively(this.nestedDataSourceLeaves.data, facets);

const withKeyValueNodes = this.nestedDataSourceLeaves.data.filter((node) => node.unitType === UnitType.WITH_KEY_VALUE);
if (!isEmpty(withKeyValueNodes)) {
this.nestedDataSourceLeaves.data = FilingHoldingSchemeHandler.removeWithKeyValueNodeFromTree(
this.nestedDataSourceLeaves.data,
withKeyValueNodes,
);
FilingHoldingSchemeHandler.addKeyValueNodeFromTree(
this.nestedDataSourceLeaves.data,
withKeyValueNodes,
this.translateService.instant('COLLECT.FILING_SCHEMA.KEY_VALUE_NODE'),
withKeyValueNodes.length,
);
}
this.addOrRemoveOrphansNode(numberOfOrphanNodes);
}),
)
Expand Down
7 changes: 1 addition & 6 deletions ...ive-search-criteria/components/filing-holding-scheme/leaves-tree/leaves-tree.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,7 @@ export class LeavesTreeComponent implements OnInit, OnChanges, OnDestroy {
return;
}
if (this.firstToggle(node)) {
if (node.id === 'KEY_VALUE_NODE') {
node.canLoadMoreChildren = false;
node.canLoadMoreMatchingChildren = false;
} else {
await this.leavesTreeService.loadNodeChildrenOnFirstToggle(node, this.showEveryNodes);
}
await this.leavesTreeService.loadNodeChildrenOnFirstToggle(node, this.showEveryNodes);
this.refreshTreeNodes();
}
}
Expand Down
34 changes: 0 additions & 34 deletions ...nd/projects/vitamui-library/src/app/modules/models/nodes/filing-holding-scheme.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import { UnitType } from '../units';
import { DescriptionLevel } from '../../../../lib/models/description-level.enum';

export const ORPHANS_NODE_ID = 'ORPHANS_NODE';
export const KEY_VALUE_NODE_ID = 'KEY_VALUE_NODE';
export const PATH_SEPARATOR = '/';

export class FilingHoldingSchemeHandler {
Expand Down Expand Up @@ -177,39 +176,6 @@ export class FilingHoldingSchemeHandler {
}
}

public static addKeyValueNodeFromTree(
parentNodes: FilingHoldingSchemeNode[],
childrenNodes: FilingHoldingSchemeNode[],
nodeTitle: string,
count: number,
): void {
const existingNode = parentNodes.find((node) => node.vitamId === 'KEY_VALUE_NODE');

if (!existingNode) {
const nodeWithKeyValue: FilingHoldingSchemeNode = {
checked: false,
children: childrenNodes,
id: KEY_VALUE_NODE_ID,
title: nodeTitle,
vitamId: KEY_VALUE_NODE_ID,
count: count,
};
parentNodes.unshift(nodeWithKeyValue);
} else {
existingNode.count = count;
}
}

public static removeWithKeyValueNodeFromTree(
source: FilingHoldingSchemeNode[],
toRemove: FilingHoldingSchemeNode[],
): FilingHoldingSchemeNode[] {
if (!isEmpty(source) && !isEmpty(toRemove)) {
return source.filter((parent) => !toRemove.some((child) => parent.id === child.id));
}
return source;
}

public static removeOrphansNodeFromTree(parentNodes: FilingHoldingSchemeNode[]) {
if (isEmpty(parentNodes) || !FilingHoldingSchemeHandler.isOrphansNode(parentNodes[0])) {
return;
Expand Down
Loading