FOUR-9333

pmPaulis · pmPaulis · commit 9adea66e14ec · 2023-07-20T17:01:48.000-04:00
diff --git a/ProcessMaker/Events/CategoryCreated.php b/ProcessMaker/Events/CategoryCreated.php
@@ -39,7 +39,6 @@ public function getData(): array
                 'label' => $this->variable['name'],
                 'link' => route('processes.create', $this->category),
             ],
-            'name' => $this->variable['name'],
             'created_at' => $this->category->getAttribute('created_at'),
         ];
     }
diff --git a/ProcessMaker/Events/CategoryDeleted.php b/ProcessMaker/Events/CategoryDeleted.php
@@ -31,7 +31,7 @@ public function __construct(ProcessCategory $data)
     public function getData(): array
     {
         return [
-            'category_name' => $this->processCategory->getAttribute('name'),
+            'name' => $this->processCategory->getAttribute('name'),
             'deleted_at' => Carbon::now(),
         ];
     }
diff --git a/ProcessMaker/Events/ScreenUpdated.php b/ProcessMaker/Events/ScreenUpdated.php
@@ -62,9 +62,10 @@ public function getData(): array
         if (array_key_exists('config', $this->changes)) {
             return $basic;
         } else {
-            return array_merge([
-                'last_modified' => $this->screen->getAttribute('updated_at'),
-            ], ArrayHelper::getArrayDifferencesWithFormat($this->changes, $this->original));
+            return array_merge(
+                $basic,
+                ArrayHelper::getArrayDifferencesWithFormat($this->changes, $this->original)
+            );
         }
     }
 
diff --git a/ProcessMaker/Events/TemplateCreated.php b/ProcessMaker/Events/TemplateCreated.php
@@ -2,6 +2,7 @@
 
 namespace ProcessMaker\Events;
 
+use Carbon\Carbon;
 use Illuminate\Foundation\Events\Dispatchable;
 use ProcessMaker\Contracts\SecurityLogEventInterface;
 
@@ -32,6 +33,7 @@ public function getData(): array
             'type' => $this->payload['type'] ?? '',
             'version' => $this->payload['version'] ?? '',
             'name' => $this->payload['name'] ?? '',
+            'created_at' => $this->payload['created_at'] ?? Carbon::now(),
         ];
     }
 
diff --git a/tests/Feature/Api/SecurityLogsTest.php b/tests/Feature/Api/SecurityLogsTest.php

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public function getData(): array`
`39`	`39`	`'label' => $this->variable['name'],`
`40`	`40`	`'link' => route('processes.create', $this->category),`
`41`	`41`	`],`
`42`		`- 'name' => $this->variable['name'],`
`43`	`42`	`'created_at' => $this->category->getAttribute('created_at'),`
`44`	`43`	`];`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct(ProcessCategory $data)`
`31`	`31`	`public function getData(): array`
`32`	`32`	`{`
`33`	`33`	`return [`
`34`		`- 'category_name' => $this->processCategory->getAttribute('name'),`
	`34`	`+ 'name' => $this->processCategory->getAttribute('name'),`
`35`	`35`	`'deleted_at' => Carbon::now(),`
`36`	`36`	`];`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,10 @@ public function getData(): array`
`62`	`62`	`if (array_key_exists('config', $this->changes)) {`
`63`	`63`	`return $basic;`
`64`	`64`	`} else {`
`65`		`- return array_merge([`
`66`		`- 'last_modified' => $this->screen->getAttribute('updated_at'),`
`67`		`- ], ArrayHelper::getArrayDifferencesWithFormat($this->changes, $this->original));`
	`65`	`+ return array_merge(`
	`66`	`+ $basic,`
	`67`	`+ ArrayHelper::getArrayDifferencesWithFormat($this->changes, $this->original)`
	`68`	`+ );`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`