Remove "selected" keyword from response (#635)

frontend/components/queries/QueryComposer/QueryComposer.jsx

@@ -25,13 +25,13 @@ class QueryComposer extends Component {
     query: queryInterface,
     queryType: PropTypes.string,
     selectedTargets: PropTypes.arrayOf(targetInterface),
-    selectedTargetsCount: PropTypes.number,
+    targetsCount: PropTypes.number,
     queryText: PropTypes.string,
   };
 
   static defaultProps = {
     queryType: 'query',
-    selectedTargetsCount: 0,
+    targetsCount: 0,
   };
 
   onLoad = (editor) => {
@@ -81,7 +81,7 @@ class QueryComposer extends Component {
       onTargetSelect,
       queryType,
       selectedTargets,
-      selectedTargetsCount,
+      targetsCount,
     } = this.props;
 
     if (queryType === 'label') {
@@ -93,7 +93,7 @@ class QueryComposer extends Component {
       <div>
         <p className={`${baseClass}__target-label`}>
           <span className={`${baseClass}__select-targets`}>Select Targets</span>
-          <span className={`${baseClass}__targets-count`}> {selectedTargetsCount} unique {selectedTargetsCount === 1 ? 'host' : 'hosts' }</span>
+          <span className={`${baseClass}__targets-count`}> {targetsCount} unique {targetsCount === 1 ? 'host' : 'hosts' }</span>
         </p>
         <SelectTargetsDropdown
           onFetchTargets={onFetchTargets}

frontend/pages/queries/QueryPage/QueryPage.jsx

@@ -28,7 +28,7 @@ class QueryPage extends Component {
     super(props);
 
     this.state = {
-      selectedTargetsCount: 0,
+      targetsCount: 0,
     };
   }
 
@@ -68,11 +68,11 @@ class QueryPage extends Component {
   onFetchTargets = (query, targetResponse) => {
     const { dispatch } = this.props;
     const {
-      selected_targets_count: selectedTargetsCount,
+      targets_count: targetsCount,
     } = targetResponse;
 
     dispatch(setSelectedTargetsQuery(query));
-    this.setState({ selectedTargetsCount });
+    this.setState({ targetsCount });
 
     return false;
   }
@@ -162,7 +162,7 @@ class QueryPage extends Component {
       onTextEditorInputChange,
       onUpdateQuery,
     } = this;
-    const { selectedTargetsCount } = this.state;
+    const { targetsCount } = this.state;
     const {
       query,
       queryText,
@@ -182,7 +182,7 @@ class QueryPage extends Component {
           onUpdate={onUpdateQuery}
           query={query}
           selectedTargets={selectedTargets}
-          selectedTargetsCount={selectedTargetsCount}
+          targetsCount={targetsCount}
           selectedOsqueryTable={selectedOsqueryTable}
           queryText={queryText}
         />

frontend/test/mocks.js

@@ -112,7 +112,7 @@ export const validGetTargetsRequest = (bearerToken, query) => {
       },
     })
     .reply(200, {
-      selected_targets_count: 1234,
+      targets_count: 1234,
       targets: [
         {
           id: 3,

server/service/endpoint_packs.go

@@ -16,8 +16,8 @@ type getPackRequest struct {
 
 type packResponse struct {
 	kolide.Pack
-	QueryCount uint `json:"query_count"`
-	HostCount  uint `json:"host_count"`
+	QueryCount   uint `json:"query_count"`
+	TargetsCount uint `json:"targets_count"`
 }
 
 type getPackResponse struct {
@@ -48,9 +48,9 @@ func makeGetPackEndpoint(svc kolide.Service) endpoint.Endpoint {
 
 		return getPackResponse{
 			Pack: packResponse{
-				Pack:       *pack,
-				QueryCount: uint(len(queries)),
-				HostCount:  uint(len(hosts)),
+				Pack:         *pack,
+				QueryCount:   uint(len(queries)),
+				TargetsCount: uint(len(hosts)),
 			},
 		}, nil
 	}
@@ -90,9 +90,9 @@ func makeListPacksEndpoint(svc kolide.Service) endpoint.Endpoint {
 				return getPackResponse{Err: err}, nil
 			}
 			resp.Packs = append(resp.Packs, packResponse{
-				Pack:       *pack,
-				QueryCount: uint(len(queries)),
-				HostCount:  uint(len(hosts)),
+				Pack:         *pack,
+				QueryCount:   uint(len(queries)),
+				TargetsCount: uint(len(hosts)),
 			})
 		}
 		return resp, nil

server/service/endpoint_targets.go

@@ -28,6 +28,7 @@ type labelSearchResult struct {
 	DisplayText     string `json:"display_text"`
 	Count           uint   `json:"count"`
 	Online          uint   `json:"online"`
+	Offline         uint   `json:"offline"`
 	MissingInAction uint   `json:"missing_in_action"`
 }
 
@@ -37,11 +38,12 @@ type targetsData struct {
 }
 
 type searchTargetsResponse struct {
-	Targets                        *targetsData `json:"targets,omitempty"`
-	SelectedTargetsCount           uint         `json:"selected_targets_count"`
-	SelectedTargetsOnline          uint         `json:"selected_targets_online"`
-	SelectedTargetsMissingInAction uint         `json:"selected_targets_missing_in_action"`
-	Err                            error        `json:"error,omitempty"`
+	Targets                *targetsData `json:"targets,omitempty"`
+	TargetsCount           uint         `json:"targets_count"`
+	TargetsOnline          uint         `json:"targets_online"`
+	TargetsOffline         uint         `json:"targets_offline"`
+	TargetsMissingInAction uint         `json:"targets_missing_in_action"`
+	Err                    error        `json:"error,omitempty"`
 }
 
 func (r searchTargetsResponse) error() error { return r.Err }
@@ -76,11 +78,12 @@ func makeSearchTargetsEndpoint(svc kolide.Service) endpoint.Endpoint {
 			}
 			targets.Labels = append(targets.Labels,
 				labelSearchResult{
-					label,
-					label.Name,
-					metrics.TotalHosts,
-					metrics.OnlineHosts,
-					metrics.MissingInActionHosts,
+					Label:           label,
+					DisplayText:     label.Name,
+					Count:           metrics.TotalHosts,
+					Online:          metrics.OnlineHosts,
+					Offline:         metrics.OfflineHosts,
+					MissingInAction: metrics.MissingInActionHosts,
 				},
 			)
 		}
@@ -91,10 +94,11 @@ func makeSearchTargetsEndpoint(svc kolide.Service) endpoint.Endpoint {
 		}
 
 		return searchTargetsResponse{
-			Targets:                        targets,
-			SelectedTargetsCount:           metrics.TotalHosts,
-			SelectedTargetsOnline:          metrics.OnlineHosts,
-			SelectedTargetsMissingInAction: metrics.MissingInActionHosts,
+			Targets:                targets,
+			TargetsCount:           metrics.TotalHosts,
+			TargetsOnline:          metrics.OnlineHosts,
+			TargetsOffline:         metrics.OfflineHosts,
+			TargetsMissingInAction: metrics.MissingInActionHosts,
 		}, nil
 	}
 }