@cdc/editor 1.4.3 → 4.22.10-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/LICENSE +201 -0
  2. package/dist/cdceditor.js +70 -52
  3. package/example/private/map.csv +60 -0
  4. package/example/private/test.html +1 -0
  5. package/example/supported-cities.csv +107 -0
  6. package/example/valid-data-map.csv +4 -3
  7. package/package.json +9 -9
  8. package/src/CdcEditor.js +84 -16
  9. package/src/components/ChooseTab.js +236 -85
  10. package/src/components/DataImport.js +337 -297
  11. package/src/scss/configure-tab.scss +4 -1
  12. package/src/scss/data-import.scss +32 -55
  13. package/src/scss/main.scss +16 -1
  14. package/src/assets/icons/dashboard.svg +0 -8
package/example/private/map.csv ADDED
@@ -0,0 +1,60 @@
1
+ State,Activity Level,Funding Status,URL,
2
+ AL,Very High,*,https://www.cdc.gov/flu/,
3
+ AK,High,Current,https://www.cdc.gov/mmwr/,
4
+ AS,Moderate,Current,https://www.cdc.gov/flu/,
5
+ AZ,Low,Current,https://www.cdc.gov/flu/,
6
+ AR,Minimal,Current,https://www.cdc.gov/mmwr/,
7
+ CA,Very High,NA,https://www.cdc.gov/flu/,
8
+ CO,High,Current,https://www.cdc.gov/flu/,
9
+ CT,Moderate,Current,https://www.cdc.gov/mmwr/,
10
+ DE,Low,Current,https://www.cdc.gov/flu/,
11
+ DC,Minimal,Current,https://www.cdc.gov/flu/,
12
+ FL,Very High,Current,https://www.cdc.gov/mmwr/,
13
+ GA,High,Current,https://www.cdc.gov/flu/,
14
+ GU,Moderate,*,https://www.cdc.gov/flu/,
15
+ HI,Low,Current,https://www.cdc.gov/mmwr/,
16
+ ID,Minimal,Current,https://www.cdc.gov/flu/,
17
+ IL,Very High,Current,https://www.cdc.gov/flu/,
18
+ IN,High,Current,https://www.cdc.gov/mmwr/,
19
+ IA,Moderate,Current,https://www.cdc.gov/flu/,
20
+ KS,Low,Current,https://www.cdc.gov/flu/,
21
+ KY,Minimal,Current,https://www.cdc.gov/mmwr/,
22
+ LA,Very High,*,https://www.cdc.gov/flu/,
23
+ ME,High,Current,https://www.cdc.gov/flu/,
24
+ MH,Moderate,Current,https://www.cdc.gov/mmwr/,
25
+ MD,Low,Current,https://www.cdc.gov/flu/,
26
+ MA,Minimal,Current,https://www.cdc.gov/flu/,
27
+ MI,Very High,Current,https://www.cdc.gov/mmwr/,
28
+ FM,High,Current,https://www.cdc.gov/flu/,
29
+ MN,Moderate,NA,https://www.cdc.gov/flu/,
30
+ MS,Low,Current,https://www.cdc.gov/mmwr/,
31
+ MO,Minimal,Current,https://www.cdc.gov/flu/,
32
+ MT,Very High,Current,https://www.cdc.gov/flu/,
33
+ NE,High,Current,https://www.cdc.gov/mmwr/,
34
+ NV,Moderate,Current,https://www.cdc.gov/flu/,
35
+ NH,Low,Current,https://www.cdc.gov/flu/,
36
+ NJ,Minimal,Current,https://www.cdc.gov/mmwr/,
37
+ NM,Very High,NA,https://www.cdc.gov/flu/,
38
+ NY,High,Current,https://www.cdc.gov/flu/,
39
+ NC,Moderate,Current,https://www.cdc.gov/mmwr/,
40
+ ND,Low,Current,https://www.cdc.gov/flu/,
41
+ MP,Minimal,Current,https://www.cdc.gov/flu/,
42
+ OH,Very High,Current,https://www.cdc.gov/mmwr/,
43
+ OK,High,Current,https://www.cdc.gov/flu/,
44
+ OR,Moderate,Current,https://www.cdc.gov/flu/,
45
+ PW,Low,Current,https://www.cdc.gov/mmwr/,
46
+ PA,Minimal,Current,https://www.cdc.gov/flu/,
47
+ PR,Very High,Current,https://www.cdc.gov/flu/,
48
+ RI,High,Current,https://www.cdc.gov/mmwr/,
49
+ SC,Moderate,Current,https://www.cdc.gov/flu/,
50
+ SD,Low,Current,https://www.cdc.gov/flu/,
51
+ TN,Minimal,Current,https://www.cdc.gov/mmwr/,
52
+ TX,Very High,Current,https://www.cdc.gov/flu/,
53
+ UT,High,Current,https://www.cdc.gov/flu/,
54
+ VT,Moderate,Current,https://www.cdc.gov/mmwr/,
55
+ VI,Low,Current,https://www.cdc.gov/flu/,
56
+ VA,Minimal,Current,https://www.cdc.gov/flu/,
57
+ WA,Very High,Current,https://www.cdc.gov/mmwr/,
58
+ WV,High,Current,https://www.cdc.gov/flu/,
59
+ WI,Moderate,Current,https://www.cdc.gov/flu/,
60
+ WY,Low,Current,https://www.cdc.gov/mmwr/,
package/example/private/test.html ADDED
@@ -0,0 +1 @@
1
+ <!doctype html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> <meta http-equiv="X-UA-Compatible" content="ie=edge"> <title>Document</title> </head> <body> <h1>Header</h1> <p>Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth.</p> <br> <p>Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum decided to leave for the far World of Grammar. The Big Oxmox advised her not to do so, because there were thousands of bad Commas, wild Question Marks and devious Semikoli, but the Little Blind Text didn’t listen. </p><br><p>She packed her seven versalia, put her initial into the belt and made herself on the way. When she reached the first hills of the Italic Mountains, she had a last view back on the skyline of her hometown Bookmarksgrove, the headline of Alphabet Village and the subline of her own road, the Line Lane. Pityful a rethoric question ran over her cheek.</p></body></html>
package/example/supported-cities.csv ADDED
@@ -0,0 +1,107 @@
1
+ City,Longitude,Latitude,Value
2
+ Albuquerque,-106.650421,35.084385,1
3
+ Anaheim,-117.914299,33.836594,2
4
+ Anchorage,-149.900284,61.218056,3
5
+ Arlington,-97.108063,32.735687,4
6
+ Atlanta,-84.387985,33.748997,5
7
+ Aurora,-93.717979,36.97089,6
8
+ Austin,-97.743057,30.267153,7
9
+ Bakersfield,-119.018715,35.373291,8
10
+ Baltimore,-76.61219,39.290386,9
11
+ Baton Rouge,-91.187149,30.451468,10
12
+ Boise,-116.202316,43.615021,11
13
+ Boston,-71.058884,42.360081,12
14
+ Buffalo,-78.878372,42.886448,13
15
+ Chandler,-111.841248,33.30616,14
16
+ Charlotte,-80.843124,35.227085,15
17
+ Chesapeake,-76.287491,36.768208,16
18
+ Chicago,-87.629799,41.878113,17
19
+ Chula Vista,-117.084198,32.640053,18
20
+ Cincinnati,-84.512016,39.103119,19
21
+ Cleveland,-81.694359,41.499321,20
22
+ Colorado Springs,-104.821365,38.833881,21
23
+ Columbus,-82.998795,39.961178,22
24
+ Corpus Christi,-97.396378,27.800583,23
25
+ Dallas,-96.796989,32.776665,24
26
+ Denver,-104.99025,39.739235,25
27
+ Detroit,-83.045753,42.331429,26
28
+ District of Columbia,-77.036873,38.907192,27
29
+ Durham,-78.898621,35.994034,28
30
+ El Paso,-106.485023,31.761877,29
31
+ Fort Wayne,-85.139351,41.079273,30
32
+ Ft Wayne,-85.139351,41.079273,31
33
+ Fort Worth,-97.330765,32.755489,32
34
+ Fremont,-121.988571,37.548271,33
35
+ Fresno,-119.787125,36.737797,34
36
+ Garland,-96.638885,32.912624,35
37
+ Gilbert,-111.789024,33.352825,36
38
+ Glendale,-118.255074,34.142509,37
39
+ Greensboro,-79.791977,36.072636,38
40
+ Henderson,-114.98172,36.039524,39
41
+ Hialeah,-80.278107,25.857595,40
42
+ Honolulu,-157.858337,21.306944,41
43
+ Houston,-95.358421,29.749907,42
44
+ Indianapolis,-86.158066,39.768402,43
45
+ Irvine,-117.826508,33.684566,44
46
+ Irving,-96.948891,32.814018,45
47
+ Jacksonville,-81.655647,30.332184,46
48
+ Jersey City,-74.077644,40.728157,47
49
+ Kansas City,-94.578568,39.099728,48
50
+ Laredo,-99.507553,27.503561,49
51
+ Las Vegas,-115.139832,36.169941,50
52
+ Lexington,-84.503716,38.040585,51
53
+ Lincoln,-95.262955,37.346134,52
54
+ Long Beach,-118.193741,33.77005,53
55
+ Los Angeles,-118.243683,34.052235,54
56
+ Los Angeles County,-118.229362,34.058762,55
57
+ Louisville,-85.758453,38.252666,56
58
+ Lubbock,-101.855164,33.577862,57
59
+ Madison,-89.40123,43.073051,58
60
+ "Marion County, Indiana",-86.136543,39.781029,59
61
+ Memphis,-90.048981,35.149532,60
62
+ Mesa,-111.831474,33.415184,61
63
+ Miami,-80.191788,25.761681,62
64
+ Milwaukee,-87.906471,43.038902,63
65
+ Minneapolis,-93.265015,44.977753,64
66
+ "Montgomery County, Maryland",-77.199406,39.153515,65
67
+ Nashville,-86.781601,36.162663,66
68
+ New Orleans,-90.071533,29.951065,67
69
+ New York City,-74.005974,40.712776,68
70
+ Newark,-95.582733,37.443188,69
71
+ Norfolk,-76.285873,36.850769,70
72
+ North Las Vegas,-115.114571,36.19585,71
73
+ Oakland,-122.271111,37.804363,72
74
+ Oklahoma City,-97.516426,35.46756,73
75
+ Omaha,-95.934502,41.256538,74
76
+ Orlando,-81.379234,28.538336,75
77
+ Philadelphia,-75.165222,39.952583,76
78
+ Phoenix,-112.074036,33.448376,77
79
+ Pittsburgh,-79.995888,40.440624,78
80
+ Plano,-96.698883,33.019844,79
81
+ Portland,-122.658722,45.51223,80
82
+ Raleigh,-78.638176,35.779591,81
83
+ Reno,-119.813805,39.529633,82
84
+ Richmond,-77.43605,37.540726,83
85
+ Riverside,-117.375496,33.980602,84
86
+ Sacramento,-121.4944,38.581573,85
87
+ Saint Paul,-93.089958,44.953705,86
88
+ San Antonio,-98.493629,29.424122,87
89
+ San Diego,-117.161087,32.715736,88
90
+ San Francisco,-122.419418,37.774929,89
91
+ San Jose,-121.88633,37.338207,90
92
+ Santa Ana,-117.867653,33.745472,91
93
+ Scottsdale,-111.926048,33.494171,92
94
+ Seattle,-122.332069,47.606209,93
95
+ Spokane,-117.426048,47.658779,94
96
+ St. Louis,-90.199402,38.627003,95
97
+ St. Petersburg,-82.640289,27.767601,96
98
+ Stockton,-121.290779,37.957703,97
99
+ Tampa,-82.457176,27.950575,98
100
+ Toledo,-83.537865,41.652805,99
101
+ Tucson,-110.974709,32.222607,100
102
+ Tuscon,-110.974709,32.222607,101
103
+ Tulsa,-95.992775,36.15398,102
104
+ Virginia Beach,-75.977982,36.852924,103
105
+ Wichita,-97.330055,37.687176,104
106
+ Winston Salem,-80.244217,36.099861,105
107
+ Winston–Salem,-80.244217,36.099861,106
package/example/valid-data-map.csv CHANGED
@@ -1,5 +1,6 @@
1
- STATE,Rate,Location,URL
2
- Alabama,30,Vehicle,https://www.cdc.gov/
1
+ STATE,Rate,Location,URL
2
+ Overall,55,Vehicle,https://www.cdc.gov
3
+ Alabama,130,Vehicle,https://www.cdc.gov/
3
4
  Alaska,40,Work,https://www.cdc.gov/
