5 Commits beee434e21 ... b03b2d5c10

Auteur SHA1 Bericht Datum
  Bachir Soussi Chiadmi b03b2d5c10 some updates 6 jaren geleden
  Bachir Soussi Chiadmi f30d82427b added user profile migration to script 6 jaren geleden
  Bachir Soussi Chiadmi ba5a74415c exported config 6 jaren geleden
  Bachir Soussi Chiadmi 45f44e0623 user profile contact_op ok 6 jaren geleden
  Bachir Soussi Chiadmi 0e4c06a73a user profile member email ok 6 jaren geleden
48 gewijzigde bestanden met toevoegingen van 305 en 461 verwijderingen
  1. 3 0
      composer.json
  2. 203 86
      composer.lock
  3. 2 0
      config/sync/autologout.role.adherent.yml
  4. 1 1
      config/sync/autologout.role.admin.yml
  5. 2 0
      config/sync/autologout.role.admin_showroom.yml
  6. 2 0
      config/sync/autologout.role.alpha_testeur.yml
  7. 2 0
      config/sync/autologout.role.contact_company.yml
  8. 2 0
      config/sync/autologout.role.free_user.yml
  9. 2 0
      config/sync/autologout.role.premium.yml
  10. 1 1
      config/sync/autologout.role.root.yml
  11. 2 0
      config/sync/autologout.role.student.yml
  12. 2 0
      config/sync/autologout.role.translator.yml
  13. 2 0
      config/sync/autologout.role.unverified.yml
  14. 3 3
      config/sync/autologout.settings.yml
  15. 1 0
      config/sync/config_split.config_split.devel.yml
  16. 7 7
      config/sync/core.entity_view_display.profile.contact_company.default.yml
  17. 13 13
      config/sync/core.entity_view_display.profile.member.admin_view.yml
  18. 0 5
      config/sync/field.field.profile.contact_company.field_email.yml
  19. 0 5
      config/sync/field.field.profile.contact_company.field_memo.yml
  20. 0 5
      config/sync/field.field.profile.contact_company.field_name.yml
  21. 0 3
      config/sync/field.field.profile.contact_company.field_phone.yml
  22. 0 5
      config/sync/field.field.profile.contact_company.field_position.yml
  23. 0 4
      config/sync/field.field.profile.contact_company.field_title.yml
  24. 0 5
      config/sync/field.field.profile.member.field_naf.yml
  25. 0 5
      config/sync/field.field.profile.member.field_organization.yml
  26. 0 5
      config/sync/field.field.profile.member.field_siret.yml
  27. 0 4
      config/sync/field.field.profile.member.field_title.yml
  28. 0 5
      config/sync/field.field.profile.member.field_vat_number_intra_ce.yml
  29. 1 1
      config/sync/migrate_plus.migration.d7_allpublicfiles.yml
  30. 1 1
      config/sync/migrate_plus.migration.d7_node_breve.yml
  31. 1 1
      config/sync/migrate_plus.migration.d7_node_breve_i18n.yml
  32. 1 1
      config/sync/migrate_plus.migration.d7_node_materiau.yml
  33. 1 1
      config/sync/migrate_plus.migration.d7_node_materiau_i18n.yml
  34. 1 1
      config/sync/migrate_plus.migration.d7_taxonomy_term_company.yml
  35. 1 1
      config/sync/migrate_plus.migration.d7_taxonomy_term_showroom.yml
  36. 1 1
      config/sync/migrate_plus.migration.d7_taxonomy_term_tags.yml
  37. 1 1
      config/sync/migrate_plus.migration.d7_taxonomy_term_tags_i18n.yml
  38. 1 1
      config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus.yml
  39. 1 1
      config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus_i18n.yml
  40. 23 12
      config/sync/migrate_plus.migration.d7_user_profile.yml
  41. 1 1
      config/sync/migrate_plus.migration.d7_users.yml
  42. 2 2
      config/sync/migrate_plus.migration_group.d7_materio.yml
  43. 2 0
      config/sync/user.role.admin.yml
  44. 1 253
      config/sync/views.view.admin_users.yml
  45. 2 2
      migrate-from-d7.sh
  46. 7 14
      web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_user_profile.yml
  47. 5 3
      web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7UserProfile.php
  48. 1 1
      web/profiles/d8-starterkit-profile

+ 3 - 0
composer.json

@@ -20,10 +20,13 @@
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6.5",
         "drupal-composer/drupal-scaffold": "^2.5",
+        "drupal/agnian_material_admin": "1.x-dev",
         "drupal/computed_field": "^2.0@beta",
         "drupal/config_split": "^1.4",
         "drupal/console": "^1.0.2",
         "drupal/core": "^8.6.0",
+        "drupal/entity_clone": "^1.0",
+        "drupal/flexi": "1.x-dev",
         "drupal/migrate_plus": "4.x-dev",
         "drupal/migrate_tools": "4.x-dev",
         "drupal/select_translation": "1.x-dev",

