Fix feature for parametric structs that have type UnionAll and added tests

Author: dqpinel

src/utils_gen/utils.jl

@@ -309,7 +309,12 @@ get_types(["Base", "Core"])  # returns type names from both packages
 function get_types(modul::Module)
     types = []
     for name ∈ names(modul)
-        if isdefined(modul, name) && getfield(modul, name) isa DataType
+        if isdefined(modul, name) && (
+            getfield(modul, name) isa DataType || (
+                getfield(modul, name) isa UnionAll &&
+                Base.unwrap_unionall(getfield(modul, name)) isa DataType
+            )
+        )
             push!(types, name)
         end
     end
@@ -368,7 +373,12 @@ This set of functions helps extract the inheritance hierarchy of types defined i
 function get_supertypes(modul::Module)
     types=Dict()
     for name ∈ names(modul)
-        if isdefined(modul, name) && getfield(modul, name) isa DataType
+        if isdefined(modul, name) && (
+            getfield(modul, name) isa DataType || (
+                getfield(modul, name) isa UnionAll &&
+                Base.unwrap_unionall(getfield(modul, name)) isa DataType
+            )
+        )
             types[name] = supertypes(getfield(modul, name))
         end
     end
@@ -410,7 +420,6 @@ Checks whether a given type is a concrete struct with at least one field.
 
 # Description
 This function combines three checks:
-- `isconcretetype(type)`: Ensures the type is concrete (i.e., can be instantiated).
 - `isstructtype(type)`: Ensures the type is a struct.
 - `nfields(type) > 0`: Ensures the struct has at least one field.
 
@@ -427,7 +436,8 @@ has_fields(AbstractType)  # returns false
 ```
 """
 function has_fields(type)
-    return (isconcretetype(type) && isstructtype(type) && nfields(type) > 0)
+    t = type isa UnionAll ? Base.unwrap_unionall(type) : type
+    return (t isa DataType && isstructtype(t) && nfields(t) > 0)
 end
 
 """

test/test_interactivity.jl

@@ -98,18 +98,26 @@ pin_plot_button = get_button(gui, :pin_plot)
         descriptive_names_raw =
             YAML.load_file(path_to_descriptive_names; dicttype = Dict{Symbol,Any})
         str1 = "Relative fixed operating expense per installed capacity"
-        gui2 = GUI(
+        str2 = "Initial stored energy in the dam"
+        gui3 = GUI(
             case;
             path_to_descriptive_names = path_to_descriptive_names,
         )
         @test descriptive_names_raw[:structures][:Node][:opex_fixed] == str1
         @test :StorCapOpexFixed ∉ keys(descriptive_names_raw[:structures])
         @test :RefNetworkNode ∉ keys(descriptive_names_raw[:structures])
 
-        descriptive_names = EMGUI.get_var(gui2, :descriptive_names)
+        @test descriptive_names_raw[:structures][:HydroStorage][:level_init] == str2
+        @test :HydroStor ∉ keys(descriptive_names_raw[:structures])
+        @test :PumpedHydroStor ∉ keys(descriptive_names_raw[:structures])
+
+        descriptive_names = EMGUI.get_var(gui3, :descriptive_names)
         @test descriptive_names[:structures][:StorCapOpexFixed][:opex_fixed] == str1
         @test descriptive_names[:structures][:RefNetworkNode][:opex_fixed] == str1
-        EMGUI.close(gui2)
+
+        @test descriptive_names[:structures][:HydroStor][:level_init] == str2
+        @test descriptive_names[:structures][:PumpedHydroStor][:level_init] == str2
+        EMGUI.close(gui3)
     end
 end