From 52fef8b09baa2ee1c1cc2a8ee34f34def05b012d Mon Sep 17 00:00:00 2001
From: Antariksh <antarikshmahajan@gmail.com>
Date: Wed, 9 Jun 2021 17:03:40 +0800
Subject: [PATCH 1/3] feat(feature-manager): remove frontend toggles

---
 src/public/main.js                            |  1 -
 .../core/componentViews/avatar-dropdown.html  |  6 +-----
 .../modules/core/componentViews/navbar.html   |  2 --
 .../feature-toggle.client.directive.js        | 19 -------------------
 .../core/views/landing.client.view.html       |  2 +-
 .../configure-mobile.client.view.html         |  2 +-
 .../directiveViews/edit-form.client.view.html |  2 +-
 .../settings-form.client.view.html            | 10 +++-------
 .../admin/views/edit-fields.client.modal.html | 16 ++--------------
 .../mobile-edit-fields.client.modal.html      |  2 +-
 .../submit-form.directive.view.html           |  2 +-
 11 files changed, 11 insertions(+), 53 deletions(-)
 delete mode 100644 src/public/modules/core/directives/feature-toggle.client.directive.js

diff --git a/src/public/main.js b/src/public/main.js
index e29766efe4..3e742e4dbf 100644
--- a/src/public/main.js
+++ b/src/public/main.js
@@ -147,7 +147,6 @@ require('./modules/core/controllers/edit-contact-number-modal.client.controller'
 require('./modules/core/directives/on-click-outside.client.directive')
 require('./modules/core/directives/route-loading-indicator.client.directive.js')
 require('./modules/core/services/features.client.factory.js')
-require('./modules/core/directives/feature-toggle.client.directive.js')
 
 // Core config
 require('./modules/core/config/core.client.routes.js')
diff --git a/src/public/modules/core/componentViews/avatar-dropdown.html b/src/public/modules/core/componentViews/avatar-dropdown.html
index 37e3c975fd..1571c9c1dc 100644
--- a/src/public/modules/core/componentViews/avatar-dropdown.html
+++ b/src/public/modules/core/componentViews/avatar-dropdown.html
@@ -27,11 +27,7 @@
       </li>
       <!-- End user details block -->
       <!-- Emergency contact block -->
-      <li
-        feature-toggle
-        feature-name="sms"
-        class="navbar__dropdown__user__contact"
-      >
+      <li class="navbar__dropdown__user__contact">
         <div
           ng-show="!vm.user.contact"
           class="navbar__dropdown__user__contact--missing"
diff --git a/src/public/modules/core/componentViews/navbar.html b/src/public/modules/core/componentViews/navbar.html
index ec8a1e3797..7535745053 100755
--- a/src/public/modules/core/componentViews/navbar.html
+++ b/src/public/modules/core/componentViews/navbar.html
@@ -30,8 +30,6 @@
         ui-sref="billing"
         class="form-navbar__link"
         ng-class="vm.activeTab==='billing' ? 'form-navbar__link--active' : ''"
-        feature-toggle
-        feature-name="spcp-myinfo"
       >
         Billing
       </a>
diff --git a/src/public/modules/core/directives/feature-toggle.client.directive.js b/src/public/modules/core/directives/feature-toggle.client.directive.js
deleted file mode 100644
index d6251650b4..0000000000
--- a/src/public/modules/core/directives/feature-toggle.client.directive.js
+++ /dev/null
@@ -1,19 +0,0 @@
-'use strict'
-
-angular.module('core').directive('featureToggle', ['Features', featureToggle])
-
-function featureToggle(Features) {
-  return {
-    restrict: 'A',
-    link: function (scope, element, attrs) {
-      Features.getFeatureStates()
-        .then(function (response) {
-          element.css('display', response[attrs.featureName] ? '' : 'none')
-          scope.feature = response
-        })
-        .catch((_err) => {
-          element.css('display', 'none')
-        })
-    },
-  }
-}
diff --git a/src/public/modules/core/views/landing.client.view.html b/src/public/modules/core/views/landing.client.view.html
index 0852a6323e..78a19101d3 100644
--- a/src/public/modules/core/views/landing.client.view.html
+++ b/src/public/modules/core/views/landing.client.view.html
@@ -227,7 +227,7 @@
       />
     </div>
 
-    <div class="feature feature3" feature-toggle feature-name="spcp-myinfo">
+    <div class="feature feature3">
       <img
         src="/public/modules/core/img/landing/restricted__feature3.png"
         class="feature-img"
diff --git a/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html b/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html
index c6cbfa0c8c..44b68cf7fc 100644
--- a/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html
+++ b/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html
@@ -1,4 +1,4 @@
-<div class="row" feature-toggle feature-name="verified-fields">
+<div class="row">
   <div class="toggle-option">
     <div class="col-xs-8 label-custom label-medium label-bottom">
       OTP verification
diff --git a/src/public/modules/forms/admin/directiveViews/edit-form.client.view.html b/src/public/modules/forms/admin/directiveViews/edit-form.client.view.html
index 16a3bb35a9..1ee73722e3 100644
--- a/src/public/modules/forms/admin/directiveViews/edit-form.client.view.html
+++ b/src/public/modules/forms/admin/directiveViews/edit-form.client.view.html
@@ -34,7 +34,7 @@
       </uib-tab>
 
       <!-- MyInfo Fields -->
-      <uib-tab feature-toggle feature-name="spcp-myinfo">
+      <uib-tab>
         <uib-tab-heading> MyInfo </uib-tab-heading>
         <!-- Only show fields if form type is not storage form -->
         <div
diff --git a/src/public/modules/forms/admin/directiveViews/settings-form.client.view.html b/src/public/modules/forms/admin/directiveViews/settings-form.client.view.html
index 7169ccec1c..08e51cab73 100644
--- a/src/public/modules/forms/admin/directiveViews/settings-form.client.view.html
+++ b/src/public/modules/forms/admin/directiveViews/settings-form.client.view.html
@@ -193,7 +193,7 @@
       </div>
 
       <!-- Form Options -->
-      <div feature-toggle feature-name="spcp-myinfo">
+      <div>
         <div class="settings-divider"></div>
         <fieldset>
           <div id="enable-auth">
@@ -315,7 +315,7 @@
         </fieldset>
       </div>
 
-      <div feature-toggle feature-name="captcha">
+      <div>
         <edit-captcha-directive
           temp-form="tempForm"
           update-settings="updateSettingsByPath"
@@ -359,11 +359,7 @@
       <div class="settings-divider feature-divider"></div>
 
       <!-- Webhooks for encrypted forms -->
-      <div
-        ng-if="isFormEncrypt()"
-        feature-toggle
-        feature-name="webhook-verified-content"
-      >
+      <div ng-if="isFormEncrypt()">
         <div class="row enable-features">
           <label
             for="settings-webhook-url"
diff --git a/src/public/modules/forms/admin/views/edit-fields.client.modal.html b/src/public/modules/forms/admin/views/edit-fields.client.modal.html
index 70aadb680b..98f1c99808 100644
--- a/src/public/modules/forms/admin/views/edit-fields.client.modal.html
+++ b/src/public/modules/forms/admin/views/edit-fields.client.modal.html
@@ -556,12 +556,7 @@ <h2 class="modal-title">
         <!-- End table -->
 
         <!-- Email -->
-        <div
-          class="row"
-          ng-if="vm.field.fieldType === 'email'"
-          feature-toggle
-          feature-name="verified-fields"
-        >
+        <div class="row" ng-if="vm.field.fieldType === 'email'">
           <br />
           <div class="toggle-option">
             <div class="col-xs-8 label-custom label-medium">
@@ -593,12 +588,7 @@ <h2 class="modal-title">
           </div>
         </div>
 
-        <div
-          class="row"
-          ng-show="vm.field.fieldType === 'email'"
-          feature-toggle
-          feature-name="verified-fields"
-        >
+        <div class="row" ng-show="vm.field.fieldType === 'email'">
           <br />
           <div class="toggle-option">
             <div
@@ -861,8 +851,6 @@ <h2 class="modal-title">
           field="vm.field"
           name="'SMS'"
           character-limit="300"
-          feature-toggle
-          feature-name="sms"
         >
         </configure-mobile-directive>
         <!-- End mobile field directive ---->
diff --git a/src/public/modules/forms/admin/views/mobile-edit-fields.client.modal.html b/src/public/modules/forms/admin/views/mobile-edit-fields.client.modal.html
index e1f7cddf38..4f8ccb4591 100644
--- a/src/public/modules/forms/admin/views/mobile-edit-fields.client.modal.html
+++ b/src/public/modules/forms/admin/views/mobile-edit-fields.client.modal.html
@@ -24,7 +24,7 @@
       </div>
     </uib-tab>
 
-    <uib-tab feature-toggle feature-name="spcp-myinfo">
+    <uib-tab>
       <uib-tab-heading> MyInfo </uib-tab-heading>
       <!-- Unlike the non-mobile view, no overlay is shown. Thus, fields are -->
       <!-- disabled instead if they do not fulfil a certain criteria. -->
diff --git a/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html b/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
index f476cd5473..d89d69c3f8 100644
--- a/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
+++ b/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
@@ -124,7 +124,7 @@
   </div>
   <div class="row">
     <div class="col-md-10 col-md-offset-1 col-sm-12">
-      <div feature-toggle feature-name="captcha">
+      <div>
         <div
           vc-recaptcha
           key="captchaService.publicKey"

From 5f1040be3631d013f130f22616359495267697c0 Mon Sep 17 00:00:00 2001
From: Antariksh <antarikshmahajan@gmail.com>
Date: Wed, 9 Jun 2021 17:05:27 +0800
Subject: [PATCH 2/3] feat(feature-manager): remove API call for feature states

---
 src/public/main.js                             |  1 -
 .../avatar-dropdown.client.component.js        |  9 +--------
 .../core/services/features.client.factory.js   | 18 ------------------
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 src/public/modules/core/services/features.client.factory.js

diff --git a/src/public/main.js b/src/public/main.js
index 3e742e4dbf..c803d953a6 100644
--- a/src/public/main.js
+++ b/src/public/main.js
@@ -146,7 +146,6 @@ require('./modules/core/controllers/edit-contact-number-modal.client.controller'
 // Core directives
 require('./modules/core/directives/on-click-outside.client.directive')
 require('./modules/core/directives/route-loading-indicator.client.directive.js')
-require('./modules/core/services/features.client.factory.js')
 
 // Core config
 require('./modules/core/config/core.client.routes.js')
diff --git a/src/public/modules/core/components/avatar-dropdown.client.component.js b/src/public/modules/core/components/avatar-dropdown.client.component.js
index f04e80fd55..d37ff2ed84 100644
--- a/src/public/modules/core/components/avatar-dropdown.client.component.js
+++ b/src/public/modules/core/components/avatar-dropdown.client.component.js
@@ -9,7 +9,6 @@ angular.module('core').component('avatarDropdownComponent', {
     '$uibModal',
     '$window',
     'Auth',
-    'Features',
     'Toastr',
     avatarDropdownController,
   ],
@@ -22,7 +21,6 @@ function avatarDropdownController(
   $uibModal,
   $window,
   Auth,
-  Features,
   Toastr,
 ) {
   const vm = this
@@ -50,13 +48,8 @@ function avatarDropdownController(
       // Early return if user already has contact information.
       if (trueUser.contact) return
 
-      const features = await Features.getFeatureStates()
-
       // Only show exclamation mark in avatar if sms feature is enabled.
-      vm.showExclamation = features.sms && !vm.user.contact
-
-      // Do not proceed if sms feature is not available.
-      if (!features.sms) return
+      vm.showExclamation = !vm.user.contact
 
       // If retrieved user does not have contact, prompt user to add one.
       // If user has the key in the browser's storage the modal will not be
diff --git a/src/public/modules/core/services/features.client.factory.js b/src/public/modules/core/services/features.client.factory.js
deleted file mode 100644
index 867590021a..0000000000
--- a/src/public/modules/core/services/features.client.factory.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict'
-
-angular.module('core').factory('Features', ['$resource', featureFactory])
-
-function featureFactory($resource) {
-  const service = {
-    states: '',
-    getFeatureStates: async () => {
-      if (this.states) {
-        return this.states
-      } else {
-        this.states = await $resource('/api/v3/client/features').get().$promise
-        return this.states
-      }
-    },
-  }
-  return service
-}

From b1a00845b43061489cf945a2f4207dc10d3c4620 Mon Sep 17 00:00:00 2001
From: Antariksh <antarikshmahajan@gmail.com>
Date: Wed, 9 Jun 2021 17:20:51 +0800
Subject: [PATCH 3/3] test: fix e2e test selector for MyInfo tab

---
 tests/end-to-end/helpers/selectors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end-to-end/helpers/selectors.js b/tests/end-to-end/helpers/selectors.js
index f008290de7..39373c3236 100644
--- a/tests/end-to-end/helpers/selectors.js
+++ b/tests/end-to-end/helpers/selectors.js
@@ -63,7 +63,7 @@ myInfoTypes.forEach((type) => {
 // Admin tab contents
 const buildTab = {
   basicTab: Selector('#add-field .nav-tabs li[heading="Basic"]'),
-  myInfoTab: Selector('#add-field .nav-tabs li[feature-name="spcp-myinfo"]'),
+  myInfoTab: Selector('#add-field .nav-tabs li').withText('MyInfo'),
   getFieldPanel: (fieldType) =>
     // We need withExactText otherwise Mobile Number will match Number
     Selector('.add-field-panel .add-field-text').withExactText(