Merge branch 'master' into reuse-unbound-routes

* master:
  Fix style issue
  Persist app wall selection of cf/org/space in local storage (#1214)
  Add upgrade documentation for helm repository based installation (#1218)
  Fixed docker image name for all-in-one deployment (#1216)
  Use stable name for docker registry (#1220)
  Update CI piplines for environment (#1217)
  Fixes and changed select source radio button to select-input dropdown - Converted the select source radio button to a drop down (ready for more sources) - Split out more styles from deploy-step-source.scss - Fixed github userinput validation - Fixed display of cf ignore info for manually opened file/folders
  Deploy fixes, removed common session data, added delay to 'scanning' busy screen
  Started deploy step, a few minor bugs to work through WIP
  UX for source mostly works now. Still plenty of tidy up to do WIP
  Refactor/reduce deploy app service WIP - Move steps out into their own service - Move input sources out into seperate directives
  Split deploy destination + source step into two steps

components/app-core/frontend/src/view/util/local-storage.service.js

@@ -68,7 +68,7 @@
       /**
        * @function getItem
        * @memberof app.view.appLocalStorage
-       * @description Get the item in the local storage for the given key. Optioanlly return the default value if not found.
+       * @description Get the item in the local storage for the given key. Optionally return the default value if not found.
        * @param {string} key - key of value fo retrieve
        * @param {string=} defaultValue - default value to be returned if no value is found
        * @returns {string} value from local storage for the given key

components/app-framework/src/widgets/wizard/wizard.directive.js

@@ -76,6 +76,8 @@
     vm.hasMessage = false;
     vm.busyMessage = false;
 
+    vm.showBusy = showBusy;
+
     if (vm.workflow.initControllers) {
       vm.workflow.initControllers(vm);
     }
@@ -144,7 +146,6 @@
     vm.switchToFirstReadyStep = switchToFirstReadyStep;
     vm.always = always;
     vm.allowCancel = allowCancel;
-    vm.showBusy = showBusy;
 
     vm.initPromise.then(function () {
       vm.onInitSuccess();

components/cf-app-push/frontend/i18n/en_US/app-push.json

@@ -5,8 +5,15 @@
   "deploy-app-dialog": {
     "title": "Deploy Application",
     "button-deploy": "Deploy",
-    "step-info": {
-      "title": "Destination and Source",
+    "step-destination": {
+      "title": "Destination",
+      "busy": "Updating Cloud Foundry Data",
+      "enter-failed": "Failed to refresh cloud foundry data. Please try again. If this error persists, please contact the Administrator."
+    },
+    "step-source": {
+      "title": "Source",
+      "choose-label": "Source Type",
+      "choose-placeholder": "Select the source type",
       "github": {
         "label": "Public Github",
         "project-label": "Project",
@@ -19,8 +26,8 @@
         "branch-last-commit-committer": ""
       },
       "source": {
-        "file": "Select a GitHub project, select a local archive file, or drag and drop a GitHub url or an archive file",
-        "folder": "Select a GitHub project, select a local archive file or folder, or drag and drop a GitHub url, an archive file or folder"
+        "file": "Select a source or drag and drop a GitHub url or an archive file",
+        "folder": "Select a source or drag and drop a GitHub url, an archive file or folder"
       },
       "local": {
         "file": {
@@ -43,9 +50,7 @@
         "description": "For existing apps, if the relative path to your manifest.yml is not in the root please supply it below.",
         "path-label": "Path to manifest",
         "path-placeholder": "Relative path of manifest to root of app directory"
-      },
-      "busy": "Updating Cloud Foundry Data",
-      "enter-failed": "Failed to refresh cloud foundry data. Please try again. If this error persists, please contact the Administrator."
+      }
     },
     "step-deploying": {
       "title": "Deploy Application",
@@ -61,15 +66,15 @@
       "event-type": {
         "CLOSE_FAILED_NO_BRANCH": "Failed to clone repository (invalid branch), please ensure github details are correct",
         "CLOSE_FAILED_CLONE": "Failed to clone repository, please ensure github details are correct and try again",
-        "CLOSE_FAILURE": "Unknown failure",
-        "CLOSE_INVALID_MANIFEST": "Invalid manifest in repository",
-        "CLOSE_NO_MANIFEST": "Failed to find manifest in repository",
-        "CLOSE_PUSH_ERROR": "[[@:cloud-foundry]] push unsuccessful",
+        "CLOSE_FAILURE": "Unknown failure. See log for more information.",
+        "CLOSE_INVALID_MANIFEST": "Invalid manifest",
+        "CLOSE_NO_MANIFEST": "Failed to find manifest",
+        "CLOSE_PUSH_ERROR": "[[@:cloud-foundry]] push unsuccessful. See log for details.",
         "CLOSE_NO_SESSION": "Failed to create session",
         "CLOSE_NO_CNSI": "Unknown [[@:cloud-foundry]] instance",
         "CLOSE_NO_CNSI_USERTOKEN": "Invalid [[@:cloud-foundry]] token"
       },
-      "failed-connection": "Failed to open connection",
+      "failed-connection": "Failed to open socket connection",
       "failed-unknown": "Unknown failure"
     }
   }