Merge pull request #15 from grafana/fix_legacy_slugify

remove legacy slugify functions
grafana · Apr 9, 2018 · ddf616e · ddf616e
2 parents 193d94c + b228072
commit ddf616e
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 134 deletions.
diff --git a/dist/components/clusters/clusterInfo.js b/dist/components/clusters/clusterInfo.js
diff --git a/dist/components/clusters/clusterInfo.js.map b/dist/components/clusters/clusterInfo.js.map
diff --git a/dist/components/clusters/clusterInfo.ts b/dist/components/clusters/clusterInfo.ts
@@ -3,11 +3,6 @@
 import _ from 'lodash';
 import $ from 'jquery';
 
-function slugify(str) {
-  var slug = str.replace("@", "at").replace("&", "and").replace(/[.]/g, "_").replace("/\W+/", "");
-  return slug;
-}
-
 export class ClusterInfoCtrl {
   cluster: any;
   pageReady: boolean;
@@ -96,7 +91,7 @@ export class ClusterInfoCtrl {
       .search({
         "var-datasource": this.cluster.jsonData.ds,
         "var-cluster": this.cluster.name,
-        "var-node": node === 'All' ? 'All': slugify(node.metadata.name)
+        "var-node": node === 'All' ? 'All': node.metadata.name
       });
     }
   }
@@ -107,7 +102,7 @@ export class ClusterInfoCtrl {
       this.$location.path("plugins/grafana-kubernetes-app/page/cluster-workloads")
       .search({
         "cluster": this.cluster.id,
-        "namespace": slugify(ns.metadata.name)
+        "namespace": ns.metadata.name
       });
     }
   }

diff --git a/dist/components/clusters/clusterWorkloads.js b/dist/components/clusters/clusterWorkloads.js