4
5
  American Samoa,55,Home,https://www.cdc.gov/
5
6
  Arizona,57,School,https://www.cdc.gov/
@@ -56,4 +57,4 @@ Virgin Islands,55,School,https://www.cdc.gov/
56
57
  Virginia,57,School,https://www.cdc.gov/
57
58
  Washington,62,Work,https://www.cdc.gov/
58
59
  West Virginia,25,Vehicle,https://www.cdc.gov/
59
- Wyoming,43,Vehicle,https://www.cdc.gov/
60
+ Wyoming,43,Vehicle,https://www.cdc.gov/
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cdc/editor",
3
- "version": "1.4.3",
3
+ "version": "4.22.10-alpha.1",
4
4
  "main": "dist/cdceditor",
5
5
  "bugs": {
6
6
  "url": "https://github.com/CDCgov/cdc-open-viz/issues"
@@ -18,13 +18,13 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "@babel/runtime": "^7.12.5",
21
- "@cdc/chart": "^1.3.2",
22
- "@cdc/core": "^1.1.2",
23
- "@cdc/dashboard": "^1.1.2",
24
- "@cdc/data-bite": "^1.1.2",
25
- "@cdc/waffle-chart": "^1.0.0",
26
- "@cdc/markup-include": "^1.0.0",
27
- "@cdc/map": "^2.6.2",
21
+ "@cdc/chart": "^9.22.9",
22
+ "@cdc/core": "^4.22.10",
23
+ "@cdc/dashboard": "^4.22.10-alpha.1",
24
+ "@cdc/data-bite": "^4.22.10",
25
+ "@cdc/map": "^4.22.10-alpha.1",
26
+ "@cdc/markup-include": "^4.22.10",
27
+ "@cdc/waffle-chart": "^4.22.10",
28
28
  "axios": "^0.21.1",
29
29
  "d3": "^7.0.0",
30
30
  "html-react-parser": "1.4.9",
@@ -40,5 +40,5 @@
40
40
  "resolutions": {
41
41
  "@types/react": "17.x"
42
42
  },
43
- "gitHead": "170845062bcbb93f31270104688f69c4148935d8"
43
+ "gitHead": "bc6f9efd741e5b22140edc58c7a7f9e5efc43d1e"
44
44
  }
