From 96700ef0109b683006e8913d43fc22ada1a6c6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 23 Oct 2024 09:41:52 +0300 Subject: [PATCH 01/20] UHF-8650: Fixed the privacy policy URL for the journey planner. --- .../custom/hdbt_subtheme/hdbt_subtheme.theme | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme index 78c7b831..bd53d5aa 100644 --- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme +++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme @@ -98,11 +98,22 @@ function hdbt_subtheme_preprocess_node(array &$variables) { * Implements hook_preprocess_HOOK(). */ function hdbt_subtheme_preprocess_paragraph__journey_planner(array &$variables): void { + // Attach the embedded content cookie compliance library. $variables['#attached']['library'][] = 'hdbt/embedded-content-cookie-compliance'; - $langcode = \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId(); - $variables['privacy_policy_url'] = helfi_eu_cookie_compliance_get_privacy_policy_url(); + // Set the necessary variables for the journey planner. $variables['media_service_url'] = 'https://reittiopas.hsl.fi'; - $variables['media_url'] = 'https://reittiopas.hsl.fi/haku?bikeOnly=1&lang=' . $langcode; + $variables['media_url'] = 'https://reittiopas.hsl.fi/haku?bikeOnly=1&lang=' . $variables['language']->getId(); $variables['media_id'] = 'journey-map'; + + // Set the privacy policy URL. + if (Drupal::moduleHandler()->moduleExists('hdbt_cookie_banner')) { + /** @var \Drupal\hdbt_cookie_banner\Services\CookieSettings $cookie_settings */ + $cookie_settings = \Drupal::service('hdbt_cookie_banner.cookie_settings'); + $variables['privacy_policy_url'] = $cookie_settings->getCookieSettingsPageUrl(); + } + // @todo UHF-10862 Remove once the HDBT cookie banner module is in use. + elseif (Drupal::moduleHandler()->moduleExists('helfi_eu_cookie_compliance')) { + $variables['privacy_policy_url'] = helfi_eu_cookie_compliance_get_privacy_policy_url(); + } } From 8819b143072da3835e9316153c94ac997eee2c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 23 Oct 2024 12:57:49 +0300 Subject: [PATCH 02/20] UHF-10862: Use HDBT cookie banner's cookie settings service to retrieve the privacy policy url. --- .../themes/custom/hdbt_subtheme/hdbt_subtheme.theme | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme index bd53d5aa..33d47533 100644 --- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme +++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme @@ -107,13 +107,7 @@ function hdbt_subtheme_preprocess_paragraph__journey_planner(array &$variables): $variables['media_id'] = 'journey-map'; // Set the privacy policy URL. - if (Drupal::moduleHandler()->moduleExists('hdbt_cookie_banner')) { - /** @var \Drupal\hdbt_cookie_banner\Services\CookieSettings $cookie_settings */ - $cookie_settings = \Drupal::service('hdbt_cookie_banner.cookie_settings'); - $variables['privacy_policy_url'] = $cookie_settings->getCookieSettingsPageUrl(); - } - // @todo UHF-10862 Remove once the HDBT cookie banner module is in use. - elseif (Drupal::moduleHandler()->moduleExists('helfi_eu_cookie_compliance')) { - $variables['privacy_policy_url'] = helfi_eu_cookie_compliance_get_privacy_policy_url(); - } + /** @var \Drupal\hdbt_cookie_banner\Services\CookieSettings $cookie_settings */ + $cookie_settings = \Drupal::service('hdbt_cookie_banner.cookie_settings'); + $variables['privacy_policy_url'] = $cookie_settings->getCookieSettingsPageUrl(); } From a2b76ec3826b936a6dad44c95959ae39e6f9d4e5 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 1 Nov 2024 13:45:43 +0200 Subject: [PATCH 03/20] UHF-9866: Remove arrows from list of plans --- .../custom/hdbt_subtheme/dist/css/styles.min.css | 2 +- .../themes/custom/hdbt_subtheme/package-lock.json | 12 ++++++------ .../06_components/paragraphs/_list-of-plans.scss | 15 --------------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index 55792db6..1d08f0f6 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.district-teaser{background-color:#fff;margin-bottom:16px;position:relative}@media(min-width: 768px){.district-teaser{display:flex}}.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{height:32px;width:32px;transition:transform .2s linear}@media(min-width: 768px){.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{bottom:32px;position:absolute;right:24px}}@media(prefers-reduced-motion){.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{transition:none}}.district-teaser:hover .hel-icon--arrow-right{transform:translateX(4px)}.district-teaser__data{display:flex;flex-direction:column;padding:32px 24px 32px 24px}@media(min-width: 768px){.district-teaser__data{padding:24px 32px 24px 32px;width:60%}}.district-teaser__data .content-tags{margin-bottom:8px}.district-teaser__data .content-tags__tags__tag:last-child{margin-bottom:0}.district-teaser__data .metadata__item{margin-bottom:16px;margin-top:0;width:100%}@media(min-width: 768px){.district-teaser__data .metadata__item>div{display:flex;flex-wrap:wrap}}.district-teaser__data .metadata__item .metadata__item-label::after{content:":";margin-right:4px}.district-teaser__image{min-width:220px;overflow:hidden}@media(min-width: 768px){.district-teaser__image{max-width:380px;width:40%}}.district-teaser__image img{display:block;height:auto;width:100%}.district-teaser__image .image-placeholder{height:100%;padding-bottom:aspect-ratio-padding(1.5)}.district-teaser__link{display:block;margin-bottom:16px;text-decoration:none}.district-teaser__link::after{content:"";top:0;right:0;bottom:0;left:0;position:absolute}.district-teaser__link h3{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:inline-block;margin-top:0}@media(min-width: 992px){.district-teaser__link h3{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.district__content-container{display:flex;flex-direction:column-reverse;margin:auto;margin-top:64px;max-width:1296px;padding-left:16px;padding-right:16px}@media(min-width: 992px){.district__content-container{flex-direction:row}}@media(min-width: 768px){.district__content-container{max-width:1328px}}@media(min-width: 768px){.district__content-container{padding-left:32px;padding-right:32px}}.district__content{margin-bottom:32px;width:100%}@media(min-width: 992px){.district__content{margin-bottom:0;margin-bottom:initial}}@media(min-width: 992px){.district__content.has-sidebar{margin-left:64px}}.district__content.has-sidebar .table-of-contents{margin:0}.district__content .table-of-contents,.district__content .component{padding:0 !important}@media(min-width: 992px){.district__sidebar-content{width:340px}}.node--type-district .hero__arrow{display:none}.node--type-district .metadata__item-content .label:not(:last-of-type)::after{content:", "}.page-type--district .lower-content .component--list-of-links:last-of-type{background-color:#f2f2f2;margin-bottom:calc((50px + 64px)*-1);padding-bottom:96px;padding-top:96px}.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{max-width:1296px;padding-left:16px;padding-right:16px;margin-left:auto;margin-right:auto}@media(min-width: 768px){.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{max-width:1328px}}@media(min-width: 768px){.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{padding-left:32px;padding-right:32px}}.page-type--project .project__image-container picture{display:block;max-width:860px}.page-type--project .project__image-container picture img{display:block;height:auto;max-width:100%;overflow:hidden;box-shadow:inset 0 0 0 1px #e6e6e6}.node--type-project .content-tags{margin-top:32px}.node--type-project .lead-in{margin-bottom:32px}.node--type-project .lower-content .component--list-of-links{background-color:#ccc}.node--type-project .metadata-container{max-width:860px}.node--type-project .metadata__item-content .label:not(:last-of-type)::after,.node--type-project .metadata__item--schedule--plan-schedule *:last-child::after,.node--type-project .card__meta__content .label:not(:last-of-type)::after,.node--type-project .card__meta__content .label--schedule:not(:last-of-type) *:last-child::after{content:", "}.node--type-project .project-metadata__schedule{display:block}.page-type--project .lower-content .component--list-of-links:last-of-type{background-color:#f2f2f2;margin-bottom:calc((50px + 64px)*-1);padding-bottom:96px;padding-top:96px}.project-teaser .content-tags{margin-top:0}.component--journey-planner .media-oembed-content{border:1px solid #ccc;border-radius:10px;height:252px;width:100%}@media(min-width: 768px){.component--journey-planner .media-oembed-content{width:500px}}.component--list-of-plans{padding-left:16px;padding-right:16px;background-color:#f7f7f8}@media(min-width: 768px){.component--list-of-plans{padding-left:32px;padding-right:32px}}.layout-main-wrapper>*:last-child .component--list-of-plans:last-child{margin-bottom:-115px;padding-bottom:55px}.list-of-plans__count-container{--line-height: 1.5;font-size:1.25rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.list-of-plans__count-container{--line-height: 1.5;font-size:1.375rem;font-weight:400}}.list-of-plans__count-container .list-of-plans__count{font-weight:700}.list-of-plans__list{margin-top:24px}.list-of-plans__subscribe-link{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-top:32px}.list-of-plans__pager{margin-top:32px}@media(min-width: 768px){.list-of-plans__pager{margin-top:64px;text-align:center}}.list-of-plans__pager-button{width:100%}@media(min-width: 768px){.list-of-plans__pager-button{width:auto}}.plan{background-color:#fff;margin-top:8px;padding-left:24px;padding-top:24px;padding-right:24px;padding-bottom:calc(24px + 28px + 8px);position:relative}@media(min-width: 992px){.plan{padding-left:32px;padding-top:32px;padding-right:32px;padding-bottom:60px}}.plan:first-child{margin-top:0}.plan__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-top:0}@media(min-width: 992px){.plan__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.plan__link{text-decoration:none}.plan__link::before{content:"";display:block;top:0;right:0;bottom:0;left:0;position:absolute}.plan__link .link__type{left:24px;bottom:24px;position:absolute}@media(min-width: 992px){.plan__link .link__type{--line-height: 2;left:auto;right:20px}}.plan__published{--line-height: 1.5;font-size:1rem;font-weight:400;line-height:var(--line-height);color:#595959;margin-top:24px}.component--project-list{padding-left:16px;padding-right:16px;background-color:#f7f7f8}@media(min-width: 768px){.component--project-list{padding-left:32px;padding-right:32px}}.project-list_count{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.project-list_count{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.project-list_count-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.project-list__count-container{margin-bottom:24px}.views--project-list .views-row:last-child .project-teaser{margin-bottom:0}.project-list__buttons{display:flex;flex-direction:column}@media(min-width: 768px){.project-list__buttons{flex-direction:row}}.project-list__buttons .hds-pagination-container{width:100%}.project-list__list .project-teaser .content-tags{display:none} +.district-teaser{background-color:#fff;margin-bottom:16px;position:relative}@media(min-width: 768px){.district-teaser{display:flex}}.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{height:32px;width:32px;transition:transform .2s linear}@media(min-width: 768px){.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{bottom:32px;position:absolute;right:24px}}@media(prefers-reduced-motion){.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{transition:none}}.district-teaser:hover .hel-icon--arrow-right{transform:translateX(4px)}.district-teaser__data{display:flex;flex-direction:column;padding:32px 24px 32px 24px}@media(min-width: 768px){.district-teaser__data{padding:24px 32px 24px 32px;width:60%}}.district-teaser__data .content-tags{margin-bottom:8px}.district-teaser__data .content-tags__tags__tag:last-child{margin-bottom:0}.district-teaser__data .metadata__item{margin-bottom:16px;margin-top:0;width:100%}@media(min-width: 768px){.district-teaser__data .metadata__item>div{display:flex;flex-wrap:wrap}}.district-teaser__data .metadata__item .metadata__item-label::after{content:":";margin-right:4px}.district-teaser__image{min-width:220px;overflow:hidden}@media(min-width: 768px){.district-teaser__image{max-width:380px;width:40%}}.district-teaser__image img{display:block;height:auto;width:100%}.district-teaser__image .image-placeholder{height:100%;padding-bottom:aspect-ratio-padding(1.5)}.district-teaser__link{display:block;margin-bottom:16px;text-decoration:none}.district-teaser__link::after{content:"";top:0;right:0;bottom:0;left:0;position:absolute}.district-teaser__link h3{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:inline-block;margin-top:0}@media(min-width: 992px){.district-teaser__link h3{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.district__content-container{display:flex;flex-direction:column-reverse;margin:auto;margin-top:64px;max-width:1296px;padding-left:16px;padding-right:16px}@media(min-width: 992px){.district__content-container{flex-direction:row}}@media(min-width: 768px){.district__content-container{max-width:1328px}}@media(min-width: 768px){.district__content-container{padding-left:32px;padding-right:32px}}.district__content{margin-bottom:32px;width:100%}@media(min-width: 992px){.district__content{margin-bottom:0;margin-bottom:initial}}@media(min-width: 992px){.district__content.has-sidebar{margin-left:64px}}.district__content.has-sidebar .table-of-contents{margin:0}.district__content .table-of-contents,.district__content .component{padding:0 !important}@media(min-width: 992px){.district__sidebar-content{width:340px}}.node--type-district .hero__arrow{display:none}.node--type-district .metadata__item-content .label:not(:last-of-type)::after{content:", "}.page-type--district .lower-content .component--list-of-links:last-of-type{background-color:#f2f2f2;margin-bottom:calc((50px + 64px)*-1);padding-bottom:96px;padding-top:96px}.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{max-width:1296px;padding-left:16px;padding-right:16px;margin-left:auto;margin-right:auto}@media(min-width: 768px){.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{max-width:1328px}}@media(min-width: 768px){.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{padding-left:32px;padding-right:32px}}.page-type--project .project__image-container picture{display:block;max-width:860px}.page-type--project .project__image-container picture img{display:block;height:auto;max-width:100%;overflow:hidden;box-shadow:inset 0 0 0 1px #e6e6e6}.node--type-project .content-tags{margin-top:32px}.node--type-project .lead-in{margin-bottom:32px}.node--type-project .lower-content .component--list-of-links{background-color:#ccc}.node--type-project .metadata-container{max-width:860px}.node--type-project .metadata__item-content .label:not(:last-of-type)::after,.node--type-project .metadata__item--schedule--plan-schedule *:last-child::after,.node--type-project .card__meta__content .label:not(:last-of-type)::after,.node--type-project .card__meta__content .label--schedule:not(:last-of-type) *:last-child::after{content:", "}.node--type-project .project-metadata__schedule{display:block}.page-type--project .lower-content .component--list-of-links:last-of-type{background-color:#f2f2f2;margin-bottom:calc((50px + 64px)*-1);padding-bottom:96px;padding-top:96px}.project-teaser .content-tags{margin-top:0}.component--journey-planner .media-oembed-content{border:1px solid #ccc;border-radius:10px;height:252px;width:100%}@media(min-width: 768px){.component--journey-planner .media-oembed-content{width:500px}}.component--list-of-plans{padding-left:16px;padding-right:16px;background-color:#f7f7f8}@media(min-width: 768px){.component--list-of-plans{padding-left:32px;padding-right:32px}}.layout-main-wrapper>*:last-child .component--list-of-plans:last-child{margin-bottom:-115px;padding-bottom:55px}.list-of-plans__count-container{--line-height: 1.5;font-size:1.25rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.list-of-plans__count-container{--line-height: 1.5;font-size:1.375rem;font-weight:400}}.list-of-plans__count-container .list-of-plans__count{font-weight:700}.list-of-plans__list{margin-top:24px}.list-of-plans__subscribe-link{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-top:32px}.list-of-plans__pager{margin-top:32px}@media(min-width: 768px){.list-of-plans__pager{margin-top:64px;text-align:center}}.list-of-plans__pager-button{width:100%}@media(min-width: 768px){.list-of-plans__pager-button{width:auto}}.plan{background-color:#fff;margin-top:8px;padding-left:24px;padding-top:24px;padding-right:24px;padding-bottom:calc(24px + 28px + 8px);position:relative}@media(min-width: 992px){.plan{padding-left:32px;padding-top:32px;padding-right:32px;padding-bottom:60px}}.plan:first-child{margin-top:0}.plan__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-top:0}@media(min-width: 992px){.plan__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.plan__link::before{content:"";display:block;top:0;right:0;bottom:0;left:0;position:absolute}.plan__published{--line-height: 1.5;font-size:1rem;font-weight:400;line-height:var(--line-height);color:#595959;margin-top:24px}.component--project-list{padding-left:16px;padding-right:16px;background-color:#f7f7f8}@media(min-width: 768px){.component--project-list{padding-left:32px;padding-right:32px}}.project-list_count{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.project-list_count{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.project-list_count-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.project-list__count-container{margin-bottom:24px}.views--project-list .views-row:last-child .project-teaser{margin-bottom:0}.project-list__buttons{display:flex;flex-direction:column}@media(min-width: 768px){.project-list__buttons{flex-direction:row}}.project-list__buttons .hds-pagination-container{width:100%}.project-list__list .project-teaser .content-tags{display:none} diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index c7071a3d..798141a4 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3349,9 +3349,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001659", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz", - "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==", + "version": "1.0.30001676", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz", + "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==", "funding": [ { "type": "opencollective", @@ -13197,9 +13197,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001659", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz", - "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==" + "version": "1.0.30001676", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz", + "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_list-of-plans.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_list-of-plans.scss index bd3e5cbe..7dc8c366 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_list-of-plans.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_list-of-plans.scss @@ -72,8 +72,6 @@ } .plan__link { - text-decoration: none; - // Make the whole card clickable. &::before { content: ''; @@ -81,19 +79,6 @@ inset: 0; position: absolute; } - - .link__type { - left: $spacing-and-half; - bottom: $spacing-and-half; - position: absolute; - - @include breakpoint($breakpoint-l) { - --line-height: 2; - left: auto; - // Arbitrary value from the design to line up the icon in a pretty way. - right: 20px; - } - } } .plan__published { From 04155a0fd08dd5c37b544e524f871288423f2dea Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Mon, 4 Nov 2024 09:07:39 +0200 Subject: [PATCH 04/20] Update elasticsearch settings --- public/sites/default/all.settings.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index 0ac7a394..e07af3ba 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -7,13 +7,12 @@ // Elasticsearch settings. if (getenv('ELASTICSEARCH_URL')) { - $config['elasticsearch_connector.cluster.kymp']['url'] = getenv('ELASTICSEARCH_URL'); + $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL'); if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) { - $config['elasticsearch_connector.cluster.kymp']['options']['use_authentication'] = '1'; - $config['elasticsearch_connector.cluster.kymp']['options']['authentication_type'] = 'Basic'; - $config['elasticsearch_connector.cluster.kymp']['options']['username'] = getenv('ELASTIC_USER'); - $config['elasticsearch_connector.cluster.kymp']['options']['password'] = getenv('ELASTIC_PASSWORD'); + $config['search_api.server.elastic_rekry']['backend_config']['connector'] = 'basicauth'; + $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER'); + $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD'); } } // Elastic proxy URL. From e8fc57cd48eb73100c7bce0c421e9fedec86ca22 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Mon, 4 Nov 2024 10:11:18 +0200 Subject: [PATCH 05/20] UHF-10719: Export config --- .../elasticsearch_connector.cluster.kymp.yml | 19 ------------------- conf/cmi/search_api.server.elastic_kymp.yml | 11 ++++++++--- 2 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 conf/cmi/elasticsearch_connector.cluster.kymp.yml diff --git a/conf/cmi/elasticsearch_connector.cluster.kymp.yml b/conf/cmi/elasticsearch_connector.cluster.kymp.yml deleted file mode 100644 index b94b08d6..00000000 --- a/conf/cmi/elasticsearch_connector.cluster.kymp.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 8caed881-457b-4d95-9881-1efe2a3148da -langcode: en -status: '1' -dependencies: { } -cluster_id: kymp -name: KYMP -url: 'http://elastic:9200' -options: - multiple_nodes_connection: false - use_authentication: true - authentication_type: Basic - username: '' - password: '' - timeout: 3 - rewrite: - rewrite_index: true - index: - prefix: '' - suffix: '' diff --git a/conf/cmi/search_api.server.elastic_kymp.yml b/conf/cmi/search_api.server.elastic_kymp.yml index f7bf3e74..e7537d84 100644 --- a/conf/cmi/search_api.server.elastic_kymp.yml +++ b/conf/cmi/search_api.server.elastic_kymp.yml @@ -9,6 +9,11 @@ name: 'Elastic KYMP' description: '' backend: elasticsearch backend_config: - cluster_settings: - cluster: kymp - fuzziness: auto + connector: standard + connector_config: + url: 'http://elastic:9200' + enable_debug_logging: false + advanced: + prefix: '' + suffix: '' + fuzziness: auto From 362a93c30c38119c02d04a429d1c1c3923566062 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Tue, 5 Nov 2024 07:56:50 +0200 Subject: [PATCH 06/20] UHF-10719: Fix search_api settings --- public/sites/default/all.settings.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index e07af3ba..260e6c53 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -7,12 +7,12 @@ // Elasticsearch settings. if (getenv('ELASTICSEARCH_URL')) { - $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL'); + $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL'); if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) { - $config['search_api.server.elastic_rekry']['backend_config']['connector'] = 'basicauth'; - $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER'); - $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD'); + $config['search_api.server.elastic_kymp']['backend_config']['connector'] = 'basicauth'; + $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER'); + $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD'); } } // Elastic proxy URL. From fdd20a3bafa885c53b708cdb5e1bcf1722f3ccdb Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 6 Nov 2024 13:26:49 +0000 Subject: [PATCH 07/20] Update configuration --- composer.lock | 108 +++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/composer.lock b/composer.lock index ec029a1f..a7cccbb0 100644 --- a/composer.lock +++ b/composer.lock @@ -4077,16 +4077,16 @@ }, { "name": "drupal/hdbt", - "version": "6.7.23", + "version": "6.8.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c3eba8e806c2fc6746f0c79ff28a599ffc45963d" + "reference": "e280113e8961216ae1db8314745801b6c40b323a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c3eba8e806c2fc6746f0c79ff28a599ffc45963d", - "reference": "c3eba8e806c2fc6746f0c79ff28a599ffc45963d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e280113e8961216ae1db8314745801b6c40b323a", + "reference": "e280113e8961216ae1db8314745801b6c40b323a", "shasum": "" }, "require": { @@ -4105,10 +4105,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.23", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-10-31T14:57:06+00:00" + "time": "2024-11-06T13:21:52+00:00" }, { "name": "drupal/hdbt_admin", @@ -11271,16 +11271,16 @@ }, { "name": "symfony/console", - "version": "v6.4.13", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79" + "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f793dd5a7d9ae9923e35d0503d08ba734cec1d79", - "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79", + "url": "https://api.github.com/repos/symfony/console/zipball/897c2441ed4eec8a8a2c37b943427d24dba3f26b", + "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b", "shasum": "" }, "require": { @@ -11345,7 +11345,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.13" + "source": "https://github.com/symfony/console/tree/v6.4.14" }, "funding": [ { @@ -11361,7 +11361,7 @@ "type": "tidelift" } ], - "time": "2024-10-09T08:40:40+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/dependency-injection", @@ -11513,16 +11513,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.13", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "e3c78742f86a5b65fe2ac4c4b6b776d92fd7ca0c" + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/e3c78742f86a5b65fe2ac4c4b6b776d92fd7ca0c", - "reference": "e3c78742f86a5b65fe2ac4c4b6b776d92fd7ca0c", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9", + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9", "shasum": "" }, "require": { @@ -11568,7 +11568,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.13" + "source": "https://github.com/symfony/error-handler/tree/v6.4.14" }, "funding": [ { @@ -11584,7 +11584,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/event-dispatcher", @@ -11874,16 +11874,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.13", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "4c0341b3e0a7291e752c69d2a1ed9a84b68d604c" + "reference": "ba020a321a95519303a3f09ec2824d34d601c388" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4c0341b3e0a7291e752c69d2a1ed9a84b68d604c", - "reference": "4c0341b3e0a7291e752c69d2a1ed9a84b68d604c", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388", + "reference": "ba020a321a95519303a3f09ec2824d34d601c388", "shasum": "" }, "require": { @@ -11931,7 +11931,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.13" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.14" }, "funding": [ { @@ -11947,20 +11947,20 @@ "type": "tidelift" } ], - "time": "2024-10-11T19:20:58+00:00" + "time": "2024-11-05T16:39:55+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.13", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "4474015c363ec0cd3bf47d55657e68630dbae66e" + "reference": "8278a947d0369754a47b758a9e17b72cab970951" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4474015c363ec0cd3bf47d55657e68630dbae66e", - "reference": "4474015c363ec0cd3bf47d55657e68630dbae66e", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8278a947d0369754a47b758a9e17b72cab970951", + "reference": "8278a947d0369754a47b758a9e17b72cab970951", "shasum": "" }, "require": { @@ -12045,7 +12045,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.13" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.14" }, "funding": [ { @@ -12061,7 +12061,7 @@ "type": "tidelift" } ], - "time": "2024-10-27T13:00:29+00:00" + "time": "2024-11-06T09:45:21+00:00" }, { "name": "symfony/mailer", @@ -13074,16 +13074,16 @@ }, { "name": "symfony/process", - "version": "v6.4.13", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f" + "reference": "25214adbb0996d18112548de20c281be9f27279f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/1f9f59b46880201629df3bd950fc5ae8c55b960f", - "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f", + "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f", + "reference": "25214adbb0996d18112548de20c281be9f27279f", "shasum": "" }, "require": { @@ -13115,7 +13115,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.13" + "source": "https://github.com/symfony/process/tree/v6.4.14" }, "funding": [ { @@ -13131,7 +13131,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2024-11-06T09:25:01+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -13646,16 +13646,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.13", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "68e0bf4522756269d9bff801a16701b2ed5eb730" + "reference": "dc259b85e59a6569e205966d447dec0a7d95facf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/68e0bf4522756269d9bff801a16701b2ed5eb730", - "reference": "68e0bf4522756269d9bff801a16701b2ed5eb730", + "url": "https://api.github.com/repos/symfony/validator/zipball/dc259b85e59a6569e205966d447dec0a7d95facf", + "reference": "dc259b85e59a6569e205966d447dec0a7d95facf", "shasum": "" }, "require": { @@ -13723,7 +13723,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.13" + "source": "https://github.com/symfony/validator/tree/v6.4.14" }, "funding": [ { @@ -13739,20 +13739,20 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-11-04T11:33:53+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.13", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2acb151474ed8cb43624e3f41a0bf7c4c8ce4f41" + "reference": "93c09246038178717a9c14b809ea8151ffcf7091" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2acb151474ed8cb43624e3f41a0bf7c4c8ce4f41", - "reference": "2acb151474ed8cb43624e3f41a0bf7c4c8ce4f41", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/93c09246038178717a9c14b809ea8151ffcf7091", + "reference": "93c09246038178717a9c14b809ea8151ffcf7091", "shasum": "" }, "require": { @@ -13808,7 +13808,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.13" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.14" }, "funding": [ { @@ -13824,7 +13824,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/var-exporter", @@ -16748,16 +16748,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.5.0", + "version": "5.5.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "54e10d44fc1a84e2598d26f70d4f6f1f233e228a" + "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/54e10d44fc1a84e2598d26f70d4f6f1f233e228a", - "reference": "54e10d44fc1a84e2598d26f70d4f6f1f233e228a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0c70d2c566e899666f367ab7b80986beb3581e6f", + "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f", "shasum": "" }, "require": { @@ -16806,9 +16806,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.5.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.5.1" }, - "time": "2024-11-04T21:26:31+00:00" + "time": "2024-11-06T11:58:54+00:00" }, { "name": "phpdocumentor/type-resolver", From cfa6ffff4a12bf93386041700153555c63448a9c Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Mon, 11 Nov 2024 07:47:52 +0000 Subject: [PATCH 08/20] Update configuration --- composer.lock | 1615 ++++++++--------- ...display.paragraph.remote_video.default.yml | 2 +- ...display.paragraph.remote_video.default.yml | 2 +- .../elasticsearch_connector.cluster.kymp.yml | 19 - ...agraph.remote_video.field_iframe_title.yml | 2 +- ...agraph.remote_video.field_remote_video.yml | 2 +- ...e_video.field_remote_video_description.yml | 2 +- ....remote_video.field_remote_video_title.yml | 2 +- ...te_video.field_remote_video_video_desc.yml | 2 +- ...e_video.field_remote_video_video_title.yml | 4 +- ...d.storage.paragraph.field_remote_video.yml | 2 +- ...ragraph.field_remote_video_description.yml | 2 +- ...age.paragraph.field_remote_video_title.yml | 2 +- ...aragraph.field_remote_video_video_desc.yml | 2 +- ...ragraph.field_remote_video_video_title.yml | 2 +- conf/cmi/metatag.settings.yml | 1 + ...aragraphs.paragraphs_type.remote_video.yml | 2 +- conf/cmi/search_api.server.elastic_kymp.yml | 13 +- 18 files changed, 746 insertions(+), 932 deletions(-) delete mode 100644 conf/cmi/elasticsearch_connector.cluster.kymp.yml diff --git a/composer.lock b/composer.lock index a7cccbb0..9284cd55 100644 --- a/composer.lock +++ b/composer.lock @@ -2263,16 +2263,16 @@ }, { "name": "drupal/core", - "version": "10.3.6", + "version": "10.3.7", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "168ec99f2012aeb4e93c6c7dd4a90dc919ae96c6" + "reference": "5b11ec4e38e71748c51287cbd64cfcc43faeb624" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/168ec99f2012aeb4e93c6c7dd4a90dc919ae96c6", - "reference": "168ec99f2012aeb4e93c6c7dd4a90dc919ae96c6", + "url": "https://api.github.com/repos/drupal/core/zipball/5b11ec4e38e71748c51287cbd64cfcc43faeb624", + "reference": "5b11ec4e38e71748c51287cbd64cfcc43faeb624", "shasum": "" }, "require": { @@ -2421,13 +2421,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.6" + "source": "https://github.com/drupal/core/tree/10.3.7" }, - "time": "2024-10-03T08:58:13+00:00" + "time": "2024-11-07T08:22:50+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.6", + "version": "10.3.7", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2471,7 +2471,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.6" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.7" }, "time": "2024-08-22T14:31:34+00:00" }, @@ -2907,17 +2907,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.19", + "version": "2.1.20", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.19" + "reference": "2.1.20" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.19.zip", - "reference": "2.1.19", - "shasum": "0ccf651071837e1ee6fcfb8fbb1c279d2fc1bc27" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.20.zip", + "reference": "2.1.20", + "shasum": "67f8e2eb17ed3d3db6cd93782ed1faa88c206640" }, "require": { "drupal/core": "^9 || ^10 || ^11" @@ -2928,8 +2928,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.19", - "datestamp": "1726514804", + "version": "2.1.20", + "datestamp": "1731097435", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2971,38 +2971,43 @@ }, { "name": "drupal/elasticsearch_connector", - "version": "7.0.0-alpha5", + "version": "8.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/elasticsearch_connector.git", - "reference": "8.x-7.0-alpha5" + "reference": "8.0.0-alpha2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.x-7.0-alpha5.zip", - "reference": "8.x-7.0-alpha5", - "shasum": "75456c31f48d76b176d81f258aa589987cd16b87" + "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.0.0-alpha2.zip", + "reference": "8.0.0-alpha2", + "shasum": "35928100f913b7a1d57a362b528071034f2ae1ff" }, "require": { - "drupal/core": "^9.2 || ^10", - "ext-curl": "*", - "makinacorpus/php-lucene": "^1.0.2", - "nodespark/des-connector": "7.x-dev" + "drupal/core": "^9 || ^10 | ^11", + "drupal/search_api": "^1.23", + "elasticsearch/elasticsearch": "^8", + "makinacorpus/php-lucene": "^1.1", + "php": "^8" }, "require-dev": { - "behat/mink-selenium2-driver": "^1.3", - "bex/behat-screenshot": "^1.2", - "drupal/coder": "^8.2", - "drupal/drupal-extension": "master-dev", - "drupal/search_api": "^1.4", - "phpmd/phpmd": "^2.6", - "phpmetrics/phpmetrics": "^2.3" + "drupal/coder": "^8.3", + "drupal/devel": "^4.0|^5.0", + "drupal/geofield": "1.x-dev", + "drush/drush": "^12.0 || ^13", + "phayes/geophp": "^1.2" + }, + "suggest": { + "drupal/facets": "Provides facetted search.", + "drupal/search_api_autocomplete": "Provides auto complete for search boxes.", + "drupal/search_api_location": "Provides location searches.", + "drupal/search_api_spellcheck": "Provides spell checking and 'Did You Mean?'." }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-7.0-alpha5", - "datestamp": "1718962853", + "version": "8.0.0-alpha2", + "datestamp": "1722668348", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3011,18 +3016,16 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { - "name": "Nikolay Ignatov", - "homepage": "http://www.nodespark.com", - "email": "nignatov@nodespark.com", - "role": "Creator and Maintainer" + "name": "lachezar.valchev", + "homepage": "https://www.drupal.org/user/1482368" }, { - "name": "See other contributors", - "homepage": "https://www.drupal.org/node/2159059/committers" + "name": "mparker17", + "homepage": "https://www.drupal.org/user/536298" }, { "name": "skek", @@ -3037,11 +3040,10 @@ "homepage": "https://www.drupal.org/user/257311" } ], - "description": "Elasticsearch Connector module for Drupal.", + "description": "Provides an ElasticSearch backend for Search API.", "homepage": "https://www.drupal.org/project/elasticsearch_connector", "support": { - "source": "https://github.com/nodespark/elasticsearch_connector", - "issues": "https://www.drupal.org/project/issues/elasticsearch_connector" + "source": "https://git.drupalcode.org/project/elasticsearch_connector" } }, { @@ -4077,16 +4079,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.0", + "version": "6.8.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "e280113e8961216ae1db8314745801b6c40b323a" + "reference": "dfabf9a5cdc0953ea7e3078ed002fe4bc937abad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e280113e8961216ae1db8314745801b6c40b323a", - "reference": "e280113e8961216ae1db8314745801b6c40b323a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/dfabf9a5cdc0953ea7e3078ed002fe4bc937abad", + "reference": "dfabf9a5cdc0953ea7e3078ed002fe4bc937abad", "shasum": "" }, "require": { @@ -4105,10 +4107,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.0", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-11-06T13:21:52+00:00" + "time": "2024-11-08T17:53:14+00:00" }, { "name": "drupal/hdbt_admin", @@ -4206,16 +4208,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.13", + "version": "2.7.15", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "b64e17819c3d21a8372c1325252f2cc294064d2d" + "reference": "bfada1ee33120497e8dde6dbde201320f41e2dfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/b64e17819c3d21a8372c1325252f2cc294064d2d", - "reference": "b64e17819c3d21a8372c1325252f2cc294064d2d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/bfada1ee33120497e8dde6dbde201320f41e2dfc", + "reference": "bfada1ee33120497e8dde6dbde201320f41e2dfc", "shasum": "" }, "require": { @@ -4245,10 +4247,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.13", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.15", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-11-06T09:24:38+00:00" + "time": "2024-11-08T08:31:53+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4417,16 +4419,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.23", + "version": "4.7.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "fda61dc90882c4799f35cb7d6039987cff4883a4" + "reference": "680984849f6f204b63af73efb0ae531ba121ff58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fda61dc90882c4799f35cb7d6039987cff4883a4", - "reference": "fda61dc90882c4799f35cb7d6039987cff4883a4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/680984849f6f204b63af73efb0ae531ba121ff58", + "reference": "680984849f6f204b63af73efb0ae531ba121ff58", "shasum": "" }, "require": { @@ -4444,7 +4446,7 @@ "drupal/diff": "^1.0", "drupal/easy_breadcrumb": "^2.0", "drupal/editoria11y": "^2.0", - "drupal/elasticsearch_connector": "^7.0@alpha", + "drupal/elasticsearch_connector": "^8.0@alpha", "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", "drupal/eu_cookie_compliance": "1.24", @@ -4491,7 +4493,8 @@ "drupal/views_bulk_operations": "^4.1", "ext-curl": "*", "league/uri": "^6.0", - "php": "^8.1" + "php": "^8.1", + "ruflin/elastica": "^8.0" }, "conflict": { "drupal/core": "<10.3", @@ -4503,6 +4506,9 @@ "drupal/stage_file_proxy": "<2.1.5", "drush/drush": "<12" }, + "require-dev": { + "dg/bypass-finals": "^1.0" + }, "type": "drupal-module", "extra": { "patches": { @@ -4537,6 +4543,9 @@ }, "drupal/view_unpublished": { "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch" + }, + "drupal/elasticsearch_connector": { + "https://drupal.org/i/3486375": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/be8a1fba1a5ea2422154caf4fb7183dfc3917599/patches/3486375.patch" } } }, @@ -4545,10 +4554,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.23", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.7.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-10-31T11:33:34+00:00" + "time": "2024-11-11T07:44:23+00:00" }, { "name": "drupal/helfi_proxy", @@ -4597,16 +4606,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.8", + "version": "2.3.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "b64f239e7b8379cbc97dfc28d35e8c3f2db80162" + "reference": "6cca3df5dc891c98ae40e8259856a343d9abd8ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/b64f239e7b8379cbc97dfc28d35e8c3f2db80162", - "reference": "b64f239e7b8379cbc97dfc28d35e8c3f2db80162", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/6cca3df5dc891c98ae40e8259856a343d9abd8ca", + "reference": "6cca3df5dc891c98ae40e8259856a343d9abd8ca", "shasum": "" }, "require": { @@ -4632,10 +4641,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.9", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2024-03-25T06:40:36+00:00" + "time": "2024-11-07T13:09:51+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -4672,20 +4681,20 @@ }, { "name": "drupal/image_style_quality", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/image_style_quality.git", - "reference": "8.x-1.6" + "reference": "8.x-1.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/image_style_quality-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "262f63471c3765eb7c944476f18b27fb82bdeaa1" + "url": "https://ftp.drupal.org/files/projects/image_style_quality-8.x-1.7.zip", + "reference": "8.x-1.7", + "shasum": "3cb3d326e3df3b78cadc91bae1fd9de17dd27bc7" }, "require": { - "drupal/core": "^8 || ^9 || ^10", + "drupal/core": "^8 || ^9 || ^10 || ^11", "php": ">=7.4" }, "require-dev": { @@ -4699,8 +4708,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.6", - "datestamp": "1679497333", + "version": "8.x-1.7", + "datestamp": "1730925822", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4721,7 +4730,7 @@ "homepage": "https://www.drupal.org/user/1463982" }, { - "name": "Sam152", + "name": "sam152", "homepage": "https://www.drupal.org/user/1485048" } ], @@ -5311,17 +5320,17 @@ }, { "name": "drupal/metatag", - "version": "2.0.2", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/metatag.git", - "reference": "2.0.2" + "reference": "2.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-2.0.2.zip", - "reference": "2.0.2", - "shasum": "748013c50a0ed5e10359413bb3481392a0bf0d3f" + "url": "https://ftp.drupal.org/files/projects/metatag-2.1.0.zip", + "reference": "2.1.0", + "shasum": "c28fe2fdac68a9370a6af6cbafff4425dd5148f3" }, "require": { "drupal/core": "^9.4 || ^10 || ^11", @@ -5329,6 +5338,7 @@ "php": ">=8.0" }, "require-dev": { + "drupal/forum": "*", "drupal/hal": "^1 || ^2 || ^9", "drupal/metatag_dc": "*", "drupal/metatag_open_graph": "*", @@ -5340,8 +5350,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1722869772", + "version": "2.1.0", + "datestamp": "1731004042", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5614,7 +5624,7 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -5634,7 +5644,7 @@ "homepage": "https://www.drupal.org/user/227761" }, { - "name": "Primsi", + "name": "primsi", "homepage": "https://www.drupal.org/user/282629" } ], @@ -7392,17 +7402,17 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.3.1", + "version": "4.3.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.3.1" + "reference": "4.3.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.3.1.zip", - "reference": "4.3.1", - "shasum": "1089fe41ddb01313f34d55e19e8f3a5157889430" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.3.2.zip", + "reference": "4.3.2", + "shasum": "b3d0ee06abb15520595b83324e93c5500d5dcef3" }, "require": { "drupal/core": "^10.3 || ^11" @@ -7419,8 +7429,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.3.1", - "datestamp": "1729683242", + "version": "4.3.2", + "datestamp": "1731070018", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7808,181 +7818,120 @@ "time": "2023-10-06T06:47:41+00:00" }, { - "name": "elasticsearch/elasticsearch", - "version": "v7.17.2", - "source": { - "type": "git", - "url": "https://github.com/elastic/elasticsearch-php.git", - "reference": "2d302233f2bb0926812d82823bb820d405e130fc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/2d302233f2bb0926812d82823bb820d405e130fc", - "reference": "2d302233f2bb0926812d82823bb820d405e130fc", - "shasum": "" - }, - "require": { - "ext-json": ">=1.3.7", - "ezimuel/ringphp": "^1.1.2", - "php": "^7.3 || ^8.0", - "psr/log": "^1|^2|^3" - }, - "require-dev": { - "ext-yaml": "*", - "ext-zip": "*", - "mockery/mockery": "^1.2", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.3", - "squizlabs/php_codesniffer": "^3.4", - "symfony/finder": "~4.0" - }, - "suggest": { - "ext-curl": "*", - "monolog/monolog": "Allows for client-level logging and tracing" - }, - "type": "library", - "autoload": { - "files": [ - "src/autoload.php" - ], - "psr-4": { - "Elasticsearch\\": "src/Elasticsearch/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0", - "LGPL-2.1-only" - ], - "authors": [ - { - "name": "Zachary Tong" - }, - { - "name": "Enrico Zimuel" - } - ], - "description": "PHP Client for Elasticsearch", - "keywords": [ - "client", - "elasticsearch", - "search" - ], - "support": { - "issues": "https://github.com/elastic/elasticsearch-php/issues", - "source": "https://github.com/elastic/elasticsearch-php/tree/v7.17.2" - }, - "time": "2023-04-21T15:31:12+00:00" - }, - { - "name": "ezimuel/guzzlestreams", - "version": "3.1.0", + "name": "elastic/transport", + "version": "v8.10.0", "source": { "type": "git", - "url": "https://github.com/ezimuel/guzzlestreams.git", - "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997" + "url": "https://github.com/elastic/elastic-transport-php.git", + "reference": "8be37d679637545e50b1cea9f8ee903888783021" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/b4b5a025dfee70d6cd34c780e07330eb93d5b997", - "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997", + "url": "https://api.github.com/repos/elastic/elastic-transport-php/zipball/8be37d679637545e50b1cea9f8ee903888783021", + "reference": "8be37d679637545e50b1cea9f8ee903888783021", "shasum": "" }, "require": { - "php": ">=5.4.0" + "composer-runtime-api": "^2.0", + "open-telemetry/api": "^1.0", + "php": "^7.4 || ^8.0", + "php-http/discovery": "^1.14", + "php-http/httplug": "^2.3", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0 || ^2.0", + "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpunit/phpunit": "~9.0" + "nyholm/psr7": "^1.5", + "open-telemetry/sdk": "^1.0", + "php-http/mock-client": "^1.5", + "phpstan/phpstan": "^1.4", + "phpunit/phpunit": "^9.5", + "symfony/http-client": "^5.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, "autoload": { "psr-4": { - "GuzzleHttp\\Stream\\": "src/" + "Elastic\\Transport\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Fork of guzzle/streams (abandoned) to be used with elasticsearch-php", - "homepage": "http://guzzlephp.org/", + "description": "HTTP transport PHP library for Elastic products", "keywords": [ - "Guzzle", - "stream" + "PSR_17", + "elastic", + "http", + "psr-18", + "psr-7", + "transport" ], "support": { - "source": "https://github.com/ezimuel/guzzlestreams/tree/3.1.0" + "issues": "https://github.com/elastic/elastic-transport-php/issues", + "source": "https://github.com/elastic/elastic-transport-php/tree/v8.10.0" }, - "time": "2022-10-24T12:58:50+00:00" + "time": "2024-08-14T08:55:07+00:00" }, { - "name": "ezimuel/ringphp", - "version": "1.2.2", + "name": "elasticsearch/elasticsearch", + "version": "v8.15.0", "source": { "type": "git", - "url": "https://github.com/ezimuel/ringphp.git", - "reference": "7887fc8488013065f72f977dcb281994f5fde9f4" + "url": "https://github.com/elastic/elasticsearch-php.git", + "reference": "34c2444fa8d4c3e6c8b009bd8dea90bca007203b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/7887fc8488013065f72f977dcb281994f5fde9f4", - "reference": "7887fc8488013065f72f977dcb281994f5fde9f4", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/34c2444fa8d4c3e6c8b009bd8dea90bca007203b", + "reference": "34c2444fa8d4c3e6c8b009bd8dea90bca007203b", "shasum": "" }, "require": { - "ezimuel/guzzlestreams": "^3.0.1", - "php": ">=5.4.0", - "react/promise": "~2.0" - }, - "replace": { - "guzzlehttp/ringphp": "self.version" + "elastic/transport": "^8.10", + "guzzlehttp/guzzle": "^7.0", + "php": "^7.4 || ^8.0", + "psr/http-client": "^1.0", + "psr/http-message": "^1.1 || ^2.0", + "psr/log": "^1|^2|^3" }, "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "~9.0" - }, - "suggest": { - "ext-curl": "Guzzle will use specific adapters if cURL is present" + "ext-yaml": "*", + "ext-zip": "*", + "mockery/mockery": "^1.5", + "nyholm/psr7": "^1.5", + "php-http/message-factory": "^1.0", + "php-http/mock-client": "^1.5", + "phpstan/phpstan": "^1.4", + "phpunit/phpunit": "^9.5", + "psr/http-factory": "^1.0", + "symfony/finder": "~4.0", + "symfony/http-client": "^5.0|^6.0|^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, "autoload": { "psr-4": { - "GuzzleHttp\\Ring\\": "src/" + "Elastic\\Elasticsearch\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } + "description": "PHP Client for Elasticsearch", + "keywords": [ + "client", + "elastic", + "elasticsearch", + "search" ], - "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php", "support": { - "source": "https://github.com/ezimuel/ringphp/tree/1.2.2" + "issues": "https://github.com/elastic/elasticsearch-php/issues", + "source": "https://github.com/elastic/elasticsearch-php/tree/v8.15.0" }, - "time": "2022-12-07T11:28:53+00:00" + "time": "2024-08-14T14:32:50+00:00" }, { "name": "ezyang/htmlpurifier", @@ -8774,16 +8723,16 @@ }, { "name": "league/container", - "version": "4.2.3", + "version": "4.2.4", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "72f9bebe7bd623007782a40f5ec305661ab706d8" + "reference": "7ea728b013b9a156c409c6f0fc3624071b742dec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/72f9bebe7bd623007782a40f5ec305661ab706d8", - "reference": "72f9bebe7bd623007782a40f5ec305661ab706d8", + "url": "https://api.github.com/repos/thephpleague/container/zipball/7ea728b013b9a156c409c6f0fc3624071b742dec", + "reference": "7ea728b013b9a156c409c6f0fc3624071b742dec", "shasum": "" }, "require": { @@ -8844,7 +8793,7 @@ ], "support": { "issues": "https://github.com/thephpleague/container/issues", - "source": "https://github.com/thephpleague/container/tree/4.2.3" + "source": "https://github.com/thephpleague/container/tree/4.2.4" }, "funding": [ { @@ -8852,7 +8801,7 @@ "type": "github" } ], - "time": "2024-10-23T12:06:58+00:00" + "time": "2024-11-10T12:42:13+00:00" }, { "name": "league/flysystem", @@ -9691,121 +9640,130 @@ "time": "2024-10-08T18:51:32+00:00" }, { - "name": "nodespark/des-connector", - "version": "7.x-dev", + "name": "open-telemetry/api", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/tuutti/des-connector.git", - "reference": "a075a6b9e54b5855d0a292d9266839312e6026dc" + "url": "https://github.com/opentelemetry-php/api.git", + "reference": "87de95d926f46262885d0d390060c095af13e2e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tuutti/des-connector/zipball/a075a6b9e54b5855d0a292d9266839312e6026dc", - "reference": "a075a6b9e54b5855d0a292d9266839312e6026dc", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/87de95d926f46262885d0d390060c095af13e2e5", + "reference": "87de95d926f46262885d0d390060c095af13e2e5", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "ruflin/elastica": "^7.0" + "open-telemetry/context": "^1.0", + "php": "^7.4 || ^8.0", + "psr/log": "^1.1|^2.0|^3.0", + "symfony/polyfill-php80": "^1.26", + "symfony/polyfill-php81": "^1.26", + "symfony/polyfill-php82": "^1.26" }, - "require-dev": { - "phpunit/phpunit": "^8.4.1 || ^9" + "conflict": { + "open-telemetry/sdk": "<=1.0.4" }, "type": "library", - "autoload": { - "psr-4": { - "nodespark\\DESConnector\\": "src/DESConnector/" + "extra": { + "branch-alias": { + "dev-main": "1.0.x-dev" } }, - "autoload-dev": { + "autoload": { + "files": [ + "Trace/functions.php" + ], "psr-4": { - "nodespark\\DESConnector\\Test\\": "tests/" + "OpenTelemetry\\API\\": "." } }, + "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "Apache-2.0" ], "authors": [ { - "name": "Nikolay Ignatov", - "email": "nignatov@nodespark.com", - "homepage": "http://www.nodespark.com", - "role": "Creator and Maintainer" - }, - { - "name": "Lachezar Valchev", - "email": "lachezar.valchev@gmail.com", - "homepage": "https://drupal.org/u/lachezar.valchev", - "role": "Maintainer" + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" } ], - "description": "An abstraction library for Elasticsearch Connector module for Drupal.", - "homepage": "https://github.com/nodespark/des-connector", + "description": "API for OpenTelemetry PHP.", + "keywords": [ + "Metrics", + "api", + "apm", + "logging", + "opentelemetry", + "otel", + "tracing" + ], "support": { - "source": "https://github.com/nodespark/des-connector" + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2022-12-05T10:56:20+00:00" + "time": "2024-02-06T01:32:25+00:00" }, { - "name": "nyholm/dsn", - "version": "2.0.1", + "name": "open-telemetry/context", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/Nyholm/dsn.git", - "reference": "9445621b426bac8c0ca161db8cd700da00a4e618" + "url": "https://github.com/opentelemetry-php/context.git", + "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Nyholm/dsn/zipball/9445621b426bac8c0ca161db8cd700da00a4e618", - "reference": "9445621b426bac8c0ca161db8cd700da00a4e618", + "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/0cba875ea1953435f78aec7f1d75afa87bdbf7f3", + "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3", "shasum": "" }, "require": { - "php": ">=7.1" + "php": "^8.1", + "symfony/polyfill-php82": "^1.26" }, - "require-dev": { - "symfony/phpunit-bridge": "^5.1" + "suggest": { + "ext-ffi": "To allow context switching in Fibers" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "1.0.x-dev" } }, "autoload": { + "files": [ + "fiber/initialize_fiber_handler.php" + ], "psr-4": { - "Nyholm\\Dsn\\": "src/" + "OpenTelemetry\\Context\\": "." } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "Apache-2.0" ], "authors": [ { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" } ], - "description": "Parse your DSN strings in a powerful and flexible way", - "homepage": "http://tnyholm.se", + "description": "Context implementation for OpenTelemetry PHP.", "keywords": [ - "database", - "dsn", - "dsn parser", - "parser" + "Context", + "opentelemetry", + "otel" ], "support": { - "issues": "https://github.com/Nyholm/dsn/issues", - "source": "https://github.com/Nyholm/dsn/tree/2.0.1" + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "funding": [ - { - "url": "https://github.com/Nyholm", - "type": "github" - } - ], - "time": "2021-11-18T09:23:29+00:00" + "time": "2024-08-21T00:29:20+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -10258,27 +10216,215 @@ "time": "2024-10-03T13:43:19+00:00" }, { - "name": "phpowermove/docblock", - "version": "v4.0", + "name": "php-http/discovery", + "version": "1.20.0", "source": { "type": "git", - "url": "https://github.com/phpowermove/docblock.git", - "reference": "a73f6e17b7d4e1b92ca5378c248c952c9fae7826" + "url": "https://github.com/php-http/discovery.git", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpowermove/docblock/zipball/a73f6e17b7d4e1b92ca5378c248c952c9fae7826", - "reference": "a73f6e17b7d4e1b92ca5378c248c952c9fae7826", + "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", "shasum": "" }, "require": { - "phootwork/collection": "^3.0", - "phootwork/lang": "^3.0", - "php": ">=8.0" + "composer-plugin-api": "^1.0|^2.0", + "php": "^7.1 || ^8.0" }, - "require-dev": { - "phootwork/php-cs-fixer-config": "^0.4", - "phpunit/phpunit": "^9.0", + "conflict": { + "nyholm/psr7": "<1.0", + "zendframework/zend-diactoros": "*" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "*", + "psr/http-factory-implementation": "*", + "psr/http-message-implementation": "*" + }, + "require-dev": { + "composer/composer": "^1.0.2|^2.0", + "graham-campbell/phpspec-skip-example-extension": "^5.0", + "php-http/httplug": "^1.0 || ^2.0", + "php-http/message-factory": "^1.0", + "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", + "sebastian/comparator": "^3.0.5 || ^4.0.8", + "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" + }, + "type": "composer-plugin", + "extra": { + "class": "Http\\Discovery\\Composer\\Plugin", + "plugin-optional": true + }, + "autoload": { + "psr-4": { + "Http\\Discovery\\": "src/" + }, + "exclude-from-classmap": [ + "src/Composer/Plugin.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", + "homepage": "http://php-http.org", + "keywords": [ + "adapter", + "client", + "discovery", + "factory", + "http", + "message", + "psr17", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/discovery/issues", + "source": "https://github.com/php-http/discovery/tree/1.20.0" + }, + "time": "2024-10-02T11:20:13+00:00" + }, + { + "name": "php-http/httplug", + "version": "2.4.1", + "source": { + "type": "git", + "url": "https://github.com/php-http/httplug.git", + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4", + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/promise": "^1.1", + "psr/http-client": "^1.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "require-dev": { + "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eric GELOEN", + "email": "geloen.eric@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" + } + ], + "description": "HTTPlug, the HTTP client abstraction for PHP", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http" + ], + "support": { + "issues": "https://github.com/php-http/httplug/issues", + "source": "https://github.com/php-http/httplug/tree/2.4.1" + }, + "time": "2024-09-23T11:39:58+00:00" + }, + { + "name": "php-http/promise", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/php-http/promise.git", + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3", + "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Http\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Joel Wurtz", + "email": "joel.wurtz@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Promise used for asynchronous HTTP requests", + "homepage": "http://httplug.io", + "keywords": [ + "promise" + ], + "support": { + "issues": "https://github.com/php-http/promise/issues", + "source": "https://github.com/php-http/promise/tree/1.3.1" + }, + "time": "2024-03-15T13:55:21+00:00" + }, + { + "name": "phpowermove/docblock", + "version": "v4.0", + "source": { + "type": "git", + "url": "https://github.com/phpowermove/docblock.git", + "reference": "a73f6e17b7d4e1b92ca5378c248c952c9fae7826" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpowermove/docblock/zipball/a73f6e17b7d4e1b92ca5378c248c952c9fae7826", + "reference": "a73f6e17b7d4e1b92ca5378c248c952c9fae7826", + "shasum": "" + }, + "require": { + "phootwork/collection": "^3.0", + "phootwork/lang": "^3.0", + "php": ">=8.0" + }, + "require-dev": { + "phootwork/php-cs-fixer-config": "^0.4", + "phpunit/phpunit": "^9.0", "psalm/phar": "^4.3" }, "type": "library", @@ -10901,32 +11047,44 @@ "time": "2019-03-08T08:55:37+00:00" }, { - "name": "react/promise", - "version": "v2.11.0", + "name": "ruflin/elastica", + "version": "8.0.0", "source": { "type": "git", - "url": "https://github.com/reactphp/promise.git", - "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831" + "url": "https://github.com/ruflin/Elastica.git", + "reference": "2fc446e37847e84cd9f9be8e75fd2b322007ea43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/1a8460931ea36dc5c76838fec5734d55c88c6831", - "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831", + "url": "https://api.github.com/repos/ruflin/Elastica/zipball/2fc446e37847e84cd9f9be8e75fd2b322007ea43", + "reference": "2fc446e37847e84cd9f9be8e75fd2b322007ea43", "shasum": "" }, "require": { - "php": ">=5.4.0" + "elastic/transport": "^8.8", + "elasticsearch/elasticsearch": "^8.4.1", + "ext-json": "*", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "psr/log": "^1.0 || ^2.0 || ^3.0" + }, + "conflict": { + "guzzlehttp/psr7": "<2.0.0" }, "require-dev": { - "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" + "guzzlehttp/guzzle": "^7.2", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "symfony/phpunit-bridge": "^6.0" + }, + "suggest": { + "aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", + "monolog/monolog": "Logging request" }, "type": "library", "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { - "React\\Promise\\": "src/" + "Elastica\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -10935,119 +11093,29 @@ ], "authors": [ { - "name": "Jan Sorgalla", - "email": "jsorgalla@gmail.com", - "homepage": "https://sorgalla.com/" - }, - { - "name": "Christian Lück", - "email": "christian@clue.engineering", - "homepage": "https://clue.engineering/" - }, - { - "name": "Cees-Jan Kiewiet", - "email": "reactphp@ceesjankiewiet.nl", - "homepage": "https://wyrihaximus.net/" - }, - { - "name": "Chris Boden", - "email": "cboden@gmail.com", - "homepage": "https://cboden.dev/" + "name": "Nicolas Ruflin", + "homepage": "http://ruflin.com/" } ], - "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "description": "Elasticsearch Client", + "homepage": "http://elastica.io/", "keywords": [ - "promise", - "promises" + "client", + "search" ], "support": { - "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.11.0" + "issues": "https://github.com/ruflin/Elastica/issues", + "source": "https://github.com/ruflin/Elastica/tree/8.0.0" }, - "funding": [ - { - "url": "https://opencollective.com/reactphp", - "type": "open_collective" - } - ], - "time": "2023-11-16T16:16:50+00:00" + "time": "2024-05-29T11:45:23+00:00" }, { - "name": "ruflin/elastica", - "version": "7.3.2", + "name": "sebastian/diff", + "version": "4.0.6", "source": { "type": "git", - "url": "https://github.com/ruflin/Elastica.git", - "reference": "84ba137678707a1aa4242d12bad891dc38fa2608" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ruflin/Elastica/zipball/84ba137678707a1aa4242d12bad891dc38fa2608", - "reference": "84ba137678707a1aa4242d12bad891dc38fa2608", - "shasum": "" - }, - "require": { - "elasticsearch/elasticsearch": "^7.10", - "ext-json": "*", - "nyholm/dsn": "^2.0.0", - "php": "^7.2 || ^8.0", - "psr/log": "^1.0 || ^2.0 || ^3.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0", - "symfony/polyfill-php73": "^1.19" - }, - "require-dev": { - "aws/aws-sdk-php": "^3.155", - "guzzlehttp/guzzle": "^6.3 || ^7.2", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^8.5.8 || ^9.4", - "symfony/phpunit-bridge": "^6.0" - }, - "suggest": { - "aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", - "guzzlehttp/guzzle": "Allow using guzzle as transport", - "monolog/monolog": "Logging request" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Elastica\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Ruflin", - "homepage": "http://ruflin.com/" - } - ], - "description": "Elasticsearch Client", - "homepage": "http://elastica.io/", - "keywords": [ - "client", - "search" - ], - "support": { - "issues": "https://github.com/ruflin/Elastica/issues", - "source": "https://github.com/ruflin/Elastica/tree/7.3.2" - }, - "time": "2024-03-11T14:11:50+00:00" - }, - { - "name": "sebastian/diff", - "version": "4.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", @@ -12845,17 +12913,17 @@ "time": "2020-10-23T14:02:19+00:00" }, { - "name": "symfony/polyfill-php73", + "name": "symfony/polyfill-php80", "version": "v1.31.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", - "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { @@ -12873,7 +12941,7 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" + "Symfony\\Polyfill\\Php80\\": "" }, "classmap": [ "Resources/stubs" @@ -12884,6 +12952,10 @@ "MIT" ], "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -12893,7 +12965,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -12902,7 +12974,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -12996,6 +13068,82 @@ ], "time": "2024-09-09T11:45:10+00:00" }, + { + "name": "symfony/polyfill-php82", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php82.git", + "reference": "5d2ed36f7734637dacc025f179698031951b1692" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/5d2ed36f7734637dacc025f179698031951b1692", + "reference": "5d2ed36f7734637dacc025f179698031951b1692", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php82\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php82/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, { "name": "symfony/polyfill-php83", "version": "v1.31.0", @@ -14075,16 +14223,16 @@ }, { "name": "twig/twig", - "version": "v3.14.0", + "version": "v3.14.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" + "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", - "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", + "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", "shasum": "" }, "require": { @@ -14138,7 +14286,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.14.0" + "source": "https://github.com/twigphp/Twig/tree/v3.14.2" }, "funding": [ { @@ -14150,7 +14298,7 @@ "type": "tidelift" } ], - "time": "2024-09-09T17:55:12+00:00" + "time": "2024-11-07T12:36:22+00:00" }, { "name": "twistor/flysystem-stream-wrapper", @@ -15937,134 +16085,6 @@ ], "time": "2023-03-08T13:26:56+00:00" }, - { - "name": "open-telemetry/api", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/opentelemetry-php/api.git", - "reference": "87de95d926f46262885d0d390060c095af13e2e5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/87de95d926f46262885d0d390060c095af13e2e5", - "reference": "87de95d926f46262885d0d390060c095af13e2e5", - "shasum": "" - }, - "require": { - "open-telemetry/context": "^1.0", - "php": "^7.4 || ^8.0", - "psr/log": "^1.1|^2.0|^3.0", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", - "symfony/polyfill-php82": "^1.26" - }, - "conflict": { - "open-telemetry/sdk": "<=1.0.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.0.x-dev" - } - }, - "autoload": { - "files": [ - "Trace/functions.php" - ], - "psr-4": { - "OpenTelemetry\\API\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "opentelemetry-php contributors", - "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" - } - ], - "description": "API for OpenTelemetry PHP.", - "keywords": [ - "Metrics", - "api", - "apm", - "logging", - "opentelemetry", - "otel", - "tracing" - ], - "support": { - "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", - "docs": "https://opentelemetry.io/docs/php", - "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", - "source": "https://github.com/open-telemetry/opentelemetry-php" - }, - "time": "2024-02-06T01:32:25+00:00" - }, - { - "name": "open-telemetry/context", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/opentelemetry-php/context.git", - "reference": "e9d254a7c89885e63fd2fde54e31e81aaaf52b7c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/e9d254a7c89885e63fd2fde54e31e81aaaf52b7c", - "reference": "e9d254a7c89885e63fd2fde54e31e81aaaf52b7c", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", - "symfony/polyfill-php82": "^1.26" - }, - "suggest": { - "ext-ffi": "To allow context switching in Fibers" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.0.x-dev" - } - }, - "autoload": { - "files": [ - "fiber/initialize_fiber_handler.php" - ], - "psr-4": { - "OpenTelemetry\\Context\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "opentelemetry-php contributors", - "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" - } - ], - "description": "Context implementation for OpenTelemetry PHP.", - "keywords": [ - "Context", - "opentelemetry", - "otel" - ], - "support": { - "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", - "docs": "https://opentelemetry.io/docs/php", - "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", - "source": "https://github.com/open-telemetry/opentelemetry-php" - }, - "time": "2024-01-13T05:50:44+00:00" - }, { "name": "open-telemetry/exporter-otlp", "version": "1.0.3", @@ -16277,20 +16297,20 @@ }, { "name": "open-telemetry/sem-conv", - "version": "1.24.0", + "version": "1.27.1", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sem-conv.git", - "reference": "d03e6501d21c04cd1b1e66e4cbcc7c2dd2e2cfa3" + "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/d03e6501d21c04cd1b1e66e4cbcc7c2dd2e2cfa3", - "reference": "d03e6501d21c04cd1b1e66e4cbcc7c2dd2e2cfa3", + "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/1dba705fea74bc0718d04be26090e3697e56f4e6", + "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0" + "php": "^8.1" }, "type": "library", "extra": { @@ -16330,7 +16350,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-01-23T21:47:17+00:00" + "time": "2024-08-28T09:20:31+00:00" }, { "name": "phar-io/manifest", @@ -16403,269 +16423,84 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.2.1" - }, - "time": "2022-02-21T01:04:05+00:00" - }, - { - "name": "php-http/discovery", - "version": "1.20.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/discovery.git", - "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", - "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0|^2.0", - "php": "^7.1 || ^8.0" - }, - "conflict": { - "nyholm/psr7": "<1.0", - "zendframework/zend-diactoros": "*" - }, - "provide": { - "php-http/async-client-implementation": "*", - "php-http/client-implementation": "*", - "psr/http-client-implementation": "*", - "psr/http-factory-implementation": "*", - "psr/http-message-implementation": "*" - }, - "require-dev": { - "composer/composer": "^1.0.2|^2.0", - "graham-campbell/phpspec-skip-example-extension": "^5.0", - "php-http/httplug": "^1.0 || ^2.0", - "php-http/message-factory": "^1.0", - "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", - "sebastian/comparator": "^3.0.5 || ^4.0.8", - "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" - }, - "type": "composer-plugin", - "extra": { - "class": "Http\\Discovery\\Composer\\Plugin", - "plugin-optional": true - }, - "autoload": { - "psr-4": { - "Http\\Discovery\\": "src/" - }, - "exclude-from-classmap": [ - "src/Composer/Plugin.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", - "homepage": "http://php-http.org", - "keywords": [ - "adapter", - "client", - "discovery", - "factory", - "http", - "message", - "psr17", - "psr7" - ], - "support": { - "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.20.0" - }, - "time": "2024-10-02T11:20:13+00:00" - }, - { - "name": "php-http/guzzle7-adapter", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/guzzle7-adapter.git", - "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", - "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", - "shasum": "" - }, - "require": { - "guzzlehttp/guzzle": "^7.0", - "php": "^7.2 | ^8.0", - "php-http/httplug": "^2.0", - "psr/http-client": "^1.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" - }, - "require-dev": { - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.0|^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Adapter\\Guzzle7\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "description": "Guzzle 7 HTTP Adapter", - "homepage": "http://httplug.io", - "keywords": [ - "Guzzle", - "http" - ], - "support": { - "issues": "https://github.com/php-http/guzzle7-adapter/issues", - "source": "https://github.com/php-http/guzzle7-adapter/tree/1.0.0" - }, - "time": "2021-03-09T07:35:15+00:00" - }, - { - "name": "php-http/httplug", - "version": "2.4.1", - "source": { - "type": "git", - "url": "https://github.com/php-http/httplug.git", - "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4", - "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0", - "php-http/promise": "^1.1", - "psr/http-client": "^1.0", - "psr/http-message": "^1.0 || ^2.0" - }, - "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", - "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { - "psr-4": { - "Http\\Client\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Eric GELOEN", - "email": "geloen.eric@gmail.com" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" }, { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" } ], - "description": "HTTPlug, the HTTP client abstraction for PHP", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "http" - ], + "description": "Library for handling version information and constraints", "support": { - "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/2.4.1" + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" }, - "time": "2024-09-23T11:39:58+00:00" + "time": "2022-02-21T01:04:05+00:00" }, { - "name": "php-http/promise", - "version": "1.3.1", + "name": "php-http/guzzle7-adapter", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/php-http/promise.git", - "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83" + "url": "https://github.com/php-http/guzzle7-adapter.git", + "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83", - "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", + "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "guzzlehttp/guzzle": "^7.0", + "php": "^7.2 | ^8.0", + "php-http/httplug": "^2.0", + "psr/http-client": "^1.0" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3", - "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4" + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.0|^9.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.2.x-dev" + } + }, "autoload": { "psr-4": { - "Http\\Promise\\": "src/" + "Http\\Adapter\\Guzzle7\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -16674,24 +16509,21 @@ ], "authors": [ { - "name": "Joel Wurtz", - "email": "joel.wurtz@gmail.com" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" } ], - "description": "Promise used for asynchronous HTTP requests", + "description": "Guzzle 7 HTTP Adapter", "homepage": "http://httplug.io", "keywords": [ - "promise" + "Guzzle", + "http" ], "support": { - "issues": "https://github.com/php-http/promise/issues", - "source": "https://github.com/php-http/promise/tree/1.3.1" + "issues": "https://github.com/php-http/guzzle7-adapter/issues", + "source": "https://github.com/php-http/guzzle7-adapter/tree/1.0.0" }, - "time": "2024-03-15T13:55:21+00:00" + "time": "2021-03-09T07:35:15+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -16812,23 +16644,23 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.18" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -16864,9 +16696,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-11-03T20:11:34+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpspec/prophecy", @@ -17664,6 +17496,79 @@ ], "time": "2024-01-19T07:03:14+00:00" }, + { + "name": "react/promise", + "version": "v3.2.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", + "shasum": "" + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpunit/phpunit": "^9.6 || ^7.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "React\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "keywords": [ + "promise", + "promises" + ], + "support": { + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v3.2.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-05-24T10:39:05+00:00" + }, { "name": "sebastian/cli-parser", "version": "1.0.1", @@ -19299,17 +19204,17 @@ "time": "2024-01-23T14:51:35+00:00" }, { - "name": "symfony/polyfill-php80", + "name": "symfony/polyfill-php73", "version": "v1.31.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { @@ -19327,7 +19232,7 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" + "Symfony\\Polyfill\\Php73\\": "" }, "classmap": [ "Resources/stubs" @@ -19338,10 +19243,6 @@ "MIT" ], "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -19351,7 +19252,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -19360,7 +19261,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -19378,82 +19279,6 @@ ], "time": "2024-09-09T11:45:10+00:00" }, - { - "name": "symfony/polyfill-php82", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php82.git", - "reference": "559d488c38784112c78b9bf17c5ce8366a265643" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/559d488c38784112c78b9bf17c5ce8366a265643", - "reference": "559d488c38784112c78b9bf17c5ce8366a265643", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php82\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php82/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" - }, { "name": "theseer/tokenizer", "version": "1.2.2", diff --git a/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml index e1d4a13a..7cbd60c7 100644 --- a/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml @@ -14,7 +14,7 @@ dependencies: - media_library - text _core: - default_config_hash: AMDZDzWNP90sUgt9bSZf2RbL7KmSxkXMKIiueo1JSWg + default_config_hash: VflHWgcqxxjyQ5dI9XiXzqbtlh7Pl2_qqR3bz8Zj1jg id: paragraph.remote_video.default targetEntityType: paragraph bundle: remote_video diff --git a/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml index 745d0e28..1bb06a69 100644 --- a/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml @@ -13,7 +13,7 @@ dependencies: module: - text _core: - default_config_hash: hYT61xkhP2zXO2VXijtXVPkoENlhLvIv5DRycKMm6iE + default_config_hash: TfUdaKwrwdr5ime_VDVt5VlOtlUx4tcGTVyC7dmC3Gk id: paragraph.remote_video.default targetEntityType: paragraph bundle: remote_video diff --git a/conf/cmi/elasticsearch_connector.cluster.kymp.yml b/conf/cmi/elasticsearch_connector.cluster.kymp.yml deleted file mode 100644 index b94b08d6..00000000 --- a/conf/cmi/elasticsearch_connector.cluster.kymp.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 8caed881-457b-4d95-9881-1efe2a3148da -langcode: en -status: '1' -dependencies: { } -cluster_id: kymp -name: KYMP -url: 'http://elastic:9200' -options: - multiple_nodes_connection: false - use_authentication: true - authentication_type: Basic - username: '' - password: '' - timeout: 3 - rewrite: - rewrite_index: true - index: - prefix: '' - suffix: '' diff --git a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml index bc4dab4d..39bd3ff7 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_iframe_title - paragraphs.paragraphs_type.remote_video _core: - default_config_hash: KFqLYybhQZx8DQDevmx8l7O1E7nmPwIhkizJrBbxTXs + default_config_hash: JYywo5MvoMggJZYuVwtPzZGrJ8oHmGN4s34-HCX-dXw id: paragraph.remote_video.field_iframe_title field_name: field_iframe_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml index 00f9ff8e..42c7769d 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml @@ -7,7 +7,7 @@ dependencies: - media.type.remote_video - paragraphs.paragraphs_type.remote_video _core: - default_config_hash: b_L89pXt7d85BtmH-jz-VizHh8JhDMro97VxdqxFy2Y + default_config_hash: EXTjrddbTsWRr2VDlxXQJcB0pQrLZGTeRStWnqxAOG0 id: paragraph.remote_video.field_remote_video field_name: field_remote_video entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml index a0689e0d..841087ff 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml @@ -12,7 +12,7 @@ third_party_settings: allowed_formats: allowed_formats: { } _core: - default_config_hash: emEHEeE_yt_Z5EVGuPcPk9m--eTj8gCieN9Gzw08GLU + default_config_hash: A2oygDMUUEZROK-5xNHDtxbP0CCJUDm3nePQUVGy1Xs id: paragraph.remote_video.field_remote_video_description field_name: field_remote_video_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml index 2b88fe7c..8d5b1421 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.paragraph.field_remote_video_title - paragraphs.paragraphs_type.remote_video _core: - default_config_hash: Kn3u7ICuSPlxFZiNdYRyNxEnd-I9Yye00bz2l39BXFQ + default_config_hash: RRecftjvqzqgVOvTJu1DCSfdvfNPW6a2yVip2zeVRs0 id: paragraph.remote_video.field_remote_video_title field_name: field_remote_video_title entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml index 89204557..ce50e52b 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml @@ -12,7 +12,7 @@ third_party_settings: allowed_formats: allowed_formats: { } _core: - default_config_hash: Zv-7KNCky603k38t9PbBgreu9IPTSpVw-bLEa3ptVlE + default_config_hash: 5Nx79ltzK2J0MvbXe4PH97S013geVCVJ9Pwfe9zhrGw id: paragraph.remote_video.field_remote_video_video_desc field_name: field_remote_video_video_desc entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml index d05d80e9..57226a8c 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml @@ -6,14 +6,14 @@ dependencies: - field.storage.paragraph.field_remote_video_video_title - paragraphs.paragraphs_type.remote_video _core: - default_config_hash: Bp1tvXNbkNozGjMop7bTopoVYSimcgFctt5eELalVbY + default_config_hash: OetItkfP7vdKFfRMKUkRAiIavZrk78vEeZ0lYtv3kU8 id: paragraph.remote_video.field_remote_video_video_title field_name: field_remote_video_video_title entity_type: paragraph bundle: remote_video label: 'Title of the video' description: '' -required: false +required: true translatable: false default_value: { } default_value_callback: '' diff --git a/conf/cmi/field.storage.paragraph.field_remote_video.yml b/conf/cmi/field.storage.paragraph.field_remote_video.yml index 3b2510c2..dfcee3d8 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video.yml @@ -6,7 +6,7 @@ dependencies: - media - paragraphs _core: - default_config_hash: Bh7n9tsOmq_MtUy_bjD_jxqlduNcg-6UJvy4_r4txc8 + default_config_hash: xIhmycJh9-kE1HhCcr8tjhZ4IQO8hZBz62eVFANtyx8 id: paragraph.field_remote_video field_name: field_remote_video entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_description.yml b/conf/cmi/field.storage.paragraph.field_remote_video_description.yml index 2e93ed56..9457d31f 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video_description.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video_description.yml @@ -6,7 +6,7 @@ dependencies: - paragraphs - text _core: - default_config_hash: cq3pdUIwmiOxVLXVLyNHCrQUxQlsS7rClbJnKKks_JU + default_config_hash: Y4hTJol9Wy9ZyomH_1QSspaJSkZwk-IUUpuTqOmpBxM id: paragraph.field_remote_video_description field_name: field_remote_video_description entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_title.yml b/conf/cmi/field.storage.paragraph.field_remote_video_title.yml index 333edb26..e60db4cf 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video_title.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video_title.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: 0k4C3yk8Ne0kpMQ0Jc4AD4B3Acm7CQKI_Ug0u-4ZUYE + default_config_hash: jw2V9D7zXEWDwG7TQvLH8_n3m_A7W1t4s_8C5fUPHQk id: paragraph.field_remote_video_title field_name: field_remote_video_title entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml b/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml index b42f9839..de062bd5 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml @@ -6,7 +6,7 @@ dependencies: - paragraphs - text _core: - default_config_hash: j86-6zpgZg50s_H3TClf9Soi0TR-N1JMtPIEcskvxTo + default_config_hash: AugkKo0s1rzTVWEU231Gjm8aktv5Jo14JMyg_1-64Lc id: paragraph.field_remote_video_video_desc field_name: field_remote_video_video_desc entity_type: paragraph diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml b/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml index bd852024..3ca8e797 100644 --- a/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml +++ b/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml @@ -5,7 +5,7 @@ dependencies: module: - paragraphs _core: - default_config_hash: NQK8C_re4avi5sgPKbEZUF-Pb5ZV05qUxasNqGulkBU + default_config_hash: qCBWtWuaF6QcegWsQZ5k2TBU_r3_2meMw8CbzLJdczY id: paragraph.field_remote_video_video_title field_name: field_remote_video_video_title entity_type: paragraph diff --git a/conf/cmi/metatag.settings.yml b/conf/cmi/metatag.settings.yml index 88fc054b..e5a143d5 100644 --- a/conf/cmi/metatag.settings.yml +++ b/conf/cmi/metatag.settings.yml @@ -24,3 +24,4 @@ entity_type_groups: basic: basic open_graph: open_graph twitter_cards: twitter_cards +tag_trim_end: '|.,-:;/+&([{"''' diff --git a/conf/cmi/paragraphs.paragraphs_type.remote_video.yml b/conf/cmi/paragraphs.paragraphs_type.remote_video.yml index 63f8a661..f88a287e 100644 --- a/conf/cmi/paragraphs.paragraphs_type.remote_video.yml +++ b/conf/cmi/paragraphs.paragraphs_type.remote_video.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: 7ACTSU3dw6y63zALTmg5uHqXetngx1XyycIXNYypUnk + default_config_hash: e1F_uSG80Cz1Et_JPUBQuzLDDOw_GTFX7E3xvDT8eCA id: remote_video label: 'Remote video embed' icon_uuid: null diff --git a/conf/cmi/search_api.server.elastic_kymp.yml b/conf/cmi/search_api.server.elastic_kymp.yml index f7bf3e74..bbae9227 100644 --- a/conf/cmi/search_api.server.elastic_kymp.yml +++ b/conf/cmi/search_api.server.elastic_kymp.yml @@ -9,6 +9,13 @@ name: 'Elastic KYMP' description: '' backend: elasticsearch backend_config: - cluster_settings: - cluster: kymp - fuzziness: auto + connector: basicauth + connector_config: + username: '' + password: '' + url: 'http://elastic:9200' + enable_debug_logging: false + advanced: + prefix: '' + suffix: '' + fuzziness: auto From b60cf1301023b3f54b1a7b0066b7ca5b56d79828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 11 Nov 2024 09:51:13 +0200 Subject: [PATCH 09/20] UHF-9680: Uninstalled modules: eu_cookie_compliance and helfi_eu_cookie_compliance. Installed: hdbt_cookie_banner. --- .../block.block.eucookiecomplianceblock.yml | 31 ------- ....hdbt_subtheme_eucookiecomplianceblock.yml | 31 ------- conf/cmi/core.extension.yml | 3 +- ...cookie_compliance.cookie_category.chat.yml | 13 --- ...e_compliance.cookie_category.essential.yml | 13 --- ..._compliance.cookie_category.preference.yml | 13 --- ..._compliance.cookie_category.statistics.yml | 13 --- conf/cmi/eu_cookie_compliance.settings.yml | 85 ------------------- conf/cmi/hdbt_cookie_banner.settings.yml | 6 ++ ...cookie_compliance.cookie_consent_intro.yml | 7 -- ...cookie_compliance.cookie_category.chat.yml | 4 - ...e_compliance.cookie_category.essential.yml | 4 - ..._compliance.cookie_category.preference.yml | 4 - ..._compliance.cookie_category.statistics.yml | 4 - .../fi/eu_cookie_compliance.settings.yml | 11 --- .../fi/hdbt_cookie_banner.settings.yml | 3 + ...cookie_compliance.cookie_consent_intro.yml | 5 -- ..._compliance.cookie_category.statistics.yml | 1 - .../ru/eu_cookie_compliance.settings.yml | 12 --- ...cookie_compliance.cookie_category.chat.yml | 4 - ...e_compliance.cookie_category.essential.yml | 4 - ..._compliance.cookie_category.preference.yml | 4 - ..._compliance.cookie_category.statistics.yml | 4 - .../sv/eu_cookie_compliance.settings.yml | 11 --- .../sv/hdbt_cookie_banner.settings.yml | 3 + ...cookie_compliance.cookie_consent_intro.yml | 5 -- conf/cmi/user.role.admin.yml | 5 +- conf/cmi/user.role.anonymous.yml | 2 - conf/cmi/user.role.authenticated.yml | 2 - 29 files changed, 15 insertions(+), 292 deletions(-) delete mode 100644 conf/cmi/block.block.eucookiecomplianceblock.yml delete mode 100644 conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml delete mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.chat.yml delete mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.essential.yml delete mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.preference.yml delete mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/eu_cookie_compliance.settings.yml create mode 100644 conf/cmi/hdbt_cookie_banner.settings.yml delete mode 100644 conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.settings.yml create mode 100644 conf/cmi/language/fi/hdbt_cookie_banner.settings.yml delete mode 100644 conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml delete mode 100644 conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/ru/eu_cookie_compliance.settings.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.settings.yml create mode 100644 conf/cmi/language/sv/hdbt_cookie_banner.settings.yml delete mode 100644 conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml diff --git a/conf/cmi/block.block.eucookiecomplianceblock.yml b/conf/cmi/block.block.eucookiecomplianceblock.yml deleted file mode 100644 index 66591fcb..00000000 --- a/conf/cmi/block.block.eucookiecomplianceblock.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: d66f67da-a1de-4526-b561-810e937c1bcc -langcode: en -status: true -dependencies: - module: - - eu_cookie_compliance - - system - theme: - - hdbt -_core: - default_config_hash: Ofp5Nv8E3DryORBw9DXtbN860LdYomjt-klGkC0fCHs -id: eucookiecomplianceblock -theme: hdbt -region: after_content -weight: -10 -provider: null -plugin: eu_cookie_compliance_block -settings: - id: eu_cookie_compliance_block - label: 'EU Cookie Compliance Block' - label_display: '0' - provider: eu_cookie_compliance - eu_cookie_compliance_block_settings: - description: - value: '' - format: full_html -visibility: - request_path: - id: request_path - negate: false - pages: /cookie-information-and-settings diff --git a/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml b/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml deleted file mode 100644 index eb57f3a0..00000000 --- a/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 5873908f-9f16-4d4d-becf-7eb0e1d2ca98 -langcode: en -status: true -dependencies: - module: - - eu_cookie_compliance - - system - theme: - - hdbt_subtheme -_core: - default_config_hash: Ofp5Nv8E3DryORBw9DXtbN860LdYomjt-klGkC0fCHs -id: hdbt_subtheme_eucookiecomplianceblock -theme: hdbt_subtheme -region: after_content -weight: -10 -provider: null -plugin: eu_cookie_compliance_block -settings: - id: eu_cookie_compliance_block - label: 'EU Cookie Compliance Block' - label_display: '0' - provider: eu_cookie_compliance - eu_cookie_compliance_block_settings: - description: - value: '' - format: full_html -visibility: - request_path: - id: request_path - negate: false - pages: /cookie-information-and-settings diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 25891215..996b2255 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -42,13 +42,13 @@ module: gin_toolbar: 0 hal: 0 hdbt_admin_tools: 0 + hdbt_cookie_banner: 0 health_check: 0 helfi_api_base: 0 helfi_azure_fs: 0 helfi_base_content: 0 helfi_ckeditor: 0 helfi_etusivu_entities: 0 - helfi_eu_cookie_compliance: 0 helfi_image_styles: 0 helfi_kymp_content: 0 helfi_kymp_migrations: 0 @@ -179,7 +179,6 @@ module: paragraphs: 11 publication_date: 99 minimal: 1000 - eu_cookie_compliance: 1001 theme: claro: 0 stable9: 0 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml deleted file mode 100644 index be70027a..00000000 --- a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 8dc5c2c3-94e7-45f3-abf2-afb2277360cc -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: Fo0xGa_NGmRHechfzeoRkN1cxRB2-z_P0gHmfGny4E8 -id: chat -label: 'Functional chat cookies' -description: - value: '

The chats on the www.hel.fi  website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.  No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.

NameProviderPurpose of the cookieValidityType
_genesys.widgets.*www.hel.fiUsed for storing data required by the chat functionality.Session 
leijuke.*www.hel.fiUsed for storing data required by the chat functionality.Session 
aiap-wbc-chat-app-button-statewww.hel.fiUsed for chat app functionality. Stores chat app button settings and configuration data.Session 
aiap-chat-app-v1-statewww.hel.fiUsed for chat app functionality. Stores chat app settings and configuration data.Session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Stores chat app conversation token for authentication and data access purposes.SessionThird party
CallGuide.languagewww.hel.fiACE Chat: The language used in the ACE Web SDK is derived from the browsers' preferred language setting and ACE Web SDK settings.-Local storage
CallGuide.config_services_*www.hel.fiACE Chat: Configuring customer service integrations on a web page. Reduces web traffic when loading and navigating a page-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chat: The unique identity of this browser window. Is used if the browser has more than one open window for a website-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chat: Only one window at a time can display video. This information tracks which of them (if any).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chat: A list of all windows that are likely to display the video-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chat: A website can have more than one chat client. This item tracks which customer the current chat belongs to.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chat: Name of the chat entrance to the system-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chat: Chat session ID when communicating with ACE-Local storage
humany-*www.hel.fiACE Chat: Preserves widget status when page reloads-Local storage
ARRAffinity.hel.humany.netACE Chat: Load balancing in the backend systemSessionThird party
ARRAffinitySameSite.hel.humany.netACE Chat: Load balancing in the backend systemSessionThird party
' - format: full_html -checkbox_default_state: unchecked -weight: -5 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml deleted file mode 100644 index bd641c1d..00000000 --- a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 7ec46403-3e1d-4c02-b4e3-ecbc635a9bab -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: 6_XedB0R6X-mo9oj-a1V_0wlGQWBzGMlKvDNs-f7KB0 -id: essential -label: 'Essential cookies' -description: - value: '

Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.

NameProviderPurpose of the cookieValidityType
cookiehubcookiehub.comUsed by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.365 days 
cookie-agreedwww.hel.fiUsed by www.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.100 days 
cookie-agreed-versionwww.hel.fiUsed by www.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categorieswww.hel.fiUsed by www.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
cookie-agreedavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.100 days 
cookie-agreed-versionavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categoriesavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
SSESS*www.hel.fiA cookie related to the operation of the content management system.23 days 
SSESS*avustukset.hel.fiA cookie related to the operation of the content management system.23 days 
AWSELBCORSsiteimproveanalytics.ioThe cookie is related to a load distribution function used to direct requests to servers with the least traffic.SessionThird party
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 days 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

The cookie is an obligatory cookie that facilitates visiting the website.SessionThird party
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Its value is used to access session data on server of the application.SessionThird party
COOKIE_SUPPORThelsinkikanava.fiThe cookie facilitates managing cookies on the website.365 daysThird party
GUEST_LANGUAGE_IDhelsinkikanava.fiThis cookie is generated by the Liferay, its function is to store the language preferences.365 daysThird party
helfi-settingswww.hel.fiUsed by www.hel.fi Drupal to store information about closed announcements and accordions'' state.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiUsed by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.365 days 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiStores whether the admin sidebar is expanded or collapsed on desktop when logged in as an editor on hel.fi.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiStores whether the admin sidebar is expanded or collapsed on mobile when logged in as an editor on hel.fi.-Local storage
Drupal.gin.darkmodewww.hel.fiStores the user''s dark mode preference in the admin theme when logged in as an editor on hel.fi.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiStores the expanded or collapsed state of submenus in the Drupal admin toolbar for a logged-in editor, ensuring consistency across page loads.-Local storage
Drupal.off-canvas.css.*www.hel.fiStores cached CKEditor CSS in localStorage for a logged-in editor, using a key with a cache-busting query to ensure the latest CSS is loaded.-Local storage
ed11ySeenwww.hel.fiTracks which accessibility issues a logged-in editor has already seen to avoid duplicate notifications.-Local storage
editoria11yResultCountwww.hel.fiTracks the number of accessibility issues found on specific pages for a logged-in editor, helping monitor and address them.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiStores the state of the admin toolbar for a logged-in editor, including its orientation, active tab and state of expansion.SessionSession storage
escapeAdminPathwww.hel.fiStores the URL to redirect a logged-in editor from the admin interface back to the main site.SessionSession storage
' - format: full_html -checkbox_default_state: required -weight: -9 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml deleted file mode 100644 index dd43bbd8..00000000 --- a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 29ab66ef-81dd-4947-91eb-bfaf581d235c -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: 2nukTq0GW1ah8MZEHNDaOJ0Ygil0hTpw48HeCYekkZY -id: preference -label: Preference -description: - value: '

Preference cookies modify the visuals and functions of the website based on the user''s previous sessions.

NameProviderPurpose of the cookieValidityType
httpskartta.hel.fi.SWCulturekartta.hel.fiThe City''s map service cookie saves the language in which the service is used.1826 days 
icareus-devicehelsinkikanava.fiThe Helsinki Channel video server cookie facilitates including videos as part of the website''s content.365 daysThird party
VISITOR_INFO1_LIVEyoutube.comThe YouTube cookie selects the old or new video player depending on the connection speed.180 daysThird party
CONSENTyoutube.comUsed by Google to store user consent preferences5947 days, 15 hoursThird party
activeTabwww.hel.fiUsed for storing active tab data when user is using high school search.Session 
activeContentwww.hel.fiUsed for storing active content data when user is using high school search.Session 
' - format: full_html -checkbox_default_state: unchecked -weight: -8 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index d91217e0..00000000 --- a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 5fd96091-6fd1-4392-a672-08f29331910b -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: DocxmYG5rysx8IQZ_Mu2ZhNcPnpkNpXJAYeRDWSRMds -id: statistics -label: Statistics -description: - value: '

The information collected by statistics cookies is used for developing the website.

NameProviderPurpose of the cookieValidityType
nmstatwww.hel.fiThe Siteimprove statistics cookie collects information about the use of the website.1000 days 
_pk_id.*www.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.141.89f6www.hel.fi-1 hour 
_pk_id.*kartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*kartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*palvelukartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*palvelukartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*avustukset.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*avustukset.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
rnsbidreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rnsbid_tsreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rns_reaction_*reactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
YSCyoutube.comThe YouTube cookie facilitates including videos as part of the website''s content.SessionThird party
' - format: full_html -checkbox_default_state: unchecked -weight: -7 diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml deleted file mode 100644 index 21bde9e3..00000000 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ /dev/null @@ -1,85 +0,0 @@ -_core: - default_config_hash: hQ7DNLHTlQh0_X_bDls8Gwa7MA_vHoOePmKn2NASjM4 -langcode: en -dependencies: - config: - - filter.format.full_html -uuid: 794fc11b-a1b4-41a7-a351-aaa84516c2c5 -popup_enabled: true -popup_clicking_confirmation: false -popup_scrolling_confirmation: false -eu_only: false -eu_only_js: false -popup_position: false -fixed_top_position: true -popup_info: - value: "

Hel.fi uses cookies

\r\n\r\n

We use essential cookies on our website to make the site work. Also third party cookies are used if you give us your permission.

\r\n" - format: full_html -mobile_popup_info: - value: '' - format: full_html -popup_info_template: new -popup_agree_button_message: Accept -popup_more_info_button_message: 'Show cookies' -mobile_breakpoint: 768 -popup_agreed_enabled: false -popup_hide_agreed: false -disagree_button_label: 'No, thanks' -popup_agreed: - value: '

Thank you for accepting cookies

You can now hide this message or find out more about cookies.

' - format: full_html -popup_find_more_button_message: 'Show cookies' -popup_hide_button_message: Hide -popup_link: /cookie-information-and-settings -popup_link_new_window: false -popup_height: null -popup_width: '' -popup_delay: 1000 -show_more_info: true -popup_bg_hex: '' -popup_text_hex: '' -domain: '' -domains_option: 1 -domains_list: '' -exclude_paths: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*" -exclude_admin_theme: false -cookie_session: 0 -set_cookie_session_zero_on_disagree: 0 -cookie_lifetime: 100 -use_mobile_message: false -use_bare_css: true -use_olivero_css: false -disagree_do_not_show_popup: false -reload_page: true -reload_options: 0 -reload_routes_list: '' -cookie_name: '' -exclude_uid_1: false -better_support_for_screen_readers: false -method: categories -disabled_javascripts: '' -automatic_cookies_removal: true -allowed_cookies: "helfi_accordions_open\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\nessential:GUEST_LANGUAGE_ID\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:nmstat\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:rnsbid\r\nstatistics:rnsbid_ts\r\nstatistics:rns_reaction_*\r\nstatistics:YSC\r\nchat:_genesys.widgets.*\r\nchat:leijuke.*" -consent_storage_method: do_not_store -withdraw_message: - value: '

Hel.fi uses cookies

You have given your consent for us to set cookies.

' - format: full_html -withdraw_tab_button_label: 'Privacy settings' -withdraw_action_button_label: 'Withdraw consent' -withdraw_enabled: false -withdraw_button_on_info_popup: false -save_preferences_button_label: 'Accept selected cookies' -accept_all_categories_button_label: 'Accept all cookies' -enable_save_preferences_button: true -domain_all_sites: true -settings_tab_enabled: false -containing_element: body -cookie_policy_version: 1.2.5 -cookie_value_disagreed: '0' -cookie_value_agreed_show_thank_you: '1' -cookie_value_agreed: '2' -accessibility_focus: false -close_button_action: close_banner -reject_button_label: '' -reject_button_enabled: false -close_button_enabled: false diff --git a/conf/cmi/hdbt_cookie_banner.settings.yml b/conf/cmi/hdbt_cookie_banner.settings.yml new file mode 100644 index 00000000..fae82ee6 --- /dev/null +++ b/conf/cmi/hdbt_cookie_banner.settings.yml @@ -0,0 +1,6 @@ +_core: + default_config_hash: y-QliARbuZ0u4VXlTAbsDzeY15OrDBGBbaP6LtSPb3c +langcode: en +cookie_information: + title: 'Cookie information' + content: "A cookie is a small-scale data storage program that a computer browser installs on a user's computer hard drive. Whenever the user's browser retrieves the site from the City of Helsinki's servers, the message is sent back to the user's computer. Javascript and server logs are used to record, for example, the number of users, country of use, usage time and browser used, as well as the content that the visitor has visited. The cookie does not damage the drive.\r\n\r\nCookies are used to speed up, analyze and develop the website and to target content to each user." diff --git a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml deleted file mode 100644 index 368a0db9..00000000 --- a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ /dev/null @@ -1,7 +0,0 @@ -_core: - default_config_hash: eVNvfbEgjm25gLyG5DH8zDbCi17xs8djPZt0XHD_Q9s -cc: - title: 'Cookie settings' - content: - value: "

A cookie is a small-scale data storage program that a computer browser installs on a user's computer hard drive. Whenever the user's browser retrieves the site from the City of Helsinki's servers, the message is sent back to the user's computer. Javascript and server logs are used to record, for example, the number of users, country of use, usage time and browser used, as well as the content that the visitor has visited. The cookie does not damage the drive.

Cookies are used to speed up, analyze and develop the website and to target content to each user.

" - format: full_html diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml deleted file mode 100644 index b554bf87..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Toiminnallisten chat-evästeiden avulla mahdollistetaan helfi-sivujen chattien toiminta. Jos aloitat chatin, hyväksyt sen käyttöön liittyvät toiminnalliset evästeet automaattisesti.  Evästeiden hyväksymiseen ei tällöin tarvita erillistä suostumusta. Toiminnallisia chat-evästeitä ladataan laitteellesi vain, jos käynnistät chatin.

NimiTarjoajaTarkoitusVoimassaTyyppi
_genesys.widgets.*www.hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
leijuke.*www.hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
aiap-wbc-chat-app-button-statewww.hel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen painikkeen asetukset ja kokoonpanotiedot.Istunto 
aiap-chat-app-v1-statewww.hel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen asetukset ja kokoonpanotiedot.Istunto 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen keskustelutunnisteen istunnnon tunnistamista ja tietojen hakemista varten.IstuntoKolmas osapuoli
CallGuide.languagewww.hel.fiACE Chat: ACE Web SDK:ssa käytettävä kieli, joka on johdettu selainten ensisijaisesta kieliasetuksesta ja ACE Web SDK - asetuksista.-Local storage
CallGuide.config_services_*www.hel.fiACE Chat: Asiakaspalveluintegraatioiden määritys verkkosivulla. Vähentää verkkoliikennettä sivun lataamisen ja navigoinnin yhteydessä.-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chat: Tämän selainikkunan yksilöllinen identiteetti. Käytetään, jos selaimessa on useampi kuin yksi avoin ikkuna verkkosivustolle.-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chat: Vain yksi ikkuna kerrallaan voi näyttää videota. Nämä tiedot seuraavat, mikä niistä (jos sellainen on).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chat: Luettelo kaikista ikkunoista, jotka ovat todennäköisiä videon näyttämiseen.-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chat: Verkkosivustolla voi olla useampi kuin yksi chat-asiakasohjelma. Tämä kohde seuraa, mihin asiakkaaseen nykyinen chat kuuluu.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chat: Järjestelmän chat-sisäänkäynnin nimi-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chat: Keskustelun istuntotunnus kommunikoitaessa ACE:n kanssa-Local storage
humany-*www.hel.fiACE Chat: Säilyttää widgetin tilan, kun sivu ladataan uudelleen -Local storage
ARRAffinity.hel.humany.netACE Chat: Kuormituksen tasaus taustajärjestelmässäIstuntoKolmas osapuoli
ARRAffinitySameSite.hel.humany.netACE Chat: Kuormituksen tasaus taustajärjestelmässäIstuntoKolmas osapuoli
' - format: full_html -label: 'Toiminnalliset chat-evästeet' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml deleted file mode 100644 index 0652c9f2..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Välttämättömät evästeet auttavat tekemään verkkosivustosta käyttökelpoisen sallimalla perustoimintoja, kuten sivulla siirtymisen ja sivuston suojattujen alueiden käytön. Verkkosivusto ei toimi kunnolla ilman näitä evästeitä eikä niihin tarvita suostumusta.

NimiTarjoajaTarkoitusVoimassaTyyppi
cookiehubCookiehubMahdollistaa evästehallinnan www.hel.fi sivuilla.365 päivää 
cookie-agreedwww.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionwww.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categorieswww.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
cookie-agreedavustukset.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionavustukset.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categoriesavustukset.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
SSESS*www.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
SSESS*avustukset.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
AWSELBCORSsiteimproveanalytics.ioEväste liittyy palvelinten kuormanjakotoiminnallisuuteen, jolla ohjataan pyynnöt vähimmällä käytöllä olevalle palvelimille.IstuntoKolmas osapuoli
mtm_cookie_consentkartta.hel.fiTekninen eväste johon talletetaan tieto valinnastasi evästeiden käytöstä kertovan bannerin kohdalla10950 päivää 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Sivuston pakollinen eväste mahdollistaa kävijän vierailun sivustolla.IstuntoKolmas osapuoli
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Evästettä käytetään sovelluksen palvelimella olevan istuntotiedon hakemiseen.IstuntoKolmas osapuoli
COOKIE_SUPPORThelsinkikanava.fiMahdollistaa evästeiden hallinnan sivustolla.365 päivääKolmas osapuoli
GUEST_LANGUAGE_IDhelsinkikanava.fiTämän evästeen on luonut Liferay, se tallentaa kieliasetukset.365 päivääKolmas osapuoli
helfi-settingswww.hel.fiSivusto käyttää tätä tietuetta tietojen tallentamiseen siitä, mitä poikkeusilmoituksia on suljettu ja mikä on avattavien sisältöalueiden tila.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiKäytetään käyttäjän automaattiseen uloskirjautumiseen.365 päivää 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiTallentaa tiedon sisällöntuottajan käyttöliittymän sivupalkin näkyvyydestä työpöytänäkymässä.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiTallentaa tiedon sisällöntuottajan käyttöliittymän sivupalkin näkyvyydestä mobiilinäkymässä.-Local storage
Drupal.gin.darkmodewww.hel.fiTallentaa tiedon sisällöntuottajan valitsemasta "tumma tila"-asetuksesta.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiTallentaa sisällöntuottajan näkymissä alivalikoiden tilan (laajennettu tai kutistettu), jotta se säilyy yhdenmukaisena sivulatausten välillä.-Local storage
Drupal.off-canvas.css.*www.hel.fiTallentaa sisällöntuottajan käyttämän wysiwyg-editorin tyylit välimuistiin varmistaakseen viimeisimpien CSS-tyylien latauksen.-Local storage
ed11ySeenwww.hel.fiTallentaa sisällöntuottajan näkemät saavutettavuusongelmat, jotta vältetään ongelmien kaksoisilmoitukset.-Local storage
editoria11yResultCountwww.hel.fiTallentaa löydettyjen saavutettavuusongelmien määrän sisällöntuottajalle, auttaen seuraamaan ja korjaamaan ne.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiTallentaa sisällöntuottajan hallintatyökalupalkin orientaation, aktiivisen välilehden ja laajennustilan.IstuntoSession storage
escapeAdminPathwww.hel.fiTallentaa URL-osoitteen, jota käytetään ohjaamaan kirjautunut sisällöntuottaja hallintaliittymästä takaisin pääsivustolle.IstuntoSession storage
' - format: full_html -label: 'Välttämättömät toiminnalliset evästeet' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml deleted file mode 100644 index 93f9ff7d..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml +++ /dev/null @@ -1,4 +0,0 @@ -label: Personointi -description: - value: '

Mieltymysevästeet mukauttavat sivuston ulkoasua ja toimintaa käyttäjän aiemman käytön perusteella.

NimiTarjoajaTarkoitusVoimassaTyyppi
httpskartta.hel.fi.SWCulturekartta.hel.fiKaupungin karttapalvelun evästeeseen tallennetaan kieli, jolla palvelua käytetään.1826 päivää 
icareus-devicehelsinkikanava.fiHelsinki-kanavan videopalvelimen eväste.365 päivääKolmas osapuoli
VISITOR_INFO1_LIVEyoutube.comYouTuben eväste valitsee yhteyden nopeuden mukaan, joko vanhan tai uuden videosoittimen.180 päivääKolmas osapuoli
CONSENTyoutube.comGooglen eväste tallentaa kävijän evästehyväskynnän.5947 päivää, 15 tuntiaKolmas osapuoli
activeTabwww.hel.fiKäytetään aktiivisten välilehtien tietojen tallentamiseen, kun käyttäjä käyttää lukioiden suodatushakua.Istunto 
activeContentwww.hel.fiKäytetään aktiivisen sisältötietojen tallentamiseen, kun käyttäjä käyttää lukioiden hakua.Istunto 
' - format: full_html diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index b4707d04..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.

NimiTarjoajaTarkoitusVoimassaTyyppi
nmstatwww.hel.fiSiteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.1000 päivää 
_pk_id.*www.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.141.89f6www.hel.fi-1 tunti 
_pk_id.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
rnsbidreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
rnsbid_tsreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
rns_reaction_*reactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
YSCyoutube.comYouTuben eväste mahdollistaa videoiden upottamisen sivustolle.IstuntoKolmas osapuoli
' - format: full_html -label: Tilastointi diff --git a/conf/cmi/language/fi/eu_cookie_compliance.settings.yml b/conf/cmi/language/fi/eu_cookie_compliance.settings.yml deleted file mode 100644 index 053fc5a4..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.settings.yml +++ /dev/null @@ -1,11 +0,0 @@ -popup_agree_button_message: Hyväksy -popup_more_info_button_message: 'Näytä evästeet' -popup_find_more_button_message: 'Näytä evästeet' -popup_hide_button_message: Piilossa -popup_info: - value: '

Hel.fi käyttää evästeitä

Tämä sivusto käyttää välttämättömiä evästeitä suorituskyvyn varmistamiseksi sekä yleisen käytön seurantaan. Lisäksi käytämme kohdennusevästeitä käyttäjäkokemuksen parantamiseksi, analytiikkaan ja kohdistetun sisällön näyttämiseen.

' -popup_link: /cookie-information-and-settings -disagree_button_label: 'Ei kiitos' -withdraw_tab_button_label: Tietosuoja-asetukset -save_preferences_button_label: 'Hyväksy valitut evästeet' -accept_all_categories_button_label: 'Hyväksy kaikki evästeet' diff --git a/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml b/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml new file mode 100644 index 00000000..26d5fef4 --- /dev/null +++ b/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml @@ -0,0 +1,3 @@ +cookie_information: + title: Evästeasetukset + content: "Eväste (engl. cookie) on pienikokoinen tekstitiedosto, jonka verkkoselain tallentaa käyttäjän tietokoneelle tai mobiililaitteelle, kun vierailet verkkosivustolla. Se ei vahingoita käyttäjän laitetta tai tiedostoja. Evästeitä ei voi käyttää haittaohjelmien levittämiseen.\r\n\r\nEvästeistä saatava käyttäjätieto auttaa meitä varmistamaan sivuston teknisen toimivuuden ja parantamaan digitaalisten palveluidemme laatua. Niiden avulla voimme kehittää sivuston käyttäjäystävällisyyttä ja helpottaa tiedon löytymistä." diff --git a/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml deleted file mode 100644 index 8b78ae23..00000000 --- a/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ /dev/null @@ -1,5 +0,0 @@ -cc: - content: - value: '

Eväste (engl. cookie) on pienikokoinen tekstitiedosto, jonka verkkoselain tallentaa käyttäjän tietokoneelle tai mobiililaitteelle, kun vierailet verkkosivustolla. Se ei vahingoita käyttäjän laitetta tai tiedostoja. Evästeitä ei voi käyttää haittaohjelmien levittämiseen.

Evästeistä saatava käyttäjätieto auttaa meitä varmistamaan sivuston teknisen toimivuuden ja parantamaan digitaalisten palveluidemme laatua. Niiden avulla voimme kehittää sivuston käyttäjäystävällisyyttä ja helpottaa tiedon löytymistä.

' - format: full_html - title: Evästeasetukset diff --git a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/ru/eu_cookie_compliance.settings.yml b/conf/cmi/language/ru/eu_cookie_compliance.settings.yml deleted file mode 100644 index 315eded2..00000000 --- a/conf/cmi/language/ru/eu_cookie_compliance.settings.yml +++ /dev/null @@ -1,12 +0,0 @@ -popup_agreed: - value: "

Thank you for accepting cookies

\r\n\r\n

You can now hide this message or find out more about cookies.

\r\n" -popup_agree_button_message: Принять -popup_more_info_button_message: 'Show cookies' -popup_find_more_button_message: 'Show cookies' -popup_hide_button_message: Скрыть -popup_info: - value: "

Hel.fi uses cookies 

\r\n\r\n

We use essential cookies on our website to make the site work. Also third party cookies are used if you give us your permission.

\r\n" -popup_link: /node/1 -withdraw_message: - value: "

Hel.fi uses cookies

\r\n\r\n

You have given your consent for us to set cookies.

\r\n" -save_preferences_button_label: 'Accept selected cookies' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml deleted file mode 100644 index 9715a41b..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Chattarna på webbplatsen www.hel.fi  fungerar med hjälp av funktionella chattkakor. Om du inleder en chatt godkänner du automatiskt de nödvändiga funktionella kakorna.  Då behövs inget separat samtycke till kakor. Funktionella chattkakor laddas endast ner på din enhet om du inleder en chatt.

NamnTjänsteleverantörCookie syfteGiltighetTyp
_genesys.widgets.*www.hel.fiAnvänds för att lagra data som behövs för chatten.session 
leijuke.*www.hel.fiAnvänds för att lagra data som behövs för chatten.session 
aiap-wbc-chat-app-button-statewww.hel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationens knapp.session 
aiap-chat-app-v1-statewww.hel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationen.session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Lagrar konversationstoken för autentisering och åtkomst till dataändamål.sessionTredje part
CallGuide.languagewww.hel.fiACE Chat: Språket som används i ACE Web SDK härleds från webbläsarnas föredragna språkinställning och ACE Web SDK-inställningar.-Local storage
CallGuide.config_services_*www.hel.fiACE Chatt: Konfigurera kundtjänstintegrationer på en webbsida. Minskar webbtrafiken när du läser in och navigerar på en sida.-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chatt: Den unika identiteten för det här webbläsarfönstret. Används om webbläsaren har mer än ett öppet fönster för en webbplats.-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chatt: Endast ett fönster i taget kan visa video. Den här informationen spårar vilka av dem (om några).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chatt: En lista över alla fönster som sannolikt kommer att visa videon.-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chatt: En webbplats kan ha mer än en chattklient. Det här objektet spårar vilken kund den aktuella chatten tillhör.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chatt: Namnet på chattingången till systemet-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chatt: Chattsessions-ID vid kommunikation med ACE-Local storage
humany-*www.hel.fiACE Chatt: Bevarar widgetstatus när sidan laddas om-Local storage
ARRAffinity.hel.humany.netACE Chatt: Lastbalansering i backend-systemetSessionTredje part
ARRAffinitySameSite.hel.humany.netACE Chatt: Lastbalansering i backend-systemetSessionTredje part
' - format: full_html -label: 'Funktionella chattkakor' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml deleted file mode 100644 index 1a90fe7a..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Nödvändiga cookies hjälper till att göra webbplatsen användbar genom att tillåta grundläggande funktioner som att navigera på sidan och använda de skyddade områdena på webbplatsen. Webbplatsen fungerar inte korrekt utan dessa cookies och kräver inte samtycke.

NamnTjänsteleverantörCookie syfteGiltighetTyp
cookiehubcookiehub.comCookie möjliggör hantering av cookies på www.hel.fi webbplatsen.365 dagar 
cookie-agreedwww.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionwww.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categorieswww.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
cookie-agreedavustukset.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionavustukset.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categoriesavustukset.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
SSESS*www.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
SSESS*avustukset.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
AWSELBCORSsiteimproveanalytics.ioCookie är kopplad till funktionen för lastfördelning som styr begäran till en server med mindre belastning.sessionTredje part
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 dagar 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Kakan är en obligatorisk kaka som gör det möjligt för besökaren att besöka webbplatsen.sessionTredje part
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Dess värde används för att få tillgång till sessiondata på applikationens server.sessionTredje part
COOKIE_SUPPORThelsinkikanava.fiKakan möjliggör hanteringen av kakor på webbplatsen.365 dagarTredje part
GUEST_LANGUAGE_IDhelsinkikanava.fiDenna cookie genereras av Liferay, dess funktion är att lagra språkinställningarna.365 dagarTredje part
helfi-settingswww.hel.fiAnvänds av www.hel.fi Drupal för att lagra information om stängda meddelanden och accordions'' tillstånd.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiAnvänds av avustukset.hel.fi Drupal för att automatiskt logga ut användare efter en period av inaktivitet.365 dagar 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiLagrar om admin-sidopanelen är expanderad eller kollapsad på skrivbordet när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiLagrar om admin-sidopanelen är expanderad eller kollapsad på mobil när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.gin.darkmodewww.hel.fiLagrar användarens mörkt läge-inställning i admin-temat när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiLagrar tillståndet för expanderade eller kollapsade undermenyer i Drupals admin-verktygsfält för en inloggad redaktör, vilket säkerställer konsekvens mellan sidladdningar.-Local storage
Drupal.off-canvas.css.*www.hel.fiLagrar cachelagrad CKEditor CSS i localStorage för en inloggad redaktör, med en nyckel som använder en cache-brytande fråga för att säkerställa att den senaste CSS-filen laddas.-Local storage
ed11ySeenwww.hel.fiSpårar vilka tillgänglighetsproblem en inloggad redaktör redan har sett för att undvika dubbla aviseringar.-Local storage
editoria11yResultCountwww.hel.fiSpårar antalet tillgänglighetsproblem som hittats på specifika sidor för en inloggad redaktör, vilket hjälper till att övervaka och åtgärda dem.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiLagrar tillståndet för admin-verktygsfältet för en inloggad redaktör, inklusive dess orientering, aktiva flik och expanderade tillstånd.SessionSession storage
escapeAdminPathwww.hel.fiLagrar URL för att omdirigera en inloggad redaktör från admin-gränssnittet tillbaka till huvudsidan.-Session storage
' - format: full_html -label: 'Nödvändiga funktionella cookies' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml deleted file mode 100644 index cef60a8e..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml +++ /dev/null @@ -1,4 +0,0 @@ -label: Preferens -description: - value: '

Preferenscookies ändrar webbplatsens utseende och funktioner enligt användarens tidigare användning.

NamnTjänsteleverantörCookie syfteGiltighetTyp
httpskartta.hel.fi.SWCulturekartta.hel.fiI kakan på stadens kaktjänst sparas det språk som användaren använder i tjänsten.1826 dagar 
icareus-devicehelsinkikanava.fiHelsinki-kanavas kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.365 dagarTredje part
VISITOR_INFO1_LIVEyoutube.comYouTubes kaka väljer antingen den nya eller gamla videospelaren enligt förbindelsens hastighet.180 dagarTredje part
CONSENTyoutube.comAnvänds av Google för att lagra inställningar för användarens samtycke.5947 dagar, 15 timmarTredje part
activeTabwww.hel.fiAnvänds för att lagra aktiv flikdata när användaren använder gymnasiesökning.Session 
activeContentwww.hel.fiAnvänds för att lagra aktivt innehållsdata när användaren använder gymnasiesökning.Session 

 

' - format: full_html diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 92e0cd64..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.

NamnTjänsteleverantörCookie syfteGiltighetTyp
nmstatwww.hel.fiSiteimproves kaka samlar information om hur webbplatsen används.1000 dagar 
_pk_id.*www.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.141.89f6www.hel.fi-1 timme 
_pk_id.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
rnsbidreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
rnsbid_tsreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
rns_reaction_*reactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
YSCyoutube.comYouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.sessionTredje part

 

' - format: full_html -label: Statistik diff --git a/conf/cmi/language/sv/eu_cookie_compliance.settings.yml b/conf/cmi/language/sv/eu_cookie_compliance.settings.yml deleted file mode 100644 index df981cb7..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.settings.yml +++ /dev/null @@ -1,11 +0,0 @@ -popup_agree_button_message: Accepterar -popup_more_info_button_message: 'Visa cookies' -popup_find_more_button_message: 'Visa cookies' -popup_hide_button_message: Dölj -popup_info: - value: '

Hel.fi använder cookies

Vi använder viktiga cookies på vår webbplats för att få webbplatsen att fungera. Även tredjepartscookies används om du ger oss ditt tillstånd.

' -disagree_button_label: 'Nej, tack' -withdraw_action_button_label: 'Återkalla samtycke' -withdraw_tab_button_label: Sekretessinställningar -save_preferences_button_label: 'Acceptera valda cookies' -accept_all_categories_button_label: 'Acceptera alla cookies' diff --git a/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml b/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml new file mode 100644 index 00000000..e079a63d --- /dev/null +++ b/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml @@ -0,0 +1,3 @@ +cookie_information: + title: 'Cookie -inställningar' + content: "En kaka (eng. cookie) är en liten textfil som webbläsaren sparar i användarens dator eller mobila enhet när hen besöker en webbplats. Den skadar inte användarens enhet eller filer. Kakor kan inte användas för att sprida skadeprogram.\r\n\r\nAnvändarinformationen som fås från kakorna hjälper oss att säkerställa webbplatsens funktionalitet och förbättra kvaliteten på våra digitala tjänster. Med hjälp av dem kan vi utveckla webbplatsens användarvänlighet och göra det lättare att hitta information." diff --git a/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml deleted file mode 100644 index 46d695ef..00000000 --- a/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ /dev/null @@ -1,5 +0,0 @@ -cc: - content: - value: '

En kaka (eng. cookie) är en liten textfil som webbläsaren sparar i användarens dator eller mobila enhet när hen besöker en webbplats. Den skadar inte användarens enhet eller filer. Kakor kan inte användas för att sprida skadeprogram.

Användarinformationen som fås från kakorna hjälper oss att säkerställa webbplatsens funktionalitet och förbättra kvaliteten på våra digitala tjänster. Med hjälp av dem kan vi utveckla webbplatsens användarvänlighet och göra det lättare att hitta information.

' - format: full_html - title: 'Cookie -inställningar' diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml index 0649d059..72af063e 100644 --- a/conf/cmi/user.role.admin.yml +++ b/conf/cmi/user.role.admin.yml @@ -27,9 +27,9 @@ dependencies: - content_translation - editoria11y - entity_usage - - eu_cookie_compliance - file - filter + - hdbt_cookie_banner - helfi_api_base - helfi_tpr - locale @@ -74,8 +74,7 @@ permissions: - 'access tpr_unit overview' - 'access user profiles' - 'administer blocks' - - 'administer eu cookie compliance categories' - - 'administer eu cookie compliance popup' + - 'administer hdbt_cookie_banner' - 'administer menu' - 'administer nodes' - 'administer paragraphs library' diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index dd32146e..78ea20dc 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -5,7 +5,6 @@ dependencies: config: - rest.resource.helfi_global_mobile_menu module: - - eu_cookie_compliance - external_entities - helfi_api_base - helfi_tpr @@ -21,7 +20,6 @@ weight: 0 is_admin: false permissions: - 'access content' - - 'display eu cookie compliance popup' - 'restful get helfi_global_mobile_menu' - 'send javascript errors to sentry' - 'view helfi_announcements external entity' diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index a6836aa0..0b8ea0da 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -5,7 +5,6 @@ dependencies: config: - rest.resource.helfi_global_mobile_menu module: - - eu_cookie_compliance - external_entities - file - helfi_api_base @@ -28,7 +27,6 @@ permissions: - 'access toolbar' - 'delete own files' - 'disable own tfa' - - 'display eu cookie compliance popup' - 'restful get helfi_global_mobile_menu' - 'send javascript errors to sentry' - 'setup own tfa' From cf4e6336c871f78b25e6f0f5002ea0f609f1d181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 11 Nov 2024 09:54:07 +0200 Subject: [PATCH 10/20] UHF-9680: Reverted obsolete configuration changes. --- conf/cmi/hdbt_admin_tools.site_settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml index 1de666bd..d7552933 100644 --- a/conf/cmi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/hdbt_admin_tools.site_settings.yml @@ -1,10 +1,10 @@ _core: default_config_hash: OgPHnjkIjDn42IHAwLRXhNzdhX825gq2SrlYKw4kbQ8 langcode: en -path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json site_settings: default_icon: home-smoke theme_color: tram koro: vibration footer_settings: footer_color: dark +path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json From 3dacd8c91acebfacf2ecee791baf1f0a6c7c8785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 11 Nov 2024 09:56:18 +0200 Subject: [PATCH 11/20] UHF-9680: Reverted hdbt_admin_tools.site_settings.yml. --- conf/cmi/hdbt_admin_tools.site_settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml index d7552933..1de666bd 100644 --- a/conf/cmi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/hdbt_admin_tools.site_settings.yml @@ -1,10 +1,10 @@ _core: default_config_hash: OgPHnjkIjDn42IHAwLRXhNzdhX825gq2SrlYKw4kbQ8 langcode: en +path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json site_settings: default_icon: home-smoke theme_color: tram koro: vibration footer_settings: footer_color: dark -path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json From 0baa90e9dc4a861d4985c51dbb4506488207ee34 Mon Sep 17 00:00:00 2001 From: Anna Lonka Date: Mon, 18 Nov 2024 16:10:56 +0200 Subject: [PATCH 12/20] UHF-10239: Added image gallery to district content type --- .../custom/helfi_kymp_content/helfi_kymp_content.module | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/modules/custom/helfi_kymp_content/helfi_kymp_content.module b/public/modules/custom/helfi_kymp_content/helfi_kymp_content.module index 1578dfef..cf4b2c48 100644 --- a/public/modules/custom/helfi_kymp_content/helfi_kymp_content.module +++ b/public/modules/custom/helfi_kymp_content/helfi_kymp_content.module @@ -317,6 +317,11 @@ function helfi_kymp_content_helfi_paragraph_types() : array { 'list_of_plans' => 19, ], ], + 'district' => [ + 'field_content' => [ + 'image_gallery' => 17, + ], + ], ], 'paragraphs_library_item' => [ 'paragraphs_library_item' => [ From 0eb08fc9ccd30bc5e3e2f0a3554df49538aacb54 Mon Sep 17 00:00:00 2001 From: Anna Lonka Date: Mon, 18 Nov 2024 16:17:43 +0200 Subject: [PATCH 13/20] UHF-10239: Added dependency --- .../custom/helfi_kymp_content/helfi_kymp_content.info.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/public/modules/custom/helfi_kymp_content/helfi_kymp_content.info.yml b/public/modules/custom/helfi_kymp_content/helfi_kymp_content.info.yml index 0026b8f8..4bbf643d 100644 --- a/public/modules/custom/helfi_kymp_content/helfi_kymp_content.info.yml +++ b/public/modules/custom/helfi_kymp_content/helfi_kymp_content.info.yml @@ -7,3 +7,4 @@ package: HELfi 'interface translation server pattern': modules/custom/helfi_kymp_content/translations/%language.po dependencies: - search_api:search_api + - helfi_platform_config:helfi_paragraphs_image_gallery From 44bd8197b44af7ce70bb2fcab544bf5d45864bcc Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 19 Nov 2024 09:14:40 +0000 Subject: [PATCH 14/20] Update configuration --- composer.lock | 327 +++++++++--------- ...tem.paragraphs_library_item.paragraphs.yml | 5 + ...form_display.node.landing_page.default.yml | 2 +- ...isplay.paragraph.image_gallery.default.yml | 65 ++++ ...y.paragraph.image_gallery_item.default.yml | 38 ++ ...view_display.media.image.image_gallery.yml | 38 ++ ...isplay.paragraph.image_gallery.default.yml | 54 +++ ...y.paragraph.image_gallery_item.default.yml | 34 ++ ...e.entity_view_mode.media.image_gallery.yml | 13 + conf/cmi/core.extension.yml | 1 + ....field.node.landing_page.field_content.yml | 7 +- .../field.field.node.page.field_content.yml | 5 + ...ld.field.node.page.field_lower_content.yml | 5 + ...graph.image_gallery.field_gallery_item.yml | 135 ++++++++ ...allery.field_image_gallery_description.yml | 29 ++ ...mage_gallery.field_image_gallery_ratio.yml | 25 ++ ...mage_gallery.field_image_gallery_title.yml | 21 ++ ...image_gallery_item.field_gallery_image.yml | 31 ++ ...y_item.field_gallery_image_description.yml | 21 ++ ....tpr_service.tpr_service.field_content.yml | 5 + ...ervice.tpr_service.field_lower_content.yml | 5 + ....field.tpr_unit.tpr_unit.field_content.yml | 5 + ....tpr_unit.tpr_unit.field_lower_content.yml | 5 + ....storage.paragraph.field_gallery_image.yml | 22 ++ ...agraph.field_gallery_image_description.yml | 23 ++ ...d.storage.paragraph.field_gallery_item.yml | 22 ++ ...agraph.field_image_gallery_description.yml | 21 ++ ...ge.paragraph.field_image_gallery_ratio.yml | 23 ++ ...ge.paragraph.field_image_gallery_title.yml | 23 ++ conf/cmi/image.style.0.7_1086w_1630h_LQ.yml | 26 ++ conf/cmi/image.style.0.7_352w_572h.yml | 19 + conf/cmi/image.style.0.7_414w_621h.yml | 19 + conf/cmi/image.style.0.7_543w_815h.yml | 19 + conf/cmi/image.style.0.7_704w_1144h_LQ.yml | 26 ++ conf/cmi/image.style.0.7_828w_1242h_LQ.yml | 26 ++ conf/cmi/image.style.1_1086w_1086h_LQ.yml | 26 ++ conf/cmi/image.style.1_414w_414h.yml | 19 + conf/cmi/image.style.1_543w_543h.yml | 19 + conf/cmi/image.style.1_828w_828h_LQ.yml | 26 ++ ...isplay.paragraph.image_gallery.default.yml | 5 + ...e.entity_view_mode.media.image_gallery.yml | 1 + ...graph.image_gallery.field_gallery_item.yml | 2 + ...allery.field_image_gallery_description.yml | 1 + ...mage_gallery.field_image_gallery_ratio.yml | 2 + ...mage_gallery.field_image_gallery_title.yml | 1 + ...image_gallery_item.field_gallery_image.yml | 1 + ...y_item.field_gallery_image_description.yml | 1 + ..._item.field_gallery_image_photographer.yml | 2 + ...ragraphs.paragraphs_type.image_gallery.yml | 2 + ...phs.paragraphs_type.image_gallery_item.yml | 1 + ...isplay.paragraph.image_gallery.default.yml | 5 + ...e.entity_view_mode.media.image_gallery.yml | 1 + ...graph.image_gallery.field_gallery_item.yml | 2 + ...allery.field_image_gallery_description.yml | 1 + ...mage_gallery.field_image_gallery_ratio.yml | 2 + ...mage_gallery.field_image_gallery_title.yml | 1 + ...image_gallery_item.field_gallery_image.yml | 1 + ...y_item.field_gallery_image_description.yml | 1 + ..._item.field_gallery_image_photographer.yml | 2 + ...ragraphs.paragraphs_type.image_gallery.yml | 2 + ...phs.paragraphs_type.image_gallery_item.yml | 1 + ...ragraphs.paragraphs_type.image_gallery.yml | 12 + ...phs.paragraphs_type.image_gallery_item.yml | 12 + ...ponsive_image.styles.image_gallery_1_1.yml | 38 ++ ...ponsive_image.styles.image_gallery_2_3.yml | 50 +++ ...ponsive_image.styles.image_gallery_3_2.yml | 50 +++ conf/cmi/search_api.server.elastic_kymp.yml | 2 +- conf/cmi/views.view.er_tpr_unit.yml | 2 +- conf/cmi/views.view.locked_services.yml | 2 +- conf/cmi/views.view.locked_units.yml | 2 +- conf/cmi/views.view.service_list.yml | 4 +- conf/cmi/views.view.service_units.yml | 2 +- conf/cmi/views.view.unit_search.yml | 2 +- 73 files changed, 1279 insertions(+), 172 deletions(-) create mode 100644 conf/cmi/core.entity_form_display.paragraph.image_gallery.default.yml create mode 100644 conf/cmi/core.entity_form_display.paragraph.image_gallery_item.default.yml create mode 100644 conf/cmi/core.entity_view_display.media.image.image_gallery.yml create mode 100644 conf/cmi/core.entity_view_display.paragraph.image_gallery.default.yml create mode 100644 conf/cmi/core.entity_view_display.paragraph.image_gallery_item.default.yml create mode 100644 conf/cmi/core.entity_view_mode.media.image_gallery.yml create mode 100644 conf/cmi/field.field.paragraph.image_gallery.field_gallery_item.yml create mode 100644 conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_description.yml create mode 100644 conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml create mode 100644 conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_title.yml create mode 100644 conf/cmi/field.field.paragraph.image_gallery_item.field_gallery_image.yml create mode 100644 conf/cmi/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml create mode 100644 conf/cmi/field.storage.paragraph.field_gallery_image.yml create mode 100644 conf/cmi/field.storage.paragraph.field_gallery_image_description.yml create mode 100644 conf/cmi/field.storage.paragraph.field_gallery_item.yml create mode 100644 conf/cmi/field.storage.paragraph.field_image_gallery_description.yml create mode 100644 conf/cmi/field.storage.paragraph.field_image_gallery_ratio.yml create mode 100644 conf/cmi/field.storage.paragraph.field_image_gallery_title.yml create mode 100644 conf/cmi/image.style.0.7_1086w_1630h_LQ.yml create mode 100644 conf/cmi/image.style.0.7_352w_572h.yml create mode 100644 conf/cmi/image.style.0.7_414w_621h.yml create mode 100644 conf/cmi/image.style.0.7_543w_815h.yml create mode 100644 conf/cmi/image.style.0.7_704w_1144h_LQ.yml create mode 100644 conf/cmi/image.style.0.7_828w_1242h_LQ.yml create mode 100644 conf/cmi/image.style.1_1086w_1086h_LQ.yml create mode 100644 conf/cmi/image.style.1_414w_414h.yml create mode 100644 conf/cmi/image.style.1_543w_543h.yml create mode 100644 conf/cmi/image.style.1_828w_828h_LQ.yml create mode 100644 conf/cmi/language/fi/core.entity_form_display.paragraph.image_gallery.default.yml create mode 100644 conf/cmi/language/fi/core.entity_view_mode.media.image_gallery.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.image_gallery.field_gallery_item.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_description.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image_photographer.yml create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.image_gallery.yml create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.image_gallery_item.yml create mode 100644 conf/cmi/language/sv/core.entity_form_display.paragraph.image_gallery.default.yml create mode 100644 conf/cmi/language/sv/core.entity_view_mode.media.image_gallery.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.image_gallery.field_gallery_item.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_description.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_title.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image_photographer.yml create mode 100644 conf/cmi/language/sv/paragraphs.paragraphs_type.image_gallery.yml create mode 100644 conf/cmi/language/sv/paragraphs.paragraphs_type.image_gallery_item.yml create mode 100644 conf/cmi/paragraphs.paragraphs_type.image_gallery.yml create mode 100644 conf/cmi/paragraphs.paragraphs_type.image_gallery_item.yml create mode 100644 conf/cmi/responsive_image.styles.image_gallery_1_1.yml create mode 100644 conf/cmi/responsive_image.styles.image_gallery_2_3.yml create mode 100644 conf/cmi/responsive_image.styles.image_gallery_3_2.yml diff --git a/composer.lock b/composer.lock index 9284cd55..abb9bd42 100644 --- a/composer.lock +++ b/composer.lock @@ -185,29 +185,29 @@ }, { "name": "chillerlan/php-qrcode", - "version": "4.4.1", + "version": "4.4.2", "source": { "type": "git", "url": "https://github.com/chillerlan/php-qrcode.git", - "reference": "f5e243f3b61a60934780579430a951460f40888d" + "reference": "345ed8e4ffb56e6b3fcd9f42e3970b9026fa6ce4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/f5e243f3b61a60934780579430a951460f40888d", - "reference": "f5e243f3b61a60934780579430a951460f40888d", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/345ed8e4ffb56e6b3fcd9f42e3970b9026fa6ce4", + "reference": "345ed8e4ffb56e6b3fcd9f42e3970b9026fa6ce4", "shasum": "" }, "require": { - "chillerlan/php-settings-container": "^2.1.4 || ^3.1", + "chillerlan/php-settings-container": "^2.1.6 || ^3.2.1", "ext-mbstring": "*", "php": "^7.4 || ^8.0" }, "require-dev": { - "phan/phan": "^5.4", + "phan/phan": "^5.4.5", "phpmd/phpmd": "^2.15", "phpunit/phpunit": "^9.6", "setasign/fpdf": "^1.8.2", - "squizlabs/php_codesniffer": "^3.8" + "squizlabs/php_codesniffer": "^3.11" }, "suggest": { "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.", @@ -250,19 +250,15 @@ ], "support": { "issues": "https://github.com/chillerlan/php-qrcode/issues", - "source": "https://github.com/chillerlan/php-qrcode/tree/4.4.1" + "source": "https://github.com/chillerlan/php-qrcode/tree/4.4.2" }, "funding": [ - { - "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4", - "type": "custom" - }, { "url": "https://ko-fi.com/codemasher", "type": "ko_fi" } ], - "time": "2024-01-06T16:56:58+00:00" + "time": "2024-11-15T15:36:24+00:00" }, { "name": "chillerlan/php-settings-container", @@ -2263,16 +2259,16 @@ }, { "name": "drupal/core", - "version": "10.3.7", + "version": "10.3.8", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "5b11ec4e38e71748c51287cbd64cfcc43faeb624" + "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/5b11ec4e38e71748c51287cbd64cfcc43faeb624", - "reference": "5b11ec4e38e71748c51287cbd64cfcc43faeb624", + "url": "https://api.github.com/repos/drupal/core/zipball/4006024a8dd7c9976fad0a2af7c9034d120c8e44", + "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44", "shasum": "" }, "require": { @@ -2318,7 +2314,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.14.0" + "twig/twig": "^3.14.2" }, "conflict": { "drush/drush": "<12.4.3" @@ -2421,13 +2417,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.7" + "source": "https://github.com/drupal/core/tree/10.3.8" }, - "time": "2024-11-07T08:22:50+00:00" + "time": "2024-11-12T09:52:10+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.7", + "version": "10.3.8", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2471,7 +2467,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.7" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.8" }, "time": "2024-08-22T14:31:34+00:00" }, @@ -2907,17 +2903,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.20", + "version": "2.1.21", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.20" + "reference": "2.1.21" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.20.zip", - "reference": "2.1.20", - "shasum": "67f8e2eb17ed3d3db6cd93782ed1faa88c206640" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.21.zip", + "reference": "2.1.21", + "shasum": "6ec1bb5cfa15408e3372d7e0d0a1355030a9f20b" }, "require": { "drupal/core": "^9 || ^10 || ^11" @@ -2928,8 +2924,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.20", - "datestamp": "1731097435", + "version": "2.1.21", + "datestamp": "1731602531", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3322,7 +3318,7 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -3841,17 +3837,17 @@ }, { "name": "drupal/focal_point", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/focal_point.git", - "reference": "2.1.1" + "reference": "2.1.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/focal_point-2.1.1.zip", - "reference": "2.1.1", - "shasum": "f8c24bb4257f784176e79ec6f2b4c11ed46391e0" + "url": "https://ftp.drupal.org/files/projects/focal_point-2.1.2.zip", + "reference": "2.1.2", + "shasum": "5f8ffadd37748506c8f00314b1d45c947eb27cf7" }, "require": { "drupal/core": "^9.3 || ^10 || ^11", @@ -3863,8 +3859,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.1", - "datestamp": "1721126807", + "version": "2.1.2", + "datestamp": "1731556344", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4079,16 +4075,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.4", + "version": "6.8.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "dfabf9a5cdc0953ea7e3078ed002fe4bc937abad" + "reference": "788a852f02962d5c38be053989b6a18ba00daf0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/dfabf9a5cdc0953ea7e3078ed002fe4bc937abad", - "reference": "dfabf9a5cdc0953ea7e3078ed002fe4bc937abad", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/788a852f02962d5c38be053989b6a18ba00daf0b", + "reference": "788a852f02962d5c38be053989b6a18ba00daf0b", "shasum": "" }, "require": { @@ -4107,23 +4103,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.7", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-11-08T17:53:14+00:00" + "time": "2024-11-18T15:33:25+00:00" }, { "name": "drupal/hdbt_admin", - "version": "3.2.7", + "version": "3.2.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "76454c97d12ea80c2e6859fea8d5926dca80bf7e" + "reference": "d1c02090ec6536e3d43abeb236a535416b97e669" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/76454c97d12ea80c2e6859fea8d5926dca80bf7e", - "reference": "76454c97d12ea80c2e6859fea8d5926dca80bf7e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/d1c02090ec6536e3d43abeb236a535416b97e669", + "reference": "d1c02090ec6536e3d43abeb236a535416b97e669", "shasum": "" }, "require": { @@ -4151,10 +4147,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.7", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.8", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-11-01T05:47:57+00:00" + "time": "2024-11-18T15:28:13+00:00" }, { "name": "drupal/health_check", @@ -4419,16 +4415,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.7.1", + "version": "4.7.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "680984849f6f204b63af73efb0ae531ba121ff58" + "reference": "760d470ec819fcc7749d77d319b904a42812ac85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/680984849f6f204b63af73efb0ae531ba121ff58", - "reference": "680984849f6f204b63af73efb0ae531ba121ff58", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/760d470ec819fcc7749d77d319b904a42812ac85", + "reference": "760d470ec819fcc7749d77d319b904a42812ac85", "shasum": "" }, "require": { @@ -4525,7 +4521,8 @@ "[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch", - "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch" + "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch", + "[#UHF-10967] Performance Degraded after update to twig 3.14.2 (https://www.drupal.org/project/drupal/issues/3487031)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/90b44ce5a778d05bbe89f7eaca6412b7bd34efa0/patches/10177.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4554,10 +4551,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.7.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.7.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-11T07:44:23+00:00" + "time": "2024-11-19T09:09:39+00:00" }, { "name": "drupal/helfi_proxy", @@ -6147,6 +6144,10 @@ "name": "nerdstein", "homepage": "https://www.drupal.org/user/1557710" }, + { + "name": "ptmkenny", + "homepage": "https://www.drupal.org/user/97885" + }, { "name": "rlhawk", "homepage": "https://www.drupal.org/user/352283" @@ -6875,17 +6876,17 @@ }, { "name": "drupal/stomp", - "version": "2.0.0-alpha4", + "version": "2.0.0-alpha5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/stomp.git", - "reference": "2.0.0-alpha4" + "reference": "2.0.0-alpha5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/stomp-2.0.0-alpha4.zip", - "reference": "2.0.0-alpha4", - "shasum": "624db88867009eab5da9ccc259a396eb79927809" + "url": "https://ftp.drupal.org/files/projects/stomp-2.0.0-alpha5.zip", + "reference": "2.0.0-alpha5", + "shasum": "5f904047325f8f55674c77e16f61a4807cb51f7e" }, "require": { "drupal/core": "^9 || ^10 || ^11", @@ -6898,18 +6899,18 @@ "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3", - "drush/drush": "^11.6 || ^12", + "drush/drush": "^11.6 || ^12 || ^13", "jangregor/phpstan-prophecy": "dev-master", "mglaman/phpstan-drupal": "^1.2", "phpstan/extension-installer": "^1.3", - "phpstan/phpstan": "1.11.x-dev", - "phpstan/phpstan-deprecation-rules": "1.2.x-dev" + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-alpha4", - "datestamp": "1711347968", + "version": "2.0.0-alpha5", + "datestamp": "1731482648", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -7877,16 +7878,16 @@ }, { "name": "elasticsearch/elasticsearch", - "version": "v8.15.0", + "version": "v8.16.0", "source": { "type": "git", "url": "https://github.com/elastic/elasticsearch-php.git", - "reference": "34c2444fa8d4c3e6c8b009bd8dea90bca007203b" + "reference": "ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/34c2444fa8d4c3e6c8b009bd8dea90bca007203b", - "reference": "34c2444fa8d4c3e6c8b009bd8dea90bca007203b", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85", + "reference": "ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85", "shasum": "" }, "require": { @@ -7929,9 +7930,9 @@ ], "support": { "issues": "https://github.com/elastic/elasticsearch-php/issues", - "source": "https://github.com/elastic/elasticsearch-php/tree/v8.15.0" + "source": "https://github.com/elastic/elasticsearch-php/tree/v8.16.0" }, - "time": "2024-08-14T14:32:50+00:00" + "time": "2024-11-14T22:23:33+00:00" }, { "name": "ezyang/htmlpurifier", @@ -8664,28 +8665,28 @@ }, { "name": "jean85/pretty-package-versions", - "version": "2.0.6", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4" + "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4", - "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", + "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", "shasum": "" }, "require": { - "composer-runtime-api": "^2.0.0", - "php": "^7.1|^8.0" + "composer-runtime-api": "^2.1.0", + "php": "^7.4|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "jean85/composer-provided-replaced-stub-package": "^1.0", "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^7.5|^8.5|^9.4", - "vimeo/psalm": "^4.3" + "phpunit/phpunit": "^7.5|^8.5|^9.6", + "vimeo/psalm": "^4.3 || ^5.0" }, "type": "library", "extra": { @@ -8717,9 +8718,9 @@ ], "support": { "issues": "https://github.com/Jean85/pretty-package-versions/issues", - "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6" + "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.0" }, - "time": "2024-03-08T09:58:59+00:00" + "time": "2024-11-18T16:19:46+00:00" }, { "name": "league/container", @@ -9482,16 +9483,16 @@ }, { "name": "monolog/monolog", - "version": "3.7.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" + "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67", + "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67", "shasum": "" }, "require": { @@ -9511,12 +9512,14 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpstan/phpstan": "^1.9", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-strict-rules": "^1.4", - "phpunit/phpunit": "^10.5.17", + "php-console/php-console": "^3.1.8", + "phpstan/phpstan": "^2", + "phpstan/phpstan-deprecation-rules": "^2", + "phpstan/phpstan-strict-rules": "^2", + "phpunit/phpunit": "^10.5.17 || ^11.0.7", "predis/predis": "^1.1 || ^2", - "ruflin/elastica": "^7", + "rollbar/rollbar": "^4.0", + "ruflin/elastica": "^7 || ^8", "symfony/mailer": "^5.4 || ^6", "symfony/mime": "^5.4 || ^6" }, @@ -9567,7 +9570,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.7.0" + "source": "https://github.com/Seldaek/monolog/tree/3.8.0" }, "funding": [ { @@ -9579,7 +9582,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:40:51+00:00" + "time": "2024-11-12T13:57:08+00:00" }, { "name": "nikic/php-parser", @@ -11339,16 +11342,16 @@ }, { "name": "symfony/console", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b" + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/897c2441ed4eec8a8a2c37b943427d24dba3f26b", - "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b", + "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", "shasum": "" }, "require": { @@ -11413,7 +11416,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.14" + "source": "https://github.com/symfony/console/tree/v6.4.15" }, "funding": [ { @@ -11429,20 +11432,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-11-06T14:19:14+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.13", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96" + "reference": "70ab1f65a4516ef741e519ea938e6aa465e6aa36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", - "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/70ab1f65a4516ef741e519ea938e6aa465e6aa36", + "reference": "70ab1f65a4516ef741e519ea938e6aa465e6aa36", "shasum": "" }, "require": { @@ -11494,7 +11497,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.13" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.15" }, "funding": [ { @@ -11510,7 +11513,7 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-11-09T06:56:25+00:00" }, { "name": "symfony/deprecation-contracts", @@ -11942,16 +11945,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ba020a321a95519303a3f09ec2824d34d601c388" + "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388", - "reference": "ba020a321a95519303a3f09ec2824d34d601c388", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", + "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", "shasum": "" }, "require": { @@ -11961,12 +11964,12 @@ "symfony/polyfill-php83": "^1.27" }, "conflict": { - "symfony/cache": "<6.3" + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" }, "require-dev": { "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.3|^7.0", + "symfony/cache": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/expression-language": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", @@ -11999,7 +12002,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.14" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.15" }, "funding": [ { @@ -12015,20 +12018,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T16:39:55+00:00" + "time": "2024-11-08T16:09:24+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8278a947d0369754a47b758a9e17b72cab970951" + "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8278a947d0369754a47b758a9e17b72cab970951", - "reference": "8278a947d0369754a47b758a9e17b72cab970951", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b002a5b3947653c5aee3adac2a024ea615fd3ff5", + "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5", "shasum": "" }, "require": { @@ -12113,7 +12116,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.14" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.15" }, "funding": [ { @@ -12129,7 +12132,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:45:21+00:00" + "time": "2024-11-13T13:57:37+00:00" }, { "name": "symfony/mailer", @@ -13222,16 +13225,16 @@ }, { "name": "symfony/process", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "25214adbb0996d18112548de20c281be9f27279f" + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f", - "reference": "25214adbb0996d18112548de20c281be9f27279f", + "url": "https://api.github.com/repos/symfony/process/zipball/3cb242f059c14ae08591c5c4087d1fe443564392", + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392", "shasum": "" }, "require": { @@ -13263,7 +13266,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.14" + "source": "https://github.com/symfony/process/tree/v6.4.15" }, "funding": [ { @@ -13279,7 +13282,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:25:01+00:00" + "time": "2024-11-06T14:19:14+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -13449,16 +13452,16 @@ }, { "name": "symfony/serializer", - "version": "v6.4.13", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "8be421505938b11a0ca4f656e4322232236386f0" + "reference": "9d862d66198f3c2e30404228629ef4c18d5d608e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/8be421505938b11a0ca4f656e4322232236386f0", - "reference": "8be421505938b11a0ca4f656e4322232236386f0", + "url": "https://api.github.com/repos/symfony/serializer/zipball/9d862d66198f3c2e30404228629ef4c18d5d608e", + "reference": "9d862d66198f3c2e30404228629ef4c18d5d608e", "shasum": "" }, "require": { @@ -13527,7 +13530,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.4.13" + "source": "https://github.com/symfony/serializer/tree/v6.4.15" }, "funding": [ { @@ -13543,7 +13546,7 @@ "type": "tidelift" } ], - "time": "2024-10-03T09:58:04+00:00" + "time": "2024-10-23T13:25:59+00:00" }, { "name": "symfony/service-contracts", @@ -13630,16 +13633,16 @@ }, { "name": "symfony/string", - "version": "v6.4.13", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", - "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", "shasum": "" }, "require": { @@ -13696,7 +13699,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.13" + "source": "https://github.com/symfony/string/tree/v6.4.15" }, "funding": [ { @@ -13712,7 +13715,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2024-11-13T13:31:12+00:00" }, { "name": "symfony/translation-contracts", @@ -13794,16 +13797,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "dc259b85e59a6569e205966d447dec0a7d95facf" + "reference": "7541055cdaf54ff95f0735bf703d313374e8b20b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/dc259b85e59a6569e205966d447dec0a7d95facf", - "reference": "dc259b85e59a6569e205966d447dec0a7d95facf", + "url": "https://api.github.com/repos/symfony/validator/zipball/7541055cdaf54ff95f0735bf703d313374e8b20b", + "reference": "7541055cdaf54ff95f0735bf703d313374e8b20b", "shasum": "" }, "require": { @@ -13871,7 +13874,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.14" + "source": "https://github.com/symfony/validator/tree/v6.4.15" }, "funding": [ { @@ -13887,20 +13890,20 @@ "type": "tidelift" } ], - "time": "2024-11-04T11:33:53+00:00" + "time": "2024-11-08T15:28:48+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "93c09246038178717a9c14b809ea8151ffcf7091" + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/93c09246038178717a9c14b809ea8151ffcf7091", - "reference": "93c09246038178717a9c14b809ea8151ffcf7091", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", "shasum": "" }, "require": { @@ -13956,7 +13959,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.14" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.15" }, "funding": [ { @@ -13972,7 +13975,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-11-08T15:28:48+00:00" }, { "name": "symfony/var-exporter", @@ -14223,16 +14226,16 @@ }, { "name": "twig/twig", - "version": "v3.14.2", + "version": "v3.15.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a" + "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", - "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/2d5b3964cc21d0188633d7ddce732dc8e874db02", + "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02", "shasum": "" }, "require": { @@ -14286,7 +14289,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.14.2" + "source": "https://github.com/twigphp/Twig/tree/v3.15.0" }, "funding": [ { @@ -14298,7 +14301,7 @@ "type": "tidelift" } ], - "time": "2024-11-07T12:36:22+00:00" + "time": "2024-11-17T15:59:19+00:00" }, { "name": "twistor/flysystem-stream-wrapper", @@ -16580,16 +16583,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.5.1", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f" + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0c70d2c566e899666f367ab7b80986beb3581e6f", - "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", "shasum": "" }, "require": { @@ -16598,7 +16601,7 @@ "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { @@ -16638,9 +16641,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.5.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" }, - "time": "2024-11-06T11:58:54+00:00" + "time": "2024-11-12T11:25:25+00:00" }, { "name": "phpdocumentor/type-resolver", diff --git a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml index 15b11be0..9884ca4e 100644 --- a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml +++ b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml @@ -10,6 +10,7 @@ dependencies: - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.district_and_project_search - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.list_of_plans @@ -57,6 +58,7 @@ settings: unit_search: unit_search service_list: service_list unit_contact_card: unit_contact_card + image_gallery: image_gallery negate: 0 target_bundles_drag_drop: accordion: @@ -80,6 +82,9 @@ settings: image: weight: 0 enabled: true + image_gallery: + weight: 0 + enabled: true liftup_with_image: weight: 0 enabled: true diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml index ee56116a..4a3fdc21 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 - region: content settings: { } third_party_settings: { } + region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/core.entity_form_display.paragraph.image_gallery.default.yml b/conf/cmi/core.entity_form_display.paragraph.image_gallery.default.yml new file mode 100644 index 00000000..e96097a2 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.image_gallery.default.yml @@ -0,0 +1,65 @@ +uuid: 6f54e74d-5553-4ba9-beb0-af843b204fed +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.image_gallery.field_gallery_item + - field.field.paragraph.image_gallery.field_image_gallery_description + - field.field.paragraph.image_gallery.field_image_gallery_ratio + - field.field.paragraph.image_gallery.field_image_gallery_title + - paragraphs.paragraphs_type.image_gallery + module: + - paragraphs + - text +_core: + default_config_hash: ClzrSrZjVhACSX9k5LALozrSm5gLuFEvOURBKAlRbvs +id: paragraph.image_gallery.default +targetEntityType: paragraph +bundle: image_gallery +mode: default +content: + field_gallery_item: + type: paragraphs + weight: 3 + region: content + settings: + title: Paragraph + title_plural: Paragraphs + edit_mode: closed + closed_mode: summary + autocollapse: none + closed_mode_threshold: 0 + add_mode: dropdown + form_display_mode: default + default_paragraph_type: image_gallery_item + features: + add_above: '0' + collapse_edit_all: collapse_edit_all + convert: '0' + duplicate: duplicate + third_party_settings: { } + field_image_gallery_description: + type: text_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_image_gallery_ratio: + type: options_select + weight: 2 + region: content + settings: { } + third_party_settings: { } + field_image_gallery_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_form_display.paragraph.image_gallery_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.image_gallery_item.default.yml new file mode 100644 index 00000000..51f23a5b --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.image_gallery_item.default.yml @@ -0,0 +1,38 @@ +uuid: ac59cef5-11ea-4ffa-8550-29adbac16965 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.image_gallery_item.field_gallery_image + - field.field.paragraph.image_gallery_item.field_gallery_image_description + - paragraphs.paragraphs_type.image_gallery_item + module: + - hdbt_admin_tools + - media_library +_core: + default_config_hash: We454Hg-JKGKzTEuGiPpn1di6JpllvY96zuvVNeMX1I +id: paragraph.image_gallery_item.default +targetEntityType: paragraph +bundle: image_gallery_item +mode: default +content: + field_gallery_image: + type: media_library_widget + weight: 0 + region: content + settings: + media_types: { } + third_party_settings: { } + field_gallery_image_description: + type: textfield_character_counter + weight: 2 + region: content + settings: + counter_step: 0 + counter_total: 160 + size: 160 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_view_display.media.image.image_gallery.yml b/conf/cmi/core.entity_view_display.media.image.image_gallery.yml new file mode 100644 index 00000000..d9bbd4dc --- /dev/null +++ b/conf/cmi/core.entity_view_display.media.image.image_gallery.yml @@ -0,0 +1,38 @@ +uuid: 276c125d-e2db-44ce-9576-21c45385e0dc +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.media.image_gallery + - field.field.media.image.field_media_image + - field.field.media.image.field_photographer + - media.type.image + - responsive_image.styles.image_gallery_1_1 + module: + - responsive_image +_core: + default_config_hash: Ky7rUnc3u7APd8dH1E5EogiDjUtvkJvq0ZHfgG6OlQw +id: media.image.image_gallery +targetEntityType: media +bundle: image +mode: image_gallery +content: + field_media_image: + type: responsive_image + label: hidden + settings: + responsive_image_style: image_gallery_1_1 + image_link: '' + image_loading: + attribute: eager + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + field_photographer: true + langcode: true + name: true + search_api_excerpt: true + thumbnail: true + uid: true diff --git a/conf/cmi/core.entity_view_display.paragraph.image_gallery.default.yml b/conf/cmi/core.entity_view_display.paragraph.image_gallery.default.yml new file mode 100644 index 00000000..507d6055 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.image_gallery.default.yml @@ -0,0 +1,54 @@ +uuid: 4634b6de-c88e-4454-97b2-5333a9f68c5d +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.image_gallery.field_gallery_item + - field.field.paragraph.image_gallery.field_image_gallery_description + - field.field.paragraph.image_gallery.field_image_gallery_ratio + - field.field.paragraph.image_gallery.field_image_gallery_title + - paragraphs.paragraphs_type.image_gallery + module: + - entity_reference_revisions + - options + - text +_core: + default_config_hash: K6JQi5u8Iwe6KYzLnjn5Mk9HBBXE3P0KHemD_OxmcU8 +id: paragraph.image_gallery.default +targetEntityType: paragraph +bundle: image_gallery +mode: default +content: + field_gallery_item: + type: entity_reference_revisions_entity_view + label: hidden + settings: + view_mode: default + link: '' + third_party_settings: { } + weight: 0 + region: content + field_image_gallery_description: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 2 + region: content + field_image_gallery_ratio: + type: list_default + label: hidden + settings: { } + third_party_settings: { } + weight: 3 + region: content + field_image_gallery_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 1 + region: content +hidden: + search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_display.paragraph.image_gallery_item.default.yml b/conf/cmi/core.entity_view_display.paragraph.image_gallery_item.default.yml new file mode 100644 index 00000000..6c9a87f8 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.image_gallery_item.default.yml @@ -0,0 +1,34 @@ +uuid: fefcfc5a-2130-4993-868c-d7a87b3bc78f +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.image_gallery_item.field_gallery_image + - field.field.paragraph.image_gallery_item.field_gallery_image_description + - paragraphs.paragraphs_type.image_gallery_item +_core: + default_config_hash: sguq7Qqt3__gceyKWUbJTys0llCi28ZdArv-LyN2XBE +id: paragraph.image_gallery_item.default +targetEntityType: paragraph +bundle: image_gallery_item +mode: default +content: + field_gallery_image: + type: entity_reference_entity_view + label: hidden + settings: + view_mode: image + link: false + third_party_settings: { } + weight: 0 + region: content + field_gallery_image_description: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 2 + region: content +hidden: + search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_mode.media.image_gallery.yml b/conf/cmi/core.entity_view_mode.media.image_gallery.yml new file mode 100644 index 00000000..aede92c6 --- /dev/null +++ b/conf/cmi/core.entity_view_mode.media.image_gallery.yml @@ -0,0 +1,13 @@ +uuid: c52c9e44-0d46-417c-a8d9-372120b2c68a +langcode: en +status: true +dependencies: + module: + - media +_core: + default_config_hash: X_EeW1ealqkAjjQhcc2ehkJxyT9VZ9QH5iTYi-6NeYY +id: media.image_gallery +label: 'Image gallery' +description: '' +targetEntityType: media +cache: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 996b2255..5a2aabe3 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -71,6 +71,7 @@ module: helfi_paragraphs_hearings: 0 helfi_paragraphs_hero: 0 helfi_paragraphs_image: 0 + helfi_paragraphs_image_gallery: 0 helfi_paragraphs_liftup_with_image: 0 helfi_paragraphs_list_of_links: 0 helfi_paragraphs_map: 0 diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 8e3d8c07..97aecfa9 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -14,6 +14,7 @@ dependencies: - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.hearings + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.list_of_plans @@ -61,12 +62,13 @@ settings: target_group_links: target_group_links event_list: event_list news_list: news_list + image_gallery: image_gallery + curated_event_list: curated_event_list hearings: hearings service_list: service_list service_list_search: service_list_search unit_search: unit_search unit_contact_card: unit_contact_card - curated_event_list: curated_event_list negate: 0 target_bundles_drag_drop: banner: @@ -96,6 +98,9 @@ settings: hearings: weight: 14 enabled: true + image_gallery: + weight: 15 + enabled: true liftup_with_image: weight: 3 enabled: true diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index 8af2b680..5d26da63 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -15,6 +15,7 @@ dependencies: - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.hearings - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.journey_planner - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.list_of_plans @@ -64,6 +65,7 @@ settings: event_list: event_list contact_card_listing: contact_card_listing news_list: news_list + image_gallery: image_gallery service_list_search: service_list_search unit_search: unit_search unit_contact_card: unit_contact_card @@ -99,6 +101,9 @@ settings: image: weight: 3 enabled: true + image_gallery: + weight: 16 + enabled: true journey_planner: weight: 19 enabled: true diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index a44557ee..5920eb47 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -14,6 +14,7 @@ dependencies: - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.list_of_plans - paragraphs.paragraphs_type.map @@ -58,6 +59,7 @@ settings: event_list: event_list contact_card_listing: contact_card_listing news_list: news_list + image_gallery: image_gallery service_list_search: service_list_search unit_search: unit_search unit_contact_card: unit_contact_card @@ -90,6 +92,9 @@ settings: image: weight: 5 enabled: true + image_gallery: + weight: 16 + enabled: true list_of_links: weight: 0 enabled: true diff --git a/conf/cmi/field.field.paragraph.image_gallery.field_gallery_item.yml b/conf/cmi/field.field.paragraph.image_gallery.field_gallery_item.yml new file mode 100644 index 00000000..28587b4a --- /dev/null +++ b/conf/cmi/field.field.paragraph.image_gallery.field_gallery_item.yml @@ -0,0 +1,135 @@ +uuid: a36e5aa7-f3be-463e-9e9c-dff68d078701 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_gallery_item + - paragraphs.paragraphs_type.image_gallery + - paragraphs.paragraphs_type.image_gallery_item + module: + - entity_reference_revisions +_core: + default_config_hash: wpMCxsqD5MqusMzUA4P_QIZAXZVoUnvJi4wSsZ0TTKE +id: paragraph.image_gallery.field_gallery_item +field_name: field_gallery_item +entity_type: paragraph +bundle: image_gallery +label: 'Gallery item' +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:paragraph' + handler_settings: + target_bundles: + image_gallery_item: image_gallery_item + negate: 0 + target_bundles_drag_drop: + accordion: + weight: 36 + enabled: false + accordion_item: + weight: 37 + enabled: false + banner: + weight: 38 + enabled: false + chart: + weight: 39 + enabled: false + columns: + weight: 40 + enabled: false + contact_card: + weight: 41 + enabled: false + contact_card_listing: + weight: 42 + enabled: false + content_cards: + weight: 43 + enabled: false + curated_event_list: + weight: 44 + enabled: false + current: + weight: 45 + enabled: false + event_list: + weight: 46 + enabled: false + from_library: + weight: 47 + enabled: false + front_page_latest_news: + weight: 48 + enabled: false + front_page_top_news: + weight: 49 + enabled: false + hearings: + weight: 50 + enabled: false + hero: + weight: 51 + enabled: false + image: + weight: 52 + enabled: false + image_gallery: + weight: 53 + enabled: false + image_gallery_item: + weight: 0 + enabled: true + liftup_with_image: + weight: 55 + enabled: false + list_of_links: + weight: 56 + enabled: false + list_of_links_item: + weight: 57 + enabled: false + map: + weight: 58 + enabled: false + news_archive: + weight: 59 + enabled: false + news_update: + weight: 60 + enabled: false + phasing: + weight: 61 + enabled: false + phasing_item: + weight: 62 + enabled: false + popular_service_item: + weight: 64 + enabled: false + popular_services: + weight: 63 + enabled: false + remote_video: + weight: 65 + enabled: false + sidebar_text: + weight: 66 + enabled: false + social_media_link: + weight: 67 + enabled: false + target_group_link_item: + weight: 69 + enabled: false + target_group_links: + weight: 68 + enabled: false + text: + weight: 70 + enabled: false +field_type: entity_reference_revisions diff --git a/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_description.yml b/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_description.yml new file mode 100644 index 00000000..9080b9a3 --- /dev/null +++ b/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_description.yml @@ -0,0 +1,29 @@ +uuid: 144defda-3730-4888-97f9-13cb97a8e107 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_image_gallery_description + - paragraphs.paragraphs_type.image_gallery + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: + - minimal +_core: + default_config_hash: YZDmpA9UTBckO4-LKC6WImb8G9GEKvWDth3DCvKHeZE +id: paragraph.image_gallery.field_image_gallery_description +field_name: field_image_gallery_description +entity_type: paragraph +bundle: image_gallery +label: Description +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + allowed_formats: { } +field_type: text_long diff --git a/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml b/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml new file mode 100644 index 00000000..6afbecc4 --- /dev/null +++ b/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml @@ -0,0 +1,25 @@ +uuid: b6356bca-1c21-4b1c-b2fe-bb8cd494f7fa +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_image_gallery_ratio + - paragraphs.paragraphs_type.image_gallery + module: + - options +_core: + default_config_hash: A4iZpYxoLuaNISkvKjMB7VvzQRzDazzPixgzktK119o +id: paragraph.image_gallery.field_image_gallery_ratio +field_name: field_image_gallery_ratio +entity_type: paragraph +bundle: image_gallery +label: 'Image ratio' +description: 'Select the ratio of the images shown in the image gallery. All images will have the same ratio. By default 1:1 is selected.' +required: true +translatable: false +default_value: + - + value: ratio_1_1 +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_title.yml b/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_title.yml new file mode 100644 index 00000000..13d6d2f1 --- /dev/null +++ b/conf/cmi/field.field.paragraph.image_gallery.field_image_gallery_title.yml @@ -0,0 +1,21 @@ +uuid: 0055eb45-30d2-4f76-9219-e99ceabfce11 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_image_gallery_title + - paragraphs.paragraphs_type.image_gallery +_core: + default_config_hash: 3LTgF7CycPwIPbBw1dE0RB4bNq_pDF1ruZJFlX5WcIw +id: paragraph.image_gallery.field_image_gallery_title +field_name: field_image_gallery_title +entity_type: paragraph +bundle: image_gallery +label: Title +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.field.paragraph.image_gallery_item.field_gallery_image.yml b/conf/cmi/field.field.paragraph.image_gallery_item.field_gallery_image.yml new file mode 100644 index 00000000..4cd7d8ab --- /dev/null +++ b/conf/cmi/field.field.paragraph.image_gallery_item.field_gallery_image.yml @@ -0,0 +1,31 @@ +uuid: e450ff8a-051e-4e08-82d3-2a345e4edd63 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_gallery_image + - media.type.image + - paragraphs.paragraphs_type.image_gallery_item +_core: + default_config_hash: 3JQvG5xbdo4_2aE_c9bytxTbjViccEv1KKD7P3jz31o +id: paragraph.image_gallery_item.field_gallery_image +field_name: field_gallery_image +entity_type: paragraph +bundle: image_gallery_item +label: Image +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + image: image + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml b/conf/cmi/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml new file mode 100644 index 00000000..a243e16e --- /dev/null +++ b/conf/cmi/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml @@ -0,0 +1,21 @@ +uuid: fe068813-e7e0-4001-8e8e-83b842c1cff6 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_gallery_image_description + - paragraphs.paragraphs_type.image_gallery_item +_core: + default_config_hash: suJvD0d1i7BhsQMtvK1DXzG4FsmH6BhKxUezCQvbUYg +id: paragraph.image_gallery_item.field_gallery_image_description +field_name: field_gallery_image_description +entity_type: paragraph +bundle: image_gallery_item +label: Description +description: 'The description of the selected image. Maximum length is 160 characters.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml index 91304e9e..3397ce58 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml @@ -12,6 +12,7 @@ dependencies: - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.phasing @@ -53,6 +54,7 @@ settings: contact_card_listing: contact_card_listing unit_accessibility_information: unit_accessibility_information unit_contact_card: unit_contact_card + image_gallery: image_gallery negate: 0 target_bundles_drag_drop: accordion: @@ -79,6 +81,9 @@ settings: image: weight: 3 enabled: true + image_gallery: + weight: 15 + enabled: true list_of_links: weight: 4 enabled: true diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml index a25ed52e..0d2cb5ab 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -12,6 +12,7 @@ dependencies: - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map @@ -57,6 +58,7 @@ settings: phasing: phasing unit_accessibility_information: unit_accessibility_information unit_contact_card: unit_contact_card + image_gallery: image_gallery negate: 0 target_bundles_drag_drop: accordion: @@ -83,6 +85,9 @@ settings: image: weight: 10 enabled: true + image_gallery: + weight: 17 + enabled: true liftup_with_image: weight: 11 enabled: true diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_content.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_content.yml index 26826340..f0cc9bd4 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_content.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_content.yml @@ -11,6 +11,7 @@ dependencies: - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text @@ -43,6 +44,7 @@ settings: remote_video: remote_video columns: columns contact_card_listing: contact_card_listing + image_gallery: image_gallery negate: 0 target_bundles_drag_drop: accordion: @@ -66,6 +68,9 @@ settings: image: weight: 3 enabled: true + image_gallery: + weight: 10 + enabled: true list_of_links: weight: 4 enabled: true diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml index cc131f07..b2d15aee 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml @@ -12,6 +12,7 @@ dependencies: - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map @@ -51,6 +52,7 @@ settings: liftup_with_image: liftup_with_image map: map remote_video: remote_video + image_gallery: image_gallery negate: 0 target_bundles_drag_drop: accordion: @@ -77,6 +79,9 @@ settings: image: weight: 10 enabled: true + image_gallery: + weight: 14 + enabled: true liftup_with_image: weight: 11 enabled: true diff --git a/conf/cmi/field.storage.paragraph.field_gallery_image.yml b/conf/cmi/field.storage.paragraph.field_gallery_image.yml new file mode 100644 index 00000000..fcd7c3b3 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_gallery_image.yml @@ -0,0 +1,22 @@ +uuid: f03c616d-5f1c-4dab-8856-9049da50b3cd +langcode: en +status: true +dependencies: + module: + - media + - paragraphs +_core: + default_config_hash: '-XluyquY0IAFJYUbjHyfr7zAQL8o6a4YfEw7pRTuhc4' +id: paragraph.field_gallery_image +field_name: field_gallery_image +entity_type: paragraph +type: entity_reference +settings: + target_type: media +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_gallery_image_description.yml b/conf/cmi/field.storage.paragraph.field_gallery_image_description.yml new file mode 100644 index 00000000..c7da7f1f --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_gallery_image_description.yml @@ -0,0 +1,23 @@ +uuid: b66fcec0-114b-4456-b4e4-06d13b99c7cd +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: ZjL5pbmCCozh8D_2AEvKlP-FGhbsxVH1k-iP7xigUUE +id: paragraph.field_gallery_image_description +field_name: field_gallery_image_description +entity_type: paragraph +type: string +settings: + max_length: 160 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_gallery_item.yml b/conf/cmi/field.storage.paragraph.field_gallery_item.yml new file mode 100644 index 00000000..400226d3 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_gallery_item.yml @@ -0,0 +1,22 @@ +uuid: aac3231f-dc54-451f-b01c-600cae4b9c2d +langcode: en +status: true +dependencies: + module: + - entity_reference_revisions + - paragraphs +_core: + default_config_hash: AASxkHLNp0neBWx8PFusMnNAxHp5CfbmeEHPMxMAiSg +id: paragraph.field_gallery_item +field_name: field_gallery_item +entity_type: paragraph +type: entity_reference_revisions +settings: + target_type: paragraph +module: entity_reference_revisions +locked: false +cardinality: 12 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_image_gallery_description.yml b/conf/cmi/field.storage.paragraph.field_image_gallery_description.yml new file mode 100644 index 00000000..b62a4181 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_image_gallery_description.yml @@ -0,0 +1,21 @@ +uuid: a70d71ee-d8c5-4718-bf09-ebff157a8085 +langcode: en +status: true +dependencies: + module: + - paragraphs + - text +_core: + default_config_hash: GUn68MvJ9jT0iJPncnEdS6ss2NubTfv3J_tNKAjKoQc +id: paragraph.field_image_gallery_description +field_name: field_image_gallery_description +entity_type: paragraph +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_image_gallery_ratio.yml b/conf/cmi/field.storage.paragraph.field_image_gallery_ratio.yml new file mode 100644 index 00000000..97a1021c --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_image_gallery_ratio.yml @@ -0,0 +1,23 @@ +uuid: b0297b85-5bc6-45cf-83d7-a131f5cbbf6a +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +_core: + default_config_hash: Wpxl8xbhczwaJ0b0_J1V00Tv8v0Z_cOq12TEKIPGwCs +id: paragraph.field_image_gallery_ratio +field_name: field_image_gallery_ratio +entity_type: paragraph +type: list_string +settings: + allowed_values: { } + allowed_values_function: helfi_paragraphs_image_gallery_allowed_values +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_image_gallery_title.yml b/conf/cmi/field.storage.paragraph.field_image_gallery_title.yml new file mode 100644 index 00000000..3fe00429 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_image_gallery_title.yml @@ -0,0 +1,23 @@ +uuid: b638715b-814d-4f07-9eb5-4d6a5d63c2b9 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: aojPqluZiqDAc6GaW1kAc3HbgJUd0So7IY_lgf_bLc8 +id: paragraph.field_image_gallery_title +field_name: field_image_gallery_title +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/image.style.0.7_1086w_1630h_LQ.yml b/conf/cmi/image.style.0.7_1086w_1630h_LQ.yml new file mode 100644 index 00000000..09db82ef --- /dev/null +++ b/conf/cmi/image.style.0.7_1086w_1630h_LQ.yml @@ -0,0 +1,26 @@ +uuid: 74ef3c22-d7ea-4cb1-8aab-01ba6b79bde5 +langcode: en +status: true +dependencies: + module: + - focal_point + - image_style_quality +_core: + default_config_hash: AeqLUQ96Cqn70SDi5us0fS8EdVFFfMUYhKl3Zf6DcBo +name: 0.7_1086w_1630h_LQ +label: 0.7_1086w_1630h_LQ +effects: + 1c1da0f4-bb6a-4f11-88eb-8cd33a8e0da2: + uuid: 1c1da0f4-bb6a-4f11-88eb-8cd33a8e0da2 + id: focal_point_scale_and_crop + weight: 1 + data: + width: 1086 + height: 1630 + crop_type: focal_point + c319bca0-92f7-4467-a5ec-1b902ce2be1b: + uuid: c319bca0-92f7-4467-a5ec-1b902ce2be1b + id: image_style_quality + weight: 2 + data: + quality: 65 diff --git a/conf/cmi/image.style.0.7_352w_572h.yml b/conf/cmi/image.style.0.7_352w_572h.yml new file mode 100644 index 00000000..6aef21fe --- /dev/null +++ b/conf/cmi/image.style.0.7_352w_572h.yml @@ -0,0 +1,19 @@ +uuid: f0276d08-9181-4923-9b87-49e9bf5ee5f4 +langcode: en +status: true +dependencies: + module: + - focal_point +_core: + default_config_hash: cBN24Ntaz6rn8wtPWjCbT3-Hxq8qynjPGSmJFAV31Hk +name: 0.7_352w_572h +label: 0.7_352w_572h +effects: + 11ff7a5b-af0b-4eac-a4a3-7bc3b9ac6188: + uuid: 11ff7a5b-af0b-4eac-a4a3-7bc3b9ac6188 + id: focal_point_scale_and_crop + weight: 1 + data: + width: 352 + height: 572 + crop_type: focal_point diff --git a/conf/cmi/image.style.0.7_414w_621h.yml b/conf/cmi/image.style.0.7_414w_621h.yml new file mode 100644 index 00000000..c93cd036 --- /dev/null +++ b/conf/cmi/image.style.0.7_414w_621h.yml @@ -0,0 +1,19 @@ +uuid: 9ec716c1-6f6d-4d08-971f-a9d9230e43b7 +langcode: en +status: true +dependencies: + module: + - focal_point +_core: + default_config_hash: 9G0iI4Xc80IIrMDVw3MufI9ChwpU4MTr2DmAQBEsNww +name: 0.7_414w_621h +label: 0.7_414w_621h +effects: + dc8a6ee8-839c-4972-9eb8-5df5305dc75d: + uuid: dc8a6ee8-839c-4972-9eb8-5df5305dc75d + id: focal_point_scale_and_crop + weight: 1 + data: + width: 414 + height: 621 + crop_type: focal_point diff --git a/conf/cmi/image.style.0.7_543w_815h.yml b/conf/cmi/image.style.0.7_543w_815h.yml new file mode 100644 index 00000000..b94f5f88 --- /dev/null +++ b/conf/cmi/image.style.0.7_543w_815h.yml @@ -0,0 +1,19 @@ +uuid: 6ff8a4a5-849c-4f94-8f22-1eb670793bdc +langcode: en +status: true +dependencies: + module: + - focal_point +_core: + default_config_hash: YnfcElLVLgfDdm94VOY-D0FddU7red0-u7cRiayv98Q +name: 0.7_543w_815h +label: 0.7_543w_815h +effects: + 6535b34f-21c8-4005-8561-d1936245e319: + uuid: 6535b34f-21c8-4005-8561-d1936245e319 + id: focal_point_scale_and_crop + weight: 1 + data: + width: 543 + height: 815 + crop_type: focal_point diff --git a/conf/cmi/image.style.0.7_704w_1144h_LQ.yml b/conf/cmi/image.style.0.7_704w_1144h_LQ.yml new file mode 100644 index 00000000..74a2411b --- /dev/null +++ b/conf/cmi/image.style.0.7_704w_1144h_LQ.yml @@ -0,0 +1,26 @@ +uuid: 19aa2c22-c3e9-47cd-b767-9fca520ae4ba +langcode: en +status: true +dependencies: + module: + - focal_point + - image_style_quality +_core: + default_config_hash: pAcV7IybMiPiagIA-dUy4lmdI5voNIOyoE0Pkse5eV0 +name: 0.7_704w_1144h_LQ +label: 0.7_704w_1144h_LQ +effects: + 289822b3-1d38-43a4-a18e-0344b4ef9161: + uuid: 289822b3-1d38-43a4-a18e-0344b4ef9161 + id: focal_point_scale_and_crop + weight: 1 + data: + width: 704 + height: 1144 + crop_type: focal_point + c5118eb7-9ad5-4756-9515-d6358c38bd75: + uuid: c5118eb7-9ad5-4756-9515-d6358c38bd75 + id: image_style_quality + weight: 2 + data: + quality: 65 diff --git a/conf/cmi/image.style.0.7_828w_1242h_LQ.yml b/conf/cmi/image.style.0.7_828w_1242h_LQ.yml new file mode 100644 index 00000000..445ae047 --- /dev/null +++ b/conf/cmi/image.style.0.7_828w_1242h_LQ.yml @@ -0,0 +1,26 @@ +uuid: 5ebc2957-c7ca-4606-ba96-49486e6630e4 +langcode: en +status: true +dependencies: + module: + - focal_point + - image_style_quality +_core: + default_config_hash: mfxUI0GJzq_vdiXkYMnF9RUM07CwW2KKkEz14ofxTt8 +name: 0.7_828w_1242h_LQ +label: 0.7_828w_1242h_LQ +effects: + fb181588-37f9-4269-ae4e-7c93d76ffebe: + uuid: fb181588-37f9-4269-ae4e-7c93d76ffebe + id: focal_point_scale_and_crop + weight: 1 + data: + width: 828 + height: 1242 + crop_type: focal_point + a3284e2a-d636-4454-b7b6-3958d1db2b35: + uuid: a3284e2a-d636-4454-b7b6-3958d1db2b35 + id: image_style_quality + weight: 2 + data: + quality: 65 diff --git a/conf/cmi/image.style.1_1086w_1086h_LQ.yml b/conf/cmi/image.style.1_1086w_1086h_LQ.yml new file mode 100644 index 00000000..c95dc132 --- /dev/null +++ b/conf/cmi/image.style.1_1086w_1086h_LQ.yml @@ -0,0 +1,26 @@ +uuid: 9f76056d-d05c-40e9-9455-9caf237c2229 +langcode: en +status: true +dependencies: + module: + - focal_point + - image_style_quality +_core: + default_config_hash: mi1XUO2QcAKfZXGktQi8uH0YqSJQRPwztvP2d1hROLs +name: 1_1086w_1086h_LQ +label: 1_1086w_1086h_LQ +effects: + 3fe5b5a5-6dcd-4410-865d-22d39e20ae22: + uuid: 3fe5b5a5-6dcd-4410-865d-22d39e20ae22 + id: focal_point_scale_and_crop + weight: 1 + data: + width: 1086 + height: 1086 + crop_type: focal_point + 348c0fc5-7317-49a8-9a52-934e77165825: + uuid: 348c0fc5-7317-49a8-9a52-934e77165825 + id: image_style_quality + weight: 2 + data: + quality: 65 diff --git a/conf/cmi/image.style.1_414w_414h.yml b/conf/cmi/image.style.1_414w_414h.yml new file mode 100644 index 00000000..21e0d117 --- /dev/null +++ b/conf/cmi/image.style.1_414w_414h.yml @@ -0,0 +1,19 @@ +uuid: 0f96fcb7-856c-4d80-9a22-b1e88f44ca2b +langcode: en +status: true +dependencies: + module: + - focal_point +_core: + default_config_hash: hYrryvmZIFbqVuUffmELrMQU_CaSN30AKFOW_jHVzjA +name: 1_414w_414h +label: 1_414w_414h +effects: + 9ef8198f-6739-4a26-b0d7-157e42648cc4: + uuid: 9ef8198f-6739-4a26-b0d7-157e42648cc4 + id: focal_point_scale_and_crop + weight: 1 + data: + width: 414 + height: 414 + crop_type: focal_point diff --git a/conf/cmi/image.style.1_543w_543h.yml b/conf/cmi/image.style.1_543w_543h.yml new file mode 100644 index 00000000..05eb86b0 --- /dev/null +++ b/conf/cmi/image.style.1_543w_543h.yml @@ -0,0 +1,19 @@ +uuid: ca8cb2c4-7e3c-4a4a-ae75-9520f628f369 +langcode: en +status: true +dependencies: + module: + - focal_point +_core: + default_config_hash: M4ETy7uSDV6Ww_h9CjHqPNr_G1ssAwvhYUP93h5drbs +name: 1_543w_543h +label: 1_543w_543h +effects: + ed62a58f-6f7b-47ff-b8c9-3574fb9abeba: + uuid: ed62a58f-6f7b-47ff-b8c9-3574fb9abeba + id: focal_point_scale_and_crop + weight: 1 + data: + width: 543 + height: 543 + crop_type: focal_point diff --git a/conf/cmi/image.style.1_828w_828h_LQ.yml b/conf/cmi/image.style.1_828w_828h_LQ.yml new file mode 100644 index 00000000..2d33d9a4 --- /dev/null +++ b/conf/cmi/image.style.1_828w_828h_LQ.yml @@ -0,0 +1,26 @@ +uuid: d0a56f46-9d91-47a8-9269-57fda40b75ed +langcode: en +status: true +dependencies: + module: + - focal_point + - image_style_quality +_core: + default_config_hash: 5FDh9emCj1EzDriYUSM9-SHEBOkHjy6jkFjGruPs5Hw +name: 1_828w_828h_LQ +label: 1_828w_828h_LQ +effects: + c4554106-234a-4d04-a6cf-c7ae4f8886dd: + uuid: c4554106-234a-4d04-a6cf-c7ae4f8886dd + id: focal_point_scale_and_crop + weight: 1 + data: + width: 828 + height: 828 + crop_type: focal_point + ee011418-cb33-48a5-af34-10bfac5b3e64: + uuid: ee011418-cb33-48a5-af34-10bfac5b3e64 + id: image_style_quality + weight: 2 + data: + quality: 65 diff --git a/conf/cmi/language/fi/core.entity_form_display.paragraph.image_gallery.default.yml b/conf/cmi/language/fi/core.entity_form_display.paragraph.image_gallery.default.yml new file mode 100644 index 00000000..2037930d --- /dev/null +++ b/conf/cmi/language/fi/core.entity_form_display.paragraph.image_gallery.default.yml @@ -0,0 +1,5 @@ +content: + field_gallery_item: + settings: + title: Lohko + title_plural: Lohkot diff --git a/conf/cmi/language/fi/core.entity_view_mode.media.image_gallery.yml b/conf/cmi/language/fi/core.entity_view_mode.media.image_gallery.yml new file mode 100644 index 00000000..740a02fc --- /dev/null +++ b/conf/cmi/language/fi/core.entity_view_mode.media.image_gallery.yml @@ -0,0 +1 @@ +label: Kuvagalleria diff --git a/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_gallery_item.yml b/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_gallery_item.yml new file mode 100644 index 00000000..e3c76cd9 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_gallery_item.yml @@ -0,0 +1,2 @@ +label: 'Gallerian kohta' +description: 'Voit lisätä 2-12 kohtaa kuvagalleriaan.' diff --git a/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_description.yml b/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_description.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml b/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml new file mode 100644 index 00000000..561c19d5 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml @@ -0,0 +1,2 @@ +label: Kuvasuhde +description: 'Valitse näytettävien kuvien kuvasuhde. Kaikille kuville tulee sama suhde.' diff --git a/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_title.yml b/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.image_gallery.field_image_gallery_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image.yml b/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image.yml new file mode 100644 index 00000000..22ed4bd4 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image.yml @@ -0,0 +1 @@ +label: Kuva diff --git a/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml b/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image_photographer.yml b/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image_photographer.yml new file mode 100644 index 00000000..ec61dc71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image_photographer.yml @@ -0,0 +1,2 @@ +label: Valokuvaaja +description: 'Kuvan valokuvaaja' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.image_gallery.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.image_gallery.yml new file mode 100644 index 00000000..b356f57f --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.image_gallery.yml @@ -0,0 +1,2 @@ +label: Kuvagalleria +description: 'Kuvagalleria johon voi lisätä 2-12 kuvaa kuvauksella tai ilman. Kuvagalleriassa tulee olla minimissään 2 kuvaa.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.image_gallery_item.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.image_gallery_item.yml new file mode 100644 index 00000000..dc20e676 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.image_gallery_item.yml @@ -0,0 +1 @@ +label: 'Kuvagallerian kohta' diff --git a/conf/cmi/language/sv/core.entity_form_display.paragraph.image_gallery.default.yml b/conf/cmi/language/sv/core.entity_form_display.paragraph.image_gallery.default.yml new file mode 100644 index 00000000..10eaa40c --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.paragraph.image_gallery.default.yml @@ -0,0 +1,5 @@ +content: + field_gallery_item: + settings: + title: Paragraf + title_plural: Paragrafer diff --git a/conf/cmi/language/sv/core.entity_view_mode.media.image_gallery.yml b/conf/cmi/language/sv/core.entity_view_mode.media.image_gallery.yml new file mode 100644 index 00000000..411f8ddb --- /dev/null +++ b/conf/cmi/language/sv/core.entity_view_mode.media.image_gallery.yml @@ -0,0 +1 @@ +label: Fotogalleri diff --git a/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_gallery_item.yml b/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_gallery_item.yml new file mode 100644 index 00000000..4f931489 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_gallery_item.yml @@ -0,0 +1,2 @@ +label: 'Galleri objekt' +description: 'Du kan lägga till 2-12 galleriobjekt.' diff --git a/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_description.yml b/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_description.yml new file mode 100644 index 00000000..45893182 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_description.yml @@ -0,0 +1 @@ +label: Beskrivning diff --git a/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml b/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml new file mode 100644 index 00000000..c7fb93b0 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_ratio.yml @@ -0,0 +1,2 @@ +label: Bildförhållande +description: 'Välj bildförhållandet mellan bilderna som visas i fotogalleriet. Alla bilder kommer att ha samma förhållande. Som standard är 1:1 valt.' diff --git a/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_title.yml b/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_title.yml new file mode 100644 index 00000000..2711e04d --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.image_gallery.field_image_gallery_title.yml @@ -0,0 +1 @@ +label: Titel diff --git a/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image.yml b/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image.yml new file mode 100644 index 00000000..b7c0a450 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image.yml @@ -0,0 +1 @@ +label: Bild diff --git a/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml b/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml new file mode 100644 index 00000000..45893182 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml @@ -0,0 +1 @@ +label: Beskrivning diff --git a/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image_photographer.yml b/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image_photographer.yml new file mode 100644 index 00000000..a8043388 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image_photographer.yml @@ -0,0 +1,2 @@ +label: Fotograf +description: 'Fotografen till bilden' diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.image_gallery.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.image_gallery.yml new file mode 100644 index 00000000..9ca88d6c --- /dev/null +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.image_gallery.yml @@ -0,0 +1,2 @@ +label: Fotogalleri +description: 'Ett fotogalleri där du kan lägga till 2-12 bilder med eller utan beskrivningar. Fotogalleriet bör ha minst 2 bilder.' diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.image_gallery_item.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.image_gallery_item.yml new file mode 100644 index 00000000..e613d5a2 --- /dev/null +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.image_gallery_item.yml @@ -0,0 +1 @@ +label: 'Fotogalleri objekt' diff --git a/conf/cmi/paragraphs.paragraphs_type.image_gallery.yml b/conf/cmi/paragraphs.paragraphs_type.image_gallery.yml new file mode 100644 index 00000000..1beb8260 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.image_gallery.yml @@ -0,0 +1,12 @@ +uuid: ce98a627-023c-4a79-a9e6-626fa4b46741 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: hd9E4fr8EIQzdj4yDXLTGkQIt1pAEMZRUVcL_6LQs3I +id: image_gallery +label: 'Image gallery' +icon_uuid: null +icon_default: null +description: 'An image gallery where you can add 2-12 images with or without descriptions. The image gallery should have a minimum of 2 images.' +behavior_plugins: { } diff --git a/conf/cmi/paragraphs.paragraphs_type.image_gallery_item.yml b/conf/cmi/paragraphs.paragraphs_type.image_gallery_item.yml new file mode 100644 index 00000000..e35bb296 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.image_gallery_item.yml @@ -0,0 +1,12 @@ +uuid: 22fa68b8-b6cd-4bd9-9a87-a6ea36f37d7b +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: 6pLBxJV1wGxfXJp9zMQStWEBoGZepxg6CgxVL2mi8-k +id: image_gallery_item +label: 'Image gallery item' +icon_uuid: null +icon_default: null +description: '' +behavior_plugins: { } diff --git a/conf/cmi/responsive_image.styles.image_gallery_1_1.yml b/conf/cmi/responsive_image.styles.image_gallery_1_1.yml new file mode 100644 index 00000000..4dfddfc6 --- /dev/null +++ b/conf/cmi/responsive_image.styles.image_gallery_1_1.yml @@ -0,0 +1,38 @@ +uuid: c0fef26d-9cc5-4756-b247-5a9c3f7b4550 +langcode: en +status: true +dependencies: + config: + - image.style.1_1086w_1086h_LQ + - image.style.1_414w_414h + - image.style.1_543w_543h + - image.style.1_828w_828h_LQ + module: + - helfi_image_styles +_core: + default_config_hash: 29_zAX_g0m2zPiaRWVs5QHweA-Yhu0_yQcb9LewDXMM +id: image_gallery_1_1 +label: 'Image gallery 1:1' +image_style_mappings: + - + image_mapping_type: image_style + image_mapping: 1_414w_414h + breakpoint_id: helfi_image_styles.m + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 1_828w_828h_LQ + breakpoint_id: helfi_image_styles.m + multiplier: 2x + - + image_mapping_type: image_style + image_mapping: 1_543w_543h + breakpoint_id: helfi_image_styles.xs + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 1_1086w_1086h_LQ + breakpoint_id: helfi_image_styles.xs + multiplier: 2x +breakpoint_group: helfi_image_styles +fallback_image_style: 1_414w_414h diff --git a/conf/cmi/responsive_image.styles.image_gallery_2_3.yml b/conf/cmi/responsive_image.styles.image_gallery_2_3.yml new file mode 100644 index 00000000..f5a90b0c --- /dev/null +++ b/conf/cmi/responsive_image.styles.image_gallery_2_3.yml @@ -0,0 +1,50 @@ +uuid: 4da06bdc-4ddf-479d-bd7a-e7ccbcf93a7e +langcode: en +status: true +dependencies: + config: + - image.style.0.7_1086w_1630h_LQ + - image.style.0.7_352w_572h + - image.style.0.7_414w_621h + - image.style.0.7_543w_815h + - image.style.0.7_704w_1144h_LQ + - image.style.0.7_828w_1242h_LQ + module: + - helfi_image_styles +_core: + default_config_hash: FsfbGbQamEyCjnhveCelHwebu8SHFK8rfWmoeeh7jEc +id: image_gallery_2_3 +label: 'Image gallery 2:3' +image_style_mappings: + - + image_mapping_type: image_style + image_mapping: 0.7_414w_621h + breakpoint_id: helfi_image_styles.m + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 0.7_828w_1242h_LQ + breakpoint_id: helfi_image_styles.m + multiplier: 2x + - + image_mapping_type: image_style + image_mapping: 0.7_352w_572h + breakpoint_id: helfi_image_styles.s + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 0.7_704w_1144h_LQ + breakpoint_id: helfi_image_styles.s + multiplier: 2x + - + image_mapping_type: image_style + image_mapping: 0.7_543w_815h + breakpoint_id: helfi_image_styles.xs + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 0.7_1086w_1630h_LQ + breakpoint_id: helfi_image_styles.xs + multiplier: 2x +breakpoint_group: helfi_image_styles +fallback_image_style: 0.7_414w_621h diff --git a/conf/cmi/responsive_image.styles.image_gallery_3_2.yml b/conf/cmi/responsive_image.styles.image_gallery_3_2.yml new file mode 100644 index 00000000..02858796 --- /dev/null +++ b/conf/cmi/responsive_image.styles.image_gallery_3_2.yml @@ -0,0 +1,50 @@ +uuid: 0011a33c-b46a-4354-af09-3ea3e656a790 +langcode: en +status: true +dependencies: + config: + - image.style.1.5_1120w_746h_LQ + - image.style.1.5_378w_252h + - image.style.1.5_452w_301h + - image.style.1.5_560w_373h + - image.style.1.5_756w_504h_LQ + - image.style.1.5_904w_602h_LQ + module: + - helfi_image_styles +_core: + default_config_hash: l_qdU6nExbacBLGCv5ZQHXE54vA49nRWaLcmwRL479U +id: image_gallery_3_2 +label: 'Image gallery 3:2' +image_style_mappings: + - + image_mapping_type: image_style + image_mapping: 1.5_452w_301h + breakpoint_id: helfi_image_styles.m + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 1.5_904w_602h_LQ + breakpoint_id: helfi_image_styles.m + multiplier: 2x + - + image_mapping_type: image_style + image_mapping: 1.5_378w_252h + breakpoint_id: helfi_image_styles.s + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 1.5_756w_504h_LQ + breakpoint_id: helfi_image_styles.s + multiplier: 2x + - + image_mapping_type: image_style + image_mapping: 1.5_560w_373h + breakpoint_id: helfi_image_styles.xs + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 1.5_1120w_746h_LQ + breakpoint_id: helfi_image_styles.xs + multiplier: 2x +breakpoint_group: helfi_image_styles +fallback_image_style: 1.5_452w_301h diff --git a/conf/cmi/search_api.server.elastic_kymp.yml b/conf/cmi/search_api.server.elastic_kymp.yml index e7537d84..160fa6f6 100644 --- a/conf/cmi/search_api.server.elastic_kymp.yml +++ b/conf/cmi/search_api.server.elastic_kymp.yml @@ -14,6 +14,6 @@ backend_config: url: 'http://elastic:9200' enable_debug_logging: false advanced: + fuzziness: auto prefix: '' suffix: '' - fuzziness: auto diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index cbd32963..dd75506a 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -91,7 +91,6 @@ display: type: mini options: offset: 0 - pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -106,6 +105,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index ee31d545..b90334a4 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -381,7 +381,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -399,6 +398,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index 8343d8e9..4d89f6c2 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -381,7 +381,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -399,6 +398,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 7e190ab5..e2ccbdeb 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -109,7 +109,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 4 total_pages: null id: 0 @@ -127,6 +126,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: @@ -646,7 +646,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 5 total_pages: null id: 0 @@ -664,6 +663,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index 631f7dee..ce78017e 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -93,7 +93,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 8 total_pages: null id: 0 @@ -111,6 +110,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 101b4532..72a7edf1 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -286,7 +286,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -304,6 +303,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: From 7501c09df2da87dde57e8c0366be117491710fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 19 Nov 2024 12:19:52 +0200 Subject: [PATCH 15/20] UHF-10239: Added image gallery to district content type. --- conf/cmi/field.field.node.district.field_content.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/cmi/field.field.node.district.field_content.yml b/conf/cmi/field.field.node.district.field_content.yml index 8f479ca7..25689f8a 100644 --- a/conf/cmi/field.field.node.district.field_content.yml +++ b/conf/cmi/field.field.node.district.field_content.yml @@ -12,6 +12,7 @@ dependencies: - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.news_list @@ -47,6 +48,7 @@ settings: contact_card_listing: contact_card_listing map: map project_listing: project_listing + image_gallery: image_gallery negate: 0 target_bundles_drag_drop: accordion: @@ -70,6 +72,9 @@ settings: image: weight: 3 enabled: true + image_gallery: + weight: 17 + enabled: true list_of_links: weight: 4 enabled: true From 56ddcdfda71b971c0cf30392c6a56f7055c1e351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 19 Nov 2024 12:20:34 +0200 Subject: [PATCH 16/20] Update field.field.node.district.field_content.yml --- conf/cmi/field.field.node.district.field_content.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/field.field.node.district.field_content.yml b/conf/cmi/field.field.node.district.field_content.yml index 25689f8a..2f7b91ea 100644 --- a/conf/cmi/field.field.node.district.field_content.yml +++ b/conf/cmi/field.field.node.district.field_content.yml @@ -12,7 +12,7 @@ dependencies: - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image - - paragraphs.paragraphs_type.image_gallery + - paragraphs.paragraphs_type.image_gallery - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.news_list From 71e338d133210a50f49322ad02ccbc067b196e9e Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:06:04 +0000 Subject: [PATCH 17/20] Update configuration --- composer.lock | 12 ++++++------ ..._form_display.paragraph.image_gallery.default.yml | 5 +++++ ...image_gallery.field_image_gallery_description.yml | 1 + ...graph.image_gallery.field_image_gallery_title.yml | 1 + ...agraph.image_gallery_item.field_gallery_image.yml | 1 + ..._gallery_item.field_gallery_image_description.yml | 1 + 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 conf/cmi/language/ru/core.entity_form_display.paragraph.image_gallery.default.yml create mode 100644 conf/cmi/language/ru/field.field.paragraph.image_gallery.field_image_gallery_description.yml create mode 100644 conf/cmi/language/ru/field.field.paragraph.image_gallery.field_image_gallery_title.yml create mode 100644 conf/cmi/language/ru/field.field.paragraph.image_gallery_item.field_gallery_image.yml create mode 100644 conf/cmi/language/ru/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml diff --git a/composer.lock b/composer.lock index abb9bd42..26006465 100644 --- a/composer.lock +++ b/composer.lock @@ -4110,16 +4110,16 @@ }, { "name": "drupal/hdbt_admin", - "version": "3.2.8", + "version": "3.2.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "d1c02090ec6536e3d43abeb236a535416b97e669" + "reference": "36437872af9f46e205ec7aff2ff27115e9c6edf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/d1c02090ec6536e3d43abeb236a535416b97e669", - "reference": "d1c02090ec6536e3d43abeb236a535416b97e669", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/36437872af9f46e205ec7aff2ff27115e9c6edf1", + "reference": "36437872af9f46e205ec7aff2ff27115e9c6edf1", "shasum": "" }, "require": { @@ -4147,10 +4147,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.8", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.10", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-11-18T15:28:13+00:00" + "time": "2024-11-19T13:01:05+00:00" }, { "name": "drupal/health_check", diff --git a/conf/cmi/language/ru/core.entity_form_display.paragraph.image_gallery.default.yml b/conf/cmi/language/ru/core.entity_form_display.paragraph.image_gallery.default.yml new file mode 100644 index 00000000..35c674ce --- /dev/null +++ b/conf/cmi/language/ru/core.entity_form_display.paragraph.image_gallery.default.yml @@ -0,0 +1,5 @@ +content: + field_gallery_item: + settings: + title: Paragraph + title_plural: Параграфы diff --git a/conf/cmi/language/ru/field.field.paragraph.image_gallery.field_image_gallery_description.yml b/conf/cmi/language/ru/field.field.paragraph.image_gallery.field_image_gallery_description.yml new file mode 100644 index 00000000..5b898549 --- /dev/null +++ b/conf/cmi/language/ru/field.field.paragraph.image_gallery.field_image_gallery_description.yml @@ -0,0 +1 @@ +label: Description diff --git a/conf/cmi/language/ru/field.field.paragraph.image_gallery.field_image_gallery_title.yml b/conf/cmi/language/ru/field.field.paragraph.image_gallery.field_image_gallery_title.yml new file mode 100644 index 00000000..9401b287 --- /dev/null +++ b/conf/cmi/language/ru/field.field.paragraph.image_gallery.field_image_gallery_title.yml @@ -0,0 +1 @@ +label: Заголовок diff --git a/conf/cmi/language/ru/field.field.paragraph.image_gallery_item.field_gallery_image.yml b/conf/cmi/language/ru/field.field.paragraph.image_gallery_item.field_gallery_image.yml new file mode 100644 index 00000000..0082c078 --- /dev/null +++ b/conf/cmi/language/ru/field.field.paragraph.image_gallery_item.field_gallery_image.yml @@ -0,0 +1 @@ +label: Изображение diff --git a/conf/cmi/language/ru/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml b/conf/cmi/language/ru/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml new file mode 100644 index 00000000..5b898549 --- /dev/null +++ b/conf/cmi/language/ru/field.field.paragraph.image_gallery_item.field_gallery_image_description.yml @@ -0,0 +1 @@ +label: Description From e342f0a0947dc003fab9d7c2dd383ce76bdc6599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 19 Nov 2024 15:34:47 +0200 Subject: [PATCH 18/20] UHF-9680: Reverted HDBT cookie banner installation. --- conf/cmi/core.extension.yml | 3 +- ...cookie_compliance.cookie_category.chat.yml | 13 +++ ...e_compliance.cookie_category.essential.yml | 13 +++ ..._compliance.cookie_category.preference.yml | 13 +++ ..._compliance.cookie_category.statistics.yml | 13 +++ conf/cmi/eu_cookie_compliance.settings.yml | 86 +++++++++++++++++++ conf/cmi/hdbt_admin_tools.site_settings.yml | 2 +- conf/cmi/hdbt_cookie_banner.settings.yml | 6 -- ...cookie_compliance.cookie_consent_intro.yml | 7 ++ ...cookie_compliance.cookie_category.chat.yml | 4 + ...e_compliance.cookie_category.essential.yml | 4 + ..._compliance.cookie_category.preference.yml | 4 + ..._compliance.cookie_category.statistics.yml | 4 + .../fi/eu_cookie_compliance.settings.yml | 11 +++ .../fi/hdbt_cookie_banner.settings.yml | 3 - ...cookie_compliance.cookie_consent_intro.yml | 5 ++ ...cookie_compliance.cookie_category.chat.yml | 4 + ...e_compliance.cookie_category.essential.yml | 4 + ..._compliance.cookie_category.preference.yml | 4 + ..._compliance.cookie_category.statistics.yml | 4 + .../sv/eu_cookie_compliance.settings.yml | 11 +++ .../sv/hdbt_cookie_banner.settings.yml | 3 - ...cookie_compliance.cookie_consent_intro.yml | 5 ++ conf/cmi/user.role.admin.yml | 6 +- conf/cmi/user.role.anonymous.yml | 2 + conf/cmi/user.role.authenticated.yml | 2 + conf/cmi/user.role.content_producer.yml | 2 + conf/cmi/user.role.editor.yml | 2 + conf/cmi/user.role.read_only.yml | 2 + conf/cmi/user.role.survey_editor.yml | 2 + 30 files changed, 228 insertions(+), 16 deletions(-) create mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.chat.yml create mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.essential.yml create mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.preference.yml create mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml create mode 100644 conf/cmi/eu_cookie_compliance.settings.yml delete mode 100644 conf/cmi/hdbt_cookie_banner.settings.yml create mode 100644 conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml create mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml create mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml create mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml create mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml create mode 100644 conf/cmi/language/fi/eu_cookie_compliance.settings.yml delete mode 100644 conf/cmi/language/fi/hdbt_cookie_banner.settings.yml create mode 100644 conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml create mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml create mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml create mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml create mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml create mode 100644 conf/cmi/language/sv/eu_cookie_compliance.settings.yml delete mode 100644 conf/cmi/language/sv/hdbt_cookie_banner.settings.yml create mode 100644 conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 5a2aabe3..46297e74 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -42,13 +42,13 @@ module: gin_toolbar: 0 hal: 0 hdbt_admin_tools: 0 - hdbt_cookie_banner: 0 health_check: 0 helfi_api_base: 0 helfi_azure_fs: 0 helfi_base_content: 0 helfi_ckeditor: 0 helfi_etusivu_entities: 0 + helfi_eu_cookie_compliance: 0 helfi_image_styles: 0 helfi_kymp_content: 0 helfi_kymp_migrations: 0 @@ -180,6 +180,7 @@ module: paragraphs: 11 publication_date: 99 minimal: 1000 + eu_cookie_compliance: 1001 theme: claro: 0 stable9: 0 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml new file mode 100644 index 00000000..610c513d --- /dev/null +++ b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml @@ -0,0 +1,13 @@ +uuid: ca0f6ab6-8ce2-4226-948c-093bb80c95bd +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: Fo0xGa_NGmRHechfzeoRkN1cxRB2-z_P0gHmfGny4E8 +id: chat +label: 'Functional chat cookies' +description: + value: '

The chats on the www.hel.fi  website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.  No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.

NameProviderPurpose of the cookieValidityType
_genesys.widgets.*www.hel.fiUsed for storing data required by the chat functionality.Session 
leijuke.*www.hel.fiUsed for storing data required by the chat functionality.Session 
aiap-wbc-chat-app-button-statewww.hel.fiUsed for chat app functionality. Stores chat app button settings and configuration data.Session 
aiap-chat-app-v1-statewww.hel.fiUsed for chat app functionality. Stores chat app settings and configuration data.Session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Stores chat app conversation token for authentication and data access purposes.SessionThird party
CallGuide.languagewww.hel.fiACE Chat: The language used in the ACE Web SDK is derived from the browsers' preferred language setting and ACE Web SDK settings.-Local storage
CallGuide.config_services_*www.hel.fiACE Chat: Configuring customer service integrations on a web page. Reduces web traffic when loading and navigating a page-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chat: The unique identity of this browser window. Is used if the browser has more than one open window for a website-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chat: Only one window at a time can display video. This information tracks which of them (if any).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chat: A list of all windows that are likely to display the video-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chat: A website can have more than one chat client. This item tracks which customer the current chat belongs to.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chat: Name of the chat entrance to the system-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chat: Chat session ID when communicating with ACE-Local storage
humany-*www.hel.fiACE Chat: Preserves widget status when page reloads-Local storage
ARRAffinity.hel.humany.netACE Chat: Load balancing in the backend systemSessionThird party
ARRAffinitySameSite.hel.humany.netACE Chat: Load balancing in the backend systemSessionThird party
' + format: full_html +checkbox_default_state: unchecked +weight: -5 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml new file mode 100644 index 00000000..729cda24 --- /dev/null +++ b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml @@ -0,0 +1,13 @@ +uuid: 55e23022-9124-46f3-85e7-fc51d46c5aa2 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: 6_XedB0R6X-mo9oj-a1V_0wlGQWBzGMlKvDNs-f7KB0 +id: essential +label: 'Essential cookies' +description: + value: '

Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.

NameProviderPurpose of the cookieValidityType
cookiehubcookiehub.comUsed by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.365 days 
cookie-agreedwww.hel.fiUsed by www.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.100 days 
cookie-agreed-versionwww.hel.fiUsed by www.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categorieswww.hel.fiUsed by www.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
cookie-agreedavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.100 days 
cookie-agreed-versionavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categoriesavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
SSESS*www.hel.fiA cookie related to the operation of the content management system.23 days 
SSESS*avustukset.hel.fiA cookie related to the operation of the content management system.23 days 
AWSELBCORSsiteimproveanalytics.ioThe cookie is related to a load distribution function used to direct requests to servers with the least traffic.SessionThird party
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 days 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

The cookie is an obligatory cookie that facilitates visiting the website.SessionThird party
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Its value is used to access session data on server of the application.SessionThird party
COOKIE_SUPPORThelsinkikanava.fiThe cookie facilitates managing cookies on the website.365 daysThird party
GUEST_LANGUAGE_IDhelsinkikanava.fiThis cookie is generated by the Liferay, its function is to store the language preferences.365 daysThird party
helfi-settingswww.hel.fiUsed by www.hel.fi Drupal to store information about closed announcements and accordions'' state.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiUsed by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.365 days 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiStores whether the admin sidebar is expanded or collapsed on desktop when logged in as an editor on hel.fi.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiStores whether the admin sidebar is expanded or collapsed on mobile when logged in as an editor on hel.fi.-Local storage
Drupal.gin.darkmodewww.hel.fiStores the user''s dark mode preference in the admin theme when logged in as an editor on hel.fi.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiStores the expanded or collapsed state of submenus in the Drupal admin toolbar for a logged-in editor, ensuring consistency across page loads.-Local storage
Drupal.off-canvas.css.*www.hel.fiStores cached CKEditor CSS in localStorage for a logged-in editor, using a key with a cache-busting query to ensure the latest CSS is loaded.-Local storage
ed11ySeenwww.hel.fiTracks which accessibility issues a logged-in editor has already seen to avoid duplicate notifications.-Local storage
editoria11yResultCountwww.hel.fiTracks the number of accessibility issues found on specific pages for a logged-in editor, helping monitor and address them.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiStores the state of the admin toolbar for a logged-in editor, including its orientation, active tab and state of expansion.SessionSession storage
escapeAdminPathwww.hel.fiStores the URL to redirect a logged-in editor from the admin interface back to the main site.SessionSession storage
' + format: full_html +checkbox_default_state: required +weight: -9 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml new file mode 100644 index 00000000..dcc0db80 --- /dev/null +++ b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml @@ -0,0 +1,13 @@ +uuid: e9f7b85e-579d-4203-8485-962bd138c785 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: 2nukTq0GW1ah8MZEHNDaOJ0Ygil0hTpw48HeCYekkZY +id: preference +label: Preference +description: + value: '

Preference cookies modify the visuals and functions of the website based on the user''s previous sessions.

NameProviderPurpose of the cookieValidityType
httpskartta.hel.fi.SWCulturekartta.hel.fiThe City''s map service cookie saves the language in which the service is used.1826 days 
icareus-devicehelsinkikanava.fiThe Helsinki Channel video server cookie facilitates including videos as part of the website''s content.365 daysThird party
VISITOR_INFO1_LIVEyoutube.comThe YouTube cookie selects the old or new video player depending on the connection speed.180 daysThird party
CONSENTyoutube.comUsed by Google to store user consent preferences5947 days, 15 hoursThird party
activeTabwww.hel.fiUsed for storing active tab data when user is using high school search.Session 
activeContentwww.hel.fiUsed for storing active content data when user is using high school search.Session 
' + format: full_html +checkbox_default_state: unchecked +weight: -8 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml new file mode 100644 index 00000000..9edf6f32 --- /dev/null +++ b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml @@ -0,0 +1,13 @@ +uuid: 0d9129e2-affc-4f3f-b300-f92bf16b7242 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: DocxmYG5rysx8IQZ_Mu2ZhNcPnpkNpXJAYeRDWSRMds +id: statistics +label: Statistics +description: + value: '

The information collected by statistics cookies is used for developing the website.

NameProviderPurpose of the cookieValidityType
nmstatwww.hel.fiThe Siteimprove statistics cookie collects information about the use of the website.1000 days 
_pk_id.*www.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.141.89f6www.hel.fi-1 hour 
_pk_id.*kartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*kartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*palvelukartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*palvelukartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*avustukset.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*avustukset.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
rnsbidreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rnsbid_tsreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rns_reaction_*reactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
YSCyoutube.comThe YouTube cookie facilitates including videos as part of the website''s content.SessionThird party
' + format: full_html +checkbox_default_state: unchecked +weight: -7 diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml new file mode 100644 index 00000000..ff0a6a84 --- /dev/null +++ b/conf/cmi/eu_cookie_compliance.settings.yml @@ -0,0 +1,86 @@ +_core: + default_config_hash: zmkyvoZ03LGqfVeB0mtslC-pkWMOrGIU9lJl9_jqUkc +langcode: en +dependencies: + config: + - filter.format.full_html +uuid: f1c1c3e6-b187-4f9b-ba72-702a7d057983 +popup_enabled: true +popup_clicking_confirmation: false +popup_scrolling_confirmation: false +eu_countries: { } +eu_only: false +eu_only_js: false +popup_position: false +fixed_top_position: true +popup_info: + value: "

Hel.fi uses cookies

\r\n\r\n

We use essential cookies on our website to make the site work. Also third party cookies are used if you give us your permission.

\r\n" + format: full_html +mobile_popup_info: + value: '' + format: full_html +popup_info_template: new +popup_agree_button_message: Accept +popup_more_info_button_message: 'Show cookies' +mobile_breakpoint: 768 +popup_agreed_enabled: false +popup_hide_agreed: false +disagree_button_label: 'No, thanks' +popup_agreed: + value: '

Thank you for accepting cookies

You can now hide this message or find out more about cookies.

' + format: full_html +popup_find_more_button_message: 'Show cookies' +popup_hide_button_message: Hide +popup_link: /cookie-information-and-settings +popup_link_new_window: false +popup_height: null +popup_width: '' +popup_delay: 1000 +show_more_info: true +popup_bg_hex: '' +popup_text_hex: '' +domain: '' +domains_option: 1 +domains_list: '' +exclude_paths: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*" +exclude_admin_theme: false +cookie_session: 0 +set_cookie_session_zero_on_disagree: 0 +cookie_lifetime: 100 +use_mobile_message: false +use_bare_css: true +use_olivero_css: false +disagree_do_not_show_popup: false +reload_page: true +reload_options: 0 +reload_routes_list: '' +cookie_name: '' +exclude_uid_1: false +better_support_for_screen_readers: false +method: categories +disabled_javascripts: '' +automatic_cookies_removal: true +allowed_cookies: "helfi_accordions_open\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\nessential:GUEST_LANGUAGE_ID\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:nmstat\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:rnsbid\r\nstatistics:rnsbid_ts\r\nstatistics:rns_reaction_*\r\nstatistics:YSC\r\nchat:_genesys.widgets.*\r\nchat:leijuke.*" +consent_storage_method: do_not_store +withdraw_message: + value: '

Hel.fi uses cookies

You have given your consent for us to set cookies.

' + format: full_html +withdraw_tab_button_label: 'Privacy settings' +withdraw_action_button_label: 'Withdraw consent' +withdraw_enabled: false +withdraw_button_on_info_popup: false +save_preferences_button_label: 'Accept selected cookies' +accept_all_categories_button_label: 'Accept all cookies' +enable_save_preferences_button: true +domain_all_sites: true +settings_tab_enabled: false +containing_element: body +cookie_policy_version: 1.2.5 +cookie_value_disagreed: '0' +cookie_value_agreed_show_thank_you: '1' +cookie_value_agreed: '2' +accessibility_focus: false +close_button_action: close_banner +reject_button_label: '' +reject_button_enabled: false +close_button_enabled: false diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml index 1de666bd..d7552933 100644 --- a/conf/cmi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/hdbt_admin_tools.site_settings.yml @@ -1,10 +1,10 @@ _core: default_config_hash: OgPHnjkIjDn42IHAwLRXhNzdhX825gq2SrlYKw4kbQ8 langcode: en -path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json site_settings: default_icon: home-smoke theme_color: tram koro: vibration footer_settings: footer_color: dark +path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json diff --git a/conf/cmi/hdbt_cookie_banner.settings.yml b/conf/cmi/hdbt_cookie_banner.settings.yml deleted file mode 100644 index fae82ee6..00000000 --- a/conf/cmi/hdbt_cookie_banner.settings.yml +++ /dev/null @@ -1,6 +0,0 @@ -_core: - default_config_hash: y-QliARbuZ0u4VXlTAbsDzeY15OrDBGBbaP6LtSPb3c -langcode: en -cookie_information: - title: 'Cookie information' - content: "A cookie is a small-scale data storage program that a computer browser installs on a user's computer hard drive. Whenever the user's browser retrieves the site from the City of Helsinki's servers, the message is sent back to the user's computer. Javascript and server logs are used to record, for example, the number of users, country of use, usage time and browser used, as well as the content that the visitor has visited. The cookie does not damage the drive.\r\n\r\nCookies are used to speed up, analyze and develop the website and to target content to each user." diff --git a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml new file mode 100644 index 00000000..368a0db9 --- /dev/null +++ b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml @@ -0,0 +1,7 @@ +_core: + default_config_hash: eVNvfbEgjm25gLyG5DH8zDbCi17xs8djPZt0XHD_Q9s +cc: + title: 'Cookie settings' + content: + value: "

A cookie is a small-scale data storage program that a computer browser installs on a user's computer hard drive. Whenever the user's browser retrieves the site from the City of Helsinki's servers, the message is sent back to the user's computer. Javascript and server logs are used to record, for example, the number of users, country of use, usage time and browser used, as well as the content that the visitor has visited. The cookie does not damage the drive.

Cookies are used to speed up, analyze and develop the website and to target content to each user.

" + format: full_html diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml new file mode 100644 index 00000000..b554bf87 --- /dev/null +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml @@ -0,0 +1,4 @@ +description: + value: '

Toiminnallisten chat-evästeiden avulla mahdollistetaan helfi-sivujen chattien toiminta. Jos aloitat chatin, hyväksyt sen käyttöön liittyvät toiminnalliset evästeet automaattisesti.  Evästeiden hyväksymiseen ei tällöin tarvita erillistä suostumusta. Toiminnallisia chat-evästeitä ladataan laitteellesi vain, jos käynnistät chatin.

NimiTarjoajaTarkoitusVoimassaTyyppi
_genesys.widgets.*www.hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
leijuke.*www.hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
aiap-wbc-chat-app-button-statewww.hel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen painikkeen asetukset ja kokoonpanotiedot.Istunto 
aiap-chat-app-v1-statewww.hel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen asetukset ja kokoonpanotiedot.Istunto 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen keskustelutunnisteen istunnnon tunnistamista ja tietojen hakemista varten.IstuntoKolmas osapuoli
CallGuide.languagewww.hel.fiACE Chat: ACE Web SDK:ssa käytettävä kieli, joka on johdettu selainten ensisijaisesta kieliasetuksesta ja ACE Web SDK - asetuksista.-Local storage
CallGuide.config_services_*www.hel.fiACE Chat: Asiakaspalveluintegraatioiden määritys verkkosivulla. Vähentää verkkoliikennettä sivun lataamisen ja navigoinnin yhteydessä.-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chat: Tämän selainikkunan yksilöllinen identiteetti. Käytetään, jos selaimessa on useampi kuin yksi avoin ikkuna verkkosivustolle.-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chat: Vain yksi ikkuna kerrallaan voi näyttää videota. Nämä tiedot seuraavat, mikä niistä (jos sellainen on).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chat: Luettelo kaikista ikkunoista, jotka ovat todennäköisiä videon näyttämiseen.-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chat: Verkkosivustolla voi olla useampi kuin yksi chat-asiakasohjelma. Tämä kohde seuraa, mihin asiakkaaseen nykyinen chat kuuluu.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chat: Järjestelmän chat-sisäänkäynnin nimi-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chat: Keskustelun istuntotunnus kommunikoitaessa ACE:n kanssa-Local storage
humany-*www.hel.fiACE Chat: Säilyttää widgetin tilan, kun sivu ladataan uudelleen -Local storage
ARRAffinity.hel.humany.netACE Chat: Kuormituksen tasaus taustajärjestelmässäIstuntoKolmas osapuoli
ARRAffinitySameSite.hel.humany.netACE Chat: Kuormituksen tasaus taustajärjestelmässäIstuntoKolmas osapuoli
' + format: full_html +label: 'Toiminnalliset chat-evästeet' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml new file mode 100644 index 00000000..0652c9f2 --- /dev/null +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml @@ -0,0 +1,4 @@ +description: + value: '

Välttämättömät evästeet auttavat tekemään verkkosivustosta käyttökelpoisen sallimalla perustoimintoja, kuten sivulla siirtymisen ja sivuston suojattujen alueiden käytön. Verkkosivusto ei toimi kunnolla ilman näitä evästeitä eikä niihin tarvita suostumusta.

NimiTarjoajaTarkoitusVoimassaTyyppi
cookiehubCookiehubMahdollistaa evästehallinnan www.hel.fi sivuilla.365 päivää 
cookie-agreedwww.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionwww.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categorieswww.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
cookie-agreedavustukset.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionavustukset.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categoriesavustukset.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
SSESS*www.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
SSESS*avustukset.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
AWSELBCORSsiteimproveanalytics.ioEväste liittyy palvelinten kuormanjakotoiminnallisuuteen, jolla ohjataan pyynnöt vähimmällä käytöllä olevalle palvelimille.IstuntoKolmas osapuoli
mtm_cookie_consentkartta.hel.fiTekninen eväste johon talletetaan tieto valinnastasi evästeiden käytöstä kertovan bannerin kohdalla10950 päivää 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Sivuston pakollinen eväste mahdollistaa kävijän vierailun sivustolla.IstuntoKolmas osapuoli
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Evästettä käytetään sovelluksen palvelimella olevan istuntotiedon hakemiseen.IstuntoKolmas osapuoli
COOKIE_SUPPORThelsinkikanava.fiMahdollistaa evästeiden hallinnan sivustolla.365 päivääKolmas osapuoli
GUEST_LANGUAGE_IDhelsinkikanava.fiTämän evästeen on luonut Liferay, se tallentaa kieliasetukset.365 päivääKolmas osapuoli
helfi-settingswww.hel.fiSivusto käyttää tätä tietuetta tietojen tallentamiseen siitä, mitä poikkeusilmoituksia on suljettu ja mikä on avattavien sisältöalueiden tila.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiKäytetään käyttäjän automaattiseen uloskirjautumiseen.365 päivää 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiTallentaa tiedon sisällöntuottajan käyttöliittymän sivupalkin näkyvyydestä työpöytänäkymässä.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiTallentaa tiedon sisällöntuottajan käyttöliittymän sivupalkin näkyvyydestä mobiilinäkymässä.-Local storage
Drupal.gin.darkmodewww.hel.fiTallentaa tiedon sisällöntuottajan valitsemasta "tumma tila"-asetuksesta.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiTallentaa sisällöntuottajan näkymissä alivalikoiden tilan (laajennettu tai kutistettu), jotta se säilyy yhdenmukaisena sivulatausten välillä.-Local storage
Drupal.off-canvas.css.*www.hel.fiTallentaa sisällöntuottajan käyttämän wysiwyg-editorin tyylit välimuistiin varmistaakseen viimeisimpien CSS-tyylien latauksen.-Local storage
ed11ySeenwww.hel.fiTallentaa sisällöntuottajan näkemät saavutettavuusongelmat, jotta vältetään ongelmien kaksoisilmoitukset.-Local storage
editoria11yResultCountwww.hel.fiTallentaa löydettyjen saavutettavuusongelmien määrän sisällöntuottajalle, auttaen seuraamaan ja korjaamaan ne.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiTallentaa sisällöntuottajan hallintatyökalupalkin orientaation, aktiivisen välilehden ja laajennustilan.IstuntoSession storage
escapeAdminPathwww.hel.fiTallentaa URL-osoitteen, jota käytetään ohjaamaan kirjautunut sisällöntuottaja hallintaliittymästä takaisin pääsivustolle.IstuntoSession storage
' + format: full_html +label: 'Välttämättömät toiminnalliset evästeet' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml new file mode 100644 index 00000000..93f9ff7d --- /dev/null +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml @@ -0,0 +1,4 @@ +label: Personointi +description: + value: '

Mieltymysevästeet mukauttavat sivuston ulkoasua ja toimintaa käyttäjän aiemman käytön perusteella.

NimiTarjoajaTarkoitusVoimassaTyyppi
httpskartta.hel.fi.SWCulturekartta.hel.fiKaupungin karttapalvelun evästeeseen tallennetaan kieli, jolla palvelua käytetään.1826 päivää 
icareus-devicehelsinkikanava.fiHelsinki-kanavan videopalvelimen eväste.365 päivääKolmas osapuoli
VISITOR_INFO1_LIVEyoutube.comYouTuben eväste valitsee yhteyden nopeuden mukaan, joko vanhan tai uuden videosoittimen.180 päivääKolmas osapuoli
CONSENTyoutube.comGooglen eväste tallentaa kävijän evästehyväskynnän.5947 päivää, 15 tuntiaKolmas osapuoli
activeTabwww.hel.fiKäytetään aktiivisten välilehtien tietojen tallentamiseen, kun käyttäjä käyttää lukioiden suodatushakua.Istunto 
activeContentwww.hel.fiKäytetään aktiivisen sisältötietojen tallentamiseen, kun käyttäjä käyttää lukioiden hakua.Istunto 
' + format: full_html diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml new file mode 100644 index 00000000..b4707d04 --- /dev/null +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml @@ -0,0 +1,4 @@ +description: + value: '

Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.

NimiTarjoajaTarkoitusVoimassaTyyppi
nmstatwww.hel.fiSiteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.1000 päivää 
_pk_id.*www.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.141.89f6www.hel.fi-1 tunti 
_pk_id.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
rnsbidreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
rnsbid_tsreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
rns_reaction_*reactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
YSCyoutube.comYouTuben eväste mahdollistaa videoiden upottamisen sivustolle.IstuntoKolmas osapuoli
' + format: full_html +label: Tilastointi diff --git a/conf/cmi/language/fi/eu_cookie_compliance.settings.yml b/conf/cmi/language/fi/eu_cookie_compliance.settings.yml new file mode 100644 index 00000000..053fc5a4 --- /dev/null +++ b/conf/cmi/language/fi/eu_cookie_compliance.settings.yml @@ -0,0 +1,11 @@ +popup_agree_button_message: Hyväksy +popup_more_info_button_message: 'Näytä evästeet' +popup_find_more_button_message: 'Näytä evästeet' +popup_hide_button_message: Piilossa +popup_info: + value: '

Hel.fi käyttää evästeitä

Tämä sivusto käyttää välttämättömiä evästeitä suorituskyvyn varmistamiseksi sekä yleisen käytön seurantaan. Lisäksi käytämme kohdennusevästeitä käyttäjäkokemuksen parantamiseksi, analytiikkaan ja kohdistetun sisällön näyttämiseen.

' +popup_link: /cookie-information-and-settings +disagree_button_label: 'Ei kiitos' +withdraw_tab_button_label: Tietosuoja-asetukset +save_preferences_button_label: 'Hyväksy valitut evästeet' +accept_all_categories_button_label: 'Hyväksy kaikki evästeet' diff --git a/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml b/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml deleted file mode 100644 index 26d5fef4..00000000 --- a/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml +++ /dev/null @@ -1,3 +0,0 @@ -cookie_information: - title: Evästeasetukset - content: "Eväste (engl. cookie) on pienikokoinen tekstitiedosto, jonka verkkoselain tallentaa käyttäjän tietokoneelle tai mobiililaitteelle, kun vierailet verkkosivustolla. Se ei vahingoita käyttäjän laitetta tai tiedostoja. Evästeitä ei voi käyttää haittaohjelmien levittämiseen.\r\n\r\nEvästeistä saatava käyttäjätieto auttaa meitä varmistamaan sivuston teknisen toimivuuden ja parantamaan digitaalisten palveluidemme laatua. Niiden avulla voimme kehittää sivuston käyttäjäystävällisyyttä ja helpottaa tiedon löytymistä." diff --git a/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml new file mode 100644 index 00000000..8b78ae23 --- /dev/null +++ b/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml @@ -0,0 +1,5 @@ +cc: + content: + value: '

Eväste (engl. cookie) on pienikokoinen tekstitiedosto, jonka verkkoselain tallentaa käyttäjän tietokoneelle tai mobiililaitteelle, kun vierailet verkkosivustolla. Se ei vahingoita käyttäjän laitetta tai tiedostoja. Evästeitä ei voi käyttää haittaohjelmien levittämiseen.

Evästeistä saatava käyttäjätieto auttaa meitä varmistamaan sivuston teknisen toimivuuden ja parantamaan digitaalisten palveluidemme laatua. Niiden avulla voimme kehittää sivuston käyttäjäystävällisyyttä ja helpottaa tiedon löytymistä.

' + format: full_html + title: Evästeasetukset diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml new file mode 100644 index 00000000..9715a41b --- /dev/null +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml @@ -0,0 +1,4 @@ +description: + value: '

Chattarna på webbplatsen www.hel.fi  fungerar med hjälp av funktionella chattkakor. Om du inleder en chatt godkänner du automatiskt de nödvändiga funktionella kakorna.  Då behövs inget separat samtycke till kakor. Funktionella chattkakor laddas endast ner på din enhet om du inleder en chatt.

NamnTjänsteleverantörCookie syfteGiltighetTyp
_genesys.widgets.*www.hel.fiAnvänds för att lagra data som behövs för chatten.session 
leijuke.*www.hel.fiAnvänds för att lagra data som behövs för chatten.session 
aiap-wbc-chat-app-button-statewww.hel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationens knapp.session 
aiap-chat-app-v1-statewww.hel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationen.session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Lagrar konversationstoken för autentisering och åtkomst till dataändamål.sessionTredje part
CallGuide.languagewww.hel.fiACE Chat: Språket som används i ACE Web SDK härleds från webbläsarnas föredragna språkinställning och ACE Web SDK-inställningar.-Local storage
CallGuide.config_services_*www.hel.fiACE Chatt: Konfigurera kundtjänstintegrationer på en webbsida. Minskar webbtrafiken när du läser in och navigerar på en sida.-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chatt: Den unika identiteten för det här webbläsarfönstret. Används om webbläsaren har mer än ett öppet fönster för en webbplats.-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chatt: Endast ett fönster i taget kan visa video. Den här informationen spårar vilka av dem (om några).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chatt: En lista över alla fönster som sannolikt kommer att visa videon.-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chatt: En webbplats kan ha mer än en chattklient. Det här objektet spårar vilken kund den aktuella chatten tillhör.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chatt: Namnet på chattingången till systemet-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chatt: Chattsessions-ID vid kommunikation med ACE-Local storage
humany-*www.hel.fiACE Chatt: Bevarar widgetstatus när sidan laddas om-Local storage
ARRAffinity.hel.humany.netACE Chatt: Lastbalansering i backend-systemetSessionTredje part
ARRAffinitySameSite.hel.humany.netACE Chatt: Lastbalansering i backend-systemetSessionTredje part
' + format: full_html +label: 'Funktionella chattkakor' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml new file mode 100644 index 00000000..1a90fe7a --- /dev/null +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml @@ -0,0 +1,4 @@ +description: + value: '

Nödvändiga cookies hjälper till att göra webbplatsen användbar genom att tillåta grundläggande funktioner som att navigera på sidan och använda de skyddade områdena på webbplatsen. Webbplatsen fungerar inte korrekt utan dessa cookies och kräver inte samtycke.

NamnTjänsteleverantörCookie syfteGiltighetTyp
cookiehubcookiehub.comCookie möjliggör hantering av cookies på www.hel.fi webbplatsen.365 dagar 
cookie-agreedwww.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionwww.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categorieswww.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
cookie-agreedavustukset.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionavustukset.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categoriesavustukset.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
SSESS*www.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
SSESS*avustukset.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
AWSELBCORSsiteimproveanalytics.ioCookie är kopplad till funktionen för lastfördelning som styr begäran till en server med mindre belastning.sessionTredje part
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 dagar 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Kakan är en obligatorisk kaka som gör det möjligt för besökaren att besöka webbplatsen.sessionTredje part
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Dess värde används för att få tillgång till sessiondata på applikationens server.sessionTredje part
COOKIE_SUPPORThelsinkikanava.fiKakan möjliggör hanteringen av kakor på webbplatsen.365 dagarTredje part
GUEST_LANGUAGE_IDhelsinkikanava.fiDenna cookie genereras av Liferay, dess funktion är att lagra språkinställningarna.365 dagarTredje part
helfi-settingswww.hel.fiAnvänds av www.hel.fi Drupal för att lagra information om stängda meddelanden och accordions'' tillstånd.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiAnvänds av avustukset.hel.fi Drupal för att automatiskt logga ut användare efter en period av inaktivitet.365 dagar 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiLagrar om admin-sidopanelen är expanderad eller kollapsad på skrivbordet när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiLagrar om admin-sidopanelen är expanderad eller kollapsad på mobil när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.gin.darkmodewww.hel.fiLagrar användarens mörkt läge-inställning i admin-temat när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiLagrar tillståndet för expanderade eller kollapsade undermenyer i Drupals admin-verktygsfält för en inloggad redaktör, vilket säkerställer konsekvens mellan sidladdningar.-Local storage
Drupal.off-canvas.css.*www.hel.fiLagrar cachelagrad CKEditor CSS i localStorage för en inloggad redaktör, med en nyckel som använder en cache-brytande fråga för att säkerställa att den senaste CSS-filen laddas.-Local storage
ed11ySeenwww.hel.fiSpårar vilka tillgänglighetsproblem en inloggad redaktör redan har sett för att undvika dubbla aviseringar.-Local storage
editoria11yResultCountwww.hel.fiSpårar antalet tillgänglighetsproblem som hittats på specifika sidor för en inloggad redaktör, vilket hjälper till att övervaka och åtgärda dem.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiLagrar tillståndet för admin-verktygsfältet för en inloggad redaktör, inklusive dess orientering, aktiva flik och expanderade tillstånd.SessionSession storage
escapeAdminPathwww.hel.fiLagrar URL för att omdirigera en inloggad redaktör från admin-gränssnittet tillbaka till huvudsidan.-Session storage
' + format: full_html +label: 'Nödvändiga funktionella cookies' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml new file mode 100644 index 00000000..cef60a8e --- /dev/null +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml @@ -0,0 +1,4 @@ +label: Preferens +description: + value: '

Preferenscookies ändrar webbplatsens utseende och funktioner enligt användarens tidigare användning.

NamnTjänsteleverantörCookie syfteGiltighetTyp
httpskartta.hel.fi.SWCulturekartta.hel.fiI kakan på stadens kaktjänst sparas det språk som användaren använder i tjänsten.1826 dagar 
icareus-devicehelsinkikanava.fiHelsinki-kanavas kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.365 dagarTredje part
VISITOR_INFO1_LIVEyoutube.comYouTubes kaka väljer antingen den nya eller gamla videospelaren enligt förbindelsens hastighet.180 dagarTredje part
CONSENTyoutube.comAnvänds av Google för att lagra inställningar för användarens samtycke.5947 dagar, 15 timmarTredje part
activeTabwww.hel.fiAnvänds för att lagra aktiv flikdata när användaren använder gymnasiesökning.Session 
activeContentwww.hel.fiAnvänds för att lagra aktivt innehållsdata när användaren använder gymnasiesökning.Session 

 

' + format: full_html diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml new file mode 100644 index 00000000..92e0cd64 --- /dev/null +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml @@ -0,0 +1,4 @@ +description: + value: '

De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.

NamnTjänsteleverantörCookie syfteGiltighetTyp
nmstatwww.hel.fiSiteimproves kaka samlar information om hur webbplatsen används.1000 dagar 
_pk_id.*www.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.141.89f6www.hel.fi-1 timme 
_pk_id.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
rnsbidreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
rnsbid_tsreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
rns_reaction_*reactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
YSCyoutube.comYouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.sessionTredje part

 

' + format: full_html +label: Statistik diff --git a/conf/cmi/language/sv/eu_cookie_compliance.settings.yml b/conf/cmi/language/sv/eu_cookie_compliance.settings.yml new file mode 100644 index 00000000..df981cb7 --- /dev/null +++ b/conf/cmi/language/sv/eu_cookie_compliance.settings.yml @@ -0,0 +1,11 @@ +popup_agree_button_message: Accepterar +popup_more_info_button_message: 'Visa cookies' +popup_find_more_button_message: 'Visa cookies' +popup_hide_button_message: Dölj +popup_info: + value: '

Hel.fi använder cookies

Vi använder viktiga cookies på vår webbplats för att få webbplatsen att fungera. Även tredjepartscookies används om du ger oss ditt tillstånd.

' +disagree_button_label: 'Nej, tack' +withdraw_action_button_label: 'Återkalla samtycke' +withdraw_tab_button_label: Sekretessinställningar +save_preferences_button_label: 'Acceptera valda cookies' +accept_all_categories_button_label: 'Acceptera alla cookies' diff --git a/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml b/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml deleted file mode 100644 index e079a63d..00000000 --- a/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml +++ /dev/null @@ -1,3 +0,0 @@ -cookie_information: - title: 'Cookie -inställningar' - content: "En kaka (eng. cookie) är en liten textfil som webbläsaren sparar i användarens dator eller mobila enhet när hen besöker en webbplats. Den skadar inte användarens enhet eller filer. Kakor kan inte användas för att sprida skadeprogram.\r\n\r\nAnvändarinformationen som fås från kakorna hjälper oss att säkerställa webbplatsens funktionalitet och förbättra kvaliteten på våra digitala tjänster. Med hjälp av dem kan vi utveckla webbplatsens användarvänlighet och göra det lättare att hitta information." diff --git a/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml new file mode 100644 index 00000000..46d695ef --- /dev/null +++ b/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml @@ -0,0 +1,5 @@ +cc: + content: + value: '

En kaka (eng. cookie) är en liten textfil som webbläsaren sparar i användarens dator eller mobila enhet när hen besöker en webbplats. Den skadar inte användarens enhet eller filer. Kakor kan inte användas för att sprida skadeprogram.

Användarinformationen som fås från kakorna hjälper oss att säkerställa webbplatsens funktionalitet och förbättra kvaliteten på våra digitala tjänster. Med hjälp av dem kan vi utveckla webbplatsens användarvänlighet och göra det lättare att hitta information.

' + format: full_html + title: 'Cookie -inställningar' diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml index 72af063e..501e322a 100644 --- a/conf/cmi/user.role.admin.yml +++ b/conf/cmi/user.role.admin.yml @@ -27,9 +27,9 @@ dependencies: - content_translation - editoria11y - entity_usage + - eu_cookie_compliance - file - filter - - hdbt_cookie_banner - helfi_api_base - helfi_tpr - locale @@ -74,7 +74,8 @@ permissions: - 'access tpr_unit overview' - 'access user profiles' - 'administer blocks' - - 'administer hdbt_cookie_banner' + - 'administer eu cookie compliance categories' + - 'administer eu cookie compliance popup' - 'administer menu' - 'administer nodes' - 'administer paragraphs library' @@ -145,6 +146,7 @@ permissions: - 'delete remote entities' - 'delete terms in keywords' - 'disable own tfa' + - 'display eu cookie compliance popup' - 'edit any announcement content' - 'edit any district content' - 'edit any file media' diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index 78ea20dc..dd32146e 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -5,6 +5,7 @@ dependencies: config: - rest.resource.helfi_global_mobile_menu module: + - eu_cookie_compliance - external_entities - helfi_api_base - helfi_tpr @@ -20,6 +21,7 @@ weight: 0 is_admin: false permissions: - 'access content' + - 'display eu cookie compliance popup' - 'restful get helfi_global_mobile_menu' - 'send javascript errors to sentry' - 'view helfi_announcements external entity' diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index 0b8ea0da..a6836aa0 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -5,6 +5,7 @@ dependencies: config: - rest.resource.helfi_global_mobile_menu module: + - eu_cookie_compliance - external_entities - file - helfi_api_base @@ -27,6 +28,7 @@ permissions: - 'access toolbar' - 'delete own files' - 'disable own tfa' + - 'display eu cookie compliance popup' - 'restful get helfi_global_mobile_menu' - 'send javascript errors to sentry' - 'setup own tfa' diff --git a/conf/cmi/user.role.content_producer.yml b/conf/cmi/user.role.content_producer.yml index e1813b9a..9d1805a0 100644 --- a/conf/cmi/user.role.content_producer.yml +++ b/conf/cmi/user.role.content_producer.yml @@ -20,6 +20,7 @@ dependencies: - content_translation - editoria11y - entity_usage + - eu_cookie_compliance - file - filter - helfi_api_base @@ -86,6 +87,7 @@ permissions: - 'delete own project content' - 'delete own remote_video media' - 'disable own tfa' + - 'display eu cookie compliance popup' - 'edit any announcement content' - 'edit any district content' - 'edit any file media' diff --git a/conf/cmi/user.role.editor.yml b/conf/cmi/user.role.editor.yml index 82929205..033088fb 100644 --- a/conf/cmi/user.role.editor.yml +++ b/conf/cmi/user.role.editor.yml @@ -20,6 +20,7 @@ dependencies: - content_translation - editoria11y - entity_usage + - eu_cookie_compliance - file - filter - helfi_api_base @@ -112,6 +113,7 @@ permissions: - 'delete remote entities' - 'delete terms in keywords' - 'disable own tfa' + - 'display eu cookie compliance popup' - 'edit any announcement content' - 'edit any district content' - 'edit any file media' diff --git a/conf/cmi/user.role.read_only.yml b/conf/cmi/user.role.read_only.yml index a9932b4a..d09ebb67 100644 --- a/conf/cmi/user.role.read_only.yml +++ b/conf/cmi/user.role.read_only.yml @@ -7,6 +7,7 @@ dependencies: - node.type.landing_page - node.type.page module: + - eu_cookie_compliance - file - helfi_tpr - node @@ -22,6 +23,7 @@ permissions: - 'access toolbar' - 'delete own files' - 'disable own tfa' + - 'display eu cookie compliance popup' - 'setup own tfa' - 'view any unpublished announcement content' - 'view any unpublished landing_page content' diff --git a/conf/cmi/user.role.survey_editor.yml b/conf/cmi/user.role.survey_editor.yml index 1a67bdb5..2cb5c34b 100644 --- a/conf/cmi/user.role.survey_editor.yml +++ b/conf/cmi/user.role.survey_editor.yml @@ -6,6 +6,7 @@ dependencies: - node.type.survey module: - content_translation + - eu_cookie_compliance - node - publication_date - tfa @@ -21,6 +22,7 @@ permissions: - 'delete own survey content' - 'delete survey revisions' - 'disable own tfa' + - 'display eu cookie compliance popup' - 'edit any survey content' - 'edit own survey content' - 'revert survey revisions' From 36e558ba661385c39fa3fa7f4f63ee12ef85e83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 19 Nov 2024 16:48:45 +0200 Subject: [PATCH 19/20] UHF-9680: Reverted the cookie banner installation (properly). --- .../block.block.eucookiecomplianceblock.yml | 31 +++++++++++++++++++ ....hdbt_subtheme_eucookiecomplianceblock.yml | 31 +++++++++++++++++++ ...cookie_compliance.cookie_category.chat.yml | 2 +- ...e_compliance.cookie_category.essential.yml | 2 +- ..._compliance.cookie_category.preference.yml | 2 +- ..._compliance.cookie_category.statistics.yml | 2 +- conf/cmi/eu_cookie_compliance.settings.yml | 5 ++- ..._compliance.cookie_category.statistics.yml | 1 + .../ru/eu_cookie_compliance.settings.yml | 12 +++++++ 9 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 conf/cmi/block.block.eucookiecomplianceblock.yml create mode 100644 conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml create mode 100644 conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml create mode 100644 conf/cmi/language/ru/eu_cookie_compliance.settings.yml diff --git a/conf/cmi/block.block.eucookiecomplianceblock.yml b/conf/cmi/block.block.eucookiecomplianceblock.yml new file mode 100644 index 00000000..66591fcb --- /dev/null +++ b/conf/cmi/block.block.eucookiecomplianceblock.yml @@ -0,0 +1,31 @@ +uuid: d66f67da-a1de-4526-b561-810e937c1bcc +langcode: en +status: true +dependencies: + module: + - eu_cookie_compliance + - system + theme: + - hdbt +_core: + default_config_hash: Ofp5Nv8E3DryORBw9DXtbN860LdYomjt-klGkC0fCHs +id: eucookiecomplianceblock +theme: hdbt +region: after_content +weight: -10 +provider: null +plugin: eu_cookie_compliance_block +settings: + id: eu_cookie_compliance_block + label: 'EU Cookie Compliance Block' + label_display: '0' + provider: eu_cookie_compliance + eu_cookie_compliance_block_settings: + description: + value: '' + format: full_html +visibility: + request_path: + id: request_path + negate: false + pages: /cookie-information-and-settings diff --git a/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml b/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml new file mode 100644 index 00000000..eb57f3a0 --- /dev/null +++ b/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml @@ -0,0 +1,31 @@ +uuid: 5873908f-9f16-4d4d-becf-7eb0e1d2ca98 +langcode: en +status: true +dependencies: + module: + - eu_cookie_compliance + - system + theme: + - hdbt_subtheme +_core: + default_config_hash: Ofp5Nv8E3DryORBw9DXtbN860LdYomjt-klGkC0fCHs +id: hdbt_subtheme_eucookiecomplianceblock +theme: hdbt_subtheme +region: after_content +weight: -10 +provider: null +plugin: eu_cookie_compliance_block +settings: + id: eu_cookie_compliance_block + label: 'EU Cookie Compliance Block' + label_display: '0' + provider: eu_cookie_compliance + eu_cookie_compliance_block_settings: + description: + value: '' + format: full_html +visibility: + request_path: + id: request_path + negate: false + pages: /cookie-information-and-settings diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml index 610c513d..be70027a 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml @@ -1,4 +1,4 @@ -uuid: ca0f6ab6-8ce2-4226-948c-093bb80c95bd +uuid: 8dc5c2c3-94e7-45f3-abf2-afb2277360cc langcode: en status: true dependencies: { } diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml index 729cda24..bd641c1d 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml @@ -1,4 +1,4 @@ -uuid: 55e23022-9124-46f3-85e7-fc51d46c5aa2 +uuid: 7ec46403-3e1d-4c02-b4e3-ecbc635a9bab langcode: en status: true dependencies: { } diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml index dcc0db80..dd43bbd8 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml @@ -1,4 +1,4 @@ -uuid: e9f7b85e-579d-4203-8485-962bd138c785 +uuid: 29ab66ef-81dd-4947-91eb-bfaf581d235c langcode: en status: true dependencies: { } diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml index 9edf6f32..d91217e0 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml @@ -1,4 +1,4 @@ -uuid: 0d9129e2-affc-4f3f-b300-f92bf16b7242 +uuid: 5fd96091-6fd1-4392-a672-08f29331910b langcode: en status: true dependencies: { } diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml index ff0a6a84..21bde9e3 100644 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ b/conf/cmi/eu_cookie_compliance.settings.yml @@ -1,14 +1,13 @@ _core: - default_config_hash: zmkyvoZ03LGqfVeB0mtslC-pkWMOrGIU9lJl9_jqUkc + default_config_hash: hQ7DNLHTlQh0_X_bDls8Gwa7MA_vHoOePmKn2NASjM4 langcode: en dependencies: config: - filter.format.full_html -uuid: f1c1c3e6-b187-4f9b-ba72-702a7d057983 +uuid: 794fc11b-a1b4-41a7-a351-aaa84516c2c5 popup_enabled: true popup_clicking_confirmation: false popup_scrolling_confirmation: false -eu_countries: { } eu_only: false eu_only_js: false popup_position: false diff --git a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml new file mode 100644 index 00000000..298e3d7c --- /dev/null +++ b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml @@ -0,0 +1 @@ +label: Statistics diff --git a/conf/cmi/language/ru/eu_cookie_compliance.settings.yml b/conf/cmi/language/ru/eu_cookie_compliance.settings.yml new file mode 100644 index 00000000..315eded2 --- /dev/null +++ b/conf/cmi/language/ru/eu_cookie_compliance.settings.yml @@ -0,0 +1,12 @@ +popup_agreed: + value: "

Thank you for accepting cookies

\r\n\r\n

You can now hide this message or find out more about cookies.

\r\n" +popup_agree_button_message: Принять +popup_more_info_button_message: 'Show cookies' +popup_find_more_button_message: 'Show cookies' +popup_hide_button_message: Скрыть +popup_info: + value: "

Hel.fi uses cookies 

\r\n\r\n

We use essential cookies on our website to make the site work. Also third party cookies are used if you give us your permission.

\r\n" +popup_link: /node/1 +withdraw_message: + value: "

Hel.fi uses cookies

\r\n\r\n

You have given your consent for us to set cookies.

\r\n" +save_preferences_button_label: 'Accept selected cookies' From 3851eb06f86e72d8afc2acc561ba8f73f8b35205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 19 Nov 2024 17:11:44 +0200 Subject: [PATCH 20/20] UHF-9680: Reverted the user roles. --- conf/cmi/user.role.admin.yml | 1 - conf/cmi/user.role.content_producer.yml | 2 -- conf/cmi/user.role.editor.yml | 2 -- conf/cmi/user.role.read_only.yml | 2 -- conf/cmi/user.role.survey_editor.yml | 2 -- 5 files changed, 9 deletions(-) diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml index 501e322a..0649d059 100644 --- a/conf/cmi/user.role.admin.yml +++ b/conf/cmi/user.role.admin.yml @@ -146,7 +146,6 @@ permissions: - 'delete remote entities' - 'delete terms in keywords' - 'disable own tfa' - - 'display eu cookie compliance popup' - 'edit any announcement content' - 'edit any district content' - 'edit any file media' diff --git a/conf/cmi/user.role.content_producer.yml b/conf/cmi/user.role.content_producer.yml index 9d1805a0..e1813b9a 100644 --- a/conf/cmi/user.role.content_producer.yml +++ b/conf/cmi/user.role.content_producer.yml @@ -20,7 +20,6 @@ dependencies: - content_translation - editoria11y - entity_usage - - eu_cookie_compliance - file - filter - helfi_api_base @@ -87,7 +86,6 @@ permissions: - 'delete own project content' - 'delete own remote_video media' - 'disable own tfa' - - 'display eu cookie compliance popup' - 'edit any announcement content' - 'edit any district content' - 'edit any file media' diff --git a/conf/cmi/user.role.editor.yml b/conf/cmi/user.role.editor.yml index 033088fb..82929205 100644 --- a/conf/cmi/user.role.editor.yml +++ b/conf/cmi/user.role.editor.yml @@ -20,7 +20,6 @@ dependencies: - content_translation - editoria11y - entity_usage - - eu_cookie_compliance - file - filter - helfi_api_base @@ -113,7 +112,6 @@ permissions: - 'delete remote entities' - 'delete terms in keywords' - 'disable own tfa' - - 'display eu cookie compliance popup' - 'edit any announcement content' - 'edit any district content' - 'edit any file media' diff --git a/conf/cmi/user.role.read_only.yml b/conf/cmi/user.role.read_only.yml index d09ebb67..a9932b4a 100644 --- a/conf/cmi/user.role.read_only.yml +++ b/conf/cmi/user.role.read_only.yml @@ -7,7 +7,6 @@ dependencies: - node.type.landing_page - node.type.page module: - - eu_cookie_compliance - file - helfi_tpr - node @@ -23,7 +22,6 @@ permissions: - 'access toolbar' - 'delete own files' - 'disable own tfa' - - 'display eu cookie compliance popup' - 'setup own tfa' - 'view any unpublished announcement content' - 'view any unpublished landing_page content' diff --git a/conf/cmi/user.role.survey_editor.yml b/conf/cmi/user.role.survey_editor.yml index 2cb5c34b..1a67bdb5 100644 --- a/conf/cmi/user.role.survey_editor.yml +++ b/conf/cmi/user.role.survey_editor.yml @@ -6,7 +6,6 @@ dependencies: - node.type.survey module: - content_translation - - eu_cookie_compliance - node - publication_date - tfa @@ -22,7 +21,6 @@ permissions: - 'delete own survey content' - 'delete survey revisions' - 'disable own tfa' - - 'display eu cookie compliance popup' - 'edit any survey content' - 'edit own survey content' - 'revert survey revisions'