+ 203 - 86
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "da7d2b41786f2def14a0d5da5f0f59e8",
+    "content-hash": "1b3daf3240884b4153434016242f1772",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -717,16 +717,16 @@
         },
         {
             "name": "consolidation/robo",
-            "version": "1.4.3",
+            "version": "1.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "d0b6f516ec940add7abed4f1432d30cca5f8ae0c"
+                "reference": "8bec6a6ea54a7d03d56552a4250c49dec3b3083d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/d0b6f516ec940add7abed4f1432d30cca5f8ae0c",
-                "reference": "d0b6f516ec940add7abed4f1432d30cca5f8ae0c",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/8bec6a6ea54a7d03d56552a4250c49dec3b3083d",
+                "reference": "8bec6a6ea54a7d03d56552a4250c49dec3b3083d",
                 "shasum": ""
             },
             "require": {
@@ -757,7 +757,7 @@
                 "natxet/cssmin": "3.0.4",
                 "nikic/php-parser": "^3.1.5",
                 "patchwork/jsqueeze": "~2",
-                "pear/archive_tar": "^1.4.2",
+                "pear/archive_tar": "^1.4.4",
                 "php-coveralls/php-coveralls": "^1",
                 "phpunit/php-code-coverage": "~2|~4",
                 "squizlabs/php_codesniffer": "^2.8"
@@ -821,7 +821,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2019-01-02T21:33:28+00:00"
+            "time": "2019-02-08T20:59:23+00:00"
         },
         {
             "name": "consolidation/self-update",
@@ -1958,6 +1958,56 @@
                 "source": "http://cgit.drupalcode.org/advanced_text_formatter"
             }
         },
+        {
+            "name": "drupal/agnian_material_admin",
+            "version": "dev-1.x",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/agnian_material_admin",
+                "reference": "0a3ea953011772fef296d33bfe1b5ae3c42b1238"
+            },
+            "require": {
+                "drupal/core": "~8.0"
+            },
+            "type": "drupal-theme",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.29+1-dev",
+                    "datestamp": "1548169680",
+                    "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-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "raffi",
+                    "homepage": "https://www.drupal.org/user/74748"
+                },
+                {
+                    "name": "saidatom",
+                    "homepage": "https://www.drupal.org/user/1846674"
+                },
+                {
+                    "name": "ysarkisyan",
+                    "homepage": "https://www.drupal.org/user/420671"
+                }
+            ],
+            "description": "Agnian material admin theme for Drupal.",
+            "homepage": "https://www.drupal.org/project/agnian_material_admin",
+            "support": {
+                "source": "http://cgit.drupalcode.org/agnian_material_admin"
+            },
+            "time": "2019-01-22T17:17:50+00:00"
+        },
         {
             "name": "drupal/audiofield",
             "version": "1.8.0",
@@ -3316,16 +3366,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "8.6.8",
+            "version": "8.6.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "0e0ccce552859f6fd3aec6b5754ad0d6ede07227"
+                "reference": "cac12e0ec19d5c6fa53778522b3ff4c542f86c8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/0e0ccce552859f6fd3aec6b5754ad0d6ede07227",
-                "reference": "0e0ccce552859f6fd3aec6b5754ad0d6ede07227",
+                "url": "https://api.github.com/repos/drupal/core/zipball/cac12e0ec19d5c6fa53778522b3ff4c542f86c8d",
+                "reference": "cac12e0ec19d5c6fa53778522b3ff4c542f86c8d",
                 "shasum": ""
             },
             "require": {
@@ -3554,7 +3604,7 @@
                 "GPL-2.0-or-later"
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2019-02-06T15:13:52+00:00"
+            "time": "2019-02-08T12:21:40+00:00"
         },
         {
             "name": "drupal/cshs",
@@ -3608,20 +3658,20 @@
         },
         {
             "name": "drupal/ctools",
-            "version": "3.0.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/ctools",
-                "reference": "8.x-3.0"
+                "reference": "8.x-3.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.0.zip",
-                "reference": "8.x-3.0",
-                "shasum": "302e869ecd1e59fe55663673999fee2ccac5daa8"
+                "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.1.zip",
+                "reference": "8.x-3.1",
+                "shasum": "7056df469624ec3943c62ebe613dbfcb3171dcd1"
             },
             "require": {
-                "drupal/core": "~8.0"
+                "drupal/core": "^8.5"
             },
             "type": "drupal-module",
             "extra": {
@@ -3629,8 +3679,8 @@
                     "dev-3.x": "3.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-3.0",
-                    "datestamp": "1493401742",
+                    "version": "8.x-3.1",
+                    "datestamp": "1549603381",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3752,36 +3802,39 @@
         },
         {
             "name": "drupal/devel",
-            "version": "1.2.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/devel",
-                "reference": "8.x-1.2"
+                "reference": "8.x-2.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/devel-8.x-1.2.zip",
-                "reference": "8.x-1.2",
-                "shasum": "01f3349ef75f6e21fceef24be9d3d6506ca29647"
+                "url": "https://ftp.drupal.org/files/projects/devel-8.x-2.0.zip",
+                "reference": "8.x-2.0",
+                "shasum": "cf5fb816f767f3cac4f2e170ab39e982d5e0698b"
             },
             "require": {
-                "drupal/core": "~8.0"
-            },
-            "suggest": {
-                "symfony/var-dumper": "Pretty print complex values better with var-dumper available"
+                "drupal/core": "~8.0",
+                "symfony/var-dumper": "~2.7|^3"
             },
             "type": "drupal-module",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.x-dev"
