fix: import data for version above 1.0.0

fixes #49
byteyilabs · Jul 10, 2020 · a076586 · a076586
1 parent b1f7f91
commit a076586
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -36,13 +36,14 @@
     "js-logger": "^1.6.0",
     "js-video-url-parser": "^0.4.0",
     "markerjs": "^1.8.1",
+    "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-highlighter": "^0.4.3",
     "react-i18next": "^11.2.6",
     "react-recipes": "^1.0.0",
     "react-router-dom": "^5.1.2",
-    "prop-types": "^15.7.2",
+    "semver-compare": "^1.0.0",
     "styled-components": "^5.0.0-rc.2",
     "throttle-debounce": "^2.1.0",
     "uuidv4": "^6.0.0"

diff --git a/packages/extension/src/options/containers/Settings/ExportAndImport/index.js b/packages/extension/src/options/containers/Settings/ExportAndImport/index.js
@@ -2,6 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { useStoreActions } from 'easy-peasy';
 import { useTranslation } from 'react-i18next';
+import cmp from 'semver-compare';
 import { Grid, Typography, Button, Divider } from '@material-ui/core';
 import {
   storage as StorageService,
@@ -31,7 +32,7 @@ const ExportAndImport = () => {
   const handleImportFile = e => {
     FileService.readAsJson(e.target.files[0])
       .then(({ version, data }) => {
-        if (version !== '1.0.0') {
+        if (cmp(version, '1.0.0') === -1) {
           throw new Error(t('settings.import.version.error'));
         }
         return importData(data);