Skip to content

Commit

Permalink
Merge pull request #412 from canyongbs/feature/advapp-136-survey-blocks
Browse files Browse the repository at this point in the history
[ADVAPP-136]: Remove Unnecessary Blocks in Surveys
  • Loading branch information
Orrison authored Jan 4, 2024
2 parents 1236eb0 + 4129bad commit 60f05b6
Show file tree
Hide file tree
Showing 7 changed files with 309 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

/*
<COPYRIGHT>
Copyright © 2022-2023, Canyon GBS LLC. All rights reserved.
Advising App™ is licensed under the Elastic License 2.0. For more details,
see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
Notice:
- You may not provide the software to third parties as a hosted or managed
service, where the service provides users with access to any substantial set of
the features or functionality of the software.
- You may not move, change, disable, or circumvent the license key functionality
in the software, and you may not remove or obscure any functionality in the
software that is protected by the license key.
- You may not alter, remove, or obscure any licensing, copyright, or other notices
of the licensor in the software. Any use of the licensor’s trademarks is subject
to applicable law.
- Canyon GBS LLC respects the intellectual property rights of others and expects the
same in return. Canyon GBS™ and Advising App™ are registered trademarks of
Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
vigorously.
- The software solution, including services, infrastructure, and code, is offered as a
Software as a Service (SaaS) by Canyon GBS LLC.
- Use of this software implies agreement to the license terms and conditions as stated
in the Elastic License 2.0.
For more information or inquiries please visit our website at
https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
</COPYRIGHT>
*/

namespace AdvisingApp\Survey\Filament\Blocks;

use AdvisingApp\Form\Filament\Blocks\CheckboxFormFieldBlock;

class CheckboxSurveyFieldBlock extends CheckboxFormFieldBlock
{
public function getLabel(): string
{
return 'Multiple Choice';
}
}
47 changes: 47 additions & 0 deletions app-modules/survey/src/Filament/Blocks/RadioSurveyFieldBlock.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

/*
<COPYRIGHT>
Copyright © 2022-2023, Canyon GBS LLC. All rights reserved.
Advising App™ is licensed under the Elastic License 2.0. For more details,
see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
Notice:
- You may not provide the software to third parties as a hosted or managed
service, where the service provides users with access to any substantial set of
the features or functionality of the software.
- You may not move, change, disable, or circumvent the license key functionality
in the software, and you may not remove or obscure any functionality in the
software that is protected by the license key.
- You may not alter, remove, or obscure any licensing, copyright, or other notices
of the licensor in the software. Any use of the licensor’s trademarks is subject
to applicable law.
- Canyon GBS LLC respects the intellectual property rights of others and expects the
same in return. Canyon GBS™ and Advising App™ are registered trademarks of
Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
vigorously.
- The software solution, including services, infrastructure, and code, is offered as a
Software as a Service (SaaS) by Canyon GBS LLC.
- Use of this software implies agreement to the license terms and conditions as stated
in the Elastic License 2.0.
For more information or inquiries please visit our website at
https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
</COPYRIGHT>
*/

namespace AdvisingApp\Survey\Filament\Blocks;

use AdvisingApp\Form\Filament\Blocks\RadioFormFieldBlock;

class RadioSurveyFieldBlock extends RadioFormFieldBlock
{
public function getLabel(): string
{
return 'Choice (Radio)';
}
}
47 changes: 47 additions & 0 deletions app-modules/survey/src/Filament/Blocks/SelectSurveyFieldBlock.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

/*
<COPYRIGHT>
Copyright © 2022-2023, Canyon GBS LLC. All rights reserved.
Advising App™ is licensed under the Elastic License 2.0. For more details,
see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
Notice:
- You may not provide the software to third parties as a hosted or managed
service, where the service provides users with access to any substantial set of
the features or functionality of the software.
- You may not move, change, disable, or circumvent the license key functionality
in the software, and you may not remove or obscure any functionality in the
software that is protected by the license key.
- You may not alter, remove, or obscure any licensing, copyright, or other notices
of the licensor in the software. Any use of the licensor’s trademarks is subject
to applicable law.
- Canyon GBS LLC respects the intellectual property rights of others and expects the
same in return. Canyon GBS™ and Advising App™ are registered trademarks of
Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
vigorously.
- The software solution, including services, infrastructure, and code, is offered as a
Software as a Service (SaaS) by Canyon GBS LLC.
- Use of this software implies agreement to the license terms and conditions as stated
in the Elastic License 2.0.
For more information or inquiries please visit our website at
https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
</COPYRIGHT>
*/

namespace AdvisingApp\Survey\Filament\Blocks;

use AdvisingApp\Form\Filament\Blocks\SelectFormFieldBlock;

