@cdc/dashboard 4.25.10 → 4.26.1

package/src/helpers/updateChildFilters.ts

@@ -1,12 +1,14 @@
 import { SharedFilter } from '../types/SharedFilter'
 import _ from 'lodash'
+import { mergeCustomOrderValues } from '@cdc/core/helpers/mergeCustomOrderValues'
+import { handleSorting } from '@cdc/core/components/Filters'
 
 export const updateChildFilters = (newSharedFilters: SharedFilter[], data: Record<string, any>): SharedFilter[] => {
   const dataSet = Object.values(data).flat()
 
   // Find indexes of all child filters
   const childFilterIndexes: number[] = newSharedFilters
-    .map((filter, index) => (filter.type === 'datafilter' && filter.parents ? index : -1))
+    .map((filter, index) => (filter.type === 'datafilter' && filter.parents?.length ? index : -1))
     .filter(index => index !== -1)
   if (childFilterIndexes.length === 0) return newSharedFilters
 
@@ -16,33 +18,54 @@ export const updateChildFilters = (newSharedFilters: SharedFilter[], data: Recor
   // Update each child filter
   childFilterIndexes.forEach(childIndex => {
     const childFilter: SharedFilter = newSharedFilters[childIndex]
-    const parentFilter: SharedFilter = newSharedFilters.find(
-      filter => String(childFilter.parents) === String(filter.key)
-    )
-
-    if (parentFilter) {
-      // Filter dataset based on parent's active value
-      const parentsActiveValues: string[] = dataSet.filter((d: Record<string, any>) => {
-        return parentFilter.active?.includes(d[parentFilter.columnName])
+
+    // Get all parent filters for this child
+    const parentFilters: SharedFilter[] = newSharedFilters.filter(filter => childFilter.parents?.includes(filter.key))
+
+    if (parentFilters.length > 0) {
+      const filteredDataSet = dataSet.filter((d: Record<string, any>) => {
+        return parentFilters.every(parentFilter => {
+          const parentActive = parentFilter.active
+          if (Array.isArray(parentActive)) {
+            return parentActive.includes(d[parentFilter.columnName])
+          }
+          return parentActive == d[parentFilter.columnName]
+        })
       })
-      // Get unique active values for the child filter
-      const childFilterValues = _.uniq(parentsActiveValues.map(d => d[childFilter.columnName]).filter(Boolean))
-
-      // Update the child filter if unique values exist
-      if (childFilterValues.length > 0) {
-        const isChildMultiSelect = childFilter.filterStyle === 'multi-select'
-        const activeValue = isChildMultiSelect
-          ? childFilterValues
-          : childFilter.active
-          ? childFilter.active
-          : childFilter.defaultValue
-          ? childFilter.defaultValue
-          : childFilterValues[0]
-        updatedFilters[childIndex] = {
-          ...childFilter,
-          values: childFilterValues,
-          active: activeValue
-        }
+
+      // Get unique active values for the child filter from the filtered dataset
+      const childFilterValues = _.uniq(filteredDataSet.map(d => d[childFilter.columnName]).filter(Boolean))
+
+      // Prepare filter with values and orderedValues for sorting
+      const filterToSort = {
+        ...childFilter,
+        values: childFilterValues,
+        orderedValues: mergeCustomOrderValues(childFilterValues, childFilter.orderedValues, childFilter.order)
+      }
+
+      // Use handleSorting to apply proper sorting logic (handles asc/desc/cust/column)
+      const sortedFilter = handleSorting(filterToSort)
+
+      // Update the child filter with new values (even if empty)
+      const isChildMultiSelect = childFilter.filterStyle === 'multi-select'
+      const activeValue =
+        sortedFilter.values.length > 0
+          ? isChildMultiSelect
+            ? sortedFilter.values
+            : childFilter.active && sortedFilter.values.includes(childFilter.active)
+            ? childFilter.active
+            : childFilter.defaultValue && sortedFilter.values.includes(childFilter.defaultValue)
+            ? childFilter.defaultValue
+            : childFilter.resetLabel || sortedFilter.values[0]
+          : isChildMultiSelect
+          ? []
+          : childFilter.active || ''
+
+      updatedFilters[childIndex] = {
+        ...childFilter,
+        values: sortedFilter.values,
+        orderedValues: sortedFilter.orderedValues,
+        active: activeValue
       }
     }
   })

package/src/index.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 import ReactDOM from 'react-dom/client'
 
 import '@cdc/core/styles/cove-main.scss'
+import '@cdc/core/components/EditorPanel/EditorPanel.styles.css'
 
 import MultiDashboardWrapper from './CdcDashboard'
 

package/src/scss/editor-panel.scss

@@ -1,3 +1,6 @@
+// Dashboard-specific Editor Panel Styles
+// Common editor panel styles are imported from @cdc/core/styles/editor-panel-base via cove-main.scss
+
 // Shift down for top level Dashboard bar when in edit mode
 .layout-container,
 .editor-panel + .cdc-dashboard-inner-container,
@@ -101,437 +104,6 @@
       width: 75px;
     }
   }
-  .form-container {
-    border-right: var(--lightGray) 1px solid;
-    flex-grow: 1;
-  }
-  .guidance-link {
-    margin: 2em 1em 0;
-    padding: 0.75em 1em;
-    svg {
-      width: 60px;
-      color: var(--blue);
-      margin-right: 1rem;
-      height: 60px; // IE11
-      path {
-        fill: currentColor;
-      }
-    }
-  }
-  .warning {
-    color: #d8000c;
-    background-color: #ffd2d2;
-    padding: 0.75em 1em;
-    margin: 1em 0;
-    font-size: 0.8em;
-    border: #d8000c 1px solid;
-    border-radius: 0.4em;
-    strong {
-      font-weight: 600;
-      display: block;
-    }
-  }
-  .accordion__button {
-    cursor: pointer;
-    font-size: 1em;
-    padding: 0.3em 1em;
-    width: 100%;
-    text-align: left;
-    position: relative;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-  }
-  .accordion__panel:first-child {
-    margin-top: 0;
-  }
-  .accordion__button:before {
-    display: inline-block;
-    content: '';
-    height: 7px;
-    width: 7px;
-    margin-right: 1em;
-    border-bottom: 2px solid currentColor;
-    border-right: 2px solid currentColor;
-    transform: rotate(-45deg);
-    right: 0;
-    position: absolute;
-    top: 50%;
-    transform: rotate(-45deg) translateY(-50%);
-    transition: 0.1s all;
-  }
-
-  .accordion__button[aria-expanded='true']::before,
-  .accordion__button[aria-selected='true']::before {
-    transform: rotate(45deg) translateY(-50%);
-    margin-right: 1.3em;
-    transition: 0.1s all;
-  }
-
-  .accordion__panel {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    padding: 1em 1.25em 2em;
-    animation: fadein 0.2s ease-in;
-    h5 {
-      font-size: 0.8em;
-    }
-  }
-
-  .advanced {
-    padding: 0 1em 1em;
-    text-align: left;
-    p {
-      font-size: 0.8rem;
-    }
-    .advanced-toggle-link {
-      padding-top: 1em;
-      display: block;
-      text-align: left;
-      cursor: pointer;
-      text-decoration: underline;
-      span {
-        text-decoration: none;
-        display: inline-block;
-        font-family: monospace;
-        padding-right: 5px;
-      }
-      &:hover {
-        color: rgba(0, 0, 0, 0.7);
-      }
-    }
-    textarea {
-      height: 400px;
-      width: 100%;
-      font-size: 0.9em;
-      padding: 0.5em;
-      font-family: monospace;
-      box-sizing: border-box;
-    }
-  }
-
-  @keyframes fadein {
-    0% {
-      opacity: 0;
-    }
-
-    100% {
-      opacity: 1;
-    }
-  }
-
-  .heading-2 {
-    background: #565656;
-    color: #fff;
-    font-size: 1.1em;
-    padding: 0.6em 1em;
-    position: relative;
-    border-bottom: #565656 3px solid;
-    z-index: 3;
-  }
-
-  label {
-    text-transform: uppercase;
-    display: block;
-    font-size: 0.8em;
-    font-weight: 600;
-    &:not(:first-child) {
-      margin-top: 1em;
-    }
-    span.edit-label {
-      margin-bottom: 0.3em;
-      display: block;
-    }
-    span.column-heading {
-      font-size: 1em;
-    }
-    &.checkbox {
-      display: flex;
-      span:not(.cove-icon) {
-        display: inline;
-      }
-      input {
-        margin-left: 0;
-        width: inherit;
-        display: inline;
-      }
-    }
-  }
-  input[type='text'],
-  input[role='combobox'],
-  input[type='number'],
-  textarea {
-    min-width: 100%;
-    max-width: 100%; // Doing this prevents width of textarea from being changed
-  }
-  .header .color-palette li {
-    width: 21px;
-    height: 21px;
-    border-radius: 40px;
-    margin-right: 2.8px;
-  }
-  .color-palette {
-    display: flex;
-    max-width: 100%;
-    padding: 0;
-    margin: 0.5em 0 0 0;
-    list-style: none;
-    flex-wrap: wrap;
-    li {
-      width: 45px;
-      height: 23px;
-      margin-right: 4px;
-      margin-bottom: 10px;
-      display: flex;
-      border-radius: 5px;
-      overflow: hidden;
-      cursor: pointer;
-      position: relative;
-      .click-target {
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-      }
-      &.selected {
-        border: rgba(0, 0, 0, 0.8) 2px solid;
-      }
-      span {
-        width: 33.3%;
-      }
-    }
-  }
-
-  fieldset {
-    display: block;
-  }
-
-  .primary-fieldset {
-    padding: 0;
-    margin: 0;
-    border: 0;
-  }
-
-  ul.column-edit {
-    list-style: none;
-    li {
-      margin-top: 1em;
-    }
-    .three-col {
-      display: flex;
-      justify-content: space-between;
-      > label {
-        margin-top: 0;
-        width: 30%;
-        display: inline-block;
-        input[type='text'],
-        input[type='number'] {
-          width: 50px;
-        }
-      }
-    }
-  }
-
-  &.hidden {
-    display: none;
-  }
-
-  .emove-column {
-    float: right;
-    text-transform: uppercase;
-    color: #c32b2b;
-    font-size: 0.7em;
-    line-height: 1.6em;
-    border-radius: 5px;
-    margin: 0 auto;
-    transition: 0.1s all;
-    border: 0;
-    text-decoration: underline;
-    outline: 0;
-    cursor: pointer;
-    font-weight: bold;
-  }
-
-  .edit-block {
-    padding-left: 1em;
-    border-left: rgba(0, 0, 0, 0.2) 4px solid;
-    transition: 0.2s all;
-    &:not(:first-child) {
-      margin-top: 2em;
-    }
-    input[type='text'],
-    input[type='number'] {
-      font-size: 1em;
-    }
-    label {
-      margin-top: 0;
-    }
-    label + label {
-      margin-top: 1em;
-    }
-    &:hover {
-      border-left: rgba(0, 0, 0, 0.7) 4px solid;
-      transition: 0.2s all;
-    }
-  }
-
-  span.subtext {
-    display: block;
-    color: rgba(0, 0, 0, 0.5);
-    text-transform: none;
-    font-weight: normal;
-  }
-
-  .sort-list {
-    list-style: none;
-    > li {
-      margin-right: 0.3em;
-      margin-bottom: 0.3em;
-    }
-  }
-  .sort-list li > div {
-    display: block;
-    box-sizing: border-box;
-    border: 1px solid #d1d1d1;
-    border-radius: 2px;
-    background: #f1f1f1;
-    padding: 0.4em 0.6em;
-    font-size: 0.8em;
-    margin-bottom: 0.3em;
-    cursor: move;
-  }
-
-  .info {
-    font-size: 0.8em;
-    line-height: 1.4em;
-    font-style: italic;
-    padding-top: 10px;
-  }
-
-  .react-tags__search {
-    width: 100%;
-  }
-
-  .react-tags {
-    position: relative;
-    input.react-tags__search-input {
-      font-size: 0.8rem;
-    }
-    /* clicking anywhere will focus the input */
-    cursor: text;
-    span {
-      display: inline;
-    }
-  }
-
-  .react-tags.is-focused {
-    border-color: rgba(0, 0, 0, 0.7);
-  }
-
-  .react-tags__selected {
-    display: inline;
-  }
-
-  .react-tags__selected-tag {
-    display: inline-block;
-    box-sizing: border-box;
-    border: 1px solid #d1d1d1;
-    border-radius: 2px;
-    background: #f1f1f1;
-    padding: 0.4em 0.6em;
-    font-size: 0.8em;
-    margin-right: 0.3em;
-    margin-bottom: 0.3em;
-  }
-
-  .react-tags__selected-tag:after {
-    content: '\2715';
-    color: #aaa;
-    margin-left: 8px;
-  }
-
-  .react-tags__selected-tag:hover,
-  .react-tags__selected-tag:focus {
-    border-color: #b1b1b1;
-  }
-
-  .react-tags__search {
-    display: inline-block;
-
-    /* prevent autoresize overflowing the container */
-    max-width: 100%;
-  }
-
-  @media screen and (min-width: 30em) {
-    .react-tags__search {
-      /* this will become the offsetParent for suggestions */
-      position: relative;
-    }
-  }
-
-  .react-tags__search input {
-    /* prevent autoresize overflowing the container */
-    max-width: 100%;
-
-    /* emove styles and layout from this element */
-    margin: 0;
-    outline: none;
-    padding: 0.5em 0.3em;
-
-    /* match the font styles */
-    font-size: inherit;
-    line-height: inherit;
-  }
-
-  .react-tags__search input::-ms-clear {
-    display: none;
-  }
-
-  .react-tags__suggestions {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    width: 100%;
-  }
-
-  @media screen and (min-width: 30em) {
-    .react-tags__suggestions {
-      width: 240px;
-    }
-  }
-
-  .react-tags__suggestions ul {
-    margin: 4px -1px;
-    padding: 0;
-    list-style: none;
-    background: white;
-    border: 1px solid #d1d1d1;
-    border-radius: 2px;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
-  }
-
-  .react-tags__suggestions li {
-    border-bottom: 1px solid #ddd;
-    padding: 6px 8px;
-  }
-
-  .react-tags__suggestions li mark {
-    text-decoration: underline;
-    background: none;
-    font-weight: 600;
-  }
-
-  .react-tags__suggestions li:hover {
-    cursor: pointer;
-    background: #eee;
-  }
-
-  .react-tags__suggestions li.is-active {
-    background: #b7cfe0;
-  }
-
-  .react-tags__suggestions li.is-disabled {
-    opacity: 0.5;
-    cursor: auto;
-  }
 
   .current-viz-list {
     margin: 0.5em 0;