Fix display of fallback

eea · Jan 3, 2023 · b3bd27b · b3bd27b
1 parent e7323c2
commit b3bd27b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/searchlib/components/RenderSlot/RenderSlot.jsx b/searchlib/components/RenderSlot/RenderSlot.jsx
@@ -1,18 +1,11 @@
-/**
- * This is a big "switch"
- */
-// import React from 'react';
-
 import { SEARCH_STATE_IDS } from '@eeacms/search/constants';
 
 export default function RenderSlot(props) {
   const { slotName, searchState } = props;
-  const anyStateId = `${slotName}-${SEARCH_STATE_IDS.any}`;
   const byStateId = `${slotName}-${SEARCH_STATE_IDS[searchState]}`;
 
-  const anyState = props[anyStateId];
   const byState = props[byStateId];
 
-  const res = props[slotName] || byState || anyState || null;
+  const res = props[slotName] || byState || null;
   return res;
 }
diff --git a/searchlib/constants.js b/searchlib/constants.js
@@ -16,7 +16,7 @@ export const SEARCH_STATE_IDS = {
 };
 
 export const SEARCH_STATES = [
-  [SEARCH_STATE_IDS.any, 'Always'],
+  [SEARCH_STATE_IDS.any, 'Any state'],
   [SEARCH_STATE_IDS.isLandingPage, 'Landing page'],
   [SEARCH_STATE_IDS.hasResults, 'Has results'],
   [SEARCH_STATE_IDS.hasNoResults, 'Has no results'],

diff --git a/src/SearchBlock/templates/FullView.jsx b/src/SearchBlock/templates/FullView.jsx
@@ -50,7 +50,11 @@ function FullView(props) {
                         selected={false}
                         block={blockId}
                         mode={mode}
-                        data={slotFills?.[blockId]}
+                        data={
+                          slotFills?.[blockId] || mode === 'view'
+                            ? slotFills?.[`${blockId.split('-')[0]}-any`]
+                            : null
+                        }
                         onChangeSlotfill={onChangeSlotfill}
                         onDeleteSlotfill={onDeleteSlotfill}
                         onSelectSlotfill={onSelectSlotfill}