fix(stack): fixed issue cannot deploy git stack without username.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Portainer Business
-    url: https://www.portainer.io/portainerbusiness 
-    about: Would you and your co-workers benefit from our enterprise edition which provides functionality to deploy Portainer at scale? 

README.md

@@ -44,7 +44,7 @@ Portainer CE is an open source project and is supported by the community. You ca
 Learn more about Portainers community support channels [here.](https://www.portainer.io/help_about)
 
 - Issues: https://github.com/portainer/portainer/issues
-- Slack (chat): [https://portainer.slack.com/](https://join.slack.com/t/portainer/shared_invite/zt-txh3ljab-52QHTyjCqbe5RibC2lcjKA)
+- Slack (chat): https://portainer.io/slack/
 
 You can join the Portainer Community by visiting community.portainer.io. This will give you advance notice of events, content and other related Portainer content.
 
@@ -59,7 +59,7 @@ You can join the Portainer Community by visiting community.portainer.io. This wi
 
 ## WORK FOR US
 
-If you are a developer, and our code in this repo makes sense to you, we would love to hear from you. We are always on the hunt for awesome devs, either freelance or employed. Drop us a line to info@portainer.io with your details and we will be in touch.
+If you are a developer, and our code in this repo makes sense to you, we would love to hear from you. We are always on the hunt for awesome devs, either freelance or employed. Drop us a line to info@portainer.io with your details and we will be in touch. 
 
 ## Privacy
 

api/bolt/migrator/migrate_dbversion31.go

@@ -2,7 +2,6 @@ package migrator
 
 import (
 	"fmt"
-	"log"
 
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/bolt/errors"
@@ -168,7 +167,6 @@ func (m *Migrator) updateVolumeResourceControlToDB32() error {
 
 		totalSnapshots := len(endpoint.Snapshots)
 		if totalSnapshots == 0 {
-			log.Println("[DEBUG] [volume migration] [message: no snapshot found]")
 			continue
 		}
 
@@ -181,7 +179,6 @@ func (m *Migrator) updateVolumeResourceControlToDB32() error {
 
 		if volumesData, done := snapshot.SnapshotRaw.Volumes.(map[string]interface{}); done {
 			if volumesData["Volumes"] == nil {
-				log.Println("[DEBUG] [volume migration] [message: no volume data found]")
 				continue
 			}
 
@@ -202,7 +199,7 @@ func (m *Migrator) updateVolumeResourceControlToDB32() error {
 			if err != nil {
 				return fmt.Errorf("failed deleting resource control %d: %w", resourceControl.ID, err)
 			}
-			log.Printf("[DEBUG] [volume migration] [message: legacy resource control(%s) has been deleted]", resourceControl.ResourceID)
+
 		}
 	}
 

api/chisel/service.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"net/http"
 	"strconv"
 	"time"
 
@@ -43,55 +42,6 @@ func NewService(dataStore portainer.DataStore, shutdownCtx context.Context) *Ser
 	}
 }
 
-// pingAgent ping the given agent so that the agent can keep the tunnel alive
-func (service *Service) pingAgent(endpointID portainer.EndpointID) error{
-	tunnel := service.GetTunnelDetails(endpointID)
-	requestURL := fmt.Sprintf("http://127.0.0.1:%d/ping", tunnel.Port)
-	req, err := http.NewRequest(http.MethodHead, requestURL, nil)
-	if err != nil {
-		return err
-	}
-
-	httpClient := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	_, err = httpClient.Do(req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// KeepTunnelAlive keeps the tunnel of the given environment for maxAlive duration, or until ctx is done
-func (service *Service) KeepTunnelAlive(endpointID portainer.EndpointID, ctx context.Context, maxAlive time.Duration) {
-	go func() {
-		log.Printf("[DEBUG] [chisel,KeepTunnelAlive] [endpoint_id: %d] [message: start for %.0f minutes]\n", endpointID, maxAlive.Minutes())
-		maxAliveTicker := time.NewTicker(maxAlive)
-		defer maxAliveTicker.Stop()
-		pingTicker := time.NewTicker(tunnelCleanupInterval)
-		defer pingTicker.Stop()
-
-		for {
-			select {
-			case <-pingTicker.C:
-				service.SetTunnelStatusToActive(endpointID)
-				err := service.pingAgent(endpointID)
-				if err != nil {
-					log.Printf("[DEBUG] [chisel,KeepTunnelAlive] [endpoint_id: %d] [warning: ping agent err=%s]\n", endpointID, err)
-				}
-			case <-maxAliveTicker.C:
-				log.Printf("[DEBUG] [chisel,KeepTunnelAlive] [endpoint_id: %d] [message: stop as %.0f minutes timeout]\n", endpointID, maxAlive.Minutes())
-				return
-			case <-ctx.Done():
-				err := ctx.Err()
-				log.Printf("[DEBUG] [chisel,KeepTunnelAlive] [endpoint_id: %d] [message: stop as err=%s]\n", endpointID, err)
-				return
-			}
-		}
-	}()
-}
-
 // StartTunnelServer starts a tunnel server on the specified addr and port.
 // It uses a seed to generate a new private/public key pair. If the seed cannot
 // be found inside the database, it will generate a new one randomly and persist it.

api/http/handler/websocket/proxy.go

@@ -35,9 +35,6 @@ func (handler *Handler) proxyEdgeAgentWebsocketRequest(w http.ResponseWriter, r
 	}
 
 	handler.ReverseTunnelService.SetTunnelStatusToActive(params.endpoint.ID)
-
-	handler.ReverseTunnelService.KeepTunnelAlive(params.endpoint.ID, r.Context(), portainer.WebSocketKeepAlive)
-
 	proxy.ServeHTTP(w, r)
 
 	return nil

api/kubernetes/cli/pod.go

@@ -21,7 +21,9 @@ const shellPodImage = "portainer/kubectl-shell"
 // - The shell pod will be automatically removed after a specified max life (prevent zombie pods)
 // - The shell pod will be automatically removed if request is cancelled (or client closes websocket connection)
 func (kcl *KubeClient) CreateUserShellPod(ctx context.Context, serviceAccountName string) (*portainer.KubernetesShellPod, error) {
-	maxPodKeepAliveSecondsStr := fmt.Sprintf("%d", int(portainer.WebSocketKeepAlive.Seconds()))
+	// Schedule the pod for automatic removal
+	maxPodKeepAlive := 1 * time.Hour
+	maxPodKeepAliveSecondsStr := fmt.Sprintf("%d", int(maxPodKeepAlive.Seconds()))
 
 	podPrefix := userShellPodPrefix(serviceAccountName)
 
@@ -79,7 +81,7 @@ func (kcl *KubeClient) CreateUserShellPod(ctx context.Context, serviceAccountNam
 	// Handle pod lifecycle/cleanup - terminate pod after maxPodKeepAlive or upon request (long-lived) cancellation
 	go func() {
 		select {
-		case <-time.After(portainer.WebSocketKeepAlive):
+		case <-time.After(maxPodKeepAlive):
 			log.Println("[DEBUG] [internal,kubernetes/pod] [message: pod removal schedule duration exceeded]")
 			kcl.cli.CoreV1().Pods(portainerNamespace).Delete(shellPod.Name, nil)
 		case <-ctx.Done():

api/portainer.go

@@ -148,7 +148,7 @@ type (
 		Name         string       `json:"Name"`
 		Dynamic      bool         `json:"Dynamic"`
 		TagIDs       []TagID      `json:"TagIds"`
-		Endpoints    []EndpointID `json:"Endpoints"`
+		Endpoints    []EndpointID `json:"Environments"`
 		PartialMatch bool         `json:"PartialMatch"`
 	}
 
@@ -161,7 +161,7 @@ type (
 		ID             EdgeJobID                          `json:"Id" example:"1"`
 		Created        int64                              `json:"Created"`
 		CronExpression string                             `json:"CronExpression"`
-		Endpoints      map[EndpointID]EdgeJobEndpointMeta `json:"Endpoints"`
+		Endpoints      map[EndpointID]EdgeJobEndpointMeta `json:"Environments"`
 		Name           string                             `json:"Name"`
 		ScriptPath     string                             `json:"ScriptPath"`
 		Recurring      bool                               `json:"Recurring"`
@@ -188,7 +188,7 @@ type (
 		CronExpression string       `json:"CronExpression"`
 		Script         string       `json:"Script"`
 		Version        int          `json:"Version"`
-		Endpoints      []EndpointID `json:"Endpoints"`
+		Endpoints      []EndpointID `json:"Environments"`
 	}
 
 	//EdgeStack represents an edge stack
@@ -1324,7 +1324,6 @@ type (
 		SetTunnelStatusToActive(endpointID EndpointID)
 		SetTunnelStatusToRequired(endpointID EndpointID) error
 		SetTunnelStatusToIdle(endpointID EndpointID)
-		KeepTunnelAlive(endpointID EndpointID, ctx context.Context, maxKeepAlive time.Duration)
 		GetTunnelDetails(endpointID EndpointID) *TunnelDetails
 		AddEdgeJob(endpointID EndpointID, edgeJob *EdgeJob)
 		RemoveEdgeJob(edgeJobID EdgeJobID)
@@ -1494,8 +1493,6 @@ const (
 	DefaultUserSessionTimeout = "8h"
 	// DefaultUserSessionTimeout represents the default timeout after which the user session is cleared
 	DefaultKubeconfigExpiry = "0"
-	// WebSocketKeepAlive web socket keep alive for edge environments
-	WebSocketKeepAlive = 1 * time.Hour
 )
 
 const (

app/assets/css/theme.css

@@ -150,8 +150,6 @@ html {
   --bg-btn-focus: var(--grey-59);
   --bg-boxselector-disabled-color: var(--white-color);
   --bg-small-select-color: var(--white-color);
-  --bg-app-datatable-thead: var(--grey-23);
-  --bg-app-datatable-tbody: var(--grey-24);
 
   --text-main-color: var(--grey-7);
   --text-body-color: var(--grey-6);
@@ -320,8 +318,6 @@ html {
   --bg-btn-focus: var(--grey-3);
   --bg-boxselector-disabled-color: var(--grey-54);
   --bg-small-select-color: var(--grey-2);
-  --bg-app-datatable-thead: var(--grey-1);
-  --bg-app-datatable-tbody: var(--grey-1);
 
   --text-main-color: var(--white-color);
   --text-body-color: var(--white-color);
@@ -489,8 +485,6 @@ html {
   --bg-boxselector-color: var(--black-color);
   --bg-boxselector-disabled-color: var(--black-color);
   --bg-small-select-color: var(--black-color);
-  --bg-app-datatable-thead: var(--black-color);
-  --bg-app-datatable-tbody: var(--black-color);
 
   --text-main-color: var(--white-color);
   --text-body-color: var(--white-color);

app/assets/css/vendor-override.css

@@ -396,8 +396,4 @@ input:-webkit-autofill {
 .btn-primary:hover {
   color: var(--white-color) !important;
 }
-
-.btn-danger:hover {
-  color: var(--white-color);
-}
 /* Overide Vendor CSS */

app/assets/images/logo_alt.svg

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 940 300" style="enable-background:new 0 0 940 300;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#13BEF9;}
-	.st1{fill:#13BEF9;}
-</style>
-<g>
-	<polygon class="st0" points="84.3,76.6 80.3,76.6 80.3,97.3 84.3,97.3 84.3,76.6 	"/>
-	<polygon class="st0" points="101.5,76.6 97.5,76.6 97.5,97.3 101.5,97.3 101.5,76.6 	"/>
-	<polygon class="st0" points="125,37.1 120.9,30 52.5,69.5 56.6,76.6 125,37.1 	"/>
-	<polygon class="st0" points="124.6,37.1 128.7,30 197.1,69.5 193,76.6 124.6,37.1 	"/>
-	<polygon class="st0" points="209.2,76.7 209.2,68.5 21.8,68.5 21.8,76.7 209.2,76.7 	"/>
-	<path class="st0" d="M135,192.5V71h8.2v127.4C141,195.9,138.2,194.1,135,192.5L135,192.5z"/>
-	<path class="st0" d="M121,190.4V19h8.2v172.4C126.9,190.3,121.3,190.4,121,190.4L121,190.4z"/>
-	<path class="st0" d="M43.3,207.5c-10-7.4-16.6-19.2-16.6-32.6c0-7.1,1.9-14.1,5.4-20.2h70c3.6,6.1,5.4,13.1,5.4,20.2
-		c0,6.2-0.8,12-3.3,17.2c-5.3-5.1-13.1-7.3-21-7.3c-14,0-26,8.7-29.1,21.7c-1.1-0.1-1.8-0.2-2.9-0.2
-		C48.5,206.4,45.9,206.8,43.3,207.5L43.3,207.5z"/>
-	<path class="st1" d="M219.8,115.5c-10.6,0-19.9,4.9-26.3,12.5v-11.4h-10.6v101.3h10.6v-42.7c6.3,7.8,15.7,12.8,26.3,12.8
-		c19.8,0,36.1-16.9,36.1-36.4C255.9,131.8,239.6,115.5,219.8,115.5L219.8,115.5z M220.1,177.5c-13.8,0-26-12.2-26-26
-		c0-14.1,12.2-25.6,26-25.6c14.1,0,24.7,11.5,24.7,25.6C244.8,165.3,234.2,177.5,220.1,177.5L220.1,177.5z"/>
-	<path class="st1" d="M302.3,187.9c19.8,0,36.1-16.9,36.1-36.4c0-19.8-16.3-36.1-36.1-36.1c-19.8,0-36.1,16.3-36.1,36.1
-		C266.2,171,282.5,187.9,302.3,187.9L302.3,187.9z M302.3,125.9c14.1,0,25,11.5,25,25.6c0,13.8-10.9,26-25,26c-14.1,0-25-12.2-25-26
-		C277.3,137.5,288.2,125.9,302.3,125.9L302.3,125.9z"/>
-	<path class="st1" d="M365.6,116.6H355v69.6h10.6v-38.5c0-14.2,11.2-21.8,23.6-21.8v-10.4c-9.6,0-17.9,4.1-23.6,10.6V116.6
-		L365.6,116.6z"/>
-	<polygon class="st1" points="433.8,126.2 433.8,116.6 418.1,116.6 418.1,89.2 407.5,89.2 407.5,116.6 397.1,116.6 397.1,126.2 
-		407.5,126.2 407.5,186.2 418.1,186.2 418.1,126.2 433.8,126.2 	"/>
-	<path class="st1" d="M478.6,187.9c10.6,0,19.9-5.1,26.3-12.8v11.4h10.6v-69.9h-10.6V128c-6.3-7.6-15.7-12.5-26.3-12.5
-		c-19.8,0-36.1,16.3-36.1,36.1C442.5,171,458.8,187.9,478.6,187.9L478.6,187.9z M478.2,177.5c-14.1,0-24.7-12.2-24.7-26
-		c0-14.1,10.6-25.6,24.7-25.6c13.8,0,26,11.5,26,25.6C504.2,165.3,492,177.5,478.2,177.5L478.2,177.5z"/>
-	<path class="st1" d="M543.6,102.5c4,0,7.4-3.3,7.4-7.6c0-3.8-3.5-7.3-7.4-7.3c-4.3,0-7.6,3.5-7.6,7.3
-		C536,99.2,539.3,102.5,543.6,102.5L543.6,102.5z M538.2,186.2h11.1v-69.6h-11.1V186.2L538.2,186.2z"/>
-	<path class="st1" d="M571.6,186.2h10.6v-37c0-15.7,8.7-23.6,22.8-23.3c11.6,0,17.9,6.8,17.9,20.6v39.7h10.6v-39.7
-		c0-22.2-8.5-31-28.5-31c-9.5,0-17.2,3.5-22.8,9.5v-8.4h-10.6V186.2L571.6,186.2z"/>
-	<path class="st1" d="M720.7,151.5c0-19.8-16.3-36.1-36.1-36.1c-19.8,0-36.1,16.3-36.1,36.1c0,19.5,16.3,36.4,36.1,36.4
-		c14.1,0,26.6-8.1,32.4-20.1h-13.1c-4.4,5.7-11.2,9.7-19.3,9.7c-12.3,0-22.3-9.5-24.5-21h60.6L720.7,151.5L720.7,151.5z
-		 M684.6,125.9c12.2,0,22.2,8.9,24.5,20.4h-49.1C662.4,134.8,672.3,125.9,684.6,125.9L684.6,125.9z"/>
-	<path class="st1" d="M747.9,116.6h-10.6v69.6h10.6v-38.5c0-14.2,11.2-21.8,23.6-21.8v-10.4c-9.7,0-17.9,4.1-23.6,10.6V116.6
-		L747.9,116.6z"/>
-	<path class="st1" d="M787.5,187c4.7,0,8.7-4,8.7-8.9c0-4.7-4-8.7-8.7-8.7c-4.9,0-8.9,4-8.9,8.7C778.6,183,782.6,187,787.5,187
-		L787.5,187z"/>
-	<path class="st1" d="M823.5,102.5c4,0,7.4-3.3,7.4-7.6c0-3.8-3.5-7.3-7.4-7.3c-4.3,0-7.6,3.5-7.6,7.3
-		C816,99.2,819.3,102.5,823.5,102.5L823.5,102.5z M818.2,186.2h11.1v-69.6h-11.1V186.2L818.2,186.2z"/>
-	<path class="st1" d="M882.1,187.9c19.8,0,36.1-16.9,36.1-36.4c0-19.8-16.3-36.1-36.1-36.1c-19.8,0-36.1,16.3-36.1,36.1
-		C846,171,862.3,187.9,882.1,187.9L882.1,187.9z M882.1,125.9c14.1,0,25,11.5,25,25.6c0,13.8-10.9,26-25,26c-14.1,0-25-12.2-25-26
-		C857.1,137.5,868,125.9,882.1,125.9L882.1,125.9z"/>
-	<polygon class="st0" points="77.7,106.5 56.5,106.5 56.5,127.8 77.7,127.8 77.7,106.5 	"/>
-	<polygon class="st0" points="53.8,106.5 32.6,106.5 32.6,127.8 53.8,127.8 53.8,106.5 	"/>
-	<polygon class="st0" points="53.8,130.2 32.6,130.2 32.6,151.5 53.8,151.5 53.8,130.2 	"/>
-	<polygon class="st0" points="77.7,130.2 56.5,130.2 56.5,151.5 77.7,151.5 77.7,130.2 	"/>
-	<polygon class="st0" points="101.5,130.2 80.3,130.2 80.3,151.5 101.5,151.5 101.5,130.2 	"/>
-	<polygon class="st0" points="101.5,95.1 80.3,95.1 80.3,116.4 101.5,116.4 101.5,95.1 	"/>
-	<path class="st0" d="M57.6,210.7c2.9-12.3,14-21.5,27.2-21.5c8.5,0,16.1,3.8,21.3,9.8c4.5-3.1,9.9-4.9,15.8-4.9
-		c15.4,0,27.9,12.5,27.9,27.9c0,3.2-0.5,6.2-1.5,9.1c3.4,4.6,5.5,10.4,5.5,16.6c0,15.4-12.5,27.9-27.9,27.9c-6.8,0-13-2.4-17.8-6.4
-		c-5.1,7.1-13.4,11.8-22.8,11.8c-10.8,0-20.2-6.2-24.9-15.2c-1.9,0.4-3.8,0.6-5.8,0.6c-15.4,0-28-12.5-28-27.9s12.5-27.9,28-27.9
-		C55.6,210.5,56.6,210.5,57.6,210.7L57.6,210.7z"/>
-</g>
-</svg>

app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html

@@ -101,7 +101,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/configs-datatable/configsDatatable.html

@@ -136,7 +136,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html

@@ -102,7 +102,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html

@@ -37,7 +37,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/containers-datatable/containersDatatable.html

@@ -295,7 +295,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/events-datatable/eventsDatatable.html

@@ -68,7 +68,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/images-datatable/imagesDatatable.html

@@ -204,7 +204,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html

@@ -97,7 +97,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/networks-datatable/networksDatatable.html

@@ -189,7 +189,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html

@@ -88,7 +88,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/nodes-datatable/nodesDatatable.html

@@ -153,7 +153,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/secrets-datatable/secretsDatatable.html

@@ -136,7 +136,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/services-datatable/servicesDatatable.html

@@ -219,7 +219,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/tasks-datatable/tasksDatatable.html

@@ -109,7 +109,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/datatables/volumes-datatable/volumesDatatable.html

@@ -201,7 +201,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/docker/components/imageRegistry/por-image-registry.html

@@ -10,7 +10,6 @@
         ng-model="$ctrl.model.Registry"
         id="image_registry"
         class="form-control"
-        data-cy="component-registrySelect"
       ></select>
     </div>
     <label for="image_name" ng-class="$ctrl.labelClass" class="margin-sm-top control-label text-left">Image</label>

app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html

@@ -65,7 +65,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.html

@@ -65,7 +65,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/edge/components/edge-jobs-datatable/edgeJobsDatatable.html

@@ -79,7 +79,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html

@@ -70,7 +70,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/edge/components/edge-stacks-datatable/edgeStacksDatatable.html

@@ -142,7 +142,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/edge/components/groups-datatable/groupsDatatable.html

@@ -94,7 +94,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js

@@ -8,11 +8,6 @@ export class EditEdgeGroupController {
     this.$state = $state;
     this.$async = $async;
 
-    this.state = {
-      actionInProgress: false,
-      loaded: false,
-    };
-
     this.updateGroup = this.updateGroup.bind(this);
     this.updateGroupAsync = this.updateGroupAsync.bind(this);
   }

app/index.html

@@ -41,7 +41,7 @@
                 <!-- loading box logo -->
                 <div class="row">
                   <img ng-if="logo" ng-src="{{ logo }}" class="simple-box-logo" />
-                  <img ng-if="!logo" src="${require('./assets/images/logo_alt.svg')}" class="simple-box-logo" alt="Portainer" />
+                  <img ng-if="!logo" src="${require('./assets/images/logo_alt.png')}" class="simple-box-logo" alt="Portainer" />
                 </div>
                 <!-- !loading box logo -->
                 <!-- panel -->

app/integrations/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html

@@ -76,7 +76,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatable.html

@@ -124,7 +124,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatable.html

@@ -98,7 +98,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/integrations/storidge/components/profiles-datatable/storidgeProfilesDatatable.html

@@ -68,7 +68,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/integrations/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html

@@ -83,7 +83,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html

@@ -99,13 +99,6 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Node' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-              <a ng-click="$ctrl.changeOrderBy('IP')">
-                Pod IP
-                <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'IP' && !$ctrl.state.reverseOrder"></i>
-                <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'IP' && $ctrl.state.reverseOrder"></i>
-              </a>
-              </th>
               <th>
                 <a ng-click="$ctrl.changeOrderBy('CreationDate')">
                   Creation date
@@ -136,7 +129,6 @@
                 </span>
                 <span ng-if="!item.Node">-</span>
               </td>
-              <td>{{ item.PodIP }}</td>
               <td>{{ item.CreationDate | getisodate }}</td>
               <td>
                 <a
@@ -169,7 +161,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.css

@@ -1,9 +1,9 @@
 .secondary-heading {
-  background-color: var(--bg-app-datatable-thead) !important;
+  background-color: #e7f6ff !important;
 }
 
 .secondary-body {
-  background-color: var(--bg-app-datatable-tbody);
+  background-color: #f1f9fd;
 }
 
 .datatable-wide {

app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html

@@ -231,7 +231,6 @@
                   <kubernetes-applications-datatable
                     dataset="item.KubernetesApplications"
                     table-key="{{ item.Id }}_table"
-                    settings-key="{{ $ctrl.tableKey }}"
                     order-by="Name"
                     remove-action="$ctrl.removeAction"
                     refresh-callback="$ctrl.refreshCallback"
@@ -269,7 +268,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js

@@ -8,7 +8,6 @@ angular.module('portainer.kubernetes').component('kubernetesApplicationsDatatabl
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
-    settingsKey: '@',
     orderBy: '@',
     reverseOrder: '<',
     removeAction: '<',

app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js

@@ -147,7 +147,7 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo
         this.expandItems(storedExpandedItems);
       }
 
-      const storedSettings = DatatableService.getDataTableSettings(this.settingsKey);
+      const storedSettings = DatatableService.getDataTableSettings(this.tableKey);
       if (storedSettings !== null) {
         this.settings = storedSettings;
         this.settings.open = false;

app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html

@@ -243,7 +243,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html

@@ -171,7 +171,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html

@@ -110,7 +110,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html

@@ -141,7 +141,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/nodes-datatable/nodesDatatable.html

@@ -152,7 +152,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html

@@ -130,7 +130,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html

@@ -163,7 +163,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html

@@ -179,7 +179,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/components/helm/helm-templates/helm-templates.html

@@ -39,7 +39,7 @@
             Configuration
           </div>
           <!-- namespace-input -->
-          <div class="form-group" ng-if="$ctrl.state.resourcePool">
+          <div class="form-group">
             <label for="resource-pool-selector" class="col-sm-2 control-label text-left">Namespace</label>
             <div class="col-sm-10">
               <select
@@ -52,7 +52,13 @@
               ></select>
             </div>
           </div>
-
+          <div class="form-group" ng-if="!$ctrl.state.resourcePool">
+            <div class="col-sm-12 small text-danger">
+              <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+              This namespace has exhausted its resource capacity and you will not be able to deploy the application. Contact your administrator to expand the capacity of the
+              namespace.
+            </div>
+          </div>
           <div class="form-group" ng-if="!$ctrl.state.resourcePool">
             <div class="col-sm-12 small text-muted">
               <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>

app/kubernetes/models/application/models/index.js

@@ -118,5 +118,4 @@ export const KubernetesDeploymentTypes = Object.freeze({
   GIT: 'git',
   CONTENT: 'content',
   APPLICATION_FORM: 'application form',
-  URL: 'url',
 });

app/kubernetes/node/service.js

@@ -26,9 +26,7 @@ class KubernetesNodeService {
       const [details, yaml] = await Promise.all([this.KubernetesNodes().get(params).$promise, this.KubernetesNodes().getYaml(params).$promise]);
       return KubernetesNodeConverter.apiToNodeDetails(details, yaml);
     } catch (err) {
-      // changing the structure of error message to fix [object, Object] issue
-      const errData = err.data;
-      throw new PortainerError('Unable to retrieve node details', errData);
+      throw new PortainerError('Unable to retrieve node details', err);
     }
   }
 

app/kubernetes/pod/converter.js

@@ -68,7 +68,6 @@ function computeContainers(data) {
       const res = new KubernetesPodContainer();
       res.Type = KubernetesPodContainerTypes.APP;
       res.PodName = data.metadata.name;
-      res.PodIP = data.status.podIP;
       res.Name = item.name;
       res.Image = item.image;
       res.ImagePullPolicy = item.imagePullPolicy;

app/kubernetes/views/applications/applications.html

@@ -15,7 +15,6 @@
               <kubernetes-applications-datatable
                 dataset="ctrl.state.applications"
                 table-key="kubernetes.applications"
-                settings-key="kubernetes.applications"
                 order-by="Name"
                 remove-action="ctrl.removeAction"
                 refresh-callback="ctrl.getApplications"

app/kubernetes/views/applications/create/createApplicationController.js

@@ -790,14 +790,15 @@ class KubernetesCreateApplicationController {
   }
 
   isEditLBWithPorts() {
-    return this.formValues.PublishingType === KubernetesApplicationPublishingTypes.LOAD_BALANCER && _.filter(this.formValues.PublishedPorts, { IsNew: false }).length === 0;
+    return this.formValues.PublishingType === KubernetesApplicationPublishingTypes.LOAD_BALANCER && _.filter(this.formValues.PublishedPorts, { IsNew: false }).length;
   }
 
   isProtocolOptionDisabled(index, protocol) {
     return (
       this.disableLoadBalancerEdit() ||
       (this.isEditAndNotNewPublishedPort(index) && this.formValues.PublishedPorts[index].Protocol !== protocol) ||
-      (this.isEditLBWithPorts() && this.formValues.PublishedPorts[index].Protocol !== protocol && this.isNewAndNotFirst(index))
+      (this.isEditLBWithPorts() && this.formValues.PublishedPorts[index].Protocol !== protocol) ||
+      (this.isNewAndNotFirst(index) && this.formValues.PublishedPorts[index].Protocol !== protocol)
     );
   }
 
@@ -1078,14 +1079,10 @@ class KubernetesCreateApplicationController {
           );
 
           if (this.application.ApplicationKind) {
-            this.state.appType = KubernetesDeploymentTypes[this.application.ApplicationKind.toUpperCase()];
-            if (this.application.ApplicationKind === KubernetesDeploymentTypes.URL) {
-              this.state.appType = KubernetesDeploymentTypes.CONTENT;
-            }
-
+            this.state.appType = this.KubernetesDeploymentTypes[this.application.ApplicationKind.toUpperCase()];
             if (this.application.StackId) {
               this.stack = await this.StackService.stack(this.application.StackId);
-              if (this.state.appType === KubernetesDeploymentTypes.CONTENT) {
+              if (this.application.ApplicationKind === this.KubernetesDeploymentTypes.CONTENT) {
                 this.stackFileContent = await this.StackService.getStackFile(this.application.StackId);
               }
             }

app/kubernetes/views/applications/edit/application.html

@@ -26,7 +26,7 @@
                     </tr>
                     <tr>
                       <td>Stack</td>
-                      <td data-cy="k8sAppDetail-stackName">{{ ctrl.application.StackName || '-' }}</td>
+                      <td>{{ ctrl.application.StackName || '-' }}</td>
                     </tr>
                     <tr>
                       <td>Namespace</td>
@@ -37,15 +37,15 @@
                     </tr>
                     <tr>
                       <td>Application Type</td>
-                      <td data-cy="k8sAppDetail-appType">
+                      <td>
                         {{ ctrl.application.ApplicationType | kubernetesApplicationTypeText }}
                       </td>
                     </tr>
                     <tr>
                       <td>Status</td>
                       <td ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD">
-                        <span ng-if="ctrl.application.DeploymentType === ctrl.KubernetesApplicationDeploymentTypes.REPLICATED" data-cy="k8sAppDetail-deployType">Replicated</span>
-                        <span ng-if="ctrl.application.DeploymentType === ctrl.KubernetesApplicationDeploymentTypes.GLOBAL" data-cy="k8sAppDetail-appType">Global</span>
+                        <span ng-if="ctrl.application.DeploymentType === ctrl.KubernetesApplicationDeploymentTypes.REPLICATED">Replicated</span>
+                        <span ng-if="ctrl.application.DeploymentType === ctrl.KubernetesApplicationDeploymentTypes.GLOBAL">Global</span>
                         <code data-cy="k8sAppDetail-runningPods">{{ ctrl.application.RunningPodsCount }}</code> /
                         <code data-cy="k8sAppDetail-totalPods">{{ ctrl.application.TotalPodsCount }}</code>
                       </td>
@@ -59,10 +59,8 @@
                         <div ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD" class="text-muted small"> per instance </div>
                       </td>
                       <td>
-                        <div ng-if="ctrl.application.Requests.Cpu" data-cy="k8sAppDetail-cpuReservation"
-                          >CPU {{ ctrl.application.Requests.Cpu | kubernetesApplicationCPUValue }}</div
-                        >
-                        <div ng-if="ctrl.application.Requests.Memory" data-cy="k8sAppDetail-memoryReservation">Memory {{ ctrl.application.Requests.Memory | humansize }}</div>
+                        <div ng-if="ctrl.application.Requests.Cpu">CPU {{ ctrl.application.Requests.Cpu | kubernetesApplicationCPUValue }}</div>
+                        <div ng-if="ctrl.application.Requests.Memory">Memory {{ ctrl.application.Requests.Memory | humansize }}</div>
                       </td>
                     </tr>
                     <tr>
@@ -81,7 +79,7 @@
                           <div class="form-group">
                             <div class="col-sm-12">
                               <i class="fa fa-edit" aria-hidden="true"></i> Note
-                              <button class="btn btn-xs btn-primary" ng-click="ctrl.state.expandedNote = !ctrl.state.expandedNote;" data-cy="k8sAppDetail-expandNoteButton"
+                              <button class="btn btn-xs btn-primary" ng-click="ctrl.state.expandedNote = !ctrl.state.expandedNote;"
                                 >{{ ctrl.state.expandedNote ? 'Collapse' : 'Expand' }}
                                 <i class="fas {{ ctrl.state.expandedNote ? 'fa-angle-up' : 'fa-angle-down' }}" aria-hidden="true"></i
                               ></button>
@@ -107,7 +105,6 @@
                                 type="button"
                                 ng-click="ctrl.updateApplication()"
                                 ng-disabled="ctrl.formValues.Note === ctrl.application.Note"
-                                data-cy="k8sAppDetail-saveNoteButton"
                                 >{{ ctrl.application.Note ? 'Update' : 'Save' }} note</button
                               >
                             </div>
@@ -198,14 +195,7 @@
       <rd-widget>
         <rd-widget-body>
           <div ng-if="!ctrl.isSystemNamespace()" style="margin-bottom: 15px;">
-            <button
-              ng-if="!ctrl.isExternalApplication()"
-              type="button"
-              class="btn btn-sm btn-primary"
-              ui-sref="kubernetes.applications.application.edit"
-              style="margin-left: 0;"
-              data-cy="k8sAppDetail-editAppButton"
-            >
+            <button ng-if="!ctrl.isExternalApplication()" type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.applications.application.edit" style="margin-left: 0;">
               <i class="fa fa-file-code space-right" aria-hidden="true"></i>Edit this application
             </button>
             <button
@@ -214,7 +204,6 @@
               class="btn btn-sm btn-primary"
               style="margin-left: 0;"
               ng-click="ctrl.redeployApplication()"
-              data-cy="k8sAppDetail-redeployButton"
             >
               <i class="fa fa-redo space-right" aria-hidden="true"></i>Redeploy
             </button>
@@ -225,7 +214,6 @@
               style="margin-left: 0;"
               ng-click="ctrl.rollbackApplication()"
               ng-disabled="ctrl.application.Revisions.length < 2 || ctrl.state.appType !== ctrl.KubernetesDeploymentTypes.APPLICATION_FORM"
-              data-cy="k8sAppDetail-rollbackButton"
             >
               <i class="fas fa-history space-right" aria-hidden="true"></i>Rollback to previous configuration
             </button>
@@ -339,7 +327,7 @@
                       <span ng-if="ctrl.application.ServiceType === ctrl.KubernetesServiceTypes.NODE_PORT" data-cy="k8sAppDetail-nodePort">
                         {{ port.NodePort }}
                       </span>
-                      <span ng-if="ctrl.application.ServiceType !== ctrl.KubernetesServiceTypes.NODE_PORT" data-cy="k8sAppDetail-containerPort">
+                      <span ng-if="ctrl.application.ServiceType !== ctrl.KubernetesServiceTypes.NODE_PORT">
                         {{ port.Port }}
                       </span>
                       <a
@@ -347,7 +335,6 @@
                         ng-href="http://{{ ctrl.application.LoadBalancerIPAddress }}:{{ port.Port }}"
                         target="_blank"
                         style="margin-left: 5px;"
-                        data-cy="k8sAppDetail-accessLink"
                       >
                         <i class="fa fa-external-link-alt" aria-hidden="true"></i> access
                       </a>
@@ -355,12 +342,12 @@
                     <td ng-if="!ctrl.portHasIngressRules(port)">-</td>
                   </tr>
                   <tr ng-repeat-end ng-repeat="rule in port.IngressRules">
-                    <td data-cy="k8sAppDetail-httpRoute">{{ port.TargetPort }}/{{ port.Protocol }}</td>
+                    <td>{{ port.TargetPort }}/{{ port.Protocol }}</td>
                     <td>
-                      <span ng-if="ctrl.application.ServiceType === ctrl.KubernetesServiceTypes.NODE_PORT" data-cy="k8sAppDetail-nodePort">
+                      <span ng-if="ctrl.application.ServiceType === ctrl.KubernetesServiceTypes.NODE_PORT">
                         {{ port.NodePort }}
                       </span>
-                      <span ng-if="ctrl.application.ServiceType !== ctrl.KubernetesServiceTypes.NODE_PORT" data-cy="k8sAppDetail-port">
+                      <span ng-if="ctrl.application.ServiceType !== ctrl.KubernetesServiceTypes.NODE_PORT">
                         {{ port.Port }}
                       </span>
                       <a
@@ -384,7 +371,7 @@
                         >pending
                       </span>
                       <span ng-if="ctrl.ruleCanBeDisplayed(rule)">
-                        <a ng-href="{{ ctrl.buildIngressRuleURL(rule) }}" target="_blank" data-cy="k8sAppDetail-httpRouteLink">
+                        <a ng-href="{{ ctrl.buildIngressRuleURL(rule) }}" target="_blank">
                           {{ ctrl.buildIngressRuleURL(rule) | stripprotocol }}
                         </a>
                       </span>
@@ -417,9 +404,9 @@
                     </td>
                   </tr>
                   <tr>
-                    <td data-cy="k8sAppDetail-minReplicas">{{ ctrl.application.AutoScaler.MinReplicas }}</td>
-                    <td data-cy="k8sAppDetail-maxReplicas">{{ ctrl.application.AutoScaler.MaxReplicas }}</td>
-                    <td data-cy="k8sAppDetail-targetCPU">{{ ctrl.application.AutoScaler.TargetCPUUtilization }}%</td>
+                    <td>{{ ctrl.application.AutoScaler.MinReplicas }}</td>
+                    <td>{{ ctrl.application.AutoScaler.MaxReplicas }}</td>
+                    <td>{{ ctrl.application.AutoScaler.TargetCPUUtilization }}%</td>
                   </tr>
                 </tbody>
               </table>
@@ -444,7 +431,7 @@
             </tr>
             <tbody ng-repeat="container in ctrl.application.Containers" style="border-top: 0;">
               <tr ng-repeat="envvar in container.Env | orderBy: 'name'">
-                <td data-cy="k8sAppDetail-containerName">
+                <td>
                   {{ container.Name }}
                   <span ng-if="container.Type === ctrl.KubernetesPodContainerTypes.INIT"
                     ><i class="fa fa-asterisk" aria-hidden="true"></i> {{ envvar.valueFrom.fieldRef.fieldPath }} (<a
@@ -454,16 +441,12 @@
                     >)</span
                   >
                 </td>
-                <td data-cy="k8sAppDetail-envVarName">{{ envvar.name }}</td>
+                <td>{{ envvar.name }}</td>
                 <td>
-                  <span ng-if="envvar.value" data-cy="k8sAppDetail-envVarValue">{{ envvar.value }}</span>
-                  <span ng-if="envvar.valueFrom.configMapKeyRef" data-cy="k8sAppDetail-envVarValue"
-                    ><i class="fa fa-key" aria-hidden="true"></i> {{ envvar.valueFrom.configMapKeyRef.key }}</span
-                  >
-                  <span ng-if="envvar.valueFrom.secretKeyRef" data-cy="k8sAppDetail-envVarValue"
-                    ><i class="fa fa-key" aria-hidden="true"></i> {{ envvar.valueFrom.secretKeyRef.key }}</span
-                  >
-                  <span ng-if="envvar.valueFrom.fieldRef" data-cy="k8sAppDetail-envVarValue"
+                  <span ng-if="envvar.value">{{ envvar.value }}</span>
+                  <span ng-if="envvar.valueFrom.configMapKeyRef"><i class="fa fa-key" aria-hidden="true"></i> {{ envvar.valueFrom.configMapKeyRef.key }}</span>
+                  <span ng-if="envvar.valueFrom.secretKeyRef"><i class="fa fa-key" aria-hidden="true"></i> {{ envvar.valueFrom.secretKeyRef.key }}</span>
+                  <span ng-if="envvar.valueFrom.fieldRef"
                     ><i class="fa fa-asterisk" aria-hidden="true"></i> {{ envvar.valueFrom.fieldRef.fieldPath }} (<a
                       href="https://kubernetes.io/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/#capabilities-of-the-downward-api"
                       target="_blank"
@@ -474,12 +457,12 @@
                 </td>
                 <td>
                   <span ng-if="envvar.value || envvar.valueFrom.fieldRef || (!envvar.valueFrom.secretKeyRef && !envvar.valueFrom.configMapKeyRef)">-</span>
-                  <span ng-if="envvar.valueFrom.configMapKeyRef" data-cy="k8sAppDetail-configName"
+                  <span ng-if="envvar.valueFrom.configMapKeyRef"
                     ><a ui-sref="kubernetes.configurations.configuration({ name: envvar.valueFrom.configMapKeyRef.name, namespace: ctrl.application.ResourcePool })"
                       ><i class="fa fa-file-code" aria-hidden="true"></i> {{ envvar.valueFrom.configMapKeyRef.name }}</a
                     ></span
                   >
-                  <span ng-if="envvar.valueFrom.secretKeyRef" data-cy="k8sAppDetail-configName"
+                  <span ng-if="envvar.valueFrom.secretKeyRef"
                     ><a ui-sref="kubernetes.configurations.configuration({ name: envvar.valueFrom.secretKeyRef.name, namespace: ctrl.application.ResourcePool })"
                       ><i class="fa fa-file-code" aria-hidden="true"></i> {{ envvar.valueFrom.secretKeyRef.name }}</a
                     ></span
@@ -546,11 +529,11 @@
               </tr>
               <tbody ng-repeat="container in ctrl.application.Containers" style="border-top: 0;">
                 <tr ng-repeat="volume in container.PersistedFolders track by $index">
-                  <td data-cy="k8sAppDetail-volMountPath">
+                  <td>
                     {{ volume.MountPath }}
                   </td>
                   <td ng-if="volume.PersistentVolumeClaimName">
-                    <a ui-sref="kubernetes.volumes.volume({ name: volume.PersistentVolumeClaimName, namespace: ctrl.application.ResourcePool })" data-cy="k8sAppDetail-volClaimName"
+                    <a ui-sref="kubernetes.volumes.volume({ name: volume.PersistentVolumeClaimName, namespace: ctrl.application.ResourcePool })"
                       ><i class="fa fa-database" aria-hidden="true"></i> {{ volume.PersistentVolumeClaimName }}</a
                     >
                   </td>

app/kubernetes/views/applications/edit/components/placements-datatable/template.html

@@ -179,7 +179,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/views/configurations/create/createConfiguration.html

@@ -49,7 +49,7 @@
             </div>
 
             <!-- resource-pool -->
-            <div class="form-group" ng-if="ctrl.formValues.ResourcePool">
+            <div class="form-group">
               <label for="resource-pool-selector" class="col-sm-1 control-label text-left">Namespace</label>
               <div class="col-sm-11">
                 <select
@@ -57,7 +57,6 @@
                   id="resource-pool-selector"
                   ng-model="ctrl.formValues.ResourcePool"
                   ng-options="resourcePool.Namespace.Name for resourcePool in ctrl.resourcePools"
-                  ng-change="ctrl.onResourcePoolSelectionChange()"
                   data-cy="k8sConfigCreate-namespaceDropdown"
                 ></select>
               </div>
@@ -69,76 +68,69 @@
                 namespace.
               </div>
             </div>
-            <div class="form-group" ng-if="!ctrl.formValues.ResourcePool">
-              <div class="col-sm-12 small text-muted">
-                <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                You do not have access to any namespace. Contact your administrator to get access to a namespace.
-              </div>
-            </div>
             <!-- !resource-pool -->
-            <div ng-if="ctrl.formValues.ResourcePool">
-              <div class="col-sm-12 form-section-title">
-                Configuration type
-              </div>
 
-              <div class="form-group">
-                <div class="col-sm-12 small text-muted">
-                  Select the type of data that you want to save in the configuration.
-                </div>
-              </div>
-
-              <!-- type options -->
-              <div class="form-group" style="margin-bottom: 0;">
-                <div class="boxselector_wrapper">
-                  <div>
-                    <input type="radio" id="type_basic" ng-value="ctrl.KubernetesConfigurationTypes.CONFIGMAP" ng-model="ctrl.formValues.Type" />
-                    <label for="type_basic" data-cy="k8sConfigCreate-nonSensitiveButton">
-                      <div class="boxselector_header">
-                        <i class="fa fa-file-code" aria-hidden="true" style="margin-right: 2px;"></i>
-                        Non-sensitive
-                      </div>
-                      <p>This configuration holds non-sensitive information</p>
-                    </label>
-                  </div>
-                  <div>
-                    <input type="radio" id="type_secret" ng-value="ctrl.KubernetesConfigurationTypes.SECRET" ng-model="ctrl.formValues.Type" />
-                    <label for="type_secret" data-cy="k8sConfigCreate-sensitiveButton">
-                      <div class="boxselector_header">
-                        <i class="fa fa-user-secret" aria-hidden="true" style="margin-right: 2px;"></i>
-                        Sensitive
-                      </div>
-                      <p>This configuration holds sensitive information</p>
-                    </label>
-                  </div>
-                </div>
-              </div>
-              <!-- !type options -->
-
-              <div class="col-sm-12 form-section-title" ng-if="ctrl.formValues.Type == ctrl.KubernetesConfigurationTypes.SECRET">
-                Information
-              </div>
-              <div class="form-group" ng-if="ctrl.formValues.Type == ctrl.KubernetesConfigurationTypes.SECRET">
-                <div class="col-sm-12 small text-muted">
-                  Creating a sensitive configuration will create a Kubernetes Secret of type <code>Opaque</code>. You can find more information about this in the
-                  <a href="https://kubernetes.io/docs/concepts/configuration/secret/#secret-types" target="_blank">official documentation</a>.
-                </div>
-              </div>
-
-              <kubernetes-configuration-data
-                ng-if="ctrl.formValues"
-                form-values="ctrl.formValues"
-                is-valid="ctrl.state.isDataValid"
-                is-creation="true"
-                is-editor-dirty="ctrl.state.isEditorDirty"
-              ></kubernetes-configuration-data>
-
-              <!-- summary -->
-              <kubernetes-summary-view
-                ng-if="!(!kubernetesConfigurationCreationForm.$valid || !ctrl.isFormValid() || ctrl.state.actionInProgress)"
-                form-values="ctrl.formValues"
-              ></kubernetes-summary-view>
+            <div class="col-sm-12 form-section-title">
+              Configuration type
             </div>
 
+            <div class="form-group">
+              <div class="col-sm-12 small text-muted">
+                Select the type of data that you want to save in the configuration.
+              </div>
+            </div>
+
+            <!-- type options -->
+            <div class="form-group" style="margin-bottom: 0;">
+              <div class="boxselector_wrapper">
+                <div>
+                  <input type="radio" id="type_basic" ng-value="ctrl.KubernetesConfigurationTypes.CONFIGMAP" ng-model="ctrl.formValues.Type" />
+                  <label for="type_basic" data-cy="k8sConfigCreate-nonSensitiveButton">
+                    <div class="boxselector_header">
+                      <i class="fa fa-file-code" aria-hidden="true" style="margin-right: 2px;"></i>
+                      Non-sensitive
+                    </div>
+                    <p>This configuration holds non-sensitive information</p>
+                  </label>
+                </div>
+                <div>
+                  <input type="radio" id="type_secret" ng-value="ctrl.KubernetesConfigurationTypes.SECRET" ng-model="ctrl.formValues.Type" />
+                  <label for="type_secret" data-cy="k8sConfigCreate-sensitiveButton">
+                    <div class="boxselector_header">
+                      <i class="fa fa-user-secret" aria-hidden="true" style="margin-right: 2px;"></i>
+                      Sensitive
+                    </div>
+                    <p>This configuration holds sensitive information</p>
+                  </label>
+                </div>
+              </div>
+            </div>
+            <!-- !type options -->
+
+            <div class="col-sm-12 form-section-title" ng-if="ctrl.formValues.Type == ctrl.KubernetesConfigurationTypes.SECRET">
+              Information
+            </div>
+            <div class="form-group" ng-if="ctrl.formValues.Type == ctrl.KubernetesConfigurationTypes.SECRET">
+              <div class="col-sm-12 small text-muted">
+                Creating a sensitive configuration will create a Kubernetes Secret of type <code>Opaque</code>. You can find more information about this in the
+                <a href="https://kubernetes.io/docs/concepts/configuration/secret/#secret-types" target="_blank">official documentation</a>.
+              </div>
+            </div>
+
+            <kubernetes-configuration-data
+              ng-if="ctrl.formValues"
+              form-values="ctrl.formValues"
+              is-valid="ctrl.state.isDataValid"
+              is-creation="true"
+              is-editor-dirty="ctrl.state.isEditorDirty"
+            ></kubernetes-configuration-data>
+
+            <!-- summary -->
+            <kubernetes-summary-view
+              ng-if="!(!kubernetesConfigurationCreationForm.$valid || !ctrl.isFormValid() || ctrl.state.actionInProgress)"
+              form-values="ctrl.formValues"
+            ></kubernetes-summary-view>
+
             <!-- actions -->
             <div class="col-sm-12 form-section-title" style="margin-top: 10px;">
               Actions
@@ -148,7 +140,7 @@
                 <button
                   type="button"
                   class="btn btn-primary btn-sm"
-                  ng-disabled="!kubernetesConfigurationCreationForm.$valid || !ctrl.isFormValid() || ctrl.state.actionInProgress || !ctrl.formValues.ResourcePool"
+                  ng-disabled="!kubernetesConfigurationCreationForm.$valid || !ctrl.isFormValid() || ctrl.state.actionInProgress"
                   ng-click="ctrl.createConfiguration()"
                   button-spinner="ctrl.state.actionInProgress"
                   data-cy="k8sConfigCreate-CreateConfigButton"

app/kubernetes/views/configure/configure.html

@@ -27,9 +27,7 @@
                 <label class="control-label text-left">
                   Allow users to use external load balancer
                 </label>
-                <label class="switch" style="margin-left: 20px;">
-                  <input type="checkbox" ng-model="ctrl.formValues.UseLoadBalancer" /><i data-cy="kubeSetup-loadBalancerToggle"></i>
-                </label>
+                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ctrl.formValues.UseLoadBalancer" /><i></i> </label>
               </div>
             </div>
 
@@ -45,7 +43,7 @@
             <div class="form-group">
               <div class="col-sm-12">
                 <label class="control-label text-left">Ingress controller</label>
-                <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addIngressClass()" data-cy="kubeSetup-congifIngressButton">
+                <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addIngressClass()">
                   <i class="fa fa-plus-circle" aria-hidden="true"></i> configure ingress controller
                 </span>
               </div>
@@ -63,7 +61,6 @@
                       ng-pattern="/^[a-z]([-a-z0-9]*[a-z0-9])?$/"
                       ng-change="ctrl.onChangeIngressClassName($index)"
                       required
-                      data-cy="kubeSetup-ingressClassName"
                     />
                   </div>
                   <div class="col-sm-3 input-group input-group-sm" ng-class="{ striked: ingressClass.NeedsDeletion }">
@@ -74,19 +71,12 @@
                       ng-model="ingressClass.Type"
                       ng-options="value as value for (key, value) in ctrl.IngressClassTypes"
                       required
-                      data-cy="kubeSetup-ingressType"
                     >
                       <option selected disabled hidden value="">Select a type</option>
                     </select>
                   </div>
                   <div class="col-sm-1 input-group input-group-sm">
-                    <button
-                      ng-if="!ingressClass.NeedsDeletion"
-                      class="btn btn-sm btn-danger"
-                      type="button"
-                      ng-click="ctrl.removeIngressClass($index)"
-                      data-cy="kubeSetup-deleteIngress"
-                    >
+                    <button ng-if="!ingressClass.NeedsDeletion" class="btn btn-sm btn-danger" type="button" ng-click="ctrl.removeIngressClass($index)">
                       <i class="fa fa-trash-alt" aria-hidden="true"></i>
                     </button>
                     <button ng-if="ingressClass.NeedsDeletion" class="btn btn-sm btn-primary" type="button" ng-click="ctrl.restoreIngressClass($index)">
@@ -155,9 +145,7 @@
                 <label class="control-label text-left">
                   Restrict access to the default namespace
                 </label>
-                <label class="switch" style="margin-left: 20px;">
-                  <input type="checkbox" ng-model="ctrl.formValues.RestrictDefaultNamespace" /><i data-cy="kubeSetup-restrictDefaultNsToggle"></i>
-                </label>
+                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ctrl.formValues.RestrictDefaultNamespace" /><i></i> </label>
               </div>
             </div>
 
@@ -181,7 +169,7 @@
                 <label class="control-label text-left">
                   Allow resource over-commit
                 </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" checked disabled /><i data-cy="kubeSetup-resourceOverCommitToggle"></i> </label>
+                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" checked disabled /><i></i> </label>
                 <span class="text-muted small" style="margin-left: 15px;">
                   <i class="fa fa-user" aria-hidden="true"></i>
                   This feature is available in <a href="https://www.portainer.io/business-upsell?from=k8s-setup-overcommit" target="_blank"> Portainer Business Edition</a>.
@@ -205,7 +193,7 @@
                   Enable features using the metrics API
                 </label>
                 <label class="switch" style="margin-left: 20px;">
-                  <input type="checkbox" ng-model="ctrl.formValues.UseServerMetrics" ng-change="ctrl.enableMetricsServer()" /><i data-cy="kubeSetup-metricsToggle"></i>
+                  <input type="checkbox" ng-model="ctrl.formValues.UseServerMetrics" ng-change="ctrl.enableMetricsServer()" /><i></i>
                 </label>
               </div>
               <div ng-if="ctrl.state.metrics.pending && ctrl.state.metrics.userClick" class="col-sm-12 small text-muted" style="margin-top: 5px;">
@@ -264,9 +252,7 @@
                     <tr ng-repeat="class in ctrl.StorageClasses">
                       <td>
                         <div style="margin: 5px;">
-                          <label class="switch" style="margin-right: 10px;">
-                            <input type="checkbox" ng-model="class.selected" /><i data-cy="kubeSetup-storageToggle{{ class.Name }}"></i>
-                          </label>
+                          <label class="switch" style="margin-right: 10px;"> <input type="checkbox" ng-model="class.selected" /><i></i> </label>
                           <span>{{ class.Name }}</span>
                         </div>
                       </td>
@@ -281,15 +267,12 @@
                           directive-id="{{ class.Name }}"
                           helper-elements=""
                           translation="{nothingSelected: 'Not configured'}"
-                          data-cy="kubeSetup-storageAccessSelect{{ class.Name }}"
                         >
                         </span>
                       </td>
                       <td>
                         <div style="margin: 5px;">
-                          <label class="switch"
-                            ><input type="checkbox" ng-model="class.AllowVolumeExpansion" /><i data-cy="kubeSetup-storageExpansionToggle{{ class.Name }}"></i>
-                          </label>
+                          <label class="switch"><input type="checkbox" ng-model="class.AllowVolumeExpansion" /><i></i> </label>
                         </div>
                       </td>
                     </tr>
@@ -321,7 +304,6 @@
                   analytics-category="kubernetes"
                   analytics-event="kubernetes-configure"
                   analytics-properties="{ metadata: { restrictAccessToDefaultNamespace: ctrl.formValues.RestrictDefaultNamespace } }"
-                  data-cy="kubeSetup-saveConfigurationButton"
                 >
                   <span ng-hide="ctrl.state.actionInProgress">Save configuration</span>
                   <span ng-show="ctrl.state.actionInProgress">Saving configuration...</span>

app/kubernetes/views/deploy/deploy.html

@@ -16,18 +16,12 @@
               <uib-tab-heading> <i class="fa fa-code space-right" aria-hidden="true"></i> Deploy </uib-tab-heading>
 
               <form class="form-horizontal" style="margin-top: 20px;">
-                <div class="form-group" ng-if="ctrl.formValues.Namespace">
+                <div class="form-group">
                   <label for="target_node" class="col-lg-1 col-sm-2 control-label text-left">Namespace</label>
                   <div class="col-lg-11 col-sm-10">
                     <select class="form-control" ng-model="ctrl.formValues.Namespace" ng-options="namespace.Name as namespace.Name for namespace in ctrl.namespaces"></select>
                   </div>
                 </div>
-                <div class="form-group" ng-if="!ctrl.formValues.Namespace">
-                  <div class="col-sm-12 small text-muted">
-                    <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                    You do not have access to any namespace. Contact your administrator to get access to a namespace.
-                  </div>
-                </div>
 
                 <div class="col-sm-12 form-section-title">
                   Build method

app/kubernetes/views/deploy/deployController.js

@@ -107,9 +107,7 @@ class KubernetesDeployController {
       this.state.BuildMethod === KubernetesDeployBuildMethods.WEB_EDITOR && _.isEmpty(this.formValues.EditorContent) && _.isEmpty(this.formValues.Namespace);
     const isURLFormInvalid = this.state.BuildMethod == KubernetesDeployBuildMethods.WEB_EDITOR.URL && _.isEmpty(this.formValues.ManifestURL);
 
-    const isNamespaceInvalid = _.isEmpty(this.formValues.Namespace);
-
-    return isGitFormInvalid || isWebEditorInvalid || isURLFormInvalid || this.state.actionInProgress || isNamespaceInvalid;
+    return isGitFormInvalid || isWebEditorInvalid || isURLFormInvalid || this.state.actionInProgress;
   }
 
   onChangeFormValues(values) {
@@ -232,9 +230,7 @@ class KubernetesDeployController {
       });
 
       this.namespaces = namespaces;
-      if (this.namespaces.length > 0) {
-        this.formValues.Namespace = this.namespaces[0].Name;
-      }
+      this.formValues.Namespace = this.namespaces[0].Name;
     } catch (err) {
       this.Notifications.error('Failure', err, 'Unable to load namespaces data');
     }

app/kubernetes/views/resource-pools/create/createResourcePool.html

@@ -213,8 +213,8 @@
               <div class="form-group" ng-if="$ctrl.formValues.IngressClasses.length === 0">
                 <div class="col-sm-12 small text-muted">
                   The ingress feature must be enabled in the
-                  <a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: $ctrl.endpoint.Id})">environment configuration view</a> to be able to register ingresses inside
-                  this namespace.
+                  <a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: $ctrl.endpoint.Id})">environment configuration view</a> to be able to register ingresses inside this
+                  namespace.
                 </div>
               </div>
 
@@ -238,9 +238,7 @@
                   <label class="control-label text-left">
                     Allow users to use this ingress
                   </label>
-                  <label class="switch" style="margin-left: 20px;">
-                    <input type="checkbox" ng-model="ic.Selected" /><i data-cy="namespaceCreate-ingressToggle{{ ic.IngressClass.Name }}"></i>
-                  </label>
+                  <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ic.Selected" /><i></i> </label>
                 </div>
               </div>
 
@@ -255,12 +253,7 @@
                       >
                       </portainer-tooltip>
                     </label>
-                    <span
-                      class="label label-default interactive"
-                      style="margin-left: 10px;"
-                      ng-click="$ctrl.addHostname(ic)"
-                      data-cy="namespaceCreate-addHostButton{{ ic.IngressClass.Name }}"
-                    >
+                    <span class="label label-default interactive" style="margin-left: 10px;" ng-click="$ctrl.addHostname(ic)">
                       <i class="fa fa-plus-circle" aria-hidden="true"></i> add hostname
                     </span>
                   </div>
@@ -277,7 +270,6 @@
                             ng-change="$ctrl.onChangeIngressHostname()"
                             placeholder="foo"
                             required
-                            data-cy="namespaceCreate-hostnameInput{{ ic.IngressClass.Name }}_{{ $index }}"
                           />
                         </div>
                         <div class="col-sm-1 input-group input-group-sm" ng-if="$index > 0">
@@ -314,19 +306,17 @@
                       >
                       </portainer-tooltip>
                     </label>
-                    <label class="switch" style="margin-left: 20px;">
-                      <input type="checkbox" ng-model="ic.RewriteTarget" /><i data-cy="namespaceCreate-redirectRoutesToggle{{ ic.IngressClass.Name }}"></i>
-                    </label>
+                    <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ic.RewriteTarget" /><i></i> </label>
                   </div>
                 </div>
               </div>
               <div ng-repeat-end class="form-group" ng-if="ic.Selected" style="margin-bottom: 20px;">
                 <div class="col-sm-12">
                   <p>
-                    <a class="small interactive" ng-if="!ic.AdvancedConfig" ng-click="ic.AdvancedConfig = true" data-cy="namespaceCreate-advancedConfig{{ ic.IngressClass.Name }}">
+                    <a class="small interactive" ng-if="!ic.AdvancedConfig" ng-click="ic.AdvancedConfig = true">
                       <i class="fa fa-plus space-right" aria-hidden="true"></i> Advanced configuration
                     </a>
-                    <a class="small interactive" ng-if="ic.AdvancedConfig" ng-click="ic.AdvancedConfig = false" data-cy="namespaceCreate-hideConfig{{ ic.IngressClass.Name }}">
+                    <a class="small interactive" ng-if="ic.AdvancedConfig" ng-click="ic.AdvancedConfig = false">
                       <i class="fa fa-minus space-right" aria-hidden="true"></i> Hide configuration
                     </a>
                   </p>
@@ -341,12 +331,7 @@
 
                 <div class="col-sm-12" ng-if="ic.AdvancedConfig">
                   <label class="control-label text-left">Annotations</label>
-                  <span
-                    class="label label-default interactive"
-                    style="margin-left: 10px;"
-                    ng-click="$ctrl.addAnnotation(ic)"
-                    data-cy="namespaceCreate-addAnnotation{{ ic.IngressClass.Name }}"
-                  >
+                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="$ctrl.addAnnotation(ic)">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add annotation
                   </span>
                 </div>
@@ -355,33 +340,14 @@
                   <div ng-repeat="annotation in ic.Annotations track by $index" style="margin-top: 2px;">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">Key</span>
-                      <input
-                        type="text"
-                        class="form-control"
-                        ng-model="annotation.Key"
-                        placeholder="nginx.ingress.kubernetes.io/rewrite-target"
-                        required
-                        data-cy="namespaceCreate-annotationKey{{ ic.IngressClass.Name }}"
-                      />
+                      <input type="text" class="form-control" ng-model="annotation.Key" placeholder="nginx.ingress.kubernetes.io/rewrite-target" required />
                     </div>
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">Value</span>
-                      <input
-                        type="text"
-                        class="form-control"
-                        ng-model="annotation.Value"
-                        placeholder="/$1"
-                        required
-                        data-cy="namespaceCreate-annotationValue{{ ic.IngressClass.Name }}"
-                      />
+                      <input type="text" class="form-control" ng-model="annotation.Value" placeholder="/$1" required />
                     </div>
                     <div class="col-sm-1 input-group input-group-sm">
-                      <button
-                        class="btn btn-sm btn-danger"
-                        type="button"
-                        ng-click="$ctrl.removeAnnotation(ic, $index)"
-                        data-cy="namespaceCreate-deleteAnnotationButton{{ ic.IngressClass.Name }}"
-                      >
+                      <button class="btn btn-sm btn-danger" type="button" ng-click="$ctrl.removeAnnotation(ic, $index)">
                         <i class="fa fa-trash-alt" aria-hidden="true"></i>
                       </button>
                     </div>
@@ -426,7 +392,6 @@
                   helper-elements="filter"
                   search-property="Name"
                   translation="{nothingSelected: 'Select one or more registry', search: 'Search...'}"
-                  data-cy="namespaceCreate-registrySelect"
                 >
                 </span>
               </div>

app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html

@@ -117,7 +117,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/views/summary/summaryController.js

@@ -20,7 +20,7 @@ class KubernetesSummaryController {
     $scope.$watch(
       '$ctrl.formValues',
       (formValues) => {
-        this.state.resources = this.generateResourceSummaryList(angular.copy(formValues));
+        this.state.resources = this.generateResourceSummaryList(formValues);
       },
       true
     );

app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html

@@ -127,7 +127,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/kubernetes/views/volumes/edit/volume.html

@@ -13,14 +13,14 @@
         <rd-widget-body classes="no-padding">
           <uib-tabset active="ctrl.state.activeTab" justified="true" type="pills">
             <uib-tab index="0" classes="btn-sm" select="ctrl.selectTab(0)">
-              <uib-tab-heading data-cy="k8sVolDetail-volTab"> <i class="fa fa-database space-right" aria-hidden="true"></i> Volume </uib-tab-heading>
+              <uib-tab-heading> <i class="fa fa-database space-right" aria-hidden="true"></i> Volume </uib-tab-heading>
 
               <div style="padding: 20px;">
                 <table class="table">
                   <tbody>
                     <tr>
                       <td>Name</td>
-                      <td data-cy="k8sVolDetail-volName">
+                      <td>
                         {{ ctrl.volume.PersistentVolumeClaim.Name }}
                         <span class="label label-primary image-tag label-margins" ng-if="!ctrl.isSystemNamespace() && ctrl.isExternalVolume()">external</span>
                         <span class="label label-warning image-tag label-margins" ng-if="!ctrl.isSystemNamespace() && !ctrl.isUsed()">unused</span>
@@ -29,19 +29,17 @@
                     <tr>
                       <td>Namespace</td>
                       <td>
-                        <a ui-sref="kubernetes.resourcePools.resourcePool({ id: ctrl.volume.ResourcePool.Namespace.Name })" data-cy="k8sVolDetail-volNamespace">{{
-                          ctrl.volume.ResourcePool.Namespace.Name
-                        }}</a>
+                        <a ui-sref="kubernetes.resourcePools.resourcePool({ id: ctrl.volume.ResourcePool.Namespace.Name })">{{ ctrl.volume.ResourcePool.Namespace.Name }}</a>
                         <span style="margin-left: 5px;" class="label label-info image-tag" ng-if="ctrl.isSystemNamespace()">system</span>
                       </td>
                     </tr>
                     <tr>
                       <td>Storage</td>
-                      <td data-cy="k8sVolDetail-volStorageClassname">{{ ctrl.volume.PersistentVolumeClaim.StorageClass.Name }}</td>
+                      <td>{{ ctrl.volume.PersistentVolumeClaim.StorageClass.Name }}</td>
                     </tr>
                     <tr>
                       <td>Shared Access Policy</td>
-                      <td data-cy="k8sVolDetail-volAccessPolicy"
+                      <td
                         >{{ ctrl.state.volumeSharedAccessPolicy }}
                         <portainer-tooltip
                           position="bottom"
@@ -52,13 +50,11 @@
                     </tr>
                     <tr>
                       <td>Provisioner</td>
-                      <td data-cy="k8sVolDetail-volProvisioner">{{
-                        ctrl.volume.PersistentVolumeClaim.StorageClass.Provisioner ? ctrl.volume.PersistentVolumeClaim.StorageClass.Provisioner : '-'
-                      }}</td>
+                      <td>{{ ctrl.volume.PersistentVolumeClaim.StorageClass.Provisioner ? ctrl.volume.PersistentVolumeClaim.StorageClass.Provisioner : '-' }}</td>
                     </tr>
                     <tr>
                       <td>Creation date</td>
-                      <td data-cy="k8sVolDetail-volCreatedAt">{{ ctrl.volume.PersistentVolumeClaim.CreationDate | getisodate }}</td>
+                      <td>{{ ctrl.volume.PersistentVolumeClaim.CreationDate | getisodate }}</td>
                     </tr>
                     <tr>
                       <td>Size</td>
@@ -69,7 +65,6 @@
                           class="btn btn-sm btn-primary"
                           ng-click="ctrl.state.increaseSize = true"
                           ng-if="ctrl.volume.PersistentVolumeClaim.StorageClass.AllowVolumeExpansion"
-                          data-cy="k8sVolDetail-increaseSizeButton"
                           >Increase size</button
                         >
                       </td>
@@ -87,7 +82,6 @@
                                 min="0"
                                 ng-change="ctrl.onChangeSize()"
                                 required
-                                data-cy="k8sVolDetail-increaseSizeInput"
                               />
                               <span class="input-group-addon" style="padding: 0;">
                                 <select
@@ -95,20 +89,13 @@
                                   ng-change="ctrl.onChangeSize()"
                                   ng-options="unit for unit in ctrl.state.availableSizeUnits"
                                   style="width: 100%; height: 100%;"
-                                  data-cy="k8sVolDetail-increaseSizeUnits"
                                 ></select>
                               </span>
                             </div>
-                            <button
-                              type="button"
-                              class="btn btn-sm btn-primary"
-                              ng-disabled="!ctrl.sizeIsValid()"
-                              ng-click="ctrl.updateVolume()"
-                              data-cy="k8sVolDetail-updateSizeConfirm"
-                            >
+                            <button type="button" class="btn btn-sm btn-primary" ng-disabled="!ctrl.sizeIsValid()" ng-click="ctrl.updateVolume()">
                               Update size
                             </button>
-                            <button type="button" class="btn btn-sm btn-default" ng-click="ctrl.state.increaseSize = false" data-cy="k8sVolDetail-cancelUpdateSize">
+                            <button type="button" class="btn btn-sm btn-default" ng-click="ctrl.state.increaseSize = false">
                               Cancel
                             </button>
                           </div>
@@ -132,7 +119,7 @@
             </uib-tab>
 
             <uib-tab index="1" classes="btn-sm" select="ctrl.selectTab(1)">
-              <uib-tab-heading data-cy="k8sVolDetail-volEventsTab">
+              <uib-tab-heading>
                 <i class="fa fa-history space-right" aria-hidden="true"></i> Events
                 <div ng-if="ctrl.hasEventWarnings()">
                   <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
@@ -153,7 +140,7 @@
             </uib-tab>
 
             <uib-tab index="2" ng-if="ctrl.volume.PersistentVolumeClaim.Yaml" select="ctrl.showEditor()" classes="btn-sm">
-              <uib-tab-heading data-cy="k8sVolDetail-volYamlTab"> <i class="fa fa-code space-right" aria-hidden="true"></i> YAML </uib-tab-heading>
+              <uib-tab-heading> <i class="fa fa-code space-right" aria-hidden="true"></i> YAML </uib-tab-heading>
               <div style="padding-right: 25px;" ng-if="ctrl.state.showEditorTab">
                 <kubernetes-yaml-inspector key="volume-yaml" data="ctrl.volume.PersistentVolumeClaim.Yaml"></kubernetes-yaml-inspector>
               </div>

app/portainer/components/access-datatable/accessDatatable.html

@@ -81,7 +81,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/components/custom-templates-list/customTemplatesListController.js

@@ -1,6 +1,6 @@
 const CUSTOM_TEMPLATES_TYPES = {
-  SWARM: 1,
-  STANDALONE: 2,
+  STANDALONE: 1,
+  SWARM: 2,
   KUBERNETES: 3,
 };
 

app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html

@@ -115,7 +115,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/components/datatables/groups-datatable/groupsDatatable.html

@@ -82,7 +82,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/components/datatables/registries-datatable/registriesDatatable.html

@@ -54,21 +54,6 @@
             </tr>
           </thead>
           <tbody>
-            <tr>
-              <td>
-                <span class="md-checkbox" ng-if="$ctrl.isAdmin && !$ctrl.endpointType">
-                  <input id="select_{{ $index }}" type="checkbox" disabled />
-                  <label for="select_{{ $index }}"></label>
-                </span>
-                <span>DockerHub (anonymous)</span>
-              </td>
-              <td>
-                docker.io
-              </td>
-              <td>
-                -
-              </td>
-            </tr>
             <tr
               dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
               ng-class="{ active: item.Checked }"
@@ -116,7 +101,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/components/datatables/stacks-datatable/stacksDatatable.html

@@ -231,7 +231,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/components/datatables/tags-datatable/tagsDatatable.html

@@ -67,7 +67,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/components/datatables/teams-datatable/teamsDatatable.html

@@ -67,7 +67,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/components/datatables/users-datatable/usersDatatable.html

@@ -100,7 +100,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/components/endpoint-list/endpoint-item/endpoint-item-controller.js

@@ -35,9 +35,10 @@ class EndpointItemController {
       return false;
     }
     const checkInInterval = this.model.EdgeCheckinInterval;
+    const now = Math.floor(Date.now() / 1000);
 
     // give checkIn some wiggle room
-    return this.endpointInitTime - this.model.LastCheckInDate <= checkInInterval * 2;
+    return now - this.model.LastCheckInDate <= checkInInterval * 2 + 20;
   }
 
   $onInit() {

app/portainer/components/endpoint-list/endpoint-item/endpointItem.js

@@ -10,7 +10,6 @@ angular.module('portainer.app').component('endpointItem', {
     onEdit: '<',
     isAdmin: '<',
     tags: '<',
-    endpointInitTime: '<',
   },
   controller: EndpointItemController,
 });

app/portainer/components/endpoint-list/endpoint-list.js

@@ -14,6 +14,5 @@ angular.module('portainer.app').component('endpointList', {
     isAdmin: '<',
     totalCount: '<',
     retrievePage: '<',
-    endpointInitTime: '<',
   },
 });

app/portainer/components/endpoint-list/endpointList.html

@@ -38,7 +38,6 @@
           on-edit="($ctrl.editAction)"
           is-admin="$ctrl.isAdmin"
           tags="$ctrl.tags"
-          endpoint-init-time="$ctrl.endpointInitTime"
         ></endpoint-item>
         <endpoint-item
           ng-if="!$ctrl.hasBackendPagination()"
@@ -48,7 +47,6 @@
           on-edit="($ctrl.editAction)"
           is-admin="$ctrl.isAdmin"
           tags="$ctrl.tags"
-          endpoint-init-time="$ctrl.endpointInitTime"
         ></endpoint-item>
         <div ng-if="$ctrl.state.loading" class="text-center text-muted" data-cy="home-loadingEndpoints">
           Loading...

app/portainer/components/forms/registry-form-gitlab/gitlab-projects-datatable/gitlabProjectsDatatable.html

@@ -76,7 +76,7 @@
               <span style="margin-right: 5px;">
                 Items per page
               </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()">
                 <option value="0">All</option>
                 <option value="10">10</option>
                 <option value="25">25</option>

app/portainer/services/notifications.js

@@ -16,7 +16,7 @@ angular.module('portainer.app').factory('Notifications', [
 
     service.error = function (title, e, fallbackText) {
       var msg = fallbackText;
-      if (e.err && e.err.data && e.err.data.details && typeof e.err.data.details === 'string') {
+      if (e.err && e.err.data && e.err.data.details) {
         msg = e.err.data.details;
       } else if (e.err && e.err.data && e.err.data.message) {
         msg = e.err.data.message;

app/portainer/views/auth/auth.html

@@ -4,7 +4,7 @@
     <div class="col-sm-6 col-sm-offset-3">
       <!-- login box logo -->
       <div class="row">
-        <img ng-if="!ctrl.logo" src="~@/assets/images/logo_alt.svg" class="simple-box-logo" alt="Portainer" />
+        <img ng-if="!ctrl.logo" src="~@/assets/images/logo_alt.png" class="simple-box-logo" alt="Portainer" />
         <img ng-if="ctrl.logo" ng-src="{{ ctrl.logo }}" class="simple-box-logo" />
       </div>
       <!-- !login box logo -->

app/portainer/views/endpoint-registries/registriesController.js

@@ -1,3 +1,5 @@
+import _ from 'lodash-es';
+import { DockerHubViewModel } from 'Portainer/models/dockerhub';
 import { RegistryTypes } from 'Portainer/models/registryTypes';
 
 class EndpointRegistriesController {
@@ -17,8 +19,9 @@ class EndpointRegistriesController {
   getRegistries() {
     return this.$async(async () => {
       try {
+        const dockerhub = new DockerHubViewModel();
         const registries = await this.EndpointService.registries(this.endpointId);
-        this.registries = registries;
+        this.registries = _.concat(dockerhub, registries);
       } catch (err) {
         this.Notifications.error('Failure', err, 'Unable to retrieve registries');
       }

app/portainer/views/endpoints/edit/endpointController.js

@@ -283,7 +283,7 @@ docker run -d \\
     -e CAP_HOST_MANAGEMENT=1 \\
     -e EDGE_INSECURE_POLL=${allowSelfSignedCerts ? 1 : 0} \\
     --name portainer_edge_agent \\
-    portainer/agent`;
+    portainer/agent:2.4.0`;
   }
 
   function buildWindowsStandaloneCommand(edgeId, edgeKey, allowSelfSignedCerts) {

app/portainer/views/home/home.html

@@ -56,7 +56,6 @@
       is-admin="isAdmin"
       total-count="totalCount"
       retrieve-page="getPaginatedEndpoints"
-      endpoint-init-time="state.homepageLoadTime"
     ></endpoint-list>
   </div>
 </div>

app/portainer/views/home/homeController.js

@@ -18,7 +18,6 @@ angular
   ) {
     $scope.state = {
       connectingToEdgeEndpoint: false,
-      homepageLoadTime: '',
     };
 
     $scope.goToEdit = function (id) {
@@ -93,7 +92,6 @@ angular
     }
 
     async function initView() {
-      $scope.state.homepageLoadTime = Math.floor(Date.now() / 1000);
       $scope.isAdmin = Authentication.isAdmin();
 
       MotdService.motd().then(function success(data) {

app/portainer/views/init/admin/initAdmin.html

@@ -5,7 +5,7 @@
       <!-- simple box logo -->
       <div class="row">
         <img ng-if="logo" ng-src="{{ logo }}" class="simple-box-logo" />
-        <img ng-if="!logo" src="~@/assets/images/logo_alt.svg" class="simple-box-logo" alt="Portainer" />
+        <img ng-if="!logo" src="~@/assets/images/logo_alt.png" class="simple-box-logo" alt="Portainer" />
       </div>
       <!-- !simple box logo -->
       <!-- init password panel -->

app/portainer/views/init/endpoint/initEndpoint.html

@@ -5,7 +5,7 @@
       <!-- simple box logo -->
       <div class="row">
         <img ng-if="ctrl.logo" ng-src="{{ ctrl.logo }}" class="simple-box-logo" />
-        <img ng-if="!ctrl.logo" src="~@/assets/images/logo_alt.svg" class="simple-box-logo" alt="Portainer" />
+        <img ng-if="!ctrl.logo" src="~@/assets/images/logo_alt.png" class="simple-box-logo" alt="Portainer" />
       </div>
       <!-- !simple box logo -->
       <!-- init-environment panel -->

app/portainer/views/logout/logout.html

@@ -4,7 +4,7 @@
     <div class="col-md-6 col-md-offset-3 col-sm-6 col-sm-offset-3">
       <!-- login box logo -->
       <div class="row">
-        <img ng-if="!ctrl.logo" src="~@/assets/images/logo_alt.svg" class="simple-box-logo" alt="Portainer" />
+        <img ng-if="!ctrl.logo" src="~@/assets/images/logo_alt.png" class="simple-box-logo" alt="Portainer" />
         <img ng-if="ctrl.logo" ng-src="{{ ctrl.logo }}" class="simple-box-logo" />
       </div>
       <div class="row" style="text-align: center;">