Fix display of slots

searchlib/components/RenderSlot/RenderSlot.jsx

@@ -1,8 +1,18 @@
-import React from 'react';
+/**
+ * This is a big "switch"
+ */
+// import React from 'react';
 
-import { SEARCH_STATES } from '@eeacms/search/constants';
+import { SEARCH_STATE_IDS } from '@eeacms/search/constants';
 
 export default function RenderSlot(props) {
   const { slotName, searchState } = props;
-  return props[slotName] ? props[slotName] : null;
+  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;
+  return res;
 }

src/SearchBlock/BlockContainer/BlockContainer.jsx

@@ -39,7 +39,9 @@ export default function BlockContainer(props) {
   );
 
   return mode === 'view' ? (
-    <RenderBlocks content={content} metadata={metadata} location={location} />
+    data ? (
+      <RenderBlocks content={content} metadata={metadata} location={location} />
+    ) : null
   ) : data ? (
     <BlockEdit
       id={block}

src/SearchBlock/templates/FullView.jsx

@@ -4,7 +4,10 @@ import { SEARCH_STATES, SLOTS, SearchApp } from '@eeacms/search';
 import { SlotEditor, BlockContainer } from './../BlockContainer';
 
 const slotCombinations = SLOTS.reduce(
-  (acc, slot) => [...acc, ...SEARCH_STATES.map((state) => `${slot}-${state}`)],
+  (acc, slot) => [
+    ...acc,
+    ...SEARCH_STATES.map((state) => `${slot}-${state[0]}`),
+  ],
   [],
 );