class SelectSurveyFieldBlock extends SelectFormFieldBlock
{
public function getLabel(): string
{
return 'Choice (Dropdown)';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php

/*
<COPYRIGHT>
Copyright © 2022-2023, Canyon GBS LLC. All rights reserved.
Advising App™ is licensed under the Elastic License 2.0. For more details,
see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
Notice:
- You may not provide the software to third parties as a hosted or managed
service, where the service provides users with access to any substantial set of
the features or functionality of the software.
- You may not move, change, disable, or circumvent the license key functionality
in the software, and you may not remove or obscure any functionality in the
software that is protected by the license key.
- You may not alter, remove, or obscure any licensing, copyright, or other notices
of the licensor in the software. Any use of the licensor’s trademarks is subject
to applicable law.
- Canyon GBS LLC respects the intellectual property rights of others and expects the
same in return. Canyon GBS™ and Advising App™ are registered trademarks of
Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
vigorously.
- The software solution, including services, infrastructure, and code, is offered as a
Software as a Service (SaaS) by Canyon GBS LLC.
- Use of this software implies agreement to the license terms and conditions as stated
in the Elastic License 2.0.
For more information or inquiries please visit our website at
https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
</COPYRIGHT>
*/

namespace AdvisingApp\Survey\Filament\Blocks;

use AdvisingApp\Form\Filament\Blocks\EmailFormFieldBlock;
use AdvisingApp\Form\Filament\Blocks\NumberFormFieldBlock;
use AdvisingApp\Form\Filament\Blocks\EducatableEmailFormFieldBlock;

class SurveyFieldBlockRegistry
{
/**
* @return array<class-string<FormFieldBlock>>
*/
public static function get(): array
{
return [
EducatableEmailFormFieldBlock::class,
TextInputSurveyFieldBlock::class,
TextAreaSurveyFieldBlock::class,
SelectSurveyFieldBlock::class,
RadioSurveyFieldBlock::class,
CheckboxSurveyFieldBlock::class,
EmailFormFieldBlock::class,
NumberFormFieldBlock::class,
];
}

/**
* @return array<string, class-string<FormFieldBlock>>
*/
public static function keyByType(): array
{
/** @var FormFieldBlock $block */
return collect(static::get())
->mapWithKeys(fn (string $block): array => [$block::type() => $block])
->all();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

/*
<COPYRIGHT>
Copyright © 2022-2023, Canyon GBS LLC. All rights reserved.
Advising App™ is licensed under the Elastic License 2.0. For more details,
see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
Notice:
- You may not provide the software to third parties as a hosted or managed
service, where the service provides users with access to any substantial set of
the features or functionality of the software.
- You may not move, change, disable, or circumvent the license key functionality
in the software, and you may not remove or obscure any functionality in the
software that is protected by the license key.
- You may not alter, remove, or obscure any licensing, copyright, or other notices
of the licensor in the software. Any use of the licensor’s trademarks is subject
to applicable law.
- Canyon GBS LLC respects the intellectual property rights of others and expects the
same in return. Canyon GBS™ and Advising App™ are registered trademarks of
Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
vigorously.
- The software solution, including services, infrastructure, and code, is offered as a
Software as a Service (SaaS) by Canyon GBS LLC.
- Use of this software implies agreement to the license terms and conditions as stated
in the Elastic License 2.0.
For more information or inquiries please visit our website at
https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
</COPYRIGHT>
*/

namespace AdvisingApp\Survey\Filament\Blocks;

use AdvisingApp\Form\Filament\Blocks\TextAreaFormFieldBlock;

class TextAreaSurveyFieldBlock extends TextAreaFormFieldBlock
{
public function getLabel(): string
{
return 'Question (Multi-Line)';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

/*
<COPYRIGHT>
Copyright © 2022-2023, Canyon GBS LLC. All rights reserved.
Advising App™ is licensed under the Elastic License 2.0. For more details,
see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
Notice:
- You may not provide the software to third parties as a hosted or managed
service, where the service provides users with access to any substantial set of
the features or functionality of the software.
- You may not move, change, disable, or circumvent the license key functionality
in the software, and you may not remove or obscure any functionality in the
software that is protected by the license key.
- You may not alter, remove, or obscure any licensing, copyright, or other notices
of the licensor in the software. Any use of the licensor’s trademarks is subject
to applicable law.
- Canyon GBS LLC respects the intellectual property rights of others and expects the
same in return. Canyon GBS™ and Advising App™ are registered trademarks of
Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
vigorously.
- The software solution, including services, infrastructure, and code, is offered as a
Software as a Service (SaaS) by Canyon GBS LLC.
- Use of this software implies agreement to the license terms and conditions as stated
in the Elastic License 2.0.
For more information or inquiries please visit our website at
https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
</COPYRIGHT>
*/

namespace AdvisingApp\Survey\Filament\Blocks;

use AdvisingApp\Form\Filament\Blocks\TextInputFormFieldBlock;

class TextInputSurveyFieldBlock extends TextInputFormFieldBlock
{
public function getLabel(): string
{
return 'Question (Single Line)';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
use AdvisingApp\Survey\Models\SurveyStep;
use AdvisingApp\Survey\Models\SurveyField;
use FilamentTiptapEditor\Enums\TiptapOutput;
use AdvisingApp\Form\Filament\Blocks\FormFieldBlockRegistry;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use AdvisingApp\Survey\Filament\Blocks\SurveyFieldBlockRegistry;
use AdvisingApp\IntegrationGoogleRecaptcha\Settings\GoogleRecaptchaSettings;

trait HasSharedFormConfiguration
Expand Down Expand Up @@ -146,7 +146,7 @@ public function fieldBuilder(): TiptapEditor
{
return TiptapEditor::make('content')
->output(TiptapOutput::Json)
->blocks(FormFieldBlockRegistry::get())
->blocks(SurveyFieldBlockRegistry::get())
->tools(['bold', 'italic', 'small', '|', 'heading', 'bullet-list', 'ordered-list', 'hr', '|', 'link', 'grid', 'blocks'])
->placeholder('Drag blocks here to build your survey')
->hiddenLabel()
Expand Down

0 comments on commit 60f05b6

Please sign in to comment.