Skip to content

Commit 6b82866

Browse files
pxpmpxpm
committed
refactor view namespaces
1 parent cc907c2 commit 6b82866

File tree

8 files changed

+27
-37
lines changed

8 files changed

+27
-37
lines changed

‎src/BackpackServiceProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Backpack\CRUD\app\Http\Middleware\ThrottlePasswordRecovery;
66
use Backpack\CRUD\app\Library\CrudPanel\CrudPanel;
7-
use Backpack\CRUD\app\Library\CrudPanel\ViewNamespaces;
7+
use Backpack\CRUD\ViewNamespaces;
88
use Illuminate\Routing\Router;
99
use Illuminate\Support\Collection;
1010
use Illuminate\Support\ServiceProvider;

‎src/app/Library/CrudPanel/ViewNamespaces.php‎ renamed to ‎src/ViewNamespaces.php‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Backpack\CRUD\app\Library\CrudPanel;
3+
namespace Backpack\CRUD;
44

55
class ViewNamespaces
66
{
@@ -12,38 +12,26 @@ class ViewNamespaces
1212
* @param string $domain (eg. fields, filters, buttons)
1313
* @return array
1414
*/
15-
public static function getViewNamespacesFor(string $domain)
15+
public static function getFor(string $domain)
1616
{
17-
$viewNamespacesFromConfig = self::getViewNamespacesFromConfigFor($domain);
17+
$viewNamespacesFromConfig = self::getFromConfigFor($domain);
1818

19-
return array_unique(array_merge($viewNamespacesFromConfig, self::getViewNamespacesForDomain($domain)));
19+
return array_unique(array_merge($viewNamespacesFromConfig, self::getForDomain($domain)));
2020
}
2121

2222
/**
23-
* Adds multiple namespaces to a given domain.
23+
* Add view namespaces for a given domain.
2424
*
2525
* @param string $domain (eg. fields, filters, buttons)
26-
* @param array $viewNamespaces
26+
* @param string|array $viewNamespaces
2727
* @return void
2828
*/
29-
public static function addViewNamespacesFor(string $domain, array $viewNamespaces)
29+
public static function addFor(string $domain, $viewNamespaces)
3030
{
3131
foreach ((array) $viewNamespaces as $viewNamespace) {
32-
self::addViewNamespaceFor($domain, $viewNamespace);
33-
}
34-
}
35-
36-
/**
37-
* Add a new view namespace for a given domain.
38-
*
39-
* @param string $domain (eg. fields, filters, buttons)
40-
* @param string $viewNamespace
41-
* @return void
42-
*/
43-
public static function addViewNamespaceFor(string $domain, string $viewNamespace)
44-
{
45-
if (! in_array($viewNamespace, self::getViewNamespacesForDomain($domain))) {
46-
self::$viewNamespaces[$domain][] = $viewNamespace;
32+
if (! in_array($viewNamespace, self::getForDomain($domain))) {
33+
self::$viewNamespaces[$domain][] = $viewNamespace;
34+
}
4735
}
4836
}
4937

@@ -52,7 +40,7 @@ public static function addViewNamespaceFor(string $domain, string $viewNamespace
5240
*
5341
* @param string $domain
5442
*/
55-
private static function getViewNamespacesForDomain(string $domain)
43+
private static function getForDomain(string $domain)
5644
{
5745
return self::$viewNamespaces[$domain] ?? [];
5846
}
@@ -65,7 +53,7 @@ private static function getViewNamespacesForDomain(string $domain)
6553
* @param mixed $customConfigKey
6654
* @return array
6755
*/
68-
private static function getViewNamespacesFromConfigFor(string $domain, $customConfigKey = null)
56+
private static function getFromConfigFor(string $domain, $customConfigKey = null)
6957
{
7058
return config($customConfigKey ?? 'backpack.crud.view_namespaces.'.$domain) ?? [];
7159
}
@@ -78,10 +66,10 @@ private static function getViewNamespacesFromConfigFor(string $domain, $customCo
7866
* @param string $viewNamespacesFromConfigKey
7967
* @return array
8068
*/
81-
public static function getViewNamespacesWithFallbackFor(string $domain, string $viewNamespacesFromConfigKey)
69+
public static function getWithFallbackFor(string $domain, string $viewNamespacesFromConfigKey)
8270
{
83-
$viewNamespacesFromConfig = self::getViewNamespacesFromConfigFor($domain, $viewNamespacesFromConfigKey);
71+
$viewNamespacesFromConfig = self::getFromConfigFor($domain, $viewNamespacesFromConfigKey);
8472

85-
return array_unique(array_merge($viewNamespacesFromConfig, self::getViewNamespacesFor($domain)));
73+
return array_unique(array_merge($viewNamespacesFromConfig, self::getFor($domain)));
8674
}
8775
}

‎src/app/Library/CrudPanel/CrudButton.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
namespace Backpack\CRUD\app\Library\CrudPanel;
4+
use Backpack\Crud\ViewNamespaces;
45

56
/**
67
* Adds fluent syntax to Backpack CRUD Buttons.
@@ -275,7 +276,7 @@ private function getViewPathsWithFallbacks()
275276
$type = $this->name;
276277
$paths = array_map(function ($item) use ($type) {
277278
return $item.'.'.$type;
278-
}, ViewNamespaces::getViewNamespacesFor('buttons'));
279+
}, ViewNamespaces::getFor('buttons'));
279280

280281
return array_merge([$this->content], $paths);
281282
}

‎src/app/Library/CrudPanel/CrudFilter.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Backpack\CRUD\app\Library\CrudPanel;
44

5+
use Backpack\Crud\ViewNamespaces;
56
use Backpack\CRUD\app\Exceptions\BackpackProRequiredException;
67
use Closure;
78
use Illuminate\Support\Str;
@@ -145,7 +146,7 @@ public function getViewWithNamespace()
145146
public function getNamespacedViewWithFallbacks()
146147
{
147148
$type = $this->type;
148-
$namespaces = ViewNamespaces::getViewNamespacesFor('filters');
149+
$namespaces = ViewNamespaces::getFor('filters');
149150

150151
if ($this->viewNamespace != 'crud::filters') {
151152
$namespaces = array_merge([$this->viewNamespace], $namespaces);

‎src/app/Library/CrudPanel/Traits/Search.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Backpack\CRUD\app\Library\CrudPanel\Traits;
44

5-
use Backpack\CRUD\app\Library\CrudPanel\ViewNamespaces;
5+
use Backpack\CRUD\ViewNamespaces;
66
use Carbon\Carbon;
77
use Validator;
88

@@ -314,7 +314,7 @@ private function getCellViewName($column)
314314
// including the configured view_namespaces
315315
$columnPaths = array_map(function ($item) use ($column) {
316316
return $item.'.'.$column['type'];
317-
}, ViewNamespaces::getViewNamespacesFor('columns'));
317+
}, ViewNamespaces::getFor('columns'));
318318

319319
// but always fall back to the stock 'text' column
320320
// if a view doesn't exist

‎src/app/Library/CrudPanel/Traits/Views.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Backpack\CRUD\app\Library\CrudPanel\Traits;
44

55
use Backpack\CRUD\app\Exceptions\BackpackProRequiredException;
6-
use Backpack\CRUD\app\Library\CrudPanel\ViewNamespaces;
6+
use Backpack\CRUD\ViewNamespaces;
77

88
trait Views
99
{
@@ -301,7 +301,7 @@ public function getFirstFieldView($viewPath, $viewNamespace = false)
301301
// until you find a view that exists
302302
$paths = array_map(function ($item) use ($viewPath) {
303303
return $item.'.'.$viewPath;
304-
}, ViewNamespaces::getViewNamespacesFor('fields'));
304+
}, ViewNamespaces::getFor('fields'));
305305

306306
foreach ($paths as $path) {
307307
if (view()->exists($path)) {

‎src/app/Library/Widget.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Backpack\CRUD\app\Library;
44

55
use Backpack\CRUD\app\Exceptions\BackpackProRequiredException;
6-
use Backpack\CRUD\app\Library\CrudPanel\ViewNamespaces;
6+
use Backpack\CRUD\ViewNamespaces;
77
use Illuminate\Support\Fluent;
88

99
/**
@@ -137,7 +137,7 @@ public function getFinalViewPath()
137137
$type = $this->type;
138138
$paths = array_map(function ($item) use ($type) {
139139
return $item.'.'.$type;
140-
}, ViewNamespaces::getViewNamespacesWithFallbackFor('widgets', 'backpack.base.component_view_namespaces.widgets'));
140+
}, ViewNamespaces::getWithFallbackFor('widgets', 'backpack.base.component_view_namespaces.widgets'));
141141

142142
foreach ($paths as $path) {
143143
if (view()->exists($path)) {

‎src/resources/views/crud/show.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
// including the configured view_namespaces
6262
$columnPaths = array_map(function($item) use ($column) {
6363
return $item.'.'.$column['type'];
64-
}, \Backpack\CRUD\app\Library\CrudPanel\ViewNamespaces::getViewNamespacesFor('columns'));
64+
}, \Backpack\CRUD\ViewNamespaces::getFor('columns'));
6565
6666
// but always fall back to the stock 'text' column
6767
// if a view doesn't exist

0 commit comments

Comments
 (0)