ensure generic search instance

CHANGELOG.md

@@ -5,6 +5,7 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE
 
 ## 4.1.0
 
++ [#657](https://github.com/luyadev/luya-module-admin/pull/657) Fix problem with global admin UI search when model does not exists, this could be due to old controller structure or custom code.
 + [#656](https://github.com/luyadev/luya-module-admin/pull/656) Ensure queue items are removed when schedule item is deleted, improved filter of upcoming queue events, fix issue with scheduler log for multiple attributes on the same model.
 + [#654](https://github.com/luyadev/luya-module-admin/pull/654) Fix issue with ngrest detail view when json is not an array.
 + [#496](https://github.com/luyadev/luya-module-admin/issues/496) Added default color for link elements in NgRest CRUD table.

src/apis/SearchController.php

@@ -67,26 +67,31 @@ public function actionIndex($query)
  ];
  }
 
- unset($data);
+ unset($model, $data);
  }
  }
 
  foreach (Yii::$app->adminmenu->getItems() as $api) {
  if ($api['permissionIsApi']) {
  $ctrl = $module->createController($api['permissionApiEndpoint']);
  $controller = $ctrl[0];
- $data = $this->transformGenericSearchToData($controller->model->genericSearch($query));
- if (count($data) > 0) {
- $search[] = [
- 'hideFields' => $controller->model->genericSearchHiddenFields(),
- 'type' => 'api',
- 'menuItem' => $api,
- 'data' => $data,
- 'stateProvider' => $controller->model->genericSearchStateProvider(),
- ];
+
+ if ($controller && $controller->model && $controller->model instanceof GenericSearchInterface) {
+ $data = $this->transformGenericSearchToData($controller->model->genericSearch($query));
+ if (count($data) > 0) {
+ $search[] = [
+ 'hideFields' => $controller->model->genericSearchHiddenFields(),
+ 'type' => 'api',
+ 'menuItem' => $api,
+ 'data' => $data,
+ 'stateProvider' => $controller->model->genericSearchStateProvider(),
+ ];
+ }
+
+ unset($data);
  }
 
- unset($data);
+ unset($controller, $ctrl);
  }
  }
 

tests/admin/apis/SearchControllerTest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace luya\admin\tests\admin\apis;
+
+use admintests\AdminModelTestCase;
+use luya\admin\apis\SearchController;
+use luya\admin\models\SearchData;
+use luya\testsuite\fixtures\NgRestModelFixture;
+use luya\testsuite\scopes\PermissionScope;
+
+class SearchControllerTest extends AdminModelTestCase
+{
+ public function testIndexAction()
+ {
+ PermissionScope::run($this->app, function (PermissionScope $scope) {
+ new NgRestModelFixture([
+ 'modelClass' => SearchData::class,
+ ]);
+
+ $this->createAdminTagFixture([
+ 1 => [
+ 'id' => 1,
+ 'name' => 'none',
+ 'translation' => 'none',
+ ]
+ ]);
+
+ $ctrl = new SearchController('search', $scope->getApp()->getModule('admin'));
+ $scope->loginUser();
+ $response = $scope->runControllerAction($ctrl, 'index', ['query' => 'test']);
+
+ $this->assertEmpty($response);
+ }, function (PermissionScope $config) {
+ $config->userFixtureData = ['is_api_user' => 0];
+ });
+ }
+}