Remove core search from the Dxpr CMS recipe

dxpr · Aug 27, 2024 · e41ba5b · e41ba5b
1 parent ebbd273
commit e41ba5b
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 19 deletions.
diff --git a/.ddev/commands/host/rebuild b/.ddev/commands/host/rebuild
@@ -6,5 +6,5 @@
 
 ddev stop
 ddev delete --omit-snapshot --yes
-rm -r -f vendor $DDEV_DOCROOT composer.*
+rm -r -f vendor $DDEV_DOCROOT composer.* project_template/patches.lock.json
 ddev start
diff --git a/dxpr_cms_base/config/user.role.content_administrator.yml b/dxpr_cms_base/config/user.role.content_administrator.yml
@@ -54,7 +54,6 @@ permissions:
   - 'revert blog revisions'
   - 'revert page revisions'
   - 'update media'
-  - 'use advanced search'
   - 'use editorial transition archive'
   - 'use editorial transition archived_draft'
   - 'use editorial transition archived_published'

diff --git a/dxpr_cms_base/config/user.role.content_editor.yml b/dxpr_cms_base/config/user.role.content_editor.yml
@@ -50,7 +50,6 @@ permissions:
   - 'revert blog revisions'
   - 'revert page revisions'
   - 'update media'
-  - 'use advanced search'
   - 'use editorial transition archive'
   - 'use editorial transition archived_draft'
   - 'use editorial transition archived_published'

diff --git a/dxpr_cms_base/config/user.role.marketer.yml b/dxpr_cms_base/config/user.role.marketer.yml
@@ -50,7 +50,6 @@ permissions:
   - 'revert blog revisions'
   - 'revert page revisions'
   - 'update media'
-  - 'use advanced search'
   - 'use editorial transition archive'
   - 'use editorial transition archived_draft'
   - 'use editorial transition archived_published'

diff --git a/dxpr_cms_base/config/user.role.site_bui.yml b/dxpr_cms_base/config/user.role.site_bui.yml
@@ -79,7 +79,6 @@ permissions:
   - 'revert page revisions'
   - 'select account cancellation method'
   - 'update media'
-  - 'use advanced search'
   - 'use editorial transition archive'
   - 'use editorial transition archived_draft'
   - 'use editorial transition archived_published'

diff --git a/dxpr_cms_base/recipe.yml b/dxpr_cms_base/recipe.yml
@@ -3,7 +3,6 @@ description: 'Applies all the DXPR CMS recipes.'
 type: Site
 recipes:
   - core/recipes/basic_block_type
-  - core/recipes/content_search
   - core/recipes/core_recommended_performance
   - dxpr_cms_admin_theme
   - core/recipes/core_recommended_front_end_theme
@@ -58,8 +57,6 @@ install:
   - views_ui
 config:
   import:
-    help:
-      - search.page.help_search
     image:
       - image.style.large
       - image.style.thumbnail
@@ -74,7 +71,6 @@ config:
       - shortcut.set.default
     user:
       - core.entity_view_mode.user.compact
-      - search.page.user_search
       - views.view.user_admin_people
       - views.view.who_s_new
       - views.view.who_s_online
@@ -127,12 +123,10 @@ config:
         - 'access shortcuts'
         - 'access user profiles'
         - 'delete own files'
-        - 'use advanced search'
         - 'view own unpublished content'
     user.role.anonymous:
       grantPermissions:
         - 'access content'
-        - 'use advanced search'
     user.settings:
       simple_config_update:
         verify_mail: true

diff --git a/dxpr_cms_locations/composer.json b/dxpr_cms_locations/composer.json
@@ -8,7 +8,7 @@
         "drupal/core": ">=10.3",
         "drupal/geocoder": "^4.10",
         "drupal/geofield": "^1.47",
-        "drupal/leaflet": "^10.2.24",
+        "drupal/leaflet": "^10.2.25",
         "drupal/metatag": "^2.0",
         "drupal/pathauto": "^1.13",
         "geocoder-php/nominatim-provider": "^5.7"

diff --git a/dxpr_cms_patches/composer.json b/dxpr_cms_patches/composer.json
@@ -7,9 +7,6 @@
         "cweagans/composer-patches": "^2",
         "drupal/core": "^10.3"
     },
-    "conflict": {
-        "drupal/leaflet": "<10.2.24"
-    },
     "extra": {
         "patches": {
             "drupal/core": {
@@ -18,10 +15,8 @@
                 "#3303127: Determine which core config entity methods should be config actions": "https://www.drupal.org/files/issues/2024-08-09/core-7940.patch",
                 "Ensure core recipes that affect user roles also install the User module": "https://www.drupal.org/files/issues/2024-08-09/core-recipes-user-import.patch",
                 "#3416357: Convert QueueFactory to use a service locator": "https://www.drupal.org/files/issues/2024-08-09/3416357-10.3.x-only.patch",
-                "Allow the command-line installer to auto-select distributions": "https://www.drupal.org/files/issues/2024-08-12/core-install-command-allow-distributions.patch"
-            },
-            "drupal/leaflet": {
-                "#3469226 Remove unnecessary weight key from settings": "https://www.drupal.org/files/issues/2024-08-20/leaflet-remove_weight_key-3469226-3.patch"
+                "Allow the command-line installer to auto-select distributions": "https://www.drupal.org/files/issues/2024-08-12/core-install-command-allow-distributions.patch",
+                "#3467262: Create menu item parent for a default tab": "https://www.drupal.org/files/issues/2024-08-23/core-default_tab_parent_menu-3467262-6.patch"
             },
             "drupal/advagg": {
                 "#3375725: Deprecated function: Creation of dynamic property": "https://git.drupalcode.org/project/advagg/-/merge_requests/36/diffs.patch"