Merge branch 'develop'

art-institute-of-chicago · May 22, 2024 · ba37f12 · ba37f12
2 parents 3899a59 + 6c4f989
commit ba37f12
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 16 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.47
+6.48
diff --git a/app/Http/Controllers/API/MyMuseumTourController.php b/app/Http/Controllers/API/MyMuseumTourController.php
@@ -52,16 +52,16 @@ public function show(Request $request, $id)
      * This method strips HTML and PHP tags from data and returns the sanitized data
      *
      */
-    private function sanitizeData(array $data): array
+    private function sanitizeData(array $data, string $parentKey = ''): array
     {
         $sanitizedData = [];
 
         foreach ($data as $key => $value) {
             if (is_array($value)) {
-                $sanitizedData[$key] = $this->sanitizeData($value);
+                $sanitizedData[$key] = $this->sanitizeData($value, $key);
             } else {
-                // Use strip_tags on strings only
-                $sanitizedData[$key] = is_string($value) ? strip_tags($value) : $value;
+                // Use strip_tags on strings only. 'description' with a parentKey that's an integer is the short_description, so don't strip that one
+                $sanitizedData[$key] = is_string($value) && !($key == 'description' && is_numeric($parentKey)) ? strip_tags($value) : $value;
             }
         }
 

diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php
@@ -162,10 +162,12 @@ protected function getRelatedSidebarItemsData()
             return response()->json(['error' => 'Item not found'], 404);
         }
 
-        return response(view('site.shared._featuredRelated', [
+        $view['html'] = view('site.shared._featuredRelated', [
             'item' => $item,
             'autoRelated' => $this->getAutoRelated($item),
             'featuredRelated' => $this->getFeatureRelated($item),
-        ])->render(), 200, ['Content-Type' => 'text/html']);
+        ])->render();
+
+        return $view;
     }
 }
diff --git a/frontend/js/behaviors/core/loadRelatedSidebar.js b/frontend/js/behaviors/core/loadRelatedSidebar.js
@@ -52,9 +52,15 @@ const loadRelatedSidebar = function(container) {
     function _inject(data)
     {
         if (sidebar) {
-            sidebar.innerHTML = data;
+            let parsed = JSON.parse(data);
+            sidebar.innerHTML = parsed.html;
             heightAwareSidebar();
         }
+
+        triggerCustomEvent(document, 'page:updated');
+        if (window.picturefill) {
+            window.picturefill();
+        }
     }
 
     function _init() {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "lodash": "^4.17.15",
     "minimist": "^1.2.0",
     "mirador": "^3.0.0",
-    "my-museum-tour-builder": "git+https://github.com/art-institute-of-chicago/my-museum-tour.git#semver:^1.13",
+    "my-museum-tour-builder": "git+https://github.com/art-institute-of-chicago/my-museum-tour.git#semver:^1.15",
     "prettier": "^1.7.4",
     "react": "^16.9.0",
     "react-app-polyfill": "^0.2.0",

diff --git a/resources/views/components/molecules/_m-listing----auto-related.blade.php b/resources/views/components/molecules/_m-listing----auto-related.blade.php
@@ -7,18 +7,45 @@
                         @if ($isHero ?? false)
                             @component('components.atoms._img')
                                 @slot('image', $image ?? ($item->imageFront('listing') ?? $item->imageFront('hero') ))
-                                @slot('settings', $imageSettings ?? '')
+                                @slot('settings', $imageSettings ?? array(
+                                'srcset' => array(300,600,800,1200,1600),
+                                'sizes' => ImageHelpers::aic_imageSizes(array(
+                                      'xsmall' => '58',
+                                      'small' => '58',
+                                      'medium' => '38',
+                                      'large' => '28',
+                                      'xlarge' => '28',
+                                    )),
+                                ))
                                 @slot('class', 'img-hero-desktop')
                             @endcomponent
                             @component('components.atoms._img')
                                 @slot('image', $imageMobile ?? $item->imageFront('mobile_hero') ?? $image ?? ($item->imageFront('listing') ?? $item->imageFront('hero') ))
-                                @slot('settings', $imageSettings ?? '')
+                                @slot('settings', $imageSettings ?? array(
+                                'srcset' => array(300,600,800,1200,1600),
+                                'sizes' => ImageHelpers::aic_imageSizes(array(
+                                      'xsmall' => '58',
+                                      'small' => '58',
+                                      'medium' => '38',
+                                      'large' => '28',
+                                      'xlarge' => '28',
+                                    )),
+                                ))
                                 @slot('class', 'img-hero-mobile')
                             @endcomponent
                         @else 
                             @component('components.atoms._img')
                                 @slot('image', $image ?? ($item->imageFront('listing') ?? $item->imageFront('hero') ))
-                                @slot('settings', $imageSettings ?? '')
+                                @slot('settings', $imageSettings ?? array(
+                                'srcset' => array(300,600,800,1200,1600),
+                                'sizes' => ImageHelpers::aic_imageSizes(array(
+                                      'xsmall' => '58',
+                                      'small' => '58',
+                                      'medium' => '38',
+                                      'large' => '28',
+                                      'xlarge' => '28',
+                                    )),
+                                ))
                             @endcomponent
                         @endif
                         @component('components.molecules._m-listing-video')

diff --git a/resources/views/site/blocks/feature_block.blade.php b/resources/views/site/blocks/feature_block.blade.php
@@ -46,7 +46,7 @@
         case 'exhibitions':
             if ($block->input('override_exhibition')) {
                 $exhibitions = $block->browserIds('exhibitions');
-                $items = \App\Models\Api\Exhibition::query()->findMany($exhibitions)->sortBy('aic_start_at');
+                $items = \App\Models\Api\Exhibition::query()->findMany($exhibitions);
             } else {
                 $items = \App\Models\Api\Exhibition::query()->current()->orderBy('aic_start_at', 'desc')->limit($columns)->get(['id', 'aic_start_at', 'aic_end_at', 'public_start_date', 'public_end_date']);
             }

diff --git a/resources/views/site/myMuseumTour.blade.php b/resources/views/site/myMuseumTour.blade.php
@@ -149,7 +149,7 @@
                             </div>
                         @endisset
                         @isset($artwork['description'])
-                            <p class="f-tertiary aic-ct-viewer__description">{{ $artwork['description'] }}</p>
+                            <p class="f-tertiary aic-ct-viewer__description">{!! $artwork['description'] !!}</p>
                         @endisset
                         @isset($artwork['objectNote'])
                             @component('components.atoms._quote')