You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2019/04/24 12:39:36 UTC
[atlas] branch branch-1.0 updated: ATLAS-2976: UI - Show entity
specific icon for the lineage node (folder changes)
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-1.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-1.0 by this push:
new 1dc6059 ATLAS-2976: UI - Show entity specific icon for the lineage node (folder changes)
1dc6059 is described below
commit 1dc6059d81ff62021b87e75248f62d0faba87504
Author: kevalbhatt <kb...@apache.org>
AuthorDate: Tue Dec 4 18:25:06 2018 +0530
ATLAS-2976: UI - Show entity specific icon for the lineage node (folder changes)
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
(cherry picked from commit 97e131a58849d17145d9ccc0997c050866e532c3)
---
.../public/img/entity-icon/{avro => }/avro.png | Bin
.../public/img/entity-icon/{default => }/db.png | Bin
.../img/entity-icon/{avro => }/disabled/avro.png | Bin
.../img/entity-icon/{default => }/disabled/db.png | Bin
.../entity-icon/{falcon => }/disabled/falcon.png | Bin
.../{file_system => }/disabled/file_system.png | Bin
.../entity-icon/{hadoop => }/disabled/hadoop.png | Bin
.../img/entity-icon/{hbase => }/disabled/hbase.png | Bin
.../{hbase => }/disabled/hbase_column.png | Bin
.../{hbase => }/disabled/hbase_column_family.png | Bin
.../hbase.png => disabled/hbase_namespace.png} | Bin
.../{hbase => }/disabled/hbase_table.png | Bin
.../file_system.png => disabled/hdfs_path.png} | Bin
.../img/entity-icon/{hive => }/disabled/hive.png | Bin
.../{hive => }/disabled/hive_column.png | Bin
.../{hive => }/disabled/hive_column_lineage.png | Bin
.../entity-icon/{hive => }/disabled/hive_db.png | Bin
.../{hive => }/disabled/hive_process.png | Bin
.../{hive => }/disabled/hive_storagedesc.png | Bin
.../entity-icon/{hive => }/disabled/hive_table.png | Bin
.../entity-icon/{kafka => }/disabled/jms_topic.png | Bin
.../img/entity-icon/{kafka => }/disabled/kafka.png | Bin
.../kafka.png => disabled/kafka_topic.png} | Bin
.../entity-icon/{default => }/disabled/process.png | Bin
.../img/entity-icon/{rdbms => }/disabled/rdbms.png | Bin
.../{rdbms => }/disabled/rdbms_column.png | Bin
.../entity-icon/{rdbms => }/disabled/rdbms_db.png | Bin
.../{rdbms => }/disabled/rdbms_table.png | Bin
.../img/entity-icon/{sqoop => }/disabled/sqoop.png | Bin
.../entity-icon/{sqoop => }/disabled/sqoop_db.png | Bin
.../{sqoop => }/disabled/sqoop_process.png | Bin
.../img/entity-icon/{storm => }/disabled/storm.png | Bin
.../{storm => }/disabled/storm_bolt.png | Bin
.../{storm => }/disabled/storm_spout.png | Bin
.../{storm => }/disabled/storm_topology.png | Bin
.../entity-icon/{default => }/disabled/table.png | Bin
.../public/img/entity-icon/{falcon => }/falcon.png | Bin
.../entity-icon/{file_system => }/file_system.png | Bin
.../public/img/entity-icon/{hadoop => }/hadoop.png | Bin
.../public/img/entity-icon/{hbase => }/hbase.png | Bin
.../img/entity-icon/{hbase => }/hbase_column.png | Bin
.../{hbase => }/hbase_column_family.png | Bin
.../{hbase/hbase.png => hbase_namespace.png} | Bin
.../img/entity-icon/{hbase => }/hbase_table.png | Bin
.../{file_system/file_system.png => hdfs_path.png} | Bin
.../public/img/entity-icon/{hive => }/hive.png | Bin
.../img/entity-icon/{hive => }/hive_column.png | Bin
.../entity-icon/{hive => }/hive_column_lineage.png | Bin
.../public/img/entity-icon/{hive => }/hive_db.png | Bin
.../img/entity-icon/{hive => }/hive_process.png | Bin
.../entity-icon/{hive => }/hive_storagedesc.png | Bin
.../img/entity-icon/{hive => }/hive_table.png | Bin
.../img/entity-icon/{kafka => }/jms_topic.png | Bin
.../public/img/entity-icon/{kafka => }/kafka.png | Bin
.../{kafka/kafka.png => kafka_topic.png} | Bin
.../img/entity-icon/{default => }/process.png | Bin
.../public/img/entity-icon/{rdbms => }/rdbms.png | Bin
.../img/entity-icon/{rdbms => }/rdbms_column.png | Bin
.../img/entity-icon/{rdbms => }/rdbms_db.png | Bin
.../img/entity-icon/{rdbms => }/rdbms_table.png | Bin
dashboardv2/public/img/entity-icon/spark/spark.png | Bin 6671 -> 0 bytes
.../public/img/entity-icon/{sqoop => }/sqoop.png | Bin
.../img/entity-icon/{sqoop => }/sqoop_db.png | Bin
.../img/entity-icon/{sqoop => }/sqoop_process.png | Bin
.../public/img/entity-icon/{storm => }/storm.png | Bin
.../img/entity-icon/{storm => }/storm_bolt.png | Bin
.../img/entity-icon/{storm => }/storm_spout.png | Bin
.../img/entity-icon/{storm => }/storm_topology.png | Bin
.../public/img/entity-icon/{default => }/table.png | Bin
dashboardv2/public/js/utils/Utils.js | 61 ++++++++++++---------
.../js/views/detail_page/DetailPageLayoutView.js | 30 +++++-----
71 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/dashboardv2/public/img/entity-icon/avro/avro.png b/dashboardv2/public/img/entity-icon/avro.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/avro/avro.png
rename to dashboardv2/public/img/entity-icon/avro.png
diff --git a/dashboardv2/public/img/entity-icon/default/db.png b/dashboardv2/public/img/entity-icon/db.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/default/db.png
rename to dashboardv2/public/img/entity-icon/db.png
diff --git a/dashboardv2/public/img/entity-icon/avro/disabled/avro.png b/dashboardv2/public/img/entity-icon/disabled/avro.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/avro/disabled/avro.png
rename to dashboardv2/public/img/entity-icon/disabled/avro.png
diff --git a/dashboardv2/public/img/entity-icon/default/disabled/db.png b/dashboardv2/public/img/entity-icon/disabled/db.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/default/disabled/db.png
rename to dashboardv2/public/img/entity-icon/disabled/db.png
diff --git a/dashboardv2/public/img/entity-icon/falcon/disabled/falcon.png b/dashboardv2/public/img/entity-icon/disabled/falcon.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/falcon/disabled/falcon.png
rename to dashboardv2/public/img/entity-icon/disabled/falcon.png
diff --git a/dashboardv2/public/img/entity-icon/file_system/disabled/file_system.png b/dashboardv2/public/img/entity-icon/disabled/file_system.png
similarity index 100%
copy from dashboardv2/public/img/entity-icon/file_system/disabled/file_system.png
copy to dashboardv2/public/img/entity-icon/disabled/file_system.png
diff --git a/dashboardv2/public/img/entity-icon/hadoop/disabled/hadoop.png b/dashboardv2/public/img/entity-icon/disabled/hadoop.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hadoop/disabled/hadoop.png
rename to dashboardv2/public/img/entity-icon/disabled/hadoop.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/disabled/hbase.png b/dashboardv2/public/img/entity-icon/disabled/hbase.png
similarity index 100%
copy from dashboardv2/public/img/entity-icon/hbase/disabled/hbase.png
copy to dashboardv2/public/img/entity-icon/disabled/hbase.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/disabled/hbase_column.png b/dashboardv2/public/img/entity-icon/disabled/hbase_column.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hbase/disabled/hbase_column.png
rename to dashboardv2/public/img/entity-icon/disabled/hbase_column.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/disabled/hbase_column_family.png b/dashboardv2/public/img/entity-icon/disabled/hbase_column_family.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hbase/disabled/hbase_column_family.png
rename to dashboardv2/public/img/entity-icon/disabled/hbase_column_family.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/disabled/hbase.png b/dashboardv2/public/img/entity-icon/disabled/hbase_namespace.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hbase/disabled/hbase.png
rename to dashboardv2/public/img/entity-icon/disabled/hbase_namespace.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/disabled/hbase_table.png b/dashboardv2/public/img/entity-icon/disabled/hbase_table.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hbase/disabled/hbase_table.png
rename to dashboardv2/public/img/entity-icon/disabled/hbase_table.png
diff --git a/dashboardv2/public/img/entity-icon/file_system/disabled/file_system.png b/dashboardv2/public/img/entity-icon/disabled/hdfs_path.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/file_system/disabled/file_system.png
rename to dashboardv2/public/img/entity-icon/disabled/hdfs_path.png
diff --git a/dashboardv2/public/img/entity-icon/hive/disabled/hive.png b/dashboardv2/public/img/entity-icon/disabled/hive.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/disabled/hive.png
rename to dashboardv2/public/img/entity-icon/disabled/hive.png
diff --git a/dashboardv2/public/img/entity-icon/hive/disabled/hive_column.png b/dashboardv2/public/img/entity-icon/disabled/hive_column.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/disabled/hive_column.png
rename to dashboardv2/public/img/entity-icon/disabled/hive_column.png
diff --git a/dashboardv2/public/img/entity-icon/hive/disabled/hive_column_lineage.png b/dashboardv2/public/img/entity-icon/disabled/hive_column_lineage.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/disabled/hive_column_lineage.png
rename to dashboardv2/public/img/entity-icon/disabled/hive_column_lineage.png
diff --git a/dashboardv2/public/img/entity-icon/hive/disabled/hive_db.png b/dashboardv2/public/img/entity-icon/disabled/hive_db.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/disabled/hive_db.png
rename to dashboardv2/public/img/entity-icon/disabled/hive_db.png
diff --git a/dashboardv2/public/img/entity-icon/hive/disabled/hive_process.png b/dashboardv2/public/img/entity-icon/disabled/hive_process.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/disabled/hive_process.png
rename to dashboardv2/public/img/entity-icon/disabled/hive_process.png
diff --git a/dashboardv2/public/img/entity-icon/hive/disabled/hive_storagedesc.png b/dashboardv2/public/img/entity-icon/disabled/hive_storagedesc.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/disabled/hive_storagedesc.png
rename to dashboardv2/public/img/entity-icon/disabled/hive_storagedesc.png
diff --git a/dashboardv2/public/img/entity-icon/hive/disabled/hive_table.png b/dashboardv2/public/img/entity-icon/disabled/hive_table.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/disabled/hive_table.png
rename to dashboardv2/public/img/entity-icon/disabled/hive_table.png
diff --git a/dashboardv2/public/img/entity-icon/kafka/disabled/jms_topic.png b/dashboardv2/public/img/entity-icon/disabled/jms_topic.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/kafka/disabled/jms_topic.png
rename to dashboardv2/public/img/entity-icon/disabled/jms_topic.png
diff --git a/dashboardv2/public/img/entity-icon/kafka/disabled/kafka.png b/dashboardv2/public/img/entity-icon/disabled/kafka.png
similarity index 100%
copy from dashboardv2/public/img/entity-icon/kafka/disabled/kafka.png
copy to dashboardv2/public/img/entity-icon/disabled/kafka.png
diff --git a/dashboardv2/public/img/entity-icon/kafka/disabled/kafka.png b/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/kafka/disabled/kafka.png
rename to dashboardv2/public/img/entity-icon/disabled/kafka_topic.png
diff --git a/dashboardv2/public/img/entity-icon/default/disabled/process.png b/dashboardv2/public/img/entity-icon/disabled/process.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/default/disabled/process.png
rename to dashboardv2/public/img/entity-icon/disabled/process.png
diff --git a/dashboardv2/public/img/entity-icon/rdbms/disabled/rdbms.png b/dashboardv2/public/img/entity-icon/disabled/rdbms.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/rdbms/disabled/rdbms.png
rename to dashboardv2/public/img/entity-icon/disabled/rdbms.png
diff --git a/dashboardv2/public/img/entity-icon/rdbms/disabled/rdbms_column.png b/dashboardv2/public/img/entity-icon/disabled/rdbms_column.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/rdbms/disabled/rdbms_column.png
rename to dashboardv2/public/img/entity-icon/disabled/rdbms_column.png
diff --git a/dashboardv2/public/img/entity-icon/rdbms/disabled/rdbms_db.png b/dashboardv2/public/img/entity-icon/disabled/rdbms_db.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/rdbms/disabled/rdbms_db.png
rename to dashboardv2/public/img/entity-icon/disabled/rdbms_db.png
diff --git a/dashboardv2/public/img/entity-icon/rdbms/disabled/rdbms_table.png b/dashboardv2/public/img/entity-icon/disabled/rdbms_table.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/rdbms/disabled/rdbms_table.png
rename to dashboardv2/public/img/entity-icon/disabled/rdbms_table.png
diff --git a/dashboardv2/public/img/entity-icon/sqoop/disabled/sqoop.png b/dashboardv2/public/img/entity-icon/disabled/sqoop.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/sqoop/disabled/sqoop.png
rename to dashboardv2/public/img/entity-icon/disabled/sqoop.png
diff --git a/dashboardv2/public/img/entity-icon/sqoop/disabled/sqoop_db.png b/dashboardv2/public/img/entity-icon/disabled/sqoop_db.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/sqoop/disabled/sqoop_db.png
rename to dashboardv2/public/img/entity-icon/disabled/sqoop_db.png
diff --git a/dashboardv2/public/img/entity-icon/sqoop/disabled/sqoop_process.png b/dashboardv2/public/img/entity-icon/disabled/sqoop_process.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/sqoop/disabled/sqoop_process.png
rename to dashboardv2/public/img/entity-icon/disabled/sqoop_process.png
diff --git a/dashboardv2/public/img/entity-icon/storm/disabled/storm.png b/dashboardv2/public/img/entity-icon/disabled/storm.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/storm/disabled/storm.png
rename to dashboardv2/public/img/entity-icon/disabled/storm.png
diff --git a/dashboardv2/public/img/entity-icon/storm/disabled/storm_bolt.png b/dashboardv2/public/img/entity-icon/disabled/storm_bolt.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/storm/disabled/storm_bolt.png
rename to dashboardv2/public/img/entity-icon/disabled/storm_bolt.png
diff --git a/dashboardv2/public/img/entity-icon/storm/disabled/storm_spout.png b/dashboardv2/public/img/entity-icon/disabled/storm_spout.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/storm/disabled/storm_spout.png
rename to dashboardv2/public/img/entity-icon/disabled/storm_spout.png
diff --git a/dashboardv2/public/img/entity-icon/storm/disabled/storm_topology.png b/dashboardv2/public/img/entity-icon/disabled/storm_topology.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/storm/disabled/storm_topology.png
rename to dashboardv2/public/img/entity-icon/disabled/storm_topology.png
diff --git a/dashboardv2/public/img/entity-icon/default/disabled/table.png b/dashboardv2/public/img/entity-icon/disabled/table.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/default/disabled/table.png
rename to dashboardv2/public/img/entity-icon/disabled/table.png
diff --git a/dashboardv2/public/img/entity-icon/falcon/falcon.png b/dashboardv2/public/img/entity-icon/falcon.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/falcon/falcon.png
rename to dashboardv2/public/img/entity-icon/falcon.png
diff --git a/dashboardv2/public/img/entity-icon/file_system/file_system.png b/dashboardv2/public/img/entity-icon/file_system.png
similarity index 100%
copy from dashboardv2/public/img/entity-icon/file_system/file_system.png
copy to dashboardv2/public/img/entity-icon/file_system.png
diff --git a/dashboardv2/public/img/entity-icon/hadoop/hadoop.png b/dashboardv2/public/img/entity-icon/hadoop.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hadoop/hadoop.png
rename to dashboardv2/public/img/entity-icon/hadoop.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/hbase.png b/dashboardv2/public/img/entity-icon/hbase.png
similarity index 100%
copy from dashboardv2/public/img/entity-icon/hbase/hbase.png
copy to dashboardv2/public/img/entity-icon/hbase.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/hbase_column.png b/dashboardv2/public/img/entity-icon/hbase_column.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hbase/hbase_column.png
rename to dashboardv2/public/img/entity-icon/hbase_column.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/hbase_column_family.png b/dashboardv2/public/img/entity-icon/hbase_column_family.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hbase/hbase_column_family.png
rename to dashboardv2/public/img/entity-icon/hbase_column_family.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/hbase.png b/dashboardv2/public/img/entity-icon/hbase_namespace.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hbase/hbase.png
rename to dashboardv2/public/img/entity-icon/hbase_namespace.png
diff --git a/dashboardv2/public/img/entity-icon/hbase/hbase_table.png b/dashboardv2/public/img/entity-icon/hbase_table.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hbase/hbase_table.png
rename to dashboardv2/public/img/entity-icon/hbase_table.png
diff --git a/dashboardv2/public/img/entity-icon/file_system/file_system.png b/dashboardv2/public/img/entity-icon/hdfs_path.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/file_system/file_system.png
rename to dashboardv2/public/img/entity-icon/hdfs_path.png
diff --git a/dashboardv2/public/img/entity-icon/hive/hive.png b/dashboardv2/public/img/entity-icon/hive.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/hive.png
rename to dashboardv2/public/img/entity-icon/hive.png
diff --git a/dashboardv2/public/img/entity-icon/hive/hive_column.png b/dashboardv2/public/img/entity-icon/hive_column.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/hive_column.png
rename to dashboardv2/public/img/entity-icon/hive_column.png
diff --git a/dashboardv2/public/img/entity-icon/hive/hive_column_lineage.png b/dashboardv2/public/img/entity-icon/hive_column_lineage.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/hive_column_lineage.png
rename to dashboardv2/public/img/entity-icon/hive_column_lineage.png
diff --git a/dashboardv2/public/img/entity-icon/hive/hive_db.png b/dashboardv2/public/img/entity-icon/hive_db.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/hive_db.png
rename to dashboardv2/public/img/entity-icon/hive_db.png
diff --git a/dashboardv2/public/img/entity-icon/hive/hive_process.png b/dashboardv2/public/img/entity-icon/hive_process.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/hive_process.png
rename to dashboardv2/public/img/entity-icon/hive_process.png
diff --git a/dashboardv2/public/img/entity-icon/hive/hive_storagedesc.png b/dashboardv2/public/img/entity-icon/hive_storagedesc.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/hive_storagedesc.png
rename to dashboardv2/public/img/entity-icon/hive_storagedesc.png
diff --git a/dashboardv2/public/img/entity-icon/hive/hive_table.png b/dashboardv2/public/img/entity-icon/hive_table.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/hive/hive_table.png
rename to dashboardv2/public/img/entity-icon/hive_table.png
diff --git a/dashboardv2/public/img/entity-icon/kafka/jms_topic.png b/dashboardv2/public/img/entity-icon/jms_topic.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/kafka/jms_topic.png
rename to dashboardv2/public/img/entity-icon/jms_topic.png
diff --git a/dashboardv2/public/img/entity-icon/kafka/kafka.png b/dashboardv2/public/img/entity-icon/kafka.png
similarity index 100%
copy from dashboardv2/public/img/entity-icon/kafka/kafka.png
copy to dashboardv2/public/img/entity-icon/kafka.png
diff --git a/dashboardv2/public/img/entity-icon/kafka/kafka.png b/dashboardv2/public/img/entity-icon/kafka_topic.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/kafka/kafka.png
rename to dashboardv2/public/img/entity-icon/kafka_topic.png
diff --git a/dashboardv2/public/img/entity-icon/default/process.png b/dashboardv2/public/img/entity-icon/process.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/default/process.png
rename to dashboardv2/public/img/entity-icon/process.png
diff --git a/dashboardv2/public/img/entity-icon/rdbms/rdbms.png b/dashboardv2/public/img/entity-icon/rdbms.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/rdbms/rdbms.png
rename to dashboardv2/public/img/entity-icon/rdbms.png
diff --git a/dashboardv2/public/img/entity-icon/rdbms/rdbms_column.png b/dashboardv2/public/img/entity-icon/rdbms_column.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/rdbms/rdbms_column.png
rename to dashboardv2/public/img/entity-icon/rdbms_column.png
diff --git a/dashboardv2/public/img/entity-icon/rdbms/rdbms_db.png b/dashboardv2/public/img/entity-icon/rdbms_db.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/rdbms/rdbms_db.png
rename to dashboardv2/public/img/entity-icon/rdbms_db.png
diff --git a/dashboardv2/public/img/entity-icon/rdbms/rdbms_table.png b/dashboardv2/public/img/entity-icon/rdbms_table.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/rdbms/rdbms_table.png
rename to dashboardv2/public/img/entity-icon/rdbms_table.png
diff --git a/dashboardv2/public/img/entity-icon/spark/spark.png b/dashboardv2/public/img/entity-icon/spark/spark.png
deleted file mode 100644
index daaa56c..0000000
Binary files a/dashboardv2/public/img/entity-icon/spark/spark.png and /dev/null differ
diff --git a/dashboardv2/public/img/entity-icon/sqoop/sqoop.png b/dashboardv2/public/img/entity-icon/sqoop.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/sqoop/sqoop.png
rename to dashboardv2/public/img/entity-icon/sqoop.png
diff --git a/dashboardv2/public/img/entity-icon/sqoop/sqoop_db.png b/dashboardv2/public/img/entity-icon/sqoop_db.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/sqoop/sqoop_db.png
rename to dashboardv2/public/img/entity-icon/sqoop_db.png
diff --git a/dashboardv2/public/img/entity-icon/sqoop/sqoop_process.png b/dashboardv2/public/img/entity-icon/sqoop_process.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/sqoop/sqoop_process.png
rename to dashboardv2/public/img/entity-icon/sqoop_process.png
diff --git a/dashboardv2/public/img/entity-icon/storm/storm.png b/dashboardv2/public/img/entity-icon/storm.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/storm/storm.png
rename to dashboardv2/public/img/entity-icon/storm.png
diff --git a/dashboardv2/public/img/entity-icon/storm/storm_bolt.png b/dashboardv2/public/img/entity-icon/storm_bolt.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/storm/storm_bolt.png
rename to dashboardv2/public/img/entity-icon/storm_bolt.png
diff --git a/dashboardv2/public/img/entity-icon/storm/storm_spout.png b/dashboardv2/public/img/entity-icon/storm_spout.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/storm/storm_spout.png
rename to dashboardv2/public/img/entity-icon/storm_spout.png
diff --git a/dashboardv2/public/img/entity-icon/storm/storm_topology.png b/dashboardv2/public/img/entity-icon/storm_topology.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/storm/storm_topology.png
rename to dashboardv2/public/img/entity-icon/storm_topology.png
diff --git a/dashboardv2/public/img/entity-icon/default/table.png b/dashboardv2/public/img/entity-icon/table.png
similarity index 100%
rename from dashboardv2/public/img/entity-icon/default/table.png
rename to dashboardv2/public/img/entity-icon/table.png
diff --git a/dashboardv2/public/js/utils/Utils.js b/dashboardv2/public/js/utils/Utils.js
index 32015e6..43b18d8 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -77,44 +77,51 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
return url.replace(/\/[\w-]+.(jsp|html)|\/+$/ig, '');
};
Utils.getEntityIconPath = function(options) {
- var entityData = null,
- serviceType = null,
- status = null,
+ var entityData = options && options.entityData,
+ serviceType,
+ status,
+ typeName,
iconBasePath = Utils.getBaseUrl(window.location.pathname) + Globals.entityImgPath;
- if (options) {
- entityData = options.entityData;
+ if (entityData) {
+ typeName = entityData.typeName;
serviceType = entityData && entityData.serviceType;
status = entityData && entityData.status;
}
+ function getImgPath(imageName) {
+ return iconBasePath + (Enums.entityStateReadOnly[status] ? "disabled/" + imageName : imageName);
+ }
+
+ function getDefaultImgPath() {
+ if (entityData.isProcess) {
+ if (Enums.entityStateReadOnly[status]) {
+ return iconBasePath + 'disabled/process.png';
+ } else {
+ return iconBasePath + 'process.png';
+ }
+ } else {
+ if (Enums.entityStateReadOnly[status]) {
+ return iconBasePath + 'disabled/table.png';
+ } else {
+ return iconBasePath + 'table.png';
+ }
+ }
+ }
+
if (entityData) {
if (options.errorUrl) {
- var isErrorInDefaultServiceType = (serviceType && options.errorUrl && options.errorUrl.match("/" + serviceType + "/" + serviceType + ".png|/" + serviceType + "/disabled/" + serviceType + ".png") ? true : false);
- if (serviceType && !isErrorInDefaultServiceType) {
+ var isErrorInTypeName = (options.errorUrl && options.errorUrl.match("entity-icon/" + typeName + ".png|disabled/" + typeName + ".png") ? true : false);
+ if (serviceType && isErrorInTypeName) {
var imageName = serviceType + ".png";
- return iconBasePath + serviceType + (Enums.entityStateReadOnly[status] ? "/disabled/" + imageName : "/" + imageName);
+ return getImgPath(imageName);
} else {
- if (entityData.isProcess) {
- if (Enums.entityStateReadOnly[status]) {
- return iconBasePath + 'default/disabled/process.png';
- } else {
- return iconBasePath + 'default/process.png';
- }
- } else {
- if (Enums.entityStateReadOnly[status]) {
- return iconBasePath + 'default/disabled/table.png';
- } else {
- return iconBasePath + 'default/table.png';
- }
- }
+ return getDefaultImgPath();
}
- } else {
+ } else if (entityData.typeName) {
var imageName = entityData.typeName + ".png";
- if (serviceType) {
- return iconBasePath + serviceType + (Enums.entityStateReadOnly[status] ? "/disabled/" + imageName : "/" + imageName);
- } else {
- return iconBasePath + (Enums.entityStateReadOnly[status] ? "default/disabled/" + imageName : "default/" + imageName);
- }
+ return getImgPath(imageName);
+ } else {
+ return getDefaultImgPath();
}
}
}
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index d53b283..2b5ca33 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -141,6 +141,18 @@ define(['require',
referredEntities: this.entityObject.referredEntities
});
+ // check if entity is process
+ var isProcess = false,
+ superTypes = Utils.getNestedSuperTypes({ data: this.activeEntityDef.toJSON(), collection: this.entityDefCollection }),
+ isLineageRender = _.find(superTypes, function(type) {
+ if (type === "DataSet" || type === "Process") {
+ if (type === "Process") {
+ isProcess = true;
+ }
+ return true;
+ }
+ });
+
if (collectionJSON && collectionJSON.guid) {
var tagGuid = collectionJSON.guid;
this.readOnly = Enums.entityStateReadOnly[collectionJSON.status];
@@ -169,7 +181,7 @@ define(['require',
titleName += '<button title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i> Deleted</button>';
}
this.ui.title.html(titleName);
- var entityData = _.extend({ serviceType: this.activeEntityDef && this.activeEntityDef.get('serviceType') }, collectionJSON);
+ var entityData = _.extend({ "serviceType": this.activeEntityDef && this.activeEntityDef.get('serviceType'), "isProcess": isProcess }, collectionJSON);
if (this.readOnly) {
this.ui.entityIcon.addClass('disabled');
} else {
@@ -268,22 +280,10 @@ define(['require',
});
}
-
- var processCheck = false,
- containsList = Utils.getNestedSuperTypes({ data: this.activeEntityDef.toJSON(), collection: this.entityDefCollection }),
- superType = _.find(containsList, function(type) {
- if (type === "DataSet" || type === "Process") {
- if (type === "Process") {
- processCheck = true;
- }
- return true;
- }
- });
-
- if (superType) {
+ if (isLineageRender) {
this.$('.lineageGraph').show();
this.renderLineageLayoutView({
- processCheck: processCheck,
+ processCheck: isProcess,
guid: this.id,
entityDefCollection: this.entityDefCollection,
fetchCollection: this.fetchCollection.bind(this),