@cdc/editor 4.26.3 → 4.26.5

package/src/components/PreviewDataTable.test.tsx

@@ -0,0 +1,184 @@
+import React from 'react'
+import { render, screen, waitFor } from '@testing-library/react'
+import ConfigContext, { EditorDispatchContext } from '@cdc/core/contexts/EditorContext'
+import PreviewDataTable from './PreviewDataTable'
+
+describe('PreviewDataTable', () => {
+  const renderPreview = config => {
+    const dispatch = vi.fn()
+
+    return render(
+      <ConfigContext.Provider
+        value={
+          {
+            config,
+            errors: [],
+            currentViewport: 'lg',
+            globalActive: 1,
+            setTempConfig: vi.fn()
+          } as any
+        }
+      >
+        <EditorDispatchContext.Provider value={dispatch}>
+          <PreviewDataTable />
+        </EditorDispatchContext.Provider>
+      </ConfigContext.Provider>
+    )
+  }
+
+  it('updates the rendered preview rows when the dashboard preview source changes', async () => {
+    const initialConfig = {
+      type: 'dashboard',
+      datasets: {
+        source_a: {
+          data: [{ label: 'Old Source Row', value: 'A' }],
+          preview: true
+        },
+        source_b: {
+          data: [{ label: 'Secondary Row', value: 'B' }],
+          preview: false
+        }
+      }
+    }
+
+    const nextConfig = {
+      ...initialConfig,
+      datasets: {
+        source_b: {
+          data: [{ label: 'New Source Row', value: 'B2' }],
+          preview: true
+        },
+        source_a: {
+          data: [{ label: 'Old Source Row', value: 'A' }],
+          preview: false
+        }
+      }
+    }
+
+    const view = renderPreview(initialConfig)
+
+    expect(await screen.findByText('Old Source Row')).toBeInTheDocument()
+    expect(screen.queryByText('New Source Row')).not.toBeInTheDocument()
+
+    view.rerender(
+      <ConfigContext.Provider
+        value={
+          {
+            config: nextConfig,
+            errors: [],
+            currentViewport: 'lg',
+            globalActive: 1,
+            setTempConfig: vi.fn()
+          } as any
+        }
+      >
+        <EditorDispatchContext.Provider value={vi.fn()}>
+          <PreviewDataTable />
+        </EditorDispatchContext.Provider>
+      </ConfigContext.Provider>
+    )
+
+    await waitFor(() => {
+      expect(screen.getByText('New Source Row')).toBeInTheDocument()
+    })
+    expect(screen.queryByText('Old Source Row')).not.toBeInTheDocument()
+  })
+
+  it('shows another loaded dataset after the active preview dataset is removed', async () => {
+    const initialConfig = {
+      type: 'dashboard',
+      datasets: {
+        source_a: {
+          data: [{ label: 'Removed Source Row', value: 'A' }],
+          preview: true
+        },
+        source_b: {
+          data: [{ label: 'Fallback Source Row', value: 'B' }],
+          preview: false
+        }
+      }
+    }
+
+    const nextConfig = {
+      type: 'dashboard',
+      datasets: {
+        source_b: {
+          data: [{ label: 'Fallback Source Row', value: 'B' }],
+          preview: true
+        }
+      }
+    }
+
+    const view = renderPreview(initialConfig)
+
+    expect(await screen.findByText('Removed Source Row')).toBeInTheDocument()
+
+    view.rerender(
+      <ConfigContext.Provider
+        value={
+          {
+            config: nextConfig,
+            errors: [],
+            currentViewport: 'lg',
+            globalActive: 1,
+            setTempConfig: vi.fn()
+          } as any
+        }
+      >
+        <EditorDispatchContext.Provider value={vi.fn()}>
+          <PreviewDataTable />
+        </EditorDispatchContext.Provider>
+      </ConfigContext.Provider>
+    )
+
+    await waitFor(() => {
+      expect(screen.getByText('Fallback Source Row')).toBeInTheDocument()
+    })
+    expect(screen.queryByText('Removed Source Row')).not.toBeInTheDocument()
+  })
+
+  it('returns to the initial empty preview when the final dataset is removed', async () => {
+    const initialConfig = {
+      type: 'dashboard',
+      datasets: {
+        source_a: {
+          data: [{ label: 'Last Source Row', value: 'A' }],
+          preview: true
+        }
+      }
+    }
+
+    const nextConfig = {
+      type: 'dashboard',
+      datasets: {}
+    }
+
+    const view = renderPreview(initialConfig)
+
+    expect(await screen.findByText('Last Source Row')).toBeInTheDocument()
+
+    view.rerender(
+      <ConfigContext.Provider
+        value={
+          {
+            config: nextConfig,
+            errors: [],
+            currentViewport: 'lg',
+            globalActive: 1,
+            setTempConfig: vi.fn()
+          } as any
+        }
+      >
+        <EditorDispatchContext.Provider value={vi.fn()}>
+          <PreviewDataTable />
+        </EditorDispatchContext.Provider>
+      </ConfigContext.Provider>
+    )
+
+    await waitFor(() => {
+      expect(screen.getByText('No Data')).toBeInTheDocument()
+    })
+    expect(screen.getByText('Import data to preview')).toBeInTheDocument()
+    expect(screen.queryByText('Last Source Row')).not.toBeInTheDocument()
+  })
+})

