Commit daff63e6 authored by Matija Obreza's avatar Matija Obreza

Merge branch '697-dependency-updates' into 'master'

Resolve "Dependency updates"

Closes #697

See merge request genesys-pgr/genesys-ui!678
parents 19aa9d0c 66b90a1e
This diff is collapsed.
......@@ -42,88 +42,88 @@
"bundle:stats3": "webpack --config config/server.config.js --profile --json"
},
"dependencies": {
"@material-ui/core": "^4.8.3",
"@material-ui/icons": "^4.5.1",
"@material-ui/lab": "^4.0.0-alpha.39",
"@material-ui/styles": "^4.8.2",
"@material-ui/core": "^4.9.9",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.48",
"@material-ui/styles": "^4.9.6",
"autosuggest-highlight": "^3.1.1",
"axios": "^0.19.2",
"chart.js": "^2.9.3",
"ckeditor": "^4.12.1",
"classnames": "^2.2.6",
"coffeescript": "^2.5.0",
"coffeescript": "^2.5.1",
"compression": "^1.7.4",
"connected-react-router": "^6.6.1",
"cookie-parser": "^1.4.4",
"connected-react-router": "^6.8.0",
"cookie-parser": "^1.4.5",
"csvtojson": "^2.0.10",
"debounce": "^1.2.0",
"debug": "^4.1.1",
"es-cookie": "^1.3.2",
"express": "^4.17.1",
"express-http-proxy": "^1.6.0",
"fast-glob": "^3.1.1",
"fast-glob": "^3.2.2",
"flattenjs": "^2.0.0",
"form-data": "^3.0.0",
"history": "^4.10.1",
"i18next": "^19.0.3",
"i18next-browser-languagedetector": "^4.0.1",
"i18next": "^19.4.0",
"i18next-browser-languagedetector": "^4.0.2",
"i18next-express-middleware": "^1.9.1",
"i18next-sync-fs-backend": "^1.1.1",
"i18next-xhr-backend": "^3.2.2",
"immutability-helper": "^3.0.1",
"is-mobile": "^2.1.0",
"immutability-helper": "^3.0.2",
"is-mobile": "^2.2.1",
"js-md5": "^0.7.3",
"jsonwebtoken": "^8.5.1",
"leaflet": "^1.6.0",
"lodash": "^4.17.15",
"minimist": "^1.2.0",
"minimist": "^1.2.5",
"moment": "^2.24.0",
"normalize.css": "^8.0.1",
"prop-types": "^15.7.2",
"query-string": "^6.10.1",
"react": "^16.12.0",
"react-autosuggest": "^9.4.3",
"query-string": "^6.12.0",
"react": "^16.13.1",
"react-autosuggest": "^10.0.0",
"react-chartkick": "^0.4.0",
"react-ckeditor-component": "^1.1.0",
"react-color": "^2.18.0",
"react-d3-tree": "^1.16.1",
"react-dnd": "^10.0.2",
"react-dnd-html5-backend": "^10.0.2",
"react-dom": "^16.12.0",
"react-dom": "^16.13.1",
"react-fontawesome": "^1.7.1",
"react-google-login": "^5.0.7",
"react-google-login": "^5.1.3",
"react-google-recaptcha": "^2.0.1",
"react-i18next": "^11.3.1",
"react-leaflet": "^2.6.1",
"react-i18next": "^11.3.4",
"react-leaflet": "^2.6.3",
"react-leaflet-control": "^2.1.2",
"react-loadable": "^5.5.0",
"react-markdown": "^4.3.1",
"react-redux": "^7.1.3",
"react-redux": "^7.2.0",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"react-time-ago": "^5.0.7",
"react-virtualized": "^9.21.2",
"react-visibility-sensor": "^5.1.1",
"redux": "^4.0.5",
"redux-form": "^8.2.6",
"redux-form": "^8.3.3",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.3.0",
"roboto-fontface": "^0.10.0",
"serialize-javascript": "^2.1.2",
"serialize-javascript": "^3.0.0",
"string-natural-compare": "^3.0.1",
"url-template": "^2.0.8"
},
"devDependencies": {
"@types/node": "13.1.8",
"@types/react": "16.9.18",
"@types/webpack-env": "^1.15.0",
"@typescript-eslint/eslint-plugin": "^2.17.0",
"@typescript-eslint/eslint-plugin-tslint": "^2.17.0",
"@typescript-eslint/parser": "^2.17.0",
"@types/node": "13.11.1",
"@types/react": "16.9.33",
"@types/webpack-env": "^1.15.1",
"@typescript-eslint/eslint-plugin": "^2.27.0",
"@typescript-eslint/eslint-plugin-tslint": "^2.27.0",
"@typescript-eslint/parser": "^2.27.0",
"awesome-typescript-loader": "^5.2.1",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.0.6",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"babel-plugin-react-transform": "^3.0.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
......@@ -132,23 +132,23 @@
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"copy-webpack-plugin": "^5.1.1",
"cross-env": "^6.0.3",
"css-loader": "^3.4.2",
"cross-env": "^7.0.2",
"css-loader": "^3.5.1",
"del": "^5.1.0",
"es6-promise": "^4.2.8",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.9.0",
"eslint-loader": "^3.0.3",
"eslint-plugin-import": "^2.20.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-prettier": "^6.10.1",
"eslint-loader": "^4.0.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prefer-arrow": "^1.1.7",
"eslint-plugin-react": "^7.18.0",
"file-loader": "^5.0.2",
"eslint-plugin-prefer-arrow": "^1.2.0",
"eslint-plugin-react": "^7.19.0",
"file-loader": "^6.0.0",
"git-revision-webpack-plugin": "^3.0.4",
"html-webpack-exclude-assets-plugin": "0.0.7",
"html-webpack-plugin": "^3.2.0",
"i18next-scanner": "^2.10.3",
"html-webpack-plugin": "4.0.0-alpha",
"i18next-scanner": "^2.11.0",
"immutable": "^4.0.0-rc.12",
"import-inspector": "^2.0.0",
"isomorphic-fetch": "^2.2.1",
......@@ -163,25 +163,25 @@
"postcss-loader": "^3.0.0",
"postcss-mixins": "^6.2.3",
"precss": "^4.0.0",
"prettier": "^1.19.1",
"react-hot-loader": "^4.12.18",
"react-jss": "^10.0.3",
"prettier": "^2.0.4",
"react-hot-loader": "^4.12.20",
"react-jss": "^10.1.1",
"readline-sync": "^1.4.10",
"resolve-url-loader": "^3.1.1",
"sass-loader": "^8.0.2",
"script-ext-html-webpack-plugin": "^2.1.4",
"source-map-loader": "^0.2.4",
"style-loader": "^1.1.3",
"stylelint": "^13.0.0",
"terser-webpack-plugin": "^2.3.2",
"ts-node": "^8.6.2",
"tslint": "^6.0.0",
"typescript": "^3.7.5",
"url-loader": "^3.0.0",
"webpack": "^4.41.5",
"stylelint": "^13.3.1",
"terser-webpack-plugin": "^2.3.5",
"ts-node": "^8.8.2",
"tslint": "^6.1.1",
"typescript": "^3.8.3",
"url-loader": "^4.1.0",
"webpack": "^4.42.1",
"webpack-chunk-hash": "^0.6.0",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.10.1",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3",
"webpack-hot-middleware": "^2.25.0",
"webpack-manifest-plugin": "^2.2.0",
"webpack-merge": "^4.2.2"
......
......@@ -2,7 +2,6 @@ import update from 'immutability-helper';
import { IReducerAction } from 'model/common.model';
import Page from 'model/Page';
import FilteredPage from 'model/FilteredPage';
import FaoInstitute from 'model/genesys/FaoInstitute';
import {
RECEIVE_PARTNER,
......@@ -10,7 +9,6 @@ import {
RECEIVE_PARTNER_INSTITUTES,
UPDATE_PARTNER_INSTITUTES,
} from 'partners/constants';
import { dereferenceReferences2 } from 'utilities';
const INITIAL_STATE = {
currentPartner: null,
......@@ -37,10 +35,6 @@ export default (state = INITIAL_STATE, action: IReducerAction = {type: ''}) => {
});
}
if (apiCall.data && apiCall.data.content && apiCall.data.content.length > 0) {
dereferenceReferences2(apiCall.data.content, FaoInstitute.DEREFERENCES);
}
return update(state, {
partnerInstitutes: {
data: { $set: Page.merge(state.partnerInstitutes && state.partnerInstitutes.data, apiCall.data) },
......@@ -67,10 +61,6 @@ export default (state = INITIAL_STATE, action: IReducerAction = {type: ''}) => {
const {apiCall: {loading, error, timestamp, data}, uuid} = action.payload;
if (state.currentPartner && state.currentPartner.data && state.currentPartner.data.uuid === uuid) {
if (data) {
dereferenceReferences2(data.content, FaoInstitute.DEREFERENCES);
}
return update(state, {
partnerInstitutes: {
$set: {
......
......@@ -2,6 +2,7 @@
import * as UrlTemplate from 'url-template';
import * as QueryString from 'query-string';
import { axiosBackend } from 'utilities/requestUtils';
import { dereferenceReferences2 } from 'utilities';
import FilteredPage from 'model/FilteredPage';
import Page, { IPageRequest } from 'model/Page';
......@@ -242,7 +243,11 @@ class PartnerService {
url: apiUrl,
method: 'POST',
...content,
}).then(({ data }) => data as Page<FaoInstitute>);
}).then(({ data }) => data as Page<FaoInstitute>)
.then((data) => {
dereferenceReferences2(data.content, FaoInstitute.DEREFERENCES);
return data;
});
}
}
......
......@@ -184,6 +184,7 @@ class Login extends React.Component<ILoginProps, any> {
value={ username }
onChange={ this.handleUsername }
fullWidth
autoComplete="username"
/>
<TextField
className={ inMenu ? classes.input : '' }
......@@ -192,6 +193,7 @@ class Login extends React.Component<ILoginProps, any> {
value={ password }
onChange={ this.handlePassword }
fullWidth
autoComplete="current-password"
/>
{ this.state.error && (inMenu ? (
......
......@@ -36,6 +36,7 @@ class Registration extends React.Component<IRegistrationProps, any> {
component={ TextField }
validate={ [Validators.required, Validators.emailAddress] }
fullWidth
autoComplete="username"
/>
<Field
name="password"
......@@ -44,6 +45,7 @@ class Registration extends React.Component<IRegistrationProps, any> {
component={ TextField }
validate={ [Validators.required, Validators.passwordMinLength, Validators.passwordNumber, Validators.passwordSpecialChar] }
fullWidth
autoComplete="new-password"
/>
<Field
name="passwordConfirm"
......@@ -52,6 +54,7 @@ class Registration extends React.Component<IRegistrationProps, any> {
component={ TextField }
validate={ [Validators.required] }
fullWidth
autoComplete="new-password"
/>
<Field
name="fullName"
......
......@@ -22,6 +22,7 @@ class PasswordForm extends React.Component<any, void> {
label={ t('user.dashboard.c.passwordForm.oldPassword') }
component={ TextField }
validate={ [ Validators.required ] }
autoComplete="current-password"
/>
<Field
name="newPassword"
......@@ -29,6 +30,7 @@ class PasswordForm extends React.Component<any, void> {
label={ t('user.dashboard.c.passwordForm.newPassword') }
component={ TextField }
validate={ [ Validators.required ] }
autoComplete="new-password"
/>
<Field
name="confirmPassword"
......@@ -36,6 +38,7 @@ class PasswordForm extends React.Component<any, void> {
label={ t('user.dashboard.c.passwordForm.confirmPassword') }
component={ TextField }
validate={ [ Validators.required ] }
autoComplete="new-password"
/>
{ error && <div style={ { color: 'red' } }>{ error }</div> }
<Button variant="contained" type="submit" style={ { margin: '1rem 0 1rem 0' } } disabled={ submitting }>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment