Merge pull request #253 from FlowzPlatform/selected-subscription

some changes done

Author: 80010ekta

client/src/components/Header.vue

@@ -125,16 +125,15 @@ export default {
     },
     setSelectedUser () {
       // let self = this
+      console.log('cxalled.....')
       if (this.selected_user === '') {
+        console.log('%%%%%%')
         if (this.$store.state.user_list.length !== 0) {
+          console.log('########')
           this.selected_user = this.$store.state.user_list[0].label
         }
       }
       this.$store.state.selectedUserName = this.selected_user
-      // if (this.$store.state.storedUsername !== '') {
-      //   console.log('^^^^^^^', this.$store.state.storedUsername)
-      //   self.$store.commit('SET_STOREDUSERNAME', this.$store.state.storedUsername)
-      // }
     }
   },
   watch: {
@@ -166,10 +165,12 @@ export default {
             this.$store.state.user_list.splice(0, 0, {'value': 'All', 'label': 'All'})
           }
           if (this.$store.state.storedUsername !== '') {
+            console.log('*********')
             this.selected_user = this.$store.state.storedUsername
             this.$store.state.storedUsername = this.selected_user
             this.$store.commit('SET_STOREDUSERNAME', this.selected_user)
           } else {
+            console.log('^^^^^^')
             this.selected_user = this.$store.state.user_list[0].label
             this.$store.state.storedUsername = this.selected_user
             this.$store.commit('SET_STOREDUSERNAME', this.selected_user)

client/src/components/uploader.vue

@@ -262,6 +262,29 @@ export default {
           }
         }
       }
+    },
+    '$store.state.storedUsername': function (selectedUser) {
+      console.log('called 8888888....')
+      if (selectedUser !== 'All') {
+        let filteredUser = lodash.filter(this.$store.state.user_detail_list, function (o) { return o.name === selectedUser })
+        let subsArr = []
+
+        for (let userSubs in filteredUser) {
+          for (let subs in this.$store.state.fullSubscriptionList) {
+            if (filteredUser[userSubs].value === this.$store.state.fullSubscriptionList[subs].value) {
+              subsArr.push(this.$store.state.fullSubscriptionList[subs])
+            }
+          }
+        }
+        this.$store.state.subscription_list = []
+        this.$store.state.subscription_list = subsArr
+        this.$store.state.storedSubscriptionName = subsArr[0].label
+      } else {
+        console.log('else called')
+        this.$store.state.subscription_list = []
+        this.$store.state.subscription_list = this.$store.state.fullSubscriptionList
+        this.$store.state.storedSubscriptionName = this.$store.state.fullSubscriptionList[0].label
+      }
     }
     // '$store.state.storedUsername': function (selectedUser) {
     //   console.log('called.....')

client/src/components/uploader_landing.vue

@@ -339,11 +339,35 @@ export default {
             let subId = lodash.findIndex(this.$store.state.subscription_list, function (o) { return o.label === 'All' })
             if (subId !== -1) {
               this.$store.state.subscription_list.splice(subId, 1)
+              console.log('atlast called....')
               // this.$store.state.fullSubscriptionList = lodash.cloneDeep(this.$store.state.subscription_list)
             }
           }
         }
       }
+    },
+    '$store.state.storedUsername': function (selectedUser) {
+      console.log('called 777777777777.....')
+      if (selectedUser !== 'All') {
+        let filteredUser = lodash.filter(this.$store.state.user_detail_list, function (o) { return o.name === selectedUser })
+        let subsArr = []
+
+        for (let userSubs in filteredUser) {
+          for (let subs in this.$store.state.fullSubscriptionList) {
+            if (filteredUser[userSubs].value === this.$store.state.fullSubscriptionList[subs].value) {
+              subsArr.push(this.$store.state.fullSubscriptionList[subs])
+            }
+          }
+        }
+        this.$store.state.subscription_list = []
+        this.$store.state.subscription_list = subsArr
+        this.$store.state.storedSubscriptionName = subsArr[0].label
+      } else {
+        console.log('else called')
+        this.$store.state.subscription_list = []
+        this.$store.state.subscription_list = this.$store.state.fullSubscriptionList
+        this.$store.state.storedSubscriptionName = this.$store.state.fullSubscriptionList[0].label
+      }
     }
     // '$store.state.storedUsername': function (selectedUser) {
     //   console.log('called.....')