change 'role' options and filters to 'membership'

website/client/src/components/challenges/myChallenges.vue

@@ -204,12 +204,12 @@ export default {
       return this.challenges.filter(challenge => {
         let isMember = true;
 
-        const filteringRole = filters.roles && filters.roles.length > 0;
-        if (filteringRole && filters.roles.indexOf('participating') !== -1) {
+        const filteringRole = filters.membership && filters.membership.length > 0;
+        if (filteringRole && filters.membership.indexOf('participating') !== -1) {
           isMember = this.isMemberOfChallenge(user, challenge);
         }
 
-        if (filteringRole && filters.roles.indexOf('not_participating') !== -1) {
+        if (filteringRole && filters.membership.indexOf('not_participating') !== -1) {
           isMember = !this.isMemberOfChallenge(user, challenge);
         }
 

website/client/src/components/challenges/sidebar.vue

@@ -34,7 +34,7 @@
           </div>
         </div>
       </filter-group>
-      <filter-group :title="$t('role')">
+      <!-- <filter-group :title="$t('role')">
         <div
           v-for="group in roleOptions"
           :key="group.key"
@@ -55,21 +55,20 @@
             >{{ $t(group.label) }}</label>
           </div>
         </div>
-      </filter-group>
+      </filter-group> -->
       <filter-group
-        v-if="$route.name !== 'findChallenges'"
         :title="$t('membership')"
         class="form-group"
       >
         <div
-          v-for="group in roleOptions"
+          v-for="group in membershipOptions"
           :key="group.key"
           class="form-check"
         >
           <div class="custom-control custom-checkbox">
             <input
               :id="group.key"
-              v-model="roleFilters"
+              v-model="membershipFilters"
               class="custom-control-input"
               type="checkbox"
               :value="group.key"
@@ -176,8 +175,23 @@ export default {
           key: 'time_management',
         },
       ],
-      roleFilters: [],
-      roleOptions: [
+      // roleFilters: [],
+      // roleOptions: [
+      //   {
+      //     label: 'participating',
+      //     key: 'participating',
+      //   },
+      //   {
+      //     label: 'not_participating',
+      //     key: 'not_participating',
+      //   },
+      //   // {
+      //   //   label: 'either',
+      //   //   key: 'either',
+      //   // },
+      // ],
+      membershipFilters: [],
+      membershipOptions: [
         {
           label: 'participating',
           key: 'participating',
@@ -186,10 +200,6 @@ export default {
           label: 'not_participating',
           key: 'not_participating',
         },
-        // {
-        //   label: 'either',
-        //   key: 'either',
-        // },
       ],
       ownershipFilters: [],
       ownershipOptions: [
@@ -219,6 +229,9 @@ export default {
     ownershipFilters: function ownershipFilters () {
       this.emitFilters();
     },
+    membershipFilters: function membershipFilters () {
+      this.emitFilters();
+    },
     searchTerm: throttle(function searchTerm (newSearch) {
       this.$emit('search', {
         searchTerm: newSearch,
@@ -231,6 +244,7 @@ export default {
         categories: this.categoryFilters,
         roles: this.roleFilters,
         ownership: this.ownershipFilters,
+        membership: this.membershipFilters,
       });
     },
   },