package/src/CdcEditor.js CHANGED
@@ -6,7 +6,11 @@ import ResizeObserver from 'resize-observer-polyfill'
6
6
 
7
7
  import getViewport from '@cdc/core/helpers/getViewport';
8
8
 
9
+ import { GlobalContextProvider } from '@cdc/core/components/GlobalContext'
9
10
  import GlobalState from './context';
11
+
12
+ import OverlayFrame from '@cdc/core/components/ui/OverlayFrame'
13
+
10
14
  import DataImport from './components/DataImport';
11
15
  import ChooseTab from './components/ChooseTab';
12
16
  import ConfigureTab from './components/ConfigureTab';
@@ -29,6 +33,54 @@ export default function CdcEditor({ config: configObj = {newViz: true}, hostname
29
33
  startingTab = 2
30
34
  }
31
35
 
36
+ // Legacy support - dashboards using a single dataset
37
+ if(config.type === 'dashboard'){
38
+ let legacyUpdateNeeded = false;
39
+ let newConfig;
40
+
41
+ if(config.data || config.dataUrl){
42
+ legacyUpdateNeeded = true;
43
+ newConfig = {...config};
44
+
45
+ newConfig.datasets = {};
46
+ newConfig.datasets[config.dataFileName || 'dataset-1'] = {
47
+ data: config.data,
48
+ dataUrl: config.dataUrl,
49
+ dataFileName: config.dataFileName || 'dataset-1',
50
+ dataFileSourceType: config.dataFileSourceType
51
+ };
52
+
53
+ Object.keys(newConfig.visualizations).forEach(vizKey => {
54
+ newConfig.visualizations[vizKey].dataKey = config.dataFileName || 'dataset-1';
55
+ newConfig.visualizations[vizKey].dataDescription = newConfig.dataDescription;
56
+ newConfig.visualizations[vizKey].formattedData = newConfig.formattedData;
57
+ });
58
+
59
+ delete newConfig.data;
60
+ delete newConfig.dataUrl;
61
+ delete newConfig.dataFileName;
62
+ delete newConfig.dataFileSourceType;
63
+ delete newConfig.dataDescription;
64
+ delete newConfig.formattedData;
65
+ }
66
+
67
+ if(config.dashboard && config.dashboard.filters){
68
+ legacyUpdateNeeded = true;
69
+ newConfig = {...config};
70
+
71
+ newConfig.dashboard.sharedFilters = newConfig.dashboard.sharedFilters || [];
72
+ newConfig.dashboard.filters.forEach(filter => {
73
+ newConfig.dashboard.sharedFilters.push({...filter, key: filter.label, showDropdown: true, usedBy: Object.keys(newConfig.visualizations)});
74
+ });
75
+
76
+ delete newConfig.dashboard.filters;
77
+ }
78
+
79
+ if(legacyUpdateNeeded){
80
+ setConfig(newConfig);
81
+ }
82
+ }
83
+
32
84
  const [globalActive, setGlobalActive] = useState(startingTab);
33
85
 
34
86
  const resizeObserver = new ResizeObserver(([ container ]) => {
@@ -50,7 +102,7 @@ export default function CdcEditor({ config: configObj = {newViz: true}, hostname
50
102
  if(null !== tempConfig) {
51
103
  const parsedData = JSON.stringify(tempConfig)
52
104
  // Emit the data in a regular JS event so it can be consumed by anything.
53
- const event = new CustomEvent('updateVizConfig', { detail: parsedData})
105
+ const event = new CustomEvent('updateVizConfig', { detail: parsedData, bubbles: true })
54
106
  window.dispatchEvent(event)
55
107
  }
56
108
  }, [tempConfig])
@@ -97,21 +149,37 @@ export default function CdcEditor({ config: configObj = {newViz: true}, hostname
97
149
  sharepath
98
150
  }
99
151
 
152
+ let configureDisabled = true;
153
+
154
+ if(config.type !== 'dashboard'){
155
+ if(config.formattedData){
156
+ configureDisabled = false;
157
+ }
158
+ } else {
159
+ if(config.datasets && Object.keys(config.datasets).length > 0){
160
+ configureDisabled = false;
161
+ }
162
+ }
163
+
100
164
  return (
101
- <GlobalState.Provider value={state}>
102
- <div className={`cdc-open-viz-module cdc-editor ${currentViewport}`} ref={outerContainerRef} >
103
- <Tabs className="top-level" startingTab={globalActive}>
104
- <TabPane title="1. Import Data" className="data-designer">
105
- <DataImport />
106
- </TabPane>
107
- <TabPane title="2. Choose Visualization Type" className="choose-type" disableRule={!config.data && !config.formattedData}>
108
- <ChooseTab />
109
- </TabPane>
110
- <TabPane title="3. Configure" className="configure" disableRule={null === config.data || !config.type}>
111
- <ConfigureTab containerEl={containerEl }/>
112
- </TabPane>
113
- </Tabs>
114
- </div>
115
- </GlobalState.Provider>
165
+ <GlobalContextProvider>
166
+ <GlobalState.Provider value={state}>
167
+ <div className={`cdc-open-viz-module cdc-editor ${currentViewport}`} ref={outerContainerRef}>
168
+ <Tabs className="top-level" startingTab={globalActive}>
169
+ <TabPane title="1. Choose Visualization Type" className="choose-type">
170
+ <ChooseTab />
171
+ </TabPane>
172
+ <TabPane title="2. Import Data" className="data-designer" disableRule={!config.type}>
173
+ <DataImport />
174
+ </TabPane>
175
+
176
+ <TabPane title="3. Configure" className="configure" disableRule={configureDisabled}>
177
+ <ConfigureTab containerEl={containerEl }/>
178
+ </TabPane>
179
+ </Tabs>
180
+ </div>
181
+ </GlobalState.Provider>
182
+ <OverlayFrame/>
183
+ </GlobalContextProvider>
116
184
  );
117
185
  }