Merge lp:~benji/charms/precise/juju-gui/remove-default-view-mode-config into lp:~juju-gui/charms/precise/juju-gui/trunk

[Benji York]

remove defaultViewMode config variable

https://codereview.appspot.com/50180043/

[Benji York (benji)]

Reviewers: mp+201111_code.launchpad.net,

Message:
Please take a look.

Description:
remove defaultViewMode config variable

https://code.launchpad.net/~benji/charms/precise/juju-gui/remove-default-view-mode-config/+merge/201111

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/50180043/

Affected files (+4, -24 lines):
   A [revision details]
   M config.yaml
   M config/config.js.template
   M hooks/backend.py
   M hooks/utils.py
   M tests/test_backends.py
   M tests/test_utils.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: config.yaml
=== modified file 'config.yaml'
--- config.yaml 2013-10-09 08:56:20 +0000
+++ config.yaml 2014-01-09 21:48:27 +0000
@@ -168,16 +168,6 @@
        allow us to improve our tool based on your experience.
      type: string
      default: UA-41463568-2
- default-viewmode:
- description: |
- What the default viewmode for the charmbrowser should be. Possible
options are:
- - 'sidebar' (default): the charmwbrowser will appear as a sidebar.
This
- is also known as build mode.
- - 'fullscreen': the charmbrowser will appear in full screen, hiding
the
- canvas. This is also known as browse mode.
- - 'minimized': the charmbrowser will be minimized by default, and
hidden.
- type: string
- default: sidebar
    show-get-juju-button:
      description: |
        There are deployment modes for Juju GUI which are not intended as
regular

Index: config/config.js.template
=== modified file 'config/config.js.template'
--- config/config.js.template 2013-09-12 18:15:19 +0000
+++ config/config.js.template 2014-01-09 21:48:27 +0000
@@ -24,6 +24,5 @@
    sandbox: {{sandbox}},
    GA_key: {{ga_key}},
    login_help: {{login_help}},
- defaultViewmode: {{default_viewmode}},
    showGetJujuButton: {{show_get_juju_button}}
  };

Index: hooks/backend.py
=== modified file 'hooks/backend.py'
--- hooks/backend.py 2013-11-15 14:56:04 +0000
+++ hooks/backend.py 2014-01-09 21:48:27 +0000
@@ -152,7 +152,6 @@
              config['read-only'], config['staging'],
config['charmworld-url'],
              build_dir, secure=config['secure'], sandbox=config['sandbox'],
              ga_key=config['ga-key'],
- default_viewmode=config['default-viewmode'],
              show_get_juju_button=config['show-get-juju-button'],
              password=config.get('password'))
          # Expose the service.

Index: hooks/utils.py
=== modified file 'hooks/utils.py'
--- hooks/utils.py 2013-11-15 14:56:04 +0000
+++ hooks/utils.py 2014-01-09 21:48:27 +0000
@@ -410,8 +410,8 @@
  def write_gui_config(
          console_enabled, login_help, readonly, in_staging, charmworld_url,
          build_dir, secure=True, sandbox=False,
- default_viewmode='sidebar', show_get_juju_button=False,
- config_js_path=None, ga_key='', password=None):
+ show_get_juju_button=...

[Richard Harding (rharding)]

LGTM

https://codereview.appspot.com/50180043/

[Benji York (benji)]

*** Submitted:

remove defaultViewMode config variable

R=rharding
CC=
https://codereview.appspot.com/50180043

https://codereview.appspot.com/50180043/

=== modified file 'config.yaml'
--- config.yaml	2013-10-09 08:56:20 +0000
+++ config.yaml	2014-01-09 21:52:49 +0000
@@ -168,16 +168,6 @@
       allow us to improve our tool based on your experience.
     type: string
     default: UA-41463568-2
