Added support for multi-facet graphs.

Author: Luis Cabrera

02 - Web UI Template/CognitiveSearch.UI/Controllers/HomeController.cs

@@ -290,14 +290,16 @@ private void GetContainerSasUris()
         [HttpPost]
         public JObject GetGraphData(string query)
         {
-            string facetName = _configuration.GetSection("GraphFacet")?.Value;
+            string facetsList = _configuration.GetSection("GraphFacet")?.Value;
+
+            string[] facetNames = facetsList.Split(new char[] {',',' '}, StringSplitOptions.RemoveEmptyEntries);
 
             if (query == null)
             {
                 query = "*";
             }
             FacetGraphGenerator graphGenerator = new FacetGraphGenerator(_docSearch);
-            var graphJson = graphGenerator.GetFacetGraphNodes(query, facetName);
+            var graphJson = graphGenerator.GetFacetGraphNodes(query, facetNames.ToList<string>());
 
             return graphJson;
         }

02 - Web UI Template/CognitiveSearch.UI/Search/DocumentSearchClient.cs

@@ -214,8 +214,15 @@ public string GetSearchId()
             return string.Empty;
         }
 
-        public DocumentSearchResult<Document> GetFacets(string searchText, string facetName, int maxCount = 30)
+        public DocumentSearchResult<Document> GetFacets(string searchText, List<string> facetNames, int maxCount = 30)
         {
+            var facets = new List<String>();
+
+            foreach (var facet in facetNames) 
+            {
+                 facets.Add($"{facet}, count:{maxCount}");
+            }
+
             // Execute search based on query string
             try
             {
@@ -224,7 +231,7 @@ public DocumentSearchResult<Document> GetFacets(string searchText, string facetN
                     SearchMode = SearchMode.Any,
                     Top = 10,
                     Select = new List<String>() { idField },
-                    Facets = new List<String>() { $"{facetName}, count:{maxCount}" },
+                    Facets = facets, 
                     QueryType = QueryType.Full
                 };
 

02 - Web UI Template/CognitiveSearch.UI/Search/FacetGraphGenerator.cs

@@ -16,7 +16,7 @@ public FacetGraphGenerator(DocumentSearchClient searchClient)
             _searchHelper = searchClient;
         }
 
-        public JObject GetFacetGraphNodes(string q, string facetName)
+        public JObject GetFacetGraphNodes(string q, List<string> facetNames)
         {
             // Calculate nodes for 3 levels
             JObject dataset = new JObject();
@@ -48,30 +48,37 @@ public JObject GetFacetGraphNodes(string q, string facetName)
                 {
                     CurrentLevel++;
                 }
-                DocumentSearchResult<Document> response = _searchHelper.GetFacets(q, facetName, 10);
+                DocumentSearchResult<Document> response = _searchHelper.GetFacets(q, facetNames, 10);
                 if (response != null)
                 {
-                    IList<FacetResult> facetVals = (response.Facets)[facetName];
-                    foreach (FacetResult facet in facetVals)
+                    //var facetName = facetNames[0]; // TODO: Fix this in a bit.
+                    foreach (var facetName in facetNames)
                     {
-                        int node = -1;
-                        if (NodeMap.TryGetValue(facet.Value.ToString(), out node) == false)
-                        {
-                            // This is a new node
-                            CurrentNodes++;
-                            node = CurrentNodes;
-                            NodeMap[facet.Value.ToString()] = node;
-                        }
-                        // Add this facet to the fd list
-                        if (NodeMap[q] != NodeMap[facet.Value.ToString()])
+                        IList<FacetResult> facetVals = (response.Facets)[facetName];
+
+                        foreach (FacetResult facet in facetVals)
                         {
-                            FDEdgeList.Add(new FDGraphEdges { source = NodeMap[q], target = NodeMap[facet.Value.ToString()] });
-                            if (CurrentLevel < MaxLevels)
+                            int node = -1;
+                            if (NodeMap.TryGetValue(facet.Value.ToString(), out node) == false)
                             {
-                                NextLevelTerms.Add(facet.Value.ToString());
+                                // This is a new node
+                                CurrentNodes++;
+                                node = CurrentNodes;
+                                NodeMap[facet.Value.ToString()] = node;
+                            }
+                            // Add this facet to the fd list
+                            if (NodeMap[q] != NodeMap[facet.Value.ToString()])
+                            {
+                                FDEdgeList.Add(new FDGraphEdges { source = NodeMap[q], target = NodeMap[facet.Value.ToString()] });
+                                if (CurrentLevel < MaxLevels)
+                                {
+                                    NextLevelTerms.Add(facet.Value.ToString());
+                                }
                             }
                         }
                     }
+
+
                 }
             }
 

02 - Web UI Template/CognitiveSearch.UI/appsettings.json

@@ -26,6 +26,8 @@
   // Optional key to an Azure Maps account if you would like to display the geoLocation field in a map
   "AzureMapsSubscriptionKey": "",
 
-  // Set to the name of a facetable field you would like to represent as a graph
-  "GraphFacet": "keyPhrases"
+  // Set to the name of a facetable field you would like to represent as a graph.
+  // You may also set to a comma separated list of the facet names if you would like more than one facet type on the graph.
+  "GraphFacet": "keyPhrases, locations"
+ 
 }