package/src/components/PreviewDataTable.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useContext, useMemo, useCallback, useEffect, useRef, memo } from 'react'
+import React, { useState, useContext, useMemo, useEffect, useRef, memo } from 'react'
 import {
   useTable,
   useBlockLayout,
@@ -18,7 +18,7 @@ import { GrFormPrevious } from 'react-icons/gr'
 import validateFipsCodeLength from '@cdc/core/helpers/validateFipsCodeLength'
 import { errorMessages } from '../helpers/errorMessages'
 import { DataSet } from '@cdc/core/types/DataSet'
-import Icon from '@cdc/core/components/ui/Icon'
+import Button from '@cdc/core/components/elements/Button'
 
 const TableFilter = memo(({ globalFilter, setGlobalFilter = () => {}, disabled = false }: any) => {
   const [filterValue, setFilterValue] = useState(globalFilter ?? '')
@@ -61,25 +61,27 @@ const Footer = memo(({ previousPage, nextPage, canPreviousPage, canNextPage, pag
   <footer className='data-table-pagination mt-2'>
     <ul>
       <li>
-        <button
+        <Button
           onClick={() => previousPage()}
           className='btn btn-prev display-flex align-items-center justify-content-center'
           disabled={!canPreviousPage}
           title='Previous Page'
+          flexCenter
         >
           {' '}
           <GrFormPrevious />
-        </button>
+        </Button>
       </li>
       <li className='me-2'>
-        <button
+        <Button
           onClick={() => nextPage()}
           className='btn btn-next display-flex align-items-center justify-content-center'
           disabled={!canNextPage}
           title='Next Page'
+          flexCenter
         >
           <MdNavigateNext />
-        </button>
+        </Button>
       </li>
     </ul>
     <span>
@@ -110,7 +112,12 @@ const PreviewDataTable = () => {
     return normalizedData
   }
   const setTableData = td => {
-    if (!Array.isArray(td) || td.length === 0) return
+    if (!Array.isArray(td) || td.length === 0) {
+      // When the active dataset is removed, clear the cached source so the placeholder can render again.
+      lastDataSourceRef.current = null
+      _setTableData(null)
+      return
+    }
     if (lastDataSourceRef.current === td) return
 
     lastDataSourceRef.current = td
@@ -142,6 +149,10 @@ const PreviewDataTable = () => {
     const loadData = async () => {
       if (!config.data) {
         if (config.type === 'dashboard') {
+          if (!previewData) {
+            setTableData(null)
+            return
+          }
           await handleDashboardData(config.datasets)
         } else {
           if (config.dataUrl) {

package/src/components/modal/Confirmation.jsx

@@ -1,16 +1,17 @@
 import React from 'react'
+import Button from '@cdc/core/components/elements/Button'
 
 export const ConfirmationModal = props => {
   return (
     <>
       <p className='message'>{props.message}</p>
       <div className='confirmation-buttons'>
-        <div className='btn btn-inline' onClick={props.onCancel}>
+        <Button type='button' className='btn btn-inline' onClick={props.onCancel}>
           No
-        </div>
-        <div className='btn btn-inline' onClick={props.onConfirm}>
+        </Button>
+        <Button type='button' className='btn btn-inline' onClick={props.onConfirm}>
           Yes
-        </div>
+        </Button>
       </div>
     </>
   )

package/src/scss/choose-vis-tab.scss

@@ -84,7 +84,8 @@
         }
       }
 
-      svg {
+      svg,
+      .choose-vis__heatmap-icon {
         display: block;
         margin: 0 auto;
         box-sizing: border-box;
@@ -92,6 +93,11 @@
         height: 80px;
         flex-shrink: 0;
       }
+
+      .choose-vis__heatmap-icon {
+        object-fit: contain;
+        mix-blend-mode: multiply;
+      }
     }
   }
 }

package/src/scss/main.scss

@@ -31,7 +31,6 @@
         background: #f2f2f2;
         line-height: 3rem;
         border-bottom: 1px solid var(--lightGray);
-        color: #333;
         flex-grow: 1;
         flex-shrink: 0;
         width: 25%;
@@ -202,9 +201,22 @@
     font-size: 1em;
     display: block;
     border-radius: 5px;
-    transition: 0.1s all;
+    transition: background-color 160ms ease, box-shadow 160ms ease, transform 160ms ease;
     cursor: pointer;
 
+    @media (hover: hover) {
+      &:hover:not(:disabled) {
+        background: #0b4778;
+        transform: translateY(-1px);
+        box-shadow: 0 0.5rem 1.1rem rgb(0 94 170 / 22%);
+      }
+    }
+
+    &:active:not(:disabled) {
+      transform: translateY(0);
+      box-shadow: 0 0.15rem 0.45rem rgb(0 94 170 / 12%);
+    }
+
     &.btn-inline {
       display: inline-block;
       margin: 10px 0 0 10px;
@@ -212,10 +224,6 @@
   }
 }
 
-section.introText {
-  padding: 15px 0;
-}
-
 section.footnotes {
   border-top: 1px solid #ddd;
   margin-top: 70px;