search

MauroDataMapper / mdm-core

The backend of MDM
Apache License 2.0
7 stars 3 forks source link

Crash attempting to merge a finalised model - version folder #463

Closed OButlerOcc closed 4 months ago

OButlerOcc commented 6 months ago

Versioned folders allow you to merge a finalised branch which causes a comparison error

Create the following: image

  1. one tagged finalised branch,

  2. one non finalised main branch

  3. one other branch.

  4. go to merge on the testbranch

image

  1. select the finalised branch that appears in the merge screen.

image

  1. note the crash and error that occurs during the merge diff calculation.
jamesrwelch commented 6 months ago

@OButlerOcc Do you have a stack trace?

pjmonks commented 6 months ago

Isn't the issue more that the list of available branches to merge into includes finalised versioned folders?

The branch selector component in the UI is calling the GET /api/versionedFolders/{id}/simpleModelVersionTree?branchesOnly=true. For data models this returns just the draft branches, perhaps there is an issue with the versionedFolder domain endpoint - maybe the branchesOnly parameter is ignored? Something to look into.

jamesrwelch commented 6 months ago

Is it related to this failing test in Jenkins? https://jenkins.cs.ox.ac.uk/job/Mauro%20Data%20Mapper/job/mdm-core/job/develop/513/testReport/junit/uk.ac.ox.softeng.maurodatamapper.datamodel/DataModelFunctionalSpec/Functional_Tests___Functional_Test__mdm_plugin_datamodel___MI07___test_merging_diff_into_draft_model_using_new_style/