Merge branch 'main' into performance-fixes

finos · Feb 14, 2024 · 2652b86 · 2652b86
2 parents 7456466 + 4e2b9fb
commit 2652b86
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/cli/src/Morphir/Web/DevelopApp.elm b/cli/src/Morphir/Web/DevelopApp.elm
@@ -66,7 +66,7 @@ import Morphir.IR.NodeId exposing (NodeID(..))
 import Morphir.IR.Package as Package exposing (PackageName)
 import Morphir.IR.Path as Path exposing (Path)
 import Morphir.IR.Repo as Repo exposing (Repo)
-import Morphir.IR.SDK as SDK exposing (packageName)
+import Morphir.IR.SDK as SDK
 import Morphir.IR.Type as Type exposing (Type(..))
 import Morphir.IR.Value as Value exposing (RawValue, Value(..))
 import Morphir.SDK.Dict as SDKDict
@@ -1585,7 +1585,7 @@ viewHome model packageName packageDef =
                   else
                     none
                 , if model.showDefinitions then
-                    definitionList packageDef model entryPoints
+                    definitionList packageName packageDef model entryPoints
 
                   else
                     none
@@ -1611,8 +1611,8 @@ viewHome model packageName packageDef =
         ]
 
 
-definitionList : Package.Definition () (Type ()) -> Model -> List FQName -> Element Msg
-definitionList packageDef model entrypoints =
+definitionList : PackageName -> Package.Definition () (Type ()) -> Model -> List FQName -> Element Msg
+definitionList packageName packageDef model entrypoints =
     let
         -- Given a module name and a module definition, returns a list of tuples with the module's definitions, and their human readable form
         moduleDefinitionsAsUiElements : ModuleName -> Module.Definition () (Type ()) -> List ( Definition, Element Msg )

diff --git a/src/Morphir/Visual/ViewValue.elm b/src/Morphir/Visual/ViewValue.elm
@@ -265,8 +265,15 @@ viewValueByLanguageFeature config value =
                             Value.uncurryApply fun arg
                     in
 
+                    case (function, args) of
+                        ( Value.Reference _ ( [ [ "morphir" ], [ "s", "d", "k" ] ], [ [ "decimal" ] ], [ "from", "float" ] ), [ argValue ] ) ->
+                            viewValue config argValue
+
+                        ( Value.Reference _ (  [ [ "morphir" ], [ "s", "d", "k" ] ], [ [ "local", "date" ] ], [ "from", "i", "s", "o" ]  ), [ argValue ] ) ->
+                            viewValue config argValue
 
-                    ViewApply.view config definitionBody (viewValue config) function args applyValue
+                        _ ->
+                            ViewApply.view config definitionBody (viewValue config) function args applyValue
 
                 Value.LetDefinition _ _ _ _ ->
                     let