diff --git a/.gitignore b/.gitignore index 3ce9e373ceba..83bcf4a5274c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ /ext/greenwich/dist /ext/greenwich/extern !/ext/oauth-client -!/ext/search +!/ext/search_kit !/ext/financialacls !/ext/contributioncancelactions !/ext/recaptcha diff --git a/CRM/Upgrade/Incremental/sql/5.38.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.38.alpha1.mysql.tpl index 4e389986d498..236abd7691e4 100644 --- a/CRM/Upgrade/Incremental/sql/5.38.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.38.alpha1.mysql.tpl @@ -1,3 +1,11 @@ {* file to handle db changes in 5.38.alpha1 during upgrade *} ALTER TABLE civicrm_queue_item MODIFY data LONGTEXT; + +UPDATE civicrm_extension +SET full_name = 'org.civicrm.search_kit', name = 'search_kit', file = 'search_kit' +WHERE full_name = 'org.civicrm.search'; + +UPDATE civicrm_managed +SET module = 'org.civicrm.search_kit' +WHERE module = 'org.civicrm.search'; diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh index 722332f2f2c0..2c204433e110 100644 --- a/distmaker/dists/common.sh +++ b/distmaker/dists/common.sh @@ -118,7 +118,7 @@ function dm_install_coreext() { ## Get a list of default/core extension directories (space-delimited) ## reldirs=$(dm_core_exts) function dm_core_exts() { - echo ext/search + echo ext/search_kit echo ext/sequentialcreditnotes echo ext/flexmailer echo ext/eventcart diff --git a/ext/search/CRM/Search/BAO/SearchDisplay.php b/ext/search_kit/CRM/Search/BAO/SearchDisplay.php similarity index 100% rename from ext/search/CRM/Search/BAO/SearchDisplay.php rename to ext/search_kit/CRM/Search/BAO/SearchDisplay.php diff --git a/ext/search/CRM/Search/DAO/SearchDisplay.php b/ext/search_kit/CRM/Search/DAO/SearchDisplay.php similarity index 98% rename from ext/search/CRM/Search/DAO/SearchDisplay.php rename to ext/search_kit/CRM/Search/DAO/SearchDisplay.php index 271b36feb387..e4dd814bfb94 100644 --- a/ext/search/CRM/Search/DAO/SearchDisplay.php +++ b/ext/search_kit/CRM/Search/DAO/SearchDisplay.php @@ -4,9 +4,9 @@ * @package CRM * @copyright CiviCRM LLC https://civicrm.org/licensing * - * Generated from org.civicrm.search/xml/schema/CRM/Search/SearchDisplay.xml + * Generated from org.civicrm.search_kit/xml/schema/CRM/Search/SearchDisplay.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:ac28cede0407e2e1bf2273b7ca6421d4) + * (GenCodeChecksum:6042d1e2bee9eaed4c3a7c59c34ad224) */ use CRM_Search_ExtensionUtil as E; @@ -125,6 +125,7 @@ public static function &fields() { 'entity' => 'SearchDisplay', 'bao' => 'CRM_Search_DAO_SearchDisplay', 'localizable' => 0, + 'readonly' => TRUE, 'add' => '1.0', ], 'name' => [ diff --git a/ext/search/CRM/Search/Page/Admin.php b/ext/search_kit/CRM/Search/Page/Admin.php similarity index 100% rename from ext/search/CRM/Search/Page/Admin.php rename to ext/search_kit/CRM/Search/Page/Admin.php diff --git a/ext/search/CRM/Search/Page/Search.php b/ext/search_kit/CRM/Search/Page/Search.php similarity index 100% rename from ext/search/CRM/Search/Page/Search.php rename to ext/search_kit/CRM/Search/Page/Search.php diff --git a/ext/search/CRM/Search/Upgrader.php b/ext/search_kit/CRM/Search/Upgrader.php similarity index 100% rename from ext/search/CRM/Search/Upgrader.php rename to ext/search_kit/CRM/Search/Upgrader.php diff --git a/ext/search/CRM/Search/Upgrader/Base.php b/ext/search_kit/CRM/Search/Upgrader/Base.php similarity index 100% rename from ext/search/CRM/Search/Upgrader/Base.php rename to ext/search_kit/CRM/Search/Upgrader/Base.php diff --git a/ext/search/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php b/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php similarity index 100% rename from ext/search/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php rename to ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php diff --git a/ext/search/Civi/Api4/Action/SearchDisplay/Run.php b/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php similarity index 100% rename from ext/search/Civi/Api4/Action/SearchDisplay/Run.php rename to ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php diff --git a/ext/search/Civi/Api4/SearchDisplay.php b/ext/search_kit/Civi/Api4/SearchDisplay.php similarity index 100% rename from ext/search/Civi/Api4/SearchDisplay.php rename to ext/search_kit/Civi/Api4/SearchDisplay.php diff --git a/ext/search/Civi/Api4/Service/Spec/Provider/SearchDisplayCreationSpecProvider.php b/ext/search_kit/Civi/Api4/Service/Spec/Provider/SearchDisplayCreationSpecProvider.php similarity index 100% rename from ext/search/Civi/Api4/Service/Spec/Provider/SearchDisplayCreationSpecProvider.php rename to ext/search_kit/Civi/Api4/Service/Spec/Provider/SearchDisplayCreationSpecProvider.php diff --git a/ext/search/Civi/Search/Actions.php b/ext/search_kit/Civi/Search/Actions.php similarity index 100% rename from ext/search/Civi/Search/Actions.php rename to ext/search_kit/Civi/Search/Actions.php diff --git a/ext/search/Civi/Search/Admin.php b/ext/search_kit/Civi/Search/Admin.php similarity index 100% rename from ext/search/Civi/Search/Admin.php rename to ext/search_kit/Civi/Search/Admin.php diff --git a/ext/search/Civi/Search/AfformSearchMetadataInjector.php b/ext/search_kit/Civi/Search/AfformSearchMetadataInjector.php similarity index 100% rename from ext/search/Civi/Search/AfformSearchMetadataInjector.php rename to ext/search_kit/Civi/Search/AfformSearchMetadataInjector.php diff --git a/ext/search/Civi/Search/Display.php b/ext/search_kit/Civi/Search/Display.php similarity index 100% rename from ext/search/Civi/Search/Display.php rename to ext/search_kit/Civi/Search/Display.php diff --git a/ext/search/README.md b/ext/search_kit/README.md similarity index 100% rename from ext/search/README.md rename to ext/search_kit/README.md diff --git a/ext/search/ang/crmSearchActions.ang.php b/ext/search_kit/ang/crmSearchActions.ang.php similarity index 100% rename from ext/search/ang/crmSearchActions.ang.php rename to ext/search_kit/ang/crmSearchActions.ang.php diff --git a/ext/search/ang/crmSearchActions.module.js b/ext/search_kit/ang/crmSearchActions.module.js similarity index 100% rename from ext/search/ang/crmSearchActions.module.js rename to ext/search_kit/ang/crmSearchActions.module.js diff --git a/ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js b/ext/search_kit/ang/crmSearchActions/crmSearchActionDelete.ctrl.js similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js rename to ext/search_kit/ang/crmSearchActions/crmSearchActionDelete.ctrl.js diff --git a/ext/search/ang/crmSearchActions/crmSearchActionDelete.html b/ext/search_kit/ang/crmSearchActions/crmSearchActionDelete.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchActionDelete.html rename to ext/search_kit/ang/crmSearchActions/crmSearchActionDelete.html diff --git a/ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js b/ext/search_kit/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js rename to ext/search_kit/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js diff --git a/ext/search/ang/crmSearchActions/crmSearchActionUpdate.html b/ext/search_kit/ang/crmSearchActions/crmSearchActionUpdate.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchActionUpdate.html rename to ext/search_kit/ang/crmSearchActions/crmSearchActionUpdate.html diff --git a/ext/search/ang/crmSearchActions/crmSearchActions.component.js b/ext/search_kit/ang/crmSearchActions/crmSearchActions.component.js similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchActions.component.js rename to ext/search_kit/ang/crmSearchActions/crmSearchActions.component.js diff --git a/ext/search/ang/crmSearchActions/crmSearchActions.html b/ext/search_kit/ang/crmSearchActions/crmSearchActions.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchActions.html rename to ext/search_kit/ang/crmSearchActions/crmSearchActions.html diff --git a/ext/search/ang/crmSearchActions/crmSearchBatchRunner.component.js b/ext/search_kit/ang/crmSearchActions/crmSearchBatchRunner.component.js similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchBatchRunner.component.js rename to ext/search_kit/ang/crmSearchActions/crmSearchBatchRunner.component.js diff --git a/ext/search/ang/crmSearchActions/crmSearchBatchRunner.html b/ext/search_kit/ang/crmSearchActions/crmSearchBatchRunner.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchBatchRunner.html rename to ext/search_kit/ang/crmSearchActions/crmSearchBatchRunner.html diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/boolean.html b/ext/search_kit/ang/crmSearchActions/crmSearchInput/boolean.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/boolean.html rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/boolean.html diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/crmMultiSelectDate.directive.js b/ext/search_kit/ang/crmSearchActions/crmSearchInput/crmMultiSelectDate.directive.js similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/crmMultiSelectDate.directive.js rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/crmMultiSelectDate.directive.js diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js b/ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.html b/ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInput.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.html rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInput.html diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js b/ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/date.html b/ext/search_kit/ang/crmSearchActions/crmSearchInput/date.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/date.html rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/date.html diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/entityRef.html b/ext/search_kit/ang/crmSearchActions/crmSearchInput/entityRef.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/entityRef.html rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/entityRef.html diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/float.html b/ext/search_kit/ang/crmSearchActions/crmSearchInput/float.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/float.html rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/float.html diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/integer.html b/ext/search_kit/ang/crmSearchActions/crmSearchInput/integer.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/integer.html rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/integer.html diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/select.html b/ext/search_kit/ang/crmSearchActions/crmSearchInput/select.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/select.html rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/select.html diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/text.html b/ext/search_kit/ang/crmSearchActions/crmSearchInput/text.html similarity index 100% rename from ext/search/ang/crmSearchActions/crmSearchInput/text.html rename to ext/search_kit/ang/crmSearchActions/crmSearchInput/text.html diff --git a/ext/search/ang/crmSearchAdmin.ang.php b/ext/search_kit/ang/crmSearchAdmin.ang.php similarity index 100% rename from ext/search/ang/crmSearchAdmin.ang.php rename to ext/search_kit/ang/crmSearchAdmin.ang.php diff --git a/ext/search/ang/crmSearchAdmin.module.js b/ext/search_kit/ang/crmSearchAdmin.module.js similarity index 100% rename from ext/search/ang/crmSearchAdmin.module.js rename to ext/search_kit/ang/crmSearchAdmin.module.js diff --git a/ext/search/ang/crmSearchAdmin/compose/controls.html b/ext/search_kit/ang/crmSearchAdmin/compose/controls.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/compose/controls.html rename to ext/search_kit/ang/crmSearchAdmin/compose/controls.html diff --git a/ext/search/ang/crmSearchAdmin/compose/criteria.html b/ext/search_kit/ang/crmSearchAdmin/compose/criteria.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/compose/criteria.html rename to ext/search_kit/ang/crmSearchAdmin/compose/criteria.html diff --git a/ext/search/ang/crmSearchAdmin/compose/debug.html b/ext/search_kit/ang/crmSearchAdmin/compose/debug.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/compose/debug.html rename to ext/search_kit/ang/crmSearchAdmin/compose/debug.html diff --git a/ext/search/ang/crmSearchAdmin/compose/pager.html b/ext/search_kit/ang/crmSearchAdmin/compose/pager.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/compose/pager.html rename to ext/search_kit/ang/crmSearchAdmin/compose/pager.html diff --git a/ext/search/ang/crmSearchAdmin/compose/results.html b/ext/search_kit/ang/crmSearchAdmin/compose/results.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/compose/results.html rename to ext/search_kit/ang/crmSearchAdmin/compose/results.html diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdmin.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdmin.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.html diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkSelect.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkSelect.html diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html diff --git a/ext/search/ang/crmSearchAdmin/crmSearchClause.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchClause.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchClause.component.js rename to ext/search_kit/ang/crmSearchAdmin/crmSearchClause.component.js diff --git a/ext/search/ang/crmSearchAdmin/crmSearchClause.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchClause.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchClause.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchClause.html diff --git a/ext/search/ang/crmSearchAdmin/crmSearchFunction.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchFunction.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchFunction.component.js rename to ext/search_kit/ang/crmSearchAdmin/crmSearchFunction.component.js diff --git a/ext/search/ang/crmSearchAdmin/crmSearchFunction.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchFunction.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/crmSearchFunction.html rename to ext/search_kit/ang/crmSearchAdmin/crmSearchFunction.html diff --git a/ext/search/ang/crmSearchAdmin/displays/colType/buttons.html b/ext/search_kit/ang/crmSearchAdmin/displays/colType/buttons.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/colType/buttons.html rename to ext/search_kit/ang/crmSearchAdmin/displays/colType/buttons.html diff --git a/ext/search/ang/crmSearchAdmin/displays/colType/field.html b/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/colType/field.html rename to ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html diff --git a/ext/search/ang/crmSearchAdmin/displays/colType/links.html b/ext/search_kit/ang/crmSearchAdmin/displays/colType/links.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/colType/links.html rename to ext/search_kit/ang/crmSearchAdmin/displays/colType/links.html diff --git a/ext/search/ang/crmSearchAdmin/displays/colType/menu.html b/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/colType/menu.html rename to ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html diff --git a/ext/search/ang/crmSearchAdmin/displays/common/addColMenu.html b/ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/common/addColMenu.html rename to ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js rename to ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html rename to ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js rename to ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html rename to ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html diff --git a/ext/search/ang/crmSearchAdmin/group.html b/ext/search_kit/ang/crmSearchAdmin/group.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/group.html rename to ext/search_kit/ang/crmSearchAdmin/group.html diff --git a/ext/search/ang/crmSearchAdmin/searchList.controller.js b/ext/search_kit/ang/crmSearchAdmin/searchList.controller.js similarity index 100% rename from ext/search/ang/crmSearchAdmin/searchList.controller.js rename to ext/search_kit/ang/crmSearchAdmin/searchList.controller.js diff --git a/ext/search/ang/crmSearchAdmin/searchList.html b/ext/search_kit/ang/crmSearchAdmin/searchList.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/searchList.html rename to ext/search_kit/ang/crmSearchAdmin/searchList.html diff --git a/ext/search/ang/crmSearchAdmin/tabs.html b/ext/search_kit/ang/crmSearchAdmin/tabs.html similarity index 100% rename from ext/search/ang/crmSearchAdmin/tabs.html rename to ext/search_kit/ang/crmSearchAdmin/tabs.html diff --git a/ext/search/ang/crmSearchDisplay.ang.php b/ext/search_kit/ang/crmSearchDisplay.ang.php similarity index 100% rename from ext/search/ang/crmSearchDisplay.ang.php rename to ext/search_kit/ang/crmSearchDisplay.ang.php diff --git a/ext/search/ang/crmSearchDisplay.module.js b/ext/search_kit/ang/crmSearchDisplay.module.js similarity index 100% rename from ext/search/ang/crmSearchDisplay.module.js rename to ext/search_kit/ang/crmSearchDisplay.module.js diff --git a/ext/search/ang/crmSearchDisplay/Pager.html b/ext/search_kit/ang/crmSearchDisplay/Pager.html similarity index 100% rename from ext/search/ang/crmSearchDisplay/Pager.html rename to ext/search_kit/ang/crmSearchDisplay/Pager.html diff --git a/ext/search/ang/crmSearchDisplay/colType/buttons.html b/ext/search_kit/ang/crmSearchDisplay/colType/buttons.html similarity index 100% rename from ext/search/ang/crmSearchDisplay/colType/buttons.html rename to ext/search_kit/ang/crmSearchDisplay/colType/buttons.html diff --git a/ext/search/ang/crmSearchDisplay/colType/field.html b/ext/search_kit/ang/crmSearchDisplay/colType/field.html similarity index 100% rename from ext/search/ang/crmSearchDisplay/colType/field.html rename to ext/search_kit/ang/crmSearchDisplay/colType/field.html diff --git a/ext/search/ang/crmSearchDisplay/colType/links.html b/ext/search_kit/ang/crmSearchDisplay/colType/links.html similarity index 100% rename from ext/search/ang/crmSearchDisplay/colType/links.html rename to ext/search_kit/ang/crmSearchDisplay/colType/links.html diff --git a/ext/search/ang/crmSearchDisplay/colType/menu.html b/ext/search_kit/ang/crmSearchDisplay/colType/menu.html similarity index 100% rename from ext/search/ang/crmSearchDisplay/colType/menu.html rename to ext/search_kit/ang/crmSearchDisplay/colType/menu.html diff --git a/ext/search/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js b/ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js similarity index 100% rename from ext/search/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js rename to ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js diff --git a/ext/search/ang/crmSearchDisplay/crmSearchDisplayEditable.html b/ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.html similarity index 100% rename from ext/search/ang/crmSearchDisplay/crmSearchDisplayEditable.html rename to ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.html diff --git a/ext/search/ang/crmSearchDisplayList.ang.php b/ext/search_kit/ang/crmSearchDisplayList.ang.php similarity index 100% rename from ext/search/ang/crmSearchDisplayList.ang.php rename to ext/search_kit/ang/crmSearchDisplayList.ang.php diff --git a/ext/search/ang/crmSearchDisplayList.module.js b/ext/search_kit/ang/crmSearchDisplayList.module.js similarity index 100% rename from ext/search/ang/crmSearchDisplayList.module.js rename to ext/search_kit/ang/crmSearchDisplayList.module.js diff --git a/ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.component.js b/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.component.js similarity index 100% rename from ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.component.js rename to ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.component.js diff --git a/ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.html b/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html similarity index 100% rename from ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.html rename to ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html diff --git a/ext/search/ang/crmSearchDisplayList/crmSearchDisplayListItems.html b/ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayListItems.html similarity index 100% rename from ext/search/ang/crmSearchDisplayList/crmSearchDisplayListItems.html rename to ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayListItems.html diff --git a/ext/search/ang/crmSearchDisplayTable.ang.php b/ext/search_kit/ang/crmSearchDisplayTable.ang.php similarity index 100% rename from ext/search/ang/crmSearchDisplayTable.ang.php rename to ext/search_kit/ang/crmSearchDisplayTable.ang.php diff --git a/ext/search/ang/crmSearchDisplayTable.module.js b/ext/search_kit/ang/crmSearchDisplayTable.module.js similarity index 100% rename from ext/search/ang/crmSearchDisplayTable.module.js rename to ext/search_kit/ang/crmSearchDisplayTable.module.js diff --git a/ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js similarity index 100% rename from ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js rename to ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js diff --git a/ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.html b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html similarity index 100% rename from ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.html rename to ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html diff --git a/ext/search/ang/crmSearchPage.ang.php b/ext/search_kit/ang/crmSearchPage.ang.php similarity index 100% rename from ext/search/ang/crmSearchPage.ang.php rename to ext/search_kit/ang/crmSearchPage.ang.php diff --git a/ext/search/ang/crmSearchPage.module.js b/ext/search_kit/ang/crmSearchPage.module.js similarity index 100% rename from ext/search/ang/crmSearchPage.module.js rename to ext/search_kit/ang/crmSearchPage.module.js diff --git a/ext/search/css/crmSearchActions.css b/ext/search_kit/css/crmSearchActions.css similarity index 100% rename from ext/search/css/crmSearchActions.css rename to ext/search_kit/css/crmSearchActions.css diff --git a/ext/search/css/crmSearchAdmin.css b/ext/search_kit/css/crmSearchAdmin.css similarity index 100% rename from ext/search/css/crmSearchAdmin.css rename to ext/search_kit/css/crmSearchAdmin.css diff --git a/ext/search/info.xml b/ext/search_kit/info.xml similarity index 92% rename from ext/search/info.xml rename to ext/search_kit/info.xml index aa85932f4411..6519587974e0 100644 --- a/ext/search/info.xml +++ b/ext/search_kit/info.xml @@ -1,6 +1,6 @@ - - search + + search_kit Search Kit Create searches for a wide variety of CiviCRM entities AGPL-3.0 diff --git a/ext/search/managed/SearchDisplayType.mgd.php b/ext/search_kit/managed/SearchDisplayType.mgd.php similarity index 100% rename from ext/search/managed/SearchDisplayType.mgd.php rename to ext/search_kit/managed/SearchDisplayType.mgd.php diff --git a/ext/search/phpunit.xml.dist b/ext/search_kit/phpunit.xml.dist similarity index 100% rename from ext/search/phpunit.xml.dist rename to ext/search_kit/phpunit.xml.dist diff --git a/ext/search/search.civix.php b/ext/search_kit/search_kit.civix.php similarity index 81% rename from ext/search/search.civix.php rename to ext/search_kit/search_kit.civix.php index 7ae23cc7de4f..b8d250482699 100644 --- a/ext/search/search.civix.php +++ b/ext/search_kit/search_kit.civix.php @@ -7,8 +7,8 @@ * extension. */ class CRM_Search_ExtensionUtil { - const SHORT_NAME = 'search'; - const LONG_NAME = 'org.civicrm.search'; + const SHORT_NAME = 'search_kit'; + const LONG_NAME = 'org.civicrm.search_kit'; const CLASS_PREFIX = 'CRM_Search'; /** @@ -84,7 +84,7 @@ public static function findClass($suffix) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config */ -function _search_civix_civicrm_config(&$config = NULL) { +function _search_kit_civix_civicrm_config(&$config = NULL) { static $configured = FALSE; if ($configured) { return; @@ -114,8 +114,8 @@ function _search_civix_civicrm_config(&$config = NULL) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu */ -function _search_civix_civicrm_xmlMenu(&$files) { - foreach (_search_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) { +function _search_kit_civix_civicrm_xmlMenu(&$files) { + foreach (_search_kit_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) { $files[] = $file; } } @@ -125,9 +125,9 @@ function _search_civix_civicrm_xmlMenu(&$files) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install */ -function _search_civix_civicrm_install() { - _search_civix_civicrm_config(); - if ($upgrader = _search_civix_upgrader()) { +function _search_kit_civix_civicrm_install() { + _search_kit_civix_civicrm_config(); + if ($upgrader = _search_kit_civix_upgrader()) { $upgrader->onInstall(); } } @@ -137,9 +137,9 @@ function _search_civix_civicrm_install() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall */ -function _search_civix_civicrm_postInstall() { - _search_civix_civicrm_config(); - if ($upgrader = _search_civix_upgrader()) { +function _search_kit_civix_civicrm_postInstall() { + _search_kit_civix_civicrm_config(); + if ($upgrader = _search_kit_civix_upgrader()) { if (is_callable([$upgrader, 'onPostInstall'])) { $upgrader->onPostInstall(); } @@ -151,9 +151,9 @@ function _search_civix_civicrm_postInstall() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall */ -function _search_civix_civicrm_uninstall() { - _search_civix_civicrm_config(); - if ($upgrader = _search_civix_upgrader()) { +function _search_kit_civix_civicrm_uninstall() { + _search_kit_civix_civicrm_config(); + if ($upgrader = _search_kit_civix_upgrader()) { $upgrader->onUninstall(); } } @@ -163,9 +163,9 @@ function _search_civix_civicrm_uninstall() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable */ -function _search_civix_civicrm_enable() { - _search_civix_civicrm_config(); - if ($upgrader = _search_civix_upgrader()) { +function _search_kit_civix_civicrm_enable() { + _search_kit_civix_civicrm_config(); + if ($upgrader = _search_kit_civix_upgrader()) { if (is_callable([$upgrader, 'onEnable'])) { $upgrader->onEnable(); } @@ -178,9 +178,9 @@ function _search_civix_civicrm_enable() { * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable * @return mixed */ -function _search_civix_civicrm_disable() { - _search_civix_civicrm_config(); - if ($upgrader = _search_civix_upgrader()) { +function _search_kit_civix_civicrm_disable() { + _search_kit_civix_civicrm_config(); + if ($upgrader = _search_kit_civix_upgrader()) { if (is_callable([$upgrader, 'onDisable'])) { $upgrader->onDisable(); } @@ -199,8 +199,8 @@ function _search_civix_civicrm_disable() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade */ -function _search_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - if ($upgrader = _search_civix_upgrader()) { +function _search_kit_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { + if ($upgrader = _search_kit_civix_upgrader()) { return $upgrader->onUpgrade($op, $queue); } } @@ -208,7 +208,7 @@ function _search_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { /** * @return CRM_Search_Upgrader */ -function _search_civix_upgrader() { +function _search_kit_civix_upgrader() { if (!file_exists(__DIR__ . '/CRM/Search/Upgrader.php')) { return NULL; } @@ -228,7 +228,7 @@ function _search_civix_upgrader() { * * @return array */ -function _search_civix_find_files($dir, $pattern) { +function _search_kit_civix_find_files($dir, $pattern) { if (is_callable(['CRM_Utils_File', 'findFiles'])) { return CRM_Utils_File::findFiles($dir, $pattern); } @@ -237,7 +237,7 @@ function _search_civix_find_files($dir, $pattern) { $result = []; while (!empty($todos)) { $subdir = array_shift($todos); - foreach (_search_civix_glob("$subdir/$pattern") as $match) { + foreach (_search_kit_civix_glob("$subdir/$pattern") as $match) { if (!is_dir($match)) { $result[] = $match; } @@ -264,8 +264,8 @@ function _search_civix_find_files($dir, $pattern) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed */ -function _search_civix_civicrm_managed(&$entities) { - $mgdFiles = _search_civix_find_files(__DIR__, '*.mgd.php'); +function _search_kit_civix_civicrm_managed(&$entities) { + $mgdFiles = _search_kit_civix_find_files(__DIR__, '*.mgd.php'); sort($mgdFiles); foreach ($mgdFiles as $file) { $es = include $file; @@ -290,12 +290,12 @@ function _search_civix_civicrm_managed(&$entities) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes */ -function _search_civix_civicrm_caseTypes(&$caseTypes) { +function _search_kit_civix_civicrm_caseTypes(&$caseTypes) { if (!is_dir(__DIR__ . '/xml/case')) { return; } - foreach (_search_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) { + foreach (_search_kit_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) { $name = preg_replace('/\.xml$/', '', basename($file)); if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) { $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name)); @@ -318,12 +318,12 @@ function _search_civix_civicrm_caseTypes(&$caseTypes) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules */ -function _search_civix_civicrm_angularModules(&$angularModules) { +function _search_kit_civix_civicrm_angularModules(&$angularModules) { if (!is_dir(__DIR__ . '/ang')) { return; } - $files = _search_civix_glob(__DIR__ . '/ang/*.ang.php'); + $files = _search_kit_civix_glob(__DIR__ . '/ang/*.ang.php'); foreach ($files as $file) { $name = preg_replace(':\.ang\.php$:', '', basename($file)); $module = include $file; @@ -339,8 +339,8 @@ function _search_civix_civicrm_angularModules(&$angularModules) { * * Find any and return any files matching "*.theme.php" */ -function _search_civix_civicrm_themes(&$themes) { - $files = _search_civix_glob(__DIR__ . '/*.theme.php'); +function _search_kit_civix_civicrm_themes(&$themes) { + $files = _search_kit_civix_glob(__DIR__ . '/*.theme.php'); foreach ($files as $file) { $themeMeta = include $file; if (empty($themeMeta['name'])) { @@ -366,7 +366,7 @@ function _search_civix_civicrm_themes(&$themes) { * * @return array */ -function _search_civix_glob($pattern) { +function _search_kit_civix_glob($pattern) { $result = glob($pattern); return is_array($result) ? $result : []; } @@ -382,7 +382,7 @@ function _search_civix_glob($pattern) { * * @return bool */ -function _search_civix_insert_navigation_menu(&$menu, $path, $item) { +function _search_kit_civix_insert_navigation_menu(&$menu, $path, $item) { // If we are done going down the path, insert menu if (empty($path)) { $menu[] = [ @@ -403,7 +403,7 @@ function _search_civix_insert_navigation_menu(&$menu, $path, $item) { if (!isset($entry['child'])) { $entry['child'] = []; } - $found = _search_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item); + $found = _search_kit_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item); } } return $found; @@ -413,9 +413,9 @@ function _search_civix_insert_navigation_menu(&$menu, $path, $item) { /** * (Delegated) Implements hook_civicrm_navigationMenu(). */ -function _search_civix_navigationMenu(&$nodes) { +function _search_kit_civix_navigationMenu(&$nodes) { if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) { - _search_civix_fixNavigationMenu($nodes); + _search_kit_civix_fixNavigationMenu($nodes); } } @@ -423,17 +423,17 @@ function _search_civix_navigationMenu(&$nodes) { * Given a navigation menu, generate navIDs for any items which are * missing them. */ -function _search_civix_fixNavigationMenu(&$nodes) { +function _search_kit_civix_fixNavigationMenu(&$nodes) { $maxNavID = 1; array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) { if ($key === 'navID') { $maxNavID = max($maxNavID, $item); } }); - _search_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL); + _search_kit_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL); } -function _search_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) { +function _search_kit_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) { $origKeys = array_keys($nodes); foreach ($origKeys as $origKey) { if (!isset($nodes[$origKey]['attributes']['parentID']) && $parentID !== NULL) { @@ -448,7 +448,7 @@ function _search_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) { $origKey = $newKey; } if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) { - _search_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']); + _search_kit_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']); } } } @@ -458,7 +458,7 @@ function _search_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders */ -function _search_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { +function _search_kit_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings'; if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) { $metaDataFolders[] = $settingsDir; @@ -472,7 +472,7 @@ function _search_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes */ -function _search_civix_civicrm_entityTypes(&$entityTypes) { +function _search_kit_civix_civicrm_entityTypes(&$entityTypes) { $entityTypes = array_merge($entityTypes, [ 'CRM_Search_DAO_SearchDisplay' => [ 'name' => 'SearchDisplay', diff --git a/ext/search/search.php b/ext/search_kit/search_kit.php similarity index 66% rename from ext/search/search.php rename to ext/search_kit/search_kit.php index 6a1f4d2ed61b..170a4a55e0fd 100644 --- a/ext/search/search.php +++ b/ext/search_kit/search_kit.php @@ -1,14 +1,14 @@ addListener('hook_civicrm_alterAngular', ['\Civi\Search\AfformSearchMetadataInjector', 'preprocess'], 1000); } @@ -17,8 +17,8 @@ function search_civicrm_config(&$config) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu */ -function search_civicrm_xmlMenu(&$files) { - _search_civix_civicrm_xmlMenu($files); +function search_kit_civicrm_xmlMenu(&$files) { + _search_kit_civix_civicrm_xmlMenu($files); } /** @@ -29,8 +29,8 @@ function search_civicrm_xmlMenu(&$files) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed */ -function search_civicrm_managed(&$entities) { - _search_civix_civicrm_managed($entities); +function search_kit_civicrm_managed(&$entities) { + _search_kit_civix_civicrm_managed($entities); } /** @@ -43,8 +43,8 @@ function search_civicrm_managed(&$entities) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules */ -function search_civicrm_angularModules(&$angularModules) { - _search_civix_civicrm_angularModules($angularModules); +function search_kit_civicrm_angularModules(&$angularModules) { + _search_kit_civix_civicrm_angularModules($angularModules); } /** @@ -52,8 +52,8 @@ function search_civicrm_angularModules(&$angularModules) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders */ -function search_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { - _search_civix_civicrm_alterSettingsFolders($metaDataFolders); +function search_kit_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { + _search_kit_civix_civicrm_alterSettingsFolders($metaDataFolders); } /** @@ -63,21 +63,21 @@ function search_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes */ -function search_civicrm_entityTypes(&$entityTypes) { - _search_civix_civicrm_entityTypes($entityTypes); +function search_kit_civicrm_entityTypes(&$entityTypes) { + _search_kit_civix_civicrm_entityTypes($entityTypes); } /** * Implements hook_civicrm_themes(). */ -function search_civicrm_themes(&$themes) { - _search_civix_civicrm_themes($themes); +function search_kit_civicrm_themes(&$themes) { + _search_kit_civix_civicrm_themes($themes); } /** * Implements hook_civicrm_pre(). */ -function search_civicrm_pre($op, $entity, $id, &$params) { +function search_kit_civicrm_pre($op, $entity, $id, &$params) { // Supply default name/label when creating new SearchDisplay if ($entity === 'SearchDisplay' && $op === 'create') { if (empty($params['label'])) { diff --git a/ext/search/sql/auto_install.sql b/ext/search_kit/sql/auto_install.sql similarity index 96% rename from ext/search/sql/auto_install.sql rename to ext/search_kit/sql/auto_install.sql index 03d97ca2e8c2..3a4deb2b6630 100644 --- a/ext/search/sql/auto_install.sql +++ b/ext/search_kit/sql/auto_install.sql @@ -10,7 +10,6 @@ -- DO NOT EDIT. Generated by CRM_Core_CodeGen -- - -- +--------------------------------------------------------------------+ -- | Copyright CiviCRM LLC. All rights reserved. | -- | | @@ -24,7 +23,7 @@ -- -- /******************************************************* -- * --- * Clean up the exisiting tables +-- * Clean up the existing tables -- * -- *******************************************************/ @@ -54,16 +53,14 @@ CREATE TABLE `civicrm_search_display` ( `label` varchar(255) NOT NULL COMMENT 'Label for identifying search display to administrators', `saved_search_id` int unsigned NOT NULL COMMENT 'FK to saved search table.', `type` varchar(128) NOT NULL COMMENT 'Type of display', - `settings` text DEFAULT NULL COMMENT 'Configuration data for the search display' + `settings` text DEFAULT NULL COMMENT 'Configuration data for the search display' , PRIMARY KEY (`id`) - + , UNIQUE INDEX `UI_saved_search__id_name`( saved_search_id , name ) - -, CONSTRAINT FK_civicrm_search_display_saved_search_id FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE CASCADE -) ROW_FORMAT=DYNAMIC ; - +, CONSTRAINT FK_civicrm_search_display_saved_search_id FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE CASCADE +) ROW_FORMAT=DYNAMIC ; diff --git a/ext/search/sql/auto_uninstall.sql b/ext/search_kit/sql/auto_uninstall.sql similarity index 95% rename from ext/search/sql/auto_uninstall.sql rename to ext/search_kit/sql/auto_uninstall.sql index 7fc5f6b8f2ed..ff5a74dc51e7 100644 --- a/ext/search/sql/auto_uninstall.sql +++ b/ext/search_kit/sql/auto_uninstall.sql @@ -11,7 +11,7 @@ -- -- /******************************************************* -- * --- * Clean up the exisiting tables +-- * Clean up the existing tables -- * -- *******************************************************/ diff --git a/ext/search/templates/CRM/Search/Page/Admin.tpl b/ext/search_kit/templates/CRM/Search/Page/Admin.tpl similarity index 100% rename from ext/search/templates/CRM/Search/Page/Admin.tpl rename to ext/search_kit/templates/CRM/Search/Page/Admin.tpl diff --git a/ext/search/templates/CRM/Search/Page/Search.tpl b/ext/search_kit/templates/CRM/Search/Page/Search.tpl similarity index 100% rename from ext/search/templates/CRM/Search/Page/Search.tpl rename to ext/search_kit/templates/CRM/Search/Page/Search.tpl diff --git a/ext/search/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php b/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php similarity index 100% rename from ext/search/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php rename to ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php diff --git a/ext/search/tests/phpunit/bootstrap.php b/ext/search_kit/tests/phpunit/bootstrap.php similarity index 100% rename from ext/search/tests/phpunit/bootstrap.php rename to ext/search_kit/tests/phpunit/bootstrap.php diff --git a/ext/search/xml/Menu/search.xml b/ext/search_kit/xml/Menu/search_kit.xml similarity index 100% rename from ext/search/xml/Menu/search.xml rename to ext/search_kit/xml/Menu/search_kit.xml diff --git a/ext/search/xml/schema/CRM/Search/SearchDisplay.entityType.php b/ext/search_kit/xml/schema/CRM/Search/SearchDisplay.entityType.php similarity index 100% rename from ext/search/xml/schema/CRM/Search/SearchDisplay.entityType.php rename to ext/search_kit/xml/schema/CRM/Search/SearchDisplay.entityType.php diff --git a/ext/search/xml/schema/CRM/Search/SearchDisplay.xml b/ext/search_kit/xml/schema/CRM/Search/SearchDisplay.xml similarity index 100% rename from ext/search/xml/schema/CRM/Search/SearchDisplay.xml rename to ext/search_kit/xml/schema/CRM/Search/SearchDisplay.xml