opendev/gerrit
Code Issues Proposed changes

Merge changes I38ca4bba,I5a9dfde5,I77306324,I89fdf349

Browse Source 
* changes:
  Allow UiActions to perform redirects without JavaScript
  Refactor default change and project callbacks
  Support invoking default GET methods for UiActions
  Rename DefaultActions.invokeProjectAction
This commit is contained in:
Shawn Pearce
2014-03-24 22:52:22 +00:00
committed by Gerrit Code Review
parent b3865f2744 64a3eea30f
commit a9e17d1799
3 changed files with 103 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiResult.java Normal file
View File

@@ -0,0 +1,59 @@
// Copyright (C) 2014 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.webui;
import java.net.URI;
/** Default result for {@link UiAction}s with no JavaScript. */
public class UiResult {
/** Display an alert message to the user. */
public static UiResult alert(String message) {
UiResult r = new UiResult();
r.alert = message;
return r;
}
/** Launch URL in a new window. */
public static UiResult openUrl(URI uri) {
return openUrl(uri.toString());
}
/** Launch URL in a new window. */
public static UiResult openUrl(String url) {
UiResult r = new UiResult();
r.url = url;
r.openWindow = true;
return r;
}
/** Redirect the browser to a new URL. */
public static UiResult redirectUrl(String url) {
UiResult r = new UiResult();
r.url = url;
return r;
}
/** Alert the user with a message. */
protected String alert;
/** If present redirect browser to this URL. */
protected String url;
/** When true open {@link #url} in a new tab/window. */
protected Boolean openWindow;
private UiResult() {
}
}

70
gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java
View File

@@ -21,50 +21,54 @@ import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.client.rpc.NativeString;
import com.google.gerrit.client.rpc.RestApi;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.Window.Location;
import com.google.gwt.user.client.rpc.AsyncCallback;
class DefaultActions {
static void invoke(ChangeInfo change, ActionInfo action, RestApi api) {
final Change.Id id = change.legacy_id();
AsyncCallback<JavaScriptObject> cb = new GerritCallback<JavaScriptObject>() {
@Override
public void onSuccess(JavaScriptObject msg) {
if (NativeString.is(msg)) {
NativeString str = (NativeString) msg;
if (!str.asString().isEmpty()) {
Window.alert(str.asString());
}
}
Gerrit.display(PageLinks.toChange(id));
}
};
invoke(action, api, cb);
invoke(action, api, callback(PageLinks.toChange(change.legacy_id())));
}
static void invokeProjectAction(final Project.NameKey project,
ActionInfo action, RestApi api) {
AsyncCallback<JavaScriptObject> cb = new GerritCallback<JavaScriptObject>() {
static void invoke(Project.NameKey project, ActionInfo action, RestApi api) {
invoke(action, api, callback(PageLinks.toProject(project)));
}
private static AsyncCallback<JavaScriptObject> callback(final String target) {
return new GerritCallback<JavaScriptObject>() {
@Override
public void onSuccess(JavaScriptObject msg) {
if (NativeString.is(msg)) {
NativeString str = (NativeString) msg;
if (!str.asString().isEmpty()) {
Window.alert(str.asString());
}
public void onSuccess(JavaScriptObject in) {
UiResult result = asUiResult(in);
if (result.alert() != null) {
Window.alert(result.alert());
}
Gerrit.display(PageLinks.toProject(project));
if (result.redirectUrl() != null && result.openWindow()) {
Window.open(result.redirectUrl(), "_blank", null);
} else if (result.redirectUrl() != null) {
Location.assign(result.redirectUrl());
} else {
Gerrit.display(target);
}
}
private UiResult asUiResult(JavaScriptObject in) {
if (NativeString.is(in)) {
String str = ((NativeString) in).asString();
return str.isEmpty() ? UiResult.none() : UiResult.alert(str);
}
return in.cast();
}
};
invoke(action, api, cb);
}
private static void invoke(ActionInfo action, RestApi api,
AsyncCallback<JavaScriptObject> cb) {
if ("PUT".equalsIgnoreCase(action.method())) {
if ("GET".equalsIgnoreCase(action.method())) {
api.get(cb);
} else if ("PUT".equalsIgnoreCase(action.method())) {
api.put(JavaScriptObject.createObject(), cb);
} else if ("DELETE".equalsIgnoreCase(action.method())) {
api.delete(cb);
@@ -75,4 +79,16 @@ class DefaultActions {
private DefaultActions() {
}
private static class UiResult extends JavaScriptObject {
static native UiResult alert(String m) /*-{ return {'alert':m} }-*/;
static native UiResult none() /*-{ return {} }-*/;
final native String alert() /*-{ return this.alert }-*/;
final native String redirectUrl() /*-{ return this.url }-*/;
final native boolean openWindow() /*-{ return this.open_window || false }-*/;
protected UiResult() {
}
}
}

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ProjectGlue.java
View File

@@ -35,7 +35,7 @@ public class ProjectGlue {
c.button(button);
ApiGlue.invoke(f, c);
} else {
DefaultActions.invokeProjectAction(project, action, api);
DefaultActions.invoke(project, action, api);
}
}