From b5c5df798a68d0573bd84ac2c9daad0f37bfa2d6 Mon Sep 17 00:00:00 2001
From: matias-portainer <104775949+matias-portainer@users.noreply.github.com>
Date: Wed, 19 Jul 2023 12:28:17 -0300
Subject: [PATCH] chore(edgegroups): rename decoratedEdgeGroup property EE-5501
 (#9212)

---
 api/http/handler/edgegroups/edgegroup_list.go             | 4 ++--
 app/edge/components/groups-datatable/groupsDatatable.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/http/handler/edgegroups/edgegroup_list.go b/api/http/handler/edgegroups/edgegroup_list.go
index 624be9194..1fea62c4b 100644
--- a/api/http/handler/edgegroups/edgegroup_list.go
+++ b/api/http/handler/edgegroups/edgegroup_list.go
@@ -14,7 +14,7 @@ import (
 type decoratedEdgeGroup struct {
 	portainer.EdgeGroup
 	HasEdgeStack  bool `json:"HasEdgeStack"`
-	HasEdgeGroup  bool `json:"HasEdgeGroup"`
+	HasEdgeJob    bool `json:"HasEdgeJob"`
 	EndpointTypes []portainer.EndpointType
 }
 
@@ -99,7 +99,7 @@ func getEdgeGroupList(tx dataservices.DataStoreTx) ([]decoratedEdgeGroup, error)
 
 		edgeGroup.EndpointTypes = endpointTypes
 		edgeGroup.HasEdgeStack = usedEdgeGroups[edgeGroup.ID]
-		edgeGroup.HasEdgeGroup = usedByEdgeJob
+		edgeGroup.HasEdgeJob = usedByEdgeJob
 
 		decoratedEdgeGroups = append(decoratedEdgeGroups, edgeGroup)
 	}
diff --git a/app/edge/components/groups-datatable/groupsDatatable.html b/app/edge/components/groups-datatable/groupsDatatable.html
index e904abf2c..be8aa6ea5 100644
--- a/app/edge/components/groups-datatable/groupsDatatable.html
+++ b/app/edge/components/groups-datatable/groupsDatatable.html
@@ -78,13 +78,13 @@
                     id="select_{{ $index }}"
                     type="checkbox"
                     ng-model="item.Checked"
-                    ng-disabled="item.HasEdgeStack || item.HasEdgeGroup"
+                    ng-disabled="item.HasEdgeStack || item.HasEdgeJob"
                     ng-click="$ctrl.selectItem(item, $event)"
                   />
                   <label for="select_{{ $index }}"></label>
                 </span>
                 <a ui-sref="edge.groups.edit({groupId: item.Id})">{{ item.Name }}</a>
-                <span ng-if="item.HasEdgeStack || item.HasEdgeGroup" class="label label-info image-tag space-left">in use</span>
+                <span ng-if="item.HasEdgeStack || item.HasEdgeJob" class="label label-info image-tag space-left">in use</span>
               </td>
               <td>{{ item.Endpoints.length }}</td>
               <td>{{ item.Dynamic ? 'Dynamic' : 'Static' }}</td>