This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 16d810a887f52bd76a67ac6636664f60afef86fa
Author: kevalbhatt <kbh...@apache.org>
AuthorDate: Wed Jun 10 13:00:03 2020 +0530
ATLAS-3831: UI: Add entity icon for spark
(cherry picked from commit 0df34884deb73237cfb5ecb367a5e4510a080357)
---
dashboardv2/public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes
.../public/img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes
.../public/img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes
dashboardv2/public/img/entity-icon/spark.png | Bin 0 -> 6685 bytes
dashboardv2/public/img/entity-icon/spark_process.png | Bin 0 -> 10072 bytes
dashboardv2/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes
dashboardv3/public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes
.../public/img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes
.../public/img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes
dashboardv3/public/img/entity-icon/spark.png | Bin 0 -> 6685 bytes
dashboardv3/public/img/entity-icon/spark_process.png | Bin 0 -> 10072 bytes
dashboardv3/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes
dashboardv3/public/js/utils/Utils.js | 8 ++++----
13 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/img/entity-icon/disabled/spark.png
b/dashboardv2/public/img/entity-icon/disabled/spark.png
new file mode 100644
index 0000000..93f8a4d
Binary files /dev/null and
b/dashboardv2/public/img/entity-icon/disabled/spark.png differ
diff --git a/dashboardv2/public/img/entity-icon/disabled/spark_process.png
b/dashboardv2/public/img/entity-icon/disabled/spark_process.png
new file mode 100644
index 0000000..bf19121
Binary files /dev/null and
b/dashboardv2/public/img/entity-icon/disabled/spark_process.png differ
diff --git a/dashboardv2/public/img/entity-icon/disabled/spark_table.png
b/dashboardv2/public/img/entity-icon/disabled/spark_table.png
new file mode 100644
index 0000000..1404026
Binary files /dev/null and
b/dashboardv2/public/img/entity-icon/disabled/spark_table.png differ
diff --git a/dashboardv2/public/img/entity-icon/spark.png
b/dashboardv2/public/img/entity-icon/spark.png
new file mode 100644
index 0000000..27bf2f7
Binary files /dev/null and b/dashboardv2/public/img/entity-icon/spark.png differ
diff --git a/dashboardv2/public/img/entity-icon/spark_process.png
b/dashboardv2/public/img/entity-icon/spark_process.png
new file mode 100644
index 0000000..077b035
Binary files /dev/null and
b/dashboardv2/public/img/entity-icon/spark_process.png differ
diff --git a/dashboardv2/public/img/entity-icon/spark_table.png
b/dashboardv2/public/img/entity-icon/spark_table.png
new file mode 100644
index 0000000..af90c24
Binary files /dev/null and b/dashboardv2/public/img/entity-icon/spark_table.png
differ
diff --git a/dashboardv3/public/img/entity-icon/disabled/spark.png
b/dashboardv3/public/img/entity-icon/disabled/spark.png
new file mode 100644
index 0000000..93f8a4d
Binary files /dev/null and
b/dashboardv3/public/img/entity-icon/disabled/spark.png differ
diff --git a/dashboardv3/public/img/entity-icon/disabled/spark_process.png
b/dashboardv3/public/img/entity-icon/disabled/spark_process.png
new file mode 100644
index 0000000..bf19121
Binary files /dev/null and
b/dashboardv3/public/img/entity-icon/disabled/spark_process.png differ
diff --git a/dashboardv3/public/img/entity-icon/disabled/spark_table.png
b/dashboardv3/public/img/entity-icon/disabled/spark_table.png
new file mode 100644
index 0000000..1404026
Binary files /dev/null and
b/dashboardv3/public/img/entity-icon/disabled/spark_table.png differ
diff --git a/dashboardv3/public/img/entity-icon/spark.png
b/dashboardv3/public/img/entity-icon/spark.png
new file mode 100644
index 0000000..27bf2f7
Binary files /dev/null and b/dashboardv3/public/img/entity-icon/spark.png differ
diff --git a/dashboardv3/public/img/entity-icon/spark_process.png
b/dashboardv3/public/img/entity-icon/spark_process.png
new file mode 100644
index 0000000..077b035
Binary files /dev/null and
b/dashboardv3/public/img/entity-icon/spark_process.png differ
diff --git a/dashboardv3/public/img/entity-icon/spark_table.png
b/dashboardv3/public/img/entity-icon/spark_table.png
new file mode 100644
index 0000000..af90c24
Binary files /dev/null and b/dashboardv3/public/img/entity-icon/spark_table.png
differ
diff --git a/dashboardv3/public/js/utils/Utils.js
b/dashboardv3/public/js/utils/Utils.js
index 7b957da..40bb698 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -73,10 +73,10 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
});
return uuid;
};
- Utils.getBaseUrl = function(url) {
+ Utils.getBaseUrl = function(url, noPop) {
var path = url.replace(/\/[\w-]+.(jsp|html)|\/+$/ig, ''),
splitPath = path.split("/");
- if (splitPath && splitPath[splitPath.length - 1] === "n") {
+ if (noPop !== true && splitPath && splitPath[splitPath.length - 1] ===
"n") {
splitPath.pop();
return splitPath.join("/");
}
@@ -87,7 +87,7 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
serviceType,
status,
typeName,
- iconBasePath = Utils.getBaseUrl(window.location.pathname) +
Globals.entityImgPath;
+ iconBasePath = Utils.getBaseUrl(window.location.pathname, true) +
Globals.entityImgPath;
if (entityData) {
typeName = entityData.typeName;
serviceType = entityData && entityData.serviceType;
@@ -283,7 +283,7 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
var existingError = $(".ui-pnotify-container.alert-danger
.ui-pnotify-text").text();
if (existingError !== message) {
Utils.notifyError({
- html:isHtml,
+ html: isHtml,
content: message
});
}
