Merge branch '4000-object-utils' of github.com:openforis/fra-platform…

… into 4000-object-utils

package.json

@@ -77,6 +77,7 @@
     "@types/lodash.isequal": "^4.5.5",
     "@types/lodash.isfunction": "^3.0.6",
     "@types/lodash.isnil": "^4.0.6",
+    "@types/lodash.merge": "^4.6.9",
     "@types/lodash.pick": "^4.4.7",
     "@types/lodash.range": "^3.2.6",
     "@types/lodash.reverse": "^4.0.6",
@@ -213,6 +214,7 @@
     "lodash.isequal": "^4.5.0",
     "lodash.isfunction": "^3.0.9",
     "lodash.isnil": "^4.0.0",
+    "lodash.merge": "^4.6.2",
     "lodash.pick": "^4.4.0",
     "lodash.range": "^3.2.0",
     "lodash.reverse": "^4.0.1",

src/utils/objects/index.ts

@@ -7,6 +7,8 @@ import * as isFunction from 'lodash.isfunction'
 // @ts-ignore
 import * as isNil from 'lodash.isnil'
 // @ts-ignore
+import * as merge from 'lodash.merge'
+// @ts-ignore
 import * as pick from 'lodash.pick'
 // @ts-ignore
 import * as unset from 'lodash.unset'
@@ -15,7 +17,6 @@ import { camelize } from './camelize'
 import { getDiff } from './getDiff'
 import { getInPath } from './getInPath'
 import { isEmpty } from './isEmpty'
-import { mergePartial } from './mergePartial'
 import { propertyOf } from './propertyOf'
 import { setInPath } from './setInPath'
 
@@ -28,7 +29,7 @@ export const Objects = {
   isEqual,
   isFunction,
   isNil,
-  mergePartial,
+  merge,
   pick,
   propertyOf,
   setInPath,

yarn.lock

@@ -2514,6 +2514,13 @@
   dependencies:
     "@types/lodash" "*"
 
+"@types/lodash.merge@^4.6.9":
+  version "4.6.9"
+  resolved "https://registry.yarnpkg.com/@types/lodash.merge/-/lodash.merge-4.6.9.tgz#93e94796997ed9a3ebe9ccf071ccaec4c6bc8fb8"
+  integrity sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==
+  dependencies:
+    "@types/lodash" "*"
+
 "@types/lodash.pick@^4.4.7":
   version "4.4.9"
   resolved "https://registry.yarnpkg.com/@types/lodash.pick/-/lodash.pick-4.4.9.tgz#06f7d88faa81a6c5665584778aea7b1374a1dc5b"