Skip to content

Commit 6e6ddd2

Browse files
authored
Merge pull request #54 from ASUWebPlatforms/ws2-1221
WS2-1221 - Replaced image entity with Media entity for card top images..
2 parents 26b388e + 24b4e7f commit 6e6ddd2

10 files changed

+93
-99
lines changed

config/install/core.entity_form_display.paragraph.degree_details_why_choose.default.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,45 @@ langcode: en
22
status: true
33
dependencies:
44
config:
5-
- field.field.paragraph.degree_details_why_choose.field_deg_dtl_why_card_image
5+
- field.field.paragraph.degree_details_why_choose.field_card_top_image
66
- field.field.paragraph.degree_details_why_choose.field_degree_nxtstep_card_contnt
77
- field.field.paragraph.degree_details_why_choose.field_degree_nxtsteps_card_btn
88
- field.field.paragraph.degree_details_why_choose.field_degree_nxtsteps_card_title
9-
- image.style.thumbnail
109
- paragraphs.paragraphs_type.degree_details_why_choose
1110
module:
12-
- image
1311
- link
12+
- media_library
1413
id: paragraph.degree_details_why_choose.default
1514
targetEntityType: paragraph
1615
bundle: degree_details_why_choose
1716
mode: default
1817
content:
19-
field_deg_dtl_why_card_image:
20-
type: image_image
18+
field_card_top_image:
19+
type: media_library_widget
2120
weight: 0
2221
region: content
2322
settings:
24-
progress_indicator: throbber
25-
preview_image_style: thumbnail
23+
media_types: { }
2624
third_party_settings: { }
2725
field_degree_nxtstep_card_contnt:
2826
type: string_textarea
29-
weight: 2
27+
weight: 3
3028
region: content
3129
settings:
3230
rows: 5
3331
placeholder: ''
3432
third_party_settings: { }
3533
field_degree_nxtsteps_card_btn:
3634
type: link_default
37-
weight: 3
35+
weight: 4
3836
region: content
3937
settings:
4038
placeholder_url: ''
4139
placeholder_title: ''
4240
third_party_settings: { }
4341
field_degree_nxtsteps_card_title:
4442
type: string_textfield
45-
weight: 1
43+
weight: 2
4644
region: content
4745
settings:
4846
size: 60

config/install/core.entity_view_display.paragraph.degree_details_why_choose.default.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,26 @@ langcode: en
22
status: true
33
dependencies:
44
config:
5-
- field.field.paragraph.degree_details_why_choose.field_deg_dtl_why_card_image
5+
- field.field.paragraph.degree_details_why_choose.field_card_top_image
66
- field.field.paragraph.degree_details_why_choose.field_degree_nxtstep_card_contnt
77
- field.field.paragraph.degree_details_why_choose.field_degree_nxtsteps_card_btn
88
- field.field.paragraph.degree_details_why_choose.field_degree_nxtsteps_card_title
9-
- image.style.block_image_16_9_sml
109
- paragraphs.paragraphs_type.degree_details_why_choose
1110
module:
12-
- image
1311
- link
1412
id: paragraph.degree_details_why_choose.default
1513
targetEntityType: paragraph
1614
bundle: degree_details_why_choose
1715
mode: default
1816
content:
19-
field_deg_dtl_why_card_image:
20-
type: image
17+
field_card_top_image:
18+
type: entity_reference_entity_view
2119
label: above
2220
settings:
23-
image_link: ''
24-
image_style: block_image_16_9_sml
25-
image_loading:
26-
attribute: lazy
21+
view_mode: default
22+
link: false
2723
third_party_settings: { }
28-
weight: 1
24+
weight: 0
2925
region: content
3026
field_degree_nxtstep_card_contnt:
3127
type: basic_string

config/install/field.field.node.degree_detail_page.field_deg_dtl_why_choose_intro.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ required: false
2121
translatable: false
2222
default_value:
2323
-
24-
value: "<p>This is the default info</p>\r\n"
24+
value: ''
2525
format: full_html
2626
default_value_callback: ''
2727
settings: { }
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
config:
5+
- field.storage.paragraph.field_card_top_image
6+
- media.type.image
7+
- paragraphs.paragraphs_type.degree_details_why_choose
8+
id: paragraph.degree_details_why_choose.field_card_top_image
9+
field_name: field_card_top_image
10+
entity_type: paragraph
11+
bundle: degree_details_why_choose
12+
label: 'Card top image'
13+
description: 'New media field type for images.'
14+
required: true
15+
translatable: false
16+
default_value: { }
17+
default_value_callback: ''
18+
settings:
19+
handler: 'default:media'
20+
handler_settings:
21+
target_bundles:
22+
image: image
23+
sort:
24+
field: name
25+
direction: ASC
26+
auto_create: false
27+
auto_create_bundle: ''
28+
field_type: entity_reference

