Update: Extracted merge functionality (coscine/issues#959)

package.json

@@ -11,6 +11,9 @@
     "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit"
   },
+  "dependencies": {
+    "@coscine/app-util": "^1.4.0"
+  },
   "devDependencies": {
     "@babel/preset-env": "^7.10.2",
     "@hutson/semantic-delivery-gitlab": "^9.1.0",

src/apps/form-generator.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/project-creation.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/project.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/projectcreate.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/projectedit.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/projectview.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/quotamanagement.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/resourcecontentview.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/resourcecreation.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/resources.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/rwthmaster.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/search.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/sidebarmenu.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/toastmessage.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/userlist.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/usermanagement.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/apps/userprofile.ts

 import Default from './default';
-import MergeUtil from '../util/MergeUtil';
+import { MergeUtil } from '@coscine/app-util';
 
 const appLanguageStrings = {
   en: {

src/util/MergeUtil.ts

-export default{
-  merge(obj1: any, obj2: any) {
-    if (obj1 === undefined) {
-        obj1 = {};
-    }
-    for (const prop in obj2) {
-      if (obj2.hasOwnProperty(prop)) {
-        if (Object.prototype.toString.call(obj2[prop]) === '[object Object]') {
-          obj1[prop] = this.merge(obj1[prop], obj2[prop]);
-        } else {
-          obj1[prop] = obj2[prop];
-        }
-      }
-    }
-    return obj1;
-  },
-};