diff --git a/docroot/profiles/lagunita/supress/config/sync/graphql_compose.settings.yml b/docroot/profiles/lagunita/supress/config/sync/graphql_compose.settings.yml index 8e69156c..0dbe4068 100644 --- a/docroot/profiles/lagunita/supress/config/sync/graphql_compose.settings.yml +++ b/docroot/profiles/lagunita/supress/config/sync/graphql_compose.settings.yml @@ -830,8 +830,6 @@ field_config: enabled: true sup_book_e_retailers: enabled: true - sup_book_excerpts: - enabled: true sup_book_image: enabled: true sup_book_imprint: diff --git a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_form_display.node.sup_book.default.yml b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_form_display.node.sup_book.default.yml index 1ca430af..5964ca7e 100644 --- a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_form_display.node.sup_book.default.yml +++ b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_form_display.node.sup_book.default.yml @@ -14,7 +14,6 @@ dependencies: - field.field.node.sup_book.sup_book_copublisher_name - field.field.node.sup_book.sup_book_digital_comp_link - field.field.node.sup_book.sup_book_e_retailers - - field.field.node.sup_book.sup_book_excerpts - field.field.node.sup_book.sup_book_image - field.field.node.sup_book.sup_book_imprint - field.field.node.sup_book.sup_book_isbn_13_alt @@ -47,7 +46,6 @@ dependencies: - datetime - field_group - inline_entity_form - - layout_paragraphs - link - media_library - metatag @@ -317,23 +315,6 @@ content: placeholder_url: '' placeholder_title: '' third_party_settings: { } - sup_book_excerpts: - type: layout_paragraphs - weight: 28 - region: content - settings: - view_mode: default - preview_view_mode: sup_form_preview - form_display_mode: default - nesting_depth: 0 - require_layouts: 1 - empty_message: '' - third_party_settings: - change_labels: - add_another: '' - field_label_overwrite: '' - hide_add_another: 0 - force_single_cardinality: 0 sup_book_image: type: media_library_widget weight: 3 diff --git a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.default.yml b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.default.yml index e828aff1..a569dd32 100644 --- a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.default.yml +++ b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.default.yml @@ -14,7 +14,6 @@ dependencies: - field.field.node.sup_book.sup_book_copublisher_name - field.field.node.sup_book.sup_book_digital_comp_link - field.field.node.sup_book.sup_book_e_retailers - - field.field.node.sup_book.sup_book_excerpts - field.field.node.sup_book.sup_book_image - field.field.node.sup_book.sup_book_imprint - field.field.node.sup_book.sup_book_isbn_13_alt @@ -44,7 +43,6 @@ dependencies: module: - datetime - empty_fields - - entity_reference_revisions - field_formatter_class - field_label - link @@ -154,15 +152,6 @@ content: third_party_settings: { } weight: 33 region: content - sup_book_excerpts: - type: entity_reference_revisions_entity_view - label: above - settings: - view_mode: default - link: '' - third_party_settings: { } - weight: 30 - region: content sup_book_image: type: media_thumbnail label: above diff --git a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.search_indexing.yml b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.search_indexing.yml index 2c80e2ba..7a22b216 100644 --- a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.search_indexing.yml +++ b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.search_indexing.yml @@ -15,7 +15,6 @@ dependencies: - field.field.node.sup_book.sup_book_copublisher_name - field.field.node.sup_book.sup_book_digital_comp_link - field.field.node.sup_book.sup_book_e_retailers - - field.field.node.sup_book.sup_book_excerpts - field.field.node.sup_book.sup_book_image - field.field.node.sup_book.sup_book_imprint - field.field.node.sup_book.sup_book_isbn_13_alt @@ -107,7 +106,6 @@ hidden: sup_book_copublisher_name: true sup_book_digital_comp_link: true sup_book_e_retailers: true - sup_book_excerpts: true sup_book_image: true sup_book_imprint: true sup_book_intl_cart: true diff --git a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.stanford_card.yml b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.stanford_card.yml index f4b1df39..a2c7cb2d 100644 --- a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.stanford_card.yml +++ b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.stanford_card.yml @@ -15,7 +15,6 @@ dependencies: - field.field.node.sup_book.sup_book_copublisher_name - field.field.node.sup_book.sup_book_digital_comp_link - field.field.node.sup_book.sup_book_e_retailers - - field.field.node.sup_book.sup_book_excerpts - field.field.node.sup_book.sup_book_image - field.field.node.sup_book.sup_book_imprint - field.field.node.sup_book.sup_book_isbn_13_alt @@ -138,7 +137,6 @@ hidden: sup_book_copublisher_name: true sup_book_digital_comp_link: true sup_book_e_retailers: true - sup_book_excerpts: true sup_book_imprint: true sup_book_intl_cart: true sup_book_isbn_13_alt: true diff --git a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.stanford_h3_card.yml b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.stanford_h3_card.yml index 106553a9..9573004b 100644 --- a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.stanford_h3_card.yml +++ b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.stanford_h3_card.yml @@ -15,7 +15,6 @@ dependencies: - field.field.node.sup_book.sup_book_copublisher_name - field.field.node.sup_book.sup_book_digital_comp_link - field.field.node.sup_book.sup_book_e_retailers - - field.field.node.sup_book.sup_book_excerpts - field.field.node.sup_book.sup_book_image - field.field.node.sup_book.sup_book_imprint - field.field.node.sup_book.sup_book_isbn_13_alt @@ -137,7 +136,6 @@ hidden: sup_book_copublisher_name: true sup_book_digital_comp_link: true sup_book_e_retailers: true - sup_book_excerpts: true sup_book_imprint: true sup_book_intl_cart: true sup_book_isbn_13_alt: true diff --git a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.teaser.yml b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.teaser.yml index 7a9fca6f..5351ea7e 100644 --- a/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.teaser.yml +++ b/docroot/profiles/lagunita/supress/config/sync/split/supress/core.entity_view_display.node.sup_book.teaser.yml @@ -15,7 +15,6 @@ dependencies: - field.field.node.sup_book.sup_book_copublisher_name - field.field.node.sup_book.sup_book_digital_comp_link - field.field.node.sup_book.sup_book_e_retailers - - field.field.node.sup_book.sup_book_excerpts - field.field.node.sup_book.sup_book_image - field.field.node.sup_book.sup_book_imprint - field.field.node.sup_book.sup_book_isbn_13_alt @@ -124,7 +123,6 @@ hidden: sup_book_copublisher_name: true sup_book_digital_comp_link: true sup_book_e_retailers: true - sup_book_excerpts: true sup_book_imprint: true sup_book_intl_cart: true sup_book_isbn_13_alt: true diff --git a/docroot/profiles/lagunita/supress/config/sync/split/supress/field.field.node.sup_book.sup_book_excerpts.yml b/docroot/profiles/lagunita/supress/config/sync/split/supress/field.field.node.sup_book.sup_book_excerpts.yml deleted file mode 100644 index e46c9ed7..00000000 --- a/docroot/profiles/lagunita/supress/config/sync/split/supress/field.field.node.sup_book.sup_book_excerpts.yml +++ /dev/null @@ -1,98 +0,0 @@ -uuid: 59689e97-c7ac-4cd7-8449-2dda2e98fc07 -langcode: en -status: true -dependencies: - config: - - field.storage.node.sup_book_excerpts - - node.type.sup_book - - paragraphs.paragraphs_type.stanford_card - - paragraphs.paragraphs_type.stanford_gallery - - paragraphs.paragraphs_type.stanford_layout - - paragraphs.paragraphs_type.stanford_spacer - - paragraphs.paragraphs_type.stanford_wysiwyg - - paragraphs.paragraphs_type.sup_file_list - module: - - entity_reference_revisions -id: node.sup_book.sup_book_excerpts -field_name: sup_book_excerpts -entity_type: node -bundle: sup_book -label: 'Excerpts and More' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:paragraph' - handler_settings: - target_bundles: - stanford_card: stanford_card - stanford_gallery: stanford_gallery - stanford_layout: stanford_layout - stanford_spacer: stanford_spacer - stanford_wysiwyg: stanford_wysiwyg - sup_file_list: sup_file_list - negate: 0 - target_bundles_drag_drop: - stanford_accordion: - weight: 21 - enabled: false - stanford_banner: - weight: 22 - enabled: false - stanford_card: - weight: 23 - enabled: true - stanford_entity: - weight: 24 - enabled: false - stanford_gallery: - weight: 25 - enabled: true - stanford_layout: - weight: 26 - enabled: true - stanford_lists: - weight: 27 - enabled: false - stanford_media_caption: - weight: 28 - enabled: false - stanford_page_title_banner: - weight: 29 - enabled: false - stanford_person_cta: - weight: 30 - enabled: false - stanford_schedule: - weight: 31 - enabled: false - stanford_spacer: - weight: 32 - enabled: true - stanford_wysiwyg: - weight: 33 - enabled: true - sup_author_list: - weight: 34 - enabled: false - sup_blog: - weight: 35 - enabled: false - sup_blog_teaser: - weight: 36 - enabled: false - sup_carousel: - weight: 37 - enabled: false - sup_carousel_slide: - weight: 38 - enabled: false - sup_file_list: - weight: 39 - enabled: true - sup_search_form: - weight: 40 - enabled: false -field_type: entity_reference_revisions diff --git a/docroot/profiles/lagunita/supress/config/sync/split/supress/field.storage.node.sup_book_excerpts.yml b/docroot/profiles/lagunita/supress/config/sync/split/supress/field.storage.node.sup_book_excerpts.yml deleted file mode 100644 index 2e282784..00000000 --- a/docroot/profiles/lagunita/supress/config/sync/split/supress/field.storage.node.sup_book_excerpts.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 7f838f0b-a7b5-45b7-8a66-d6501f08ba7d -langcode: en -status: true -dependencies: - module: - - entity_reference_revisions - - node - - paragraphs -id: node.sup_book_excerpts -field_name: sup_book_excerpts -entity_type: node -type: entity_reference_revisions -settings: - target_type: paragraph -module: entity_reference_revisions -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/docroot/profiles/lagunita/supress/modules/supress_helper/src/Entity/PressEntityType.php b/docroot/profiles/lagunita/supress/modules/supress_helper/src/Entity/PressEntityType.php index 8c53db30..a765a29c 100644 --- a/docroot/profiles/lagunita/supress/modules/supress_helper/src/Entity/PressEntityType.php +++ b/docroot/profiles/lagunita/supress/modules/supress_helper/src/Entity/PressEntityType.php @@ -47,6 +47,7 @@ * config_export = { * "id", * "label", + * "description", * "uuid", * }, * ) @@ -63,4 +64,18 @@ final class PressEntityType extends ConfigEntityBundleBase { */ protected string $label; + /** + * A brief description of this entity type. + * + * @var string|null + */ + protected $description = NULL; + + /** + * {@inheritdoc} + */ + public function getDescription() { + return $this->description ?? ''; + } + } diff --git a/docroot/profiles/lagunita/supress/modules/supress_helper/src/EventSubscriber/SuPressEventSubscriber.php b/docroot/profiles/lagunita/supress/modules/supress_helper/src/EventSubscriber/SuPressEventSubscriber.php index d148520e..fa54bcea 100644 --- a/docroot/profiles/lagunita/supress/modules/supress_helper/src/EventSubscriber/SuPressEventSubscriber.php +++ b/docroot/profiles/lagunita/supress/modules/supress_helper/src/EventSubscriber/SuPressEventSubscriber.php @@ -9,8 +9,6 @@ use Drupal\core_event_dispatcher\Event\Entity\EntityCreateEvent; use Drupal\media\MediaInterface; use Drupal\migrate\Plugin\MigrationPluginManagerInterface; -use Drupal\next\Event\EntityActionEvent; -use Drupal\next\Event\EntityEvents; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** @@ -27,25 +25,7 @@ public function __construct(protected readonly EntityTypeManagerInterface $entit * {@inheritdoc} */ public static function getSubscribedEvents(): array { - return [ - EntityEvents::ENTITY_ACTION => ['onNextEntityAction', 10], - EntityHookEvents::ENTITY_CREATE => ['onEntityCreate'], - ]; - } - - /** - * Change the entity url if the entity is a price object. - * - * @param \Drupal\next\Event\EntityActionEvent $event - * Next entity event. - */ - public function onNextEntityAction(EntityActionEvent $event) { - $entity = $event->getEntity(); - if ($entity->getEntityTypeId() == 'press') { - $bundle = $entity->bundle(); - $uuid = $entity->uuid(); - $event->setEntityUrl("/tags/$bundle:$uuid"); - } + return [EntityHookEvents::ENTITY_CREATE => ['onEntityCreate']]; } /** diff --git a/docroot/profiles/lagunita/supress/modules/supress_helper/src/Form/PressEntityTypeForm.php b/docroot/profiles/lagunita/supress/modules/supress_helper/src/Form/PressEntityTypeForm.php index 607adf6e..2fbbe0c5 100644 --- a/docroot/profiles/lagunita/supress/modules/supress_helper/src/Form/PressEntityTypeForm.php +++ b/docroot/profiles/lagunita/supress/modules/supress_helper/src/Form/PressEntityTypeForm.php @@ -45,6 +45,12 @@ public function form(array $form, FormStateInterface $form_state): array { '#description' => $this->t('A unique machine-readable name for this press entity type. It must only contain lowercase letters, numbers, and underscores.'), ]; + $form['description'] = [ + '#title' => $this->t('Description'), + '#type' => 'textarea', + '#default_value' => $this->entity->getDescription(), + ]; + return $this->protectBundleIdElement($form); } diff --git a/docroot/profiles/lagunita/supress/modules/supress_helper/supress_helper.install b/docroot/profiles/lagunita/supress/modules/supress_helper/supress_helper.install index d50e7e0a..86f04635 100644 --- a/docroot/profiles/lagunita/supress/modules/supress_helper/supress_helper.install +++ b/docroot/profiles/lagunita/supress/modules/supress_helper/supress_helper.install @@ -106,3 +106,28 @@ function supress_helper_update_9007() { $press_entity = \Drupal::entityTypeManager()->getDefinition('press'); \Drupal::entityDefinitionUpdateManager()->installEntityType($press_entity); } + +/** + * Create new next entity configs. + */ +function supress_helper_update_9008() { + $next_storage = \Drupal::entityTypeManager() + ->getStorage('next_entity_type_config'); + /** @var \Drupal\next\Entity\NextEntityTypeConfigInterface $entity */ + $entity = $next_storage->create([ + 'id' => 'press.prices', + ]); + $entity->setSiteResolver('site_selector') + ->setSiteResolverConfiguration('site_selector', ['sites' => ['vercel' => 'vercel']]) + ->setRevalidator('path') + ->setRevalidatorConfiguration('path', ['additional_paths' => '/tags/prices:[press:uuid]']) + ->save(); + + if ($entity = $next_storage->load('node.sup_book_ancillary')) { + $entity->setRevalidatorConfiguration('path', [ + 'revalidate_page' => TRUE, + 'additional_paths' => '/tags/excerpts:[node:sup_ancillary_book:entity:uuid]', + ]) + ->save(); + } +} diff --git a/docroot/profiles/lagunita/supress/modules/supress_helper/tests/src/Unit/EventSubscriber/SuPressEventSubscriberTest.php b/docroot/profiles/lagunita/supress/modules/supress_helper/tests/src/Unit/EventSubscriber/SuPressEventSubscriberTest.php index c0dbca1b..a82273c1 100644 --- a/docroot/profiles/lagunita/supress/modules/supress_helper/tests/src/Unit/EventSubscriber/SuPressEventSubscriberTest.php +++ b/docroot/profiles/lagunita/supress/modules/supress_helper/tests/src/Unit/EventSubscriber/SuPressEventSubscriberTest.php @@ -38,16 +38,6 @@ protected function setUp(): void { $this->eventSubscriber = new SuPressEventSubscriber($entity_type_manager, $migration_manager); } - public function testNextEntityAction() { - $entity = $this->createMock(ContentEntityInterface::class); - $entity->method('getEntityTypeId')->willReturn('press'); - $entity->method('uuid')->willReturn('foobarbaz'); - $entity->method('bundle')->willReturn('foo'); - $event = new EntityActionEvent($entity, 'action', [], ''); - $this->eventSubscriber->onNextEntityAction($event); - $this->assertEquals('/tags/foo:foobarbaz', $event->getEntityUrl()); - } - public function testEntityInsertEvent() { $fieldItem = $this->createMock(FieldItemListInterface::class); $fieldItem->method('count')->willReturn(1);