diff --git a/config/default/config_pages.type.news_rss.yml b/config/default/config_pages.type.news_rss.yml deleted file mode 100644 index 449b46d0af..0000000000 --- a/config/default/config_pages.type.news_rss.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 533ca6fd-f669-4bd6-9bc1-437829f523ca -langcode: en -status: true -dependencies: { } -id: news_rss -label: 'News RSS' -token: false -context: - show_warning: true - group: - language: false - fallback: - language: '' -menu: - path: /admin/structure/migrate/news-rss - weight: 0 - description: '' diff --git a/config/default/core.entity_form_display.config_pages.news_rss.default.yml b/config/default/core.entity_form_display.config_pages.news_rss.default.yml deleted file mode 100644 index e48dc02458..0000000000 --- a/config/default/core.entity_form_display.config_pages.news_rss.default.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: ae375907-b001-456a-9e01-fb1f59777bb5 -langcode: en -status: true -dependencies: - config: - - config_pages.type.news_rss - - field.field.config_pages.news_rss.field_news_rss - module: - - inline_entity_form -id: config_pages.news_rss.default -targetEntityType: config_pages -bundle: news_rss -mode: default -content: - field_news_rss: - type: inline_entity_form_simple - weight: 0 - region: content - settings: - form_mode: default - override_labels: true - label_singular: Importer - label_plural: Importers - collapsible: false - collapsed: false - revision: false - third_party_settings: { } -hidden: - label: true diff --git a/config/default/core.entity_view_display.config_pages.news_rss.default.yml b/config/default/core.entity_view_display.config_pages.news_rss.default.yml deleted file mode 100644 index 497e434127..0000000000 --- a/config/default/core.entity_view_display.config_pages.news_rss.default.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 0a56339c-51cb-4e43-bae7-30dca5341947 -langcode: en -status: true -dependencies: - config: - - config_pages.type.news_rss - - field.field.config_pages.news_rss.field_news_rss -id: config_pages.news_rss.default -targetEntityType: config_pages -bundle: news_rss -mode: default -content: - field_news_rss: - type: entity_reference_label - label: above - settings: - link: true - third_party_settings: { } - weight: 0 - region: content -hidden: - search_api_excerpt: true diff --git a/config/default/field.field.config_pages.news_rss.field_news_rss.yml b/config/default/field.field.config_pages.news_rss.field_news_rss.yml deleted file mode 100644 index 8f7f38f411..0000000000 --- a/config/default/field.field.config_pages.news_rss.field_news_rss.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: f6ec0234-0001-40dd-89a1-613bcd54608b -langcode: en -status: true -dependencies: - config: - - config_pages.type.news_rss - - field.storage.config_pages.field_news_rss - - hs_entities.hs_entity_type.news_rss -id: config_pages.news_rss.field_news_rss -field_name: field_news_rss -entity_type: config_pages -bundle: news_rss -label: 'News RSS' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: 'default:hs_entity' - handler_settings: - target_bundles: - news_rss: news_rss -field_type: entity_reference diff --git a/config/default/field.storage.config_pages.field_news_rss.yml b/config/default/field.storage.config_pages.field_news_rss.yml deleted file mode 100644 index cc9e8f5f11..0000000000 --- a/config/default/field.storage.config_pages.field_news_rss.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 57e70cdd-9ad7-49bc-9bd2-a049799f1a1e -langcode: en -status: true -dependencies: - module: - - config_pages - - hs_entities -id: config_pages.field_news_rss -field_name: field_news_rss -entity_type: config_pages -type: entity_reference -settings: - target_type: hs_entity -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/docroot/modules/humsci/hs_migrate/hs_migrate.services.yml b/docroot/modules/humsci/hs_migrate/hs_migrate.services.yml index 5e189499ce..905278f485 100644 --- a/docroot/modules/humsci/hs_migrate/hs_migrate.services.yml +++ b/docroot/modules/humsci/hs_migrate/hs_migrate.services.yml @@ -4,8 +4,3 @@ services: arguments: ['@entity_type.manager'] tags: - { name: 'event_subscriber' } - hs_migrate.migration_overrider: - class: Drupal\hs_migrate\Overrides\MigrationOverrides - arguments: ['@config_pages.loader', '@entity_type.manager'] - tags: - - {name: config.factory.override, priority: 5} diff --git a/docroot/modules/humsci/hs_migrate/src/EventSubscriber/ConfigEventsSubscriber.php b/docroot/modules/humsci/hs_migrate/src/EventSubscriber/ConfigEventsSubscriber.php index d861c03d18..dfe5e7e8f9 100644 --- a/docroot/modules/humsci/hs_migrate/src/EventSubscriber/ConfigEventsSubscriber.php +++ b/docroot/modules/humsci/hs_migrate/src/EventSubscriber/ConfigEventsSubscriber.php @@ -51,8 +51,6 @@ public function onConfigImport(ConfigImporterEvent $event) { } $urls = [ 'field_news_xml' => $this->getConfigPageValue('hs_migrate_news', 'field_news_xml_feed'), - 'field_people_xml' => $this->getConfigPageValue('d7_people', 'field_d7_people_xml_url'), - 'field_publications_xml' => $this->getConfigPageValue('publications', 'field_xml_url'), ]; $urls = array_filter($urls); @@ -65,15 +63,13 @@ public function onConfigImport(ConfigImporterEvent $event) { $field_storage = $this->entityTypeManager->getStorage('field_config'); $fields = [ 'config_pages.hs_migrate_news.field_news_xml_feed', - 'config_pages.d7_people.field_d7_people_xml_url', - 'config_pages.publications.field_xml_url', ]; foreach ($field_storage->loadMultiple($fields) as $field) { $field->delete(); } $page_storage = $this->entityTypeManager->getStorage('config_pages_type'); - $pages = ['hs_migrate_news', 'd7_people', 'publications']; + $pages = ['hs_migrate_news']; foreach ($page_storage->loadMultiple($pages) as $page) { $page->delete(); } diff --git a/docroot/modules/humsci/hs_migrate/src/Overrides/MigrationOverrides.php b/docroot/modules/humsci/hs_migrate/src/Overrides/MigrationOverrides.php deleted file mode 100644 index 7a637818e8..0000000000 --- a/docroot/modules/humsci/hs_migrate/src/Overrides/MigrationOverrides.php +++ /dev/null @@ -1,89 +0,0 @@ -configPagesLoader = $config_pages_loader; - $this->entityTypeManager = $entity_type_manager; - } - - /** - * {@inheritdoc} - */ - public function loadOverrides($names) { - $overrides = []; - if (in_array('migrate_plus.migration.hs_news_rss', $names) && $this->entityTypeManager->hasDefinition('hs_entity')) { - - $urls = []; - $entity_ids = $this->configPagesLoader->getValue('news_rss', 'field_news_rss', [], 'target_id'); - - if ($entity_ids) { - $news_entities = $this->entityTypeManager->getStorage('hs_entity') - ->loadMultiple($entity_ids); - foreach ($news_entities as $entity) { - if ($entity->hasField('field_url')) { - $urls[] = $entity->get('field_url')->getString(); - } - } - } - $overrides['migrate_plus.migration.hs_news_rss']['status'] = !empty($urls); - $overrides['migrate_plus.migration.hs_news_rss']['source']['urls'] = $urls; - } - return $overrides; - } - - /** - * {@inheritdoc} - */ - public function createConfigObject($name, $collection = StorageInterface::DEFAULT_COLLECTION) { - return NULL; - } - - /** - * {@inheritdoc} - */ - public function getCacheableMetadata($name) { - return new CacheableMetadata(); - } - - /** - * {@inheritdoc} - */ - public function getCacheSuffix() { - return 'MigrationImporterOverrides'; - } - -}