roleNames = new LinkedHashSet<>();
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java b/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java
index 3381a516c5..97c223c2fc 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java
@@ -109,6 +109,9 @@ import javax.naming.ldap.PagedResultsControl;
* # optional mapping from physical groups to logical application roles
* ldapRealm.rolesByGroup = \ LDN_USERS: user_role,\ NYK_USERS: user_role,\
* HKG_USERS: user_role,\ GLOBAL_ADMIN: admin_role,\ DEMOS: self-install_role
+ *
+ *
# optional list of roles that are allowed to authenticate
+ * ldapRealm.allowedRolesForAuthentication = admin_role,user_role
*
*
ldapRealm.permissionsByRole=\ user_role = *:ToDoItemsJdo:*:*,\
* *:ToDoItem:*:*; \ self-install_role = *:ToDoItemsFixturesService:install:* ;
@@ -176,6 +179,7 @@ public class LdapRealm extends JndiLdapRealm {
private String memberAttributeValueSuffix = "";
private final Map rolesByGroup = new LinkedHashMap();
+ private final List allowedRolesForAuthentication = new ArrayList();
private final Map> permissionsByRole =
new LinkedHashMap>();
@@ -202,6 +206,29 @@ public class LdapRealm extends JndiLdapRealm {
}
}
+ /**
+ * This overrides the implementation of queryForAuthenticationInfo inside JndiLdapRealm.
+ * In addition to calling the super method for authentication it also tries to validate
+ * if this user has atleast one of the allowed roles for authentication. In case the property
+ * allowedRolesForAuthentication is empty this check always returns true.
+ *
+ * @param token the submitted authentication token that triggered the authentication attempt.
+ * @param ldapContextFactory factory used to retrieve LDAP connections.
+ * @return AuthenticationInfo instance representing the authenticated user's information.
+ * @throws NamingException if any LDAP errors occur.
+ */
+ @Override
+ protected AuthenticationInfo queryForAuthenticationInfo(AuthenticationToken token,
+ LdapContextFactory ldapContextFactory)
+ throws NamingException {
+ AuthenticationInfo info = super.queryForAuthenticationInfo(token, ldapContextFactory);
+ // Credentials were verified. Verify that the principal has all allowedRulesForAuthentication
+ if (!hasAllowedAuthenticationRules(info.getPrincipals(), ldapContextFactory)) {
+ throw new NamingException("Principal does not have any of the allowedRolesForAuthentication");
+ }
+ return info;
+ }
+
/**
* Get groups from LDAP.
*
@@ -231,6 +258,23 @@ public class LdapRealm extends JndiLdapRealm {
return simpleAuthorizationInfo;
}
+ private boolean hasAllowedAuthenticationRules(PrincipalCollection principals,
+ final LdapContextFactory ldapContextFactory)
+ throws NamingException {
+ boolean allowed = allowedRolesForAuthentication.isEmpty();
+ if (!allowed) {
+ Set roles = getRoles(principals, ldapContextFactory);
+ for (String allowedRole: allowedRolesForAuthentication) {
+ if (roles.contains(allowedRole)) {
+ log.debug("Allowed role for user [" + allowedRole + "] found.");
+ allowed = true;
+ break;
+ }
+ }
+ }
+ return allowed;
+ }
+
private Set getRoles(PrincipalCollection principals,
final LdapContextFactory ldapContextFactory)
throws NamingException {
@@ -524,6 +568,10 @@ public class LdapRealm extends JndiLdapRealm {
this.memberAttributeValueSuffix = suffix;
}
+ public void setAllowedRolesForAuthentication(List allowedRolesForAuthencation) {
+ this.allowedRolesForAuthentication.addAll(allowedRolesForAuthencation);
+ }
+
public void setRolesByGroup(Map rolesByGroup) {
this.rolesByGroup.putAll(rolesByGroup);
}
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
index 8ca04762d3..9c511d46fe 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
@@ -588,17 +588,17 @@ public class NotebookRestApi {
throws IOException, IllegalArgumentException {
LOG.info("run note jobs {} ", noteId);
Note note = notebook.getNote(noteId);
+ AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
checkIfNoteIsNotNull(note);
checkIfUserCanWrite(noteId, "Insufficient privileges you cannot run job for this note");
try {
- note.runAll();
+ note.runAll(subject);
} catch (Exception ex) {
LOG.error("Exception from run", ex);
return new JsonResponse<>(Status.PRECONDITION_FAILED,
ex.getMessage() + "- Not selected or Invalid Interpreter bind").build();
}
-
return new JsonResponse<>(Status.OK).build();
}
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/ZeppelinRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/ZeppelinRestApi.java
index 9d9f5510a0..42edd235ed 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/ZeppelinRestApi.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/ZeppelinRestApi.java
@@ -17,12 +17,18 @@
package org.apache.zeppelin.rest;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.apache.zeppelin.annotation.ZeppelinApi;
import org.apache.zeppelin.server.JsonResponse;
import org.apache.zeppelin.util.Util;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
/**
@@ -52,4 +58,25 @@ public class ZeppelinRestApi {
public Response getVersion() {
return new JsonResponse<>(Response.Status.OK, "Zeppelin version", Util.getVersion()).build();
}
+
+ /**
+ * Set the log level for root logger
+ * @param request
+ * @param logLevel new log level for Rootlogger
+ * @return
+ */
+ @PUT
+ @Path("log/level/{logLevel}")
+ public Response changeRootLogLevel(@Context HttpServletRequest request,
+ @PathParam("logLevel") String logLevel) {
+ Level level = Level.toLevel(logLevel);
+ if (logLevel.toLowerCase().equalsIgnoreCase(level.toString().toLowerCase())) {
+ Logger.getRootLogger().setLevel(level);
+ return new JsonResponse<>(Response.Status.OK).build();
+ } else {
+ return new JsonResponse<>(Response.Status.NOT_ACCEPTABLE,
+ "Please check LOG level specified. Valid values: DEBUG, ERROR, FATAL, "
+ + "INFO, TRACE, WARN").build();
+ }
+ }
}
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 2b67dfdc3a..826ae5f863 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -27,7 +27,6 @@ import javax.servlet.DispatcherType;
import javax.ws.rs.core.Application;
import org.apache.commons.lang.StringUtils;
-import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
import org.apache.shiro.web.env.EnvironmentLoaderListener;
import org.apache.shiro.web.servlet.ShiroFilter;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
@@ -286,7 +285,7 @@ public class ZeppelinServer extends Application {
final ServletHolder servletHolder = new ServletHolder(notebookWsServer);
servletHolder.setInitParameter("maxTextMessageSize", maxTextMessageSize);
- final ServletContextHandler cxfContext = new ServletContextHandler(
+ final ServletContextHandler context = new ServletContextHandler(
ServletContextHandler.SESSIONS);
webapp.addServlet(servletHolder, "/ws/*");
@@ -316,13 +315,15 @@ public class ZeppelinServer extends Application {
private static void setupRestApiContextHandler(WebAppContext webapp,
ZeppelinConfiguration conf) {
- final ServletHolder cxfServletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- cxfServletHolder.setInitParameter("javax.ws.rs.Application", ZeppelinServer.class.getName());
- cxfServletHolder.setName("rest");
- cxfServletHolder.setForcedPath("rest");
+ final ServletHolder servletHolder = new ServletHolder(
+ new org.glassfish.jersey.servlet.ServletContainer());
+
+ servletHolder.setInitParameter("javax.ws.rs.Application", ZeppelinServer.class.getName());
+ servletHolder.setName("rest");
+ servletHolder.setForcedPath("rest");
webapp.setSessionHandler(new SessionHandler());
- webapp.addServlet(cxfServletHolder, "/api/*");
+ webapp.addServlet(servletHolder, "/api/*");
String shiroIniPath = conf.getShiroPath();
if (!StringUtils.isBlank(shiroIniPath)) {
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index 87d0009473..5588be0218 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -19,15 +19,9 @@ package org.apache.zeppelin.socket;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.regex.Matcher;
@@ -1696,6 +1690,23 @@ public class NotebookServer extends WebSocketServlet
p.setErrorMessage((String) fromMessage.get("errorMessage"));
p.setStatusWithoutNotification(status);
+ // Spell uses ISO 8601 formatted string generated from moment
+ String dateStarted = (String) fromMessage.get("dateStarted");
+ String dateFinished = (String) fromMessage.get("dateFinished");
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
+
+ try {
+ p.setDateStarted(df.parse(dateStarted));
+ } catch (ParseException e) {
+ LOG.error("Failed parse dateStarted", e);
+ }
+
+ try {
+ p.setDateFinished(df.parse(dateFinished));
+ } catch (ParseException e) {
+ LOG.error("Failed parse dateFinished", e);
+ }
+
addNewParagraphIfLastParagraphIsExecuted(note, p);
if (!persistNoteWithAuthInfo(conn, note, p)) {
return;
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
index dcb5a1f339..19eb980c61 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
@@ -34,6 +34,7 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadContext;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
+import org.apache.zeppelin.realm.ActiveDirectoryGroupRealm;
import org.apache.zeppelin.realm.LdapRealm;
import org.mortbay.log.Log;
import org.slf4j.Logger;
@@ -133,6 +134,9 @@ public class SecurityUtils {
} else if (name.equals("org.apache.zeppelin.realm.LdapRealm")) {
allRoles = ((LdapRealm) realm).getListRoles();
break;
+ } else if (name.equals("org.apache.zeppelin.realm.ActiveDirectoryGroupRealm")) {
+ allRoles = ((ActiveDirectoryGroupRealm) realm).getListRoles();
+ break;
}
}
if (allRoles != null) {
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
index add23ac0fb..fa5bed994b 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
@@ -253,7 +253,6 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
} catch (Exception e) {
handleException("Exception in ParagraphActionsIT while testDisableParagraphRunButton ", e);
}
-
}
@Test
@@ -594,6 +593,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
CoreMatchers.equalTo("Howdy "));
Select dropDownMenu = new Select(driver.findElement(By.xpath("(" + (getParagraphXPath(1) + "//select)[1]"))));
+
dropDownMenu.selectByVisibleText("Alice");
collector.checkThat("After selection in drop down menu, output should display the newly selected option",
driver.findElement(By.xpath(getParagraphXPath(1) + "//div[contains(@class, 'text plainTextContent')]")).getText(),
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java
index 2cc6a6c8a2..0aa03541ff 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java
@@ -32,6 +32,8 @@ import org.openqa.selenium.WebElement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+
public class SparkParagraphIT extends AbstractZeppelinIT {
private static final Logger LOG = LoggerFactory.getLogger(SparkParagraphIT.class);
@@ -182,10 +184,16 @@ public class SparkParagraphIT extends AbstractZeppelinIT {
);
}
- WebElement paragraph1Result = driver.findElement(By.xpath(
- getParagraphXPath(1) + "//div[contains(@id,\"_graph\")]/div/div/div/div/div[1]"));
+ // Age, Job, Marital, Education, Balance
+ List tableHeaders = driver.findElements(By.cssSelector("span.ui-grid-header-cell-label"));
+ String headerNames = "";
+
+ for(WebElement header : tableHeaders) {
+ headerNames += header.getText().toString() + "|";
+ }
+
collector.checkThat("Paragraph from SparkParagraphIT of testSqlSpark result: ",
- paragraph1Result.getText().toString(), CoreMatchers.equalTo("age\n▼\njob\n▼\nmarital\n▼\neducation\n▼\nbalance\n▼\n30 unemployed married primary 1787"));
+ headerNames, CoreMatchers.equalTo("Age|Job|Marital|Education|Balance|"));
} catch (Exception e) {
handleException("Exception in SparkParagraphIT while testSqlSpark", e);
}
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
index 7ea2774c9d..00b82fdd6f 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
@@ -429,13 +429,19 @@ public abstract class AbstractTestRestApi {
LOG.info("{} - {}", postMethod.getStatusCode(), postMethod.getStatusText());
Pattern pattern = Pattern.compile("JSESSIONID=([a-zA-Z0-9-]*)");
Header[] setCookieHeaders = postMethod.getResponseHeaders("Set-Cookie");
+ String jsessionId = null;
for (Header setCookie : setCookieHeaders) {
java.util.regex.Matcher matcher = pattern.matcher(setCookie.toString());
if (matcher.find()) {
- return matcher.group(1);
+ jsessionId = matcher.group(1);
}
}
- return StringUtils.EMPTY;
+
+ if (jsessionId != null) {
+ return jsessionId;
+ } else {
+ return StringUtils.EMPTY;
+ }
}
protected static boolean userAndPasswordAreNotBlank(String user, String pwd) {
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
index 4ee5a0078a..5093cb838f 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
@@ -167,7 +167,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
assertEquals("paragraph col width check failed", 9.0, p.getConfig().get("colWidth"));
assertTrue("paragraph show title check failed", ((boolean) p.getConfig().get("title")));
Map graph = ((List)p.getConfig().get("results")).get(0);
- String mode = graph.get("mode").toString();
+ String mode = ((Map)graph.get("graph")).get("mode").toString();
assertEquals("paragraph graph mode check failed", "pieChart", mode);
}
}
diff --git a/zeppelin-web/.eslintrc b/zeppelin-web/.eslintrc
index 1fe3fa5e7d..6dca5c8982 100644
--- a/zeppelin-web/.eslintrc
+++ b/zeppelin-web/.eslintrc
@@ -58,6 +58,7 @@
"no-undef": 2,
"no-unused-vars": [2, { "vars": "local", "args": "none" }],
"strict": [2, "global"],
- "max-len": [2, {"code": 120, "ignoreComments": true, "ignoreRegExpLiterals": true}]
+ "max-len": [2, {"code": 120, "ignoreComments": true, "ignoreRegExpLiterals": true}],
+ "linebreak-style": 0
}
}
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index 30fc5f0268..8e9a1e590c 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -30,8 +30,6 @@
"ngtoast": "~2.0.0",
"ng-focus-if": "~1.0.2",
"bootstrap3-dialog": "bootstrap-dialog#~1.34.7",
- "handsontable": "~0.24.2",
- "moment-duration-format": "^1.3.0",
"select2": "^4.0.3",
"MathJax": "2.7.0",
"ngclipboard": "^1.1.1"
diff --git a/zeppelin-web/karma.conf.js b/zeppelin-web/karma.conf.js
index f47741aee5..b163b56f38 100644
--- a/zeppelin-web/karma.conf.js
+++ b/zeppelin-web/karma.conf.js
@@ -81,11 +81,6 @@ module.exports = function(config) {
'bower_components/ngtoast/dist/ngToast.js',
'bower_components/ng-focus-if/focusIf.js',
'bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js',
- 'bower_components/zeroclipboard/dist/ZeroClipboard.js',
- 'bower_components/moment/moment.js',
- 'bower_components/pikaday/pikaday.js',
- 'bower_components/handsontable/dist/handsontable.js',
- 'bower_components/moment-duration-format/lib/moment-duration-format.js',
'bower_components/select2/dist/js/select2.js',
'bower_components/MathJax/MathJax.js',
'bower_components/clipboard/dist/clipboard.js',
diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
index a992a0f79d..ec62003793 100644
--- a/zeppelin-web/package.json
+++ b/zeppelin-web/package.json
@@ -9,8 +9,8 @@
"clean": "rimraf dist && rimraf .tmp",
"postinstall": "bower install --silent",
"prebuild": "npm-run-all clean lint:once",
- "build:dist": "grunt pre-webpack-dist && webpack && grunt post-webpack-dist",
- "build:ci": "grunt pre-webpack-ci && webpack && grunt post-webpack-dist",
+ "build:dist": "npm-run-all prebuild && grunt pre-webpack-dist && webpack && grunt post-webpack-dist",
+ "build:ci": "npm-run-all prebuild && grunt pre-webpack-ci && webpack && grunt post-webpack-dist",
"lint:watch": "esw --watch src",
"lint:once": "eslint src",
"predev": "grunt pre-webpack-dev",
@@ -18,14 +18,18 @@
"dev:helium": "HELIUM_BUNDLE_DEV=true webpack-dev-server --hot",
"dev:watch": "grunt watch-webpack-dev",
"dev": "npm-run-all --parallel dev:server lint:watch dev:watch",
- "pretest": "npm install karma-phantomjs-launcher babel-polyfill",
"test": "karma start karma.conf.js"
},
"dependencies": {
+ "angular-viewport-watch": "github:shahata/angular-viewport-watch",
"github-markdown-css": "2.6.0",
+ "angular-ui-grid": "^4.0.4",
"grunt-angular-templates": "^0.5.7",
"grunt-dom-munger": "^3.4.0",
- "headroom.js": "^0.9.3"
+ "headroom.js": "^0.9.3",
+ "moment": "^2.18.1",
+ "moment-duration-format": "^1.3.0",
+ "scrollmonitor": "^1.2.3"
},
"devDependencies": {
"autoprefixer": "^6.5.4",
@@ -73,6 +77,7 @@
"karma-coverage": "^1.1.1",
"karma-jasmine": "~1.0.2",
"karma-sourcemap-loader": "^0.3.7",
+ "karma-phantomjs-launcher": "^1.0.4",
"karma-webpack": "^1.8.1",
"load-grunt-tasks": "^0.4.0",
"ng-annotate-loader": "^0.2.0",
diff --git a/zeppelin-web/src/WEB-INF/web.xml b/zeppelin-web/src/WEB-INF/web.xml
index e2514c9d4c..4356b7c080 100644
--- a/zeppelin-web/src/WEB-INF/web.xml
+++ b/zeppelin-web/src/WEB-INF/web.xml
@@ -23,11 +23,12 @@
zeppelin-web
default
- com.sun.jersey.spi.container.servlet.ServletContainer
-
- com.sun.jersey.config.property.packages
- org.apache.zeppelin.rest
-
+ org.glassfish.jersey.servlet.ServletContainer
+
+ jersey.config.server.provider.packages
+ org.apache.zeppelin.rest
+
+
1
diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js
index aed7468631..b923aeb858 100644
--- a/zeppelin-web/src/app/app.js
+++ b/zeppelin-web/src/app/app.js
@@ -18,6 +18,12 @@
import 'headroom.js'
import 'headroom.js/dist/angular.headroom'
+import 'scrollmonitor/scrollMonitor.js'
+import 'angular-viewport-watch/angular-viewport-watch.js'
+
+import 'angular-ui-grid/ui-grid.css'
+import 'angular-ui-grid'
+
const requiredModules = [
'ngCookies',
'ngAnimate',
@@ -37,6 +43,17 @@ const requiredModules = [
'focus-if',
'ngResource',
'ngclipboard',
+ 'angularViewportWatch',
+ 'ui.grid',
+ 'ui.grid.exporter',
+ 'ui.grid.edit', 'ui.grid.rowEdit',
+ 'ui.grid.selection',
+ 'ui.grid.cellNav', 'ui.grid.pinning',
+ 'ui.grid.grouping',
+ 'ui.grid.emptyBaseLayer',
+ 'ui.grid.resizeColumns', 'ui.grid.moveColumns',
+ 'ui.grid.pagination',
+ 'ui.grid.saveState',
]
// headroom should not be used for CI, since we have to execute some integration tests.
diff --git a/zeppelin-web/src/app/configuration/configuration.controller.js b/zeppelin-web/src/app/configuration/configuration.controller.js
index e4f4e5d657..6b4f308fc5 100644
--- a/zeppelin-web/src/app/configuration/configuration.controller.js
+++ b/zeppelin-web/src/app/configuration/configuration.controller.js
@@ -34,7 +34,7 @@ function ConfigurationCtrl ($scope, $rootScope, $http, baseUrlSrv, ngToast) {
timeout: '3000'
})
setTimeout(function () {
- window.location.replace('/')
+ window.location = baseUrlSrv.getBase()
}, 3000)
}
console.log('Error %o %o', status, data.message)
diff --git a/zeppelin-web/src/app/credential/credential.controller.js b/zeppelin-web/src/app/credential/credential.controller.js
index eb649c8aa2..89cb1cfd36 100644
--- a/zeppelin-web/src/app/credential/credential.controller.js
+++ b/zeppelin-web/src/app/credential/credential.controller.js
@@ -40,7 +40,7 @@ function CredentialCtrl ($scope, $rootScope, $http, baseUrlSrv, ngToast) {
timeout: '3000'
})
setTimeout(function () {
- window.location.replace('/')
+ window.location = baseUrlSrv.getBase()
}, 3000)
}
console.log('Error %o %o', status, data.message)
diff --git a/zeppelin-web/src/app/handsontable/handsonHelper.js b/zeppelin-web/src/app/handsontable/handsonHelper.js
deleted file mode 100644
index 8d724c0e4b..0000000000
--- a/zeppelin-web/src/app/handsontable/handsonHelper.js
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * HandsonHelper class
- */
-export default class HandsonHelper {
- constructor (columns, rows, comment) {
- this.columns = columns || []
- this.rows = rows || []
- this.comment = comment || ''
- this._numericValidator = this._numericValidator.bind(this)
- }
-
- getHandsonTableConfig (columns, columnNames, resultRows) {
- let self = this
- return {
- colHeaders: columnNames,
- data: resultRows,
- rowHeaders: false,
- stretchH: 'all',
- sortIndicator: true,
- columns: columns,
- columnSorting: true,
- contextMenu: false,
- manualColumnResize: true,
- manualRowResize: true,
- readOnly: true,
- readOnlyCellClassName: '',
- fillHandle: false,
- fragmentSelection: true,
- disableVisualSelection: true,
- cells: function (ro, co, pro) {
- let cellProperties = {}
- let colType = columns[co].type
- cellProperties.renderer = function (instance, td, row, col, prop, value, cellProperties) {
- self._cellRenderer(instance, td, row, col, prop, value, cellProperties, colType)
- }
- return cellProperties
- },
- afterGetColHeader: function (col, TH) {
- let instance = this
- let menu = self._buildDropDownMenu(columns[col].type)
- let button = self._buildTypeSwitchButton()
-
- self._addButtonMenuEvent(button, menu)
-
- Handsontable.Dom.addEvent(menu, 'click', function (event) {
- if (event.target.nodeName === 'LI') {
- self._setColumnType(columns, event.target.data.colType, instance, col)
- }
- })
- if (TH.firstChild.lastChild.nodeName === 'BUTTON') {
- TH.firstChild.removeChild(TH.firstChild.lastChild)
- }
- TH.firstChild.appendChild(button)
- TH.style['white-space'] = 'normal'
- }
- }
- }
-
- /*
- ** Private Service Functions
- */
-
- _addButtonMenuEvent (button, menu) {
- Handsontable.Dom.addEvent(button, 'click', function (event) {
- let changeTypeMenu
- let position
- let removeMenu
-
- document.body.appendChild(menu)
-
- event.preventDefault()
- event.stopImmediatePropagation()
-
- changeTypeMenu = document.querySelectorAll('.changeTypeMenu')
-
- for (let i = 0, len = changeTypeMenu.length; i < len; i++) {
- changeTypeMenu[i].style.display = 'none'
- }
- menu.style.display = 'block'
- position = button.getBoundingClientRect()
-
- menu.style.top = (position.top + (window.scrollY || window.pageYOffset)) + 2 + 'px'
- menu.style.left = (position.left) + 'px'
-
- removeMenu = function (event) {
- if (menu.parentNode) {
- menu.parentNode.removeChild(menu)
- }
- }
- Handsontable.Dom.removeEvent(document, 'click', removeMenu)
- Handsontable.Dom.addEvent(document, 'click', removeMenu)
- })
- }
-
- _buildDropDownMenu (activeCellType) {
- let menu = document.createElement('UL')
- let types = ['text', 'numeric', 'date']
- let item
-
- menu.className = 'changeTypeMenu'
-
- for (let i = 0, len = types.length; i < len; i++) {
- item = document.createElement('LI')
- if ('innerText' in item) {
- item.innerText = types[i]
- } else {
- item.textContent = types[i]
- }
-
- item.data = {'colType': types[i]}
-
- if (activeCellType === types[i]) {
- item.className = 'active'
- }
- menu.appendChild(item)
- }
-
- return menu
- }
-
- _buildTypeSwitchButton () {
- let button = document.createElement('BUTTON')
-
- button.innerHTML = '\u25BC'
- button.className = 'changeType'
-
- return button
- }
-
- _isNumeric (value) {
- if (!isNaN(value)) {
- if (value.length !== 0) {
- if (Number(value) <= Number.MAX_SAFE_INTEGER && Number(value) >= Number.MIN_SAFE_INTEGER) {
- return true
- }
- }
- }
- return false
- }
-
- _cellRenderer (instance, td, row, col, prop, value, cellProperties, colType) {
- if (colType === 'numeric' && this._isNumeric(value)) {
- cellProperties.format = '0,0.[00000]'
- td.style.textAlign = 'left'
- // eslint-disable-next-line prefer-rest-params
- Handsontable.renderers.NumericRenderer.apply(this, arguments)
- } else if (value.length > '%html'.length && value.substring(0, '%html '.length) === '%html ') {
- td.innerHTML = value.substring('%html'.length)
- } else {
- // eslint-disable-next-line prefer-rest-params
- Handsontable.renderers.TextRenderer.apply(this, arguments)
- }
- }
-
- _dateValidator (value, callback) {
- let d = moment(value)
- return callback(d.isValid())
- }
-
- _numericValidator (value, callback) {
- return callback(this._isNumeric(value))
- }
-
- _setColumnType (columns, type, instance, col) {
- columns[col].type = type
- this._setColumnValidator(columns, col)
- instance.updateSettings({columns: columns})
- instance.validateCells(null)
- if (this._isColumnSorted(instance, col)) {
- instance.sort(col, instance.sortOrder)
- }
- }
-
- _isColumnSorted (instance, col) {
- return instance.sortingEnabled && instance.sortColumn === col
- }
-
- _setColumnValidator (columns, col) {
- if (columns[col].type === 'numeric') {
- columns[col].validator = this._numericValidator
- } else if (columns[col].type === 'date') {
- columns[col].validator = this._dateValidator
- } else {
- columns[col].validator = null
- }
- }
-}
diff --git a/zeppelin-web/src/app/home/home.css b/zeppelin-web/src/app/home/home.css
index ce30e6642d..03ae4c1576 100644
--- a/zeppelin-web/src/app/home/home.css
+++ b/zeppelin-web/src/app/home/home.css
@@ -32,14 +32,14 @@ body {
background: white;
}
-.displayNavBar {
- display: inline !important;
-}
-
body.asIframe {
padding-top: 0;
}
+.displayNavBar {
+ display: inline !important;
+}
+
body .navbar {
margin-bottom: 0;
}
@@ -59,58 +59,6 @@ body .navbar {
text-decoration: none;
}
-.navbar-inverse {
- background: #3071a9;
- color: #fff;
- border-color: #3071a9;
- font-size: 18px;
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
- color: #fff;
- background: #3071a9;
-}
-
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
- background: #3071a9;
-}
-
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
- color: #fff;
- background: rgba(0, 0, 0, 0.2);
-
-}
-
-.navbar-inverse .navbar-toggle {
- border-color: #FFFFFF;
-}
-
-.navbar-inverse .navbar-nav > .active > a,
-.navbar-inverse .navbar-nav > .active > a:hover,
-.navbar-inverse .navbar-nav > .active > a:focus {
- color: #fff;
- background: #080808;
-}
-
-.navbar-inverse .navbar-nav > li > a {
- color: #FFFFFF;
-}
-
-.navbar-inverse .navbar-brand {
- color: #fff;
- text-decoration: none;
- font-family: 'Patua One', cursive;
- font-size: 32px;
-}
-
-a.navbar-brand:hover {
- color: #fff !important;
-}
-
/* Css for the Notebook Dropdown */
.expandable ul {
@@ -248,45 +196,6 @@ a.navbar-brand:hover {
border-radius:6px 0 6px 6px;
}
-@media (max-width: 767px) {
- .navbar-inverse .navbar-nav .open .dropdown-menu > li > a,
- #notebook-list li a {
- color: #D3D3D3;
- }
-
- .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a,
- #notebook-list li a {
- padding: 5px 15px 5px 25px;
- line-height: 20px;
- }
-
- .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a {
- color: #D3D3D3;
- }
-
- .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a:hover,
- .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a:focus,
- #notebook-list li a:hover {
- color: #fff;
- background: transparent;
- }
-
- .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > .active > a,
- .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > .active > a:hover,
- .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > .active > a:focus {
- color: #fff;
- background: #080808;
- }
-
- .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
- background: #3071A9;
- }
-
- .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form {
- border-color: #3071A9;
- }
-}
-
#main {
padding: 10px;
height: 100%;
@@ -335,14 +244,6 @@ a.navbar-brand:hover {
border-color: #357ebd;
}
-.username {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- max-width: 120px;
- display: inline-block;
-}
-
.server-connected {
padding-top: 12px;
color: #00CC00;
@@ -455,40 +356,6 @@ This part should be removed when new version of bootstrap handles this issue.
z-index: 10003 !important;
}
-#noteImportModal .modal-body {
- min-height: 420px;
- overflow: hidden;
-}
-
-#noteImportModal .modal-footer {
- min-height: 65px;
-}
-
-#noteImportModal .display-inline a {
- background: #fff;
- border: 1px solid #ddd;
- border-radius: 5px;
- color: #999;
- cursor: pointer;
- display: block;
- float: left;
- font-size: 98px;
- height: 240px;
- margin: 0 10px 16px;
- padding-top: 60px;
- text-align: center;
- text-decoration: none;
- width: 264px;
-}
-
-#noteImportModal .display-inline a:hover {
- background: #eee;
-}
-
-#noteImportModal .display-inline a p {
- font-size: 14px;
-}
-
/* ------------------------------------------- */
/* Slide Top
/* ------------------------------------------- */
@@ -824,28 +691,3 @@ This part should be removed when new version of bootstrap handles this issue.
.bootstrap-dialog.type-primary .modal-header {
background: #3071a9;
}
-
-/* About Zeppelin */
-.about {
- height: 200px;
- padding: 25px;
-}
-
-.about .logo {
- padding-top: 30px;
-}
-
-.about .logo img {
- width: 95%;
-}
-
-.about .content {
- text-align: center;
-}
-
-.about .content h3 {
- font-family: 'Patua One';
- color: #3071A9;
- font-size: 30px;
- margin: 0 auto;
-}
diff --git a/zeppelin-web/src/app/home/notebook-template.html b/zeppelin-web/src/app/home/notebook-template.html
index 0456a39ec6..4c287de69c 100644
--- a/zeppelin-web/src/app/home/notebook-template.html
+++ b/zeppelin-web/src/app/home/notebook-template.html
@@ -56,7 +56,7 @@ limitations under the License.
-
diff --git a/zeppelin-web/src/app/interpreter/interpreter.controller.js b/zeppelin-web/src/app/interpreter/interpreter.controller.js
index 330c2adadf..6afc077c13 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.controller.js
+++ b/zeppelin-web/src/app/interpreter/interpreter.controller.js
@@ -101,7 +101,7 @@ function InterpreterCtrl ($rootScope, $scope, $http, baseUrlSrv, ngToast, $timeo
timeout: '3000'
})
setTimeout(function () {
- window.location.replace('/')
+ window.location = baseUrlSrv.getBase()
}, 3000)
}
console.log('Error %o %o', status, data.message)
diff --git a/zeppelin-web/src/app/jobmanager/jobs/job.controller.js b/zeppelin-web/src/app/jobmanager/jobs/job.controller.js
index e1ce02ddc2..e811f7bdbd 100644
--- a/zeppelin-web/src/app/jobmanager/jobs/job.controller.js
+++ b/zeppelin-web/src/app/jobmanager/jobs/job.controller.js
@@ -12,6 +12,8 @@
* limitations under the License.
*/
+import moment from 'moment'
+
import { ParagraphStatus, } from '../../notebook/paragraph/paragraph.status'
angular.module('zeppelinWebApp').controller('JobCtrl', JobCtrl)
diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html
index e83e05e190..5b600f2611 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -156,7 +156,7 @@ limitations under the License.
{{revision.message}}
- {{moment.unix(revision.time).format('MMMM Do YYYY, h:mm a')}}
+ {{formatRevisionDate(revision.time)}}
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index 4b02f1a979..a5126642d0 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -12,6 +12,8 @@
* limitations under the License.
*/
+import moment from 'moment'
+
import { isParagraphRunning, } from './paragraph/paragraph.status'
angular.module('zeppelinWebApp').controller('NotebookCtrl', NotebookCtrl)
@@ -25,7 +27,6 @@ function NotebookCtrl ($scope, $route, $routeParams, $location, $rootScope,
ngToast.dismiss()
$scope.note = null
- $scope.moment = moment
$scope.editorToggled = false
$scope.tableToggled = false
$scope.viewOnly = false
@@ -42,6 +43,10 @@ function NotebookCtrl ($scope, $route, $routeParams, $location, $rootScope,
{name: '1d', value: '0 0 0 * * ?'}
]
+ $scope.formatRevisionDate = function(date) {
+ return moment.unix(date).format('MMMM Do YYYY, h:mm a')
+ }
+
$scope.interpreterSettings = []
$scope.interpreterBindings = []
$scope.isNoteDirty = null
@@ -223,7 +228,7 @@ function NotebookCtrl ($scope, $route, $routeParams, $location, $rootScope,
}
$scope.$on('listRevisionHistory', function (event, data) {
- console.log('received list of revisions %o', data)
+ console.debug('received list of revisions %o', data)
$scope.noteRevisions = data.revisionList
$scope.noteRevisions.splice(0, 0, {
id: 'Head',
@@ -464,10 +469,12 @@ function NotebookCtrl ($scope, $route, $routeParams, $location, $rootScope,
let addPara = function (paragraph, index) {
$scope.note.paragraphs.splice(index, 0, paragraph)
- _.each($scope.note.paragraphs, function (para) {
+ $scope.note.paragraphs.map(para => {
if (para.id === paragraph.id) {
para.focus = true
- $scope.$broadcast('focusParagraph', para.id, 0, false)
+
+ // we need `$timeout` since angular DOM might not be initialized
+ $timeout(() => { $scope.$broadcast('focusParagraph', para.id, 0, false) })
}
})
}
diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html
index 293e2c2bd6..63ef98b94d 100644
--- a/zeppelin-web/src/app/notebook/notebook.html
+++ b/zeppelin-web/src/app/notebook/notebook.html
@@ -112,7 +112,8 @@ limitations under the License.
ng-controller="ParagraphCtrl"
ng-init="init(currentParagraph, note)"
ng-class="columnWidthClass(currentParagraph.config.colWidth)"
- style="margin: 0; padding: 0;">
+ style="margin: 0; padding: 0;"
+ viewport-watch>
+
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html
index 222b3b3a6a..5523609eb9 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html
@@ -44,11 +44,12 @@ limitations under the License.
-
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index a6564d4a0d..00be23efbb 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -17,6 +17,9 @@ import {
ParagraphStatus, isParagraphRunning,
} from './paragraph.status'
+import moment from 'moment'
+require('moment-duration-format')
+
const ParagraphExecutor = {
SPELL: 'SPELL',
INTERPRETER: 'INTERPRETER',
@@ -251,12 +254,15 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
$scope.propagateSpellResult = function (paragraphId, paragraphTitle,
paragraphText, paragraphResults,
paragraphStatus, paragraphErrorMessage,
- paragraphConfig, paragraphSettingsParam) {
+ paragraphConfig, paragraphSettingsParam,
+ paragraphDateStarted, paragraphDateFinished) {
websocketMsgSrv.paragraphExecutedBySpell(
paragraphId, paragraphTitle,
paragraphText, paragraphResults,
paragraphStatus, paragraphErrorMessage,
- paragraphConfig, paragraphSettingsParam)
+ paragraphConfig, paragraphSettingsParam,
+ paragraphDateStarted, paragraphDateFinished
+ )
}
$scope.handleSpellError = function (paragraphText, error,
@@ -266,11 +272,16 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
$scope.paragraph.errorMessage = errorMessage
console.error('Failed to execute interpret() in spell\n', error)
+ if (!propagated) {
+ $scope.paragraph.dateFinished = $scope.getFormattedParagraphTime()
+ }
+
if (!propagated) {
$scope.propagateSpellResult(
$scope.paragraph.id, $scope.paragraph.title,
paragraphText, [], $scope.paragraph.status, errorMessage,
- $scope.paragraph.config, $scope.paragraph.settings.params)
+ $scope.paragraph.config, $scope.paragraph.settings.params,
+ $scope.paragraph.dateStarted, $scope.paragraph.dateFinished)
}
}
@@ -305,12 +316,17 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
const resultsMsg = $scope.spellTransaction.resultsMsg
const paragraphText = $scope.spellTransaction.paragraphText
+ if (!propagated) {
+ $scope.paragraph.dateFinished = $scope.getFormattedParagraphTime()
+ }
+
if (!propagated) {
const propagable = SpellResult.createPropagable(resultsMsg)
$scope.propagateSpellResult(
$scope.paragraph.id, $scope.paragraph.title,
paragraphText, propagable, status, '',
- $scope.paragraph.config, $scope.paragraph.settings.params)
+ $scope.paragraph.config, $scope.paragraph.settings.params,
+ $scope.paragraph.dateStarted, $scope.paragraph.dateFinished)
}
}
@@ -328,6 +344,10 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
// remove leading spaces
const textWithoutMagic = splited[1].replace(/^\s+/g, '')
+ if (!propagated) {
+ $scope.paragraph.dateStarted = $scope.getFormattedParagraphTime()
+ }
+
// handle actual result message in promise
heliumService.executeSpell(magic, textWithoutMagic)
.then(resultsMsg => {
@@ -627,10 +647,10 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
$scope.editor.renderer.setShowGutter($scope.paragraph.config.lineNumbers)
$scope.editor.setShowFoldWidgets(false)
$scope.editor.setHighlightActiveLine(false)
- $scope.editor.setHighlightGutterLine(false)
$scope.editor.getSession().setUseWrapMode(true)
$scope.editor.setTheme('ace/theme/chrome')
$scope.editor.setReadOnly($scope.isRunning($scope.paragraph))
+ $scope.editor.setHighlightActiveLine($scope.paragraphFocused)
if ($scope.paragraphFocused) {
let prefix = '%' + getInterpreterName($scope.paragraph.text)
@@ -815,20 +835,16 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
switch (keyCode) {
case 38:
- keyBindingEditorFocusAction(ROW_UP)
+ if (!e.shiftKey) { keyBindingEditorFocusAction(ROW_UP) }
break
case 80:
- if (e.ctrlKey && !e.altKey) {
- keyBindingEditorFocusAction(ROW_UP)
- }
+ if (e.ctrlKey && !e.altKey) { keyBindingEditorFocusAction(ROW_UP) }
break
case 40:
- keyBindingEditorFocusAction(ROW_DOWN)
+ if (!e.shiftKey) { keyBindingEditorFocusAction(ROW_DOWN) }
break
case 78:
- if (e.ctrlKey && !e.altKey) {
- keyBindingEditorFocusAction(ROW_DOWN)
- }
+ if (e.ctrlKey && !e.altKey) { keyBindingEditorFocusAction(ROW_DOWN) }
break
}
}
@@ -837,8 +853,11 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
}
}
- const handleFocus = function (value, isDigestPass) {
- $scope.paragraphFocused = value
+ const handleFocus = function (focused, isDigestPass) {
+ $scope.paragraphFocused = focused
+
+ if ($scope.editor) { $scope.editor.setHighlightActiveLine(focused) }
+
if (isDigestPass === false || isDigestPass === undefined) {
// Protect against error in case digest is already running
$timeout(function () {
@@ -982,20 +1001,29 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
return $scope.currentProgress || 0
}
+ $scope.getFormattedParagraphTime = () => {
+ return moment().toISOString()
+ }
+
$scope.getExecutionTime = function (pdata) {
- let timeMs = Date.parse(pdata.dateFinished) - Date.parse(pdata.dateStarted)
+ const end = pdata.dateFinished
+ const start = pdata.dateStarted
+ let timeMs = Date.parse(end) - Date.parse(start)
if (isNaN(timeMs) || timeMs < 0) {
if ($scope.isResultOutdated(pdata)) {
return 'outdated'
}
return ''
}
+
+ const durationFormat = moment.duration((timeMs / 1000), 'seconds').format('h [hrs] m [min] s [sec]')
+ const endFormat = moment(pdata.dateFinished).format('MMMM DD YYYY, h:mm:ss A')
+
let user = (pdata.user === undefined || pdata.user === null) ? 'anonymous' : pdata.user
- let desc = 'Took ' + moment.duration((timeMs / 1000), 'seconds').format('h [hrs] m [min] s [sec]') +
- '. Last updated by ' + user + ' at ' + moment(pdata.dateFinished).format('MMMM DD YYYY, h:mm:ss A') + '.'
- if ($scope.isResultOutdated(pdata)) {
- desc += ' (outdated)'
- }
+ let desc = `Took ${durationFormat}. Last updated by ${user} at ${endFormat}.`
+
+ if ($scope.isResultOutdated(pdata)) { desc += ' (outdated)' }
+
return desc
}
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
index e517be42fe..8ecc7bba75 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
@@ -52,21 +52,6 @@
width: 100%;
}
-table.dataTable {
- margin-top: 0px !important;
- margin-bottom: 6px !important;
-}
-
-table.dataTable.table-condensed > thead > tr > th {
- padding-right: 28px;
-}
-
-table.dataTable.table-condensed .sorting:after,
-table.dataTable.table-condensed .sorting_asc:after,
-table.dataTable.table-condensed .sorting_desc:after {
- right: 12px;
-}
-
.plainTextContainer {
font-family: "Monaco","Menlo","Ubuntu Mono","Consolas","source-code-pro",monospace;
font-size: 12px !important;
@@ -128,7 +113,6 @@ table.dataTable.table-condensed .sorting_desc:after {
display: none;
float: right;
color: #999;
- margin-top: -9px;
margin-right: 0;
position: absolute;
clear: both;
@@ -190,8 +174,9 @@ table.dataTable.table-condensed .sorting_desc:after {
}
.paragraph .control {
- background: rgba(255,255,255,0.85);
+ position: absolute;
float: right;
+ background: rgba(255,255,255,0.85);
color: #999;
margin-top: 1px;
margin-right: 5px;
@@ -385,10 +370,22 @@ table.table-shortcut {
direction: ltr;
}
+/** set highlight line color */
+#main .ace-chrome .ace_marker-layer .ace_active-line {
+ background: rgba(114, 127, 222, 0.08);
+}
+
+/** hide not focused cursors */
.ace_hidden-cursors {
opacity: 0;
}
+/** set cursor color */
+#main .emacs-mode .ace_cursor {
+ background: #C0C0C0!important;
+ border: none !important;
+}
+
.ace_text-input, .ace_gutter, .ace_layer,
.emacs-mode, .ace_text-layer, .ace_cursor-layer,
.ace_cursor, .ace_scrollbar {
@@ -399,11 +396,6 @@ table.table-shortcut {
opacity: 0 !important;
}
-#main .emacs-mode .ace_cursor {
- background: #C0C0C0!important;
- border: none !important;
-}
-
/*
Table Display CSS
*/
@@ -487,46 +479,6 @@ table.table-shortcut {
background: none;
}
-/*
- Handsontable
-*/
-
-.handsontable th {
- font-weight: bold;
-}
-
-.handsontable th, .handsontable td {
- border-right: 0px;
- border-left: 0px !important;
- padding: 4px;
-}
-
-.handsontable tr:first-child th {
- text-align: left;
- border-top: 0px;
- padding: 4px 0px 0px 0px;
- border-left: 0px;
- border-right: 0px;
- border-bottom: 2px solid #CCC;
-}
-
-.handsontable .columnSorting.ascending::after {
- content: '\f160';
- margin-left: 3px;
- font-size: 12px;
- font-family: FontAwesome;
- line-height: 2;
-}
-
-.handsontable .columnSorting.descending::after {
- content: '\f161';
- margin-left: 3px;
- font-size: 12px;
- margin-left: 3px;
- font-family: FontAwesome;
- line-height: 2;
-}
-
/*
Pivot CSS
*/
@@ -583,54 +535,6 @@ table.table-striped {
width: 20px;
}
-
-.changeType {
- border: 1px solid #bbb;
- color: #bbb;
- background: #eee;
- border-radius: 2px;
- padding: 2px;
- font-size: 9px;
- float: right;
- line-height: 9px;
- margin: 3px 3px 0 0;
-}
-.changeType:hover {
- border: 1px solid #777;
- color: #777;
- cursor: pointer;
-}
-.changeType.pressed {
- background-color: #999;
-}
-.changeTypeMenu {
- position: absolute;
- border: 1px solid #ccc;
- margin-top: 22px;
- box-shadow: 0 1px 3px -1px #323232;
- background: white;
- padding: 0;
- font-size: 13px;
- display: none;
- z-index: 10;
-}
-.changeTypeMenu li {
- text-align: left;
- list-style: none;
- padding: 2px 20px;
- cursor: pointer;
- margin-bottom: 0;
-}
-.changeTypeMenu li.active:before {
- font-size: 12px;
- content: "\2714";
- margin-left: -15px;
- margin-right: 3px;
-}
-.changeTypeMenu li:hover {
- background: #eee;
-}
-
/*
Overwrite github-markdown-css for Markdown interpreter
*/
@@ -660,3 +564,7 @@ table.table-striped {
.markdown-body h4 {
font-size: 16px;
}
+
+.network-labels {
+ margin: 0.2em;
+}
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/display-table.css b/zeppelin-web/src/app/notebook/paragraph/result/display-table.css
new file mode 100644
index 0000000000..946210913b
--- /dev/null
+++ b/zeppelin-web/src/app/notebook/paragraph/result/display-table.css
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+.ui-grid-pager-panel {
+ vertical-align: middle;
+ background-color: #f3f3f3;
+}
+
+.ui-grid-footer-info {
+ padding: 5px;
+ background-color: #f3f3f3;
+}
+
+.ui-grid-menu {
+ overflow: auto; /** enable scrollbar in column menu */
+}
+
+/** disable alternative color for even lows in a table */
+.ui-grid-row:nth-child(even) .ui-grid-cell {
+ background-color: white !important;
+}
+
+/** support `height: auto` for cells */
+.ui-grid-viewport .ui-grid-cell-contents {
+ word-wrap: break-word;
+ white-space: normal !important;
+ border-bottom: 1px solid #e8e8e8;
+}
+
+.ui-grid-row, .ui-grid-cell {
+ height: auto !important;
+}
+
+.ui-grid-row div[role=row] {
+ display: flex ;
+ align-content: stretch;
+}
+
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result-chart-selector.html b/zeppelin-web/src/app/notebook/paragraph/result/result-chart-selector.html
index d8a316b4b2..9592d809d3 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result-chart-selector.html
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result-chart-selector.html
@@ -13,12 +13,13 @@ limitations under the License.
-->
-
+
settings
-
+
+ ng-show="config.graph.optionOpen && !asIframe && !viewOnly">
@@ -36,6 +36,26 @@ limitations under the License.
ng-show="graphMode == viz.id">
+
+
+
+ `,
scope: {
config: configObj,
save: function () {
diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-table-grid-filter.html b/zeppelin-web/src/app/visualization/builtins/visualization-table-grid-filter.html
new file mode 100644
index 0000000000..d4b7e987f5
--- /dev/null
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-table-grid-filter.html
@@ -0,0 +1,27 @@
+
+
+
diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-table-setting.html b/zeppelin-web/src/app/visualization/builtins/visualization-table-setting.html
new file mode 100644
index 0000000000..d01fd1b928
--- /dev/null
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-table-setting.html
@@ -0,0 +1,84 @@
+
+
+
+
+
Table Options
+
+
+
+
+
+
+
+
+ {{grid.getCellValue(row, col)}}
+
+
+
+ `,
+ }
+ }),
+ rowEditWaitInterval: -1, /** disable saveRow event */
+ enableRowHashing: true,
+ saveFocus: false,
+ saveScroll: false,
+ saveSort: true,
+ savePinning: true,
+ saveGrouping: true,
+ saveGroupingExpandedStates: true,
+ saveOrder: true, // column order
+ saveVisible: true, // column visibility
+ saveTreeView: true,
+ saveFilter: true,
+ saveSelection: false,
+ }
+
+ return gridOptions
+ }
+
+ getGridElemId() {
+ // angular doesn't allow `-` in scope variable name
+ const gridElemId = `${this.targetEl[0].id}_grid`.replace('-', '_')
+ return gridElemId
+ }
+
+ getGridApiId() {
+ // angular doesn't allow `-` in scope variable name
+ const gridApiId = `${this.targetEl[0].id}_gridApi`.replace('-', '_')
+ return gridApiId
+ }
+
+ refresh() {
+ const gridElemId = this.getGridElemId()
+ const gridElem = angular.element(`#${gridElemId}`)
+
+ if (gridElem) {
+ gridElem.css('height', this.targetEl.height() - 10)
+ }
+ }
+
+ refreshGrid() {
+ const gridElemId = this.getGridElemId()
+ const gridElem = angular.element(`#${gridElemId}`)
+
+ if (gridElem) {
+ const scope = this.getScope()
+ const gridApiId = this.getGridApiId()
+ scope[gridApiId].core.notifyDataChange(this._uiGridConstants.dataChange.ALL)
+ }
+ }
+
+ updateColDefType(colDef, type) {
+ if (type === colDef.type) { return }
+
+ colDef.type = type
+ const colName = colDef.name
+ const config = this.config
+ if (config.tableColumnTypeState.names && config.tableColumnTypeState.names[colName]) {
+ config.tableColumnTypeState.names[colName] = type
+ this.persistConfigWithGridState(this.config)
+ }
+ }
+
+ addColumnMenus(gridOptions) {
+ if (!gridOptions || !gridOptions.columnDefs) { return }
+
+ const self = this // for closure
+
+ // SHOULD use `function() { ... }` syntax for each action to get `this`
+ gridOptions.columnDefs.map(colDef => {
+ colDef.menuItems = [
+ {
+ title: 'Type: String',
+ action: function() {
+ self.updateColDefType(this.context.col.colDef, TableColumnType.STRING)
+ },
+ active: function() {
+ return this.context.col.colDef.type === TableColumnType.STRING
+ },
+ },
+ {
+ title: 'Type: Number',
+ action: function() {
+ self.updateColDefType(this.context.col.colDef, TableColumnType.NUMBER)
+ },
+ active: function() {
+ return this.context.col.colDef.type === TableColumnType.NUMBER
+ },
+ },
+ {
+ title: 'Type: Date',
+ action: function() {
+ self.updateColDefType(this.context.col.colDef, TableColumnType.DATE)
+ },
+ active: function() {
+ return this.context.col.colDef.type === TableColumnType.DATE
+ },
+ },
+ ]
+ })
+ }
+
+ setDynamicGridOptions(gridOptions, config) {
+ // parse based on their type definitions
+ const parsed = parseTableOption(TABLE_OPTION_SPECS, config.tableOptionValue)
+
+ const { showAggregationFooter, useFilter, showPagination, } = parsed
+
+ gridOptions.showGridFooter = false
+ gridOptions.showColumnFooter = showAggregationFooter
+ gridOptions.enableFiltering = useFilter
+
+ gridOptions.enablePagination = showPagination
+ gridOptions.enablePaginationControls = showPagination
+
+ if (showPagination) {
+ gridOptions.paginationPageSize = 50
+ gridOptions.paginationPageSizes = [25, 50, 100, 250, 1000]
+ }
+
+ // selection can't be rendered dynamically in ui-grid 4.0.4
+ gridOptions.enableRowSelection = false
+ gridOptions.enableRowHeaderSelection = false
+ gridOptions.enableFullRowSelection = false
+ gridOptions.enableSelectAll = false
+ gridOptions.enableGroupHeaderSelection = false
+ gridOptions.enableSelectionBatchEvent = false
}
render (tableData) {
- let height = this.targetEl.height()
- let container = this.targetEl.css('height', height).get(0)
- let resultRows = tableData.rows
- let columnNames = _.pluck(tableData.columns, 'name')
- // eslint-disable-next-line prefer-spread
- let columns = Array.apply(null, Array(tableData.columns.length)).map(function () {
- return {type: 'text'}
- })
+ const gridElemId = this.getGridElemId()
+ let gridElem = document.getElementById(gridElemId)
- if (this.hot) {
- this.hot.destroy()
+ const config = this.config
+ const self = this // for closure
+
+ if (!gridElem) {
+ // create, compile and append grid elem
+ gridElem = angular.element(
+ `
`)
+
+ gridElem.css('height', this.targetEl.height() - 10)
+ const scope = this.getScope()
+ gridElem = this._compile(gridElem)(scope)
+ this.targetEl.append(gridElem)
+
+ // set gridOptions for this elem
+ const gridOptions = this.createGridOptions(tableData, onRegisterApiCallback, config)
+ this.setDynamicGridOptions(gridOptions, config)
+ this.addColumnMenus(gridOptions)
+ scope[gridElemId] = gridOptions
+
+ // set gridApi for this elem
+ const gridApiId = this.getGridApiId()
+ const onRegisterApiCallback = (gridApi) => {
+ scope[gridApiId] = gridApi
+ // should restore state before registering APIs
+
+ // register callbacks for change evens
+ // should persist `self.config` instead `config` (closure issue)
+ gridApi.core.on.columnVisibilityChanged(scope, () => { self.persistConfigWithGridState(self.config) })
+ gridApi.colMovable.on.columnPositionChanged(scope, () => { self.persistConfigWithGridState(self.config) })
+ gridApi.core.on.sortChanged(scope, () => { self.persistConfigWithGridState(self.config) })
+ gridApi.core.on.filterChanged(scope, () => { self.persistConfigWithGridState(self.config) })
+ gridApi.grouping.on.aggregationChanged(scope, () => { self.persistConfigWithGridState(self.config) })
+ gridApi.grouping.on.groupingChanged(scope, () => { self.persistConfigWithGridState(self.config) })
+ gridApi.treeBase.on.rowCollapsed(scope, () => { self.persistConfigWithGridState(self.config) })
+ gridApi.treeBase.on.rowExpanded(scope, () => { self.persistConfigWithGridState(self.config) })
+
+ // pagination doesn't follow usual life-cycle in ui-grid v4.0.4
+ // gridApi.pagination.on.paginationChanged(scope, () => { self.persistConfigWithGridState(self.config) })
+ // TBD: do we need to propagate row selection?
+ // gridApi.selection.on.rowSelectionChanged(scope, () => { self.persistConfigWithGridState(self.config) })
+ // gridApi.selection.on.rowSelectionChangedBatch(scope, () => { self.persistConfigWithGridState(self.config) })
+ }
+ gridOptions.onRegisterApi = onRegisterApiCallback
+ } else {
+ // don't need to update gridOptions.data since it's synchronized by paragraph execution
+ const gridOptions = this.getGridOptions()
+ this.setDynamicGridOptions(gridOptions, config)
+ this.refreshGrid()
}
- let handsonHelper = new HandsonHelper()
- this.hot = new Handsontable(container, handsonHelper.getHandsonTableConfig(
- columns, columnNames, resultRows))
- this.hot.validateCells(null)
+ const columnDefs = this.getGridOptions().columnDefs
+ updateColumnTypeState(tableData.columns, config, columnDefs)
+ // SHOULD restore grid state after columnDefs are updated
+ this.restoreGridState(config.tableGridState)
+ }
+
+ restoreGridState(gridState) {
+ if (!gridState) { return }
+
+ // should set isRestoring to avoid that changed* events are triggered while restoring
+ this.isRestoring = true
+ const gridApi = this.getGridApi()
+
+ // restore grid state when gridApi is available
+ if (!gridApi) {
+ setTimeout(() => this.restoreGridState(gridState), 100)
+ } else {
+ gridApi.saveState.restore(this.getScope(), gridState)
+ this.isRestoring = false
+ }
}
destroy () {
- if (this.hot) {
- this.hot.destroy()
- }
}
getTransformation () {
return this.passthrough
}
+
+ getScope() {
+ const scope = this.targetEl.scope()
+ return scope
+ }
+
+ getGridOptions() {
+ const scope = this.getScope()
+ const gridElemId = this.getGridElemId()
+ return scope[gridElemId]
+ }
+
+ getGridApi() {
+ const scope = this.targetEl.scope()
+ const gridApiId = this.getGridApiId()
+ return scope[gridApiId]
+ }
+
+ persistConfigImmediatelyWithGridState(config) {
+ this.persistConfigWithGridState(config)
+ }
+
+ persistConfigWithGridState(config) {
+ if (this.isRestoring) { return }
+
+ const gridApi = this.getGridApi()
+ config.tableGridState = gridApi.saveState.save()
+ this.emitConfig(config)
+ }
+
+ persistConfig(config) {
+ this.emitConfig(config)
+ }
+
+ getSetting (chart) {
+ const self = this // for closure in scope
+ const configObj = self.config
+
+ // emit config if it's updated in `render`
+ if (configObj.initialized) {
+ configObj.initialized = false
+ this.persistConfig(configObj) // should persist w/o state
+ } else if (configObj.tableColumnTypeState &&
+ configObj.tableColumnTypeState.updated) {
+ configObj.tableColumnTypeState.updated = false
+ this.persistConfig(configObj) // should persist w/o state
+ }
+
+ return {
+ template: SETTING_TEMPLATE,
+ scope: {
+ config: configObj,
+ tableOptionSpecs: TABLE_OPTION_SPECS,
+ isInputWidget: isInputWidget,
+ isOptionWidget: isOptionWidget,
+ isCheckboxWidget: isCheckboxWidget,
+ isTextareaWidget: isTextareaWidget,
+ isBtnGroupWidget: isBtnGroupWidget,
+ tableOptionValueChanged: () => {
+ self.persistConfigWithGridState(configObj)
+ },
+ saveTableOption: () => {
+ self.persistConfigWithGridState(configObj)
+ },
+ resetTableOption: () => {
+ resetTableOptionConfig(configObj)
+ initializeTableConfig(configObj, TABLE_OPTION_SPECS)
+ self.persistConfigWithGridState(configObj)
+ },
+ tableWidgetOnKeyDown: (event, optSpec) => {
+ const code = event.keyCode || event.which
+ if (code === 13 && isInputWidget(optSpec)) {
+ self.persistConfigWithGridState(configObj)
+ } else if (code === 13 && event.shiftKey && isTextareaWidget(optSpec)) {
+ self.persistConfigWithGridState(configObj)
+ }
+
+ event.stopPropagation() /** avoid to conflict with paragraph shortcuts */
+ }
+ }
+ }
+ }
}
diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-util.js b/zeppelin-web/src/app/visualization/builtins/visualization-util.js
new file mode 100644
index 0000000000..cd9cd48b75
--- /dev/null
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-util.js
@@ -0,0 +1,172 @@
+/*
+ * 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.
+ */
+
+export const Widget = {
+ CHECKBOX: 'checkbox',
+ INPUT: 'input',
+ TEXTAREA: 'textarea',
+ OPTION: 'option',
+ BTN_GROUP: 'btn-group',
+}
+
+export const ValueType = {
+ INT: 'int',
+ FLOAT: 'float',
+ BOOLEAN: 'boolean',
+ STRING: 'string',
+ JSON: 'JSON',
+}
+
+export const TableColumnType = {
+ STRING: 'string',
+ BOOLEAN: 'boolean',
+ NUMBER: 'number',
+ DATE: 'date',
+ OBJECT: 'object',
+ NUMBER_STR: 'numberStr',
+}
+
+export const DefaultTableColumnType = TableColumnType.STRING
+
+export function isInputWidget (spec) { return spec.widget === Widget.INPUT }
+export function isOptionWidget (spec) { return spec.widget === Widget.OPTION }
+export function isCheckboxWidget (spec) { return spec.widget === Widget.CHECKBOX }
+export function isTextareaWidget (spec) { return spec.widget === Widget.TEXTAREA }
+export function isBtnGroupWidget (spec) { return spec.widget === Widget.BTN_GROUP }
+
+export function resetTableOptionConfig(config) {
+ delete config.tableOptionSpecHash
+ config.tableOptionSpecHash = {}
+ delete config.tableOptionValue
+ config.tableOptionValue = {}
+ delete config.tableColumnTypeState.names
+ config.tableColumnTypeState.names = {}
+ config.updated = false
+ return config
+}
+
+export function initializeTableConfig(config, tableOptionSpecs) {
+ if (typeof config.tableOptionValue === 'undefined') { config.tableOptionValue = {} }
+ if (typeof config.tableGridState === 'undefined') { config.tableGridState = {} }
+ if (typeof config.tableColumnTypeState === 'undefined') { config.tableColumnTypeState = {} }
+
+ // should remove `$$hashKey` using angular.toJson
+ const newSpecHash = JSON.stringify(JSON.parse(angular.toJson(tableOptionSpecs)))
+ const previousSpecHash = config.tableOptionSpecHash
+
+ // check whether spec is updated or not
+ if (typeof previousSpecHash === 'undefined' || (previousSpecHash !== newSpecHash)) {
+ resetTableOptionConfig(config)
+
+ config.tableOptionSpecHash = newSpecHash
+ config.initialized = true
+
+ // reset all persisted option values if spec is updated
+ for (let i = 0; i < tableOptionSpecs.length; i++) {
+ const option = tableOptionSpecs[i]
+ config.tableOptionValue[option.name] = option.defaultValue
+ }
+ }
+
+ return config
+}
+
+export function parseTableOption(specs, persistedTableOption) {
+ /** copy original params */
+ const parsed = JSON.parse(JSON.stringify(persistedTableOption))
+
+ for (let i = 0; i < specs.length; i++) {
+ const s = specs[i]
+ const name = s.name
+
+ if (s.valueType === ValueType.INT &&
+ typeof parsed[name] !== 'number') {
+ try { parsed[name] = parseInt(parsed[name]) } catch (error) { parsed[name] = s.defaultValue }
+ } else if (s.valueType === ValueType.FLOAT &&
+ typeof parsed[name] !== 'number') {
+ try { parsed[name] = parseFloat(parsed[name]) } catch (error) { parsed[name] = s.defaultValue }
+ } else if (s.valueType === ValueType.BOOLEAN) {
+ if (parsed[name] === 'false') {
+ parsed[name] = false
+ } else if (parsed[name] === 'true') {
+ parsed[name] = true
+ } else if (typeof parsed[name] !== 'boolean') {
+ parsed[name] = s.defaultValue
+ }
+ } else if (s.valueType === ValueType.JSON) {
+ if (parsed[name] !== null && typeof parsed[name] !== 'object') {
+ try { parsed[name] = JSON.parse(parsed[name]) } catch (error) { parsed[name] = s.defaultValue }
+ } else if (parsed[name] === null) {
+ parsed[name] = s.defaultValue
+ }
+ }
+ }
+
+ return parsed
+}
+
+export function isColumnNameUpdated(prevColumnNames, newColumnNames) {
+ if (typeof prevColumnNames === 'undefined') { return true }
+
+ let columnNameUpdated = false
+
+ for (let prevColName in prevColumnNames) {
+ if (!newColumnNames[prevColName]) {
+ return true
+ }
+ }
+
+ if (!columnNameUpdated) {
+ for (let newColName in newColumnNames) {
+ if (!prevColumnNames[newColName]) {
+ return true
+ }
+ }
+ }
+
+ return false
+}
+
+export function updateColumnTypeState(columns, config, columnDefs) {
+ const columnTypeState = config.tableColumnTypeState
+
+ if (!columnTypeState) { return }
+
+ // compare objects because order might be changed
+ const prevColumnNames = columnTypeState.names || {}
+ const newColumnNames = columns.reduce((acc, c) => {
+ const prevColumnType = prevColumnNames[c.name]
+
+ // use previous column type if exists
+ if (prevColumnType) {
+ acc[c.name] = prevColumnType
+ } else {
+ acc[c.name] = DefaultTableColumnType
+ }
+ return acc
+ }, {})
+
+ let columnNameUpdated = isColumnNameUpdated(prevColumnNames, newColumnNames)
+
+ if (columnNameUpdated) {
+ columnTypeState.names = newColumnNames
+ columnTypeState.updated = true
+ }
+
+ // update `columnDefs[n].type`
+ for (let i = 0; i < columnDefs.length; i++) {
+ const colName = columnDefs[i].name
+ columnDefs[i].type = columnTypeState.names[colName]
+ }
+}
diff --git a/zeppelin-web/src/app/visualization/visualization.js b/zeppelin-web/src/app/visualization/visualization.js
index ec8988238f..82704e3a00 100644
--- a/zeppelin-web/src/app/visualization/visualization.js
+++ b/zeppelin-web/src/app/visualization/visualization.js
@@ -13,7 +13,7 @@
*/
/**
- * Base class for visualization
+ * Base class for visualization.
*/
export default class Visualization {
constructor (targetEl, config) {
@@ -25,17 +25,22 @@ export default class Visualization {
}
/**
- * get transformation
+ * Get transformation.
+ * @abstract
+ * @return {Transformation}
*/
getTransformation () {
// override this
+ throw new TypeError('Visualization.getTransformation() should be overrided')
}
/**
- * Method will be invoked when data or configuration changed
+ * Method will be invoked when data or configuration changed.
+ * @abstract
*/
render (tableData) {
// override this
+ throw new TypeError('Visualization.render() should be overrided')
}
/**
@@ -46,7 +51,7 @@ export default class Visualization {
}
/**
- * method will be invoked when visualization need to be destroyed.
+ * Method will be invoked when visualization need to be destroyed.
* Don't need to destroy this.targetEl.
*/
destroy () {
@@ -64,7 +69,7 @@ export default class Visualization {
}
/**
- * Activate. invoked when visualization is selected
+ * Activate. Invoked when visualization is selected.
*/
activate () {
if (!this._active || this._dirty) {
@@ -75,21 +80,21 @@ export default class Visualization {
}
/**
- * Activate. invoked when visualization is de selected
+ * Deactivate. Invoked when visualization is de selected.
*/
deactivate () {
this._active = false
}
/**
- * Is active
+ * Is active.
*/
isActive () {
return this._active
}
/**
- * When window or paragraph is resized
+ * When window or paragraph is resized.
*/
resize () {
if (this.isActive()) {
@@ -100,7 +105,7 @@ export default class Visualization {
}
/**
- * Set new config
+ * Set new config.
*/
setConfig (config) {
this.config = config
@@ -119,7 +124,7 @@ export default class Visualization {
}
/**
- * render setting
+ * Render setting.
*/
renderSetting (targetEl) {
let setting = this.getSetting()
diff --git a/zeppelin-web/src/components/baseUrl/baseUrl.service.js b/zeppelin-web/src/components/baseUrl/baseUrl.service.js
index fb2ecfbfd8..5b8824a098 100644
--- a/zeppelin-web/src/components/baseUrl/baseUrl.service.js
+++ b/zeppelin-web/src/components/baseUrl/baseUrl.service.js
@@ -36,10 +36,12 @@ function baseUrlSrv () {
skipTrailingSlash(location.pathname) + '/ws'
}
+ this.getBase = function() {
+ return location.protocol + '//' + location.hostname + ':' + this.getPort() + location.pathname
+ }
+
this.getRestApiBase = function () {
- return location.protocol + '//' + location.hostname + ':' +
- this.getPort() + skipTrailingSlash(location.pathname) +
- '/api'
+ return skipTrailingSlash(this.getBase()) + '/api'
}
const skipTrailingSlash = function (path) {
diff --git a/zeppelin-web/src/components/editor/ace.editor.directive.html b/zeppelin-web/src/components/editor/ace.editor.directive.html
index 4729e4bb28..1c0a1f0f48 100644
--- a/zeppelin-web/src/components/editor/ace.editor.directive.html
+++ b/zeppelin-web/src/components/editor/ace.editor.directive.html
@@ -13,10 +13,7 @@ limitations under the License.
-->
diff --git a/zeppelin-web/src/components/editor/codeEditor.directive.js b/zeppelin-web/src/components/editor/codeEditor.directive.js
index b8e1b6a503..d8cb73f025 100644
--- a/zeppelin-web/src/components/editor/codeEditor.directive.js
+++ b/zeppelin-web/src/components/editor/codeEditor.directive.js
@@ -31,7 +31,7 @@ function codeEditor ($templateRequest, $compile) {
editor.attr('id', scope.paragraphId + '_editor')
element.append(editor)
$compile(editor)(scope)
- console.log('codeEditor directive revision view is ' + scope.revisionView)
+ console.debug('codeEditor directive revision view is ' + scope.revisionView)
})
}
}
diff --git a/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js b/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
index 5d51818b6e..c71fae0c87 100644
--- a/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
+++ b/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
@@ -21,12 +21,12 @@ function expandCollapse () {
angular.element(element).click(function (event) {
if (angular.element(element).find('.expandable:visible').length > 1) {
angular.element(element).find('.expandable:visible').slideUp('slow')
- angular.element(element).find('i.icon-folder-alt').toggleClass('icon-folder icon-folder-alt')
+ angular.element(element).find('i.fa-folder-open').toggleClass('fa-folder fa-folder-open')
} else {
angular.element(element).find('.expandable').first().slideToggle('200', function () {
// do not toggle trash folder
if (angular.element(element).find('.fa-trash-o').length === 0) {
- angular.element(element).find('i').first().toggleClass('icon-folder icon-folder-alt')
+ angular.element(element).find('i').first().toggleClass('fa-folder fa-folder-open')
}
})
}
diff --git a/zeppelin-web/src/components/navbar/navbar-noteList-elem.html b/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
index d5fb4a13b5..6cba04a987 100644
--- a/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
+++ b/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
@@ -22,7 +22,7 @@ limitations under the License.
-
+
{{noteName(node)}}
span {
+ font-family: 'Patua One', cursive;
+ font-size: 25px;
+ color: white;
+}
+
+.navbar-menu {
+ font-weight: 300;
+ font-size: 16px;
+}
+
+.navbar-inverse .navbar-nav > li > a.navbar-menu-notebook:focus {
+ background-color: transparent;
+}
+
+.navbar-inverse .navbar-nav > li > a.navbar-menu-notebook:hover{
+ background-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-inverse .navbar-nav > li > a {
+ padding-top: 16px;
+}
+
+.navbar-logo {
+ display: inline-block;
+ padding-right: 10px;
+}
+
+.navbar-search {
+ font-size: 14px;
+ font-family: 'FontAwesome', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+#navbar-search {
+ min-width: 170px;
+}
@media (min-width: 795px) and (max-width: 830px) {
- input#searchTermId {
- width: 170px;
- min-width: 170px;
+ #navbar-search {
+ width: 150px;
+ min-width: 150px;
}
}
@media (min-width: 768px) and (max-width: 794px) {
- input#searchTermId {
- width: 140px;
- min-width: 140px;
+ #navbar-search {
+ width: 130px;
+ min-width: 130px;
}
}
@@ -41,3 +82,151 @@
}
.navbar-fixed-top.headroom--unpinned { top: -100px; }
.navbar-fixed-top.headroom--pinned { top: 0; /** `navbar` top */ }
+
+.navbar-inverse {
+ background: #3071a9;
+ color: #fff;
+ border-color: #3071a9;
+ font-size: 18px;
+}
+
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+ color: #fff;
+ background: #3071a9;
+}
+
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
+ background: #3071a9;
+}
+
+.navbar-inverse .navbar-nav > li > a:hover,
+.navbar-inverse .navbar-nav > li > a:focus {
+ color: #fff;
+ background: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-inverse .navbar-toggle {
+ border-color: transparent;
+}
+
+.navbar-inverse .navbar-nav > .active > a,
+.navbar-inverse .navbar-nav > .active > a:hover,
+.navbar-inverse .navbar-nav > .active > a:focus {
+ color: #fff;
+ background: #080808;
+}
+
+.navbar-inverse .navbar-nav > li > a {
+ color: #FFFFFF;
+}
+
+.navbar-inverse .navbar-brand {
+ color: #fff;
+ text-decoration: none;
+ font-family: 'Patua One', cursive;
+ font-size: 32px;
+}
+
+a.navbar-brand:hover {
+ color: #fff !important;
+}
+
+@media (max-width: 767px) {
+ .navbar-inverse .navbar-nav .open .dropdown-menu > li > a,
+ #notebook-list li a {
+ color: #ecf0f1;
+ }
+
+ .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a,
+ #notebook-list li a {
+ padding: 5px 15px 5px 25px;
+ line-height: 20px;
+ }
+
+ .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a {
+ color: #D3D3D3;
+ }
+
+ .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a:hover,
+ .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a:focus,
+ #notebook-list li a:hover {
+ color: #fff;
+ background: transparent;
+ }
+
+ .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > .active > a,
+ .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > .active > a:hover,
+ .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > .active > a:focus {
+ color: #fff;
+ background: #080808;
+ }
+
+ .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+ background: #3071A9;
+ }
+
+ .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form {
+ border-color: #3071A9;
+ }
+}
+
+.username {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 120px;
+ display: inline-block;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+
+/* About Dialog */
+
+.modal-header-about {
+ background-color: #3071a9;
+ border: 2px solid #3071a9;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
+.modal-header-about > .close {
+ color: #cfcfcf;
+ opacity: 1;
+}
+
+.modal-header-about > .modal-title {
+ font-weight: 300;
+ font-size: 20px;
+ color: #e8e8e8;
+}
+
+.modal-body-about-version {
+ font-weight: 500;
+}
+
+.modal-body-about {
+ height: 250px;
+ padding: 50px;
+}
+
+.modal-body-about .logo {
+ padding-top: 30px;
+}
+
+.modal-body-about .logo img {
+ width: 95%;
+}
+
+.modal-body-about .content {
+ text-align: center;
+}
+
+.modal-body-about .content h3 {
+ font-family: 'Patua One';
+ color: #3071A9;
+ font-size: 30px;
+ margin: 0 auto;
+}
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index 8c6749288e..d5e6668fa9 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -20,18 +20,30 @@ limitations under the License.
-
+
+
+ Zeppelin
> **Note :** Display system is backend independent.
+
+## Network
+
+With the `%network` directive, Zeppelin treats your output as a graph. Zeppelin can leverage the Property Graph Model.
+
+### What is the Labelled Property Graph Model?
+
+A [Property Graph](https://github.com/tinkerpop/gremlin/wiki/Defining-a-Property-Graph) is a graph that has these elements:
+
+* a set of vertices
+ * each vertex has a unique identifier.
+ * each vertex has a set of outgoing edges.
+ * each vertex has a set of incoming edges.
+ * each vertex has a collection of properties defined by a map from key to value
+* a set of edges
+ * each edge has a unique identifier.
+ * each edge has an outgoing tail vertex.
+ * each edge has an incoming head vertex.
+ * each edge has a label that denotes the type of relationship between its two vertices.
+ * each edge has a collection of properties defined by a map from key to value.
+
+
+
+A [Labelled Property Graph](https://neo4j.com/developer/graph-database/#property-graph) is a Property Graph where the nodes can be tagged with **labels** representing their different roles in the graph model
+
+
+
+### What are the APIs?
+
+The new NETWORK visualization is based on json with the following params:
+
+* "nodes" (mandatory): list of nodes of the graph every node can have the following params:
+ * "id" (mandatory): the id of the node (must be unique);
+ * "label": the main Label of the node;
+ * "labels": the list of the labels of the node;
+ * "data": the data attached to the node;
+* "edges": list of the edges of the graph;
+ * "id" (mandatory): the id of the edge (must be unique);
+ * "source" (mandatory): the id of source node of the edge;
+ * "target" (mandatory): the id of target node of the edge;
+ * "label": the main type of the edge;
+ * "data": the data attached to the edge;
+* "labels": a map (K, V) where K is the node label and V is the color of the node;
+* "directed": (true/false, default false) wich tells if is directed graph or not;
+* "types": a *distinct* list of the edge types of the graph
+
+If you click on a node or edge on the bottom of the paragraph you find a list of entity properties
+
+
+
+This kind of graph can be easily *flatten* in order to support other visualization formats provided by Zeppelin.
+
+
+
+### How to use it?
+
+An example of a simple graph
+
+```
+%spark
+print(s"""
+%network {
+ "nodes": [
+ {"id": 1},
+ {"id": 2},
+ {"id": 3}
+ ],
+ "edges": [
+ {"source": 1, "target": 2, "id" : 1},
+ {"source": 2, "target": 3, "id" : 2},
+ {"source": 1, "target": 2, "id" : 3},
+ {"source": 1, "target": 2, "id" : 4},
+ {"source": 2, "target": 1, "id" : 5},
+ {"source": 2, "target": 1, "id" : 6}
+ ]
+}
+""")
+```
+
+that will look like:
+
+
+
+A little more complex graph:
+
+```
+%spark
+print(s"""
+%network {
+ "nodes": [{"id": 1, "label": "User", "data": {"fullName":"Andrea Santurbano"}},{"id": 2, "label": "User", "data": {"fullName":"Lee Moon Soo"}},{"id": 3, "label": "Project", "data": {"name":"Zeppelin"}}],
+ "edges": [{"source": 2, "target": 1, "id" : 1, "label": "HELPS"},{"source": 2, "target": 3, "id" : 2, "label": "CREATE"},{"source": 1, "target": 3, "id" : 3, "label": "CONTRIBUTE_TO", "data": {"oldPR": "https://github.com/apache/zeppelin/pull/1582"}}],
+ "labels": {"User": "#8BC34A", "Project": "#3071A9"},
+ "directed": true,
+ "types": ["HELPS", "CREATE", "CONTRIBUTE_TO"]
+}
+""")
+```
+
+that will look like:
+
+
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 043538d217..bb2222b932 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -161,6 +161,7 @@ Join to our [Mailing list](https://zeppelin.apache.org/community.html) and repor
* [Azure Storage](./storage/storage.html#notebook-storage-in-azure)
* [ZeppelinHub Storage](./storage/storage.html#storage-in-zeppelinhub)
* REST API: available REST API list in Apache Zeppelin
+ * [Zeppelin server API](./rest-api/rest-zeppelin-server.html)
* [Interpreter API](./rest-api/rest-interpreter.html)
* [Notebook API](./rest-api/rest-notebook.html)
* [Notebook Repository API](./rest-api/rest-notebookRepo.html)
@@ -172,6 +173,7 @@ Join to our [Mailing list](https://zeppelin.apache.org/community.html) and repor
* [Shiro Authentication](./security/shiroauthentication.html)
* [Notebook Authorization](./security/notebook_authorization.html)
* [Data Source Authorization](./security/datasource_authorization.html)
+ * [Helium Authorization](./security/helium_authorization.html)
* Helium Framework (Experimental)
* [Writing Zeppelin Application](./development/writingzeppelinapplication.html)
* [Writing Zeppelin Spell](./development/writingzeppelinspell.html)
diff --git a/docs/install/configuration.md b/docs/install/configuration.md
index a35eb91594..ca55397828 100644
--- a/docs/install/configuration.md
+++ b/docs/install/configuration.md
@@ -282,10 +282,22 @@ If both are defined, then the **environment variables** will take priority.