Skip to content

Commit 89109d3

Browse files
committed
fix for Hibernating Filter
1 parent 02a3d61 commit 89109d3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

pkg/app/AppListingService.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222
"github.com/devtron-labs/devtron/api/bean/AppView"
23+
bean2 "github.com/devtron-labs/devtron/client/argocdServer/bean"
2324
"github.com/devtron-labs/devtron/internal/middleware"
2425
"github.com/devtron-labs/devtron/internal/sql/repository/app"
2526
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow/cdWorkflow"
@@ -386,7 +387,7 @@ func (impl AppListingServiceImpl) FetchAppsByEnvironmentV2(fetchAppListingReques
386387
isFilteredOnHibernatingStatus := impl.isFilteredOnHibernatingStatus(fetchAppListingRequest)
387388
// remove ""HIBERNATING" from fetchAppListingRequest.AppStatuses
388389
if isFilteredOnHibernatingStatus {
389-
fetchAppListingRequest.AppStatuses = sliceutil.Remove(fetchAppListingRequest.AppStatuses, "HIBERNATING")
390+
fetchAppListingRequest.AppStatuses = sliceutil.Remove(fetchAppListingRequest.AppStatuses, bean2.HIBERNATING)
390391
}
391392

392393
appListingFilter := helper.AppListingFilter{
@@ -447,7 +448,7 @@ func (impl AppListingServiceImpl) FetchAppsByEnvironmentV2(fetchAppListingReques
447448
if isFilteredOnHibernatingStatus {
448449
filteredContainers := make([]*AppView.AppEnvironmentContainer, 0)
449450
for _, container := range envContainers {
450-
if container.AppStatus == "HIBERNATING" {
451+
if container.AppStatus == bean2.HIBERNATING {
451452
filteredContainers = append(filteredContainers, container)
452453
}
453454
}
@@ -459,7 +460,7 @@ func (impl AppListingServiceImpl) FetchAppsByEnvironmentV2(fetchAppListingReques
459460

460461
func (impl AppListingServiceImpl) isFilteredOnHibernatingStatus(fetchAppListingRequest FetchAppListingRequest) bool {
461462
if fetchAppListingRequest.AppStatuses != nil && len(fetchAppListingRequest.AppStatuses) > 0 {
462-
if slices.Contains(fetchAppListingRequest.AppStatuses, "HIBERNATING") {
463+
if slices.Contains(fetchAppListingRequest.AppStatuses, bean2.HIBERNATING) {
463464
return true
464465
}
465466
}

0 commit comments

Comments
 (0)