Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use semver to match installed and latest versions

Browse source
This commit is contained in:
navaneeth 2021-08-10 12:11:51 +05:30
parent 6442f23752
commit ac77059ae8
6 changed files with 21555 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21564
frontend/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

15
frontend/package.json
View file

@ -3,18 +3,24 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@babel/core": "^7.4.3",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/preset-env": "^7.4.3",
"@babel/preset-react": "^7.0.0",
"@react-google-maps/api": "^2.1.1",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"@uiw/react-codemirror": "^3.0.6",
"array-move": "^3.0.1",
"babel-loader": "^8.0.5",
"bootstrap": "^4.6.0",
"dompurify": "^2.2.7",
"draft-js": "^0.11.7",
"draft-js-export-html": "^1.4.1",
"fuse.js": "^6.4.6",
"history": "^4.9.0",
"html-webpack-plugin": "^3.2.0",
"immutability-helper": "^3.1.1",
"lodash": "^4.17.21",
"moment": "^2.29.1",
@ -47,15 +53,10 @@
"react-toastify": "^7.0.3",
"react-tooltip": "^4.2.18",
"rxjs": "^6.3.3",
"semver": "^5.7.1",
"tinycolor2": "^1.4.2",
"webpack-cli": "^3.3.0",
"yup": "^0.27.0",
"@babel/core": "^7.4.3",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/preset-env": "^7.4.3",
"@babel/preset-react": "^7.0.0",
"html-webpack-plugin": "^3.2.0",
"babel-loader": "^8.0.5"
"yup": "^0.27.0"
},
"devDependencies": {
"@cypress/react": "^5.9.0",

3
frontend/src/App/App.jsx
View file

@ -16,6 +16,7 @@ import { ManageOrgUsers } from '@/ManageOrgUsers';
import { OnboardingModal } from '@/Onboarding/OnboardingModal';
import {ForgotPassword} from '@/ForgotPassword'
import { ResetPassword } from '@/ResetPassword';
import { lt } from 'semver';
class App extends React.Component {
constructor(props) {
@ -52,7 +53,7 @@ class App extends React.Component {
tooljetService.fetchMetaData().then((data) => {
this.setState({ fetchedMetadata: true, onboarded: data.onboarded });
if(data.installed_version < data.latest_version && data.version_ignored === false) {
if(lt(data.installed_version, data.latest_version) && data.version_ignored === false) {
this.setState({ updateAvailable: true });
}
})

1
server/package-lock.json generated
View file

@ -42,6 +42,7 @@
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rxjs": "^7.2.0",
"semver": "^7.3.5",
"tedious": "^11.2.0",
"ts-node": "^10.0.0",
"tsconfig-paths": "^3.10.1",

3
server/package.json
View file

@ -61,10 +61,11 @@
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rxjs": "^7.2.0",
"semver": "^7.3.5",
"tedious": "^11.2.0",
"typeorm": "^0.2.34",
"ts-node": "^10.0.0",
"tsconfig-paths": "^3.10.1",
"typeorm": "^0.2.34",
"typescript": "^4.3.5"
},
"devDependencies": {

4
server/src/services/metadata.service.ts
View file

@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { Metadata } from 'src/entities/metadata.entity';
import { gt } from 'semver';
const got = require('got');
@Injectable()
export class MetadataService {
@ -58,7 +58,7 @@ export class MetadataService {
'last_checked': new Date()
}
if(latestVersion > installedVersion && installedVersion !== ignoredVersion) {
if(gt(latestVersion, installedVersion) && installedVersion !== ignoredVersion) {
newOptions['latest_version'] = latestVersion;
newOptions['version_ignored'] = false;
}