fix decl.moveTo is not a function error in css

* fix(name): fixed namespace creation issue when a registry attached.

* fix(name): moved copy object to upper level of the function

api/bolt/migrator/migrate_dbversion31.go

@@ -2,6 +2,7 @@ package migrator
 
 import (
 	"fmt"
+	"log"
 
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/bolt/errors"
@@ -167,6 +168,7 @@ func (m *Migrator) updateVolumeResourceControlToDB32() error {
 
 		totalSnapshots := len(endpoint.Snapshots)
 		if totalSnapshots == 0 {
+			log.Println("[DEBUG] [volume migration] [message: no snapshot found]")
 			continue
 		}
 
@@ -179,6 +181,7 @@ 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
 			}
 
@@ -199,7 +202,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,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/http"
 	"strconv"
 	"time"
 
@@ -42,6 +43,55 @@ 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,6 +35,9 @@ 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,9 +21,7 @@ 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) {
-	// Schedule the pod for automatic removal
-	maxPodKeepAlive := 1 * time.Hour
-	maxPodKeepAliveSecondsStr := fmt.Sprintf("%d", int(maxPodKeepAlive.Seconds()))
+	maxPodKeepAliveSecondsStr := fmt.Sprintf("%d", int(portainer.WebSocketKeepAlive.Seconds()))
 
 	podPrefix := userShellPodPrefix(serviceAccountName)
 
@@ -81,7 +79,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(maxPodKeepAlive):
+		case <-time.After(portainer.WebSocketKeepAlive):
 			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:"Environments"`
+		Endpoints    []EndpointID `json:"Endpoints"`
 		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:"Environments"`
+		Endpoints      map[EndpointID]EdgeJobEndpointMeta `json:"Endpoints"`
 		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:"Environments"`
+		Endpoints      []EndpointID `json:"Endpoints"`
 	}
 
 	//EdgeStack represents an edge stack
@@ -1324,6 +1324,7 @@ 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)
@@ -1493,6 +1494,8 @@ 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/app.css

@@ -721,10 +721,6 @@ a[ng-click] {
 .multiSelect .multiSelectItem:hover,
 .multiSelect .multiSelectGroup:hover {
   border-color: var(--grey-3);
-}
-
-.multiSelect .multiSelectItem:hover,
-.multiSelect .multiSelectGroup:hover {
   background-image: var(--bg-image-multiselect) !important;
   color: var(--white-color) !important;
 }

app/assets/css/vendor-override.css

@@ -246,12 +246,6 @@ json-tree .branch-preview {
 .pagination > li > span:focus {
   background-color: var(--bg-pagination-hover-color);
   border-color: var(--border-pagination-hover-color);
-}
-
-.pagination > li > a:hover,
-.pagination > li > span:hover,
-.pagination > li > a:focus,
-.pagination > li > span:focus {
   color: var(--text-pagination-span-hover-color);
 }
 

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

@@ -8,6 +8,11 @@ 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/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html

@@ -231,6 +231,7 @@
                   <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"

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

@@ -8,6 +8,7 @@ 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.tableKey);
+      const storedSettings = DatatableService.getDataTableSettings(this.settingsKey);
       if (storedSettings !== null) {
         this.settings = storedSettings;
         this.settings.open = false;

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

@@ -39,7 +39,7 @@
             Configuration
           </div>
           <!-- namespace-input -->
-          <div class="form-group">
+          <div class="form-group" ng-if="$ctrl.state.resourcePool">
             <label for="resource-pool-selector" class="col-sm-2 control-label text-left">Namespace</label>
             <div class="col-sm-10">
               <select
@@ -52,13 +52,7 @@
               ></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,4 +118,5 @@ export const KubernetesDeploymentTypes = Object.freeze({
   GIT: 'git',
   CONTENT: 'content',
   APPLICATION_FORM: 'application form',
+  URL: 'url',
 });

app/kubernetes/node/service.js

@@ -26,7 +26,9 @@ 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) {
-      throw new PortainerError('Unable to retrieve node details', 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);
     }
   }
 

app/kubernetes/views/applications/applications.html

@@ -15,6 +15,7 @@
               <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/createApplication.html

@@ -141,6 +141,7 @@
                 <div class="col-sm-12">
                   <por-image-registry
                     model="ctrl.formValues.ImageModel"
+                    ng-if="ctrl.formValues.ResourcePool"
                     auto-complete="false"
                     label-class="col-sm-1"
                     input-class="col-sm-11"
@@ -152,7 +153,7 @@
                   ></por-image-registry>
                 </div>
               </div>
-
+            <div ng-if="ctrl.formValues.ResourcePool">
               <div class="col-sm-12 form-section-title">
                 Stack
               </div>
@@ -1607,6 +1608,7 @@
                 form-values="ctrl.formValues"
                 old-form-values="ctrl.savedFormValues"
               ></kubernetes-summary-view>
+              </div>
             </div>
 
             <div class="col-sm-12 form-section-title" ng-if="ctrl.state.appType !== ctrl.KubernetesDeploymentTypes.GIT">

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

@@ -1079,10 +1079,14 @@ class KubernetesCreateApplicationController {
           );
 
           if (this.application.ApplicationKind) {
-            this.state.appType = this.KubernetesDeploymentTypes[this.application.ApplicationKind.toUpperCase()];
+            this.state.appType = KubernetesDeploymentTypes[this.application.ApplicationKind.toUpperCase()];
+            if (this.application.ApplicationKind === KubernetesDeploymentTypes.URL) {
+              this.state.appType = KubernetesDeploymentTypes.CONTENT;
+            }
+
             if (this.application.StackId) {
               this.stack = await this.StackService.stack(this.application.StackId);
-              if (this.application.ApplicationKind === this.KubernetesDeploymentTypes.CONTENT) {
+              if (this.state.appType === KubernetesDeploymentTypes.CONTENT) {
                 this.stackFileContent = await this.StackService.getStackFile(this.application.StackId);
               }
             }

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

@@ -49,7 +49,7 @@
             </div>
 
             <!-- resource-pool -->
-            <div class="form-group">
+            <div class="form-group" ng-if="ctrl.formValues.ResourcePool">
               <label for="resource-pool-selector" class="col-sm-1 control-label text-left">Namespace</label>
               <div class="col-sm-11">
                 <select
@@ -57,6 +57,7 @@
                   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>
@@ -68,69 +69,75 @@
                 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 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 ng-if="ctrl.formValues.ResourcePool">
+              <div class="col-sm-12 form-section-title">
+                Configuration type
               </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 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>
-            </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>.
+              <!-- 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>
-
-            <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
@@ -140,7 +147,7 @@
                 <button
                   type="button"
                   class="btn btn-primary btn-sm"
-                  ng-disabled="!kubernetesConfigurationCreationForm.$valid || !ctrl.isFormValid() || ctrl.state.actionInProgress"
+                  ng-disabled="!kubernetesConfigurationCreationForm.$valid || !ctrl.isFormValid() || ctrl.state.actionInProgress || !ctrl.formValues.ResourcePool"
                   ng-click="ctrl.createConfiguration()"
                   button-spinner="ctrl.state.actionInProgress"
                   data-cy="k8sConfigCreate-CreateConfigButton"

app/kubernetes/views/deploy/deploy.html

@@ -16,12 +16,18 @@
               <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">
+                <div class="form-group" ng-if="ctrl.formValues.Namespace">
                   <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,7 +107,9 @@ 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);
 
-    return isGitFormInvalid || isWebEditorInvalid || isURLFormInvalid || this.state.actionInProgress;
+    const isNamespaceInvalid = _.isEmpty(this.formValues.Namespace);
+
+    return isGitFormInvalid || isWebEditorInvalid || isURLFormInvalid || this.state.actionInProgress || isNamespaceInvalid;
   }
 
   onChangeFormValues(values) {
@@ -230,7 +232,9 @@ class KubernetesDeployController {
       });
 
       this.namespaces = namespaces;
-      this.formValues.Namespace = this.namespaces[0].Name;
+      if (this.namespaces.length > 0) {
+        this.formValues.Namespace = this.namespaces[0].Name;
+      }
     } catch (err) {
       this.Notifications.error('Failure', err, 'Unable to load namespaces data');
     }

app/kubernetes/views/summary/summaryController.js

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

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

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

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

@@ -54,6 +54,21 @@
             </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 }"

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

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

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

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

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

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

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

@@ -38,6 +38,7 @@
           on-edit="($ctrl.editAction)"
           is-admin="$ctrl.isAdmin"
           tags="$ctrl.tags"
+          endpoint-init-time="$ctrl.endpointInitTime"
         ></endpoint-item>
         <endpoint-item
           ng-if="!$ctrl.hasBackendPagination()"
@@ -47,6 +48,7 @@
           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/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) {
+      if (e.err && e.err.data && e.err.data.details && typeof e.err.data.details === 'string') {
         msg = e.err.data.details;
       } else if (e.err && e.err.data && e.err.data.message) {
         msg = e.err.data.message;

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

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

app/portainer/views/home/home.html

@@ -56,6 +56,7 @@
       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,6 +18,7 @@ angular
   ) {
     $scope.state = {
       connectingToEdgeEndpoint: false,
+      homepageLoadTime: '',
     };
 
     $scope.goToEdit = function (id) {
@@ -92,6 +93,7 @@ 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/registries/registriesController.js

@@ -1,6 +1,5 @@
 import _ from 'lodash-es';
 import { RegistryTypes } from 'Portainer/models/registryTypes';
-import { DockerHubViewModel } from 'Portainer/models/dockerhub';
 
 angular.module('portainer.app').controller('RegistriesController', [
   '$q',
@@ -59,7 +58,7 @@ angular.module('portainer.app').controller('RegistriesController', [
         registries: RegistryService.registries(),
       })
         .then(function success(data) {
-          $scope.registries = _.concat(new DockerHubViewModel(), data.registries);
+          $scope.registries = data.registries;
         })
         .catch(function error(err) {
           $scope.registries = [];

app/portainer/views/stacks/create/createStackController.js

@@ -34,7 +34,7 @@ angular
       StackFile: null,
       RepositoryURL: '',
       RepositoryReferenceName: '',
-      RepositoryAuthentication: true,
+      RepositoryAuthentication: false,
       RepositoryUsername: '',
       RepositoryPassword: '',
       Env: [],

app/portainer/views/wizard/wizard-view.html

@@ -1,6 +1,6 @@
 <rd-header>
   <rd-header-title title-text="Quick Setup"></rd-header-title>
-  <rd-header-content>Endpoint Wizard</rd-header-content>
+  <rd-header-content>Environment Wizard</rd-header-content>
 </rd-header>
 
 <div class="row">