Remove the serviceInspector feature flag.

app/views/topology/service.js

 /*
 This file is part of the Juju GUI, which lets users view and manage Juju
 environments within a graphical interface (https://launchpad.net/juju-gui).
 Copyright (C) 2012-2013 Canonical Ltd.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU Affero General Public License version 3, as published by
 the Free Software Foundation.
 
 This program is distributed in the hope that it will be useful, but WITHOUT
@@ skipping 345 matching lines @@
           mousemove: 'serviceMouseMove'
         },
 
         '.service-status': {
           mouseover: 'serviceStatusMouseOver',
           mouseout: 'serviceStatusMouseOut'
         },
         // See _attachDragEvents for the drag and drop event registrations
         '.zoom-plane': {
           click: 'canvasClick'
-        },
-        // Menu/Controls
-        '.view-service': {
-          click: 'viewServiceClick',
-          touchstart: 'viewServiceClick'
-        },
-        '.destroy-service': {
-          click: 'destroyServiceClick'

[rharding, 2013/09/19 15:06:28]

these menus are gone

         }
       },
       d3: {
         '.service': {
           'mousedown.addrel': 'serviceAddRelMouseDown',
           'mouseup.addrel': 'serviceAddRelMouseUp'
         }
       },
       yui: {
         /**
@@ skipping 190 matching lines @@
         box.ignoreNextClick = true;
       }
 
       if (box.ignoreNextClick) {
         box.ignoreNextClick = false;
         return;
       }
 
       // If the service box is pending, ensure that the charm panel is
       // visible, but don't do anything else.
-      if (box.pending && !window.flags.serviceInspector) {

[gary.poster, 2013/09/19 15:51:29]

Wait a sec, this says to only do the block if serviceInspector is turned *off*. 
Shouldn't we delete this whole block?

[rharding, 2013/09/19 17:10:57]

Yes, misread this one.

+      if (box.pending) {
         // Prevent the clickoutside event from firing and immediately
         // closing the panel.
         d3.event.halt();
         // Ensure service menus are closed.
         topo.fire('clearState');
         views.CharmPanel.getInstance().show();
         return;
       }
       // serviceClick is being called after dragend is processed.  In those
       // cases the current click action should not be invoked.
@@ skipping 196 matching lines @@
      * @return {undefined} Side effects only.
      */
     clearStateHandler: function() {
       var container = this.get('container'),
               topo = this.get('component');
       container.all('.environment-menu.active').removeClass('active');
       this.hideServiceMenu();
     },
 
     /**
-     * The user clicked on the "View" menu item.
-     *
-     * @method viewServiceClick
-     */
-    viewServiceClick: function(_, context) {
-      // Get the service element
-      var topo = context.get('component');
-      var box = topo.get('active_service');
-      var service = box.model;
-      context.hideServiceMenu();
-      context.show_service(service);
-    },
-
-    /**
-     * The user clicked on the "Destroy" menu item.
-     *
-     * @method destroyServiceClick
-     */
-    destroyServiceClick: function(_, context) {
-      // Get the service element
-      var topo = context.get('component');
-      var box = topo.get('active_service');
-      context.hideServiceMenu();
-      if (window.flags && window.flags.serviceInspector) {
-        context.destroyServiceInspector();
-      }
-      context.destroyServiceConfirm(box);

[rharding, 2013/09/19 15:06:28]

and the callbacks for them are no longer required.

-    },
-
-    /**
       Destroys the service inspector when it's service topo destroy
       button is clicked.
 
       @method destroyServiceInspector
     */
     destroyServiceInspector: function() {
       this.get('component').fire('destroyServiceInspector');
     },
 
     /**
@@ skipping 517 matching lines @@
      */
     showServiceMenu: function(box) {
       var serviceMenu = this.get('container').one('#service-menu');
       var topo = this.get('component');
       var service = box.model;
       var landscape = topo.get('landscape');
       var landscapeReboot = serviceMenu.one('.landscape-reboot').hide();
       var landscapeSecurity = serviceMenu.one('.landscape-security').hide();
       var triangle = serviceMenu.one('.triangle');
       var securityURL, rebootURL;
-      var flags = window.flags;
 
-      if (flags.serviceInspector) {
-        this.show_service(service);
-      }
+      this.show_service(service);
 
       if (service.get('pending')) {
         return true;
       }
 
       // Update landscape links and show/hide as needed.
-      if (landscape && !flags.serviceInspector) {

[gary.poster, 2013/09/19 15:51:29]

No, look, this says *not* serviceInspector.  We can delete this block and the
related landscape code that I mentioned before and also related handlers.

+      if (landscape) {
         rebootURL = landscape.getLandscapeURL(service, 'reboot');
         securityURL = landscape.getLandscapeURL(service, 'security');
 
         if (rebootURL && service['landscape-needs-reboot']) {
           landscapeReboot.show().one('a').set('href', rebootURL);
         }
         if (securityURL && service['landscape-security-upgrades']) {
           landscapeSecurity.show().one('a').set('href', securityURL);
         }
       }
 
-      // The view option should not be used with the inspector.
-      if (flags.serviceInspector) {
-        serviceMenu.one('.view-service').hide();
-        serviceMenu.one('.destroy-service').hide();
-      }
-
       if (box && !serviceMenu.hasClass('active')) {
         topo.set('active_service', box);
         topo.set('active_context', box.node);
         serviceMenu.addClass('active');
 
         var menuHeight = serviceMenu.getDOMNode().getClientRects()[0].height;
         var triHeight = 18;
         triangle.setStyle('top', ((menuHeight - triHeight) / 2) + 'px');
 
         // Disable the 'Build Relation' link if the charm has not yet loaded.
         var addRelation = serviceMenu.one('.add-relation');
         if (this.allowBuildRelation(topo, service)) {
           addRelation.removeClass('disabled');
         } else {
           addRelation.addClass('disabled');
         }
 
-        // We do not want the user destroying the Juju GUI service.
-        if (utils.isGuiService(service)) {
-          serviceMenu.one('.destroy-service').addClass('disabled');
-        }

[rharding, 2013/09/19 15:06:28]

this was about changing the menu for the inspector service block. So it's
removed entirely since that destroy is gone.

         this.updateServiceMenuLocation();
       }
     },
 
     /**
      * Hide the service menu.
      *
      * @method hideServiceMenu
      * @param {object} box The presentation state for the service (unused).
      * @return {undefined} Side effects only.
      */
     hideServiceMenu: function(box) {
       var serviceMenu = this.get('container').one('#service-menu');
       var topo = this.get('component');
 
       if (serviceMenu.hasClass('active')) {
         serviceMenu.removeClass('active');
         topo.set('active_service', null);
         topo.set('active_context', null);
-        // Most services can be destroyed via the GUI.
-        serviceMenu.one('.destroy-service').removeClass('disabled');
       }
     },
 
     /*
      * View a service
      *
      * @method show_service
      */
     show_service: function(service) {
       var topo = this.get('component');
       var createServiceInspector = topo.get('createServiceInspector');
-      var getModelURL = topo.get('getModelURL');
-      // to satisfy linter;
-      var flags = window.flags;
 
       topo.detachContainer();
-      if (flags.serviceInspector) {
-        createServiceInspector(service);
-      } else {
-        topo.fire('navigateTo', {
-          url: getModelURL(service)
-        });
-      }
+      createServiceInspector(service);

[rharding, 2013/09/19 15:06:28]

this is what caused tests to have issues. The service inspector requires a
div#content to exist and many of the tests didn't create that.

     },
 
     /*
      * Show a dialog before destroying a service
      *
      * @method destroyServiceConfirm
      */
     destroyServiceConfirm: function(box) {
       // Set service in view.
       this.set('destroy_service', box.model);
@@ skipping 65 matching lines @@
     'd3',
     'd3-components',
     'd3-statusbar',
     'juju-view-service',
     'juju-templates',
     'juju-models',
     'juju-env',
     'unscaled-pack-layout'
   ]
 });