-  default-viewmode:
-    description: |
-      What the default viewmode  for the charmbrowser should be. Possible options are:
-      - 'sidebar' (default): the charmwbrowser will appear as a sidebar. This
-        is also known as build mode.
-      - 'fullscreen': the charmbrowser will appear in full screen, hiding the
-        canvas. This is also known as browse mode.
-      - 'minimized': the charmbrowser will be minimized by default, and hidden.
-    type: string
-    default: sidebar
   show-get-juju-button:
     description: |
       There are deployment modes for Juju GUI which are not intended as regular

=== modified file 'config/config.js.template'
--- config/config.js.template	2013-09-12 18:15:19 +0000
+++ config/config.js.template	2014-01-09 21:52:49 +0000
@@ -24,6 +24,5 @@
   sandbox: {{sandbox}},
   GA_key: {{ga_key}},
   login_help: {{login_help}},
-  defaultViewmode: {{default_viewmode}},
   showGetJujuButton: {{show_get_juju_button}}
 };

=== modified file 'hooks/backend.py'
--- hooks/backend.py	2013-11-15 14:56:04 +0000
+++ hooks/backend.py	2014-01-09 21:52:49 +0000
@@ -152,7 +152,6 @@
             config['read-only'], config['staging'], config['charmworld-url'],
             build_dir, secure=config['secure'], sandbox=config['sandbox'],
             ga_key=config['ga-key'],
-            default_viewmode=config['default-viewmode'],
             show_get_juju_button=config['show-get-juju-button'],
             password=config.get('password'))
         # Expose the service.

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2013-11-15 14:56:04 +0000
+++ hooks/utils.py	2014-01-09 21:52:49 +0000
@@ -410,8 +410,8 @@
 def write_gui_config(
         console_enabled, login_help, readonly, in_staging, charmworld_url,
         build_dir, secure=True, sandbox=False,
-        default_viewmode='sidebar', show_get_juju_button=False,
-        config_js_path=None, ga_key='', password=None):
+        show_get_juju_button=False, config_js_path=None, ga_key='',
+        password=None):
     """Generate the GUI configuration file."""
     log('Generating the Juju GUI configuration file.')
     is_legacy_juju = legacy_juju()
@@ -439,7 +439,6 @@
         'sandbox': json.dumps(sandbox),
         'charmworld_url': json.dumps(charmworld_url),
         'ga_key': json.dumps(ga_key),
-        'default_viewmode': json.dumps(default_viewmode),
         'show_get_juju_button': json.dumps(show_get_juju_button),
     }
     if config_js_path is None:

=== modified file 'tests/test_backends.py'
--- tests/test_backends.py	2013-11-15 14:56:04 +0000
+++ tests/test_backends.py	2014-01-09 21:52:49 +0000
@@ -204,7 +204,6 @@
             'builtin-server-logging': 'info',
             'charmworld-url': 'http://charmworld.example.com/',
             'command-log-file': self.command_log_file,
-            'default-viewmode': 'sidebar',
             'ga-key': 'my-key',
             'juju-api-branch': self.juju_api_branch,
             'juju-gui-debug': False,
@@ -275,7 +274,6 @@
             config['read-only'], config['staging'], config['charmworld-url'],
             mocks.compute_build_dir(), secure=config['secure'],
             sandbox=config['sandbox'], ga_key=config['ga-key'],
-            default_viewmode=config['default-viewmode'],
             show_get_juju_button=config['show-get-juju-button'], password=None)
 
     def test_base_dir_created(self):

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2013-11-15 14:56:04 +0000
+++ tests/test_utils.py	2014-01-09 21:52:49 +0000
@@ -1100,13 +1100,6 @@
         self.assertIn('user: "admin"', js_conf)
         self.assertIn('password: "admin"', js_conf)
 
-    def test_write_gui_config_fullscreen(self):
-        write_gui_config(
-            False, 'This is login help.', False, False, self.charmworld_url,
-            self.build_dir, sandbox=True, default_viewmode='fullscreen',
-            config_js_path='config')
-        self.assertIn('defaultViewmode: "fullscreen"', self.files['config'])
-
     def test_write_gui_config_with_button(self):
         write_gui_config(
             False, 'This is login help.', False, False, self.charmworld_url,