Fix diff links correctly going to new and old branches

unisoncomputing · Nov 22, 2024 · aeec3d1 · aeec3d1
1 parent 67dc63a
commit aeec3d1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/UnisonShare/DefinitionDiff.elm b/src/UnisonShare/DefinitionDiff.elm
@@ -152,30 +152,30 @@ viewNewDiffSegment syntaxConfig segment =
             ]
 
 
-viewDiff : SyntaxConfig msg -> NEL.Nonempty DiffSegment -> Html msg
-viewDiff syntaxConfig segments =
+viewDiff : (Bool -> SyntaxConfig msg) -> NEL.Nonempty DiffSegment -> Html msg
+viewDiff toSyntaxConfig segments =
     let
         old =
             segments
                 |> NEL.toList
-                |> List.concatMap (viewOldDiffSegment syntaxConfig)
+                |> List.concatMap (viewOldDiffSegment (toSyntaxConfig False))
 
         new =
             segments
                 |> NEL.toList
-                |> List.concatMap (viewNewDiffSegment syntaxConfig)
+                |> List.concatMap (viewNewDiffSegment (toSyntaxConfig True))
     in
     div [ class "diff-side-by-side" ]
         [ pre [ class "monochrome diff-side" ] [ code [] old ]
         , pre [ class "monochrome diff-side" ] [ code [] new ]
         ]
 
 
-view : SyntaxConfig msg -> DefinitionDiff -> Html msg
-view syntaxConfig defDiff =
+view : (Bool -> SyntaxConfig msg) -> DefinitionDiff -> Html msg
+view toSyntaxConfig defDiff =
     case defDiff of
         Diff _ diff ->
-            div [] [ viewDiff syntaxConfig diff ]
+            div [] [ viewDiff toSyntaxConfig diff ]
 
         Mismatched _ ->
             div [] [ text "TODO" ]

diff --git a/src/UnisonShare/Page/ProjectContributionChangesPage.elm b/src/UnisonShare/Page/ProjectContributionChangesPage.elm
@@ -486,7 +486,15 @@ viewLoadingExpandedContent =
 viewChangedDefinitionCard : ProjectRef -> ChangedDefinitions -> BranchDiff -> ChangeLine -> DefinitionType -> Html Msg -> Html Msg
 viewChangedDefinitionCard projectRef changedDefinitions branchDiff changeLine type_ content =
     let
-        linked branchRef =
+        toSyntaxConfig isNew =
+            let
+                branchRef =
+                    if isNew then
+                        branchDiff.newBranch.ref
+
+                    else
+                        branchDiff.newBranch.ref
+            in
             SyntaxConfig.empty
                 |> SyntaxConfig.withToClick
                     (Link.projectBranchDefinition projectRef branchRef)
@@ -508,7 +516,7 @@ viewChangedDefinitionCard projectRef changedDefinitions branchDiff changeLine ty
 
                                             Success d ->
                                                 DefinitionDiff.view
-                                                    (linked branchDiff.newBranch.ref)
+                                                    toSyntaxConfig
                                                     d
 
                                             Failure e ->