Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"drupal/migrate_plus": ">=3.0",
"drupal/migrate_plus": ">=4.0",
"digicol/dcx-sdk-php": "^2.0"
},
"require-dev": {
Expand Down
1 change: 1 addition & 0 deletions modules/dcx_article_import/dcx_article_import.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ package: dcx
dependencies:
- dcx_integration:dcx_integration
- dcx_integration:dcx_migration
- paragraphs:paragraphs
5 changes: 5 additions & 0 deletions modules/dcx_article_import/dcx_article_import.libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ dropzone:
css:
theme:
css/dcx-article-import-ui.css: {}
dependencies:
- core/jquery
- core/drupal
- core/drupalSettings
- core/jquery.once
5 changes: 4 additions & 1 deletion modules/dcx_article_import/js/dcx-article-import-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
Drupal.behaviors.dcxArticleImportUi = {
attach: function (context, settings) {
var submitButton = $('#edit-submit');
var textfield = $('input[data-drupal-selector=edit-dcx-id]');
var textfield = $('input[data-drupal-selector=edit-dcx-id]').once('dcx_dropzone_init');
if (textfield.length === 0) {
return;
}

var dropzone = $('<div></div>').addClass('dcx-dropzone');
var message = $('<div>' + Drupal.t('Drop DC-X story link here!') + '</div>').addClass('message').appendTo(dropzone);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

namespace Drupal\Tests\dcx_article_import\FunctionalJavascript;

use Drupal\FunctionalJavascriptTests\JavascriptTestBase;

/**
* Class ArticleImportTest.
*/
class ArticleImportTest extends JavascriptTestBase {

/**
* Modules to enable.
*
* @var array
*/
public static $modules = [
'dcx_article_import',
'dcx_test',
];

/**
* Test article import.
*/
public function testArticleImport() {

$this->config('dcx_integration.jsonclientsettings')->setData([
'url' => getenv('DCX_URL'),
'username' => getenv('DCX_USER'),
'password' => getenv('DCX_PASS'),
'publication' => getenv('DCX_PUBLICATION'),
'notification_access_key' => getenv('DCX_NOTIFICATION_KEY'),
])->save();
$this->config('system.site')->setData(['mail' => 'admin@admin.de', 'name' => 'Integration Test'])->save();

$this->drupalLogin($this->createUser(['import from dcx']));

$this->drupalGet('node/add/article/dcx-import');
}

}
2 changes: 0 additions & 2 deletions modules/dcx_migration/dcx_migration.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ type: module
description: 'Migration of data from DC-X digital asset management.'
core: '8.x'
package: dcx

dependencies:
- dcx_integration:dcx_integration
- drupal:migrate
- migrate_plus:migrate_plus
- media_entity:media_entity
- thunder:thunder_media
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
uuid: 5af4128c-f300-442e-a7ce-45879b1ee82b
langcode: en
status: true
dependencies:
config:
- field.storage.media.field_copyright
- media_entity.bundle.image
id: media.image.field_copyright
field_name: field_copyright
entity_type: media
bundle: image
label: Copyright
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: string
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: fd203df1-2506-4051-9c65-943ddf0bd0ef
langcode: en
status: true
dependencies:
config:
- field.storage.media.field_expires
- media_entity.bundle.image
module:
- datetime
id: media.image.field_expires
field_name: field_expires
entity_type: media
bundle: image
label: Expires
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: datetime
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
uuid: a1ae969d-7d6c-4607-be0a-0eb034469315
langcode: en
status: true
dependencies:
config:
- field.storage.media.field_image
- media_entity.bundle.image
module:
- image
id: media.image.field_image
field_name: field_image
entity_type: media
bundle: image
label: Image
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
file_directory: '[date:custom:Y]-[date:custom:m]'
file_extensions: 'png gif jpg jpeg'
max_filesize: ''
max_resolution: ''
min_resolution: ''
alt_field: true
alt_field_required: true
title_field: false
title_field_required: false
default_image:
uuid: ''
alt: ''
title: ''
width: null
height: null
handler: 'default:file'
handler_settings: { }
field_type: image
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
uuid: a6103478-2b1c-4050-ae7f-0494c6be33e8
langcode: en
status: true
dependencies:
config:
- field.storage.media.field_source
- media_entity.bundle.image
id: media.image.field_source
field_name: field_source
entity_type: media
bundle: image
label: Source
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: string
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
uuid: 341f7fba-b53b-4716-9b4a-563c8f54ba7f
langcode: en
status: true
dependencies:
config:
- field.storage.node.field_paragraphs
- node.type.article
- paragraphs.paragraphs_type.image
module:
- entity_reference_revisions
id: node.article.field_paragraphs
field_name: field_paragraphs
entity_type: node
bundle: article
label: Paragraphs
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
handler: 'default:paragraph'
handler_settings:
negate: 0
target_bundles:
image: image
target_bundles_drag_drop:
image:
enabled: true
weight: 2
field_type: entity_reference_revisions
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
uuid: d47d0055-395f-4c4d-a179-4dc78083a24d
langcode: en
status: true
dependencies:
config:
- field.storage.paragraph.field_image
- media_entity.bundle.image
- paragraphs.paragraphs_type.image
id: paragraph.image.field_image
field_name: field_image
entity_type: paragraph
bundle: image
label: Image
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
handler: 'default:media'
handler_settings:
target_bundles:
image: image
sort:
field: _none
auto_create: false
auto_create_bundle: ''
field_type: entity_reference
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: d1c920ba-be79-40a1-840b-34fb257907c0
langcode: en
status: true
dependencies:
config:
- field.storage.paragraph.field_text
- paragraphs.paragraphs_type.text
module:
- text
id: paragraph.text.field_text
field_name: field_text
entity_type: paragraph
bundle: text
label: Text
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: text_long
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: b5a9b0da-70a3-4db6-a136-43260e6a5805
langcode: en
status: true
dependencies:
module:
- media_entity
id: media.field_copyright
field_name: field_copyright
entity_type: media
type: string
settings:
max_length: 255
is_ascii: false
case_sensitive: false
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
uuid: 2791a276-3db7-4fcd-92e3-23fca4d5103e
langcode: en
status: true
dependencies:
module:
- datetime
- media_entity
id: media.field_expires
field_name: field_expires
entity_type: media
type: datetime
settings:
datetime_type: datetime
module: datetime
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
uuid: ef7d7657-3a17-4752-83bd-dba3401c6b4a
langcode: en
status: true
dependencies:
module:
- file
- image
- media_entity
id: media.field_image
field_name: field_image
entity_type: media
type: image
settings:
uri_scheme: public
default_image:
uuid: ''
alt: ''
title: ''
width: null
height: null
target_type: file
display_field: false
display_default: false
module: image
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: 071fc21b-8b4e-463a-b8a0-007383e229d9
langcode: en
status: true
dependencies:
module:
- media_entity
id: media.field_source
field_name: field_source
entity_type: media
type: string
settings:
max_length: 255
is_ascii: false
case_sensitive: false
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: 2486cc03-26ed-44a1-bc8c-e8191c369c9f
langcode: en
status: true
dependencies:
module:
- entity_reference_revisions
- node
- paragraphs
id: node.field_paragraphs
field_name: field_paragraphs
entity_type: node
type: entity_reference_revisions
settings:
target_type: paragraph
module: entity_reference_revisions
locked: false
cardinality: -1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Loading