Make new UI be the default UI

appengine/swarming/handlers_frontend.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Main entry point for Swarming service.
 
 This file contains the URL handlers for all the Swarming service URLs,
 implemented using the webapp2 framework.
 """
 
@@ skipping 227 matching lines @@
     version = bot_code.get_bot_version(self.request.host_url)
     bots, cursor, more = fetch_future.get_result()
     # Prefetch the tasks. We don't actually use the value here, it'll be
     # implicitly used by ndb local's cache when refetched by the html template.
     tasks = filter(None, (b.task for b in bots))
     ndb.get_multi(tasks)
     num_bots_busy = num_bots_busy_future.get_result()
     num_bots_dead = num_bots_dead_future.get_result()
     num_bots_quarantined = num_bots_quarantined_future.get_result()
     num_bots_total = num_bots_total_future.get_result()
-    try_link = '/newui/botlist?l=%d' % limit
+    try_link = '/botlist?l=%d' % limit
     if dimensions:
       try_link += '&f=' + '&f='.join(dimensions)
     params = {
       'bots': bots,
       'current_version': version,
       'cursor': cursor.urlsafe() if cursor and more else '',
       'dimensions': '\n'.join(dimensions),
       'is_admin': acl.is_admin(),
       'is_privileged_user': acl.is_privileged_user(),
       'limit': limit,
@@ skipping 81 matching lines @@
       'bot_id': bot_id,
       'current_version': bot_code.get_bot_version(self.request.host_url),
       'cursor': cursor.urlsafe() if cursor and more else None,
       'events': events,
       'idle_time': idle_time,
       'is_admin': acl.is_admin(),
       'limit': limit,
       'now': now,
       'run_results': run_results,
       'run_time': run_time,
-      'try_link': '/newui/bot?id=%s' % bot_id,
+      'try_link': '/bot?id=%s' % bot_id,
       'xsrf_token': self.generate_xsrf_token(),
     }
     self.response.write(
         template.render('swarming/restricted_bot.html', params))
 
 
 class BotDeleteHandler(auth.AuthenticatingHandler):
   """Deletes a known bot.
 
   This only deletes the BotInfo, not BotRoot, BotEvent's nor BotSettings.
@@ skipping 158 matching lines @@
     # In theory, t.duration_as_seen_by_server should always be set when
     # t.deduped_from is set but there has some broken entities in the datastore.
     total_saved = safe_sum(
         t.duration_as_seen_by_server for t in tasks
         if t.deduped_from and t.duration_as_seen_by_server)
     duration_sum = safe_sum(durations)
     total_saved_percent = (
         (100. * total_saved.total_seconds() / duration_sum.total_seconds())
         if duration_sum else 0.)
 
-    try_link = '/newui/tasklist?l=%d' % limit
+    try_link = '/tasklist?l=%d' % limit
     if task_tags:
       try_link += '&f=' + '&f='.join(task_tags)
     params = {
       'cursor': cursor_str,
       'duration_average': avg(durations),
       'duration_median': median(durations),
       'duration_sum': duration_sum,
       'has_pending': any(t.is_pending for t in tasks),
       'has_running': any(t.is_running for t in tasks),
       'is_admin': acl.is_admin(),
@@ skipping 169 matching lines @@
       'is_gae_admin': users.is_current_user_admin(),
       'is_privileged_user': acl.is_privileged_user(),
       'following_task': following_task,
       'full_appid': os.environ['APPLICATION_ID'],
       'host_url': self.request.host_url,
       'is_running': result.state == task_result.State.RUNNING,
       'parent_task': parent_task,
       'previous_task': previous_task,
       'request': request,
       'task': result,
-      'try_link': '/newui/task?id=%s' % task_id,
+      'try_link': '/task?id=%s' % task_id,
       'xsrf_token': self.generate_xsrf_token(),
     }
     self.response.write(template.render('swarming/user_task.html', params))
 
 
 class TaskCancelHandler(BaseTaskHandler):
   """Cancel a task."""
 
   @auth.require(acl.is_user)
   def post(self, task_id):
