Add resolve action to responses

Author: dnahrebecki

src/B2bCode/Bundle/CmsFormBundle/Entity/CmsFormResponse.php

@@ -102,6 +102,13 @@ class CmsFormResponse extends ExtendCmsFormResponse implements DatesAwareInterfa
      */
     protected $visitor;
 
+    /**
+     * @var bool
+     *
+     * @ORM\Column(name="is_resolved", type="boolean", nullable=true)
+     */
+    protected $resolved = false;
+
     public function __construct()
     {
         $this->fieldResponses = new ArrayCollection();
@@ -176,6 +183,26 @@ public function setVisitor(?CustomerVisitor $visitor)
         return $this;
     }
 
+    /**
+     * @param bool $resolved
+     *
+     * @return $this
+     */
+    public function setResolved(?bool $resolved)
+    {
+        $this->resolved = (bool) $resolved;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isResolved()
+    {
+        return (bool) $this->resolved;
+    }
+
     /**
      * @return array
      */

src/B2bCode/Bundle/CmsFormBundle/Entity/Repository/CmsFieldResponseRepository.php

@@ -27,6 +27,10 @@ public function findGroupedByFormResponses(array $formResponsesIds = [])
 
         $groupedByResponses = [];
         foreach ($records as $record) {
+            // @todo create option 'hide_from_response'
+            if ($record->getField()->getType() === 'oro-recaptcha-v3') {
+                continue;
+            }
             $responseId = $record->getFormResponse()->getId();
             if (array_key_exists($responseId, $groupedByResponses)) {
                 $groupedByResponses[$responseId][] = $record;

src/B2bCode/Bundle/CmsFormBundle/Migrations/Schema/B2bCodeCmsFormBundleInstaller.php

@@ -27,7 +27,7 @@ class B2bCodeCmsFormBundleInstaller implements Installation
      */
     public function getMigrationVersion()
     {
-        return 'v1_0';
+        return 'v1_1';
     }
 
     /**
@@ -62,6 +62,7 @@ protected function createB2BCodeCmsFormResponseTable(Schema $schema)
         $table->addColumn('visitor_id', 'integer', ['notnull' => false]);
         $table->addColumn('created_at', 'datetime', ['comment' => '(DC2Type:datetime)']);
         $table->addColumn('updated_at', 'datetime', ['comment' => '(DC2Type:datetime)']);
+        $table->addColumn('is_resolved', 'boolean', ['notnull' => false]);
         $table->addColumn('serialized_data', 'array', ['notnull' => false, 'comment' => '(DC2Type:array)']);
         $table->setPrimaryKey(['id']);
         $table->addIndex(['visitor_id'], 'idx_eab5a5270bee6d', []);

src/B2bCode/Bundle/CmsFormBundle/Migrations/Schema/v1_0/CreateTables.php

@@ -16,7 +16,7 @@
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
 /**
- * @todo make it up to date with Installer
+ * Version 1_0 doesn't need to be present. Left just for BC.
  */
 class CreateTables implements Migration
 {
@@ -25,12 +25,7 @@ class CreateTables implements Migration
      */
     public function up(Schema $schema, QueryBag $queries)
     {
-        /** Tables generation **/
-        $this->createB2BCodeCmsFormTable($schema);
-        $this->createB2BCodeCmsFormFieldTable($schema);
-
-        /** Foreign keys generation **/
-        $this->addB2BCodeCmsFormFieldForeignKeys($schema);
+        return;
     }
 
     /**

src/B2bCode/Bundle/CmsFormBundle/Migrations/Schema/v1_1/AddResolvedField.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace B2bCode\Bundle\CmsFormBundle\Migrations\Schema\v1_1;
+
+use Doctrine\DBAL\Schema\Schema;
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class AddResolvedField implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        if (!$schema->hasTable('b2b_code_cms_form_response')) {
+            return;
+        }
+
+        $table = $schema->getTable('b2b_code_cms_form_response');
+
+        $table->addColumn('is_resolved', 'boolean', ['notnull' => false]);
+
+        $queries->addPostQuery('UPDATE b2b_code_cms_form_response SET is_resolved = false');
+    }
+}

src/B2bCode/Bundle/CmsFormBundle/Resources/config/oro/actions.yml

@@ -0,0 +1,34 @@
+operations:
+    b2b_code_cms_form.action.resolve:
+        label: b2bcode.cmsform.actions.resolve.label
+        enabled: true
+        applications: [default]
+        button_options:
+            icon: fa-check
+        datagrids:
+            - b2bcode-cms-form-responses-grid
+        preconditions:
+            '@equal': [$.data.resolved, 0]
+        actions:
+            -   '@assign_value': [$.data.resolved, 1]
+            -   '@flush_entity': [$.data]
+            -   '@flash_message':
+                    message: b2bcode.cmsform.actions.resolve.success
+                    type: 'success'
+
+    b2b_code_cms_form.action.unresolve:
+        label: b2bcode.cmsform.actions.unresolve.label
+        enabled: true
+        applications: [default]
+        button_options:
+            icon: fa-undo
+        datagrids:
+            - b2bcode-cms-form-responses-grid
+        preconditions:
+            '@equal': [$.data.resolved, 1]
+        actions:
+            -   '@assign_value': [$.data.resolved, 0]
+            -   '@flush_entity': [$.data]
+            -   '@flash_message':
+                    message: b2bcode.cmsform.actions.unresolve.success
+                    type: 'success'

src/B2bCode/Bundle/CmsFormBundle/Resources/config/oro/datagrids.yml

@@ -187,6 +187,7 @@ datagrids:
             query:
                 select:
                     - response.id
+                    - response.resolved
 #                    - response.visitor
                     - response.createdAt
                 from:
@@ -209,10 +210,15 @@ datagrids:
             createdAt:
                 label:         oro.ui.created_at
                 frontend_type: datetime
+            resolved:
+                label: b2bcode.cmsformresponse.resolved.label
+                frontend_type: boolean
         sorters:
             columns:
                 id:
                     data_name: response.id
+                resolved:
+                    data_name: response.resolved
 #                visitor:
 #                    data_name: response.visitor
                 createdAt:
@@ -221,6 +227,9 @@ datagrids:
                 createdAt: DESC
         filters:
             columns:
+                resolved:
+                    type: boolean
+                    data_name: response.resolved
 #                name:
 #                    type:      string
 #                    data_name: cmsForm.name

src/B2bCode/Bundle/CmsFormBundle/Resources/translations/messages.en.yml

@@ -135,6 +135,14 @@ b2bcode:
             form_update: 'Cms Form #%name% - Edit'
             field_update: 'Field #%name% - Edit'
 
+        actions:
+            resolve:
+                label: Resolve
+                success: Response sucessfully resolved
+            unresolve:
+                label: Unresolve
+                success: Response sucessfully unresolved
+
         field_type:
             text.label: Single Line Text
             textarea.label: Paragraph Text
@@ -183,6 +191,7 @@ b2bcode:
         entity_plural_label: Form Responses
 
         id.label: ID
+        resolved.label: Resolved
         visitor.label: Visitor ID
 
         cmsfieldresponse: