Dashboard Restore: Remove experimental functionality under feature flag dashboardRestore for now - this will be reworked (#103204)

pkg/services/folder/folderimpl/folder.go

@@ -1024,29 +1024,26 @@ func (s *Service) deleteChildrenInFolder(ctx context.Context, orgID int64, folde
 }
 
 func (s *Service) legacyDelete(ctx context.Context, cmd *folder.DeleteFolderCommand, folderUIDs []string) error {
-	// if dashboard restore is on we don't delete public dashboards, the hard delete will take care of it later
-	if !s.features.IsEnabledGlobally(featuremgmt.FlagDashboardRestore) {
-		// We need a list of dashboard uids inside the folder to delete related public dashboards
-		dashes, err := s.dashboardStore.FindDashboards(ctx, &dashboards.FindPersistedDashboardsQuery{
-			SignedInUser: cmd.SignedInUser,
-			FolderUIDs:   folderUIDs,
-			OrgId:        cmd.OrgID,
-			Type:         searchstore.TypeDashboard,
-		})
-		if err != nil {
-			return folder.ErrInternal.Errorf("failed to fetch dashboards: %w", err)
-		}
+	// We need a list of dashboard uids inside the folder to delete related public dashboards
+	dashes, err := s.dashboardStore.FindDashboards(ctx, &dashboards.FindPersistedDashboardsQuery{
+		SignedInUser: cmd.SignedInUser,
+		FolderUIDs:   folderUIDs,
+		OrgId:        cmd.OrgID,
+		Type:         searchstore.TypeDashboard,
+	})
+	if err != nil {
+		return folder.ErrInternal.Errorf("failed to fetch dashboards: %w", err)
+	}
 
-		dashboardUIDs := make([]string, 0, len(dashes))
-		for _, dashboard := range dashes {
-			dashboardUIDs = append(dashboardUIDs, dashboard.UID)
-		}
+	dashboardUIDs := make([]string, 0, len(dashes))
+	for _, dashboard := range dashes {
+		dashboardUIDs = append(dashboardUIDs, dashboard.UID)
+	}
 
-		// Delete all public dashboards in the folders
-		err = s.publicDashboardService.DeleteByDashboardUIDs(ctx, cmd.OrgID, dashboardUIDs)
-		if err != nil {
-			return folder.ErrInternal.Errorf("failed to delete public dashboards: %w", err)
-		}
+	// Delete all public dashboards in the folders
+	err = s.publicDashboardService.DeleteByDashboardUIDs(ctx, cmd.OrgID, dashboardUIDs)
+	if err != nil {
+		return folder.ErrInternal.Errorf("failed to delete public dashboards: %w", err)
 	}
 
 	// TODO use bulk delete