Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old code related to notifications #363

Merged
merged 67 commits into from
Mar 28, 2024
Merged
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
8a4abe4
Integrations Refactoring - WIP
formsdev Feb 23, 2024
788ddfd
integrations list & edit - WIP
formsdev Feb 28, 2024
2ff62ea
Fix integration store binding issue
JhumanJ Feb 28, 2024
f7bfbbc
integrations refactor - WIP
formsdev Feb 28, 2024
453b56c
Form integration - WIP
formsdev Mar 1, 2024
d43cbe4
Form integration Edit - WIP
formsdev Mar 1, 2024
732fe0f
Merge remote-tracking branch 'origin/main' into integrations-refactoring
formsdev Mar 1, 2024
cbe6708
Integration Refactor - Slack - WIP
formsdev Mar 4, 2024
a53d94b
Integration Refactor - Discord - WIP
formsdev Mar 5, 2024
ad8c8ed
Integration Refactor - Webhook - WIP
formsdev Mar 5, 2024
99ba662
Integration Refactor - Send Submission Confirmation - WIP
formsdev Mar 6, 2024
e57f91c
Integration Refactor - Backend handler - WIP
formsdev Mar 12, 2024
3ef45c9
Form Integration Status field
formsdev Mar 12, 2024
855ea0c
Merge branch 'main' into integrations-refactoring
formsdev Mar 12, 2024
b2e3de7
Integration Refactor - Backend SubmissionConfirmation - WIP
formsdev Mar 12, 2024
31b30b3
IntegrationMigration Command
formsdev Mar 13, 2024
11148df
skip confirmation email test case
formsdev Mar 13, 2024
b7e4029
Small refactoring
JhumanJ Mar 13, 2024
81a197e
FormIntegration status active/inactive
formsdev Mar 14, 2024
d481f94
formIntegrationData to integrationData
formsdev Mar 14, 2024
441b173
Rename file name with Integration suffix for integration realted files
formsdev Mar 14, 2024
ddc8166
Loader on form integrations
formsdev Mar 14, 2024
5d12a1a
WIP
JhumanJ Mar 15, 2024
0e9a3f4
form integration test case
formsdev Mar 15, 2024
8c6fa2e
Merge branch 'main' into integrations-refactoring
formsdev Mar 15, 2024
1dbe3ee
Merge branch 'integrations-refactoring' of https://github.com/JhumanJ…
JhumanJ Mar 19, 2024
d5c5b7a
WIP
JhumanJ Mar 19, 2024
012b894
Added Integration card - working on refactoring
JhumanJ Mar 20, 2024
bc0f75b
change location for IntegrationCard and update package file
formsdev Mar 21, 2024
14caefd
Form Integration Create/Edit in single Modal
formsdev Mar 21, 2024
731f899
Remove integration extra pages
formsdev Mar 21, 2024
61cbd59
crisp_help_page_slug for integration json
formsdev Mar 21, 2024
056b1ad
integration logic as collapse
formsdev Mar 22, 2024
d6eb61f
UI improvements
JhumanJ Mar 22, 2024
c08bc88
Merge master
JhumanJ Mar 23, 2024
c6418e6
WIP
JhumanJ Mar 24, 2024
7cbec8f
Trying to debug vue devtools
JhumanJ Mar 24, 2024
475a83f
WIP for integrations
JhumanJ Mar 25, 2024
38f4a76
getIntegrationHandler change namespace name
formsdev Mar 25, 2024
3b6d009
useForm for integration fields + validation structure
JhumanJ Mar 25, 2024
763e92a
Integration Test case & apply validation rules
formsdev Mar 26, 2024
5ddc1aa
Apply useform changes to integration other files
formsdev Mar 26, 2024
aa66172
validation rules for FormNotificationsMessageActions fields
formsdev Mar 26, 2024
42c22f0
Merge branch 'main' into integrations-refactoring
formsdev Mar 26, 2024
308ceda
Zapier integration as coming soon
formsdev Mar 26, 2024
a805649
Update FormCleaner
formsdev Mar 26, 2024
c0a14ef
set default settings for confirmation integration
formsdev Mar 26, 2024
0bcface
WIP
JhumanJ Mar 26, 2024
9086987
Finish validation for all integrations
JhumanJ Mar 26, 2024
dec59f1
Updated purify, added integration formatData
JhumanJ Mar 26, 2024
78ba679
Fix testcase
formsdev Mar 26, 2024
3c58685
Ran pint; working on integration errors
JhumanJ Mar 26, 2024
7542748
Merge branch 'integrations-refactoring' of https://github.com/JhumanJ…
JhumanJ Mar 26, 2024
0d60794
Handle integration events
JhumanJ Mar 26, 2024
82a0b51
Remove old code related to notifications
formsdev Mar 27, 2024
60896e4
command for Delete Old Integration Events
formsdev Mar 28, 2024
4aebf4c
Display Past Events in Modal
formsdev Mar 28, 2024
7b31368
on Integration event create with status error send email to form creator
formsdev Mar 28, 2024
9abc26b
Polish styling
JhumanJ Mar 28, 2024
f75d28c
Minor improvements
JhumanJ Mar 28, 2024
fc34016
Finish badge and integration status
JhumanJ Mar 28, 2024
8892909
Merge branch 'main' into integrations-refactoring
JhumanJ Mar 28, 2024
6bad74a
Fix tests and add an integration event test
JhumanJ Mar 28, 2024
d42ed16
Merge branch 'integrations-refactoring' of https://github.com/JhumanJ…
JhumanJ Mar 28, 2024
68072af
Merge branch 'integrations-refactoring' into integrations-refactoring…
JhumanJ Mar 28, 2024
b61f02d
Merge changes from integrations
JhumanJ Mar 28, 2024
8ba8c40
Run linters
JhumanJ Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FormIntegration status active/inactive
  • Loading branch information
