fixup! Visualize internal dependencies with GraphViz

Author: JohT

scripts/reports/InternalDependenciesVisualization.sh

@@ -3,7 +3,7 @@
 # Executes selected "Artifact_Dependencies" Cypher queries for GraphViz visualization.
 # It contains lists of dependencies across artifacts and their build levels (topologically sorted).
 # It requires an already running Neo4j graph database with already scanned and analyzed artifacts.
-# The reports (csv, dot and svg files) will be written into the sub directory reports/artifact-dependencies-visualization.
+# The reports (csv, dot and svg files) will be written into the sub directory reports/internal-dependencies-visualization.
 
 # Requires executeQueryFunctions.sh, cleanupAfterReportGeneration.sh
 
@@ -32,6 +32,8 @@ echo "InternalDependenciesVisualization VISUALIZATION_SCRIPTS_DIR=${VISUALIZATIO
 CYPHER_DIR=${CYPHER_DIR:-"${REPORTS_SCRIPT_DIR}/../../cypher"}
 echo "InternalDependenciesVisualization CYPHER_DIR=${CYPHER_DIR}"
 
+INTERNAL_DEPENDENCIES_CYPHER_DIR="${CYPHER_DIR}/Internal_Dependencies"
+
 if ! command -v "npx" &> /dev/null ; then
     echo "InternalDependenciesVisualization: Error: Command npx (run npm locally) not found. It's needed for Graph visualization with GraphViz." >&2
     exit 1
@@ -45,30 +47,27 @@ REPORT_NAME="internal-dependencies-visualization"
 FULL_REPORT_DIRECTORY="${REPORTS_DIRECTORY}/${REPORT_NAME}"
 mkdir -p "${FULL_REPORT_DIRECTORY}"
 
-# Local Constants
-INTERNAL_DEPENDENCIES_CYPHER_DIR="${CYPHER_DIR}/Internal_Dependencies"
-
 visualizeGraphAndGenerateSvg() {
-    if [ -f "${reportName}.gv" ]; then
+    local name="${1}"
+    echo "InternalDependenciesVisualization: Generating Visualization ${name}..."
+    source "${VISUALIZATION_SCRIPTS_DIR}/convertQueryResultCsvToGraphVizDotFile.sh" --filename "${name}.csv"
+
+    if [ -f "${name}.gv" ]; then
         # Run GraphViz command line interface (CLI) wrapped utilizing WASM (WebAssembly) 
         # to convert the DOT file to SVG operating system independently.
-        npx --yes @hpcc-js/[email protected] -T svg "${reportName}.gv" > "${reportName}.svg"
+        npx --yes @hpcc-js/[email protected] -T svg "${name}.gv" > "${name}.svg"
     fi
 }
 
 # Java Artifacts: Dependencies Visualization
 reportName="${FULL_REPORT_DIRECTORY}/JavaArtifactBuildLevels"
-echo "InternalDependenciesVisualization Generating ${reportName}..."
 execute_cypher "${INTERNAL_DEPENDENCIES_CYPHER_DIR}/Java_Artifact_build_levels_for_graphviz.cypher" > "${reportName}.csv"
-source "${VISUALIZATION_SCRIPTS_DIR}/convertQueryResultCsvToGraphVizDotFile.sh" --filename "${reportName}.csv"
-visualizeGraphAndGenerateSvg
+visualizeGraphAndGenerateSvg "${reportName}"
 
 # TypeScript Modules: Dependencies Visualization
 reportName="${FULL_REPORT_DIRECTORY}/TypeScriptModuleBuildLevels"
-echo "InternalDependenciesVisualization Generating ${reportName}..."
 execute_cypher "${INTERNAL_DEPENDENCIES_CYPHER_DIR}/Typescript_Module_build_levels_for_graphviz.cypher" > "${reportName}.csv"
-source "${VISUALIZATION_SCRIPTS_DIR}/convertQueryResultCsvToGraphVizDotFile.sh" --filename "${reportName}.csv"
-visualizeGraphAndGenerateSvg
+visualizeGraphAndGenerateSvg "${reportName}"
 
 # Clean-up after report generation. Empty reports will be deleted.
 source "${SCRIPTS_DIR}/cleanupAfterReportGeneration.sh" "${FULL_REPORT_DIRECTORY}"