Skip to content

Code changes for SNAP-2989: Snappy UI rebranding to Tibco ComputeDB iff it's Enterprise Edition #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snappy-sachin merged 3 commits into from
Apr 29, 2019
Merged

Code changes for SNAP-2989: Snappy UI rebranding to Tibco ComputeDB iff it's Enterprise Edition #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27028aa
Code changes for SNAP-2989:
snappy-sachin Apr 24, 2019
f516b65
Code changes for SNAP-2989:
snappy-sachin Apr 26, 2019
118c2e9
Changes for SNAP-2989:
snappy-sachin Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/resources/org/apache/spark/ui/static/snappydata/snappy-dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
}

#autorefreshswitch-holder {
width: 170px;
width: 172px;
position: relative;
margin: 5px 50px 5px auto;
padding: 0px 5px;
Expand Down
Binary file added .../main/resources/org/apache/spark/ui/static/snappydata/tibco-computdb-274X35.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
143 changes: 106 additions & 37 deletions core/src/main/scala/org/apache/spark/ui/UIUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import java.net.URLDecoder
import java.text.SimpleDateFormat
import java.util.{Date, Locale, TimeZone}

import scala.collection.mutable.HashMap
import scala.util.control.NonFatal
import scala.xml._
import scala.xml.transform.{RewriteRule, RuleTransformer}
Expand All @@ -33,6 +34,7 @@ private[spark] object UIUtils extends Logging {
val TABLE_CLASS_NOT_STRIPED = "table table-bordered table-condensed"
val TABLE_CLASS_STRIPED = TABLE_CLASS_NOT_STRIPED + " table-striped"
val TABLE_CLASS_STRIPED_SORTABLE = TABLE_CLASS_STRIPED + " sortable"
var snappyVersionDetails: HashMap[String, String] = HashMap.empty[String, String]

// SimpleDateFormat is not thread-safe. Don't expose it to avoid improper use.
private val dateFormat = new ThreadLocal[SimpleDateFormat]() {
Expand Down Expand Up @@ -247,17 +249,47 @@ private[spark] object UIUtils extends Logging {
<body>
<div class="navbar navbar-static-top">
<div class="navbar-inner">
<div class="product-brand">
<a href={prependBaseUri("/")} class="brand">
<img src={prependBaseUri("/static/snappydata/tibco-computdb-392X50.png")} />
</a>
</div>
<div class="brand" style="line-height: 2.5;">
<img src={prependBaseUri("/static/snappydata/helpicon-18X18.png")}
style="cursor: pointer;"
onclick="displayVersionDetails()" />
{getProductVersionNode}
</div>
{
val isEnterprise = {
val isEnt = snappyVersionDetails.getOrElse("editionType", "")
if (!isEnt.isEmpty && isEnt.equalsIgnoreCase("Enterprise")) {
true
} else {
false
}
}
if (isEnterprise) {
<div class="product-brand">
<a href={prependBaseUri("/")} class="brand" style="padding-top: 8px;">
<img src={prependBaseUri("/static/snappydata/tibco-computdb-274X35.png")} />
</a>
</div>
<div class="brand" style="line-height: 2.5;">
<img src={prependBaseUri("/static/snappydata/helpicon-18X18.png")}
style="cursor: pointer;"
onclick="displayVersionDetails()" />
{getProductVersionNode}
</div>
} else {
<div class="product-brand">
<a href={prependBaseUri("/")} class="brand">
<img src={prependBaseUri("/static/snappydata/pulse-snappydata-152X50.png")} />
</a>
</div>
<div class="brand" style="line-height: 2.5;">
<a class="brand" href="https://www.snappydata.io/" target="_blank">
<img src={prependBaseUri("/static/snappydata/snappydata-175X28.png")}
style="cursor: pointer;" />
</a>
</div>
<div class="brand" style="line-height: 2.5;">
<img src={prependBaseUri("/static/snappydata/helpicon-18X18.png")}
style="cursor: pointer;"
onclick="displayVersionDetails()" />
{getProductVersionNode}
</div>
}
}
<ul class="nav">{header}</ul>
</div>
</div>
Expand Down Expand Up @@ -543,38 +575,75 @@ private[spark] object UIUtils extends Logging {
}

def getProductVersionNode(): Node = {
val versionDetails = SparkUI.getProductVersion
<div class="popup">
snappyVersionDetails = SparkUI.getProductVersion
<div class="popup" style="z-index: 3;">
<div class="popuptext" id="sdVersionDetails">
<div>
<img src="/static/snappydata/cross.png" onclick="displayVersionDetails()"
style="float:right; cursor: pointer;"></img>
</div>
<div>
<p>
<strong>TIBCO<sup>&reg;</sup> ComputeDB<sup>&trade;</sup> -
{versionDetails.getOrElse("editionType", "")} Edition</strong> <br />
<br />&copy; 2017-2019 TIBCO<sup>&reg;</sup> Software Inc. All rights reserved.
<br />This program is protected by copyright law.
</p>
<p>
Build Version: {versionDetails.getOrElse("productVersion", "")} <br/>
Build Date: { val buildDateStr = versionDetails.getOrElse("buildDate", "");
if (!buildDateStr.isEmpty) {
buildDateStr.substring(0, buildDateStr.indexOf(" "))
} else ""
} <br/>
Spark Version: {org.apache.spark.SPARK_VERSION}
</p>
<p>
For assistance, get started at: <br />
<a href="https://www.snappydata.io/community" target="_blank">
https://www.snappydata.io/community</a> <br />
<a href="https://www.tibco.com/" target="_blank">https://www.tibco.com/</a> <br />
<a href="http://snappydatainc.github.io/snappydata/" target="_blank">
Product Documentation
</a>
</p>
{
val isEnterprise = {
val isEnt = snappyVersionDetails.getOrElse("editionType", "")
if (!isEnt.isEmpty && isEnt.equalsIgnoreCase("Enterprise")) {
true
} else {
false
}
}
if(isEnterprise) {
<p>
<strong>TIBCO<sup>&reg;</sup> ComputeDB<sup>&trade;</sup> - Enterprise Edition</strong> <br />
<br />&copy; 2017-2019 TIBCO<sup>&reg;</sup> Software Inc. All rights reserved.
<br />This program is protected by copyright law.
</p>
<p>
Build Version: {snappyVersionDetails.getOrElse("productVersion", "")} <br/>
Build Date: {
val buildDateStr = snappyVersionDetails.getOrElse("buildDate", "");
if (!buildDateStr.isEmpty) {
buildDateStr.substring(0, buildDateStr.indexOf(" "))
} else ""
} <br/>
Spark Version: {org.apache.spark.SPARK_VERSION}
</p>
<p>
For assistance, get started at: <br />
<a href="https://www.snappydata.io/community" target="_blank">
https://www.snappydata.io/community</a> <br />
<a href="https://www.tibco.com/" target="_blank">https://www.tibco.com/</a> <br />
<a href="https://docs.tibco.com/products/tibco-computedb-enterprise-edition"
target="_blank">
Product Documentation
</a>
</p>
} else {
<p>
<strong>Project SnappyData<sup>&trade;</sup> - Community Edition </strong> <br />
<br />&copy; 2017-2019 TIBCO<sup>&reg;</sup> Software Inc. All rights reserved.
<br />This program is protected by copyright law.
</p>
<p>
Build Version: {snappyVersionDetails.getOrElse("productVersion", "")} <br/>
Build : {
snappyVersionDetails.getOrElse("buildId", "") + " " +
snappyVersionDetails.getOrElse("buildDate", "")
} <br/>
Source Revision : {snappyVersionDetails.getOrElse("sourceRevision", "")} <br/>
Spark Version: {org.apache.spark.SPARK_VERSION}
</p>
<p>
For assistance, get started at: <br />
<a href="https://www.snappydata.io/community" target="_blank">
https://www.snappydata.io/community</a> <br />
<a href="https://www.tibco.com/" target="_blank">https://www.tibco.com/</a> <br />
<a href="http://snappydatainc.github.io/snappydata/" target="_blank">
Product Documentation
</a>
</p>
}
}
</div>
</div>
</div>
Expand Down