From 14e829fd66f9ca6bfbd540da706c60f4d81b37d8 Mon Sep 17 00:00:00 2001 From: David Valdez Date: Tue, 28 Aug 2018 18:20:36 -0500 Subject: [PATCH] Add the bio and the gpg field in the users. Also, the user migration was updated to migrate the data of these fields. --- ....entity_form_display.user.user.default.yml | 28 ++++++++++++ ....entity_view_display.user.user.default.yml | 19 ++++++++ .../sync/field.field.user.user.field_bio.yml | 22 ++++++++++ ...d.field.user.user.field_gpg_public_key.yml | 27 ++++++++++++ config/sync/field.storage.user.field_bio.yml | 19 ++++++++ ...ield.storage.user.field_gpg_public_key.yml | 23 ++++++++++ .../migrations/agaric_files.yml | 44 +++++++++---------- .../migrations/agaric_page.yml | 22 +++++----- .../migrations/agaric_user.yml | 27 ++++++++++++ 9 files changed, 198 insertions(+), 33 deletions(-) create mode 100644 config/sync/field.field.user.user.field_bio.yml create mode 100644 config/sync/field.field.user.user.field_gpg_public_key.yml create mode 100644 config/sync/field.storage.user.field_bio.yml create mode 100644 config/sync/field.storage.user.field_gpg_public_key.yml diff --git a/config/sync/core.entity_form_display.user.user.default.yml b/config/sync/core.entity_form_display.user.user.default.yml index e5b9a19..7bc2774 100644 --- a/config/sync/core.entity_form_display.user.user.default.yml +++ b/config/sync/core.entity_form_display.user.user.default.yml @@ -3,11 +3,15 @@ langcode: en status: true dependencies: config: + - field.field.user.user.field_bio + - field.field.user.user.field_gpg_public_key - field.field.user.user.user_picture - image.style.thumbnail module: + - file - image - path + - text - user _core: default_config_hash: cAoTuTfmGrGB_89qPV_cTRlA7NXOWtLCLePKVX4SO3A @@ -19,12 +23,34 @@ content: account: weight: -10 region: content + settings: { } + third_party_settings: { } contact: weight: 5 region: content + settings: { } + third_party_settings: { } + field_bio: + weight: 32 + settings: + rows: 9 + summary_rows: 3 + placeholder: '' + third_party_settings: { } + type: text_textarea_with_summary + region: content + field_gpg_public_key: + weight: 31 + settings: + progress_indicator: throbber + third_party_settings: { } + type: file_generic + region: content language: weight: 0 region: content + settings: { } + third_party_settings: { } path: type: path weight: 30 @@ -34,6 +60,8 @@ content: timezone: weight: 6 region: content + settings: { } + third_party_settings: { } user_picture: type: image_image settings: diff --git a/config/sync/core.entity_view_display.user.user.default.yml b/config/sync/core.entity_view_display.user.user.default.yml index fe992f9..b6673e5 100644 --- a/config/sync/core.entity_view_display.user.user.default.yml +++ b/config/sync/core.entity_view_display.user.user.default.yml @@ -3,10 +3,14 @@ langcode: en status: true dependencies: config: + - field.field.user.user.field_bio + - field.field.user.user.field_gpg_public_key - field.field.user.user.user_picture - image.style.thumbnail module: + - file - image + - text - user _core: default_config_hash: '-spcniWjm5Ez6YM3ccxk3ocvsn52jkdaGEgp0xzPYU8' @@ -15,6 +19,21 @@ targetEntityType: user bundle: user mode: default content: + field_bio: + weight: 2 + label: above + settings: { } + third_party_settings: { } + type: text_default + region: content + field_gpg_public_key: + weight: 1 + label: above + settings: + use_description_as_link_text: true + third_party_settings: { } + type: file_default + region: content user_picture: type: image weight: 0 diff --git a/config/sync/field.field.user.user.field_bio.yml b/config/sync/field.field.user.user.field_bio.yml new file mode 100644 index 0000000..6729913 --- /dev/null +++ b/config/sync/field.field.user.user.field_bio.yml @@ -0,0 +1,22 @@ +uuid: dc19403f-a0a1-47e9-9a98-292f5cc2683f +langcode: en +status: true +dependencies: + config: + - field.storage.user.field_bio + module: + - text + - user +id: user.user.field_bio +field_name: field_bio +entity_type: user +bundle: user +label: Bio +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + display_summary: false +field_type: text_with_summary diff --git a/config/sync/field.field.user.user.field_gpg_public_key.yml b/config/sync/field.field.user.user.field_gpg_public_key.yml new file mode 100644 index 0000000..bdabc46 --- /dev/null +++ b/config/sync/field.field.user.user.field_gpg_public_key.yml @@ -0,0 +1,27 @@ +uuid: f3bac6b8-03b8-4b50-813d-74a0aebdb7ef +langcode: en +status: true +dependencies: + config: + - field.storage.user.field_gpg_public_key + module: + - file + - user +id: user.user.field_gpg_public_key +field_name: field_gpg_public_key +entity_type: user +bundle: user +label: 'GPG public key' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + file_directory: '' + file_extensions: asc + max_filesize: '' + description_field: false + handler: 'default:file' + handler_settings: { } +field_type: file diff --git a/config/sync/field.storage.user.field_bio.yml b/config/sync/field.storage.user.field_bio.yml new file mode 100644 index 0000000..7d3280e --- /dev/null +++ b/config/sync/field.storage.user.field_bio.yml @@ -0,0 +1,19 @@ +uuid: 86ae8bc8-2606-42f0-9cda-da3f6bf63306 +langcode: en +status: true +dependencies: + module: + - text + - user +id: user.field_bio +field_name: field_bio +entity_type: user +type: text_with_summary +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.user.field_gpg_public_key.yml b/config/sync/field.storage.user.field_gpg_public_key.yml new file mode 100644 index 0000000..8812d06 --- /dev/null +++ b/config/sync/field.storage.user.field_gpg_public_key.yml @@ -0,0 +1,23 @@ +uuid: ef210af7-b091-46d9-a882-2b15fd240ca1 +langcode: en +status: true +dependencies: + module: + - file + - user +id: user.field_gpg_public_key +field_name: field_gpg_public_key +entity_type: user +type: file +settings: + display_field: false + display_default: false + uri_scheme: public + target_type: file +module: file +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/web/modules/custom/agaric_migration/migrations/agaric_files.yml b/web/modules/custom/agaric_migration/migrations/agaric_files.yml index 40bfeb0..50ba780 100644 --- a/web/modules/custom/agaric_migration/migrations/agaric_files.yml +++ b/web/modules/custom/agaric_migration/migrations/agaric_files.yml @@ -7,18 +7,18 @@ source: process: filename: filename source_full_path: - - - plugin: concat - delimiter: / - source: - - filepath - - - plugin: str_replace - search: 'sites/default/files/' - # The old files must be located at this path: - replace: 'sites/default/import/' - - - plugin: urlencode + - + plugin: concat + delimiter: / + source: + - filepath + - + plugin: str_replace + search: 'sites/default/files/' + # The old files must be located at this path: + replace: 'sites/default/import/' + - + plugin: urlencode uri: plugin: file_copy source: @@ -29,17 +29,17 @@ process: created: timestamp changed: timestamp uid: - - - plugin: migration_lookup - migration: agaric_user - source: uid - no_stub: true - - - # If the user id does not exists then migrate it as anonymous. - plugin: default_value - default_value: 0 + - + plugin: migration_lookup + migration: agaric_user + source: uid + no_stub: true + - + # If the user id does not exists then migrate it as anonymous. + plugin: default_value + default_value: 0 destination: plugin: entity:file migration_dependencies: required: - - nichq_community_user + - agaric_user diff --git a/web/modules/custom/agaric_migration/migrations/agaric_page.yml b/web/modules/custom/agaric_migration/migrations/agaric_page.yml index 9433274..626a0cf 100644 --- a/web/modules/custom/agaric_migration/migrations/agaric_page.yml +++ b/web/modules/custom/agaric_migration/migrations/agaric_page.yml @@ -16,14 +16,14 @@ process: default_value: "und" title: title uid: - - - plugin: migration_lookup - migration: agaric_user - source: node_uid - no_stub: true - - - plugin: skip_on_empty - method: row + - + plugin: migration_lookup + migration: agaric_user + source: node_uid + no_stub: true + - + plugin: skip_on_empty + method: row paragraph_body: plugin: migration migration: agaric_page_paragraph @@ -31,7 +31,7 @@ process: field_body_paragraph: plugin: iterator source: - - '@paragraph_body' + - '@paragraph_body' process: target_id: '0' target_revision_id: '1' @@ -45,5 +45,5 @@ process: revision_timestamp: timestamp migration_dependencies: required: - - agaric_user - - agaric_page_paragraph + - agaric_user + - agaric_page_paragraph diff --git a/web/modules/custom/agaric_migration/migrations/agaric_user.yml b/web/modules/custom/agaric_migration/migrations/agaric_user.yml index afdb7cf..0adb624 100644 --- a/web/modules/custom/agaric_migration/migrations/agaric_user.yml +++ b/web/modules/custom/agaric_migration/migrations/agaric_user.yml @@ -15,6 +15,7 @@ process: status: status timezone: timezone init: init + field_bio: field_bio roles: - plugin: static_map @@ -30,3 +31,29 @@ process: plugin: role_generate entity_type: user_role value_key: id + field_gpg_public_key/target_id: + - + plugin: extract + source: field_gpg_public_key + default: '' + index: + - 0 + - fid + - + plugin: skip_on_empty + method: process + - + plugin: migration_lookup + migration: agaric_file + user_picture: + - + plugin: default_value + source: picture + default_value: null + - + plugin: migration_lookup + migration: agaric_file +migration_dependencies: + optional: + - agaric_file +