+                    "dev-2.x": "2.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.2",
-                    "datestamp": "1507197844",
+                    "version": "8.x-2.0",
+                    "datestamp": "1548799380",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
                     }
+                },
+                "drush": {
+                    "services": {
+                        "drush.services.yml": "^9"
+                    }
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -3834,7 +3887,7 @@
         },
         {
             "name": "drupal/devel_generate",
-            "version": "1.2.0",
+            "version": "2.0.0",
             "require": {
                 "drupal/core": "~8.0",
                 "drupal/devel": "self.version"
@@ -3842,41 +3895,52 @@
             "type": "metapackage",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.x-dev"
+                    "dev-2.x": "2.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.2",
-                    "datestamp": "1507197844",
+                    "version": "8.x-2.0",
+                    "datestamp": "1548799380",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
                     }
+                },
+                "drush": {
+                    "services": {
+                        "drush.services.yml": "^9"
+                    }
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0-or-later"
+                "GPL-2.0+"
             ],
             "authors": [
                 {
-                    "name": "catch",
-                    "homepage": "https://www.drupal.org/user/35733"
+                    "name": "Moshe Weitzman",
+                    "homepage": "https://github.com/weitzman",
+                    "email": "weitzman@tejasa.com",
+                    "role": "Maintainer"
                 },
                 {
-                    "name": "juampynr",
-                    "homepage": "https://www.drupal.org/user/682736"
+                    "name": "Hans Salvisberg",
+                    "homepage": "https://www.drupal.org/u/salvis",
+                    "email": "drupal@salvisberg.com",
+                    "role": "Maintainer"
                 },
                 {
-                    "name": "lussoluca",
-                    "homepage": "https://www.drupal.org/user/138068"
+                    "name": "Luca Lusso",
+                    "homepage": "https://www.drupal.org/u/lussoluca",
+                    "role": "Maintainer"
                 },
                 {
-                    "name": "moshe weitzman",
-                    "homepage": "https://www.drupal.org/user/23"
+                    "name": "Marco (willzyx)",
+                    "homepage": "https://www.drupal.org/u/willzyx",
+                    "role": "Maintainer"
                 },
                 {
-                    "name": "pcambra",
-                    "homepage": "https://www.drupal.org/user/122101"
+                    "name": "See contributors",
+                    "homepage": "https://www.drupal.org/node/3236/committers"
                 },
                 {
                     "name": "salvis",
@@ -3888,9 +3952,11 @@
                 }
             ],
             "description": "Generate dummy users, nodes, menus, taxonomy terms...",
-            "homepage": "https://www.drupal.org/project/devel",
+            "homepage": "http://drupal.org/project/devel",
             "support": {
-                "source": "http://cgit.drupalcode.org/devel"
+                "source": "http://cgit.drupalcode.org/devel",
+                "issues": "http://drupal.org/project/devel",
+                "irc": "irc://irc.freenode.org/drupal-contribute"
             }
         },
         {
@@ -3899,7 +3965,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/domain",
-                "reference": "0fed3e661813b1c254a7bd9448e773f5f1a1276a"
+                "reference": "b8519b2a8201e7636efced1fb9945f8ce94f4bc8"
             },
             "require": {
                 "drupal/core": "^8.5"
@@ -3913,8 +3979,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-alpha14+77-dev",
-                    "datestamp": "1546629180",
+                    "version": "8.x-1.0-alpha14+80-dev",
+                    "datestamp": "1549396080",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Dev releases are not covered by Drupal security advisories."
@@ -3940,7 +4006,7 @@
             "support": {
                 "source": "http://cgit.drupalcode.org/domain"
             },
-            "time": "2019-02-05T19:47:44+00:00"
+            "time": "2019-02-11T16:25:59+00:00"
         },
         {
             "name": "drupal/domain_alias",
@@ -4761,6 +4827,52 @@
             },
             "time": "2016-07-27T19:01:11+00:00"
         },
