Fix buttons in JsTree output

Buttons expand all and colapse all did nothing when
using multiple modules.

JIRA:LIGHTY-230
Signed-off-by: tobias.pobocik <tobias.pobocik@pantheon.tech>

Author: Tobianas

src/main/java/io/lighty/yang/validator/Main.java

@@ -184,7 +184,7 @@ private static void runLywForeachYangFile(final List<String> yangFiles, final Co
         for (final Module module : lyvContext.testedModules()) {
             format.emit(module);
         }
-        format.close();
+        format.close(lyvContext.testedModules());
     }
 
     private static void generateHtmlAnalyzeOutput(final List<String> yangFiles, final Configuration config)

src/main/java/io/lighty/yang/validator/formats/Emitter.java

@@ -9,6 +9,7 @@
 
 import io.lighty.yang.validator.config.Configuration;
 import io.lighty.yang.validator.simplify.SchemaTree;
+import java.util.Collection;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
 
@@ -33,5 +34,5 @@ public interface Emitter {
     /**
      * Close after printing out the module.
      */
-    void close();
+    void close(Collection<Module> modules);
 }

src/main/java/io/lighty/yang/validator/formats/Format.java

@@ -12,6 +12,7 @@
 import io.lighty.yang.validator.config.Configuration;
 import io.lighty.yang.validator.simplify.SchemaTree;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
@@ -56,7 +57,7 @@ public void emit(final Module module) {
     }
 
     @Override
-    public void close() {
-        this.usedFormat.close();
+    public void close(Collection<Module> modules) {
+        this.usedFormat.close(modules);
     }
 }

src/main/java/io/lighty/yang/validator/formats/FormatPlugin.java

@@ -13,6 +13,7 @@
 import io.lighty.yang.validator.simplify.SchemaTree;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Collection;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
@@ -48,7 +49,7 @@ void init(final EffectiveModelContext context, final SchemaTree tree, final Conf
     /**
      * Close after printing out the module.
      */
-    protected void close() {
+    protected void close(Collection<Module> modules) {
         // no-op by default
     }
 

src/main/java/io/lighty/yang/validator/formats/JsTree.java

@@ -236,11 +236,39 @@ private static RpcInputOutput getRpcInputOutput(final List<QName> qnames,
         return inputOutputOther;
     }
 
-    private static String loadJS() {
+    private static String loadJS(Collection<Module> modules) {
         final URL url = Resources.getResource("js");
         String text = "";
         try {
             text = Resources.toString(url, StandardCharsets.UTF_8);
+
+            StringBuilder moduleCode = new StringBuilder();
+
+            for (Module module : modules) {
+
+                // Define the multi-line string to add
+                String multiLineStringToAdd =
+                    " $('#basic-" + module.getName()
+                        + "').simpleTreeTable({\n"
+                        + "expander: $('#expander-" + module.getName() + "'),\n"
+                        + "collapser: $('#collapser-" + module.getName() + "')\n});\n";
+                moduleCode.append(multiLineStringToAdd);
+            }
+
+            // Encapsulate module code within $(document).ready(function () {...});
+            String encapsulatedCode = "\n$(document).ready(function () {\n" + moduleCode + "});\n";
+
+            // Find the index of the placeholder comment
+            String placeholderComment = "//AddTableLogic";
+            int commentIndex = text.indexOf(placeholderComment);
+
+            if (commentIndex != -1) {
+                // Insert the encapsulated code after the comment
+                StringBuilder modifiedText = new StringBuilder(text);
+                modifiedText.insert(commentIndex + placeholderComment.length(), encapsulatedCode);
+                text = modifiedText.toString();
+            }
+
         } catch (final IOException e) {
             LOG.error("Can not load text from js file");
         }
@@ -267,6 +295,9 @@ private static String prepareModule(final Module module) {
         String text = "";
         try {
             text = Resources.toString(url, StandardCharsets.UTF_8);
+            text = text.replace("expander", "expander-" + module.getName());
+            text = text.replace("collapser", "collapser-" + module.getName());
+            text = text.replace("basic", "basic-" + module.getName());
             text = text.replace("<NAME_REVISION>", nameRevision);
             text = text.replace("<NAMESPACE>", module.getNamespace().toString());
             text = text.replace("<PREFIX>", module.getPrefix());
@@ -403,8 +434,8 @@ public Optional<GroupArguments> getGroupArguments() {
     @Override
     @SuppressFBWarnings(value = "SLF4J_SIGN_ONLY_FORMAT",
             justification = "Valid output from LYV is dependent on Logback output")
-    public void close() {
-        LOG.info("{}", loadJS());
+    public void close(Collection<Module> modules) {
+        LOG.info("{}", loadJS(modules));
         LOG.info("</body>");
         LOG.info("</html>");
     }

src/main/java/io/lighty/yang/validator/formats/JsonTree.java

@@ -146,7 +146,7 @@ public void emitFormat(final Module module) {
     @SuppressFBWarnings(value = "SLF4J_SIGN_ONLY_FORMAT",
                         justification = "Valid output from LYV is dependent on Logback output")
     @Override
-    public void close() {
+    public void close(Collection<Module> modules) {
         LOG.info("{}", new JSONObject().put("parsed-models", parsedModels).toString(4));
         parsedModels.clear();
     }

src/main/resources/js

@@ -325,15 +325,5 @@ $.fn.simpleTreeTable = function(options) {
 
 $.SimpleTreeTable = SimpleTreeTable;
 
-    $('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
-  expander: $('#expander'),
-  collapser: $('#collapser')
-});
-
-$('#collapsed').simpleTreeTable({
-  opened: 'none',
-});
-$('#collapsed').simpleTreeTable({
-  margin: 25
-});
+//AddTableLogic
 </script>

src/test/java/io/lighty/yang/validator/MainTest.java

@@ -76,7 +76,7 @@ public void testSimplifyWithYangFormat() throws Exception {
         for (final Module module : effectiveModelContext.getModules()) {
             format.emit(module);
         }
-        format.close();
+        format.close((Collection<Module>) effectiveModelContext.getModules());
         contextFactory =
                 new YangContextFactory(ImmutableList.of(outPath), ImmutableList.of(), Collections.emptySet(), false);
         effectiveModelContext = contextFactory.createContext(true);