Notification & Integrations refactoring (#346)
* Integrations Refactoring - WIP * integrations list & edit - WIP * Fix integration store binding issue * integrations refactor - WIP * Form integration - WIP * Form integration Edit - WIP * Integration Refactor - Slack - WIP * Integration Refactor - Discord - WIP * Integration Refactor - Webhook - WIP * Integration Refactor - Send Submission Confirmation - WIP * Integration Refactor - Backend handler - WIP * Form Integration Status field * Integration Refactor - Backend SubmissionConfirmation - WIP * IntegrationMigration Command * skip confirmation email test case * Small refactoring * FormIntegration status active/inactive * formIntegrationData to integrationData * Rename file name with Integration suffix for integration realted files * Loader on form integrations * WIP * form integration test case * WIP * Added Integration card - working on refactoring * change location for IntegrationCard and update package file * Form Integration Create/Edit in single Modal * Remove integration extra pages * crisp_help_page_slug for integration json * integration logic as collapse * UI improvements * WIP * Trying to debug vue devtools * WIP for integrations * getIntegrationHandler change namespace name * useForm for integration fields + validation structure * Integration Test case & apply validation rules * Apply useform changes to integration other files * validation rules for FormNotificationsMessageActions fields * Zapier integration as coming soon * Update FormCleaner * set default settings for confirmation integration * WIP * Finish validation for all integrations * Updated purify, added integration formatData * Fix testcase * Ran pint; working on integration errors * Handle integration events * command for Delete Old Integration Events * Display Past Events in Modal * on Integration event create with status error send email to form creator * Polish styling * Minor improvements * Finish badge and integration status * Fix tests and add an integration event test * Lint --------- Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
formsdev
GitHub
@@ -0,0 +1,68 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Forms\Integration;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Integration\FormIntegrationsRequest;
|
||||
use App\Models\Forms\Form;
|
||||
use App\Models\Integration\FormIntegration;
|
||||
|
||||
class FormIntegrationsController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function index(string $id)
|
||||
{
|
||||
$form = Form::findOrFail((int)$id);
|
||||
$this->authorize('view', $form);
|
||||
|
||||
return FormIntegration::where('form_id', $form->id)->get();
|
||||
}
|
||||
|
||||
public function create(FormIntegrationsRequest $request, string $id)
|
||||
{
|
||||
$form = Form::findOrFail((int)$id);
|
||||
$this->authorize('update', $form);
|
||||
|
||||
$formIntegration = FormIntegration::create(
|
||||
array_merge([
|
||||
'form_id' => $form->id,
|
||||
], $request->toIntegrationData())
|
||||
);
|
||||
|
||||
return $this->success([
|
||||
'message' => 'Form Integration was created.',
|
||||
'form_integration' => $formIntegration
|
||||
]);
|
||||
}
|
||||
|
||||
public function update(FormIntegrationsRequest $request, string $id, string $integrationid)
|
||||
{
|
||||
$form = Form::findOrFail((int)$id);
|
||||
$this->authorize('update', $form);
|
||||
|
||||
$formIntegration = FormIntegration::findOrFail((int)$integrationid);
|
||||
$formIntegration->update($request->toIntegrationData());
|
||||
|
||||
return $this->success([
|
||||
'message' => 'Form Integration was updated.',
|
||||
'form_integration' => $formIntegration
|
||||
]);
|
||||
}
|
||||
|
||||
public function destroy(string $id, string $integrationid)
|
||||
{
|
||||
$form = Form::findOrFail((int)$id);
|
||||
$this->authorize('update', $form);
|
||||
|
||||
$formIntegration = FormIntegration::findOrFail((int)$integrationid);
|
||||
$formIntegration->delete();
|
||||
|
||||
return $this->success([
|
||||
'message' => 'Form Integration was deleted.'
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Forms\Integration;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Resources\FormIntegrationsEventResource;
|
||||
use App\Models\Forms\Form;
|
||||
use App\Models\Integration\FormIntegrationsEvent;
|
||||
|
||||
class FormIntegrationsEventController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function index(string $id, string $integrationid)
|
||||
{
|
||||
$form = Form::findOrFail((int)$id);
|
||||
$this->authorize('view', $form);
|
||||
|
||||
return FormIntegrationsEventResource::collection(
|
||||
FormIntegrationsEvent::where('integration_id', (int)$integrationid)->orderByDesc('created_at')->get()
|
||||
);
|
||||
}
|
||||
}
|
||||
84
app/Http/Requests/Integration/FormIntegrationsRequest.php
Normal file
84
app/Http/Requests/Integration/FormIntegrationsRequest.php
Normal file
@@ -0,0 +1,84 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Integration;
|
||||
|
||||
use App\Models\Integration\FormIntegration;
|
||||
use App\Rules\IntegrationLogicRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class FormIntegrationsRequest extends FormRequest
|
||||
{
|
||||
public array $integrationRules = [];
|
||||
|
||||
private ?string $integrationClassName = null;
|
||||
|
||||
public function __construct(Request $request)
|
||||
{
|
||||
if ($request->integration_id) {
|
||||
// Load integration class, and get rules
|
||||
$integration = FormIntegration::getIntegration($request->integration_id);
|
||||
if ($integration && isset($integration['file_name']) && class_exists(
|
||||
'App\Service\Forms\Integrations\\' . $integration['file_name']
|
||||
)) {
|
||||
$this->integrationClassName = 'App\Service\Forms\Integrations\\' . $integration['file_name'];
|
||||
$this->loadIntegrationRules();
|
||||
return;
|
||||
}
|
||||
throw new \Exception('Unknown Integration!');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return array_merge([
|
||||
'integration_id' => ['required', Rule::in(array_keys(FormIntegration::getAllIntegrations()))],
|
||||
'settings' => 'present|array',
|
||||
'status' => 'required|boolean',
|
||||
'logic' => [new IntegrationLogicRule()]
|
||||
], $this->integrationRules);
|
||||
}
|
||||
|
||||
/**
|
||||
* Give the validated fields a better "human-readable" name
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function attributes()
|
||||
{
|
||||
$fields = [];
|
||||
foreach ($this->rules() as $key => $value) {
|
||||
$fields[$key] = Str::of($key)
|
||||
->replace('settings.', '')
|
||||
->headline();
|
||||
}
|
||||
|
||||
return $fields;
|
||||
}
|
||||
|
||||
private function loadIntegrationRules()
|
||||
{
|
||||
foreach ($this->integrationClassName::getValidationRules() as $key => $value) {
|
||||
$this->integrationRules['settings.' . $key] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
public function toIntegrationData(): array
|
||||
{
|
||||
return $this->integrationClassName::formatData([
|
||||
'status' => ($this->validated(
|
||||
'status'
|
||||
)) ? FormIntegration::STATUS_ACTIVE : FormIntegration::STATUS_INACTIVE,
|
||||
'integration_id' => $this->validated('integration_id'),
|
||||
'data' => $this->validated('settings') ?? [],
|
||||
'logic' => $this->validated('logic') ?? []
|
||||
]);
|
||||
}
|
||||
}
|
||||
23
app/Http/Resources/FormIntegrationsEventResource.php
Normal file
23
app/Http/Resources/FormIntegrationsEventResource.php
Normal file
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
class FormIntegrationsEventResource extends JsonResource
|
||||
{
|
||||
/**
|
||||
* Transform the resource into an array.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
|
||||
*/
|
||||
public function toArray($request)
|
||||
{
|
||||
return [
|
||||
'date' => date('Y-m-d H:i', strtotime($this->created_at)),
|
||||
'status' => ucfirst($this->status),
|
||||
'data' => $this->data
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user