Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1944)

Unified Diff: appengine/isolate/ui/res/imp/common/isolate-app.html

Issue 2991303002: Add in OAuth authentication to Isolate Polymer UI (Closed)
Patch Set: Fix GET request for server_details Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/isolate/ui/res/imp/common/isolate-app.html
diff --git a/appengine/swarming/ui/res/imp/common/swarming-app.html b/appengine/isolate/ui/res/imp/common/isolate-app.html
similarity index 85%
copy from appengine/swarming/ui/res/imp/common/swarming-app.html
copy to appengine/isolate/ui/res/imp/common/isolate-app.html
index 8295afaa0adbd487602cd6c7fe5f03876333c80f..b56b2552fcaa3be5b59c9c0fa80db3392fbbbec0 100644
--- a/appengine/swarming/ui/res/imp/common/swarming-app.html
+++ b/appengine/isolate/ui/res/imp/common/isolate-app.html
@@ -1,21 +1,21 @@
<!--
- Copyright 2016 The LUCI Authors. All rights reserved.
+ Copyright 2017 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.
This in an HTML Import-able file that contains the definition
of the following elements:
- <swarming-app>
+ <isolate-app>
- <swarming-app> is meant to be used in top level elements to provide the header
+ <isolate-app> is meant to be used in top level elements to provide the header
toolbar and authentication.
It contains the definition of the following style modules:
- swarming-app-style
+ isolate-app-style
- <style include="shared-style"> contains styles to be shared among all
+ <style include="isolate-shared-style"> contains styles to be shared among all
apps, such as colors.
Properties:
@@ -25,9 +25,7 @@
name: String, the name of the app to be displayed.
auth_headers: Object, Use this as an argument to sk.request to set oauth2 headers.
- permissions: Object, {String:Boolean} of permissions to perform various
- behaviors, such as terminate_bot.
- server_details: Object, containing mutliple Strings including:
+ server_details: Object, containing multiple Strings including:
server_version: what git revision the server is using.
bot_version: A hash of the bot code being distributed. Isn't associated
with any git revisions
@@ -49,11 +47,12 @@
<link rel="import" href="/res/imp/bower_components/paper-menu/paper-menu.html">
<link rel="import" href="/res/imp/bower_components/paper-spinner/paper-spinner-lite.html">
-<link rel="import" href="auth-signin.html">
+<link rel="import" href="/res/imp/shared/auth-signin.html">
+<link rel="import" href="/res/imp/shared/error-toast.html">
+
<link rel="import" href="common-behavior.html">
-<link rel="import" href="error-toast.html">
-<dom-module id="swarming-app">
+<dom-module id="isolate-app">
<template>
<style include="iron-flex">
:host {
@@ -130,9 +129,6 @@
<app-header-layout>
<app-drawer id="mobile_menu">
<div class="menu-item"><a class="left" href="/">Home</a></div>
- <div class="menu-item"><a class="left" href="/botlist">Bot List</a></div>
- <div class="menu-item"><a class="left" href="/tasklist">Task List</a></div>
- <div class="menu-item"><a class="left" href="/oldui">Old UI</a></div>
</app-drawer>
<app-header fixed>
<app-toolbar class$="[[_toolbarClass(client_id)]]">
@@ -146,8 +142,6 @@
<paper-spinner-lite class="left" active="[[_or(busy,_busy1,_busy2)]]"></paper-spinner-lite>
<a class="left" href="/" hidden$="[[!wide_layout]]">Home</a>
- <a class="left" href="/botlist" hidden$="[[!wide_layout]]">Bot List</a>
- <a class="left" href="/tasklist" hidden$="[[!wide_layout]]">Task List</a>
<div class="flex" hidden$="[[!wide_layout]]"></div>
<template is="dom-if" if="[[client_id]]">
<div class="small right">
@@ -183,10 +177,10 @@
</template>
<script>
Polymer({
- is: 'swarming-app',
+ is: 'isolate-app',
behaviors: [
- SwarmingBehaviors.CommonBehavior,
+ IsolateBehaviors.CommonBehavior,
],
properties: {
@@ -207,14 +201,6 @@
observer: "_load"
},
- permissions: {
- type: Object,
- value: function() {
- // If we aren't logged in, default to no permissions.
- return {};
- },
- notify: true,
- },
profile: {
type: Object,
notify: true,
@@ -244,9 +230,7 @@
},
_load: function() {
- this._getJsonAsync("permissions", "/api/swarming/v1/server/permissions",
- "_busy1", this.auth_headers);
- this._getJsonAsync("server_details", "/api/swarming/v1/server/details",
+ this._getJsonAsync("server_details", "/_ah/api/isolateservice/v1/server_details",
"_busy2", this.auth_headers).catch(function(r){
sk.errorMessage("Http response: "+ (r.status || " ") + " " + r.response);
});
@@ -278,7 +262,7 @@
</script>
</dom-module>
-<dom-module id="swarming-app-style">
+<dom-module id="isolate-app-style">
<style>
* {
font-family: sans-serif;
« no previous file with comments | « appengine/isolate/ui/res/imp/common/common-behavior.html ('k') | appengine/isolate/ui/res/imp/index/isolate-index.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698