fix tests and processing of supertypes

Author: dqpinel

src/utils_GUI/GUI_utils.jl

@@ -634,9 +634,7 @@ function update_descriptive_names!(gui::GUI)
     # apply inheritances for fetching descriptive names
     # create a dictionary were the keys are all the types defined in emx_packages and the values are the types they inherit from
     emx_supertypes_dict = get_supertypes(emx_packages)
-
     inherit_descriptive_names_from_supertypes!(descriptive_names, emx_supertypes_dict)
-
     for package ∈ emx_packages
         package_path::Union{String,Nothing} = dirname(dirname(Base.find_package(package)))
         if !isnothing(package_path)

src/utils_gen/utils.jl

@@ -515,9 +515,14 @@ function inherit_descriptive_names_from_supertypes!(descriptive_names, emx_super
         for fname ∈ emx_type_fieldnames
             for emx_supertype ∈ emx_supertypes[2:end] # skip first element as it is the type itself
                 #check if the supertype has an entry in descriptive names for fname
-                if haskey(descriptive_names[:structures], Symbol(emx_supertype)) &&
+                # Extract only what is after the dot in emx_supertype, if any
+                supertype_str = string(emx_supertype)
+                supertype_key =
+                    occursin(r"\.", supertype_str) ?
+                    match(r"\.([^.]+)$", supertype_str).captures[1] : supertype_str
+                if haskey(descriptive_names[:structures], Symbol(supertype_key)) &&
                    haskey(
-                    descriptive_names[:structures][Symbol(emx_supertype)],
+                    descriptive_names[:structures][Symbol(supertype_key)],
                     Symbol(fname),
                 )
                     # if so, and if the emx_type does not have an entry for fname, copy it
@@ -531,7 +536,7 @@ function inherit_descriptive_names_from_supertypes!(descriptive_names, emx_super
                                 Dict{Symbol,Any}()
                         end
                         descriptive_names[:structures][Symbol(emx_type)][Symbol(fname)] =
-                            descriptive_names[:structures][Symbol(emx_supertype)][Symbol(
+                            descriptive_names[:structures][Symbol(supertype_key)][Symbol(
                                 fname,
                             )]
                     end

test/test_interactivity.jl

@@ -107,7 +107,6 @@ pin_plot_button = get_button(gui, :pin_plot)
         @test :RefNetworkNode ∉ keys(descriptive_names_raw[:structures])
 
         descriptive_names = EMGUI.get_var(gui2, :descriptive_names)
-        @test :Node ∉ keys(descriptive_names[:structures])
         @test descriptive_names[:structures][:StorCapOpexFixed][:opex_fixed] == str1
         @test descriptive_names[:structures][:RefNetworkNode][:opex_fixed] == str1
         EMGUI.close(gui2)