Merge pull request #90 from Landoop/0.9.3

0.9.3 release changes
lensesio · Oct 20, 2017 · 0d8202a · 0d8202a
2 parents 9d987fd + 11588b7
commit 0d8202a
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 36 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -56,10 +56,7 @@ module.exports = function (grunt) {
           'bower_components/handsontable/dist/handsontable.full.js',
           'bower_components/ngHandsontable/dist/ngHandsontable.js',
           'bower_components/handsontable/dist/handsontable.full.css',
-          'bower_components/angularjs-slider/dist/rzslider.min.js',
           'bower_components/angular-base64/angular-base64.js',
-          'bower_components/angularjs-slider/dist/rzslider.css'
-
         ],
         dest: 'dist',
         expand: true

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -0,0 +1,18 @@
+Third Party JS libraries included in Kafka Topics UI (v0.9.3)
+-----------------------------------------------------
+angular                                     : MIT                 - https://github.com/angular/angular.js
+angular-animate                             : MIT                 - https://github.com/angular/angular.js
+angular-aria                                : MIT                 - https://github.com/angular/angular.js
+angular-base64                              : MIT                 - https://github.com/ninjatronic/angular-base64
+angular-route                               : MIT                 - https://github.com/angular/angular.js
+angular-spinner                             : MIT                 - https://github.com/urish/angular-spinner
+angular-ui-ace                              : MIT                 - https://github.com/angular-ui/ui-ace
+angular-utils-pagination                    : MIT                 - https://github.com/michaelbromley/angularUtils-pagination
+angular-material                            : MIT                 - https://github.com/angular/material
+angular-material-data-table                 : MIT                 - https://github.com/daniel-nagy/md-data-table
+angularUtils-pagination                     : MIT                 - https://github.com/michaelbromley/angularUtils
+bootstrap                                   : MIT                 - https://github.com/twbs/bootstrap
+ngHandsontable                              : MIT                 - https://github.com/handsontable/ngHand
+ace-builds                                  : BSD-3               - https://github.com/ajaxorg/ace-builds
+angular-json-tree                           : Creative Commons    - https://github.com/awendland/angular-json-tree
+font-awesome                                : OFL 1.1             - http://fontawesome.io
diff --git a/bower.json b/bower.json
@@ -28,7 +28,6 @@
     "angularUtils-pagination": "angular-utils-pagination#^0.11.1",
     "font-awesome": "fontawesome#^4.6.3",
     "angular-material-data-table": "^0.10.9",
-    "angular-oboe": "*",
     "angular-cookies": "^1.6.5",
     "angular-json-tree": "^1.0.1",
     "ngHandsontable": "0.13.0",

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN wget "https://github.com/mholt/caddy/releases/download/v0.9.5/caddy_linux_am
     && rm -f /caddy.tgz
 
 # Add and Setup Kafka-Topics-Ui
-RUN wget https://github.com/Landoop/kafka-topics-ui/releases/download/v0.9.2/kafka-topics-ui-0.9.2.tar.gz \
+RUN wget https://github.com/Landoop/kafka-topics-ui/releases/download/v0.9.3/kafka-topics-ui-0.9.3.tar.gz \
          -O /kafka-topics-ui.tar.gz \
     && mkdir /kafka-topics-ui \
     && tar xzf /kafka-topics-ui.tar.gz -C /kafka-topics-ui \

diff --git a/env.js b/env.js
@@ -4,7 +4,7 @@ var clusters = [
       NAME: "prod",
       KAFKA_REST: "/api",
       MAX_BYTES: "50000", 	// Sets the default maximum amount of bytes to fetch from each topic
-      RECORD_POLL_TIMEOUT: "5000",
+      RECORD_POLL_TIMEOUT: "3000",
       COLOR: "#141414", // Optional
       DEBUG_LOGS_ENABLED: true
     },
