Skip to content

Uno 812 poc #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
attiks wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Uno 812 poc #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c1cf7fa
Simplify templates
attiks Dec 19, 2023
3afd686
Change display formatter
attiks Dec 19, 2023
45201cb
Use un_date 2.0
attiks Dec 19, 2023
3b22ed7
Update un_date, fix CS
attiks Dec 20, 2023
6c62416
Switch date fields to un_date
attiks Dec 20, 2023
817068d
Switch date fields to un_date
attiks Dec 20, 2023
6c37a30
Still on PHP8.1
attiks Dec 20, 2023
576ad2f
chore: adjust selector to add margin for full node date
left23 Dec 21, 2023
fd7fdb0
bug: brackets around timezone
attiks Dec 21, 2023
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 .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
uses: cafuego/command-output@main
with:
run: |
docker compose -f tests/docker-compose.yml exec -T drupal drush -y si --existing-config
docker compose -f tests/docker-compose.yml exec -T drupal drush -y si --existing-config --verbose
env:
fail-fast: true

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"unocha/ocha_integrations": "^2",
"unocha/ocha_monitoring": "^1.0",
"unocha/ocha_search": "^1.0",
"unocha/un_date": "^1.0.1",
"unocha/un_date": "^2.0",
"vlucas/phpdotenv": "^2.4",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
19 changes: 10 additions & 9 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions config/core.entity_view_display.group.iasc_space.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ dependencies:
- field.field.group.iasc_space.field_sidebar
- group.type.iasc_space
module:
- datetime
- entity_reference_revisions
- link
- text
- un_date
id: group.iasc_space.default
targetEntityType: group
bundle: iasc_space
Expand All @@ -49,11 +49,12 @@ content:
weight: 6
region: content
field_date_closed:
type: datetime_default
type: un_date_datetime
label: above
settings:
timezone_override: ''
format_type: teaser
display_timezone: false
month_format: full
template: default
third_party_settings: { }
weight: 7
region: content
Expand Down
2 changes: 2 additions & 0 deletions config/core.entity_view_display.media.remote_video.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ content:
settings:
max_width: 0
max_height: 0
loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
16 changes: 9 additions & 7 deletions config/core.entity_view_display.node.action_point.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dependencies:
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
- datetime
- options
- text
- un_date
- user
id: node.action_point.default
targetEntityType: node
Expand All @@ -33,11 +33,12 @@ content:
weight: 0
region: content
field_ap_date:
type: datetime_default
type: un_date_datetime
label: above
settings:
timezone_override: ''
format_type: medium
display_timezone: true
month_format: numeric
template: default
third_party_settings: { }
weight: 2
region: content
Expand Down Expand Up @@ -80,11 +81,12 @@ content:
weight: 5
region: content
field_date:
type: datetime_default
type: un_date_datetime
label: above
settings:
timezone_override: ''
format_type: medium
display_timezone: true
month_format: abbreviation
template: default
third_party_settings: { }
weight: 1
region: content
Expand Down
16 changes: 9 additions & 7 deletions config/core.entity_view_display.node.action_point.full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ dependencies:
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
- datetime
- options
- text
- un_date
- user
id: node.action_point.full
targetEntityType: node
Expand All @@ -34,11 +34,12 @@ content:
weight: 0
region: content
field_ap_date:
type: datetime_default
type: un_date_datetime
label: above
settings:
timezone_override: ''
format_type: medium
display_timezone: true
month_format: numeric
template: default
third_party_settings: { }
weight: 2
region: content
Expand Down Expand Up @@ -81,11 +82,12 @@ content:
weight: 5
region: content
field_date:
type: datetime_default
type: un_date_datetime
label: above
settings:
timezone_override: ''
format_type: medium
display_timezone: true
month_format: numeric
template: default
third_party_settings: { }
weight: 1
region: content
Expand Down
9 changes: 5 additions & 4 deletions config/core.entity_view_display.node.announcement.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ dependencies:
- field.field.node.announcement.og_group_ref
- node.type.announcement
module:
- datetime
- link
- text
- un_date
- user
id: node.announcement.default
targetEntityType: node
Expand Down Expand Up @@ -56,11 +56,12 @@ content:
weight: 2
region: content
field_published_date:
type: datetime_default
type: un_date_datetime
label: inline
settings:
timezone_override: ''
format_type: published_date
display_timezone: true
month_format: full
template: default
third_party_settings: { }
weight: 0
region: content
Expand Down
9 changes: 5 additions & 4 deletions config/core.entity_view_display.node.announcement.full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ dependencies:
- field.field.node.announcement.og_group_ref
- node.type.announcement
module:
- datetime
- link
- text
- un_date
- user
id: node.announcement.full
targetEntityType: node
Expand Down Expand Up @@ -57,11 +57,12 @@ content:
weight: 2
region: content
field_published_date:
type: datetime_default
type: un_date_datetime
label: inline
settings:
timezone_override: ''
format_type: published_date
display_timezone: true
month_format: full
template: default
third_party_settings: { }
weight: 0
region: content
Expand Down
9 changes: 5 additions & 4 deletions config/core.entity_view_display.node.announcement.teaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dependencies:
- field.field.node.announcement.og_group_ref
- node.type.announcement
module:
- datetime
- text
- un_date
- user
id: node.announcement.teaser
targetEntityType: node
Expand All @@ -36,11 +36,12 @@ content:
weight: 2
region: content
field_published_date:
type: datetime_default
type: un_date_datetime
label: inline
settings:
timezone_override: ''
format_type: published_date
display_timezone: true
month_format: full
template: default
third_party_settings: { }
weight: 1
region: content
Expand Down
16 changes: 6 additions & 10 deletions config/core.entity_view_display.node.oa_event.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ langcode: en
status: true
dependencies:
config:
- core.date_format.long
- field.field.node.oa_event.body
- field.field.node.oa_event.field_additional_locations
- field.field.node.oa_event.field_agenda_items
Expand All @@ -27,9 +26,9 @@ dependencies:
- field.field.node.oa_event.og_vocabulary
- node.type.oa_event
module:
- date_recur
- entity_reference_revisions
- text
- un_date
- user
id: node.oa_event.default
targetEntityType: node
Expand Down Expand Up @@ -114,16 +113,13 @@ content:
weight: 8
region: content
field_oa_date:
type: date_recur_basic_formatter
type: un_data_date_recur_basic
label: above
settings:
timezone_override: ''
format_type: long
separator: '-'
show_next: 5
count_per_item: true
occurrence_format_type: long
same_end_date_format_type: long
display_timezone: true
month_format: numeric
show_next: '1'
count_per_item: '1'
interpreter: ''
third_party_settings: { }
weight: 11
Expand Down
17 changes: 7 additions & 10 deletions config/core.entity_view_display.node.oa_event.full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ langcode: en
status: true
dependencies:
config:
- core.date_format.medium
- core.entity_view_mode.node.full
- field.field.node.oa_event.body
- field.field.node.oa_event.field_additional_locations
Expand All @@ -28,9 +27,9 @@ dependencies:
- field.field.node.oa_event.og_vocabulary
- node.type.oa_event
module:
- date_recur
- entity_reference_revisions
- text
- un_date
- user
id: node.oa_event.full
targetEntityType: node
Expand Down Expand Up @@ -116,16 +115,14 @@ content:
weight: 9
region: content
field_oa_date:
type: date_recur_basic_formatter
type: un_data_date_recur_basic
label: hidden
settings:
timezone_override: ''
format_type: medium
separator: to
show_next: 100
count_per_item: true
occurrence_format_type: medium
same_end_date_format_type: medium
display_timezone: true
month_format: abbreviation
template: un_date_date_block
show_next: '3'
count_per_item: '1'
interpreter: ''
third_party_settings: { }
weight: 1
Expand Down
17 changes: 7 additions & 10 deletions config/core.entity_view_display.node.oa_event.teaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ langcode: en
status: true
dependencies:
config:
- core.date_format.medium
- core.entity_view_mode.node.teaser
- field.field.node.oa_event.body
- field.field.node.oa_event.field_additional_locations
Expand All @@ -28,7 +27,7 @@ dependencies:
- field.field.node.oa_event.og_vocabulary
- node.type.oa_event
module:
- date_recur
- un_date
- user
id: node.oa_event.teaser
targetEntityType: node
Expand All @@ -44,17 +43,15 @@ content:
weight: 2
region: content
field_oa_date:
type: date_recur_basic_formatter
type: un_data_date_recur_basic
label: hidden
settings:
timezone_override: ''
format_type: medium
separator: '-'
show_next: 5
count_per_item: true
occurrence_format_type: medium
same_end_date_format_type: medium
display_timezone: true
month_format: numeric
show_next: '5'
count_per_item: '1'
interpreter: ''
template: un_date_date_block
third_party_settings: { }
weight: 0
region: content
Expand Down
Loading