From b41fc36c322e6a4034c2f28863dd4a7ec3a7ce4c Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Mon, 8 Jan 2018 13:31:09 +0200 Subject: [PATCH 01/16] ISAICP-4211: Approve RDF entity PR#10. --- composer.json | 5 +--- composer.lock | 65 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 50 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index cfd323ba20..024946bf6d 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "drupal/piwik": "~1.0", "drupal/piwik_reporting_api": "^1.0-beta2", "drupal/r4032login": "dev-1.x#391f10d69b9b8c466a2fddac2a6b99f1289e7781", - "drupal/rdf_entity": "dev-pathauto-support", + "drupal/rdf_entity": "^1.0-alpha3", "drupal/redirect": "^1.0", "drupal/redis": "^1.0@RC", "drupal/search_api": "~1.5", @@ -209,9 +209,6 @@ }, "drupal/video_embed_field": { "Allow also YouTube embed URLs. Improve the YT regexp @see https://www.drupal.org/node/2899093": "https://www.drupal.org/files/issues/2899093-8.patch" - }, - "drupal/rdf_entity": { - "Allow created date to be visible in the form. @see https://github.com/ec-europa/rdf_entity/pull/10": "https://patch-diff.githubusercontent.com/raw/ec-europa/rdf_entity/pull/10.patch" } } }, diff --git a/composer.lock b/composer.lock index 5008d33432..f90a2bca30 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "749eb19f3c3bf21425dba45edf565ad3", + "content-hash": "9c0cdd834981247d25c472647160549e", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -4256,41 +4256,75 @@ }, { "name": "drupal/rdf_entity", - "version": "dev-pathauto-support", + "version": "1.0.0-alpha3", "source": { "type": "git", - "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "2cfd3d48dda7aeead5f48608e51b0a2c5e3ab0d7" + "url": "https://git.drupal.org/project/rdf_entity", + "reference": "8.x-1.0-alpha3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/2cfd3d48dda7aeead5f48608e51b0a2c5e3ab0d7", - "reference": "2cfd3d48dda7aeead5f48608e51b0a2c5e3ab0d7", - "shasum": "" + "url": "https://ftp.drupal.org/files/projects/rdf_entity-8.x-1.0-alpha3.zip", + "reference": "8.x-1.0-alpha3", + "shasum": "8d39089aad9d5526795abf39a83fe4f940c17c68" }, "require": { - "easyrdf/easyrdf": "0.10.0-alpha.1 as 0.9.2", - "php": ">=7.1" + "drupal/core": "*", + "easyrdf/easyrdf": "0.10.0-alpha.1 as 0.9.2" }, "require-dev": { "minimaxir/big-list-of-naughty-strings": "dev-master" }, "type": "drupal-module", "extra": { - "patches_applied": { - "Allow created date to be visible in the form. @see https://github.com/ec-europa/rdf_entity/pull/10": "https://patch-diff.githubusercontent.com/raw/ec-europa/rdf_entity/pull/10.patch" + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.0-alpha3", + "datestamp": "1504697043", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } } }, + "notification-url": "https://packages.drupal.org/8/downloads", "license": [ "GPL-2.0+" ], + "authors": [ + { + "name": "claudiu.cristea", + "homepage": "https://www.drupal.org/user/56348" + }, + { + "name": "dublutz", + "homepage": "https://www.drupal.org/user/980246" + }, + { + "name": "idimopoulos", + "homepage": "https://www.drupal.org/user/2578708" + }, + { + "name": "pfrenssen", + "homepage": "https://www.drupal.org/user/382067" + }, + { + "name": "sandervd", + "homepage": "https://www.drupal.org/user/346775" + }, + { + "name": "sardara", + "homepage": "https://www.drupal.org/user/2353864" + } + ], "description": "This module allows you to leverage the semantic web by storing and retrieving content directly from an RDF data store using the SPARQL RDF query language.", "homepage": "https://drupal.org/project/rdf_entity", "support": { - "issues": "https://drupal.org/project/issues/rdf_entity", - "source": "https://cgit.drupalcode.org/rdf_entity" - }, - "time": "2017-10-12T12:15:24+00:00" + "source": "https://cgit.drupalcode.org/rdf_entity", + "issues": "https://drupal.org/project/issues/rdf_entity" + } }, { "name": "drupal/redirect", @@ -12271,7 +12305,6 @@ "drupal/persistent_login": 20, "drupal/phingdrushtask": 20, "drupal/r4032login": 20, - "drupal/rdf_entity": 20, "drupal/redis": 5, "drupal/subpathauto": 10, "drupal/swiftmailer": 10, From f13ec509ca45bcf23be8f21b474e8babdf1ff2ca Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Mon, 8 Jan 2018 15:55:12 +0200 Subject: [PATCH 02/16] ISAICP-4211: Use a RDF entity project dedicated branch. --- composer.json | 2 +- composer.lock | 66 +++++++++++---------------------------------------- 2 files changed, 15 insertions(+), 53 deletions(-) diff --git a/composer.json b/composer.json index 024946bf6d..609ae84c64 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "drupal/piwik": "~1.0", "drupal/piwik_reporting_api": "^1.0-beta2", "drupal/r4032login": "dev-1.x#391f10d69b9b8c466a2fddac2a6b99f1289e7781", - "drupal/rdf_entity": "^1.0-alpha3", + "drupal/rdf_entity": "dev-graph-refactor", "drupal/redirect": "^1.0", "drupal/redis": "^1.0@RC", "drupal/search_api": "~1.5", diff --git a/composer.lock b/composer.lock index f90a2bca30..d8273068d2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "9c0cdd834981247d25c472647160549e", + "content-hash": "461f74904eaf63336bbe8c339e0734eb", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -4256,75 +4256,36 @@ }, { "name": "drupal/rdf_entity", - "version": "1.0.0-alpha3", + "version": "dev-graph-refactor", "source": { "type": "git", - "url": "https://git.drupal.org/project/rdf_entity", - "reference": "8.x-1.0-alpha3" + "url": "https://github.com/ec-europa/rdf_entity.git", + "reference": "26ea02a3a1408abe4136211207156b81511e9f63" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/rdf_entity-8.x-1.0-alpha3.zip", - "reference": "8.x-1.0-alpha3", - "shasum": "8d39089aad9d5526795abf39a83fe4f940c17c68" + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/26ea02a3a1408abe4136211207156b81511e9f63", + "reference": "26ea02a3a1408abe4136211207156b81511e9f63", + "shasum": "" }, "require": { - "drupal/core": "*", - "easyrdf/easyrdf": "0.10.0-alpha.1 as 0.9.2" + "easyrdf/easyrdf": "0.10.0-alpha.1 as 0.9.2", + "php": ">=7.1" }, "require-dev": { "minimaxir/big-list-of-naughty-strings": "dev-master" }, "type": "drupal-module", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, - "drupal": { - "version": "8.x-1.0-alpha3", - "datestamp": "1504697043", - "security-coverage": { - "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", "license": [ "GPL-2.0+" ], - "authors": [ - { - "name": "claudiu.cristea", - "homepage": "https://www.drupal.org/user/56348" - }, - { - "name": "dublutz", - "homepage": "https://www.drupal.org/user/980246" - }, - { - "name": "idimopoulos", - "homepage": "https://www.drupal.org/user/2578708" - }, - { - "name": "pfrenssen", - "homepage": "https://www.drupal.org/user/382067" - }, - { - "name": "sandervd", - "homepage": "https://www.drupal.org/user/346775" - }, - { - "name": "sardara", - "homepage": "https://www.drupal.org/user/2353864" - } - ], "description": "This module allows you to leverage the semantic web by storing and retrieving content directly from an RDF data store using the SPARQL RDF query language.", "homepage": "https://drupal.org/project/rdf_entity", "support": { - "source": "https://cgit.drupalcode.org/rdf_entity", - "issues": "https://drupal.org/project/issues/rdf_entity" - } + "issues": "https://drupal.org/project/issues/rdf_entity", + "source": "https://cgit.drupalcode.org/rdf_entity" + }, + "time": "2018-01-08T11:21:13+00:00" }, { "name": "drupal/redirect", @@ -12305,6 +12266,7 @@ "drupal/persistent_login": 20, "drupal/phingdrushtask": 20, "drupal/r4032login": 20, + "drupal/rdf_entity": 20, "drupal/redis": 5, "drupal/subpathauto": 10, "drupal/swiftmailer": 10, From 98d49477e84167d6d5937d836abd9252f358831a Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Tue, 9 Jan 2018 21:56:40 +0200 Subject: [PATCH 03/16] ISAICP-4211: Move mapping config from bundle 3rd party settings to dedicated config entities. --- .../asset_distribution.info.yml | 1 + ....mapping.rdf_entity.asset_distribution.yml | 69 ++++++++++++++++++ ...df_entity.rdfentity.asset_distribution.yml | 65 +---------------- .../asset_release/asset_release.info.yml | 1 + ...ntity.mapping.rdf_entity.asset_release.yml | 69 ++++++++++++++++++ .../rdf_entity.rdfentity.asset_release.yml | 65 +---------------- .../custom/collection/collection.info.yml | 1 + ...f_entity.mapping.rdf_entity.collection.yml | 73 +++++++++++++++++++ .../rdf_entity.rdfentity.collection.yml | 69 +----------------- ...mapping.rdf_entity.contact_information.yml | 33 +++++++++ ...f_entity.rdfentity.contact_information.yml | 29 +------- .../contact_information.info.yml | 1 + ...rdf_entity.mapping.taxonomy_term.actor.yml | 53 ++++++++++++++ ...mapping.taxonomy_term.business_process.yml | 56 ++++++++++++++ .../rdf_entity.mapping.taxonomy_term.eira.yml | 53 ++++++++++++++ ...f_entity.mapping.taxonomy_term.eurovoc.yml | 53 ++++++++++++++ ...entity.mapping.taxonomy_term.file_type.yml | 53 ++++++++++++++ ..._entity.mapping.taxonomy_term.language.yml | 53 ++++++++++++++ ...ity.mapping.taxonomy_term.licence_type.yml | 53 ++++++++++++++ ...ntity.mapping.taxonomy_term.owner_type.yml | 53 ++++++++++++++ ...ty.mapping.taxonomy_term.policy_domain.yml | 54 ++++++++++++++ ...ity.mapping.taxonomy_term.product_type.yml | 53 ++++++++++++++ ...taxonomy_term.representation_technique.yml | 53 ++++++++++++++ ...apping.taxonomy_term.solution_category.yml | 53 ++++++++++++++ ...f_entity.mapping.taxonomy_term.spatial.yml | 53 ++++++++++++++ ...ng.taxonomy_term.standardization_level.yml | 53 ++++++++++++++ ...df_entity.mapping.taxonomy_term.status.yml | 53 ++++++++++++++ ...pping.taxonomy_term.test_resource_type.yml | 53 ++++++++++++++ ...df_entity.mapping.taxonomy_term.themes.yml | 53 ++++++++++++++ .../install/taxonomy.vocabulary.actor.yml | 49 +------------ .../taxonomy.vocabulary.business_process.yml | 52 +------------ .../install/taxonomy.vocabulary.eira.yml | 49 +------------ .../install/taxonomy.vocabulary.eurovoc.yml | 49 +------------ .../install/taxonomy.vocabulary.file_type.yml | 49 +------------ .../install/taxonomy.vocabulary.language.yml | 49 +------------ .../taxonomy.vocabulary.licence_type.yml | 49 +------------ .../taxonomy.vocabulary.owner_type.yml | 49 +------------ .../taxonomy.vocabulary.policy_domain.yml | 48 ------------ .../taxonomy.vocabulary.product_type.yml | 51 +------------ ...my.vocabulary.representation_technique.yml | 49 +------------ .../taxonomy.vocabulary.solution_category.yml | 51 +------------ .../install/taxonomy.vocabulary.spatial.yml | 49 +------------ ...onomy.vocabulary.standardization_level.yml | 49 +------------ .../install/taxonomy.vocabulary.status.yml | 49 +------------ ...taxonomy.vocabulary.test_resource_type.yml | 51 +------------ .../install/taxonomy.vocabulary.themes.yml | 49 +------------ .../custom/joinup_core/joinup_core.info.yml | 23 +++++- ...rdf_entity.mapping.rdf_entity.file_url.yml | 33 +++++++++ .../install/rdf_entity.rdfentity.file_url.yml | 29 +------- .../rdf_entity.mapping.rdf_entity.licence.yml | 53 ++++++++++++++ .../install/rdf_entity.rdfentity.licence.yml | 49 +------------ .../rdf_entity.mapping.rdf_entity.owner.yml | 33 +++++++++ .../install/rdf_entity.rdfentity.owner.yml | 29 +------- web/modules/custom/owner/owner.info.yml | 1 + ...rdf_entity.mapping.rdf_entity.solution.yml | 69 ++++++++++++++++++ .../install/rdf_entity.rdfentity.solution.yml | 65 +---------------- web/modules/custom/solution/solution.info.yml | 1 + 57 files changed, 1389 insertions(+), 1218 deletions(-) create mode 100644 web/modules/custom/asset_distribution/config/install/rdf_entity.mapping.rdf_entity.asset_distribution.yml create mode 100644 web/modules/custom/asset_release/config/install/rdf_entity.mapping.rdf_entity.asset_release.yml create mode 100644 web/modules/custom/collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml create mode 100644 web/modules/custom/contact_information/config/install/rdf_entity.mapping.rdf_entity.contact_information.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.actor.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.business_process.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eira.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eurovoc.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.file_type.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.language.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.licence_type.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.owner_type.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.policy_domain.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.product_type.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.representation_technique.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.solution_category.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.spatial.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.standardization_level.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.status.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.test_resource_type.yml create mode 100644 web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.themes.yml create mode 100644 web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.mapping.rdf_entity.file_url.yml create mode 100644 web/modules/custom/joinup_licence/config/install/rdf_entity.mapping.rdf_entity.licence.yml create mode 100644 web/modules/custom/owner/config/install/rdf_entity.mapping.rdf_entity.owner.yml create mode 100644 web/modules/custom/solution/config/install/rdf_entity.mapping.rdf_entity.solution.yml diff --git a/web/modules/custom/asset_distribution/asset_distribution.info.yml b/web/modules/custom/asset_distribution/asset_distribution.info.yml index ad9b311455..c4bd4f2b6b 100644 --- a/web/modules/custom/asset_distribution/asset_distribution.info.yml +++ b/web/modules/custom/asset_distribution/asset_distribution.info.yml @@ -39,5 +39,6 @@ config_devel: - field.storage.rdf_entity.field_ad_gitb_compliant - field.storage.rdf_entity.field_ad_licence - field.storage.rdf_entity.field_ad_repr_technique + - rdf_entity.mapping.rdf_entity.asset_distribution - rdf_entity.rdfentity.asset_distribution - views.view.asset_distribution_downloads diff --git a/web/modules/custom/asset_distribution/config/install/rdf_entity.mapping.rdf_entity.asset_distribution.yml b/web/modules/custom/asset_distribution/config/install/rdf_entity.mapping.rdf_entity.asset_distribution.yml new file mode 100644 index 0000000000..cab52299f9 --- /dev/null +++ b/web/modules/custom/asset_distribution/config/install/rdf_entity.mapping.rdf_entity.asset_distribution.yml @@ -0,0 +1,69 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: rdf_entity.asset_distribution +entity_type_id: rdf_entity +bundle: asset_distribution +rdf_type: 'http://www.w3.org/ns/adms#AssetDistribution' +base_fields_mapping: + rid: + target_id: + predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + format: resource + uid: + target_id: + predicate: '' + format: '' + label: + value: + predicate: 'http://purl.org/dc/terms/title' + format: t_literal + created: + value: + predicate: 'http://purl.org/dc/terms/issued' + format: 'xsd:dateTime' + changed: + value: + predicate: 'http://purl.org/dc/terms/modified' + format: 'xsd:dateTime' + uuid: + value: + predicate: '' + format: '' + langcode: + value: + predicate: 'http://joinup.eu/language' + format: t_literal + default_langcode: + value: + predicate: 'http://joinup.eu/language/default' + format: literal + content_translation_source: + value: + predicate: 'http://joinup.eu/language/translation_source' + format: t_literal + content_translation_outdated: + value: + predicate: 'http://joinup.eu/language/translation_outdated' + format: t_literal + content_translation_uid: + target_id: + predicate: 'http://joinup.eu/language/translation_author' + format: t_literal + content_translation_status: + value: + predicate: 'http://joinup.eu/language/translation_status' + format: t_literal + content_translation_created: + value: + predicate: 'http://joinup.eu/language/translation_created_time' + format: t_literal + content_translation_changed: + value: + predicate: 'http://joinup.eu/language/translation_changed_time' + format: t_literal +graph: + default: 'http://joinup.eu/asset_distribution/published' + draft: 'http://joinup.eu/asset_distribution/draft' +entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/asset_distribution/config/install/rdf_entity.rdfentity.asset_distribution.yml b/web/modules/custom/asset_distribution/config/install/rdf_entity.rdfentity.asset_distribution.yml index ea453e5300..0f8ddf718d 100644 --- a/web/modules/custom/asset_distribution/config/install/rdf_entity.rdfentity.asset_distribution.yml +++ b/web/modules/custom/asset_distribution/config/install/rdf_entity.rdfentity.asset_distribution.yml @@ -1,70 +1,7 @@ langcode: en status: true dependencies: { } -third_party_settings: - rdf_entity: - rdf_type: 'http://www.w3.org/ns/adms#AssetDistribution' - mapping: - rid: - target_id: - predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' - format: resource - uid: - target_id: - predicate: '' - format: '' - label: - value: - predicate: 'http://purl.org/dc/terms/title' - format: t_literal - created: - value: - predicate: 'http://purl.org/dc/terms/issued' - format: 'xsd:dateTime' - changed: - value: - predicate: 'http://purl.org/dc/terms/modified' - format: 'xsd:dateTime' - uuid: - value: - predicate: '' - format: '' - langcode: - value: - predicate: 'http://joinup.eu/language' - format: t_literal - default_langcode: - value: - predicate: 'http://joinup.eu/language/default' - format: literal - content_translation_source: - value: - predicate: 'http://joinup.eu/language/translation_source' - format: t_literal - content_translation_outdated: - value: - predicate: 'http://joinup.eu/language/translation_outdated' - format: t_literal - content_translation_uid: - target_id: - predicate: 'http://joinup.eu/language/translation_author' - format: t_literal - content_translation_status: - value: - predicate: 'http://joinup.eu/language/translation_status' - format: t_literal - content_translation_created: - value: - predicate: 'http://joinup.eu/language/translation_created_time' - format: t_literal - content_translation_changed: - value: - predicate: 'http://joinup.eu/language/translation_changed_time' - format: t_literal - graph: - default: 'http://joinup.eu/asset_distribution/published' - draft: 'http://joinup.eu/asset_distribution/draft' - entity_id_plugin: joinup_po_namespace +third_party_settings: { } name: Distribution rid: asset_distribution description: '' diff --git a/web/modules/custom/asset_release/asset_release.info.yml b/web/modules/custom/asset_release/asset_release.info.yml index b527f290a6..772177d6d3 100644 --- a/web/modules/custom/asset_release/asset_release.info.yml +++ b/web/modules/custom/asset_release/asset_release.info.yml @@ -64,4 +64,5 @@ config_devel: - field.storage.rdf_entity.field_isr_solution_type - field.storage.rdf_entity.field_isr_state - field.storage.rdf_entity.field_isr_translation + - rdf_entity.mapping.rdf_entity.asset_release - rdf_entity.rdfentity.asset_release diff --git a/web/modules/custom/asset_release/config/install/rdf_entity.mapping.rdf_entity.asset_release.yml b/web/modules/custom/asset_release/config/install/rdf_entity.mapping.rdf_entity.asset_release.yml new file mode 100644 index 0000000000..e8f52281a6 --- /dev/null +++ b/web/modules/custom/asset_release/config/install/rdf_entity.mapping.rdf_entity.asset_release.yml @@ -0,0 +1,69 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: rdf_entity.asset_release +entity_type_id: rdf_entity +bundle: asset_release +rdf_type: 'http://www.w3.org/ns/adms#Asset' +base_fields_mapping: + rid: + target_id: + predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + format: resource + uid: + target_id: + predicate: '' + format: '' + label: + value: + predicate: 'http://purl.org/dc/terms/title' + format: t_literal + created: + value: + predicate: 'http://purl.org/dc/terms/issued' + format: 'xsd:dateTime' + changed: + value: + predicate: 'http://purl.org/dc/terms/modified' + format: 'xsd:dateTime' + uuid: + value: + predicate: '' + format: '' + langcode: + value: + predicate: 'http://joinup.eu/language' + format: t_literal + default_langcode: + value: + predicate: 'http://joinup.eu/language/default' + format: literal + content_translation_source: + value: + predicate: 'http://joinup.eu/language/translation_source' + format: t_literal + content_translation_outdated: + value: + predicate: 'http://joinup.eu/language/translation_outdated' + format: t_literal + content_translation_uid: + target_id: + predicate: 'http://joinup.eu/language/translation_author' + format: t_literal + content_translation_status: + value: + predicate: 'http://joinup.eu/language/translation_status' + format: t_literal + content_translation_created: + value: + predicate: 'http://joinup.eu/language/translation_created_time' + format: t_literal + content_translation_changed: + value: + predicate: 'http://joinup.eu/language/translation_changed_time' + format: t_literal +graph: + default: 'http://joinup.eu/asset_release/published' + draft: 'http://joinup.eu/asset_release/draft' +entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/asset_release/config/install/rdf_entity.rdfentity.asset_release.yml b/web/modules/custom/asset_release/config/install/rdf_entity.rdfentity.asset_release.yml index 39a99a86ce..f42f19f59d 100644 --- a/web/modules/custom/asset_release/config/install/rdf_entity.rdfentity.asset_release.yml +++ b/web/modules/custom/asset_release/config/install/rdf_entity.rdfentity.asset_release.yml @@ -1,70 +1,7 @@ langcode: en status: true dependencies: { } -third_party_settings: - rdf_entity: - rdf_type: 'http://www.w3.org/ns/adms#Asset' - mapping: - rid: - target_id: - predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' - format: resource - uid: - target_id: - predicate: '' - format: '' - label: - value: - predicate: 'http://purl.org/dc/terms/title' - format: t_literal - created: - value: - predicate: 'http://purl.org/dc/terms/issued' - format: 'xsd:dateTime' - changed: - value: - predicate: 'http://purl.org/dc/terms/modified' - format: 'xsd:dateTime' - uuid: - value: - predicate: '' - format: '' - langcode: - value: - predicate: 'http://joinup.eu/language' - format: t_literal - default_langcode: - value: - predicate: 'http://joinup.eu/language/default' - format: literal - content_translation_source: - value: - predicate: 'http://joinup.eu/language/translation_source' - format: t_literal - content_translation_outdated: - value: - predicate: 'http://joinup.eu/language/translation_outdated' - format: t_literal - content_translation_uid: - target_id: - predicate: 'http://joinup.eu/language/translation_author' - format: t_literal - content_translation_status: - value: - predicate: 'http://joinup.eu/language/translation_status' - format: t_literal - content_translation_created: - value: - predicate: 'http://joinup.eu/language/translation_created_time' - format: t_literal - content_translation_changed: - value: - predicate: 'http://joinup.eu/language/translation_changed_time' - format: t_literal - graph: - default: 'http://joinup.eu/asset_release/published' - draft: 'http://joinup.eu/asset_release/draft' - entity_id_plugin: joinup_po_namespace +third_party_settings: { } name: Release rid: asset_release description: '' diff --git a/web/modules/custom/collection/collection.info.yml b/web/modules/custom/collection/collection.info.yml index d56819ee14..1270c01a1f 100644 --- a/web/modules/custom/collection/collection.info.yml +++ b/web/modules/custom/collection/collection.info.yml @@ -69,4 +69,5 @@ config_devel: - og.og_role.rdf_entity-collection-facilitator - og.og_role.rdf_entity-collection-member - og.og_role.rdf_entity-collection-non-member + - rdf_entity.mapping.rdf_entity.collection - rdf_entity.rdfentity.collection diff --git a/web/modules/custom/collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml b/web/modules/custom/collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml new file mode 100644 index 0000000000..a1bdcd76ab --- /dev/null +++ b/web/modules/custom/collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml @@ -0,0 +1,73 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: rdf_entity.collection +entity_type_id: rdf_entity +bundle: collection +rdf_type: 'http://www.w3.org/ns/adms#AssetRepository' +base_fields_mapping: + rid: + target_id: + predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + format: resource + uid: + target_id: + predicate: 'http://joinup.eu/owner/uid' + format: 'xsd:integer' + label: + value: + predicate: 'http://purl.org/dc/terms/title' + format: t_literal + created: + value: + predicate: 'http://purl.org/dc/terms/issued' + format: 'xsd:dateTime' + changed: + value: + predicate: 'http://purl.org/dc/terms/modified' + format: 'xsd:dateTime' + uuid: + value: + predicate: '' + format: '' + langcode: + value: + predicate: 'http://joinup.eu/language' + format: t_literal + default_langcode: + value: + predicate: 'http://joinup.eu/language/default' + format: literal + content_translation_source: + value: + predicate: 'http://joinup.eu/language/translation_source' + format: t_literal + content_translation_outdated: + value: + predicate: 'http://joinup.eu/language/translation_outdated' + format: t_literal + content_translation_uid: + target_id: + predicate: 'http://joinup.eu/language/translation_author' + format: t_literal + content_translation_status: + value: + predicate: 'http://joinup.eu/language/translation_status' + format: t_literal + content_translation_created: + value: + predicate: 'http://joinup.eu/language/translation_created_time' + format: t_literal + content_translation_changed: + value: + predicate: 'http://joinup.eu/language/translation_changed_time' + format: t_literal + graph: + value: + predicate: '' + format: '' +graph: + default: 'http://joinup.eu/collection/published' + draft: 'http://joinup.eu/collection/draft' +entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/collection/config/install/rdf_entity.rdfentity.collection.yml b/web/modules/custom/collection/config/install/rdf_entity.rdfentity.collection.yml index 3b551f24e5..b5cc3f150b 100644 --- a/web/modules/custom/collection/config/install/rdf_entity.rdfentity.collection.yml +++ b/web/modules/custom/collection/config/install/rdf_entity.rdfentity.collection.yml @@ -1,74 +1,7 @@ langcode: en status: true dependencies: { } -third_party_settings: - rdf_entity: - rdf_type: 'http://www.w3.org/ns/adms#AssetRepository' - mapping: - rid: - target_id: - predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' - format: resource - uid: - target_id: - predicate: 'http://joinup.eu/owner/uid' - format: 'xsd:integer' - label: - value: - predicate: 'http://purl.org/dc/terms/title' - format: t_literal - created: - value: - predicate: 'http://purl.org/dc/terms/issued' - format: 'xsd:dateTime' - changed: - value: - predicate: 'http://purl.org/dc/terms/modified' - format: 'xsd:dateTime' - uuid: - value: - predicate: '' - format: '' - langcode: - value: - predicate: 'http://joinup.eu/language' - format: t_literal - default_langcode: - value: - predicate: 'http://joinup.eu/language/default' - format: literal - content_translation_source: - value: - predicate: 'http://joinup.eu/language/translation_source' - format: t_literal - content_translation_outdated: - value: - predicate: 'http://joinup.eu/language/translation_outdated' - format: t_literal - content_translation_uid: - target_id: - predicate: 'http://joinup.eu/language/translation_author' - format: t_literal - content_translation_status: - value: - predicate: 'http://joinup.eu/language/translation_status' - format: t_literal - content_translation_created: - value: - predicate: 'http://joinup.eu/language/translation_created_time' - format: t_literal - content_translation_changed: - value: - predicate: 'http://joinup.eu/language/translation_changed_time' - format: t_literal - graph: - value: - predicate: '' - format: '' - graph: - default: 'http://joinup.eu/collection/published' - draft: 'http://joinup.eu/collection/draft' - entity_id_plugin: joinup_po_namespace +third_party_settings: { } name: Collection rid: collection description: 'An Asset Repository stores descriptions of Assets and Asset Distributions.' diff --git a/web/modules/custom/contact_information/config/install/rdf_entity.mapping.rdf_entity.contact_information.yml b/web/modules/custom/contact_information/config/install/rdf_entity.mapping.rdf_entity.contact_information.yml new file mode 100644 index 0000000000..5a1fc6f2d3 --- /dev/null +++ b/web/modules/custom/contact_information/config/install/rdf_entity.mapping.rdf_entity.contact_information.yml @@ -0,0 +1,33 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: rdf_entity.contact_information +entity_type_id: rdf_entity +bundle: contact_information +rdf_type: 'http://www.w3.org/2006/vcard/ns#Kind' +base_fields_mapping: + rid: + target_id: + predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + format: resource + uid: + target_id: + predicate: 'http://joinup.eu/owner/uid' + format: integer + label: + value: + predicate: 'http://purl.org/dc/terms/title' + format: t_literal + langcode: + value: + predicate: 'http://joinup.eu/language' + format: t_literal + default_langcode: + value: + predicate: 'http://joinup.eu/language/default' + format: literal +graph: + default: 'http://joinup.eu/contact-information/published' + draft: 'http://joinup.eu/contact-information/draft' +entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/contact_information/config/install/rdf_entity.rdfentity.contact_information.yml b/web/modules/custom/contact_information/config/install/rdf_entity.rdfentity.contact_information.yml index a5f6dc3a46..034caf046e 100644 --- a/web/modules/custom/contact_information/config/install/rdf_entity.rdfentity.contact_information.yml +++ b/web/modules/custom/contact_information/config/install/rdf_entity.rdfentity.contact_information.yml @@ -1,34 +1,7 @@ langcode: en status: true dependencies: { } -third_party_settings: - rdf_entity: - rdf_type: 'http://www.w3.org/2006/vcard/ns#Kind' - mapping: - rid: - target_id: - predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' - format: resource - uid: - target_id: - predicate: 'http://joinup.eu/owner/uid' - format: integer - label: - value: - predicate: 'http://purl.org/dc/terms/title' - format: t_literal - langcode: - value: - predicate: 'http://joinup.eu/language' - format: t_literal - default_langcode: - value: - predicate: 'http://joinup.eu/language/default' - format: literal - graph: - default: 'http://joinup.eu/contact-information/published' - draft: 'http://joinup.eu/contact-information/draft' - entity_id_plugin: joinup_po_namespace +third_party_settings: { } name: 'Contact information' rid: contact_information description: '' diff --git a/web/modules/custom/contact_information/contact_information.info.yml b/web/modules/custom/contact_information/contact_information.info.yml index 269a60b21e..ba27c2ef17 100644 --- a/web/modules/custom/contact_information/contact_information.info.yml +++ b/web/modules/custom/contact_information/contact_information.info.yml @@ -25,4 +25,5 @@ config_devel: - field.storage.rdf_entity.field_ci_name - field.storage.rdf_entity.field_ci_state - field.storage.rdf_entity.field_ci_webpage + - rdf_entity.mapping.rdf_entity.contact_information - rdf_entity.rdfentity.contact_information diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.actor.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.actor.yml new file mode 100644 index 0000000000..ab5e24551f --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.actor.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.actor +entity_type_id: taxonomy_term +bundle: actor +rdf_type: 'http://joinup.eu/taxonomy/actor' +graph: + default: 'http://actor' + draft: 'http://actor' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.business_process.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.business_process.yml new file mode 100644 index 0000000000..e31cd34763 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.business_process.yml @@ -0,0 +1,56 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.business_process +entity_type_id: taxonomy_term +bundle: business_process +rdf_type: 'http://joinup.eu/business-process' +entity_id_plugin: default +graph: + default: 'http://business-process' + draft: 'http://business-process' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + langcode: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: null + format: null + format: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: '' + format: '' + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + graph: + value: + predicate: '' + format: '' diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eira.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eira.yml new file mode 100644 index 0000000000..ad01372f5c --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eira.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.eira +entity_type_id: taxonomy_term +bundle: eira +rdf_type: 'http://data.europa.eu/eira' +graph: + default: 'http://eira_skos' + draft: 'http://eira_skos' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eurovoc.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eurovoc.yml new file mode 100644 index 0000000000..6dfb1b34f6 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eurovoc.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.eurovoc +entity_type_id: taxonomy_term +bundle: eurovoc +rdf_type: 'http://eurovoc.europa.eu/100141' +graph: + default: 'http://joinup.eu/license_type/published' + draft: 'http://joinup.eu/collection/draft' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: '' + format: '' + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.file_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.file_type.yml new file mode 100644 index 0000000000..a458b98754 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.file_type.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.file_type +entity_type_id: taxonomy_term +bundle: file_type +rdf_type: 'http://publications.europa.eu/resource/authority/file-type' +graph: + default: 'http://filetypes-skos' + draft: 'http://filetypes-skos' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#altLabel' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: '' + format: '' + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.language.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.language.yml new file mode 100644 index 0000000000..37ccde2333 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.language.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.language +entity_type_id: taxonomy_term +bundle: language +rdf_type: 'http://publications.europa.eu/resource/authority/language' +graph: + default: 'http://languages-skos' + draft: 'http://languages-skos' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.licence_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.licence_type.yml new file mode 100644 index 0000000000..f946add424 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.licence_type.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.licence_type +entity_type_id: taxonomy_term +bundle: licence_type +rdf_type: 'http://purl.org/adms/licencetype/1.1' +graph: + default: 'http://adms-sw-v1.00' + draft: 'http://adms-sw-v1.00' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.owner_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.owner_type.yml new file mode 100644 index 0000000000..386dcb8422 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.owner_type.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.owner_type +entity_type_id: taxonomy_term +bundle: owner_type +rdf_type: 'http://purl.org/adms/publishertype/1.0' +graph: + default: 'http://adms_skos_v1.00' + draft: 'http://adms_skos_v1.00' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.policy_domain.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.policy_domain.yml new file mode 100644 index 0000000000..3afde2d160 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.policy_domain.yml @@ -0,0 +1,54 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.policy_domain +entity_type_id: taxonomy_term +bundle: policy_domain +rdf_type: 'http://joinup.eu/policy-domain' +graph: + default: 'http://policy_domain' + draft: 'http://policy_domain' +entity_id_plugin: policy_domain +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broaderTransitive' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.product_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.product_type.yml new file mode 100644 index 0000000000..5ad56614a0 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.product_type.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.product_type +entity_type_id: taxonomy_term +bundle: product_type +rdf_type: 'http://joinup.eu/product-type#' +graph: + default: 'http://product_type' + draft: 'http://product_type' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: '' + format: '' + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.representation_technique.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.representation_technique.yml new file mode 100644 index 0000000000..9b627802f3 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.representation_technique.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.representation_technique +entity_type_id: taxonomy_term +bundle: representation_technique +rdf_type: 'http://purl.org/adms/representationtechnique/1.0' +graph: + default: 'http://adms_skos_v1.00' + draft: 'http://adms_skos_v1.00' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.solution_category.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.solution_category.yml new file mode 100644 index 0000000000..230a1aebbb --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.solution_category.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.solution_category +entity_type_id: taxonomy_term +bundle: solution_category +rdf_type: 'http://joinup.eu/taxonomy/solutionCategory#' +graph: + default: 'http://solution_category' + draft: 'http://solution_category' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: '' + format: '' + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.spatial.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.spatial.yml new file mode 100644 index 0000000000..b2d14c6bcc --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.spatial.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.spatial +entity_type_id: taxonomy_term +bundle: spatial +rdf_type: 'http://publications.europa.eu/resource/authority/country' +graph: + default: 'http://countries-skos' + draft: 'http://countries-skos' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.standardization_level.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.standardization_level.yml new file mode 100644 index 0000000000..bbf4d4c6c5 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.standardization_level.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.standardization_level +entity_type_id: taxonomy_term +bundle: standardization_level +rdf_type: 'http://joinup.eu/taxonomy/standardizationLevel#' +graph: + default: 'http://standardization_level' + draft: 'http://standardization_level' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: '' + format: '' + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.status.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.status.yml new file mode 100644 index 0000000000..ed66f7965c --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.status.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.status +entity_type_id: taxonomy_term +bundle: status +rdf_type: 'http://purl.org/adms/status/1.0' +graph: + default: 'http://adms_skos_v1.00' + draft: 'http://adms_skos_v1.00' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: '' + format: '' + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.test_resource_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.test_resource_type.yml new file mode 100644 index 0000000000..d95f7ee148 --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.test_resource_type.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.test_resource_type +entity_type_id: taxonomy_term +bundle: test_resource_type +rdf_type: 'http://joinup.eu/test-resource-type#' +graph: + default: 'http://test_resource_type' + draft: 'http://test_resource_type' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: '' + format: '' + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.themes.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.themes.yml new file mode 100644 index 0000000000..566bfb439f --- /dev/null +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.themes.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: taxonomy_term.themes +entity_type_id: taxonomy_term +bundle: themes +rdf_type: 'http://publications.europa.eu/resource/authority/data-theme' +graph: + default: 'http://data-theme-skos' + draft: 'http://data-theme-skos' +base_fields_mapping: + uuid: + value: + predicate: '' + format: '' + vid: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' + format: resource + langcode: + value: + predicate: '' + format: '' + name: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' + format: t_literal + description: + value: + predicate: 'http://www.w3.org/2004/02/skos/core#definition' + format: t_literal + format: + value: + predicate: '' + format: '' + weight: + value: + predicate: '' + format: '' + parent: + target_id: + predicate: 'http://www.w3.org/2004/02/skos/core#broader' + format: resource + changed: + value: + predicate: '' + format: '' + default_langcode: + value: + predicate: '' + format: '' + path: { } diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.actor.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.actor.yml index bf48aec652..2cadb2d691 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.actor.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.actor.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://joinup.eu/taxonomy/actor' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://actor' - draft: 'http://actor' +third_party_settings: { } name: Actor vid: actor description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.business_process.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.business_process.yml index 4edb5dac87..cc247e411a 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.business_process.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.business_process.yml @@ -3,57 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://joinup.eu/business-process' - entity_id_plugin: default - mapping: - uuid: - value: - predicate: '' - format: '' - langcode: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: null - format: null - format: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: '' - format: '' - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - graph: - value: - predicate: '' - format: '' - graph: - default: 'http://business-process' - draft: 'http://business-process' +third_party_settings: { } name: 'Business process' vid: business_process description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.eira.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.eira.yml index 4b2ae3fd64..a6538dfb28 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.eira.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.eira.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://data.europa.eu/eira' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://eira_skos' - draft: 'http://eira_skos' +third_party_settings: { } name: EIRA vid: eira description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.eurovoc.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.eurovoc.yml index ef1742d191..e2b9d09dfd 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.eurovoc.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.eurovoc.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://eurovoc.europa.eu/100141' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: '' - format: '' - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://joinup.eu/license_type/published' - draft: 'http://joinup.eu/collection/draft' +third_party_settings: { } name: EuroVoc vid: eurovoc description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.file_type.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.file_type.yml index f6791392f2..8277f06685 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.file_type.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.file_type.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://publications.europa.eu/resource/authority/file-type' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#altLabel' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: '' - format: '' - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://filetypes-skos' - draft: 'http://filetypes-skos' +third_party_settings: { } name: 'File type' vid: file_type description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.language.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.language.yml index 5a01729570..72fc07b8a9 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.language.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.language.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://publications.europa.eu/resource/authority/language' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://languages-skos' - draft: 'http://languages-skos' +third_party_settings: { } name: Language vid: language description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.licence_type.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.licence_type.yml index 7be37f3a3b..fb2079acb9 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.licence_type.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.licence_type.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://purl.org/adms/licencetype/1.1' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://adms-sw-v1.00' - draft: 'http://adms-sw-v1.00' +third_party_settings: { } name: 'Licence type' vid: licence_type description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.owner_type.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.owner_type.yml index d76c6fd0a1..837129a070 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.owner_type.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.owner_type.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://purl.org/adms/publishertype/1.0' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://adms_skos_v1.00' - draft: 'http://adms_skos_v1.00' +third_party_settings: { } name: 'Owner type' vid: owner_type description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.policy_domain.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.policy_domain.yml index b07a9c954c..16d0124691 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.policy_domain.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.policy_domain.yml @@ -5,54 +5,6 @@ dependencies: - rdf_entity - rdf_taxonomy third_party_settings: - rdf_entity: - rdf_type: 'http://joinup.eu/policy-domain' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broaderTransitive' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://policy_domain' - draft: 'http://policy_domain' - entity_id_plugin: policy_domain rdf_taxonomy: locked: false name: 'Policy domain' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.product_type.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.product_type.yml index 2d4de021f5..6992836d25 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.product_type.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.product_type.yml @@ -3,55 +3,8 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://joinup.eu/product-type#' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: '' - format: '' - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://product_type' - draft: 'http://product_type' -name: Product type +third_party_settings: { } +name: 'Product type' vid: product_type description: '' hierarchy: 0 diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.representation_technique.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.representation_technique.yml index 869801a782..1f82e1a964 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.representation_technique.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.representation_technique.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://purl.org/adms/representationtechnique/1.0' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://adms_skos_v1.00' - draft: 'http://adms_skos_v1.00' +third_party_settings: { } name: 'Representation Technique' vid: representation_technique description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.solution_category.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.solution_category.yml index 2b8786a803..cdaf89b36d 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.solution_category.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.solution_category.yml @@ -3,55 +3,8 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://joinup.eu/taxonomy/solutionCategory#' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: '' - format: '' - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://solution_category' - draft: 'http://solution_category' -name: Solution category +third_party_settings: { } +name: 'Solution category' vid: solution_category description: '' hierarchy: 0 diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.spatial.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.spatial.yml index 33a7aca5c8..8041c91362 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.spatial.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.spatial.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://publications.europa.eu/resource/authority/country' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://countries-skos' - draft: 'http://countries-skos' +third_party_settings: { } name: Spatial vid: spatial description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.standardization_level.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.standardization_level.yml index 217a32d354..dfb4399372 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.standardization_level.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.standardization_level.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://joinup.eu/taxonomy/standardizationLevel#' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: '' - format: '' - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://standardization_level' - draft: 'http://standardization_level' +third_party_settings: { } name: 'Standardization level' vid: standardization_level description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.status.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.status.yml index d29f86e713..ea4ab9f221 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.status.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.status.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://purl.org/adms/status/1.0' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: '' - format: '' - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://adms_skos_v1.00' - draft: 'http://adms_skos_v1.00' +third_party_settings: { } name: Status vid: status description: '' diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.test_resource_type.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.test_resource_type.yml index e1e988d52d..c0f76081de 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.test_resource_type.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.test_resource_type.yml @@ -3,55 +3,8 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://joinup.eu/test-resource-type#' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: '' - format: '' - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://test_resource_type' - draft: 'http://test_resource_type' -name: Test resource type +third_party_settings: { } +name: 'Test resource type' vid: test_resource_type description: '' hierarchy: 0 diff --git a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.themes.yml b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.themes.yml index 24369d57bd..48bfd62997 100644 --- a/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.themes.yml +++ b/web/modules/custom/joinup_core/config/install/taxonomy.vocabulary.themes.yml @@ -3,54 +3,7 @@ status: true dependencies: module: - rdf_entity -third_party_settings: - rdf_entity: - rdf_type: 'http://publications.europa.eu/resource/authority/data-theme' - mapping: - uuid: - value: - predicate: '' - format: '' - vid: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#inScheme' - format: resource - langcode: - value: - predicate: '' - format: '' - name: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel' - format: t_literal - description: - value: - predicate: 'http://www.w3.org/2004/02/skos/core#definition' - format: t_literal - format: - value: - predicate: '' - format: '' - weight: - value: - predicate: '' - format: '' - parent: - target_id: - predicate: 'http://www.w3.org/2004/02/skos/core#broader' - format: resource - changed: - value: - predicate: '' - format: '' - default_langcode: - value: - predicate: '' - format: '' - path: { } - graph: - default: 'http://data-theme-skos' - draft: 'http://data-theme-skos' +third_party_settings: { } name: Themes vid: themes description: '' diff --git a/web/modules/custom/joinup_core/joinup_core.info.yml b/web/modules/custom/joinup_core/joinup_core.info.yml index a5ba742c57..c4735d773d 100644 --- a/web/modules/custom/joinup_core/joinup_core.info.yml +++ b/web/modules/custom/joinup_core/joinup_core.info.yml @@ -1,9 +1,8 @@ -name: Joinup core +name: 'Joinup core' type: module -description: Contains field storage configuration. +description: 'Contains field storage configuration.' core: 8.x package: Joinup - dependencies: - allowed_formats - cached_computed_field @@ -23,7 +22,6 @@ dependencies: - search_api - search_api_solr - state_machine - config_devel: - comment.type.comment - core.entity_form_display.comment.comment.default @@ -61,6 +59,23 @@ config_devel: - image.style.wysiwyg_one_third_width - joinup_core.piwik_settings - rdf_draft.settings + - rdf_entity.mapping.taxonomy_term.actor + - rdf_entity.mapping.taxonomy_term.business_process + - rdf_entity.mapping.taxonomy_term.eira + - rdf_entity.mapping.taxonomy_term.eurovoc + - rdf_entity.mapping.taxonomy_term.file_type + - rdf_entity.mapping.taxonomy_term.language + - rdf_entity.mapping.taxonomy_term.licence_type + - rdf_entity.mapping.taxonomy_term.owner_type + - rdf_entity.mapping.taxonomy_term.policy_domain + - rdf_entity.mapping.taxonomy_term.product_type + - rdf_entity.mapping.taxonomy_term.representation_technique + - rdf_entity.mapping.taxonomy_term.solution_category + - rdf_entity.mapping.taxonomy_term.spatial + - rdf_entity.mapping.taxonomy_term.standardization_level + - rdf_entity.mapping.taxonomy_term.status + - rdf_entity.mapping.taxonomy_term.test_resource_type + - rdf_entity.mapping.taxonomy_term.themes - taxonomy.vocabulary.business_process - taxonomy.vocabulary.eira - taxonomy.vocabulary.eurovoc diff --git a/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.mapping.rdf_entity.file_url.yml b/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.mapping.rdf_entity.file_url.yml new file mode 100644 index 0000000000..93cdc616bd --- /dev/null +++ b/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.mapping.rdf_entity.file_url.yml @@ -0,0 +1,33 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: rdf_entity.file_url +entity_type_id: rdf_entity +bundle: file_url +rdf_type: 'http://example.com/file_url' +base_fields_mapping: + rid: + target_id: + predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + format: resource + uid: + target_id: + predicate: '' + format: '' + label: + value: + predicate: 'http://example.com/file_url_label' + format: t_literal + langcode: + value: + predicate: 'http://example.com/language' + format: t_literal + default_langcode: + value: + predicate: 'http://joinup.eu/language/default' + format: literal +graph: + default: 'http://example.com/file_url/published' + draft: 'http://example.com/file_url/draft' +entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.rdfentity.file_url.yml b/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.rdfentity.file_url.yml index ec8db972df..cc129874c0 100644 --- a/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.rdfentity.file_url.yml +++ b/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.rdfentity.file_url.yml @@ -1,34 +1,7 @@ langcode: en status: true dependencies: { } -third_party_settings: - rdf_entity: - rdf_type: 'http://example.com/file_url' - mapping: - rid: - target_id: - predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' - format: resource - uid: - target_id: - predicate: '' - format: '' - label: - value: - predicate: 'http://example.com/file_url_label' - format: t_literal - langcode: - value: - predicate: 'http://example.com/language' - format: t_literal - default_langcode: - value: - predicate: 'http://joinup.eu/language/default' - format: literal - graph: - default: 'http://example.com/file_url/published' - draft: 'http://example.com/file_url/draft' - entity_id_plugin: joinup_po_namespace +third_party_settings: { } name: File URL rid: file_url description: '' diff --git a/web/modules/custom/joinup_licence/config/install/rdf_entity.mapping.rdf_entity.licence.yml b/web/modules/custom/joinup_licence/config/install/rdf_entity.mapping.rdf_entity.licence.yml new file mode 100644 index 0000000000..be7f847fba --- /dev/null +++ b/web/modules/custom/joinup_licence/config/install/rdf_entity.mapping.rdf_entity.licence.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: rdf_entity.licence +entity_type_id: rdf_entity +bundle: licence +rdf_type: 'http://purl.org/dc/terms/LicenseDocument' +base_fields_mapping: + rid: + target_id: + predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + format: resource + label: + value: + predicate: 'http://purl.org/dc/terms/title' + format: t_literal + langcode: + value: + predicate: 'http://joinup.eu/language' + format: t_literal + default_langcode: + value: + predicate: 'http://joinup.eu/language/default' + format: literal + content_translation_source: + value: + predicate: 'http://joinup.eu/language/translation_source' + format: t_literal + content_translation_outdated: + value: + predicate: 'http://joinup.eu/language/translation_outdated' + format: t_literal + content_translation_uid: + target_id: + predicate: 'http://joinup.eu/language/translation_author' + format: t_literal + content_translation_status: + value: + predicate: 'http://joinup.eu/language/translation_status' + format: t_literal + content_translation_created: + value: + predicate: 'http://joinup.eu/language/translation_created_time' + format: t_literal + content_translation_changed: + value: + predicate: 'http://joinup.eu/language/translation_changed_time' + format: t_literal +graph: + default: 'http://joinup.eu/licence/published' + draft: 'http://joinup.eu/licence/draft' +entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/joinup_licence/config/install/rdf_entity.rdfentity.licence.yml b/web/modules/custom/joinup_licence/config/install/rdf_entity.rdfentity.licence.yml index 8b6bcf4cd8..43b87f123f 100644 --- a/web/modules/custom/joinup_licence/config/install/rdf_entity.rdfentity.licence.yml +++ b/web/modules/custom/joinup_licence/config/install/rdf_entity.rdfentity.licence.yml @@ -1,54 +1,7 @@ langcode: en status: true dependencies: { } -third_party_settings: - rdf_entity: - rdf_type: 'http://purl.org/dc/terms/LicenseDocument' - mapping: - rid: - target_id: - predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' - format: resource - label: - value: - predicate: 'http://purl.org/dc/terms/title' - format: t_literal - langcode: - value: - predicate: 'http://joinup.eu/language' - format: t_literal - default_langcode: - value: - predicate: 'http://joinup.eu/language/default' - format: literal - content_translation_source: - value: - predicate: 'http://joinup.eu/language/translation_source' - format: t_literal - content_translation_outdated: - value: - predicate: 'http://joinup.eu/language/translation_outdated' - format: t_literal - content_translation_uid: - target_id: - predicate: 'http://joinup.eu/language/translation_author' - format: t_literal - content_translation_status: - value: - predicate: 'http://joinup.eu/language/translation_status' - format: t_literal - content_translation_created: - value: - predicate: 'http://joinup.eu/language/translation_created_time' - format: t_literal - content_translation_changed: - value: - predicate: 'http://joinup.eu/language/translation_changed_time' - format: t_literal - graph: - default: 'http://joinup.eu/licence/published' - draft: 'http://joinup.eu/licence/draft' - entity_id_plugin: joinup_po_namespace +third_party_settings: { } name: Licence rid: licence description: '' diff --git a/web/modules/custom/owner/config/install/rdf_entity.mapping.rdf_entity.owner.yml b/web/modules/custom/owner/config/install/rdf_entity.mapping.rdf_entity.owner.yml new file mode 100644 index 0000000000..b2c87207ea --- /dev/null +++ b/web/modules/custom/owner/config/install/rdf_entity.mapping.rdf_entity.owner.yml @@ -0,0 +1,33 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: rdf_entity.owner +entity_type_id: rdf_entity +bundle: owner +rdf_type: 'http://xmlns.com/foaf/spec/#term_Agent' +base_fields_mapping: + rid: + target_id: + predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + format: resource + uid: + target_id: + predicate: 'http://joinup.eu/owner/uid' + format: integer + label: + value: + predicate: 'http://purl.org/dc/terms/title' + format: t_literal + langcode: + value: + predicate: 'http://joinup.eu/language' + format: t_literal + default_langcode: + value: + predicate: 'http://joinup.eu/language/default' + format: literal +graph: + default: 'http://joinup.eu/owner/published' + draft: 'http://joinup.eu/owner/draft' +entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/owner/config/install/rdf_entity.rdfentity.owner.yml b/web/modules/custom/owner/config/install/rdf_entity.rdfentity.owner.yml index 1f3e0c1913..da9af8e4a6 100644 --- a/web/modules/custom/owner/config/install/rdf_entity.rdfentity.owner.yml +++ b/web/modules/custom/owner/config/install/rdf_entity.rdfentity.owner.yml @@ -1,34 +1,7 @@ langcode: en status: true dependencies: { } -third_party_settings: - rdf_entity: - rdf_type: 'http://xmlns.com/foaf/spec/#term_Agent' - mapping: - rid: - target_id: - predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' - format: resource - uid: - target_id: - predicate: 'http://joinup.eu/owner/uid' - format: integer - label: - value: - predicate: 'http://purl.org/dc/terms/title' - format: t_literal - langcode: - value: - predicate: 'http://joinup.eu/language' - format: t_literal - default_langcode: - value: - predicate: 'http://joinup.eu/language/default' - format: literal - graph: - default: 'http://joinup.eu/owner/published' - draft: 'http://joinup.eu/owner/draft' - entity_id_plugin: joinup_po_namespace +third_party_settings: { } name: Owner rid: owner description: '' diff --git a/web/modules/custom/owner/owner.info.yml b/web/modules/custom/owner/owner.info.yml index b3758b8748..5003527bb6 100644 --- a/web/modules/custom/owner/owner.info.yml +++ b/web/modules/custom/owner/owner.info.yml @@ -20,4 +20,5 @@ config_devel: - field.storage.rdf_entity.field_owner_name - field.storage.rdf_entity.field_owner_state - field.storage.rdf_entity.field_owner_type + - rdf_entity.mapping.rdf_entity.owner - rdf_entity.rdfentity.owner diff --git a/web/modules/custom/solution/config/install/rdf_entity.mapping.rdf_entity.solution.yml b/web/modules/custom/solution/config/install/rdf_entity.mapping.rdf_entity.solution.yml new file mode 100644 index 0000000000..5de218df4d --- /dev/null +++ b/web/modules/custom/solution/config/install/rdf_entity.mapping.rdf_entity.solution.yml @@ -0,0 +1,69 @@ +langcode: en +status: true +dependencies: { } +third_party_settings: { } +id: rdf_entity.solution +entity_type_id: rdf_entity +bundle: solution +rdf_type: 'http://www.w3.org/ns/adms#Asset' +base_fields_mapping: + rid: + target_id: + predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + format: resource + uid: + target_id: + predicate: 'http://joinup.eu/owner/uid' + format: 'xsd:integer' + label: + value: + predicate: 'http://purl.org/dc/terms/title' + format: t_literal + created: + value: + predicate: 'http://purl.org/dc/terms/issued' + format: 'xsd:dateTime' + changed: + value: + predicate: 'http://purl.org/dc/terms/modified' + format: 'xsd:dateTime' + uuid: + value: + predicate: '' + format: '' + langcode: + value: + predicate: 'http://joinup.eu/language' + format: t_literal + default_langcode: + value: + predicate: 'http://joinup.eu/language/default' + format: literal + content_translation_source: + value: + predicate: 'http://joinup.eu/language/translation_source' + format: t_literal + content_translation_outdated: + value: + predicate: 'http://joinup.eu/language/translation_outdated' + format: t_literal + content_translation_uid: + target_id: + predicate: 'http://joinup.eu/language/translation_author' + format: t_literal + content_translation_status: + value: + predicate: 'http://joinup.eu/language/translation_status' + format: t_literal + content_translation_created: + value: + predicate: 'http://joinup.eu/language/translation_created_time' + format: t_literal + content_translation_changed: + value: + predicate: 'http://joinup.eu/language/translation_changed_time' + format: t_literal +graph: + default: 'http://joinup.eu/solution/published' + draft: 'http://joinup.eu/solution/draft' +entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/solution/config/install/rdf_entity.rdfentity.solution.yml b/web/modules/custom/solution/config/install/rdf_entity.rdfentity.solution.yml index 3004c9a2d4..6a2a7a9c31 100644 --- a/web/modules/custom/solution/config/install/rdf_entity.rdfentity.solution.yml +++ b/web/modules/custom/solution/config/install/rdf_entity.rdfentity.solution.yml @@ -1,70 +1,7 @@ langcode: en status: true dependencies: { } -third_party_settings: - rdf_entity: - rdf_type: 'http://www.w3.org/ns/adms#Asset' - mapping: - rid: - target_id: - predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' - format: resource - uid: - target_id: - predicate: 'http://joinup.eu/owner/uid' - format: 'xsd:integer' - label: - value: - predicate: 'http://purl.org/dc/terms/title' - format: t_literal - created: - value: - predicate: 'http://purl.org/dc/terms/issued' - format: 'xsd:dateTime' - changed: - value: - predicate: 'http://purl.org/dc/terms/modified' - format: 'xsd:dateTime' - uuid: - value: - predicate: '' - format: '' - langcode: - value: - predicate: 'http://joinup.eu/language' - format: t_literal - default_langcode: - value: - predicate: 'http://joinup.eu/language/default' - format: literal - content_translation_source: - value: - predicate: 'http://joinup.eu/language/translation_source' - format: t_literal - content_translation_outdated: - value: - predicate: 'http://joinup.eu/language/translation_outdated' - format: t_literal - content_translation_uid: - target_id: - predicate: 'http://joinup.eu/language/translation_author' - format: t_literal - content_translation_status: - value: - predicate: 'http://joinup.eu/language/translation_status' - format: t_literal - content_translation_created: - value: - predicate: 'http://joinup.eu/language/translation_created_time' - format: t_literal - content_translation_changed: - value: - predicate: 'http://joinup.eu/language/translation_changed_time' - format: t_literal - graph: - default: 'http://joinup.eu/solution/published' - draft: 'http://joinup.eu/solution/draft' - entity_id_plugin: joinup_po_namespace +third_party_settings: { } name: Solution rid: solution description: '' diff --git a/web/modules/custom/solution/solution.info.yml b/web/modules/custom/solution/solution.info.yml index a6468e8c35..e11cfb334f 100644 --- a/web/modules/custom/solution/solution.info.yml +++ b/web/modules/custom/solution/solution.info.yml @@ -104,5 +104,6 @@ config_devel: - og.og_role.rdf_entity-solution-facilitator - og.og_role.rdf_entity-solution-member - og.og_role.rdf_entity-solution-non-member + - rdf_entity.mapping.rdf_entity.solution - rdf_entity.rdfentity.solution - system.action.joinup_transfer_solution_ownership From ebad7ba589b5b88e0199e4180f928a83e621bef8 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Tue, 9 Jan 2018 22:02:02 +0200 Subject: [PATCH 04/16] ISAICP-4211: Use the latest version of rdf_entity. --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index d8273068d2..109078c138 100644 --- a/composer.lock +++ b/composer.lock @@ -4260,12 +4260,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "26ea02a3a1408abe4136211207156b81511e9f63" + "reference": "a9462206148edc5fbbb116b8404468c3dde32cf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/26ea02a3a1408abe4136211207156b81511e9f63", - "reference": "26ea02a3a1408abe4136211207156b81511e9f63", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/a9462206148edc5fbbb116b8404468c3dde32cf4", + "reference": "a9462206148edc5fbbb116b8404468c3dde32cf4", "shasum": "" }, "require": { @@ -4285,7 +4285,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-08T11:21:13+00:00" + "time": "2018-01-09T19:58:31+00:00" }, { "name": "drupal/redirect", From 68ed76fdcfa6239551f72a2cbe8242e65d060683 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Tue, 9 Jan 2018 22:11:14 +0200 Subject: [PATCH 05/16] ISAICP-4211: Add the licence config to .info.yml. --- web/modules/custom/joinup_licence/joinup_licence.info.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/web/modules/custom/joinup_licence/joinup_licence.info.yml b/web/modules/custom/joinup_licence/joinup_licence.info.yml index f3585b7f99..9dacc8906a 100644 --- a/web/modules/custom/joinup_licence/joinup_licence.info.yml +++ b/web/modules/custom/joinup_licence/joinup_licence.info.yml @@ -13,4 +13,5 @@ config_devel: - field.field.rdf_entity.licence.field_licence_type - field.storage.rdf_entity.field_licence_description - field.storage.rdf_entity.field_licence_type + - rdf_entity.mapping.rdf_entity.licence - rdf_entity.rdfentity.licence From 5cfa88344e14e10f65b99fb9d32728015164092e Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Tue, 9 Jan 2018 23:46:36 +0200 Subject: [PATCH 06/16] ISAICP-4211: Overwrite the 'default' graph label. --- .../joinup/config/install/rdf_entity.graph.default.yml | 5 +++++ web/profiles/joinup/joinup.info.yml | 1 + 2 files changed, 6 insertions(+) create mode 100644 web/profiles/joinup/config/install/rdf_entity.graph.default.yml diff --git a/web/profiles/joinup/config/install/rdf_entity.graph.default.yml b/web/profiles/joinup/config/install/rdf_entity.graph.default.yml new file mode 100644 index 0000000000..2e9e9a1074 --- /dev/null +++ b/web/profiles/joinup/config/install/rdf_entity.graph.default.yml @@ -0,0 +1,5 @@ +langcode: en +status: true +id: default +name: Published +description: 'Default graph. This is available for all entity types and bundles.' diff --git a/web/profiles/joinup/joinup.info.yml b/web/profiles/joinup/joinup.info.yml index a80a44ea17..422b530140 100644 --- a/web/profiles/joinup/joinup.info.yml +++ b/web/profiles/joinup/joinup.info.yml @@ -203,6 +203,7 @@ config_devel: - pathauto.pattern.rdf_entities_releases - piwik.settings - r4032login.settings + - rdf_entity.graph.default - subpathauto.settings - swiftmailer.message - swiftmailer.transport From 95135d1a61dca23b532ef94385ddbb1f954f996d Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Tue, 9 Jan 2018 23:47:08 +0200 Subject: [PATCH 07/16] ISAICP-4211: Grab the latest version of rdf_entity. --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 109078c138..738dc38051 100644 --- a/composer.lock +++ b/composer.lock @@ -4260,12 +4260,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "a9462206148edc5fbbb116b8404468c3dde32cf4" + "reference": "1249183805bbaca602c975eef890225e0841088f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/a9462206148edc5fbbb116b8404468c3dde32cf4", - "reference": "a9462206148edc5fbbb116b8404468c3dde32cf4", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/1249183805bbaca602c975eef890225e0841088f", + "reference": "1249183805bbaca602c975eef890225e0841088f", "shasum": "" }, "require": { @@ -4285,7 +4285,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-09T19:58:31+00:00" + "time": "2018-01-09T21:34:05+00:00" }, { "name": "drupal/redirect", From 6957e88bd58438eca12c26b7645df15884d7a362 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Wed, 10 Jan 2018 11:58:11 +0200 Subject: [PATCH 08/16] ISAICP-4211: Use the latest version of rdf_entity from graph-refactor branch. --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 738dc38051..06f538176f 100644 --- a/composer.lock +++ b/composer.lock @@ -4260,12 +4260,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "1249183805bbaca602c975eef890225e0841088f" + "reference": "a347ddbe53dc395ae64326cfee35d9599929f87e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/1249183805bbaca602c975eef890225e0841088f", - "reference": "1249183805bbaca602c975eef890225e0841088f", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/a347ddbe53dc395ae64326cfee35d9599929f87e", + "reference": "a347ddbe53dc395ae64326cfee35d9599929f87e", "shasum": "" }, "require": { @@ -4285,7 +4285,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-09T21:34:05+00:00" + "time": "2018-01-10T09:54:56+00:00" }, { "name": "drupal/redirect", From 6ef4616da0187ef8191d0a8e1847a1fd46de2311 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Wed, 10 Jan 2018 11:58:30 +0200 Subject: [PATCH 09/16] ISAICP-4211: Fix the CustomPageOgMenuLinksManagerTest test. --- .../src/Kernel/CustomPageOgMenuLinksManagerTest.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/modules/custom/custom_page/tests/src/Kernel/CustomPageOgMenuLinksManagerTest.php b/web/modules/custom/custom_page/tests/src/Kernel/CustomPageOgMenuLinksManagerTest.php index ffb91ba9f8..ad4dc76c4b 100644 --- a/web/modules/custom/custom_page/tests/src/Kernel/CustomPageOgMenuLinksManagerTest.php +++ b/web/modules/custom/custom_page/tests/src/Kernel/CustomPageOgMenuLinksManagerTest.php @@ -11,6 +11,7 @@ use Drupal\og_menu\Entity\OgMenu; use Drupal\og_menu\Entity\OgMenuInstance; use Drupal\rdf_entity\Entity\Rdf; +use Drupal\rdf_entity\Entity\RdfEntityMapping; use Drupal\rdf_entity\Entity\RdfEntityType; use Drupal\Tests\rdf_entity\Traits\RdfDatabaseConnectionTrait; @@ -80,12 +81,12 @@ protected function setUp() { // @see og_ui_entity_type_save(). $mocked_collection_type->og_is_group = TRUE; $mocked_collection_type->og_group_content_bundle = FALSE; - $rdf_entity_3rd_party = Yaml::decode(file_get_contents(__DIR__ . '/../../../../collection/config/install/rdf_entity.rdfentity.collection.yml'))['third_party_settings']['rdf_entity']; - foreach ($rdf_entity_3rd_party as $key => $value) { - $mocked_collection_type->setThirdPartySetting('rdf_entity', $key, $value); - } $mocked_collection_type->save(); + // Create the corresponding mapping config entity. + $mapping_values = Yaml::decode(file_get_contents(__DIR__ . '/../../../../collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml')); + RdfEntityMapping::create($mapping_values)->save(); + $mocked_custom_page_type = NodeType::create([ 'type' => 'custom_page', 'name' => 'Mocked custom page', From 7898ca6b4aeaee25bea6368a91496aafaa56f632 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Wed, 10 Jan 2018 16:43:25 +0200 Subject: [PATCH 10/16] ISAICP-4211: Refactoring RDF entity graph. --- composer.json | 2 +- composer.lock | 8 ++++---- .../asset_release.moderation.feature | 4 ++-- ....mapping.rdf_entity.asset_distribution.yml | 6 ++++-- .../custom/asset_release/asset_release.module | 10 ++-------- ...ntity.mapping.rdf_entity.asset_release.yml | 6 +++++- .../custom/collection/collection.module | 6 ++---- ...f_entity.mapping.rdf_entity.collection.yml | 6 +++++- ...mapping.rdf_entity.contact_information.yml | 6 ++++-- .../CustomPageOgMenuLinksManagerTest.php | 2 +- .../config/install/rdf_draft.settings.yml | 19 ------------------- ...rdf_entity.mapping.taxonomy_term.actor.yml | 6 ++++-- ...mapping.taxonomy_term.business_process.yml | 6 ++++-- .../rdf_entity.mapping.taxonomy_term.eira.yml | 6 ++++-- ...f_entity.mapping.taxonomy_term.eurovoc.yml | 6 ++++-- ...entity.mapping.taxonomy_term.file_type.yml | 6 ++++-- ..._entity.mapping.taxonomy_term.language.yml | 6 ++++-- ...ity.mapping.taxonomy_term.licence_type.yml | 6 ++++-- ...ntity.mapping.taxonomy_term.owner_type.yml | 6 ++++-- ...ty.mapping.taxonomy_term.policy_domain.yml | 6 ++++-- ...ity.mapping.taxonomy_term.product_type.yml | 6 ++++-- ...taxonomy_term.representation_technique.yml | 6 ++++-- ...apping.taxonomy_term.solution_category.yml | 6 ++++-- ...f_entity.mapping.taxonomy_term.spatial.yml | 6 ++++-- ...ng.taxonomy_term.standardization_level.yml | 6 ++++-- ...df_entity.mapping.taxonomy_term.status.yml | 6 ++++-- ...pping.taxonomy_term.test_resource_type.yml | 6 ++++-- ...df_entity.mapping.taxonomy_term.themes.yml | 6 ++++-- .../custom/joinup_core/joinup_core.info.yml | 1 - .../Controller/JoinupRdfListBuilder.php | 3 ++- .../Plugin/Block/ProposedEntitiesBlock.php | 2 +- .../src/Plugin/Block/UserUnpublishedBlock.php | 2 +- ...rdf_entity.mapping.rdf_entity.file_url.yml | 6 ++++-- .../rdf_entity.mapping.rdf_entity.licence.yml | 6 ++++-- .../processor/JoinupEntityLatestRevision.php | 2 +- .../JoinupEntityPublishedRevision.php | 2 +- .../rdf_entity.mapping.rdf_entity.owner.yml | 6 ++++-- ...rdf_entity.mapping.rdf_entity.solution.yml | 6 +++++- .../custom/solution/solution.behat.inc | 2 +- web/modules/custom/solution/solution.module | 8 +++----- .../config/install/rdf_entity.graph.draft.yml | 7 +++++++ 41 files changed, 132 insertions(+), 98 deletions(-) delete mode 100644 web/modules/custom/joinup_core/config/install/rdf_draft.settings.yml create mode 100644 web/profiles/joinup/config/install/rdf_entity.graph.draft.yml diff --git a/composer.json b/composer.json index 609ae84c64..310c1cf9b4 100644 --- a/composer.json +++ b/composer.json @@ -168,7 +168,7 @@ "drupal/email_registration": { "Display name vs Username. @see https://www.drupal.org/project/email_registration/issues/2871604": "https://www.drupal.org/files/issues/8.x-1.x-2871604-dont_change_account_name.patch", "Allow username on the registration form @see https://www.drupal.org/project/email_registration/issues/2927109": "https://www.drupal.org/files/issues/2927109-4.patch" - }, + }, "drupal/config_sync": { "Error after last Drush refactoring @see https://www.drupal.org/project/config_sync/issues/2929952": "https://www.drupal.org/files/issues/2929952-2.patch", "Config changes table is not printed anymore @see https://www.drupal.org/project/config_sync/issues/2931084": "https://www.drupal.org/files/issues/2931084-2.patch" diff --git a/composer.lock b/composer.lock index 06f538176f..1136a4abcb 100644 --- a/composer.lock +++ b/composer.lock @@ -4260,12 +4260,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "a347ddbe53dc395ae64326cfee35d9599929f87e" + "reference": "5835fddbdc03d500dbeaacc5d06ffe4e5b5a0a96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/a347ddbe53dc395ae64326cfee35d9599929f87e", - "reference": "a347ddbe53dc395ae64326cfee35d9599929f87e", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/5835fddbdc03d500dbeaacc5d06ffe4e5b5a0a96", + "reference": "5835fddbdc03d500dbeaacc5d06ffe4e5b5a0a96", "shasum": "" }, "require": { @@ -4285,7 +4285,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-10T09:54:56+00:00" + "time": "2018-01-14T14:57:09+00:00" }, { "name": "drupal/redirect", diff --git a/tests/features/asset_release/asset_release.moderation.feature b/tests/features/asset_release/asset_release.moderation.feature index 9ce0513076..366af41b9f 100644 --- a/tests/features/asset_release/asset_release.moderation.feature +++ b/tests/features/asset_release/asset_release.moderation.feature @@ -9,8 +9,8 @@ Feature: Asset release moderation | name | type | | Kenny Logan | Private Individual(s) | And the following contact: - | name | SheriMoore | - | email | SheriMoore @example.com | + | name | SheriMoore | + | email | SheriMoore@example.com | And users: | Username | E-mail | First name | Family name | Roles | | Bonnie Holloway | bonnie.holloway@example.com | Bonnie | Holloway | | diff --git a/web/modules/custom/asset_distribution/config/install/rdf_entity.mapping.rdf_entity.asset_distribution.yml b/web/modules/custom/asset_distribution/config/install/rdf_entity.mapping.rdf_entity.asset_distribution.yml index cab52299f9..8e9717181c 100644 --- a/web/modules/custom/asset_distribution/config/install/rdf_entity.mapping.rdf_entity.asset_distribution.yml +++ b/web/modules/custom/asset_distribution/config/install/rdf_entity.mapping.rdf_entity.asset_distribution.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - rdf_entity.rdfentity.asset_distribution third_party_settings: { } id: rdf_entity.asset_distribution entity_type_id: rdf_entity @@ -65,5 +68,4 @@ base_fields_mapping: format: t_literal graph: default: 'http://joinup.eu/asset_distribution/published' - draft: 'http://joinup.eu/asset_distribution/draft' entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/asset_release/asset_release.module b/web/modules/custom/asset_release/asset_release.module index acb2e8511b..4bc5b51a59 100644 --- a/web/modules/custom/asset_release/asset_release.module +++ b/web/modules/custom/asset_release/asset_release.module @@ -203,8 +203,7 @@ function asset_release_rdf_entity_presave(EntityInterface $entity) { \Drupal::service('asset_release.relations')->syncFieldsFromParentSolution($entity); } - $enabled_bundles = \Drupal::config('rdf_draft.settings')->get('revision_bundle_rdf_entity'); - if (empty($enabled_bundles) || !in_array($entity->bundle(), $enabled_bundles)) { + if (!\Drupal::service('sparql.graph_handler')->bundleHasGraph('rdf_entity', 'asset_release', 'draft')) { return; } @@ -231,12 +230,7 @@ function asset_release_rdf_entity_presave(EntityInterface $entity) { */ function asset_release_entity_update(EntityInterface $entity) { // Quick escape check to avoid unnecessary loadings. - if ($entity->bundle() != 'asset_release') { - return; - } - - $enabled_bundles = \Drupal::config('rdf_draft.settings')->get('revision_bundle_rdf_entity'); - if (empty($enabled_bundles) || !in_array($entity->bundle(), $enabled_bundles)) { + if ($entity->bundle() !== 'asset_release' || !\Drupal::service('sparql.graph_handler')->bundleHasGraph('rdf_entity', 'asset_release', 'draft')) { return; } diff --git a/web/modules/custom/asset_release/config/install/rdf_entity.mapping.rdf_entity.asset_release.yml b/web/modules/custom/asset_release/config/install/rdf_entity.mapping.rdf_entity.asset_release.yml index e8f52281a6..ce247a631b 100644 --- a/web/modules/custom/asset_release/config/install/rdf_entity.mapping.rdf_entity.asset_release.yml +++ b/web/modules/custom/asset_release/config/install/rdf_entity.mapping.rdf_entity.asset_release.yml @@ -1,6 +1,10 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - rdf_entity.graph.draft + - rdf_entity.rdfentity.asset_release third_party_settings: { } id: rdf_entity.asset_release entity_type_id: rdf_entity diff --git a/web/modules/custom/collection/collection.module b/web/modules/custom/collection/collection.module index 51269169b3..f93f8dcaae 100644 --- a/web/modules/custom/collection/collection.module +++ b/web/modules/custom/collection/collection.module @@ -231,8 +231,7 @@ function collection_rdf_entity_presave(RdfInterface $entity) { } } - $enabled_bundles = \Drupal::config('rdf_draft.settings')->get('revision_bundle_rdf_entity'); - if (empty($enabled_bundles) || !in_array($entity->bundle(), $enabled_bundles)) { + if (!\Drupal::service('sparql.graph_handler')->bundleHasGraph('rdf_entity', 'collection', 'draft')) { return; } @@ -263,8 +262,7 @@ function collection_rdf_entity_presave(RdfInterface $entity) { * - When the entity is saved into the default graph, the draft must be deleted. */ function collection_rdf_entity_update(EntityInterface $entity) { - $enabled_bundles = \Drupal::config('rdf_draft.settings')->get('revision_bundle_rdf_entity'); - if (empty($enabled_bundles) || $entity->bundle() != 'collection' || !in_array($entity->bundle(), $enabled_bundles)) { + if ($entity->bundle() !== 'collection' || !\Drupal::service('sparql.graph_handler')->bundleHasGraph('rdf_entity', 'collection', 'draft')) { return; } diff --git a/web/modules/custom/collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml b/web/modules/custom/collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml index a1bdcd76ab..2821fff48e 100644 --- a/web/modules/custom/collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml +++ b/web/modules/custom/collection/config/install/rdf_entity.mapping.rdf_entity.collection.yml @@ -1,6 +1,10 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - rdf_entity.graph.draft + - rdf_entity.rdfentity.collection third_party_settings: { } id: rdf_entity.collection entity_type_id: rdf_entity diff --git a/web/modules/custom/contact_information/config/install/rdf_entity.mapping.rdf_entity.contact_information.yml b/web/modules/custom/contact_information/config/install/rdf_entity.mapping.rdf_entity.contact_information.yml index 5a1fc6f2d3..35d60ee279 100644 --- a/web/modules/custom/contact_information/config/install/rdf_entity.mapping.rdf_entity.contact_information.yml +++ b/web/modules/custom/contact_information/config/install/rdf_entity.mapping.rdf_entity.contact_information.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - rdf_entity.rdfentity.contact_information third_party_settings: { } id: rdf_entity.contact_information entity_type_id: rdf_entity @@ -29,5 +32,4 @@ base_fields_mapping: format: literal graph: default: 'http://joinup.eu/contact-information/published' - draft: 'http://joinup.eu/contact-information/draft' entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/custom_page/tests/src/Kernel/CustomPageOgMenuLinksManagerTest.php b/web/modules/custom/custom_page/tests/src/Kernel/CustomPageOgMenuLinksManagerTest.php index ad4dc76c4b..5841e5c832 100644 --- a/web/modules/custom/custom_page/tests/src/Kernel/CustomPageOgMenuLinksManagerTest.php +++ b/web/modules/custom/custom_page/tests/src/Kernel/CustomPageOgMenuLinksManagerTest.php @@ -50,7 +50,7 @@ protected function setUp() { parent::setUp(); $this->setUpSparql(); - $this->installConfig(['language', 'og', 'og_menu']); + $this->installConfig(['language', 'og', 'og_menu', 'rdf_entity']); $this->installEntitySchema('user'); $this->installEntitySchema('node'); $this->installEntitySchema('ogmenu'); diff --git a/web/modules/custom/joinup_core/config/install/rdf_draft.settings.yml b/web/modules/custom/joinup_core/config/install/rdf_draft.settings.yml deleted file mode 100644 index 5ee9a0dcfa..0000000000 --- a/web/modules/custom/joinup_core/config/install/rdf_draft.settings.yml +++ /dev/null @@ -1,19 +0,0 @@ -revision_bundle_rdf_entity: - collection: collection - solution: solution - asset_distribution: '' - asset_release: asset_release - contact_information: '' - licence: '' - owner: '' -default_save_graph_rdf_entity: default -revision_bundle_taxonomy_term: - eira: '' - eurovoc: '' - language: '' - licence_type: '' - policy_domain: '' - spatial: '' - status: '' - themes: '' -default_save_graph_taxonomy_term: default diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.actor.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.actor.yml index ab5e24551f..8e58406faf 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.actor.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.actor.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.actor third_party_settings: { } id: taxonomy_term.actor entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: actor rdf_type: 'http://joinup.eu/taxonomy/actor' graph: default: 'http://actor' - draft: 'http://actor' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.business_process.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.business_process.yml index e31cd34763..3fa35e9b33 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.business_process.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.business_process.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.business_process third_party_settings: { } id: taxonomy_term.business_process entity_type_id: taxonomy_term @@ -9,7 +12,6 @@ rdf_type: 'http://joinup.eu/business-process' entity_id_plugin: default graph: default: 'http://business-process' - draft: 'http://business-process' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eira.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eira.yml index ad01372f5c..9524800e35 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eira.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eira.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.eira third_party_settings: { } id: taxonomy_term.eira entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: eira rdf_type: 'http://data.europa.eu/eira' graph: default: 'http://eira_skos' - draft: 'http://eira_skos' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eurovoc.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eurovoc.yml index 6dfb1b34f6..c4519ec0fa 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eurovoc.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.eurovoc.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.eurovoc third_party_settings: { } id: taxonomy_term.eurovoc entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: eurovoc rdf_type: 'http://eurovoc.europa.eu/100141' graph: default: 'http://joinup.eu/license_type/published' - draft: 'http://joinup.eu/collection/draft' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.file_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.file_type.yml index a458b98754..9abc6c7d09 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.file_type.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.file_type.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.file_type third_party_settings: { } id: taxonomy_term.file_type entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: file_type rdf_type: 'http://publications.europa.eu/resource/authority/file-type' graph: default: 'http://filetypes-skos' - draft: 'http://filetypes-skos' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.language.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.language.yml index 37ccde2333..bd67859c5d 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.language.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.language.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.language third_party_settings: { } id: taxonomy_term.language entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: language rdf_type: 'http://publications.europa.eu/resource/authority/language' graph: default: 'http://languages-skos' - draft: 'http://languages-skos' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.licence_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.licence_type.yml index f946add424..3730691cd0 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.licence_type.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.licence_type.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.licence_type third_party_settings: { } id: taxonomy_term.licence_type entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: licence_type rdf_type: 'http://purl.org/adms/licencetype/1.1' graph: default: 'http://adms-sw-v1.00' - draft: 'http://adms-sw-v1.00' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.owner_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.owner_type.yml index 386dcb8422..25719cbc08 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.owner_type.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.owner_type.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.owner_type third_party_settings: { } id: taxonomy_term.owner_type entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: owner_type rdf_type: 'http://purl.org/adms/publishertype/1.0' graph: default: 'http://adms_skos_v1.00' - draft: 'http://adms_skos_v1.00' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.policy_domain.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.policy_domain.yml index 3afde2d160..21ff752299 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.policy_domain.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.policy_domain.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.policy_domain third_party_settings: { } id: taxonomy_term.policy_domain entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: policy_domain rdf_type: 'http://joinup.eu/policy-domain' graph: default: 'http://policy_domain' - draft: 'http://policy_domain' entity_id_plugin: policy_domain base_fields_mapping: uuid: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.product_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.product_type.yml index 5ad56614a0..d851701bcc 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.product_type.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.product_type.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.product_type third_party_settings: { } id: taxonomy_term.product_type entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: product_type rdf_type: 'http://joinup.eu/product-type#' graph: default: 'http://product_type' - draft: 'http://product_type' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.representation_technique.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.representation_technique.yml index 9b627802f3..4194c7881b 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.representation_technique.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.representation_technique.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.representation_technique third_party_settings: { } id: taxonomy_term.representation_technique entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: representation_technique rdf_type: 'http://purl.org/adms/representationtechnique/1.0' graph: default: 'http://adms_skos_v1.00' - draft: 'http://adms_skos_v1.00' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.solution_category.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.solution_category.yml index 230a1aebbb..3df9b11673 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.solution_category.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.solution_category.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.solution_category third_party_settings: { } id: taxonomy_term.solution_category entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: solution_category rdf_type: 'http://joinup.eu/taxonomy/solutionCategory#' graph: default: 'http://solution_category' - draft: 'http://solution_category' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.spatial.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.spatial.yml index b2d14c6bcc..2f0b917fe5 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.spatial.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.spatial.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.spatial third_party_settings: { } id: taxonomy_term.spatial entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: spatial rdf_type: 'http://publications.europa.eu/resource/authority/country' graph: default: 'http://countries-skos' - draft: 'http://countries-skos' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.standardization_level.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.standardization_level.yml index bbf4d4c6c5..1fab62dc34 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.standardization_level.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.standardization_level.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.standardization_level third_party_settings: { } id: taxonomy_term.standardization_level entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: standardization_level rdf_type: 'http://joinup.eu/taxonomy/standardizationLevel#' graph: default: 'http://standardization_level' - draft: 'http://standardization_level' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.status.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.status.yml index ed66f7965c..92c0a57c55 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.status.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.status.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.status third_party_settings: { } id: taxonomy_term.status entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: status rdf_type: 'http://purl.org/adms/status/1.0' graph: default: 'http://adms_skos_v1.00' - draft: 'http://adms_skos_v1.00' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.test_resource_type.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.test_resource_type.yml index d95f7ee148..76980a8d24 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.test_resource_type.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.test_resource_type.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.test_resource_type third_party_settings: { } id: taxonomy_term.test_resource_type entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: test_resource_type rdf_type: 'http://joinup.eu/test-resource-type#' graph: default: 'http://test_resource_type' - draft: 'http://test_resource_type' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.themes.yml b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.themes.yml index 566bfb439f..213d5fca79 100644 --- a/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.themes.yml +++ b/web/modules/custom/joinup_core/config/install/rdf_entity.mapping.taxonomy_term.themes.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - taxonomy.vocabulary.themes third_party_settings: { } id: taxonomy_term.themes entity_type_id: taxonomy_term @@ -8,7 +11,6 @@ bundle: themes rdf_type: 'http://publications.europa.eu/resource/authority/data-theme' graph: default: 'http://data-theme-skos' - draft: 'http://data-theme-skos' base_fields_mapping: uuid: value: diff --git a/web/modules/custom/joinup_core/joinup_core.info.yml b/web/modules/custom/joinup_core/joinup_core.info.yml index c4735d773d..f24e65bf45 100644 --- a/web/modules/custom/joinup_core/joinup_core.info.yml +++ b/web/modules/custom/joinup_core/joinup_core.info.yml @@ -58,7 +58,6 @@ config_devel: - image.style.wysiwyg_half_width - image.style.wysiwyg_one_third_width - joinup_core.piwik_settings - - rdf_draft.settings - rdf_entity.mapping.taxonomy_term.actor - rdf_entity.mapping.taxonomy_term.business_process - rdf_entity.mapping.taxonomy_term.eira diff --git a/web/modules/custom/joinup_core/src/Entity/Controller/JoinupRdfListBuilder.php b/web/modules/custom/joinup_core/src/Entity/Controller/JoinupRdfListBuilder.php index c7acc7794c..d673a031cd 100644 --- a/web/modules/custom/joinup_core/src/Entity/Controller/JoinupRdfListBuilder.php +++ b/web/modules/custom/joinup_core/src/Entity/Controller/JoinupRdfListBuilder.php @@ -18,6 +18,7 @@ class JoinupRdfListBuilder extends RdfListBuilder { */ protected function getEntityIds() { $request = \Drupal::request(); + /** @var \Drupal\rdf_entity\Entity\RdfEntitySparqlStorage $rdf_storage */ $rdf_storage = $this->getStorage(); /** @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info */ $bundle_info = \Drupal::service('entity_type.bundle.info'); @@ -34,7 +35,7 @@ protected function getEntityIds() { } } else { - $query->setGraphType($rdf_storage->getGraphHandler()->getEntityTypeEnabledGraphs()); + $query->setGraphType($rdf_storage->getGraphHandler()->getGraphIds($rdf_storage->getEntityTypeId())); } if ($rid = $request->get('rid')) { diff --git a/web/modules/custom/joinup_core/src/Plugin/Block/ProposedEntitiesBlock.php b/web/modules/custom/joinup_core/src/Plugin/Block/ProposedEntitiesBlock.php index 53796e5e45..5d78c63981 100644 --- a/web/modules/custom/joinup_core/src/Plugin/Block/ProposedEntitiesBlock.php +++ b/web/modules/custom/joinup_core/src/Plugin/Block/ProposedEntitiesBlock.php @@ -100,7 +100,7 @@ protected function getRows() { $data = array_fill_keys($results, ['draft']); $storage->setRequestGraphsMultiple($data); $entities = $storage->loadMultiple($results); - $storage->getGraphHandler()->resetRequestGraphs($results); + $storage->getGraphHandler()->resetRequestGraphs('rdf_entity', $results); $rows = []; foreach ($entities as $entity) { diff --git a/web/modules/custom/joinup_core/src/Plugin/Block/UserUnpublishedBlock.php b/web/modules/custom/joinup_core/src/Plugin/Block/UserUnpublishedBlock.php index dfa689e79e..17ad14199b 100644 --- a/web/modules/custom/joinup_core/src/Plugin/Block/UserUnpublishedBlock.php +++ b/web/modules/custom/joinup_core/src/Plugin/Block/UserUnpublishedBlock.php @@ -209,7 +209,7 @@ protected function getDraftRdf($entity_id) { $rdf_storage->setRequestGraphs($entity_id, ['draft']); /** @var \Drupal\rdf_entity\RdfInterface $draft */ $draft = $rdf_storage->load($entity_id); - $rdf_storage->getGraphHandler()->resetRequestGraphs([$entity_id]); + $rdf_storage->getGraphHandler()->resetRequestGraphs('rdf_entity', [$entity_id]); return $draft; } diff --git a/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.mapping.rdf_entity.file_url.yml b/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.mapping.rdf_entity.file_url.yml index 93cdc616bd..439502c3f0 100644 --- a/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.mapping.rdf_entity.file_url.yml +++ b/web/modules/custom/joinup_core/tests/modules/file_url_entity_test/config/install/rdf_entity.mapping.rdf_entity.file_url.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - rdf_entity.rdfentity.file_url third_party_settings: { } id: rdf_entity.file_url entity_type_id: rdf_entity @@ -29,5 +32,4 @@ base_fields_mapping: format: literal graph: default: 'http://example.com/file_url/published' - draft: 'http://example.com/file_url/draft' entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/joinup_licence/config/install/rdf_entity.mapping.rdf_entity.licence.yml b/web/modules/custom/joinup_licence/config/install/rdf_entity.mapping.rdf_entity.licence.yml index be7f847fba..49f53c1b4e 100644 --- a/web/modules/custom/joinup_licence/config/install/rdf_entity.mapping.rdf_entity.licence.yml +++ b/web/modules/custom/joinup_licence/config/install/rdf_entity.mapping.rdf_entity.licence.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - rdf_entity.rdfentity.licence third_party_settings: { } id: rdf_entity.licence entity_type_id: rdf_entity @@ -49,5 +52,4 @@ base_fields_mapping: format: t_literal graph: default: 'http://joinup.eu/licence/published' - draft: 'http://joinup.eu/licence/draft' entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityLatestRevision.php b/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityLatestRevision.php index 9ab754e392..f2f53555b3 100644 --- a/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityLatestRevision.php +++ b/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityLatestRevision.php @@ -108,7 +108,7 @@ public function alterIndexedItems(array &$items) { $rdf_storage = $this->entityTypeManager->getStorage('rdf_entity'); $rdf_storage->setRequestGraphs($object->id(), ['draft']); $latest = $rdf_storage->load($object->id()); - $rdf_storage->getGraphHandler()->resetRequestGraphs([$object->id()]); + $rdf_storage->getGraphHandler()->resetRequestGraphs('rdf_entity', [$object->id()]); if (!empty($latest)) { $original_object->setValue($latest); $item->setOriginalObject($original_object); diff --git a/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityPublishedRevision.php b/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityPublishedRevision.php index bf9ad2d6b4..b7cbcebc8a 100644 --- a/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityPublishedRevision.php +++ b/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityPublishedRevision.php @@ -96,7 +96,7 @@ public function alterIndexedItems(array &$items) { $rdf_storage = $this->entityTypeManager->getStorage('rdf_entity'); $rdf_storage->setRequestGraphs($object->id(), ['default']); $published = $rdf_storage->load($object->id()); - $rdf_storage->getGraphHandler()->resetRequestGraphs([$object->id()]); + $rdf_storage->getGraphHandler()->resetRequestGraphs('rdf_entity', [$object->id()]); if (!empty($published)) { $original_object->setValue($published); $item->setOriginalObject($original_object); diff --git a/web/modules/custom/owner/config/install/rdf_entity.mapping.rdf_entity.owner.yml b/web/modules/custom/owner/config/install/rdf_entity.mapping.rdf_entity.owner.yml index b2c87207ea..696bbfd6ba 100644 --- a/web/modules/custom/owner/config/install/rdf_entity.mapping.rdf_entity.owner.yml +++ b/web/modules/custom/owner/config/install/rdf_entity.mapping.rdf_entity.owner.yml @@ -1,6 +1,9 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - rdf_entity.rdfentity.owner third_party_settings: { } id: rdf_entity.owner entity_type_id: rdf_entity @@ -29,5 +32,4 @@ base_fields_mapping: format: literal graph: default: 'http://joinup.eu/owner/published' - draft: 'http://joinup.eu/owner/draft' entity_id_plugin: joinup_po_namespace diff --git a/web/modules/custom/solution/config/install/rdf_entity.mapping.rdf_entity.solution.yml b/web/modules/custom/solution/config/install/rdf_entity.mapping.rdf_entity.solution.yml index 5de218df4d..a1dc8483b1 100644 --- a/web/modules/custom/solution/config/install/rdf_entity.mapping.rdf_entity.solution.yml +++ b/web/modules/custom/solution/config/install/rdf_entity.mapping.rdf_entity.solution.yml @@ -1,6 +1,10 @@ langcode: en status: true -dependencies: { } +dependencies: + config: + - rdf_entity.graph.default + - rdf_entity.graph.draft + - rdf_entity.rdfentity.solution third_party_settings: { } id: rdf_entity.solution entity_type_id: rdf_entity diff --git a/web/modules/custom/solution/solution.behat.inc b/web/modules/custom/solution/solution.behat.inc index d6820cf69c..ce012003e5 100644 --- a/web/modules/custom/solution/solution.behat.inc +++ b/web/modules/custom/solution/solution.behat.inc @@ -217,7 +217,7 @@ class SolutionSubContext extends DrupalSubContextBase implements DrupalSubContex // As each given step is executed in the same request // we need to reset the mapping. $storage = \Drupal::entityManager()->getStorage('rdf_entity'); - $storage->getGraphHandler()->resetRequestGraphs(); + $storage->getGraphHandler()->resetRequestGraphs('rdf_entity'); foreach ($membership_table->getColumnsHash() as $values) { $group = $this->getRdfEntityByLabel($values['solution'], 'solution'); /** @var \Drupal\node\NodeInterface $content */ diff --git a/web/modules/custom/solution/solution.module b/web/modules/custom/solution/solution.module index 6e70253015..4f030e76a3 100644 --- a/web/modules/custom/solution/solution.module +++ b/web/modules/custom/solution/solution.module @@ -222,7 +222,7 @@ function solution_update_collection_affiliation($solution_id, $collection_id) { foreach (['default', 'draft'] as $graph) { $storage->setRequestGraphs($collection_id, [$graph]); $collection = $storage->load($collection_id); - $storage->getGraphHandler()->resetRequestGraphs([$collection_id]); + $storage->getGraphHandler()->resetRequestGraphs('rdf_entity', [$collection_id]); if (empty($collection)) { continue; } @@ -496,8 +496,7 @@ function solution_build_related_solutions_list(array $ids) { * Default graph is published. Draft graph is draft. */ function solution_rdf_entity_presave(EntityInterface $entity) { - $enabled_bundles = \Drupal::config('rdf_draft.settings')->get('revision_bundle_rdf_entity'); - if (empty($enabled_bundles) || $entity->bundle() != 'solution' || !in_array($entity->bundle(), $enabled_bundles)) { + if ($entity->bundle() !== 'solution' || !\Drupal::service('sparql.graph_handler')->bundleHasGraph('rdf_entity', 'solution', 'draft')) { return; } @@ -590,8 +589,7 @@ function solution_get_collection_ids(RdfInterface $solution) { * (the entity becomes unpublished). */ function solution_rdf_entity_update(EntityInterface $entity) { - $enabled_bundles = \Drupal::config('rdf_draft.settings')->get('revision_bundle_rdf_entity'); - if (empty($enabled_bundles) || $entity->bundle() != 'solution' || !in_array($entity->bundle(), $enabled_bundles)) { + if ($entity->bundle() !== 'solution' || !\Drupal::service('sparql.graph_handler')->bundleHasGraph('rdf_entity', 'solution', 'draft')) { return; } diff --git a/web/profiles/joinup/config/install/rdf_entity.graph.draft.yml b/web/profiles/joinup/config/install/rdf_entity.graph.draft.yml new file mode 100644 index 0000000000..479a956c30 --- /dev/null +++ b/web/profiles/joinup/config/install/rdf_entity.graph.draft.yml @@ -0,0 +1,7 @@ +langcode: en +status: true +id: draft +name: Draft +description: 'Draft graph.' +entity_types: + - rdf_entity From 6769f2466efcdb64b1c68cd3754af6ae7d9ba6d2 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Mon, 15 Jan 2018 13:44:03 +0200 Subject: [PATCH 11/16] ISAICP-4211: Integrate the changes from rdf_entity module. --- build.project.xml | 2 +- composer.json | 4 +- composer.lock | 68 +++++++++++-------- .../custom/asset_release/asset_release.module | 5 +- .../custom/collection/collection.module | 5 +- ...chema.yml => joinup_collection.schema.yml} | 0 .../Controller/JoinupRdfListBuilder.php | 2 +- .../Plugin/Block/ProposedEntitiesBlock.php | 7 +- .../src/Plugin/Block/UserUnpublishedBlock.php | 7 +- .../joinup_migrate.post_update.php | 2 + .../processor/JoinupEntityLatestRevision.php | 6 +- .../JoinupEntityPublishedRevision.php | 4 +- .../custom/solution/solution.behat.inc | 1 - web/modules/custom/solution/solution.module | 9 ++- .../install/rdf_entity.graph.default.yml | 1 + .../config/install/rdf_entity.graph.draft.yml | 1 + 16 files changed, 66 insertions(+), 58 deletions(-) rename web/modules/custom/joinup_communities/joinup_collection/config/schema/{joinup_colelction.schema.yml => joinup_collection.schema.yml} (100%) diff --git a/build.project.xml b/build.project.xml index 297603975a..e2b270181d 100644 --- a/build.project.xml +++ b/build.project.xml @@ -199,7 +199,7 @@ - + diff --git a/composer.json b/composer.json index 310c1cf9b4..0a6f35cb04 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "drupal/video_embed_field": "~1.5", "drupal/view_unpublished": "~1.0@alpha", "drupal/views_bulk_operations": "^1.0", - "drush/drush": "dev-updb-use-updatekernel as 9.0.0-rc1", + "drush/drush": "dev-update-message-out-of-order as 9.0.0-rc1", "easyrdf/easyrdf": "0.10.0-alpha1 as 0.9.2", "ec-europa/infra": "dev-master", "ec-europa/material-design-lite": "dev-version-1.1.3", @@ -227,7 +227,7 @@ }, { "type": "vcs", - "url": "https://github.com/claudiu-cristea/drush.git" + "url": "https://github.com/pfrenssen/drush.git" }, { "type": "vcs", diff --git a/composer.lock b/composer.lock index 1136a4abcb..4391836edb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "461f74904eaf63336bbe8c339e0734eb", + "content-hash": "e985e6e712f33521926b818fbe065572", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -1753,7 +1753,11 @@ }, "drupal": { "version": "8.x-1.1", - "datestamp": "1492709942" + "datestamp": "1492709942", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -3943,7 +3947,11 @@ }, "drupal": { "version": "8.x-1.0-alpha3+1-dev", - "datestamp": "1488538684" + "datestamp": "1488538684", + "security-coverage": { + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." + } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -3962,10 +3970,6 @@ { "name": "markus_petrux", "homepage": "https://www.drupal.org/user/39593" - }, - { - "name": "moshe weitzman", - "homepage": "https://www.drupal.org/user/23" } ], "description": "Provides a \"Remember Me\" feature on the login form.", @@ -4260,12 +4264,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "5835fddbdc03d500dbeaacc5d06ffe4e5b5a0a96" + "reference": "2f7a793f46caf7daa82ab1527e4c18bdf8d3bf2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/5835fddbdc03d500dbeaacc5d06ffe4e5b5a0a96", - "reference": "5835fddbdc03d500dbeaacc5d06ffe4e5b5a0a96", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/2f7a793f46caf7daa82ab1527e4c18bdf8d3bf2f", + "reference": "2f7a793f46caf7daa82ab1527e4c18bdf8d3bf2f", "shasum": "" }, "require": { @@ -4285,7 +4289,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-14T14:57:09+00:00" + "time": "2018-01-18T17:58:05+00:00" }, { "name": "drupal/redirect", @@ -5140,23 +5144,23 @@ }, { "name": "drush/drush", - "version": "dev-updb-use-updatekernel", + "version": "dev-update-message-out-of-order", "source": { "type": "git", - "url": "https://github.com/claudiu-cristea/drush.git", - "reference": "db668b12e0e62f5b2541c12f8cea7cbe4767fd09" + "url": "https://github.com/pfrenssen/drush.git", + "reference": "a8d58e8582a613e04ce62d7667ca5649a8269dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/claudiu-cristea/drush/zipball/db668b12e0e62f5b2541c12f8cea7cbe4767fd09", - "reference": "db668b12e0e62f5b2541c12f8cea7cbe4767fd09", + "url": "https://api.github.com/repos/pfrenssen/drush/zipball/a8d58e8582a613e04ce62d7667ca5649a8269dce", + "reference": "a8d58e8582a613e04ce62d7667ca5649a8269dce", "shasum": "" }, "require": { "chi-teck/drupal-code-generator": "^1.21.0", "composer/semver": "^1.4", "consolidation/annotated-command": "^2.8.1", - "consolidation/config": "^1.0.7", + "consolidation/config": "^1.0.9", "consolidation/output-formatters": "^3.1.12", "consolidation/robo": "^1.1.5", "ext-dom": "*", @@ -5193,15 +5197,16 @@ "autoload": { "psr-4": { "Drush\\": "src/", + "Drush\\Internal\\": "internal-copy/", "Unish\\": "tests/" } }, "scripts": { "cs": [ - "phpcs -n src tests" + "phpcs -n --standard=PSR2 src tests" ], "cbf": [ - "phpcbf -n src tests" + "phpcbf -n --standard=PSR2 src tests" ], "lint": [ "find includes -name '*.inc' -print0 | xargs -0 -n1 php -l", @@ -5264,9 +5269,9 @@ "forum": "http://drupal.stackexchange.com/questions/tagged/drush", "irc": "irc://irc.freenode.org/drush", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/claudiu-cristea/drush/tree/updb-use-updatekernel" + "source": "https://github.com/pfrenssen/drush/tree/update-message-out-of-order" }, - "time": "2017-12-11T15:48:33+00:00" + "time": "2018-01-15T10:13:48+00:00" }, { "name": "easyrdf/easyrdf", @@ -6683,6 +6688,7 @@ "Piwik\\ReportingApi\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-3.0" ], @@ -6693,10 +6699,6 @@ } ], "description": "PHP client library to query the Piwik Reporting API.", - "support": { - "source": "https://github.com/pfrenssen/piwik-reporting-api/tree/1.0.1", - "issues": "https://github.com/pfrenssen/piwik-reporting-api/issues" - }, "time": "2017-07-17T09:33:42+00:00" }, { @@ -10213,7 +10215,11 @@ }, "drupal": { "version": "8.x-1.20", - "datestamp": "1505199844" + "datestamp": "1511190785", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -10225,6 +10231,14 @@ "name": "Mohamed Anis Taktak", "homepage": "https://www.drupal.org/u/matio89" }, + { + "name": "adriancid", + "homepage": "https://www.drupal.org/user/1962106" + }, + { + "name": "bolbol", + "homepage": "https://www.drupal.org/user/3400070" + }, { "name": "eme", "homepage": "https://www.drupal.org/user/542492" @@ -12245,7 +12259,7 @@ { "alias": "9.0.0-rc1", "alias_normalized": "9.0.0.0-RC1", - "version": "dev-updb-use-updatekernel", + "version": "dev-update-message-out-of-order", "package": "drush/drush" }, { diff --git a/web/modules/custom/asset_release/asset_release.module b/web/modules/custom/asset_release/asset_release.module index 4bc5b51a59..8fbc857f2c 100644 --- a/web/modules/custom/asset_release/asset_release.module +++ b/web/modules/custom/asset_release/asset_release.module @@ -14,6 +14,7 @@ use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\og\Og; use Drupal\rdf_entity\Entity\Rdf; +use Drupal\rdf_entity\RdfEntityGraphInterface; use Drupal\rdf_entity\RdfInterface; /** @@ -209,10 +210,10 @@ function asset_release_rdf_entity_presave(EntityInterface $entity) { $state = $entity->field_isr_state->value; if (in_array($state, ['draft', 'needs_update'])) { - \Drupal::entityTypeManager()->getStorage($entity->getEntityTypeId())->getGraphHandler()->setTargetGraphToEntity($entity, 'draft'); + $entity->set('graph', 'draft'); } elseif (in_array($state, ['validated'])) { - \Drupal::entityTypeManager()->getStorage($entity->getEntityTypeId())->getGraphHandler()->setTargetGraphToEntity($entity, 'default'); + $entity->set('graph', RdfEntityGraphInterface::DEFAULT); } elseif (empty($state)) { throw new \Exception("State field not found while trying to get the appropriate graph."); diff --git a/web/modules/custom/collection/collection.module b/web/modules/custom/collection/collection.module index f93f8dcaae..c5e8b62424 100644 --- a/web/modules/custom/collection/collection.module +++ b/web/modules/custom/collection/collection.module @@ -22,6 +22,7 @@ use Drupal\og\Og; use Drupal\og\OgMembershipInterface; use Drupal\og\OgRoleInterface; use Drupal\rdf_entity\Entity\RdfEntityType; +use Drupal\rdf_entity\RdfEntityGraphInterface; use Drupal\rdf_entity\RdfInterface; use Drupal\search_api\Query\QueryInterface; use Solarium\QueryType\Select\Query\Query; @@ -237,7 +238,7 @@ function collection_rdf_entity_presave(RdfInterface $entity) { $state = $entity->field_ar_state->value; if (in_array($state, ['draft', 'proposed'])) { - \Drupal::entityTypeManager()->getStorage($entity->getEntityTypeId())->getGraphHandler()->setTargetGraphToEntity($entity, 'draft'); + $entity->set('graph', 'draft'); } elseif (in_array($state, [ 'validated', @@ -245,7 +246,7 @@ function collection_rdf_entity_presave(RdfInterface $entity) { 'deletion_request', 'archived', ])) { - \Drupal::entityTypeManager()->getStorage($entity->getEntityTypeId())->getGraphHandler()->setTargetGraphToEntity($entity, 'default'); + $entity->set('graph', RdfEntityGraphInterface::DEFAULT); } elseif (empty($state)) { throw new \Exception("State field not found while trying to get the appropriate graph."); diff --git a/web/modules/custom/joinup_communities/joinup_collection/config/schema/joinup_colelction.schema.yml b/web/modules/custom/joinup_communities/joinup_collection/config/schema/joinup_collection.schema.yml similarity index 100% rename from web/modules/custom/joinup_communities/joinup_collection/config/schema/joinup_colelction.schema.yml rename to web/modules/custom/joinup_communities/joinup_collection/config/schema/joinup_collection.schema.yml diff --git a/web/modules/custom/joinup_core/src/Entity/Controller/JoinupRdfListBuilder.php b/web/modules/custom/joinup_core/src/Entity/Controller/JoinupRdfListBuilder.php index d673a031cd..1d6802660e 100644 --- a/web/modules/custom/joinup_core/src/Entity/Controller/JoinupRdfListBuilder.php +++ b/web/modules/custom/joinup_core/src/Entity/Controller/JoinupRdfListBuilder.php @@ -35,7 +35,7 @@ protected function getEntityIds() { } } else { - $query->setGraphType($rdf_storage->getGraphHandler()->getGraphIds($rdf_storage->getEntityTypeId())); + $query->setGraphType($rdf_storage->getGraphHandler()->getEntityTypeGraphIds($rdf_storage->getEntityTypeId())); } if ($rid = $request->get('rid')) { diff --git a/web/modules/custom/joinup_core/src/Plugin/Block/ProposedEntitiesBlock.php b/web/modules/custom/joinup_core/src/Plugin/Block/ProposedEntitiesBlock.php index 5d78c63981..a655caa9f1 100644 --- a/web/modules/custom/joinup_core/src/Plugin/Block/ProposedEntitiesBlock.php +++ b/web/modules/custom/joinup_core/src/Plugin/Block/ProposedEntitiesBlock.php @@ -97,12 +97,9 @@ protected function getRows() { $query->condition($collection_sub_condition); $results = $query->execute(); - $data = array_fill_keys($results, ['draft']); - $storage->setRequestGraphsMultiple($data); - $entities = $storage->loadMultiple($results); - $storage->getGraphHandler()->resetRequestGraphs('rdf_entity', $results); - $rows = []; + $entities = $storage->loadMultiple($results, ['draft']); + $rows = []; foreach ($entities as $entity) { $view = $this->entityTypeManager->getViewBuilder($entity->getEntityTypeId())->view($entity, 'view_mode_tile'); $rows[] = [ diff --git a/web/modules/custom/joinup_core/src/Plugin/Block/UserUnpublishedBlock.php b/web/modules/custom/joinup_core/src/Plugin/Block/UserUnpublishedBlock.php index 17ad14199b..4d589b22f6 100644 --- a/web/modules/custom/joinup_core/src/Plugin/Block/UserUnpublishedBlock.php +++ b/web/modules/custom/joinup_core/src/Plugin/Block/UserUnpublishedBlock.php @@ -205,12 +205,9 @@ protected function getResultEntities(ResultSetInterface $result) { * The loaded node. */ protected function getDraftRdf($entity_id) { + /** @var \Drupal\rdf_entity\RdfEntitySparqlStorageInterface $rdf_storage */ $rdf_storage = $this->entityTypeManager->getStorage('rdf_entity'); - $rdf_storage->setRequestGraphs($entity_id, ['draft']); - /** @var \Drupal\rdf_entity\RdfInterface $draft */ - $draft = $rdf_storage->load($entity_id); - $rdf_storage->getGraphHandler()->resetRequestGraphs('rdf_entity', [$entity_id]); - return $draft; + return $rdf_storage->load($entity_id, ['draft']); } /** diff --git a/web/modules/custom/joinup_migrate/joinup_migrate.post_update.php b/web/modules/custom/joinup_migrate/joinup_migrate.post_update.php index aba8385b44..eceab4d40d 100644 --- a/web/modules/custom/joinup_migrate/joinup_migrate.post_update.php +++ b/web/modules/custom/joinup_migrate/joinup_migrate.post_update.php @@ -316,6 +316,8 @@ function joinup_migrate_post_update_srits_change_owner() { * Copy the about text to distributions for CTT Spain [ISAICP-4057]. */ function joinup_migrate_post_update_copy_about_text_ctt_spain() { + \Drupal::moduleHandler()->loadAll(); + $solution_labels = []; $collection = Rdf::load('http://administracionelectronica.gob.es/ctt'); /** @var \Drupal\Core\Field\EntityReferenceFieldItemListInterface $solutions */ diff --git a/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityLatestRevision.php b/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityLatestRevision.php index f2f53555b3..935e94d43f 100644 --- a/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityLatestRevision.php +++ b/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityLatestRevision.php @@ -104,11 +104,9 @@ public function alterIndexedItems(array &$items) { } elseif ($object instanceof RdfInterface) { if ($object->isPublished()) { - /** @var \Drupal\rdf_entity\Entity\RdfEntitySparqlStorage $rdf_storage */ + /** @var \Drupal\rdf_entity\RdfEntitySparqlStorageInterface $rdf_storage */ $rdf_storage = $this->entityTypeManager->getStorage('rdf_entity'); - $rdf_storage->setRequestGraphs($object->id(), ['draft']); - $latest = $rdf_storage->load($object->id()); - $rdf_storage->getGraphHandler()->resetRequestGraphs('rdf_entity', [$object->id()]); + $latest = $rdf_storage->load($object->id(), ['draft']); if (!empty($latest)) { $original_object->setValue($latest); $item->setOriginalObject($original_object); diff --git a/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityPublishedRevision.php b/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityPublishedRevision.php index b7cbcebc8a..3e9897b00a 100644 --- a/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityPublishedRevision.php +++ b/web/modules/custom/joinup_search/src/Plugin/search_api/processor/JoinupEntityPublishedRevision.php @@ -94,9 +94,7 @@ public function alterIndexedItems(array &$items) { if (!$object->isPublished()) { /** @var \Drupal\rdf_entity\Entity\RdfEntitySparqlStorage $rdf_storage */ $rdf_storage = $this->entityTypeManager->getStorage('rdf_entity'); - $rdf_storage->setRequestGraphs($object->id(), ['default']); - $published = $rdf_storage->load($object->id()); - $rdf_storage->getGraphHandler()->resetRequestGraphs('rdf_entity', [$object->id()]); + $published = $rdf_storage->load($object->id(), ['default']); if (!empty($published)) { $original_object->setValue($published); $item->setOriginalObject($original_object); diff --git a/web/modules/custom/solution/solution.behat.inc b/web/modules/custom/solution/solution.behat.inc index ce012003e5..45dfadd0ff 100644 --- a/web/modules/custom/solution/solution.behat.inc +++ b/web/modules/custom/solution/solution.behat.inc @@ -217,7 +217,6 @@ class SolutionSubContext extends DrupalSubContextBase implements DrupalSubContex // As each given step is executed in the same request // we need to reset the mapping. $storage = \Drupal::entityManager()->getStorage('rdf_entity'); - $storage->getGraphHandler()->resetRequestGraphs('rdf_entity'); foreach ($membership_table->getColumnsHash() as $values) { $group = $this->getRdfEntityByLabel($values['solution'], 'solution'); /** @var \Drupal\node\NodeInterface $content */ diff --git a/web/modules/custom/solution/solution.module b/web/modules/custom/solution/solution.module index 4f030e76a3..c072fad53f 100644 --- a/web/modules/custom/solution/solution.module +++ b/web/modules/custom/solution/solution.module @@ -20,6 +20,7 @@ use Drupal\og\Og; use Drupal\og\OgRoleInterface; use Drupal\rdf_entity\Entity\Rdf; use Drupal\rdf_entity\Entity\RdfEntityType; +use Drupal\rdf_entity\RdfEntityGraphInterface; use Drupal\rdf_entity\RdfInterface; use Drupal\search_api\Query\QueryInterface; use Drupal\user\Entity\User; @@ -220,9 +221,7 @@ function solution_update_collection_affiliation($solution_id, $collection_id) { // Add the reference field both to the published and the draft collection. foreach (['default', 'draft'] as $graph) { - $storage->setRequestGraphs($collection_id, [$graph]); - $collection = $storage->load($collection_id); - $storage->getGraphHandler()->resetRequestGraphs('rdf_entity', [$collection_id]); + $collection = $storage->load($collection_id, [$graph]); if (empty($collection)) { continue; } @@ -502,10 +501,10 @@ function solution_rdf_entity_presave(EntityInterface $entity) { $state = $entity->field_is_state->value; if (in_array($state, ['draft', 'proposed', 'needs_update', 'blacklisted'])) { - \Drupal::entityManager()->getStorage($entity->getEntityTypeId())->getGraphHandler()->setTargetGraphToEntity($entity, 'draft'); + $entity->set('graph', 'draft'); } elseif (in_array($state, ['validated', 'deletion_request'])) { - \Drupal::entityManager()->getStorage($entity->getEntityTypeId())->getGraphHandler()->setTargetGraphToEntity($entity, 'default'); + $entity->set('graph', RdfEntityGraphInterface::DEFAULT); } elseif (empty($state)) { throw new \Exception("State field not found while trying to get the appropriate graph."); diff --git a/web/profiles/joinup/config/install/rdf_entity.graph.default.yml b/web/profiles/joinup/config/install/rdf_entity.graph.default.yml index 2e9e9a1074..8f2289505e 100644 --- a/web/profiles/joinup/config/install/rdf_entity.graph.default.yml +++ b/web/profiles/joinup/config/install/rdf_entity.graph.default.yml @@ -1,5 +1,6 @@ langcode: en status: true id: default +weight: 0 name: Published description: 'Default graph. This is available for all entity types and bundles.' diff --git a/web/profiles/joinup/config/install/rdf_entity.graph.draft.yml b/web/profiles/joinup/config/install/rdf_entity.graph.draft.yml index 479a956c30..d6291411c7 100644 --- a/web/profiles/joinup/config/install/rdf_entity.graph.draft.yml +++ b/web/profiles/joinup/config/install/rdf_entity.graph.draft.yml @@ -1,6 +1,7 @@ langcode: en status: true id: draft +weight: 10 name: Draft description: 'Draft graph.' entity_types: From 35151102c06f595c600bdfe68d30c18afa8aff63 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Thu, 18 Jan 2018 23:29:41 +0200 Subject: [PATCH 12/16] ISAICP-4211: Use the patched version of Drush 9 'updb' command. --- composer.json | 2 +- composer.lock | 16 ++++++++-------- .../joinup_migrate.post_update.php | 2 -- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 0a6f35cb04..72a9783f8b 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "drupal/video_embed_field": "~1.5", "drupal/view_unpublished": "~1.0@alpha", "drupal/views_bulk_operations": "^1.0", - "drush/drush": "dev-update-message-out-of-order as 9.0.0-rc1", + "drush/drush": "dev-post-update-modules-loaded as 9.0.0-rc1", "easyrdf/easyrdf": "0.10.0-alpha1 as 0.9.2", "ec-europa/infra": "dev-master", "ec-europa/material-design-lite": "dev-version-1.1.3", diff --git a/composer.lock b/composer.lock index 4391836edb..dfd78e3766 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "e985e6e712f33521926b818fbe065572", + "content-hash": "8d1ffb5482bb51ac2ff26fe8fc17515b", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -5144,16 +5144,16 @@ }, { "name": "drush/drush", - "version": "dev-update-message-out-of-order", + "version": "dev-post-update-modules-loaded", "source": { "type": "git", "url": "https://github.com/pfrenssen/drush.git", - "reference": "a8d58e8582a613e04ce62d7667ca5649a8269dce" + "reference": "f2c786010c4545b0852f5fd4a3a755399d6d33d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pfrenssen/drush/zipball/a8d58e8582a613e04ce62d7667ca5649a8269dce", - "reference": "a8d58e8582a613e04ce62d7667ca5649a8269dce", + "url": "https://api.github.com/repos/pfrenssen/drush/zipball/f2c786010c4545b0852f5fd4a3a755399d6d33d5", + "reference": "f2c786010c4545b0852f5fd4a3a755399d6d33d5", "shasum": "" }, "require": { @@ -5269,9 +5269,9 @@ "forum": "http://drupal.stackexchange.com/questions/tagged/drush", "irc": "irc://irc.freenode.org/drush", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/pfrenssen/drush/tree/update-message-out-of-order" + "source": "https://github.com/pfrenssen/drush/tree/post-update-modules-loaded" }, - "time": "2018-01-15T10:13:48+00:00" + "time": "2018-01-18T16:23:26+00:00" }, { "name": "easyrdf/easyrdf", @@ -12259,7 +12259,7 @@ { "alias": "9.0.0-rc1", "alias_normalized": "9.0.0.0-RC1", - "version": "dev-update-message-out-of-order", + "version": "dev-post-update-modules-loaded", "package": "drush/drush" }, { diff --git a/web/modules/custom/joinup_migrate/joinup_migrate.post_update.php b/web/modules/custom/joinup_migrate/joinup_migrate.post_update.php index eceab4d40d..aba8385b44 100644 --- a/web/modules/custom/joinup_migrate/joinup_migrate.post_update.php +++ b/web/modules/custom/joinup_migrate/joinup_migrate.post_update.php @@ -316,8 +316,6 @@ function joinup_migrate_post_update_srits_change_owner() { * Copy the about text to distributions for CTT Spain [ISAICP-4057]. */ function joinup_migrate_post_update_copy_about_text_ctt_spain() { - \Drupal::moduleHandler()->loadAll(); - $solution_labels = []; $collection = Rdf::load('http://administracionelectronica.gob.es/ctt'); /** @var \Drupal\Core\Field\EntityReferenceFieldItemListInterface $solutions */ From 2152887d832604e1dccaa8367ec8cb0f7935c4a4 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Fri, 19 Jan 2018 10:45:59 +0200 Subject: [PATCH 13/16] ISAICP-4211: Grap the latest version of rdf_entity. --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index dfd78e3766..8ddb411741 100644 --- a/composer.lock +++ b/composer.lock @@ -4264,12 +4264,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "2f7a793f46caf7daa82ab1527e4c18bdf8d3bf2f" + "reference": "5181d6302ba535332a7249cfa4fdd7cec99674f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/2f7a793f46caf7daa82ab1527e4c18bdf8d3bf2f", - "reference": "2f7a793f46caf7daa82ab1527e4c18bdf8d3bf2f", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/5181d6302ba535332a7249cfa4fdd7cec99674f6", + "reference": "5181d6302ba535332a7249cfa4fdd7cec99674f6", "shasum": "" }, "require": { @@ -4289,7 +4289,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-18T17:58:05+00:00" + "time": "2018-01-19T08:43:23+00:00" }, { "name": "drupal/redirect", From 34abe2c5615bd6165787df4edadbec78ce4b473b Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Mon, 22 Jan 2018 17:41:11 +0200 Subject: [PATCH 14/16] ISAICP-4211: Use the last commit from drupal/rdf_entity. --- composer.lock | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 77327acacb..3250965634 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "eae81320be4b6298eb5ae1108865f13a", + "content-hash": "b732d8fb82ad1f1758ca29900916d5e4", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -1069,7 +1069,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "BSD-2-Clause" ], "authors": [ { @@ -4265,12 +4265,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "5181d6302ba535332a7249cfa4fdd7cec99674f6" + "reference": "af695e587e660205ac2eae5c5a0bcfad1ffcfded" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/5181d6302ba535332a7249cfa4fdd7cec99674f6", - "reference": "5181d6302ba535332a7249cfa4fdd7cec99674f6", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/af695e587e660205ac2eae5c5a0bcfad1ffcfded", + "reference": "af695e587e660205ac2eae5c5a0bcfad1ffcfded", "shasum": "" }, "require": { @@ -4290,7 +4290,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-19T08:43:23+00:00" + "time": "2018-01-22T15:31:17+00:00" }, { "name": "drupal/redirect", @@ -5204,7 +5204,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -10474,7 +10474,8 @@ "homepage": "https://www.drupal.org/project/default_content", "support": { "source": "http://cgit.drupalcode.org/default_content" - } + }, + "time": "2017-10-19T21:26:16+00:00" }, { "name": "drupal/devel", @@ -10642,8 +10643,6 @@ }, "require-dev": { "behat/mink-zombie-driver": "^1.2", - "drupal/coder": "^8.2", - "jakub-onderka/php-parallel-lint": "^0.9.2", "phpspec/phpspec": "~2.0", "phpunit/phpunit": "3.7.*" }, @@ -10668,14 +10667,6 @@ { "name": "Jonathan Hedstrom", "email": "jhedstrom@gmail.com" - }, - { - "name": "Melissa Anderson", - "homepage": "https://github.com/eliza411" - }, - { - "name": "Pieter Frenssen", - "homepage": "https://github.com/pfrenssen" } ], "description": "Drupal extension for Behat", From 2006d1760035b93e76d0ef5891c38c9f7c25b962 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Mon, 22 Jan 2018 19:01:13 +0200 Subject: [PATCH 15/16] ISAICP-4211: Use the last commit from drupal/rdf_entity (2). --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 3250965634..ddf75d8aaa 100644 --- a/composer.lock +++ b/composer.lock @@ -4265,12 +4265,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "af695e587e660205ac2eae5c5a0bcfad1ffcfded" + "reference": "11b92c763b923360f567f5cfd07c4e8a009c0ef8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/af695e587e660205ac2eae5c5a0bcfad1ffcfded", - "reference": "af695e587e660205ac2eae5c5a0bcfad1ffcfded", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/11b92c763b923360f567f5cfd07c4e8a009c0ef8", + "reference": "11b92c763b923360f567f5cfd07c4e8a009c0ef8", "shasum": "" }, "require": { @@ -4290,7 +4290,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-22T15:31:17+00:00" + "time": "2018-01-22T16:59:21+00:00" }, { "name": "drupal/redirect", From 51b159c9e48805cca417a7862b69ae4db7903427 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Tue, 23 Jan 2018 14:53:00 +0200 Subject: [PATCH 16/16] ISAICP-4211: Address some upstream QA remarks. --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index ddf75d8aaa..72e5665ef6 100644 --- a/composer.lock +++ b/composer.lock @@ -4265,12 +4265,12 @@ "source": { "type": "git", "url": "https://github.com/ec-europa/rdf_entity.git", - "reference": "11b92c763b923360f567f5cfd07c4e8a009c0ef8" + "reference": "31828f7f824640f665ce7376592ba13784fafae9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/11b92c763b923360f567f5cfd07c4e8a009c0ef8", - "reference": "11b92c763b923360f567f5cfd07c4e8a009c0ef8", + "url": "https://api.github.com/repos/ec-europa/rdf_entity/zipball/31828f7f824640f665ce7376592ba13784fafae9", + "reference": "31828f7f824640f665ce7376592ba13784fafae9", "shasum": "" }, "require": { @@ -4290,7 +4290,7 @@ "issues": "https://drupal.org/project/issues/rdf_entity", "source": "https://cgit.drupalcode.org/rdf_entity" }, - "time": "2018-01-22T16:59:21+00:00" + "time": "2018-01-23T12:49:43+00:00" }, { "name": "drupal/redirect",