@@ -13,7 +13,7 @@ var clusters = [
       KAFKA_REST: "localhost",
       MAX_BYTES: "50000",
       COLOR: "red",
-      RECORD_POLL_TIMEOUT: "5000",
+      RECORD_POLL_TIMEOUT: "3000",
       DEBUG_LOGS_ENABLED: true
     }
   ];
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kafka-topics-ui",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "A user interface for reading data from Kafka Topics",
   "readme": "README.md",
   "main": "Gruntfile.js",

diff --git a/src/kafka-topics/dashboard-components/version/project-version.html b/src/kafka-topics/dashboard-components/version/project-version.html
@@ -2,7 +2,7 @@
 <md-card style="box-shadow:none; margin-top:15px;" >
     <md-content flex layout-padding>
         <div>
-            <b style="font-weight: 500; text-transform: uppercase; font-size: 14px;">kafka-topics-ui</b> v0.9.2
+            <b style="font-weight: 500; text-transform: uppercase; font-size: 14px;">kafka-topics-ui</b> v0.9.3 
         </div>
     </md-content>
 </md-card>
diff --git a/src/kafka-topics/list/compact-topics-list.html b/src/kafka-topics/list/compact-topics-list.html
@@ -17,7 +17,7 @@
                       class="md-2-line"
                       ng-class="{ 'selectedListItem': topic.topicName == topicName }">
 
-          <p style="font-size:10px">{{shortenControlCenterName(topic)}}</p>
+          <p style="font-size:10px">{{topic.topicName}}</p>
         </md-list-item>
       </md-list>
     </div>

diff --git a/src/kafka-topics/list/topics-list.html b/src/kafka-topics/list/topics-list.html
@@ -34,8 +34,7 @@ <h3>
                         ng-class="{ 'selectedListItem': topicName == topic.topicName }">
 
             <div class="md-list-item-text" layout="column">
-              <!--<h4>{{shortenControlCenterName(topic.topicName)}}</h4>-->
-              <h4>{{shortenControlCenterName(topic)}}</h4>
+              <h4>{{topic.topicName}}</h4>
               <p style="font-size:12px;">
                 {{topic.partitions}} Partitions &#10799; {{topic.replication}} Replication
                 <span ng-if="topic.customConfig > 0" style="display:inline-block;">

diff --git a/src/kafka-topics/list/topics-list.module.js b/src/kafka-topics/list/topics-list.module.js
@@ -89,10 +89,6 @@ topicsListModule.controller('KafkaTopicsListCtrl', function ($scope, $location,
     } },
    true);
 
-  $scope.shortenControlCenterName = function (topic) {
-    return shortenControlCenterName(topic);
-  }
-
   $scope.query = { order: '-totalMessages', limit: 100, page: 1 };
 
   // This one is called each time - the user clicks on an md-table header (applies sorting)
@@ -179,26 +175,6 @@ function arrayObjectIndexOf(myArray, searchTerm, property) {
     return -1;
 }
 
-  function shortenControlCenterName(topic) {
-      if (topic.isControlTopic) {
-        return topic.topicName
-          .replace('_confluent-controlcenter-0-', '...')
-          // .replace('aggregate-topic-partition', 'aggregate-topic')
-          .replace('MonitoringMessageAggregatorWindows', 'monitor-msg')
-          //.replace('connect-configs', 'monitor-msg')
-          .replace('aggregatedTopicPartitionTableWindows', 'aggregate-window')
-          .replace('monitoring-aggregate-rekey', 'monitor-rekey')
-          .replace('MonitoringStream', 'monitor-stream')
-          .replace('MonitoringVerifierStore', 'monitor-verifier')
-          .replace('...Group', '...group')
-          .replace('FIFTEEN_SECONDS', '15sec')
-          .replace('ONE_HOUR', '1hour')
-          .replace('ONE_WEEK', '1week');
-      } else {
-        return topic.topicName;
-      }
-  }
-
 
   function loadSchemas(){
     var uuid=consumerFactory.genUUID();