Bug fixes

app/authenticated/route.js

@@ -354,6 +354,17 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
     serviceChanged: function(change) {
       var service = change.data.resource;
       this._includeChanged('environment', 'services', 'environmentId', change.data.resource);
+
+      // Remove the service from depenedent services
+      if ( ['removed','purged','purging'].indexOf(service.get('state')) >= 0 )
+      {
+        ['service','loadBalancerService','dnsService','externalService'].forEach((type) => {
+          this.get('store').all(type).forEach((otherService) => {
+            (otherService.get('consumedservices')||[]).removeObject(service);
+          });
+        });
+      }
+
       service.importLink('consumedservices');
     },
   },

app/components/environment-header/template.hbs

@@ -12,6 +12,6 @@
     </div>
     {{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-sm btn-primary right-divider-btn"}}Add Service{{/link-to}}
     {{#link-to "service.new-balancer" (query-params environmentId=model.id) classNames="btn btn-sm btn-primary right-divider-btn"}}Add Balancer{{/link-to}}
-    {{#link-to "service.new-dns" (query-params environmentId=model.id) classNames="btn btn-sm btn-primary right-divider-btn"}}Add DNS Name{{/link-to}}
+    {{#link-to "service.new-dns" (query-params environmentId=model.id) classNames="btn btn-sm btn-primary right-divider-btn"}}Add DNS{{/link-to}}
   </h3>
 </section>

app/components/project-section/template.hbs

@@ -10,7 +10,7 @@
   <span class="right-divider clip">{{#link-to "environment" model.id}}{{model.name}}{{/link-to}}</span>
   {{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-sm btn-default right-divider-btn"}}Add Service{{/link-to}}
   {{#link-to "service.new-balancer" (query-params environmentId=model.id) classNames="btn btn-sm btn-default right-divider-btn"}}Add Balancer{{/link-to}}
-  {{#link-to "service.new-dns" (query-params environmentId=model.id) classNames="btn btn-sm btn-default right-divider-btn"}}Add DNS Name{{/link-to}}
+  {{#link-to "service.new-dns" (query-params environmentId=model.id) classNames="btn btn-sm btn-default right-divider-btn"}}Add DNS{{/link-to}}
 </h4>
 <h6 style="margin-top: 3px;">
   <span class="right-divider" tooltip="Service Count"><i class="ss-layers"></i>&nbsp;{{model.services.length}}</span>

app/mixins/edit-service.js

@@ -26,7 +26,7 @@ export default Ember.Mixin.create(EditLabels, {
   // ----------------------------------
   serviceChoices: function() {
     var env = this.get('selectedEnvironment');
-    var group = 'Environment: ' + (env.get('name') || '('+env.get('id')+')');
+    var group = 'Project: ' + (env.get('name') || '('+env.get('id')+')');
 
     var list = (env.get('services')||[]).map((service) => {
       var serviceLabel = (service.get('name') || '('+service.get('id')+')');

app/service/new-dns/controller.js

@@ -63,7 +63,7 @@ export default Ember.ObjectController.extend(Cattle.NewOrEditMixin, {
 
     env.get('services').map((service) => {
       list.pushObject({
-        group: 'Environment: ' + envName,
+        group: 'Project: ' + envName,
         id: service.get('id'),
         name: service.get('name') || ('(' + service.get('id') + ')')
       });

app/service/new/route.js

@@ -39,6 +39,7 @@ export default Ember.Route.extend({
           serviceData = serviceOrContainer.serializeForNew();
           instanceData = serviceData.launchConfig;
           delete serviceData.launchConfig;
+          delete serviceData.instances;
         }
         else
         {