Skip to content

Enhancement [DEV-12166] Standalone markup includes #2529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jayb wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Enhancement [DEV-12166] Standalone markup includes #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/dashboard/src/components/VisualizationsPanel/VisualizationsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,7 @@ const addVisualization = (type, subType) => {
newVisualizationConfig.visualizationType = type
break
case 'markup-include':
newVisualizationConfig.contentEditor = {
inlineHTML: '<h2>Inline HTML</h2>',
markupVariables: [],
showHeader: true,
srcUrl: '#example',
useInlineHTML: true
}
newVisualizationConfig.theme = 'theme-blue'
newVisualizationConfig.visual = {
border: false,
accent: false,
background: false,
hideBackgroundColor: false,
borderColorTheme: false
}
newVisualizationConfig.showEditorPanel = true
newVisualizationConfig.visualizationType = type

break
case 'dashboardFilters': {
newVisualizationConfig.sharedFilterIndexes = []
Expand Down
11 changes: 11 additions & 0 deletions packages/editor/src/components/ChooseTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import ComboChartIcon from '@cdc/core/assets/icon-combo-chart.svg'
import EpiChartIcon from '@cdc/core/assets/icon-epi-chart.svg'
import TableIcon from '@cdc/core/assets/icon-table.svg'
import WarmingStripesIcon from '@cdc/core/assets/icon-warming-stripes.svg'
import CodeIcon from '@cdc/core/assets/icon-code.svg'
import Icon from '@cdc/core/components/ui/Icon'

import {
Expand Down Expand Up @@ -317,6 +318,16 @@ const buttons = [
content: `Specify the calculation of a single data point (such as a percentage value) and present it on a horizontal
scale.`
},
{
id: 26,
category: 'General',
label: 'Markup Include',
type: 'markup-include',
subType: null,
orientation: null,
icon: <CodeIcon />,
content: 'Include custom HTML markup or embed content from external URLs.'
},
{
id: 17,
category: 'General',
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/scss/choose-vis-tab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
display: grid;
gap: 1em;
&.category_general {
grid-template-columns: repeat(5, 160px);
grid-template-columns: repeat(6, 160px);
}
&.category_charts {
grid-template-columns: repeat(7, 160px);
Expand Down
2 changes: 1 addition & 1 deletion packages/markup-include/src/CdcMarkupInclude.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const CdcMarkupInclude: React.FC<CdcMarkupIncludeProps> = ({
processedConfig.filters = addValuesToFilters(processedConfig.filters, responseData)
}

updateConfig({ ...configObj, ...processedConfig })
updateConfig({ ...defaults, ...processedConfig })
dispatch({ type: 'SET_LOADING', payload: false })
}

Expand Down
7 changes: 5 additions & 2 deletions packages/markup-include/src/data/initial-state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
export default {
contentEditor: {
inlineHTML: '<h2>Inline HTML</h2>',
inlineHTML: '<strong>Inline HTML</strong>',
markupVariables: [],
showHeader: true,
srcUrl: '#example',
title: '',
titleStyle: 'small',
useInlineHTML: false,
useInlineHTML: true,
showNoDataMessage: false,
noDataMessageText: 'No Data Available'
},
data: [],
legend: {},
newViz: true,
showEditorPanel: true,
theme: 'theme-blue',
type: 'markup-include',
visualizationType: 'markup-include',
runtime: null,
visual: {
border: false,
Expand Down