UILD-446: Edit headers in full entity display screens (#64)

folio-org · Dec 26, 2024 · 7df749d · 7df749d
1 parent 61f2c27
commit 7df749d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 29 deletions.
diff --git a/src/common/constants/uiControls.constants.ts b/src/common/constants/uiControls.constants.ts
@@ -34,6 +34,7 @@ export const UI_DROPDOWNS_LIST = [AdvancedFieldType.dropdown, AdvancedFieldType.
 
 export const NOT_PREVIEWABLE_TYPES = [
   AdvancedFieldType.profile,
+  AdvancedFieldType.block,
   AdvancedFieldType.hidden,
   AdvancedFieldType.dropdownOption,
   AdvancedFieldType.complex,

diff --git a/src/components/FullDisplay/PreviewContent.tsx b/src/components/FullDisplay/PreviewContent.tsx
@@ -15,7 +15,6 @@ export const PreviewContent = () => {
 
   return previewContent.map(({ id, base, userValues, initKey, title, entities }) => {
     const resourceType = entities?.map(e => RESOURCE_TEMPLATE_IDS[e])?.[0];
-    const resourceTypeWithFallback = resourceType ?? '-';
     const handleButtonClick = () => setPreviewContent(previewContent.filter(entry => entry.id !== id));
 
     return (
@@ -31,7 +30,6 @@ export const PreviewContent = () => {
           </Button>
           <div className="info">
             <span className="title">{title}</span>
-            <span className="type">{resourceTypeWithFallback}</span>
           </div>
           <Button
             data-testid="preview-fetch"

diff --git a/src/components/Preview/Fields.tsx b/src/components/Preview/Fields.tsx
@@ -79,8 +79,9 @@ export const Fields = ({
   const entry = base.get(uuid);
   const isOnBranchWithUserValue = paths.includes(uuid);
   const isEntity = level === ENTITY_LEVEL;
+  const hasEmptyChildren = entry?.children?.every(id => !schema.get(id));
 
-  if (!entry) return null;
+  if (!entry || hasEmptyChildren) return null;
 
   const { displayName = '', children, type, bfid = '', path, htmlId } = entry;
   const isDependentDropdownOption =

diff --git a/src/components/Preview/Labels.tsx b/src/components/Preview/Labels.tsx
@@ -22,7 +22,6 @@ export const Labels: FC<LabelProps> = ({
   return (
     <strong
       className={classNames({
-        'entity-heading': isEntity,
         'sub-heading': isBlock,
         'value-heading': !isGroupable,
       })}

diff --git a/src/components/Preview/Preview.scss b/src/components/Preview/Preview.scss
@@ -9,7 +9,7 @@
   .preview-entity {
     max-width: 560px;
     width: 100%;
-    
+
     &:not(:last-child) {
       border-right: 1px solid rgba(0, 0, 0, 0.1);
       padding-right: 0.938rem;
@@ -42,27 +42,6 @@
     }
   }
 
-  .entity-heading {
-    display: flex;
-    align-items: center;
-    gap: 0.313rem;
-    font-size: 1.138rem;
-    padding-bottom: 0.5rem;
-
-    .toggle-entity-edit {
-      margin-left: auto;
-    }
-
-    > svg {
-      height: 1.25rem;
-      width: 1.25rem;
-
-      & * {
-        fill: #00000099;
-      }
-    }
-  }
-
   .value-heading {
     padding-bottom: 0.219rem;
   }
@@ -109,7 +88,7 @@
       }
 
       span {
-        color: rgba(0, 0, 0, 0.6)
+        color: rgba(0, 0, 0, 0.6);
       }
     }
   }

diff --git a/src/test/__tests__/components/FullDisplay.test.tsx b/src/test/__tests__/components/FullDisplay.test.tsx
@@ -58,11 +58,10 @@ describe('FullDisplay', () => {
     );
   });
 
-  const { getByTestId, getAllByTestId, getByText } = screen;
+  const { getByTestId, getAllByTestId } = screen;
 
   test('contains preview container and header', () => {
     expect(getByTestId('preview-contents-container')).toBeInTheDocument();
-    expect(getByText('Work')).toBeInTheDocument();
   });
 
   test('removes a preview content entry on close button click', () => {