ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-08-14 04:40:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

B: Fix cyclic block hierarchy

Browse Source
This commit is contained in:
Ivan 2025-07-17 19:17:23 +03:00
parent ebd1bfbd2c
commit 6b6e929696
3 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsconcept/backend/apps/oss/serializers/data_access.py
View File

@ -123,7 +123,7 @@ class UpdateBlockSerializer(StrictSerializer):
raise serializers.ValidationError({
'parent': msg.parentNotInOSS()
})
if parent == attrs['target']:
if attrs['target'].pk in _collect_ancestors(parent):
raise serializers.ValidationError({
'parent': msg.blockCyclicHierarchy()
})

33
rsconcept/backend/apps/oss/tests/s_views/t_blocks.py
View File

@ -266,3 +266,36 @@ class TestOssBlocks(EndpointTester):
data['layout'] = self.layout_data
self.executeOK(data=data)
@decl_endpoint('/api/oss/{item}/update-block', method='patch')
def test_update_block_cyclic_parent(self):
self.populateData()
# block1 -> block2
# Try to set block1's parent to block2 (should fail, direct cycle)
data = {
'target': self.block1.pk,
'item_data': {
'title': self.block1.title,
'description': self.block1.description,
'parent': self.block2.pk
},
}
self.executeBadData(data=data, item=self.owned_id)
# Create a deeper hierarchy: block1 -> block2 -> block3
self.block3 = self.owned.create_block(title='3', parent=self.block2)
# Try to set block1's parent to block3 (should fail, indirect cycle)
data['item_data']['parent'] = self.block3.pk
self.executeBadData(data=data, item=self.owned_id)
# Setting block2's parent to block1 (valid, as block1 is not a descendant)
data = {
'target': self.block2.pk,
'item_data': {
'title': self.block2.title,
'description': self.block2.description,
'parent': self.block1.pk
},
}
self.executeOK(data=data, item=self.owned_id)

20
rsconcept/frontend/src/features/oss/dialogs/dlg-edit-block.tsx
View File

@ -66,14 +66,18 @@ export function DlgEditBlock() {
<Controller
name='item_data.parent'
control={control}
render={({ field }) => (
<SelectParent
items={manager.oss.blocks.filter(block => block.id !== target.id)}
value={field.value ? manager.oss.blockByID.get(field.value) ?? null : null}
placeholder='Родительский блок'
onChange={value => field.onChange(value ? value.id : null)}
/>
)}
render={({ field }) => {
const descendantNodeIDs = manager.oss.hierarchy.expandAllOutputs([target.nodeID]);
descendantNodeIDs.push(target.nodeID);
return (
<SelectParent
items={manager.oss.blocks.filter(block => !descendantNodeIDs.includes(block.nodeID))}
value={field.value ? manager.oss.blockByID.get(field.value) ?? null : null}
placeholder='Родительский блок'
onChange={value => field.onChange(value ? value.id : null)}
/>
);
}}
/>
<TextArea