feat(backport, filters): Merge pull request #123 from shuklina/RGTC-2170

[Backport][RGTC-2170] Create Limit by location for AF
ymcatwincities · Dec 20, 2021 · adb4801 · adb4801
2 parents 6f3bd30 + 6ca8dae
commit adb4801
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 5 deletions.
diff --git a/openy_activity_finder.libraries.yml b/openy_activity_finder.libraries.yml
@@ -60,7 +60,7 @@ openy_activity_finder_search:
     - core/jquery.cookie
 
 activity_finder_4:
-  version: 4.0.12
+  version: 4.0.13
   js:
     openy_af4_vue_app/dist/activity_finder_4.umd.min.js: { minified: true }
   css:

diff --git a/openy_activity_finder.module b/openy_activity_finder.module
@@ -77,6 +77,7 @@ function openy_activity_finder_theme() {
         'filters_section_config' => [],
         'limit_by_category' => [],
         'exclude_by_category' => [],
+        'exclude_by_location' => [],
         'legacy_mode' => FALSE,
         'weeks_filter' => FALSE,
         'hide_home_branch_block' => FALSE,

diff --git a/openy_af4_vue_app/dist/activity_finder_4.umd.min.js b/openy_af4_vue_app/dist/activity_finder_4.umd.min.js
diff --git a/openy_af4_vue_app/src/App.vue b/openy_af4_vue_app/src/App.vue
@@ -49,6 +49,7 @@
           :daxko="daxko"
           :bs-version="bsVersion"
           :exclude-by-category="excludeByCategory"
+          :exclude-by-location="excludeByLocation"
           @filterChange="onFilterChange($event, hideModal)"
           @clearFilters="clearFilters(hideModal)"
         />
@@ -130,6 +131,7 @@
       :facets="data.facets.locations"
       :first-step="selectedPath === 'selectLocations'"
       :home-branch-id="homeBranchId"
+      :exclude-by-location="excludeByLocation"
       @nextStep="nextStep('selectLocations')"
     />
     <SelectActivities
@@ -331,6 +333,10 @@ export default {
       type: Boolean,
       required: true
     },
+    excludeByLocation: {
+      type: Array,
+      required: true
+    },
     weeksFilter: {
       type: Boolean,
       required: true
@@ -502,7 +508,8 @@ export default {
         page: this.selectedPage,
         sort: this.selectedSort,
         keywords: this.searchKeywords,
-        exclude: this.excludeByCategory.join(',')
+        exclude: this.excludeByCategory.join(','),
+        excludeloc: this.excludeByLocation.join(',')
       }
 
       if (this.daxko && this.selectedPage > 1 && this.daxkoPages[this.selectedPage]) {

diff --git a/openy_af4_vue_app/src/components/filters/Filters.vue b/openy_af4_vue_app/src/components/filters/Filters.vue
@@ -75,6 +75,7 @@
           v-model="selectedLocations"
           :locations="locations"
           :facets="data.facets.locations"
+          :exclude-by-location="excludeByLocation"
         />
       </Fieldset>
     </div>
@@ -197,6 +198,10 @@ export default {
       type: Array,
       required: true
     },
+    excludeByLocation: {
+      type: Array,
+      required: true
+    },
     bsVersion: {
       type: Number,
       required: true

diff --git a/openy_af4_vue_app/src/components/filters/Locations.vue b/openy_af4_vue_app/src/components/filters/Locations.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="locations-filter-component">
     <Foldable
-      v-for="(item_type, index) in locations"
+      v-for="(item_type, index) in filteredLocations"
       :key="id + '-location-type-' + index"
       :label="item_type.label"
       :collapse-id="id + '-toggle-' + index"
@@ -46,13 +46,51 @@ export default {
     facets: {
       type: Array,
       required: true
+    },
+    excludeByLocation: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
       selectedLocations: this.value
     }
   },
+  computed: {
+    filteredLocations() {
+      if (!this.excludeByLocation.length) {
+        return this.locations
+      }
+      const filteredLocations = {}
+      this.locations.forEach((locationGroup, key) => {
+        // Filter out excluded locations.
+        if (!this.excludeByLocation.length) {
+          filteredLocations[key] = locationGroup
+          return
+        }
+        let checkIsArray = Array.isArray(locationGroup.value)
+        let results = new Object()
+        if (!checkIsArray) {
+          let filteredLocationIndex = Object.keys(locationGroup.value).filter(key => {
+            return !this.excludeByLocation.includes(locationGroup.value[key].value.toString())
+          })
+          filteredLocationIndex.forEach(locationIndex => {
+            results[locationIndex] = locationGroup.value[locationIndex]
+          })
+        } else {
+          results = locationGroup.value.filter(item => {
+            return !this.excludeByLocation.includes(item.value.toString())
+          })
+        }
+        filteredLocations[key] = {
+          ...locationGroup,
+          value: results
+        }
+      })
+      return filteredLocations
+    }
+  },
   watch: {
     value() {
       this.selectedLocations = this.value

diff --git a/openy_af4_vue_app/src/components/steps/SelectLocations.vue b/openy_af4_vue_app/src/components/steps/SelectLocations.vue
@@ -83,6 +83,10 @@ export default {
     homeBranchId: {
       type: String,
       default: null
+    },
+    excludeByLocation: {
+      type: Array,
+      required: true
     }
   },
   data() {
@@ -92,7 +96,7 @@ export default {
   },
   computed: {
     filteredLocations() {
-      if (!this.firstStep) {
+      if (!this.firstStep && !this.excludeByLocation.length) {
         return this.locations
       }
 
@@ -102,6 +106,34 @@ export default {
           filteredLocations[key] = this.locations[key]
         }
       }
+      if (!this.excludeByLocation.length) {
+        return this.locations
+      }
+      this.locations.forEach((locationGroup, key) => {
+        // Filter out excluded locations.
+        if (!this.excludeByLocation.length) {
+          filteredLocations[key] = locationGroup
+          return
+        }
+        let checkIsArray = Array.isArray(locationGroup.value)
+        let results = new Object()
+        if (!checkIsArray) {
+          let filteredLocationIndex = Object.keys(locationGroup.value).filter(key => {
+            return !this.excludeByLocation.includes(locationGroup.value[key].value.toString())
+          })
+          filteredLocationIndex.forEach(locationIndex => {
+            results[locationIndex] = locationGroup.value[locationIndex]
+          })
+        } else {
+          results = locationGroup.value.filter(item => {
+            return !this.excludeByLocation.includes(item.value.toString())
+          })
+        }
+        filteredLocations[key] = {
+          ...locationGroup,
+          value: results
+        }
+      })
       return filteredLocations
     },
     filtersSelected() {

diff --git a/src/Plugin/Block/ActivityFinder4Block.php b/src/Plugin/Block/ActivityFinder4Block.php
@@ -84,6 +84,7 @@ public function defaultConfiguration() {
       'label_display' => 'visible',
       'limit_by_category' => [],
       'exclude_by_category' => [],
+      'exclude_by_location' => [],
       'legacy_mode' => 0,
       'weeks_filter' => 0,
       'hide_home_branch_block' => 0,
@@ -172,6 +173,7 @@ public function build() {
       '#filters_section_config' => $backend->getFiltersSectionConfig(),
       '#limit_by_category' => $conf['limit_by_category'],
       '#exclude_by_category' => $conf['exclude_by_category'],
+      '#exclude_by_location' => $conf['exclude_by_location'],
       '#legacy_mode' => (bool) $conf['legacy_mode'],
       '#weeks_filter' => (bool) $conf['weeks_filter'],
       '#hide_home_branch_block' => (bool) $conf['hide_home_branch_block'],
@@ -215,6 +217,24 @@ public function blockForm($form, FormStateInterface $form_state) {
       '#size' => 100,
       '#maxlength' => 2048,
     ];
+    $base_by_location = [
+      '#type' => 'entity_autocomplete',
+      '#description' => $this->t('Separate multiple values by comma. Search for title from Branch, Camp, Facility types.'),
+      '#target_type' => 'node',
+      '#tags' => TRUE,
+      '#selection_settings' => [
+        'target_bundles' => ['branch', 'camp', 'facility'],
+      ],
+      '#size' => 100,
+      '#maxlength' => 2048,
+    ];
+
+    $form['exclude_by_location'] = $base_by_location + [
+      '#title' => $this->t('Exclude by location'),
+      '#default_value' => $conf['exclude_by_location']
+        ? $this->entityTypeManager->getStorage('node')->loadMultiple($conf['exclude_by_location'])
+        : NULL,
+    ];
     $form['limit_by_category'] = $base_by_category + [
       '#title' => $this->t('Limit by category'),
       '#default_value' => $conf['limit_by_category']
@@ -273,6 +293,9 @@ public function blockSubmit($form, FormStateInterface $form_state) {
     $this->configuration['exclude_by_category'] = $form_state->getValue('exclude_by_category')
       ? array_column($form_state->getValue('exclude_by_category'), 'target_id')
       : [];
+    $this->configuration['exclude_by_location'] = $form_state->getValue('exclude_by_location')
+      ? array_column($form_state->getValue('exclude_by_location'), 'target_id')
+      : [];
     $this->configuration['legacy_mode'] = $form_state->getValue('legacy_mode');
     $this->configuration['weeks_filter'] = $form_state->getValue('weeks_filter');
     $this->configuration['hide_home_branch_block'] = $form_state->getValue('hide_home_branch_block');

diff --git a/templates/openy-activity-finder-4-block.html.twig b/templates/openy-activity-finder-4-block.html.twig
@@ -23,6 +23,7 @@
  * - relevance_sort_option
  * - limit_by_category
  * - exclude_by_category
+ * - exclude_by_location
  * - legacy_mode
  * - weeks_filter
  * - background_image
@@ -50,6 +51,7 @@
       :default-sort-option="{{ default_sort_option|json_encode }}"
       :relevance-sort-option="{{ relevance_sort_option|json_encode }}"
       :limit-by-category="{{ limit_by_category|json_encode }}"
+      :exclude-by-location="{{ exclude_by_location|json_encode }}"
       :exclude-by-category="{{ exclude_by_category|json_encode }}"
       :legacy-mode="{{ legacy_mode|json_encode }}"
       :weeks-filter="{{ weeks_filter|json_encode }}"