formsdev committed Mar 14, 2024
commit 81a197eef8e35bcbced7c4faea031aaf55b41798
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ public function create(FormIntegrationsRequest $request, string $id)

$formIntegration = FormIntegration::create([
'form_id' => $form->id,
'status' => ($request->get('status')) ? FormIntegration::STATUS_ACTIVE : FormIntegration::STATUS_PAUSED,
'status' => ($request->get('status')) ? FormIntegration::STATUS_ACTIVE : FormIntegration::STATUS_INACTIVE,
'integration_id' => $request->get('integration_id'),
'data' => $request->get('settings') ?? [],
'logic' => $request->get('logic') ?? []
@@ -48,7 +48,7 @@ public function update(FormIntegrationsRequest $request, string $id, string $int

$formIntegration = FormIntegration::findOrFail((int) $integrationid);
$formIntegration->update([
'status' => ($request->get('status')) ? FormIntegration::STATUS_ACTIVE : FormIntegration::STATUS_PAUSED,
'status' => ($request->get('status')) ? FormIntegration::STATUS_ACTIVE : FormIntegration::STATUS_INACTIVE,
'data' => $request->get('settings') ?? [],
'logic' => $request->get('logic') ?? []
]);
4 changes: 2 additions & 2 deletions app/Models/Integration/FormIntegration.php
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@

class FormIntegration extends Model
{
const STATUS_ACTIVE = 1;
const STATUS_PAUSED = 0;
const STATUS_ACTIVE = 'active';
const STATUS_INACTIVE = 'inactive';

use HasFactory;

2 changes: 1 addition & 1 deletion client/pages/forms/[slug]/show/integrations/[id].vue
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ const integrationProperty = computed(() => {
const integrationData = computed(() => {
return {
integration_id: integration.value.integration_id,
status: (integration.value.status == 1 || integration.value.status == '1') ? true : false,
status: integration.value.status === 'active',
settings: integration.value.data ?? {},
logic: (!Array.isArray(integration.value.logic) && integration.value.logic) ? integration.value.logic : null
}
2 changes: 1 addition & 1 deletion client/pages/forms/[slug]/show/integrations/index.vue
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<div
class="hover:bg-gray-50 bg-white transition shadow-md cursor-pointer border border-gray-200 rounded-lg py-5 pr-10 pl-7 items-center flex w-full group justify-between relative">
<div class="flex space-x-3">{{ integrations.get(row.integration_id).name }}</div>
<span v-if="row.status != '1'"
<span v-if="row.status === 'inactive'"
class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700">
In-Active
</span>
Loading
Oops, something went wrong.