Skip to content

Commit

Permalink
Merge branch 'develop' into DP-28815_new_org_nav
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurbaghdas authored Sep 12, 2023
2 parents 77da2b5 + d63739e commit 17109d3
Show file tree
Hide file tree
Showing 26 changed files with 15,570 additions and 2,682 deletions.
41 changes: 41 additions & 0 deletions changelogs/DP-28608.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
# Write your changelog entry here. Every pull request must have a changelog yml file.
#
# Change types:
# #############################################################################
# You can use one of the following types:
# - Added: For new features.
# - Changed: For changes to existing functionality.
# - Deprecated: For soon-to-be removed features.
# - Removed: For removed features.
# - Fixed: For any bug fixes.
# - Security: In case of vulnerabilities.
#
# Format
# #############################################################################
# The format is crucial. Please follow the examples below. For reference, the requirements are:
# - All 3 parts are required and you must include "Type", "description" and "issue".
# - "Type" must be left aligned and followed by a colon.
# - "description" must be indented with 2 spaces followed by a colon
# - "issue" must be indented with 4 spaces followed by a colon.
# - "issue" is for the Jira ticket number only e.g. DP-1234
# - No extra spaces, indents, or blank lines are allowed.
#
# Example:
# #############################################################################
# Fixed:
# - description: Fixes scrolling on edit pages in Safari.
# issue: DP-13314
#
# You may add more than 1 description & issue for each type using the following format:
# Changed:
# - description: Automating the release branch.
# issue: DP-10166
# - description: Second change item that needs a description.
# issue: DP-19875
# - description: Third change item that needs a description along with an issue.
# issue: DP-19843
#
Changed:
- description: Replace superset data in views with data from bigquery
issue: DP-28608
41 changes: 41 additions & 0 deletions changelogs/DP-29493.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
# Write your changelog entry here. Every pull request must have a changelog yml file.
#
# Change types:
# #############################################################################
# You can use one of the following types:
# - Added: For new features.
# - Changed: For changes to existing functionality.
# - Deprecated: For soon-to-be removed features.
# - Removed: For removed features.
# - Fixed: For any bug fixes.
# - Security: In case of vulnerabilities.
#
# Format
# #############################################################################
# The format is crucial. Please follow the examples below. For reference, the requirements are:
# - All 3 parts are required and you must include "Type", "description" and "issue".
# - "Type" must be left aligned and followed by a colon.
# - "description" must be indented with 2 spaces followed by a colon
# - "issue" must be indented with 4 spaces followed by a colon.
# - "issue" is for the Jira ticket number only e.g. DP-1234
# - No extra spaces, indents, or blank lines are allowed.
#
# Example:
# #############################################################################
# Fixed:
# - description: Fixes scrolling on edit pages in Safari.
# issue: DP-13314
#
# You may add more than 1 description & issue for each type using the following format:
# Changed:
# - description: Automating the release branch.
# issue: DP-10166
# - description: Second change item that needs a description.
# issue: DP-19875
# - description: Third change item that needs a description along with an issue.
# issue: DP-19843
#
Fixed:
- description: Fix default domain URLs from service detail migration
issue: DP-29493
4 changes: 2 additions & 2 deletions conf/drupal/config/views.view.advancedsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
module:
- content_moderation
- entity_hierarchy
- mass_superset
- mass_bigquery
- mass_views
- node
- taxonomy
Expand Down Expand Up @@ -813,7 +813,7 @@ display:
field_api_classes: false
pageviews:
id: pageviews
table: mass_superset_data
table: mass_bigquery_data
field: pageviews
relationship: vid
group_type: group
Expand Down
6 changes: 3 additions & 3 deletions conf/drupal/config/views.view.breadcrumb_depth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
module:
- csv_serialization
- entity_hierarchy
- mass_superset
- mass_bigquery
- mass_views
- node
- rest
Expand Down Expand Up @@ -303,7 +303,7 @@ display:
field_api_classes: false
pageviews:
id: pageviews
table: mass_superset_data
table: mass_bigquery_data
field: pageviews
relationship: none
group_type: group
Expand Down Expand Up @@ -1072,7 +1072,7 @@ display:
field_api_classes: false
pageviews:
id: pageviews
table: mass_superset_data
table: mass_bigquery_data
field: pageviews
relationship: none
group_type: group
Expand Down
86 changes: 14 additions & 72 deletions conf/drupal/config/views.view.change_collections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- workflows.workflow.editorial
module:
- content_moderation
- mass_superset
- mass_bigquery
- mass_views
- node
- taxonomy
Expand Down Expand Up @@ -1082,32 +1082,32 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
score:
id: score
table: mass_superset_data
field: score
nos_per_1000_cleaned:
id: nos_per_1000_cleaned
table: mass_bigquery_data
field: nos_per_1000_cleaned
relationship: vid
group_type: group
admin_label: ''
plugin_id: numeric
operator: '<='
operator: '>='
value:
min: ''
max: ''
value: ''
group: 1
exposed: true
expose:
operator_id: score_op
label: 'Score is less than or equal to'
operator_id: nos_per_1000_cleaned_op
label: 'Nos per 1000 is greater than or equal to'
description: ''
use_operator: false
operator: score_op
operator: nos_per_1000_cleaned_op
operator_limit_selection: false
operator_list: { }
identifier: score
identifier: nos_per_1000_cleaned
required: false
remember: true
remember: false
multiple: false
remember_roles:
authenticated: authenticated
Expand All @@ -1122,6 +1122,9 @@ display:
administrator: '0'
tester: '0'
doc_deletion: '0'
d2d_redirect_manager: '0'
data_administrator: '0'
collection_administrator: '0'
min_placeholder: ''
max_placeholder: ''
placeholder: ''
Expand All @@ -1137,67 +1140,6 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
last_updated:
id: last_updated
table: snooze
field: last_updated
relationship: none
group_type: group
admin_label: ''
plugin_id: date
operator: '='
value:
min: ''
max: ''
value: ''
type: date
group: 1
exposed: true
expose:
operator_id: last_updated_op
label: Snoozed
description: null
use_operator: false
operator: last_updated_op
operator_limit_selection: false
operator_list: { }
identifier: last_updated
required: false
remember: false
multiple: false
remember_roles:
authenticated: authenticated
min_placeholder: null
max_placeholder: null
placeholder: null
is_grouped: true
group_info:
label: Snoozed
description: ''
identifier: last_updated
optional: true
widget: select
multiple: false
remember: true
default_group: All
default_group_multiple: { }
group_items:
1:
title: 'Yes'
operator: '>='
value:
min: ''
max: ''
value: '-2 weeks'
type: offset
3:
title: 'No'
operator: empty
value:
min: ''
max: ''
value: ''
type: date
filter_groups:
operator: AND
groups:
Expand Down
10 changes: 5 additions & 5 deletions conf/drupal/config/views.view.change_parents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- taxonomy.vocabulary.label
module:
- content_moderation
- mass_superset
- mass_bigquery
- node
- taxonomy
- user
Expand Down Expand Up @@ -82,13 +82,13 @@ display:
form_step: true
buttons: true
action_title: Action
clear_on_exposed: false
force_selection_info: false
selected_actions:
2:
action_id: mass_hierarchy_change_parent
preconfiguration:
add_confirmation: 0
clear_on_exposed: false
force_selection_info: 0
add_confirmation: false
title:
id: title
table: node_field_data
Expand Down Expand Up @@ -417,7 +417,7 @@ display:
field_api_classes: false
pageviews:
id: pageviews
table: mass_superset_data
table: mass_bigquery_data
field: pageviews
relationship: none
group_type: group
Expand Down
Loading

0 comments on commit 17109d3

Please sign in to comment.