Skip to content

Commit dc55f3e

Browse files
Fix if
1 parent 90002f4 commit dc55f3e

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"babel-eslint": "^10.1.0",
6565
"chroma-js": "^2.0.4",
6666
"concurrently": "^5.3.0",
67-
"cypress": "^6.4.0",
67+
"cypress": "^6.7.0",
6868
"cypress-file-upload": "^4.0.6",
6969
"cypress-image-snapshot": "^3.1.1",
7070
"cypress-terminal-report": "^2.4.0",

src/components/ImportFromCognitoS3Dialog/index.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import datasetManagerCognito from "udt-dataset-managers/dist/CognitoDatasetManag
77
import useAuth from "../../utils/auth-handlers/use-auth"
88
import setTypeOfFileToLoadAndDisable from "./set-type-of-file-to-load-and-disable"
99
import initConfigImport from "./init-config-import"
10-
import datasetHasChanged from "../../utils//dataset-helper/get-files-differences"
1110
import setUrl from "./set-url"
1211
import { setIn } from "seamless-immutable"
1312
import ExpandedRow from "./table-expanded-row"
@@ -43,14 +42,10 @@ export default ({ open, onClose, onAddSamples }) => {
4342
useEffect(() => {
4443
if (!open) return
4544
var configToSet = configImport
46-
4745
var hasChanged = false
48-
if (oldData === lastObjectRef.current) {
49-
const changes = datasetHasChanged(lastObjectRef.current, oldData)
50-
if (changes.interface.type || changes.samples) {
51-
configToSet = setTypeOfFileToLoadAndDisable(configToSet, oldData)
52-
hasChanged = true
53-
}
46+
if (JSON.stringify(oldData) !== JSON.stringify(lastObjectRef.current)) {
47+
configToSet = setTypeOfFileToLoadAndDisable(configToSet, oldData)
48+
hasChanged = true
5449
}
5550
if (
5651
importConfigIsReady(projectToFetch, configImport) !== configImport.isReady

yarn.lock

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8190,15 +8190,10 @@ cypress-terminal-report@^2.4.0:
81908190
methods "^1.1.2"
81918191
tv4 "^1.3.0"
81928192

8193-
cypress-xpath@^1.6.1:
8194-
version "1.6.2"
8195-
resolved "https://registry.yarnpkg.com/cypress-xpath/-/cypress-xpath-1.6.2.tgz#e9d44c3ab694fefa8608f1d977e3e389647f10d3"
8196-
integrity sha512-mtwJPl840GQPGtb480fKR5vDIcijBHhAVwby5/AIPIT/UVT7UJhM2L42/R+venR7N01I0PoOJErb6UiMbCyUxg==
8197-
8198-
cypress@^6.4.0:
8199-
version "6.5.0"
8200-
resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.5.0.tgz#d853d7a8f915f894249a8788294bfba077278c17"
8201-
integrity sha512-ol/yTAqHrQQpYBjxLlRSvZf4DOb9AhaQNVlwdOZgJcBHZOOa52/p/6/p3PPcvzjWGOMG6Yq0z4G+jrbWyk/9Dg==
8193+
cypress@^6.7.0:
8194+
version "6.7.0"
8195+
resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.7.0.tgz#06e5bec43bd1e6f277532f29f8fe9bcccbb372e7"
8196+
integrity sha512-d1tEF7W4O2Hs68/OxFt5BpnQJVfix8Kjm1kgTIQHxdbtowjiU9ltVRfSPrMfvK/1SGttCUj+3I+o1EuxSo5Asg==
82028197
dependencies:
82038198
"@cypress/listr-verbose-renderer" "^0.4.1"
82048199
"@cypress/request" "^2.88.5"
@@ -8233,7 +8228,7 @@ cypress@^6.4.0:
82338228
moment "^2.29.1"
82348229
ospath "^1.2.2"
82358230
pretty-bytes "^5.4.1"
8236-
ramda "~0.26.1"
8231+
ramda "~0.27.1"
82378232
request-progress "^3.0.0"
82388233
supports-color "^7.2.0"
82398234
tmp "~0.2.1"
@@ -17459,7 +17454,7 @@ raf@^3.4.1:
1745917454
dependencies:
1746017455
performance-now "^2.1.0"
1746117456

17462-
[email protected], ramda@~0.26.1:
17457+
1746317458
version "0.26.1"
1746417459
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
1746517460
integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
@@ -17469,7 +17464,7 @@ ramda@^0.21.0:
1746917464
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
1747017465
integrity sha1-oAGr7bP/YQd9T/HVd9RN536NCjU=
1747117466

17472-
ramda@^0.27.1:
17467+
ramda@^0.27.1, ramda@~0.27.1:
1747317468
version "0.27.1"
1747417469
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9"
1747517470
integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==

0 commit comments

Comments
 (0)