@@ skipping 22 matching lines @@
     # original one, but with new parameters.
     new_request = task_request.new_request_clone(
         original_request, allow_high_priority=acl.is_admin())
     result_summary = task_scheduler.schedule_request(new_request)
     self.redirect('/user/task/%s' % result_summary.task_id)
 
 
 ### Public pages.
 
 
-class RootHandler(auth.AuthenticatingHandler):
+class OldUIHandler(auth.AuthenticatingHandler):
   @auth.public
   def get(self):
     params = {
       'host_url': self.request.host_url,
       'is_admin': acl.is_admin(),
       'is_privileged_user': acl.is_privileged_user(),
       'is_user': acl.is_user(),
       'is_bootstrapper': acl.is_bootstrapper(),
       'bootstrap_token': '...',
       'mapreduce_jobs': [],
       'user_type': acl.get_user_type(),
       'xsrf_token': '',
     }
     if acl.is_admin():
       params['mapreduce_jobs'] = [
         {'id': job_id, 'name': job_def['job_name']}
         for job_id, job_def in mapreduce_jobs.MAPREDUCE_JOBS.iteritems()
       ]
       params['xsrf_token'] = self.generate_xsrf_token()
     if acl.is_bootstrapper():
       params['bootstrap_token'] = bot_code.generate_bootstrap_token()
     self.response.write(template.render('swarming/root.html', params))
 
 
 class UIHandler(auth.AuthenticatingHandler):
   @auth.public
   def get(self, page):
     if not page:
-      page = "swarming"
+      page = 'swarming'
 
     params = {
       'client_id': config.settings().ui_client_id,
     }
-    self.response.write(template.render(
+    try:
+      self.response.write(template.render(
         'swarming/public_%s_index.html' % page, params))
+    except template.TemplateNotFound:
+      self.abort(404, 'Page not found.')
 
 
 class WarmupHandler(webapp2.RequestHandler):
   def get(self):
     auth.warmup()
     bot_code.get_swarming_bot_zip(self.request.host_url)
     utils.get_module_version_list(None, None)
     self.response.headers['Content-Type'] = 'text/plain; charset=utf-8'
     self.response.write('ok')
 
 
 class EmailHandler(webapp2.RequestHandler):
   """Blackhole any email sent."""
   def post(self, to):
     pass
 
 
 def create_application(debug):
   template.bootstrap()
   utils.set_task_queue_module('default')
 
   routes = [
       # Frontend pages. They return HTML.
       # Public pages.
-      ('/', RootHandler),
+      ('/oldui', OldUIHandler),
       ('/stats', stats_gviz.StatsSummaryHandler),
-      ('/newui/<page:[a-z]*>', UIHandler),
+      ('/<page:(bot|botlist|task|tasklist|)>', UIHandler),
 
       # User pages.
       ('/user/tasks', TasksHandler),
       ('/user/task/<task_id:[0-9a-fA-F]+>', TaskHandler),
       ('/user/task/<task_id:[0-9a-fA-F]+>/cancel', TaskCancelHandler),
       ('/user/task/<task_id:[0-9a-fA-F]+>/retry', TaskRetryHandler),
 
       # Privileged user pages.
       ('/restricted/bots', BotsListHandler),
       ('/restricted/bot/<bot_id:[^/]+>', BotHandler),
@@ skipping 21 matching lines @@
 
   # If running on a local dev server, allow bots to connect without prior
   # groups configuration. Useful when running smoke test.
   if utils.is_local_dev_server():
     acl.bootstrap_dev_server_acls()
 
   routes.extend(handlers_backend.get_routes())
   routes.extend(handlers_bot.get_routes())
   routes.extend(handlers_endpoints.get_routes())
   return webapp2.WSGIApplication(routes, debug=debug)