Merge pull request #22 from cmu-delphi/release/v2.0.2

Release v2.0.2

Author: krivard

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "www-epivis",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "private": true,
   "license": "MIT",
   "description": "",
@@ -30,45 +30,45 @@
     "prepack": "npm run build"
   },
   "devDependencies": {
-    "@fortawesome/free-solid-svg-icons": "^5.15.3",
-    "@rollup/plugin-commonjs": "^19.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.0",
-    "@rollup/plugin-replace": "^2.4.2",
-    "@rollup/plugin-typescript": "^8.2.1",
-    "@tsconfig/svelte": "^1.0.10",
+    "@fortawesome/free-solid-svg-icons": "^6.1.2",
+    "@rollup/plugin-commonjs": "^22.0.2",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-replace": "^4.0.0",
+    "@rollup/plugin-typescript": "^8.4.0",
+    "@tsconfig/svelte": "^3.0.0",
     "@types/d3-array": "^2.11.0",
     "@types/d3-dsv": "^2.0.1",
-    "@types/uikit": "^3.3.1",
-    "@typescript-eslint/eslint-plugin": "^4.24.0",
-    "@typescript-eslint/parser": "^4.24.0",
+    "@types/uikit": "^3.14.0",
+    "@typescript-eslint/eslint-plugin": "^5.35.1",
+    "@typescript-eslint/parser": "^5.35.1",
     "d3-array": "^2.12.1",
     "d3-dsv": "^2.0.0",
-    "date-fns": "^2.21.3",
-    "eslint": "^7.26.0",
-    "eslint-plugin-cypress": "^2.11.3",
-    "eslint-plugin-svelte3": "^3.2.0",
-    "husky": "^6.0.0",
-    "lint-staged": "^11.0.0",
-    "prettier": "^2.3.0",
-    "prettier-plugin-svelte": "^2.3.0",
-    "rollup": "^2.48.0",
+    "date-fns": "^2.29.2",
+    "eslint": "^8.22.0",
+    "eslint-plugin-cypress": "^2.12.1",
+    "eslint-plugin-svelte3": "^4.0.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1",
+    "prettier-plugin-svelte": "^2.7.0",
+    "rollup": "^2.78.1",
     "rollup-plugin-css-only": "^3.1.0",
-    "rollup-plugin-livereload": "^2.0.0",
-    "rollup-plugin-scss": "^2.6.1",
+    "rollup-plugin-livereload": "^2.0.5",
+    "rollup-plugin-scss": "^3.0.0",
     "rollup-plugin-svelte": "^7.1.0",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.32.13",
-    "shepherd.js": "^8.3.1",
-    "sirv-cli": "^1.0.11",
-    "svelte": "^3.38.2",
-    "svelte-check": "^1.5.4",
-    "svelte-fa": "^2.2.0",
-    "svelte-preprocess": "^4.7.3",
-    "tslib": "^2.2.0",
-    "typescript": "^4.2.4"
+    "sass": "^1.54.5",
+    "shepherd.js": "^10.0.1",
+    "sirv-cli": "^2.0.2",
+    "svelte": "^3.49.0",
+    "svelte-check": "^2.8.1",
+    "svelte-fa": "^3.0.3",
+    "svelte-preprocess": "^4.10.7",
+    "tslib": "^2.4.0",
+    "typescript": "^4.7.4"
   },
   "dependencies": {
-    "uikit": "^3.6.22"
+    "uikit": "^3.15.5"
   },
   "lint-staged": {
     "*.{ts,js,svelte}": "eslint --cache --fix",

package.json

@@ -0,0 +1,6 @@
+a,date,v
+1,2022-01-01,1
+1,2022-01-02,2
+1,2022-01-03,3
+1,2022-01-04,4
+1,2022-01-05,3

samples/simple.csv

@@ -793,6 +793,7 @@
 </script>
 
 <div {style} class="wrapper {className || ''}" bind:clientWidth={width} bind:clientHeight={height} data-tour="chart">
+  <!-- svelte-ignore a11y-mouse-events-have-key-events -->
   <canvas
     bind:this={canvas}
     {style}

src/components/Chart.svelte

@@ -32,7 +32,7 @@
         transpose,
         hasHeader,
         dateType: dateType == 'none' ? null : dateType,
-        dateFormat: dateType == 'simple' ? 'YYYY-MM-DD' : 'undefined',
+        dateFormat: dateType == 'simple' ? 'yyyy-MM-dd' : 'undefined',
         dateCol1: Number.parseInt(dateColumn, 10),
         dateCol2: Number.parseInt(dateColumn1, 10),
         hasGroup,

src/components/dialogs/ImportCSVDialog.svelte

@@ -37,26 +37,27 @@ function asDataGroup(group: IDataGroup): DataGroup {
 }
 
 export default function importCSV(file: File, fileContent: string, options: CSVOptions): DataGroup {
-  let lines = '';
+  const lines: string[] = [];
   for (const row of fileContent.split('\n')) {
     const trimmed = row.trim();
     if (trimmed[0] === '#') {
       continue;
     }
-    lines += trimmed;
+    lines.push(trimmed);
   }
-  let rows = csvParseRows(lines);
+  let rows = csvParseRows(lines.join('\n'));
   let numColumns = rows.reduce((acc, v) => Math.max(acc, v.length), 0);
   if (options.transpose) {
     numColumns = rows.length;
     rows = transpose(rows, numColumns);
   }
 
-  let labels = Array(numColumns).map((_, i) => `Column ${i}`);
+  let labels = Array(numColumns)
+    .fill(0)
+    .map((_, i) => `Column ${i}`);
 
   let groups: { label: string; level: number; rows: string[][] }[] = [{ label: file.name, level: 0, rows: [] }];
   let activeGroup = groups[0];
-  groups.push(activeGroup);
 
   let foundHeader = false;
   for (const row of rows) {
@@ -207,7 +208,7 @@ function parseDate(values: string[], lineIndex: number, options: CSVOptions): Ep
     }
     return new EpiDate(2000, 1, 1).addDays(lineIndex);
   } catch (error) {
-    console.error('invalid date in row', values, options);
+    console.error('invalid date in row', values, options, error);
     return null;
   }
 }

src/data/importCSV.ts

@@ -0,0 +1 @@
+/// <reference types="svelte" />

src/global.d.ts

@@ -1,3 +1,5 @@
+@use 'sass:math';
+
 // Font
 $global-font-family: 'Open Sans', Roboto, Arial, sans-serif;
 
@@ -27,4 +29,4 @@ $breadcrumb-divider-margin-horizontal: 3px;
 $tab-item-active-border: $menu-active-color;
 $tab-item-border-width: $menu-active-border-width;
 
-$grid-gap: (32/1440) * 100%;
+$grid-gap: math.div(32, 1440) * 100%;

src/wrapper/_customize.scss

@@ -1,4 +1,6 @@
-$grid-gap: (32/1440) * 100%;
+@use 'sass:math';
+
+$grid-gap: math.div(32, 1440) * 100%;
 
 .content-grid {
   display: grid;