Skip to content

Don't boot Nova Request in the Service Provider #35

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.

Sign up for GitHub

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

Open
tylernathanreed wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't boot Nova Request in the Service Provider #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6675c2d
~ Don't boot the request in the service provider
tylernathanreed Dec 22, 2023
4b2e90a
- Remove return types for PHP 7.x compatibility
tylernathanreed Dec 22, 2023
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
314 changes: 163 additions & 151 deletions src/ToolServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,187 +15,201 @@

class ToolServiceProvider extends ServiceProvider
{


/**
* Bootstrap any application services.
*
* @return void
*/
public function boot(NovaRequest $novaRequest)
public function boot()
{
$this->publishConfiguration();
$this->bootMacros();
}

protected function publishConfiguration()
{
$this->publishes([
__DIR__.'/../config/nova-grid-system.php' => config_path('nova-grid-system.php'),
], 'nova-grid-system');
}

protected function bootMacros()
{
$request = fn () => resolve(NovaRequest::class);

$this->bootHelperMacros();
$this->bootGlobalMacros();
$this->bootCreatingMacros();
$this->bootUpdatingMacros();
$this->bootFormMacros();
$this->bootDetailMacros();
}

Nova::serving(function (ServingNova $event) use ($novaRequest) {
protected function bootHelperMacros()
{
NovaRequest::macro('getRequestType', function () {
$requestType = '';
if ($this->isCreateOrAttachRequest()) {
$requestType = 'creating';
} elseif ($this->isUpdateOrUpdateAttachedRequest()) {
$requestType = 'updating';
} else {
$requestType = 'detail';
}
return $requestType;
});

/**
* HELPERS MACROS
*/
NovaRequest::macro('getRequestType', function () {
$requestType = '';
if ($this->isCreateOrAttachRequest()) {
$requestType = 'creating';
} elseif ($this->isUpdateOrUpdateAttachedRequest()) {
$requestType = 'updating';
} else {
$requestType = 'detail';
}
return $requestType;
});
NovaRequest::macro('isActivate', function (string $meta,string $context, bool $scope = false) {
$requestType = $this->getRequestType();

return
($context == 'all'
|| ($context=='forms' ? collect(['creating','updating'])->contains($requestType) : $requestType == $context)
)
&& config('nova-grid-system.nova_grid_system_enabled', true)
&& config('nova-grid-system.'.$requestType.'.'.$meta, true)
&& ($scope ? $this->isActivateGlobally($meta) : true);
});

NovaRequest::macro('isActivateGlobally', function (string $meta) {
$requestType = $this->getRequestType();
return config('nova-grid-system.'.$meta.'_scope.'.$requestType, true);
});

Field::macro('withSize', function (string $size = 'w-full') use ($novaRequest) {

if ($novaRequest->isActivateGlobally('stacked')) {
$this->stacked();
}
NovaRequest::macro('isActivate', function (string $meta, string $context, bool $scope = false) {
$requestType = $this->getRequestType();

return $this->withMeta(['size' => $size]);
});
return
($context == 'all'
|| ($context=='forms' ? collect(['creating','updating'])->contains($requestType) : $requestType == $context)
)
&& config('nova-grid-system.nova_grid_system_enabled', true)
&& config('nova-grid-system.'.$requestType.'.'.$meta, true)
&& ($scope ? $this->isActivateGlobally($meta) : true);
});

NovaRequest::macro('isActivateGlobally', function (string $meta) {
$requestType = $this->getRequestType();
return config('nova-grid-system.'.$meta.'_scope.'.$requestType, true);
});

Field::macro('isRequestActivate', function (string $meta, string $context, bool $scope = false) {
return resolve(NovaRequest::class)->isActivate($meta, $context, $scope);
});

/**
* GLOBALS MACROS
*/
Field::macro('isRequestActivateGlobally', function (string $meta {
return resolve(NovaRequest::class)->isActivate($meta);
});

Field::macro('size', function ($size = 'w-full') use ($novaRequest) {
Field::macro('withSize', function (string $size = 'w-full') {
if ($this->isRequestActivateGlobally('stacked')) {
$this->stacked();
}

if ($novaRequest->isActivate('size','all', $scope = true)) {
$this->withSize($size);
}
return $this;
});
return $this->withMeta(['size' => $size]);
});
}

Field::macro('removeBottomBorder', function ($remove = true) use ($novaRequest) {
if ($novaRequest->isActivate('remove_bottom_border','all', $scope = true)) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});

/**
* CREATING
*/
Field::macro('sizeOnCreating', function ($size = 'w-full') use ($novaRequest) {
if ($novaRequest->isActivate('size','creating')) {
if (
config('nova-grid-system.stacked_auto', true)
&& config('nova-grid-system.creating.stacked', true)
) {
$this->stacked();
}
$this->withMeta(['size' => $size]);
}
return $this;
});
protected function bootGlobalMacros()
{
Field::macro('size', function ($size = 'w-full') {
if ($this->isRequestActivate('size','all', $scope = true)) {
$this->withSize($size);
}
return $this;
});

Field::macro('stackedOnCreating', function ($stacked = true) use ($novaRequest) {
if ($novaRequest->isActivate('stacked','creating')) {
$this->stacked($stacked);
}
return $this;
});
Field::macro('removeBottomBorder', function ($remove = true) {
if ($this->isRequestActivate('remove_bottom_border','all', $scope = true)) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});
}

Field::macro('removeBottomBorderOnCreating', function ($remove = true) use ($novaRequest) {
if ($novaRequest->isActivate('remove_bottom_border','creating')) {
$this->withMeta(['removeBottomBorder' => $remove]);
protected function bootCreatingMacros()
{
Field::macro('sizeOnCreating', function ($size = 'w-full') {
if ($this->isRequestActivate('size','creating')) {
if (
config('nova-grid-system.stacked_auto', true)
&& config('nova-grid-system.creating.stacked', true)
) {
$this->stacked();
}
return $this;
});
$this->withMeta(['size' => $size]);
}
return $this;
});

Field::macro('stackedOnCreating', function ($stacked = true) {
if ($this->isRequestActivate('stacked','creating')) {
$this->stacked($stacked);
}
return $this;
});

/**
* UPDATING
*/
Field::macro('sizeOnUpdating', function ($size = 'w-full') use ($novaRequest) {
if ($novaRequest->isActivate('size','updating')) {
$this->withSize($size);
}
return $this;
});
Field::macro('removeBottomBorderOnCreating', function ($remove = true) {
if ($this->isRequestActivate('remove_bottom_border','creating')) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});
}

Field::macro('stackedOnUpdating', function ($stacked = true) use ($novaRequest) {
if ($novaRequest->isActivate('stacked','updating')) {
$this->stacked($stacked);
}
return $this;
});
protected function bootUpdatingMacros()
{
Field::macro('sizeOnUpdating', function ($size = 'w-full') {
if ($this->isRequestActivate('size','updating')) {
$this->withSize($size);
}
return $this;
});

Field::macro('removeBottomBorderOnUpdating', function ($remove = true) use ($novaRequest) {
if ($novaRequest->isActivate('remove_bottom_border','updating')) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});

/**
* FORMS
*/
Field::macro('sizeOnForms', function ($size = 'w-full') use ($novaRequest) {
if ($novaRequest->isActivate('size','forms')) {
$this->withSize($size);
}
return $this;
});
Field::macro('stackedOnUpdating', function ($stacked = true) {
if ($this->isRequestActivate('stacked','updating')) {
$this->stacked($stacked);
}
return $this;
});

Field::macro('stackedOnForms', function ($stacked = true) use ($novaRequest) {
if ($novaRequest->isActivate('stacked','forms')) {
$this->stacked($stacked);
}
return $this;
});
Field::macro('removeBottomBorderOnUpdating', function ($remove = true) {
if ($this->isRequestActivate('remove_bottom_border','updating')) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});
}

Field::macro('removeBottomBorderOnForms', function ($remove = true) use ($novaRequest) {
if ($novaRequest->isActivate('remove_bottom_border','forms')) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});

/**
* DETAIL
*/
Field::macro('sizeOnDetail', function ($size = 'w-full') use ($novaRequest) {
if ($novaRequest->isActivate('size','detail')) {
$this->withSize($size);
}
return $this;
});
protected function bootFormMacros()
{
Field::macro('sizeOnForms', function ($size = 'w-full') {
if ($this->isRequestActivate('size','forms')) {
$this->withSize($size);
}
return $this;
});

Field::macro('stackedOnDetail', function ($stacked = true) use ($novaRequest) {
if ($novaRequest->isActivate('stacked','detail')) {
$this->stacked($stacked);
}
return $this;
});
Field::macro('stackedOnForms', function ($stacked = true) {
if ($this->isRequestActivate('stacked','forms')) {
$this->stacked($stacked);
}
return $this;
});

Field::macro('removeBottomBorderOnDetail', function ($remove = true) use ($novaRequest) {
if ($novaRequest->isActivate('remove_bottom_border','detail')) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});
Field::macro('removeBottomBorderOnForms', function ($remove = true) {
if ($this->isRequestActivate('remove_bottom_border','forms')) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});
}

protected function bootDetailMacros()
{
Field::macro('sizeOnDetail', function ($size = 'w-full') {
if ($this->isRequestActivate('size','detail')) {
$this->withSize($size);
}
return $this;
});

Field::macro('stackedOnDetail', function ($stacked = true) {
if ($this->isRequestActivate('stacked','detail')) {
$this->stacked($stacked);
}
return $this;
});

Field::macro('removeBottomBorderOnDetail', function ($remove = true) {
if ($this->isRequestActivate('remove_bottom_border','detail')) {
$this->withMeta(['removeBottomBorder' => $remove]);
}
return $this;
});
}

/**
Expand All @@ -207,6 +221,4 @@ public function register()
{
//
}


}