Merge pull request #99 from defineEditor/dev

New release 0.6.4

Author: DmitryMK

.eslintrc.json

@@ -21,7 +21,17 @@
         "no-restricted-syntax": ["off", "ForOfStatement"],
         "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
         "@typescript-eslint/no-explicit-any": "warn",
-        "react/require-default-props": ["error", { "functions": "defaultArguments"}]
+        "react/require-default-props": ["error", { "functions": "defaultArguments"}],
+        "prefer-destructuring": ["error", {
+            "VariableDeclarator": {
+                "array": false,
+                "object": true
+            },
+            "AssignmentExpression": {
+                "array": false,
+                "object": false
+            }
+        }]
     },
     "parserOptions": {
         "ecmaVersion": 2022,

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 0.6.4
+### Core Changes
+* Dataset compare functionality [#96](https://github.com/defineEditor/vde-dataset-viewer/issues/96)
+
+### Improvements
+* Better handling of invalid JSON files [#95](https://github.com/defineEditor/vde-dataset-viewer/issues/95)
+
+### Fixes
+* Conversion/Validation freezes [#97](https://github.com/defineEditor/vde-dataset-viewer/issues/97)
+
+## Technical Changes
+* Update to React 19 [70](https://github.com/defineEditor/vde-dataset-viewer/issues/70)
+* Update to MUI 7/Toolpad 16 [71](https://github.com/defineEditor/vde-dataset-viewer/issues/71)
+
 # 0.6.3
 ### Improvements
 * Improved handling of invalid Define-XML files and adding Open File button to the Define-XML screen [#92](https://github.com/defineEditor/vde-dataset-viewer/issues/92)

package-lock.json

@@ -25,10 +25,10 @@
         "lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
         "lint:fix": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx --fix",
         "bp-linux": "npm run build && electron-builder build --linux --publish never && ts-node ./.erb/scripts/moveFiles.ts",
-        "package-linux": "electron-builder build --linux --publish never && ts-node ./.erb/scripts/moveFiles.ts",
-        "package-win": "electron-builder build --win --x64 --publish never && ts-node ./.erb/scripts/moveFiles.ts",
-        "package-mac": "electron-builder build --mac --publish never && ts-node ./.erb/scripts/moveFiles.ts",
-        "package-all": "ts-node ./.erb/scripts/clean.js dist && npm run build && npm run package-linux && npm run package-win && npm run build:dll",
+        "package-linux": "npm run build && electron-builder build --linux --publish never && ts-node ./.erb/scripts/moveFiles.ts",
+        "package-win": "npm run build && electron-builder build --win --x64 --publish never && ts-node ./.erb/scripts/moveFiles.ts",
+        "package-mac": "npm run build && electron-builder build --mac --publish never && ts-node ./.erb/scripts/moveFiles.ts",
+        "package-all": "npm run build && ts-node ./.erb/scripts/clean.js dist && npm run build && npm run package-linux && npm run package-win && npm run build:dll",
         "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
         "prestart": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.dev.ts",
         "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run prestart && npm run start:renderer",
@@ -89,91 +89,93 @@
         }
     },
     "dependencies": {
-        "@emotion/react": "^11.10.4",
-        "@emotion/styled": "^11.10.4",
+        "@emotion/react": "^11.14.0",
+        "@emotion/styled": "^11.14.1",
         "@fontsource/roboto": "^5.1.1",
         "@fontsource/roboto-mono": "^5.1.1",
-        "@mui/icons-material": "^6.0.0",
-        "@mui/material": "^6.2.1",
-        "@reduxjs/toolkit": "^1.8.5",
-        "@tanstack/react-table": "^8.20.5",
-        "@tanstack/react-virtual": "^3.10.9",
-        "@toolpad/core": "^0.11.0",
-        "dompurify": "^3.2.3",
+        "@mui/icons-material": "^7.3.7",
+        "@mui/lab": "^7.0.1-beta.21",
+        "@mui/material": "^7.3.7",
+        "@reduxjs/toolkit": "^2.11.2",
+        "@tanstack/react-table": "^8.21.3",
+        "@tanstack/react-virtual": "^3.13.18",
+        "@toolpad/core": "^0.16.0",
+        "diff": "^8.0.3",
+        "dompurify": "^3.2.7",
         "electron-debug": "^3.2.0",
         "electron-log": "^4.4.8",
-        "electron-updater": "^6.1.4",
+        "electron-updater": "^6.1.9",
         "js-array-filter": "^0.1.6",
-        "js-stream-dataset-json": "^0.7.1",
+        "js-stream-dataset-json": "^0.8.0",
         "parse-define-xml": "^0.1.7",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "react-redux": "^8.0.2",
-        "redux": "^4.2.0",
-        "xport-js": "^0.3.1"
+        "react": "^19.2.3",
+        "react-dom": "^19.2.3",
+        "react-redux": "^9.2.0",
+        "redux": "^5.0.1",
+        "xport-js": "^0.4.0"
     },
     "devDependencies": {
-        "@electron/rebuild": "^3.3.0",
-        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+        "@electron/rebuild": "^3.3.1",
+        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.17",
         "@svgr/webpack": "^8.1.0",
         "@teamsupercell/typings-for-css-modules-loader": "^2.5.2",
-        "@testing-library/jest-dom": "^6.6.3",
-        "@testing-library/react": "^14.0.0",
-        "@types/jest": "^29.5.5",
+        "@testing-library/jest-dom": "^6.6.4",
+        "@testing-library/react": "^16.3.2",
+        "@types/jest": "^29.5.14",
         "@types/node": "24.5.2",
-        "@types/react": "^18.2.21",
-        "@types/react-dom": "^18.2.7",
-        "@types/react-test-renderer": "^18.0.1",
-        "@types/webpack-bundle-analyzer": "^4.6.0",
-        "@typescript-eslint/eslint-plugin": "^6.7.0",
-        "@typescript-eslint/parser": "^6.7.0",
+        "@types/react": "^19.2.8",
+        "@types/react-dom": "^19.2.3",
+        "@types/react-test-renderer": "^19.1.0",
+        "@types/webpack-bundle-analyzer": "^4.6.4",
+        "@typescript-eslint/eslint-plugin": "^6.7.5",
+        "@typescript-eslint/parser": "^6.7.5",
         "browserslist-config-erb": "^0.0.3",
         "chalk": "^4.1.2",
-        "concurrently": "^8.2.1",
+        "concurrently": "^8.2.2",
         "core-js": "^3.32.2",
         "cross-env": "^7.0.3",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
         "detect-port": "^1.5.1",
-        "electron": "^34.0.0",
-        "electron-builder": "^26.0.12",
+        "electron": "^34.0.2",
+        "electron-builder": "^26.0.20",
         "electron-devtools-installer": "^4.0.0",
-        "electronmon": "^2.0.2",
+        "electronmon": "^2.0.4",
         "eslint": "^8.49.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-config-erb": "^4.1.0-0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-import-resolver-typescript": "^3.6.0",
-        "eslint-import-resolver-webpack": "^0.13.7",
+        "eslint-config-erb": "^4.1.0",
+        "eslint-config-prettier": "^9.1.2",
+        "eslint-import-resolver-typescript": "^3.6.3",
+        "eslint-import-resolver-webpack": "^0.13.10",
         "eslint-plugin-compat": "^4.2.0",
         "eslint-plugin-import": "^2.28.1",
-        "eslint-plugin-jest": "^27.4.0",
+        "eslint-plugin-jest": "^27.4.3",
         "eslint-plugin-jsx-a11y": "^6.7.1",
         "eslint-plugin-promise": "^6.1.1",
         "eslint-plugin-react": "^7.33.2",
-        "eslint-plugin-react-hooks": "^4.6.0",
+        "eslint-plugin-react-hooks": "^4.6.2",
         "file-loader": "^6.2.0",
-        "html-webpack-plugin": "^5.5.3",
+        "html-webpack-plugin": "^5.5.4",
         "identity-obj-proxy": "^3.0.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "mini-css-extract-plugin": "^2.7.6",
+        "mini-css-extract-plugin": "^2.7.7",
         "prettier": "^3.0.3",
-        "react-refresh": "^0.14.0",
-        "react-test-renderer": "^18.2.0",
-        "rimraf": "^5.0.1",
+        "react-refresh": "^0.14.2",
+        "react-test-renderer": "^19.2.3",
+        "rimraf": "^5.0.10",
         "style-loader": "^4.0.0",
-        "terser-webpack-plugin": "^5.3.9",
-        "ts-jest": "^29.1.1",
+        "terser-webpack-plugin": "^5.3.16",
+        "ts-jest": "^29.1.5",
         "ts-loader": "^9.4.4",
-        "ts-node": "^10.9.1",
+        "ts-node": "^10.9.2",
         "tsconfig-paths-webpack-plugin": "^4.1.0",
         "typescript": "^5.2.2",
         "url-loader": "^4.1.1",
         "webpack": "^5.88.2",
         "webpack-bundle-analyzer": "^4.9.1",
         "webpack-cli": "^5.1.4",
-        "webpack-dev-server": "^4.15.1",
+        "webpack-dev-server": "^4.15.2",
         "webpack-merge": "^5.9.0"
     },
     "build": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vde-dataset-viewer",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "VDE Dataset Viewer",
   "license": "MIT",
   "author": {
@@ -14,6 +14,6 @@
     "link-modules": "node -r ts-node/register ../../.erb/scripts/link-modules.ts"
   },
   "dependencies": {
-    "js-stream-sas7bdat": "^0.1.6"
+    "js-stream-sas7bdat": "^0.2.0"
   }
 }

release/app/package-lock.json

@@ -25,6 +25,7 @@ export interface ApiOpenedFile {
     path: string;
     type: DataType;
     lastModified?: number;
+    compareId?: string;
 }
 
 export interface ApiOpenedFileWithMetadata extends ApiOpenedFile {
@@ -41,6 +42,7 @@ export interface IOpenFile {
     lastModified: number;
     datasetNames?: string[];
     errorMessage?: string;
+    compareId?: string;
 }
 
 export interface IOpenFileWithMetadata extends IOpenFile {

release/app/package.json

@@ -27,6 +27,7 @@ export interface ElectronApi {
             encoding: BufferEncoding | 'default';
             filePath?: string;
             folderPath?: string;
+            fileIdPrefix?: string;
         },
     ) => Promise<{
         fileId: string;
@@ -71,7 +72,8 @@ export interface ElectronApi {
     downloadUpdate: () => Promise<boolean>;
     writeToClipboard: (text: string) => Promise<boolean>;
     startTask: (task: MainTask) => Promise<boolean | { error: string }>;
-    onTaskProgress: (callback: (info: TaskProgress) => void) => void;
+    stopTask: (id: string) => Promise<boolean>;
+    onTaskProgress: (callback: (info: TaskProgress) => void) => () => void;
     cleanTaskProgressListeners: () => void;
     openFileDialog: (options: {
         multiple?: boolean;