move actions list to DB

matfish2 · Jul 3, 2022 · 0dd8558 · 0dd8558
1 parent d524d74
commit 0dd8558
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Activity Log
 
+## 1.0.0 - 2022-07-03
+###  Changed
+- Move actions list to database in preparation for Actions CRUD UI
+
 ## 1.0.0-beta.2 - 2022-06-22
 ### Fixed
 - Fix issue with uninstall

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -11,6 +11,7 @@ class Plugin extends BasePlugin
 {
     public bool $hasCpSection = true;
     public bool $hasCpSettings = true;
+    public string $schemaVersion = '1.0.1';
 
     public function init()
     {

diff --git a/src/assets/compiled/activity-log.js b/src/assets/compiled/activity-log.js
diff --git a/src/assets/compiled/activity-log.min.js b/src/assets/compiled/activity-log.min.js
diff --git a/src/assets/js/main.js b/src/assets/js/main.js
@@ -27,6 +27,11 @@ new Vue({
 
 
         this.options.listColumns.siteId = this.sites
+        this.options.listColumns.actionSegments = data.actions.map(action=>({
+            id:action.action,
+            text:action.label
+        }))
+
         window.svgPath = data.svgPath
         this.svgPath = data.svgPath
 
@@ -66,6 +71,7 @@ new Vue({
             loaded: false,
             loadingTable: true,
             sites: [],
+            actions:[],
             userId: null,
             columns: ['url', 'userId', 'siteId', 'isCp', 'isAjax', 'ip', 'method', 'actionSegments', 'responseCode', 'execTime', 'createdAt'],
             options: {
@@ -113,48 +119,7 @@ new Vue({
                 },
                 listColumns: {
                     siteId: [],
-                    actionSegments: [
-                        {
-                            id: 'allActions',
-                            text: 'All Actions'
-                        },
-                        {
-                            id: '["users","login"]',
-                            text: 'Login'
-                        },
-                        {
-                            id: '["users","logout"]',
-                            text: 'Logout'
-                        },
-                        {
-                            id: '["users","impersonate"]',
-                            text: 'Impersonate User'
-                        },
-                        {
-                            id: '["elements","apply-draft"]',
-                            text: 'Apply Draft'
-                        },
-                        {
-                            id: '["elements","save"]',
-                            text: 'Save Element'
-                        },
-                        {
-                            id: '["users","save-user"]',
-                            text: 'Save User'
-                        },
-                        {
-                            id: '["assets","generate-transform"]',
-                            text: 'Generate Transform'
-                        },
-                        {
-                            id: '["plugins","save-plugin-settings"]',
-                            text: 'Save Plugin Settings'
-                        },
-                        {
-                            id: '["sections","save-section"]',
-                            text: 'Save Section'
-                        }
-                    ],
+                    actionSegments: [],
                     method: [
                         {
                             id: 'GET',

diff --git a/src/controllers/ActivityLogController.php b/src/controllers/ActivityLogController.php
@@ -5,6 +5,7 @@
 use craft\elements\User;
 use craft\records\Site;
 use matfish\ActivityLog\ActivityLogAssetBundle;
+use matfish\ActivityLog\records\ActivityLogAction;
 use matfish\ActivityLog\services\VueTablesActivityLogRetriever;
 use yii\web\Response;
 
@@ -14,8 +15,8 @@ public function actionInitialData(): Response
     {
         $res  = [
             'sites'=>Site::find()->select(['id','name'])->all(),
-            'svgPath'=>$this->getSvgPath()
-
+            'svgPath'=>$this->getSvgPath(),
+            'actions'=>ActivityLogAction::find()->all()
         ];
 
         return $this->asJson($res);

diff --git a/src/migrations/Install.php b/src/migrations/Install.php
@@ -1,8 +1,10 @@
 <?php
+
 namespace matfish\ActivityLog\migrations;
 
 
 use craft\db\Migration;
+use matfish\ActivityLog\services\CreateActionsTable;
 
 class Install extends Migration
 {
@@ -11,33 +13,41 @@ public function safeUp()
         if (!$this->db->tableExists('{{%activitylog}}')) {
             $this->createTable('{{%activitylog}}', [
                 'id' => $this->primaryKey()->notNull(),
-                'url'=>$this->string()->notNull(),
-                'query'=>$this->longText()->null(),
-                'payload'=>$this->longText()->null(),
-                'userId'=>$this->integer()->null(),
-                'execTime'=>$this->float()->null(),
-                'ip'=>$this->string(20),
-                'userAgent'=>$this->string(),
-                'isAjax'=>$this->boolean(),
-                'method'=>$this->string(10),
-                'siteId'=>$this->integer(),
-                'isCp'=>$this->boolean(),
-                'isAction'=>$this->boolean(),
-                'actionSegments'=>$this->string()->null(),
-                'responseCode'=>$this->smallInteger(),
-                'createdAt'=>$this->timestamp()
+                'url' => $this->string()->notNull(),
+                'query' => $this->longText()->null(),
+                'payload' => $this->longText()->null(),
+                'userId' => $this->integer()->null(),
+                'execTime' => $this->float()->null(),
+                'ip' => $this->string(20),
+                'userAgent' => $this->string(),
+                'isAjax' => $this->boolean(),
+                'method' => $this->string(10),
+                'siteId' => $this->integer(),
+                'isCp' => $this->boolean(),
+                'isAction' => $this->boolean(),
+                'actionSegments' => $this->string()->null(),
+                'responseCode' => $this->smallInteger(),
+                'createdAt' => $this->timestamp()
             ]);
 
-            $this->createIndex('activityLogCreatedAt_idx','{{%activitylog}}','createdAt');
-            $this->createIndex('activityLogUserId_idx','{{%activitylog}}','userId');
+            $this->createIndex('activityLogCreatedAt_idx', '{{%activitylog}}', 'createdAt');
+            $this->createIndex('activityLogUserId_idx', '{{%activitylog}}', 'userId');
 
         }
+        if (!$this->db->tableExists('{{%activitylog_actions}}')) {
+            (new CreateActionsTable())->execute($this);
+        }
+
     }
 
     public function safeDown()
     {
         if ($this->db->tableExists('{{%activitylog}}')) {
             $this->dropTable('{{%activitylog}}');
         }
+
+        if ($this->db->tableExists('{{%activitylog_actions}}')) {
+            $this->dropTable('{{%activitylog_actions}}');
+        }
     }
 }
diff --git a/src/migrations/m220703_102139_add_actions_table.php b/src/migrations/m220703_102139_add_actions_table.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace matfish\ActivityLog\migrations;
+
+use Craft;
+use craft\db\Migration;
+use matfish\ActivityLog\records\ActivityLogAction;
+use matfish\ActivityLog\services\CreateActionsTable;
+
+/**
+ * m220703_102139_add_actions_table migration.
+ */
+class m220703_102139_add_actions_table extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+       if (!$this->db->tableExists('{{%activitylog_actions}}')) {
+            (new CreateActionsTable())->execute($this);
+        }
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        if ($this->db->tableExists('{{%activitylog_actions}}')) {
+            $this->dropTable('{{%activitylog_actions}}');
+        }
+
+        return true;
+    }
+}
diff --git a/...ions/m220702_144330_add_actions_table.php → src/services/CreateActionsTable.php b/...ions/m220702_144330_add_actions_table.php → src/services/CreateActionsTable.php
@@ -1,23 +1,21 @@
 <?php
 
 
-namespace matfish\ActivityLog\migrations;
+namespace matfish\ActivityLog\services;
 
 
 use craft\db\Migration;
 use matfish\ActivityLog\records\ActivityLogAction;
 
-class m220702_144330_add_actions_table extends Migration
+class CreateActionsTable
 {
-    public function safeUp()
-    {
-        if (!$this->db->tableExists('{{%activitylog_actions}}')) {
-            $this->createTable('{{%activitylog_actions}}', [
-                'id' => $this->primaryKey()->notNull(),
-                'action' => $this->string()->notNull(),
-                'label' => $this->string()->notNull(),
-                'native' => $this->boolean()->notNull(),
-                'createdAt' => $this->timestamp()
+    public function execute(Migration $migration) {
+              $migration->createTable('{{%activitylog_actions}}', [
+                'id' => $migration->primaryKey()->notNull(),
+                'action' => $migration->string()->notNull(),
+                'label' => $migration->string()->notNull(),
+                'native' => $migration->boolean()->notNull(),
+                'createdAt' => $migration->timestamp()
             ]);
 
             $actions = [
@@ -66,13 +64,5 @@ public function safeUp()
                 $r->native = true;
                 $r->save();
             }
-        }
-    }
-
-    public function safeDown()
-    {
-        if ($this->db->tableExists('{{%activitylog_actions}}')) {
-            $this->dropTable('{{%activitylog_actions}}');
-        }
     }
 }