fix(modif): inverse added and deleted

infra-geo-ouverte · Aug 29, 2018 · 2fb09b1 · 2fb09b1
1 parent 0685845
commit 2fb09b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/projects/auth/src/lib/shared/auth.guard.ts b/projects/auth/src/lib/shared/auth.guard.ts
@@ -27,7 +27,7 @@ export class AuthGuard implements CanActivate {
     this.authService.redirectUrl = state.url;
 
     const authConfig = this.config.getConfig('auth');
-    if (authConfig.loginRoute) {
+    if (authConfig && authConfig.loginRoute) {
       this.router.navigateByUrl(authConfig.loginRoute);
     }
 

diff --git a/projects/utils/src/lib/modif.interface.ts b/projects/utils/src/lib/modif.interface.ts
@@ -6,8 +6,6 @@ export enum ModifType {
 
 export interface Modif {
   type: ModifType;
-  oldValue?: any;
-  newValue?: any;
   keysChanged?: {
     key: string;
     newValue: any;
@@ -24,4 +22,6 @@ export interface ModifRegroupement {
 export interface ModifItem {
   modif: Modif;
   value: any;
+  oldValue?: any;
+  newValue?: any;
 }
diff --git a/projects/utils/src/lib/modif.ts b/projects/utils/src/lib/modif.ts
@@ -24,8 +24,8 @@ export class ModifUtils {
       const index = obj2Clone.findIndex(s => s.id === fromItem.id);
 
       if (index === -1) {
-        items.added.push({
-          modif: { type: ModifType.ADDED },
+        items.deleted.push({
+          modif: { type: ModifType.DELETED },
           value: fromItem
         });
         continue;
@@ -46,19 +46,19 @@ export class ModifUtils {
         items.modified.push({
           modif: {
             type: ModifType.MODIFIED,
-            keysChanged: keysChanged,
-            oldValue: fromItemClone,
-            newValue: toItemClone
+            keysChanged: keysChanged
           },
-          value: fromItem
+          value: fromItem,
+          oldValue: fromItemClone,
+          newValue: toItemClone
         });
       }
     }
 
-    items.deleted = obj2Clone.map(itemDeleted => {
+    items.added = obj2Clone.map(itemAdded => {
       return {
-        modif: { type: ModifType.DELETED },
-        value: itemDeleted
+        modif: { type: ModifType.ADDED },
+        value: itemAdded
       };
     });