Reverted UI code, added unit test for the new REST API and updated docs

This commit is contained in:
Kavin Kumar 2016-08-05 01:21:01 +05:30
parent 4d11553638
commit 88a0627840
4 changed files with 59 additions and 8 deletions

View file

@ -392,6 +392,43 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
</tr>
</table>
<br/>
### Get the status of a single paragraph
<table class="table-configuration">
<col width="200">
<tr>
<td>Description</td>
<td>This ```GET``` method gets the status of a single paragraph by the given notebook and paragraph id.
The body field of the returned JSON contains of the array that compose of the paragraph id, paragraph status, paragraph finish date, paragraph started date.
</td>
</tr>
<tr>
<td>URL</td>
<td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[notebookId]/[paragraphId]```</td>
</tr>
<tr>
<td>Success code</td>
<td>200</td>
</tr>
<tr>
<td> Fail code</td>
<td> 500 </td>
</tr>
<tr>
<td> sample JSON response </td>
<td><pre>
{
"status": "OK",
"body": {
"id":"20151121-212654\_766735423",
"status":"FINISHED",
"finished":"Tue Nov 24 14:21:40 KST 2015",
"started":"Tue Nov 24 14:21:39 KST 2015"
}
}</pre></td>
</tr>
</table>
<br/>
### Run a paragraph
<table class="table-configuration">

View file

@ -122,6 +122,28 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
ZeppelinServer.notebook.removeNote(note2.getId(), null);
}
@Test
public void testGetNoteParagraphJobStatus() throws IOException {
Note note1 = ZeppelinServer.notebook.createNote(null);
note1.addParagraph();
String paragraphId = note1.getLastParagraph().getId();
GetMethod get = httpGet("/notebook/job/" + note1.getId() + "/" + paragraphId);
assertThat(get, isAllowed());
Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() {
}.getType());
Map<String, Set<String>> paragraphStatus = (Map<String, Set<String>>) resp.get("body");
// Check id and status have proper value
assertEquals(paragraphStatus.get("id"), paragraphId);
assertEquals(paragraphStatus.get("status"), "READY");
//cleanup
ZeppelinServer.notebook.removeNote(note1.getId(), null);
}
}

View file

@ -82,9 +82,6 @@ limitations under the License.
<li>
<a ng-click="goToSingleParagraph()"><span class="icon-share-alt"></span> Link this paragraph</a>
</li>
<li>
<a ng-click="goToSingleParagraphId()"><span class="icon-share-alt"></span> Get paragraph id</a>
</li>
<li>
<a ng-click="clearParagraphOutput()"><span class="fa fa-eraser"></span> Clear output</a>
</li>

View file

@ -1821,11 +1821,6 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
$window.open(redirectToUrl);
};
$scope.goToSingleParagraphId = function() {
var paragraphId = $scope.paragraph.id;
alert(paragraphId);
};
$scope.showScrollDownIcon = function() {
var doc = angular.element('#p' + $scope.paragraph.id + '_text');
if (doc[0]) {