Merge pull request #4425 from pnrgenc/SER-784

[SER-784] Table consent filter is not filtering right way in users view
Countly · Aug 2, 2023 · ad2d42f · ad2d42f
2 parents 4ff1e18 + 912048d
commit ad2d42f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/compliance-hub/frontend/public/javascripts/countly.models.js b/plugins/compliance-hub/frontend/public/javascripts/countly.models.js
@@ -283,13 +283,13 @@
     var consentHistoryUserResource = countlyVue.vuex.ServerDataTable("consentHistoryUserResource", {
         columns: ['_id', 'type', 'optin', 'optout', 'av', 'ts' ],
         // eslint-disable-next-line
-        onRequest: function(context, payload) {
+        onRequest: function(context) {
             context.rootState.countlyConsentManager.isLoading = true;
             var data = {
                 app_id: countlyCommon.ACTIVE_APP_ID
             };
-            if (payload.uid) {
-                data.query = JSON.stringify({ uid: payload.uid });
+            if (context.rootState.countlyConsentManager.uid) {
+                data.query = JSON.stringify({ uid: context.rootState.countlyConsentManager.uid });
             }
             return {
                 type: "POST",

diff --git a/plugins/compliance-hub/frontend/public/javascripts/countly.views.js b/plugins/compliance-hub/frontend/public/javascripts/countly.views.js
@@ -619,6 +619,7 @@
             mounted: function() {
                 var userDetails = this.$store.getters["countlyUsers/userDetailsResource/userDetails"];
                 if (userDetails.uid) {
+                    this.$store.dispatch("countlyConsentManager/uid", userDetails.uid);
                     this.$store.dispatch("countlyConsentManager/fetchConsentHistoryUserResource", userDetails);
                 }
             }