From 10b078d89d6ad2834b029bceb456a99b56bd26b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Furkan=20Ba=C5=9Faran?= <frknbasaran@gmail.com>
Date: Mon, 7 Mar 2022 17:58:46 +0300
Subject: [PATCH] [feature-renaming] moved featureBeautifier method into
 countlyAuth.

changed naming method by read feature name from localization file.
---
 .../javascripts/countly.views.js              | 23 ++-----------------
 .../user-management/templates/drawer.html     |  2 +-
 .../javascripts/countly/countly.auth.js       |  9 ++++++++
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/frontend/express/public/core/user-management/javascripts/countly.views.js b/frontend/express/public/core/user-management/javascripts/countly.views.js
index d1a2735b7bd..9e79441d118 100644
--- a/frontend/express/public/core/user-management/javascripts/countly.views.js
+++ b/frontend/express/public/core/user-management/javascripts/countly.views.js
@@ -1,9 +1,5 @@
 /*global countlyAuth, app, countlyGlobal, $, groupsModel, CV, countlyVue, countlyUserManagement, countlyCommon, CountlyHelpers */
 (function() {
-    var featureNameMapper = {
-        'block': 'filtering_rules',
-        'geo': 'location_targeting'
-    };
 
     var DataTable = countlyVue.views.create({
         template: CV.T("/core/user-management/templates/data-table.html"),
@@ -153,6 +149,7 @@
             };
         },
         methods: {
+            featureBeautifier: countlyAuth.featureBeautifier,
             generatePassword: function() {
                 var generatedPassword = CountlyHelpers.generatePassword(countlyGlobal.security.password_min);
                 this.$refs.userDrawer.editedObject.password = generatedPassword;
@@ -599,15 +596,6 @@
                     this.permissionSets.push(permissionSet_);
                 }
             },
-            // TODO: move this to countlyAuth
-            featureBeautifier: function(featureName) {
-                var fa = featureName.split('_');
-                var ret = '';
-                for (var i = 0; i < fa.length; i++) {
-                    ret += fa[i].substr(0, 1).toUpperCase() + fa[i].substr(1, fa[i].length - 1) + ' ';
-                }
-                return ret;
-            },
             onGroupChange: function(groupVal) {
                 this.group = groupVal;
             },
@@ -690,14 +678,7 @@
                     self.users.push(usersObj[user]);
                 }
                 self.loading = false;
-                self.features = countlyUserManagement.getFeatures().map(function(f) {
-                    if (featureNameMapper[f]) {
-                        return featureNameMapper[f];
-                    }
-                    else {
-                        return f;
-                    }
-                }).sort();
+                self.features = countlyUserManagement.getFeatures().sort();
             });
         }
     });
diff --git a/frontend/express/public/core/user-management/templates/drawer.html b/frontend/express/public/core/user-management/templates/drawer.html
index e6cc6ab06e2..2a100bfc3e0 100644
--- a/frontend/express/public/core/user-management/templates/drawer.html
+++ b/frontend/express/public/core/user-management/templates/drawer.html
@@ -184,7 +184,7 @@
                 </div>
                 <div class="user-management-drawer-content__permission-table-content bu-px-1">
                   <div class="user-management-drawer-content__permission-row bu-mb-5" v-for="feature in features">
-                    <div class="user-management-drawer-content__feature-name">{{featureBeautifier(feature)}}</div>
+                    <div class="user-management-drawer-content__feature-name">{{ featureBeautifier(feature) }}</div>
                     <div class="user-management-drawer-content__feature-permissions">
                       <div class="user-management-drawer-content__permission-box">
                         <el-checkbox @change="setPermissionByFeature(index, 'c', feature)" v-model="permissionSets[index].c.allowed[feature]"></el-checkbox>
diff --git a/frontend/express/public/javascripts/countly/countly.auth.js b/frontend/express/public/javascripts/countly/countly.auth.js
index c0a5dc354c7..aa9daf1741f 100644
--- a/frontend/express/public/javascripts/countly/countly.auth.js
+++ b/frontend/express/public/javascripts/countly/countly.auth.js
@@ -380,4 +380,13 @@
         }
     };
 
+    countlyAuth.featureBeautifier = function(featureName) {
+        var fa = featureName.split('_');
+        var ret = '';
+        for (var i = 0; i < fa.length; i++) {
+            ret += fa[i].substr(0, 1).toUpperCase() + fa[i].substr(1, fa[i].length - 1) + ' ';
+        }
+        return $.i18n.map[featureName + ".plugin-title"] || $.i18n.map[featureName + ".title"] || ret;
+    };
+
 })(window.countlyAuth = window.countlyAuth || {});
\ No newline at end of file