+        {
+            "name": "drupal/flexi",
+            "version": "dev-1.x",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/flexi",
+                "reference": "1786c56c7dd2be20a4684d3a3df91eff13a3b928"
+            },
+            "require": {
+                "drupal/core": "~8.0"
+            },
+            "type": "drupal-theme",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.3+3-dev",
+                    "datestamp": "1549435680",
+                    "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-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Girish-jerk",
+                    "homepage": "https://www.drupal.org/user/3406890"
+                },
+                {
+                    "name": "Sakthivel M",
+                    "homepage": "https://www.drupal.org/user/2947669"
+                }
+            ],
+            "description": "HTML5 based Responsive Drupal Base theme. Most flexible & user friendly theme for backend and frontend.",
+            "homepage": "https://www.drupal.org/project/flexi",
+            "support": {
+                "source": "http://cgit.drupalcode.org/flexi"
+            },
+            "time": "2019-02-06T06:48:14+00:00"
+        },
         {
             "name": "drupal/honeypot",
             "version": "1.29.0",
@@ -4974,7 +5086,7 @@
         },
         {
             "name": "drupal/kint",
-            "version": "1.2.0",
+            "version": "2.0.0",
             "require": {
                 "drupal/core": "~8.0",
                 "drupal/devel": "self.version"
@@ -4982,11 +5094,11 @@
             "type": "metapackage",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.x-dev"
+                    "dev-2.x": "2.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.2",
-                    "datestamp": "1507197844",
+                    "version": "8.x-2.0",
+                    "datestamp": "1548799380",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5327,17 +5439,17 @@
         },
         {
             "name": "drupal/matomo",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/matomo",
-                "reference": "8.x-1.8"
+                "reference": "8.x-1.9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.8.zip",
-                "reference": "8.x-1.8",
-                "shasum": "f7e06e3eab8662bca51187aebc064ffb1f118ce7"
+                "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.9.zip",
+                "reference": "8.x-1.9",
+                "shasum": "2c818af730f834d3aef3f6b7aa29f05e6fa9246d"
             },
             "require": {
                 "drupal/core": "~8.5"
@@ -5352,8 +5464,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.8",
-                    "datestamp": "1548968880",
+                    "version": "8.x-1.9",
+                    "datestamp": "1549615080",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -6796,29 +6908,32 @@
         },
         {
             "name": "drupal/translation_views",
-            "version": "1.0.0-alpha4",
+            "version": "1.0.0-alpha5",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/translation_views",
-                "reference": "8.x-1.0-alpha4"
+                "reference": "8.x-1.0-alpha5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/translation_views-8.x-1.0-alpha4.zip",
-                "reference": "8.x-1.0-alpha4",
-                "shasum": "96f7828005a8d559f31f0dfcb471a68698311cda"
+                "url": "https://ftp.drupal.org/files/projects/translation_views-8.x-1.0-alpha5.zip",
+                "reference": "8.x-1.0-alpha5",
+                "shasum": "f1fc54c4648bca5194c0bdcb6df02dae1e8fefd9"
             },
             "require": {
                 "drupal/core": "*"
             },
+            "require-dev": {
+                "drupal/local_translation": "*"
+            },
             "type": "drupal-module",
             "extra": {
                 "branch-alias": {
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-alpha4",
-                    "datestamp": "1538124180",
+                    "version": "8.x-1.0-alpha5",
+                    "datestamp": "1549581180",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Project has not opted into security advisory coverage!"
@@ -7195,7 +7310,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/views_ef_fieldset",
-                "reference": "f435fba5ce99bead7e57c32479c3e744b10d0cbf"
+                "reference": "d8005b76baa0c9d03553ad75f1aaddae5fb8f0a8"
             },
             "require": {
                 "drupal/core": "*",
@@ -7210,8 +7325,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.2+0-dev",
-                    "datestamp": "1549376580",
+                    "version": "8.x-1.2+1-dev",
+                    "datestamp": "1549467480",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Dev releases are not covered by Drupal security advisories."
@@ -7258,7 +7373,7 @@
             "support": {
                 "source": "http://cgit.drupalcode.org/views_ef_fieldset"
             },
-            "time": "2019-02-06T15:33:42+00:00"
+            "time": "2019-02-06T21:02:32+00:00"
         },
         {
             "name": "drupal/workflow",
@@ -7585,16 +7700,16 @@
         },
         {
             "name": "giggsey/libphonenumber-for-php",
-            "version": "8.10.4",
+            "version": "8.10.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/giggsey/libphonenumber-for-php.git",
-                "reference": "3cda94a4a442c24259fb0893618422a56cb8a898"
+                "reference": "667a1fe292561b7c64c4fc457a9f1ecc41d67185"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/3cda94a4a442c24259fb0893618422a56cb8a898",
-                "reference": "3cda94a4a442c24259fb0893618422a56cb8a898",
+                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/667a1fe292561b7c64c4fc457a9f1ecc41d67185",
+                "reference": "667a1fe292561b7c64c4fc457a9f1ecc41d67185",
                 "shasum": ""
             },
             "require": {
@@ -7649,7 +7764,7 @@
                 "phonenumber",
                 "validation"
             ],
-            "time": "2019-01-24T15:41:24+00:00"
+            "time": "2019-02-08T08:31:08+00:00"
         },
         {
             "name": "giggsey/locale",
@@ -13048,16 +13163,16 @@
         },
         {
             "name": "webflo/drupal-core-require-dev",
-            "version": "8.6.8",
+            "version": "8.6.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webflo/drupal-core-require-dev.git",
-                "reference": "d1398ae231a0592eb8d5c6a50ae63396e677745e"
+                "reference": "c083ddd802bda504d836dc0d4fea44cf2e6f191f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webflo/drupal-core-require-dev/zipball/d1398ae231a0592eb8d5c6a50ae63396e677745e",
-                "reference": "d1398ae231a0592eb8d5c6a50ae63396e677745e",
+                "url": "https://api.github.com/repos/webflo/drupal-core-require-dev/zipball/c083ddd802bda504d836dc0d4fea44cf2e6f191f",
+                "reference": "c083ddd802bda504d836dc0d4fea44cf2e6f191f",
                 "shasum": ""
             },
             "require": {
@@ -13065,7 +13180,7 @@
                 "behat/mink-goutte-driver": "^1.2",
                 "behat/mink-selenium2-driver": "1.3.x-dev",
                 "drupal/coder": "^8.2.12",
-                "drupal/core": "8.6.8",
+                "drupal/core": "8.6.9",
                 "jcalderonzumba/gastonjs": "^1.0.2",
                 "jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
                 "mikey179/vfsstream": "^1.2",
@@ -13081,13 +13196,15 @@
                 "GPL-2.0-or-later"
             ],
             "description": "require-dev dependencies from drupal/core",
-            "time": "2019-02-06T15:31:35+00:00"
+            "time": "2019-02-08T12:31:37+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "drupal/agnian_material_admin": 20,
         "drupal/computed_field": 10,
+        "drupal/flexi": 20,
         "drupal/migrate_plus": 20,
         "drupal/migrate_tools": 20,
         "drupal/select_translation": 20,

+ 2 - 0
config/sync/autologout.role.adherent.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 1 - 1
config/sync/autologout.role.admin.yml

@@ -1,4 +1,4 @@
 enabled: true
-timeout: 172800
+timeout: 0
 _core:
   default_config_hash: Oe-fB2enOwHHacGGf5HLP31RdU9bEsQZ19YQ6AS8pjw

+ 2 - 0
config/sync/autologout.role.admin_showroom.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 2 - 0
config/sync/autologout.role.alpha_testeur.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 2 - 0
config/sync/autologout.role.contact_company.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 2 - 0
config/sync/autologout.role.free_user.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 2 - 0
config/sync/autologout.role.premium.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 1 - 1
config/sync/autologout.role.root.yml

@@ -1,4 +1,4 @@
 enabled: true
-timeout: 172800
+timeout: 0
 _core:
   default_config_hash: Oe-fB2enOwHHacGGf5HLP31RdU9bEsQZ19YQ6AS8pjw

+ 2 - 0
config/sync/autologout.role.student.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 2 - 0
config/sync/autologout.role.translator.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 2 - 0
config/sync/autologout.role.unverified.yml

@@ -0,0 +1,2 @@
+enabled: false
+timeout: null

+ 3 - 3
config/sync/autologout.settings.yml

@@ -1,9 +1,9 @@
 timeout: 1800
 max_timeout: 172800
-padding: 20
-role_logout: false
+padding: 60
+role_logout: true
 redirect_url: /
-no_dialog: true
+no_dialog: false
 message: 'Your session is about to expire. Do you want to reset it?'
 inactivity_message: 'You have been logged out due to inactivity.'
 enforce_admin: false

+ 1 - 0
config/sync/config_split.config_split.devel.yml

@@ -11,6 +11,7 @@ module:
   context_ui: 0
   dblog: 0
   devel: 0
+  entity_clone: 0
   views_ui: 0
   webprofiler: 0
   workflow_ui: 0

+ 7 - 7
config/sync/core.entity_view_display.profile.contact_company.default.yml

@@ -20,7 +20,7 @@ mode: default
 content:
   field_email:
     weight: 4
-    label: above
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     type: basic_string
@@ -33,16 +33,16 @@ content:
     type: basic_string
     region: content
   field_name:
+    type: string
     weight: 1
-    label: above
+    region: content
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
-    region: content
   field_phone:
     weight: 3
-    label: above
+    label: hidden
     settings:
       title: ''
     third_party_settings: {  }
@@ -50,7 +50,7 @@ content:
     region: content
   field_position:
     weight: 2
-    label: above
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -58,7 +58,7 @@ content:
     region: content
   field_title:
     weight: 0
-    label: above
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     type: list_default

+ 13 - 13
config/sync/core.entity_view_display.profile.member.admin_view.yml

@@ -32,7 +32,7 @@ mode: admin_view
 content:
   field_activity_sector:
     weight: 2
-    label: above
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -40,21 +40,21 @@ content:
     region: content
   field_address:
     weight: 8
-    label: above
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     type: address_default
     region: content
   field_email:
     weight: 6
-    label: above
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     type: basic_string
     region: content
   field_employee:
     weight: 9
-    label: above
+    label: inline
     settings:
       thousand_separator: ''
       prefix_suffix: true
@@ -63,7 +63,7 @@ content:
     region: content
   field_naf:
     weight: 10
-    label: above
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -71,7 +71,7 @@ content:
     region: content
   field_organization:
     weight: 1
-    label: above
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -79,7 +79,7 @@ content:
     region: content
   field_phone:
     weight: 7
-    label: above
+    label: hidden
     settings:
       title: ''
     third_party_settings: {  }
@@ -87,7 +87,7 @@ content:
     region: content
   field_position:
     weight: 3
-    label: above
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -95,7 +95,7 @@ content:
     region: content
   field_service:
     weight: 4
-    label: above
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -103,7 +103,7 @@ content:
     region: content
   field_siret:
     weight: 11
-    label: above
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -111,14 +111,14 @@ content:
     region: content
   field_title:
     weight: 0
-    label: above
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     type: list_default
     region: content
   field_vat_number_intra_ce:
     weight: 12
-    label: above
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -126,7 +126,7 @@ content:
     region: content
   field_website:
     weight: 5
-    label: above
+    label: hidden
     settings:
       trim_length: 80
       url_only: false

+ 0 - 5
config/sync/field.field.profile.contact_company.field_email.yml

@@ -5,11 +5,6 @@ dependencies:
   config:
     - field.storage.profile.field_email
     - profile.type.contact_company
-  module:
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.contact_company.field_email
 field_name: field_email
 entity_type: profile

+ 0 - 5
config/sync/field.field.profile.contact_company.field_memo.yml

@@ -5,11 +5,6 @@ dependencies:
   config:
     - field.storage.profile.field_memo
     - profile.type.contact_company
-  module:
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.contact_company.field_memo
 field_name: field_memo
 entity_type: profile

+ 0 - 5
config/sync/field.field.profile.contact_company.field_name.yml

@@ -5,11 +5,6 @@ dependencies:
   config:
     - field.storage.profile.field_name
     - profile.type.contact_company
-  module:
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.contact_company.field_name
 field_name: field_name
 entity_type: profile

+ 0 - 3
config/sync/field.field.profile.contact_company.field_phone.yml

@@ -6,12 +6,9 @@ dependencies:
     - field.storage.profile.field_phone
     - profile.type.contact_company
   module:
-    - profile
     - telephone
     - telephone_validation
 third_party_settings:
-  profile:
-    profile_private: true
   telephone_validation:
     format: 0
     country: {  }

+ 0 - 5
config/sync/field.field.profile.contact_company.field_position.yml

@@ -5,11 +5,6 @@ dependencies:
   config:
     - field.storage.profile.field_position
     - profile.type.contact_company
-  module:
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.contact_company.field_position
 field_name: field_position
 entity_type: profile

+ 0 - 4
config/sync/field.field.profile.contact_company.field_title.yml

@@ -7,10 +7,6 @@ dependencies:
     - profile.type.contact_company
   module:
     - options
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.contact_company.field_title
 field_name: field_title
 entity_type: profile

+ 0 - 5
config/sync/field.field.profile.member.field_naf.yml

@@ -5,11 +5,6 @@ dependencies:
   config:
     - field.storage.profile.field_naf
     - profile.type.member
-  module:
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.member.field_naf
 field_name: field_naf
 entity_type: profile

+ 0 - 5
config/sync/field.field.profile.member.field_organization.yml

@@ -5,11 +5,6 @@ dependencies:
   config:
     - field.storage.profile.field_organization
     - profile.type.member
-  module:
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.member.field_organization
 field_name: field_organization
 entity_type: profile

+ 0 - 5
config/sync/field.field.profile.member.field_siret.yml

@@ -5,11 +5,6 @@ dependencies:
   config:
     - field.storage.profile.field_siret
     - profile.type.member
-  module:
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.member.field_siret
 field_name: field_siret
 entity_type: profile

+ 0 - 4
config/sync/field.field.profile.member.field_title.yml

@@ -7,10 +7,6 @@ dependencies:
     - profile.type.member
   module:
     - options
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.member.field_title
 field_name: field_title
 entity_type: profile

+ 0 - 5
config/sync/field.field.profile.member.field_vat_number_intra_ce.yml

@@ -5,11 +5,6 @@ dependencies:
   config:
     - field.storage.profile.field_vat_number_intra_ce
     - profile.type.member
-  module:
-    - profile
-third_party_settings:
-  profile:
-    profile_private: true
 id: profile.member.field_vat_number_intra_ce
 field_name: field_vat_number_intra_ce
 entity_type: profile

+ 1 - 1
config/sync/migrate_plus.migration.d7_allpublicfiles.yml

@@ -1,4 +1,4 @@
-uuid: 545ce18f-9c93-4101-856a-46abfbf23af8
+uuid: 5eac072a-379c-414e-b39b-a5a759c5afb3
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_node_breve.yml

@@ -1,4 +1,4 @@
-uuid: 4f4c3c56-5a5c-4447-9c62-12c0ba40a4c5
+uuid: ad3d0c00-acd6-405d-93a5-50d24899e388
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_node_breve_i18n.yml

@@ -1,4 +1,4 @@
-uuid: 6693dc65-c1b9-43a3-a05c-10432c299a57
+uuid: 72a79c05-dd59-49a2-8169-6cc5bc1aa7f6
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_node_materiau.yml

@@ -1,4 +1,4 @@
-uuid: 936116bb-6458-4ef2-9d4b-0d76667d0ae5
+uuid: 9f856cc4-9692-48e4-ad0e-92dcd4b238cb
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_node_materiau_i18n.yml

@@ -1,4 +1,4 @@
-uuid: fb746204-e216-4f5d-998c-2bf403e92c89
+uuid: 87b3961c-7d3b-4405-88a6-331b6efc016b
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_taxonomy_term_company.yml

@@ -1,4 +1,4 @@
-uuid: 711288e2-260d-4dfe-ab50-cb0bc6c9029b
+uuid: 9b156a4d-6712-42a9-b249-78ccf55f23b0
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_taxonomy_term_showroom.yml

@@ -1,4 +1,4 @@
-uuid: 0f95b7fd-3f3a-4137-ae2a-0bfe5ac407f4
+uuid: 3678f370-0f53-45d4-a1dc-521fc9dcd17c
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_taxonomy_term_tags.yml

@@ -1,4 +1,4 @@
-uuid: 58ff2b07-74c0-464b-b6a2-1d7660be8b81
+uuid: 8c0e583b-aa12-4acc-9303-d8dd8dafe46f
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_taxonomy_term_tags_i18n.yml

@@ -1,4 +1,4 @@
-uuid: a8eda226-85ac-43c5-8404-89030df4bb39
+uuid: 177d87cd-6a45-42da-9bed-7ce3e663b484
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus.yml

@@ -1,4 +1,4 @@
-uuid: cba6bfc1-723f-46bd-bd7a-ae837070c178
+uuid: fc2191cd-c25e-4ef1-bac9-594bdc3ee4b3
 langcode: en
 status: true
 dependencies: {  }

+ 1 - 1
config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus_i18n.yml

@@ -1,4 +1,4 @@
-uuid: 2ac73091-ce57-4218-a155-c23bdb72f618
+uuid: 84168e57-5ad6-4923-a27c-379931f27eb2
 langcode: en
 status: true
 dependencies: {  }

+ 23 - 12
config/sync/migrate_plus.migration.d7_user_profile.yml

@@ -1,4 +1,4 @@
-uuid: c0ee4d63-d111-4488-9389-03efd1551668
+uuid: f1e63181-b530-4848-9439-8a9811d63525
 langcode: en
 status: true
 dependencies:
@@ -8,7 +8,7 @@ dependencies:
       - migrate_tools
       - profile
 _core:
-  default_config_hash: yQMn6M_hGm1NmGAIYpol4n5NBMeUXQqvxMpTAF7cYPw
+  default_config_hash: BXfTTGg9wZCH6eEyUC3OcKgCj56WCCRQMcDLYj9yHfo
 id: d7_user_profile
 class: null
 field_plugin_method: null
@@ -35,20 +35,12 @@ process:
     plugin: migration_lookup
     migration: d7_users
     source: uid
-  field_activity_sector: field_activity_sector
-  field_employee: field_employee
+  field_title: field_private_name_title
   field_first_name: field_first_name
   field_name: field_name
-  field_naf: field_naf
   field_organization: field_organization
+  field_activity_sector: field_activity_sector
   field_phone: field_private_phone
-  field_position: field_private_quality
-  field_service: field_service
-  field_siret: field_siret
-  field_title: field_private_name_title
-  field_vat_number_intra_ce: field_vat_number_intra_ce
-  field_website: field_user_website
-  field_memo: field_memo
   field_address:
     plugin: iterator
     source: field_adresse
@@ -62,6 +54,25 @@ process:
       organization: organisation_name
       given_name: first_name
       family_name: last_name
+  field_position: field_private_quality
+  field_service: field_service
+  field_employee: field_employee
+  field_vat_number_intra_ce: field_vat_number_intra_ce
+  field_naf: field_naf
+  field_siret: field_siret
+  field_website:
+    plugin: iterator
+    source: field_user_website
+    process:
+      uri: url
+      title: title
+      options: attributes
+  field_email:
+    plugin: iterator
+    source: field_email
+    process:
+      value: email
+  field_memo: field_memo
 destination:
   plugin: 'entity:profile'
 migration_dependencies:

+ 1 - 1
config/sync/migrate_plus.migration.d7_users.yml

@@ -1,4 +1,4 @@
-uuid: 2d5923ba-b450-458a-adf2-632e3f31d775
+uuid: 33c0bdd8-4317-4566-8ec5-d9be1dfc70d2
 langcode: en
 status: true
 dependencies: {  }

+ 2 - 2
config/sync/migrate_plus.migration_group.d7_materio.yml

@@ -1,5 +1,5 @@
-uuid: 9b1e3bf9-a402-448f-89c8-e345d02f3b06
-langcode: en
+uuid: 51fd38ed-3f74-4503-a2c3-b3e80b8b25ba
+langcode: fr
 status: true
 dependencies:
   enforced:

+ 2 - 0
config/sync/user.role.admin.yml

@@ -119,9 +119,11 @@ permissions:
   - 'view any member profile'
   - 'view autre_son revisions'
   - 'view breve revisions'
+  - 'view contact_company profile'
   - 'view enregistrement revisions'
   - 'view evenement revisions'
   - 'view materiau revisions'
+  - 'view member profile'
   - 'view page revisions'
   - 'view profile'
   - 'view static revisions'

+ 1 - 253
config/sync/views.view.admin_users.yml

@@ -3,9 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - core.entity_view_mode.profile.admin_view
-    - field.storage.profile.field_first_name
-    - field.storage.profile.field_name
     - field.storage.user.field_company
     - field.storage.user.field_memo
     - field.storage.user.field_showroom
@@ -15,7 +12,6 @@ dependencies:
     - user.role.root
   module:
     - pagerer
-    - profile
     - taxonomy
     - user
     - views_bulk_operations
@@ -337,132 +333,6 @@ display:
           entity_type: user
           entity_field: name
           plugin_id: field
-        field_first_name:
-          id: field_first_name
-          table: profile__field_first_name
-          field: field_first_name
-          relationship: profile
-          group_type: group
-          admin_label: ''
-          label: 'First Name'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          plugin_id: field
-        field_name:
-          id: field_name
-          table: profile__field_name
-          field: field_name
-          relationship: profile
-          group_type: group
-          admin_label: ''
-          label: Name
-          exclude: false
-          alter:
-            alter_text: true
-            text: '{{ field_first_name }} {{ field_name }}'
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          plugin_id: field
         mail:
           id: mail
           table: users_field_data
@@ -953,57 +823,6 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
-        rendered_entity:
-          id: rendered_entity
-          table: profile
-          field: rendered_entity
-          relationship: profile
-          group_type: group
-          admin_label: ''
-          label: 'Rendered entity'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: 'no profile'
-          hide_empty: false
-          empty_zero: true
-          hide_alter_empty: true
-          view_mode: admin_view
-          entity_type: profile
-          plugin_id: rendered_entity
       filters:
         status:
           id: status
@@ -1374,57 +1193,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-        type:
-          id: type
-          table: profile
-          field: type
-          relationship: profile
-          group_type: group
-          admin_label: ''
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: 'Profile type'
-            description: ''
-            use_operator: false
-            operator: type_op
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              unverified: '0'
-              anonymous: '0'
-              free_user: '0'
-              contact_company: '0'
-              alpha_testeur: '0'
-              student: '0'
-              premium: '0'
-              adherent: '0'
-              translator: '0'
-              admin_showroom: '0'
-              admin: '0'
-              root: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: profile
-          entity_field: type
-          plugin_id: bundle
       sorts:
         created:
           id: created
@@ -1455,17 +1223,7 @@ display:
           plugin_id: result
       footer: {  }
       empty: {  }
-      relationships:
-        profile:
-          id: profile
-          table: users_field_data
-          field: profile
-          relationship: none
-          group_type: group
-          admin_label: Profile
-          required: false
-          entity_type: user
-          plugin_id: standard
+      relationships: {  }
       arguments: {  }
       display_extenders:
         views_ef_fieldset: {  }
@@ -1483,11 +1241,6 @@ display:
         - user
         - user.roles
       tags:
-        - 'config:core.entity_view_display.profile.contact_company.default'
-        - 'config:core.entity_view_display.profile.member.admin_view'
-        - 'config:core.entity_view_display.profile.member.default'
-        - 'config:field.storage.profile.field_first_name'
-        - 'config:field.storage.profile.field_name'
         - 'config:field.storage.user.field_company'
         - 'config:field.storage.user.field_memo'
         - 'config:field.storage.user.field_showroom'
@@ -1519,11 +1272,6 @@ display:
         - user
         - user.roles
       tags:
-        - 'config:core.entity_view_display.profile.contact_company.default'
-        - 'config:core.entity_view_display.profile.member.admin_view'
-        - 'config:core.entity_view_display.profile.member.default'
-        - 'config:field.storage.profile.field_first_name'
-        - 'config:field.storage.profile.field_name'
         - 'config:field.storage.user.field_company'
         - 'config:field.storage.user.field_memo'
         - 'config:field.storage.user.field_showroom'

+ 2 - 2
migrate-from-d7.sh

@@ -13,8 +13,8 @@ drush mim d7_allpublicfiles --feedback="1000"
 
 echo " "
 echo "Migrating Users"
-drush mim d7_users --update --feedback="1000"
-# drush mim d7_user_profiles --feedback="1000"
+drush mim d7_users --feedback="1000"
+drush mim d7_user_profiles --feedback="1000"
 
 echo " "
 echo "Migrating Taxonomy"

+ 7 - 14
web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_user_profile.yml

@@ -31,6 +31,7 @@ process:
     plugin: migration_lookup
     migration: d7_users
     source: uid
+
   field_title: field_private_name_title
   field_first_name: field_first_name
   field_name: field_name
@@ -81,21 +82,13 @@ process:
       title: title
       options: attributes
 
+  field_email:
+    plugin: iterator
+    source: field_email
+    process:
+      value: email
 
-  # not verified
-
-  field_email: field_email
-  # field_email
-  #   plugin: merge
-  #   source:
-  #     - field_administrative_email
-  #     - field_private_email
-
-  # field_name:
-  #   plugin: merge
-  #   source:
-  #     - field_name
-  #     - field_private_name
+  field_memo: field_memo
 
 migration_dependencies:
   required:

+ 5 - 3
web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7UserProfile.php

@@ -102,18 +102,20 @@ class D7UserProfile extends FieldableEntity {
 
     // Get Field API field values.
     foreach ($this->getFields('profile2', $type) as $field_name => $field) {
-      $row->setSourceProperty($field_name, $this->getFieldValues('profile2', $field_name, $pid));
+      // drush_print($field_name);
+      $value = $this->getFieldValues('profile2', $field_name, $pid);
+      $row->setSourceProperty($field_name, $value);
     }
 
     // merge : field_administrative_email & field_private_email into field_email
     // merge : field_private_name & field_name into field_name
     switch ($type) {
       case 'contact_operationnel':
-        $row->setSourceProperty('field_email', $row->getSourceProperty('field_administrative_email'));
+        $row->setSourceProperty('field_email', $row->getSourceProperty('field_private_email'));
         $row->setSourceProperty('field_name', $row->getSourceProperty('field_private_name'));
         break;
       case 'adherent':
-        $row->setSourceProperty('field_email', $row->getSourceProperty('field_private_email'));
+        $row->setSourceProperty('field_email', $row->getSourceProperty('field_administrative_email'));
         break;
     }
 

+ 1 - 1
web/profiles/d8-starterkit-profile

@@ -1 +1 @@
-Subproject commit 4b6a697e45018c0c27a9f03aba6d3e5a75c515b2
+Subproject commit 8383835acbd61e0e7ba8571bd77ebc0203b2b234