#82 rendering indexer status on searcher view

Hendy · Mar 7, 2019 · e658e9e · e658e9e
1 parent 3ba4422
commit e658e9e
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 30 deletions.
diff --git a/src/Our.Umbraco.Look.BackOffice/Client/Views/Searcher.html b/src/Our.Umbraco.Look.BackOffice/Client/Views/Searcher.html
@@ -28,20 +28,20 @@
                     <dt>Look Indexing Enabled</dt>
                     <dd>{{ viewData.lookIndexingEnabled }}</dd>
 
-                    <!--<dt>Name Indexer Set</dt>
-                    <dd>{{ viewData.nameIndexerSet }}</dd>
+                    <dt>Name Indexer Enabled</dt>
+                    <dd>{{ viewData.nameIndexerEnabled }}</dd>
 
-                    <dt>Date Indexer Set</dt>
-                    <dd>{{ viewData.dateIndexerSet }}</dd>
+                    <dt>Date Indexer Enabled</dt>
+                    <dd>{{ viewData.dateIndexerEnabled }}</dd>
 
-                    <dt>Text Indexer Set</dt>
-                    <dd>{{ viewData.textIndexerSet }}</dd>
+                    <dt>Text Indexer Enabled</dt>
+                    <dd>{{ viewData.textIndexerEnabled }}</dd>
 
-                    <dt>Tag Indexer Set</dt>
-                    <dd>{{ viewData.tagIndexerSet }}</dd>
+                    <dt>Tag Indexer Enabled</dt>
+                    <dd>{{ viewData.tagIndexerEnabled }}</dd>
 
-                    <dt>Location Indexer Set</dt>
-                    <dd>{{ viewData.locationIndexerSet }}</dd>-->
+                    <dt>Location Indexer Enabled</dt>
+                    <dd>{{ viewData.locationIndexerEnabled }}</dd>
 
                 </dl>
 

diff --git a/src/Our.Umbraco.Look.BackOffice/Controllers/ApiController.cs b/src/Our.Umbraco.Look.BackOffice/Controllers/ApiController.cs
@@ -21,21 +21,24 @@ public IHttpActionResult GetViewDataForSearcher([FromUri]string searcherName)
         {
             var viewData = new SearcherViewData();
 
-            var searcher = (BaseSearchProvider)this.RequestContext.RouteData.Values["searcher"];
-            //var searcher = ExamineManager.Instance.SearchProviderCollection[searcherName];
+            var searcher = (BaseSearchProvider)this.RequestContext.RouteData.Values["searcher"]; //ExamineManager.Instance.SearchProviderCollection[searcherName];
 
             viewData.SearcherName = searcher.Name;
             viewData.SearcherDescription = searcher.Description;
             viewData.SearcherType = searcher is LookSearcher ? "Look" : "Examine";
             viewData.Icon = IconService.GetSearcherIcon(searcher);
-
             viewData.LookIndexingEnabled = searcher is LookSearcher || LookConfiguration.ExamineIndexers.Contains(searcher.Name.TrimEnd("Searcher") + "Indexer");
-
-
-            //viewData.NameIndexerEnabled = 
-            // number of documents in index
-            // indexers operational
-            //viewData.LookIndexingEnabled = 
+            viewData.NameIndexerEnabled = viewData.LookIndexingEnabled && LookConfiguration.NameIndexerEnabled;
+            viewData.DateIndexerEnabled = viewData.LookIndexingEnabled && LookConfiguration.DateIndexerEnabled;
+            viewData.TextIndexerEnabled = viewData.LookIndexingEnabled && LookConfiguration.TextIndexerEnabled;
+            viewData.TagIndexerEnabled = viewData.LookIndexingEnabled && LookConfiguration.TagIndexerEnabled;
+            viewData.LocationIndexerEnabled = viewData.LookIndexingEnabled && LookConfiguration.LocationIndexerEnabled;
+
+            // TODO: 
+            //number of documents in index
+            //fields in index
+            //text analyzer
+            //lucene index folder
 
             return this.Ok(viewData);
         }
@@ -54,7 +57,12 @@ public IHttpActionResult GetViewDataForNodes([FromUri]string searcherName)
             return this.Ok(viewData);
         }
 
-        // TODO: GetViewDataForNodeType
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="searcherName"></param>
+        /// <param name="nodeType"></param>
+        /// <returns></returns>
         [HttpGet]
         [ValidateSearcher]
         public IHttpActionResult GetViewDataForNodeType([FromUri]string searcherName, [FromUri]PublishedItemType nodeType)

diff --git a/src/Our.Umbraco.Look.BackOffice/Models/Api/SearcherViewData.cs b/src/Our.Umbraco.Look.BackOffice/Models/Api/SearcherViewData.cs
@@ -40,22 +40,31 @@ public class SearcherViewData
         /// <summary>
         /// should default to true when indexing enabled (as default indexing behaviour will be to index the IPublishedContent.Name property)
         /// </summary>
-        [JsonProperty("nameIndexerSet")]
-        public bool NameIndexerSet { get; set; }
+        [JsonProperty("nameIndexerEnabled")]
+        public bool NameIndexerEnabled { get; set; }
 
         /// <summary>
         /// should default to true when indexing enabled (as default indexing behaviour will be to index the IPublishedContent.UpdateDate property)
         /// </summary>
-        [JsonProperty("dateIndexerSet")]
-        public bool DateIndexerSet { get; set; }
+        [JsonProperty("dateIndexerEnabled")]
+        public bool DateIndexerEnabled { get; set; }
 
-        [JsonProperty("textIndexerSet")]
-        public bool TextIndexerSet { get; set; }
+        /// <summary>
+        /// Flag to indicate whether a custom indexer has been set
+        /// </summary>
+        [JsonProperty("textIndexerEnabled")]
+        public bool TextIndexerEnabled { get; set; }
 
-        [JsonProperty("tagIndexerSet")]
-        public bool TagIndexerSet { get; set; }
+        /// <summary>
+        /// Flag to indicate whether a custom indexer has been set
+        /// </summary>
+        [JsonProperty("tagIndexerEnabled")]
+        public bool TagIndexerEnabled { get; set; }
 
-        [JsonProperty("locationIndexerSet")]
-        public bool LocationIndexerSet { get; set; }
+        /// <summary>
+        /// Flag to indicate whether a custom indexer has been set
+        /// </summary>
+        [JsonProperty("locationIndexerEnabled")]
+        public bool LocationIndexerEnabled { get; set; }
     }
 }