config/install/field.field.paragraph.degree_details_why_choose.field_deg_dtl_why_card_image.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
module:
5+
- node
6+
- text
7+
id: node.field_deg_dtl_why_choose_intro
8+
field_name: field_deg_dtl_why_choose_intro
9+
entity_type: node
10+
type: text_long
11+
settings: { }
12+
module: text
13+
locked: false
14+
cardinality: 1
15+
translatable: true
16+
indexes: { }
17+
persist_with_no_fields: false
18+
custom_storage: false
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
module:
5+
- media
6+
- paragraphs
7+
id: paragraph.field_card_top_image
8+
field_name: field_card_top_image
9+
entity_type: paragraph
10+
type: entity_reference
11+
settings:
12+
target_type: media
13+
module: core
14+
locked: false
15+
cardinality: 1
16+
translatable: true
17+
indexes: { }
18+
persist_with_no_fields: false
19+
custom_storage: false

config/install/field.storage.paragraph.field_deg_dtl_why_card_image.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/AsuDegreeRfiHelperFunctions.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ public function getParagraphsContent($paragraph, $field = "nextSteps") {
5353
case "whyChooseAsu":
5454
// whyChooseAsu - top image
5555
$image = new \stdClass();
56-
if (isset($paragraph->field_deg_dtl_why_card_image->target_id)) {
57-
$wca_image = $paragraph->field_deg_dtl_why_card_image->entity;
58-
$imageUri = $wca_image->getFileUri();
56+
if (isset($paragraph->field_card_top_image->target_id)) {
57+
$wca_image = $paragraph->field_card_top_image->entity;
58+
$image->altText = $wca_image->field_media_image->alt;
59+
$imageUri = $wca_image->field_media_image->entity->getFileUri();
5960
$image->url = \Drupal::service('file_url_generator')->generateAbsoluteString($imageUri);
60-
$image->altText = $paragraph->field_deg_dtl_why_card_image->alt;
6161
$card->image = $image;
6262
}
6363
// Varying props names?
6464
$content = "text";
6565
$button = "button";
6666
break;
67-
default:
67+
default: // nextSteps
6868
$content = "content";
6969
$button = "buttonLink";
70-
// nextSteps - top icon
70+
//// nextSteps top icon
7171
if (isset($paragraph->field_degree_nxtsteps_card_icon) && $paragraph->field_degree_nxtsteps_card_icon->icon_name) {
7272
$icon_name = $paragraph->field_degree_nxtsteps_card_icon->icon_name;
7373
$icon_style = $paragraph->field_degree_nxtsteps_card_icon->style;

src/Plugin/Block/AsuDegreeRfiDegreeDetailsBlock.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,11 @@ public function build() {
237237
$whyChooseAsu = new \stdClass;
238238
$cards = [];
239239
$why_choose = 0;
240+
//// hide whyChooseAsu?
241+
if ($node->field_deg_dtl_hide_why_choos_asu->value) {
242+
$whyChooseAsu->hide = (bool) $node->field_deg_dtl_hide_why_choos_asu->value;
243+
$why_choose = 1;
244+
}
240245
////- Intro
241246
if (isset($node->field_deg_dtl_why_choose_intro->value) && !empty($node->field_deg_dtl_why_choose_intro->value)) {
242247
$whyChooseAsu->sectionIntroText = $node->field_deg_dtl_why_choose_intro->value;
@@ -274,13 +279,9 @@ public function build() {
274279
if (isset($cards[1])) { $labelled_cards->mentors = $cards[1]; }
275280
if (isset($cards[2])) { $labelled_cards->honors = $cards[2]; }
276281
}
277-
//// hide whyChooseAsu?
278-
if ($node->field_deg_dtl_hide_why_choos_asu->value) {
279-
$whyChooseAsu->hide = (bool) $node->field_deg_dtl_hide_why_choos_asu->value;
280-
}
281282

282-
if ($why_choose > 0) {
283-
if ($why_choose > 1) { // Add properties + hide boolean
283+
if ($why_choose > 0) { // Has intro text or hide setting, but no cards
284+
if ($why_choose > 1) { // Also has cards
284285
$whyChooseAsu->cards = $labelled_cards;
285286
}
286287
$props['whyChooseAsu'] = $whyChooseAsu;

0 commit comments

Comments
 (0)