From 3386fd0e31ca1295608956b92257c8d5bc415f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Sat, 6 Feb 2021 18:25:48 +0300 Subject: [PATCH 1/3] Upgrade dependencies kaplan==0.8.3 electron==11.2.3 --- app/package.json | 2 +- app/yarn.lock | 61 ++++++++++++++++++++-------------------- backend/requirements.txt | 2 +- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/app/package.json b/app/package.json index e2048f1..b5c633d 100644 --- a/app/package.json +++ b/app/package.json @@ -63,6 +63,6 @@ "@electron-forge/maker-rpm": "6.0.0-beta.54", "@electron-forge/maker-squirrel": "6.0.0-beta.54", "@electron-forge/maker-zip": "6.0.0-beta.54", - "electron": "^11.2.1" + "electron": "^11.2.3" } } diff --git a/app/yarn.lock b/app/yarn.lock index 1b5cf43..c5d1ea7 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -251,13 +251,12 @@ fs-extra "^9.0.1" "@electron/get@^1.0.1", "@electron/get@^1.6.0", "@electron/get@^1.9.0": - version "1.12.3" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.3.tgz#fa2723385c4b565a34c4c82f46087aa2a5fbf6d0" - integrity sha512-NFwSnVZQK7dhOYF1NQCt+HGqgL1aNdj0LUSx75uCqnZJqyiWCVdAMFV4b4/kC8HjUJAnsvdSEmjEt4G2qNQ9+Q== + version "1.12.4" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" + integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== dependencies: debug "^4.1.1" env-paths "^2.2.0" - filenamify "^4.1.0" fs-extra "^8.1.0" got "^9.6.0" progress "^2.0.3" @@ -267,7 +266,7 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@malept/cross-spawn-promise@^1.0.0", "@malept/cross-spawn-promise@^1.1.0": +"@malept/cross-spawn-promise@^1.0.0", "@malept/cross-spawn-promise@^1.1.0", "@malept/cross-spawn-promise@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== @@ -341,14 +340,14 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.14.22" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18" - integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== + version "14.14.25" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.25.tgz#15967a7b577ff81383f9b888aa6705d43fbbae93" + integrity sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ== "@types/node@^12.0.12": - version "12.19.15" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.15.tgz#0de7e978fb43db62da369db18ea088a63673c182" - integrity sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw== + version "12.19.16" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.16.tgz#15753af35cbef636182d8d8ca55b37c8583cecb3" + integrity sha512-7xHmXm/QJ7cbK2laF+YYD7gb5MggHIIQwqyjin3bpEGiSuvScMQ5JZZXPvRipi1MwckTQbJZROMns/JxdnIL1Q== "@types/responselike@*", "@types/responselike@^1.0.0": version "1.0.0" @@ -513,9 +512,9 @@ bignumber.js@9.0.0: integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== + version "4.0.4" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.4.tgz#f4fda39f81a811d0df6368c1ed91dae499d1c900" + integrity sha512-7tdr4EpSd7jJ6tuQ21vu2ke8w7pNEstzj1O8wwq6sNNzO3UDi5MA8Gny/gquCj7r2C6fHudg8tKRGyjRgmvNxQ== dependencies: buffer "^5.5.0" inherits "^2.0.4" @@ -971,9 +970,9 @@ electron-installer-debian@^3.0.0: yargs "^15.0.1" electron-installer-redhat@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/electron-installer-redhat/-/electron-installer-redhat-3.2.0.tgz#2c0f5da6f4a244453e4675ab1eca0877a66788c5" - integrity sha512-XMA+fQj3ULNVMl4eG+hIvrYITEqP1pfpERvx6kRwuPd06vdtB4KucL9241DAHT0NR5E9gnyJHM9Y6N24kk0mcA== + version "3.3.0" + resolved "https://registry.yarnpkg.com/electron-installer-redhat/-/electron-installer-redhat-3.3.0.tgz#acdb59d13d738c55debc5214114d36096eda1aed" + integrity sha512-hXIXB3uQXmXZy/v3MpbwWN4Of28ALpPt9ZyUDNEoSe0w7QZceL9IqI2K6Q6imiBJCLRC0hmT94WhlKj1RyGOWg== dependencies: "@malept/cross-spawn-promise" "^1.0.0" debug "^4.1.1" @@ -981,7 +980,7 @@ electron-installer-redhat@^3.2.0: fs-extra "^9.0.0" lodash "^4.17.15" word-wrap "^1.2.3" - yargs "^15.1.0" + yargs "^16.0.2" electron-notarize@^1.0.0: version "1.0.0" @@ -1027,11 +1026,11 @@ electron-packager@^15.0.0: yargs-parser "^20.0.0" electron-rebuild@^2.0.3: - version "2.3.4" - resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-2.3.4.tgz#59d49b37d5cc690aa60500aa5e5ecd168cbb5ba2" - integrity sha512-EHr1bkqXTN/jQJuh2/IunF9QGa9yOgpE9KdQ9A7VHshd7ycWvoXjWzaXaimfa1nu1l7vKqLLu7N2COe3Jn9NuA== + version "2.3.5" + resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-2.3.5.tgz#10dc38d1ffe1515ba2eef8b8be8e973ad1e1d597" + integrity sha512-1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ== dependencies: - "@malept/cross-spawn-promise" "^1.1.0" + "@malept/cross-spawn-promise" "^1.1.1" colors "^1.3.3" debug "^4.1.1" detect-libc "^1.0.3" @@ -1062,10 +1061,10 @@ electron-winstaller@^4.0.1: lodash.template "^4.2.2" temp "^0.9.0" -electron@^11.2.1: - version "11.2.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.1.tgz#8641dd1a62911a1144e0c73c34fd9f37ccc65c2b" - integrity sha512-Im1y29Bnil+Nzs+FCTq01J1OtLbs+2ZGLLllaqX/9n5GgpdtDmZhS/++JHBsYZ+4+0n7asO+JKQgJD+CqPClzg== +electron@^11.2.3: + version "11.2.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" + integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -1518,9 +1517,9 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + version "4.2.5" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.5.tgz#bc18864a6c9fc7b303f2e2abdb9155ad178fbe29" + integrity sha512-kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw== har-schema@^2.0.0: version "2.0.0" @@ -3427,7 +3426,7 @@ yargs-parser@^20.0.0, yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== -yargs@^15.0.1, yargs@^15.1.0: +yargs@^15.0.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== @@ -3444,7 +3443,7 @@ yargs@^15.0.1, yargs@^15.1.0: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.0.0: +yargs@^16.0.0, yargs@^16.0.2: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== diff --git a/backend/requirements.txt b/backend/requirements.txt index 36596d2..a5d0308 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,3 +1,3 @@ Django==2.2.14 -kaplan==0.8.2 +kaplan==0.8.3 mysql-connector-python==8.0.22 From 181e9fe1735a64d1f0cba866f49f61fef83851bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Sat, 6 Feb 2021 18:56:55 +0300 Subject: [PATCH 2/3] Fix a bug where project creation failed without a MySQL connection --- app/src/new-project-preload.js | 4 ++-- app/src/new-project.html | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/new-project-preload.js b/app/src/new-project-preload.js index 7a29c44..fb943e8 100644 --- a/app/src/new-project-preload.js +++ b/app/src/new-project-preload.js @@ -72,8 +72,8 @@ function fireOnReady() { alert(error); } else { selectCTMs.innerHTML = null; + selectCTMs.appendChild(new Option('-----')); if (result.length > 0) { - selectCTMs.appendChild(new Option('----')); result.map(function(row) { selectCTMs.appendChild(new Option(row.name, row.id)); }) @@ -162,7 +162,7 @@ function fireOnReady() { [...selectTBs.selectedOptions].forEach(function(tb) { languageResources.push(tb.value); }); - if (selectCTMs.value !== '----') { + if (selectCTMs.value !== '-----') { cloudLanguageResources = JSON.parse(fs.readFileSync(path.join(app.getPath('userData'), 'settings.json'))).mysql; cloudLanguageResources.table = selectCTMs.value; } diff --git a/app/src/new-project.html b/app/src/new-project.html index 8546ee1..0ce5337 100644 --- a/app/src/new-project.html +++ b/app/src/new-project.html @@ -415,6 +415,7 @@ From fe70b9d1dffec939877fa00ae930d1c894fd1bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Sat, 6 Feb 2021 18:57:06 +0300 Subject: [PATCH 3/3] version 0.3.3 --- app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index b5c633d..5e06af7 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "kaplan-desktop", "productName": "Kaplan Desktop", - "version": "0.3.2", + "version": "0.3.3", "description": "An open-source CAT tool.", "homepage": "https://kaplan.pro", "main": "src/main.js",